vars/build.vars:native_packages_deps_x11: adds {libepoxy,gtk3} v{1.5.0,3.22.28} (via Redfoxmoon.)

patches/gtk3-3.22.28.local.patch:Makefile.in: skip `testsuite' target (via Redfoxmoon.)

2 files changed, 22 insertions, 1 deletions

diff --git a/patches/gtk3-3.22.28.local.patch b/patches/gtk3-3.22.28.local.patch
new file mode 100644
index 00000000..f60454f8
--- /dev/null
+++ b/patches/gtk3-3.22.28.local.patch
@@ -0,0 +1,12 @@
+diff -ru gtk+-3.22.28.orig/Makefile.in gtk+-3.22.28/Makefile.in
+--- gtk+-3.22.28.orig/Makefile.in	2018-02-14 19:22:34.000000000 +0100
++++ gtk+-3.22.28/Makefile.in	2018-03-07 00:17:36.646939857 +0100
+@@ -566,7 +566,7 @@
+ 	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
+ 	&& DISPLAY=:$$XID && export DISPLAY
+ 
+-SRC_SUBDIRS = gdk gtk libgail-util modules demos tests testsuite examples
++SRC_SUBDIRS = gdk gtk libgail-util modules demos tests examples
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ MAINTAINERCLEANFILES = \
diff --git a/vars/build.vars b/vars/build.vars
index 377a72c6..dd328f05 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -549,7 +549,7 @@ NATIVE_PACKAGES_DEPS_X11_PACKAGES="
 inputproto kbproto xcb_proto xproto fixesproto recordproto libXau libpthread_stubs xcb
 xextproto xtrans libX11 libXext freetype fontconfig renderproto Xrender
 libXft libXfixes libXi libXtst libICE libSM libXt libXmu libXpm libXaw libxkbfile
-harfbuzz pixman cairo dbus pango atk at_spi2_core at_spi2_atk gdk gtk2 imlib2 libcaca";
+harfbuzz pixman cairo dbus pango atk at_spi2_core at_spi2_atk gdk libepoxy gtk2 gtk3 imlib2 libcaca";
 NATIVE_PACKAGES_DEPS_X11_PREFIX="${PREFIX_NATIVE}";
 NATIVE_PACKAGES_DEPS_X11_PYTHON="${PREFIX}/bin/python";
 : ${PKG_INPUTPROTO_SHA256SUM:=893a6af55733262058a27b38eeb1edc733669f01d404e8581b167f03c03ef31d};
@@ -675,11 +675,20 @@ NATIVE_PACKAGES_DEPS_X11_PYTHON="${PREFIX}/bin/python";
 : ${PKG_GDK_VERSION:=2.36.10};
 : ${PKG_GDK_SHA256SUM:=f8f6fa896b89475c73b6e9e8d2a2b062fc359c4b4ccb8e96470d6ab5da949ace};
 : ${PKG_GDK_URL:=http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${PKG_GDK_VERSION%.*}/gdk-pixbuf-${PKG_GDK_VERSION}.tar.xz};
+: ${PKG_LIBEPOXY_SHA256SUM:=4c94995398a6ebf691600dda2e9685a0cac261414175c2adf4645cdfab42a5d5};
+: ${PKG_LIBEPOXY_VERSION:=1.5.0};
+: ${PKG_LIBEPOXY_URL:=https://github.com/anholt/libepoxy/releases/download/${PKG_LIBEPOXY_VERSION}/libepoxy-${PKG_LIBEPOXY_VERSION}.tar.xz};
+: ${PKG_LIBEPOXY_CONFIGURE_ARGS_EXTRA:="--enable-egl=no"};
 : ${PKG_GTK2_SHA256SUM:=68c1922732c7efc08df4656a5366dcc3afdc8791513400dac276009b40954658};
 : ${PKG_GTK2_VERSION:=2.24.31};
 : ${PKG_GTK2_URL:=http://ftp.gnome.org/pub/gnome/sources/gtk+/${PKG_GTK2_VERSION%.*}/gtk+-${PKG_GTK2_VERSION}.tar.xz};
 : ${PKG_GTK2_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include/freetype2 -I${PREFIX_NATIVE}/include/pango-1.0 -I${PREFIX_NATIVE}/include/gdk-pixbuf-2.0 -I${PREFIX_NATIVE}/include/atk-1.0 -I${PREFIX_NATIVE}/include/cairo -I${PREFIX_NATIVE}/include/glib-2.0 -I${PREFIX_NATIVE}/include/glib-2.0/gio -I${PREFIX_NATIVE}/lib/glib-2.0/include"};
 : ${PKG_GTK2_CONFIGURE_ARGS_EXTRA:="--disable-cups --disable-papi"};
+: ${PKG_GTK3_SHA256SUM:=d299612b018cfed7b2c689168ab52b668023708e17c335eb592260d186f15e1f};
+: ${PKG_GTK3_VERSION:=3.22.28};
+: ${PKG_GTK3_URL:=https://download.gnome.org/sources/gtk+/${PKG_GTK3_VERSION%.*}/gtk+-${PKG_GTK3_VERSION}.tar.xz};
+: ${PKG_GTK3_CONFIGURE_ARGS_EXTRA:="--disable-cups --disable-papi --disable-cloudprint --enable-gtk2-dependency"};
+: ${PKG_GTK3_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include/freetype2 -I${PREFIX_NATIVE}/include/harfbuzz"};
 : ${PKG_IMLIB2_SHA256SUM:=3f698cd285cbbfc251c1d6405f249b99fafffafa5e0a5ecf0ca7ae49bbc0a272};
 : ${PKG_IMLIB2_VERSION:=1.4.10};
 : ${PKG_IMLIB2_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/imlib2/imlib2-${PKG_IMLIB2_VERSION}.tar.bz2};