From 65e35e5ca150b4475d6379daf332b7aab9e2e263 Mon Sep 17 00:00:00 2001 From: trunc88 Date: Wed, 18 May 2022 19:15:01 -0400 Subject: [PATCH] gtk+3: bump to 3.24.34, switch to meson (from ehawkvu/kiss-xorg) --- gtk+3/build | 87 ++++++++++++++++++------------------------ gtk+3/{build => build.old} | 2 +- gtk+3/checksums | 4 +- gtk+3/depends | 7 ++++ gtk+3/patches/no-fribidi.patch | 64 +++++++++++++++++++++++++++++++ gtk+3/version | 2 +- 6 files changed, 113 insertions(+), 53 deletions(-) rewrite gtk+3/build (84%) copy gtk+3/{build => build.old} (96%) diff --git a/gtk+3/build b/gtk+3/build dissimilarity index 84% index 74ea837..39b7e71 100755 --- a/gtk+3/build +++ b/gtk+3/build @@ -1,49 +1,38 @@ -#!/bin/sh -e - -patch -p1 < no-fribidi.patch - -# Remove configure check for atk-bridge and fribidi. -sed -e 's/\(ATK_PACKAGES="atk\) atk-bridge-2.0"/\1"/' \ - -e 's/fribidi >= 0\.19\.7//g' \ - configure > _ -mv -f _ configure -chmod +x configure - -# Remove atk-bridge code. -sed '//d;/atk_bridge_adaptor_init/d' \ - gtk/a11y/gtkaccessibility.c > _ -mv -f _ gtk/a11y/gtkaccessibility.c - -# Don't build GTK examples/demos/testsuite. -sed 's/demos tests testsuite examples//;s/docs \(m4macros\)/\1/' Makefile.in > _ -mv -f _ Makefile.in - -./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-xkb \ - --enable-xinerama \ - --enable-xrandr \ - --enable-xfixes \ - --enable-xcomposite \ - --enable-xdamage \ - --enable-x11-backend \ - --disable-schemas-compile \ - --disable-cups \ - --disable-papi \ - --disable-cloudprint \ - --disable-glibtest \ - --disable-nls \ - --disable-installed-tests \ - --enable-introspection=yes \ - --enable-colord=no \ - --enable-gtk-doc-html=no - -make -make DESTDIR="$1" install - -# We don't compile with librsvg which leads to this -# utility solely causing compiler errors for some -# packages. It has no use at all. -rm -f "$1/usr/bin/gtk-encode-symbolic-svg" +#!/bin/sh -e + +export DESTDIR="$1" + +patch -p1 < no-fribidi.patch + +# Disable native language support, disable atk-bridge, don't compile schemas. +sed -e '/compile_schemas/s/true/false/' \ + -e '/ENABLE_NLS/s/1/0/' \ + -e "/subdir('po/d" \ + -e "/atk-bridge/d" \ + meson.build > _ +mv -f _ meson.build + +# Remove atk-bridge code. +sed '//d;/atk_bridge_adaptor_init/d' \ + gtk/a11y/gtkaccessibility.c > _ +mv -f _ gtk/a11y/gtkaccessibility.c + +meson setup \ + -Dprefix=/usr \ + -Dx11_backend=true \ + -Dwayland_backend=false \ + -Dxinerama=yes \ + -Dprint_backends=file,lpr \ + -Dcolord=no \ + -Dintrospection=true \ + -Ddemos=false \ + -Dexamples=false \ + -Dtests=false \ + output + +ninja -C output +ninja -C output install + +# We don't compile with librsvg which leads to this utility solely causing +# compiler errors for some packages. It has no use at all. +#rm -f "$1/usr/bin/gtk-encode-symbolic-svg" diff --git a/gtk+3/build b/gtk+3/build.old similarity index 96% copy from gtk+3/build copy to gtk+3/build.old index 74ea837..e4577a2 100755 --- a/gtk+3/build +++ b/gtk+3/build.old @@ -46,4 +46,4 @@ make DESTDIR="$1" install # We don't compile with librsvg which leads to this # utility solely causing compiler errors for some # packages. It has no use at all. -rm -f "$1/usr/bin/gtk-encode-symbolic-svg" +#rm -f "$1/usr/bin/gtk-encode-symbolic-svg" diff --git a/gtk+3/checksums b/gtk+3/checksums index bbd0ae7..57c592f 100644 --- a/gtk+3/checksums +++ b/gtk+3/checksums @@ -1,2 +1,2 @@ -588b06522e25d1579e989b6f9d8a1bdbf2fe13cde01a04e904ff346a225e7801 -e44b643a9ec01ea153817602241d6d7e6fd2d121b3ce4e29f99a87d8836a3ff0 +dbc69f90ddc821b8d1441f00374dc1da4323a2eafa9078e61edbe5eeefa852ec +893f84833bf5b87a1b2f7d0a373f16037f5e2be6b4d030d8c4b7f9ff48cc993f diff --git a/gtk+3/depends b/gtk+3/depends index 49c8f7d..ce73b08 100644 --- a/gtk+3/depends +++ b/gtk+3/depends @@ -1,5 +1,9 @@ atk +cairo +fontconfig +freetype-harfbuzz gdk-pixbuf +glib libXcomposite libXcursor libXdamage @@ -8,6 +12,9 @@ libXi libXinerama libXrandr libepoxy +libxkbcommon +mesa +meson make pango pkgconf make python make diff --git a/gtk+3/patches/no-fribidi.patch b/gtk+3/patches/no-fribidi.patch index 360c378..92846e0 100644 --- a/gtk+3/patches/no-fribidi.patch +++ b/gtk+3/patches/no-fribidi.patch @@ -28,6 +28,18 @@ index f0869a6..2f3c039 100644 return PANGO_DIRECTION_LTR; } +diff --git a/gdk/meson.build b/gdk/meson.build +index 4bb1bf2..9270c97 100644 +--- a/gdk/meson.build ++++ b/gdk/meson.build +@@ -202,7 +202,6 @@ gdk_deps = [ + pixbuf_dep, + cairo_dep, + pango_dep, +- fribidi_dep, + cairogobj_dep, + glib_dep, + epoxy_dep, diff --git a/gtk/gtkpango.c b/gtk/gtkpango.c index aaac4cc..a76ad57 100644 --- a/gtk/gtkpango.c @@ -58,3 +70,55 @@ index aaac4cc..a76ad57 100644 return PANGO_DIRECTION_LTR; } +diff --git a/gtk/meson.build b/gtk/meson.build +index 79f4f0d..be51997 100644 +--- a/gtk/meson.build ++++ b/gtk/meson.build +@@ -836,7 +836,6 @@ gtk_deps = [ + pango_dep, + pangoft_dep, + harfbuzz_dep, +- fribidi_dep, + cairogobj_dep, + cairo_dep, + fontconfig_dep, +diff --git a/meson.build b/meson.build +index c599843..967a022 100644 +--- a/meson.build ++++ b/meson.build +@@ -25,7 +25,6 @@ endif + + glib_req = '>= @0@.@1@.@2@'.format(glib_major_req, glib_minor_req, glib_micro_req) + pango_req = '>= 1.41.0' +-fribidi_req = '>= 0.19.7' + atk_req = '>= 2.35.1' + at_spi2_atk_req = '>= 2.15.1' + cairo_req = '>= 1.14.0' +@@ -404,8 +403,6 @@ endif + + pango_dep = dependency('pango', version: pango_req, + fallback : ['pango', 'libpango_dep']) +-fribidi_dep = dependency('fribidi', version: fribidi_req, +- fallback : ['fribidi', 'libfribidi_dep']) + + # Require PangoFT2 if on X11 or wayland + require_pangoft2 = wayland_enabled or x11_enabled +@@ -927,8 +924,7 @@ endif + + pkgconf.set('GDK_PRIVATE_PACKAGES', + ' '.join(gio_packages + x11_pkgs + wayland_pkgs + cairo_backends + +- ['epoxy', epoxy_req] + cloudproviders_packages + +- ['fribidi', fribidi_req])) ++ ['epoxy', epoxy_req] + cloudproviders_packages)) + + gtk_packages = ' '.join([ + atk_dep.name(), atk_req, +@@ -941,7 +937,7 @@ pkgconf.set('GTK_PACKAGES', gtk_packages) + # Requires.private + pc_gdk_extra_libs += cairo_libs + +-gtk_private_packages = atk_pkgs + wayland_pkgs + ['epoxy', epoxy_req, 'fribidi', fribidi_req] ++gtk_private_packages = atk_pkgs + wayland_pkgs + ['epoxy', epoxy_req] + if wayland_enabled or x11_enabled + gtk_private_packages += ['pangoft2'] + endif diff --git a/gtk+3/version b/gtk+3/version index 7d62168..2d1bc36 100644 --- a/gtk+3/version +++ b/gtk+3/version @@ -1 +1 @@ -3.24.33 1 +3.24.34 1 -- 2.11.4.GIT