vars/build.vars: adds GTK+ v2.24.31 (via Redfoxmoon.)

2 files changed, 58 insertions, 1 deletions

diff --git a/patches/gtk+-2.24.31.local.patch b/patches/gtk+-2.24.31.local.patch
new file mode 100644
index 00000000..b1ea98fc
--- /dev/null
+++ b/patches/gtk+-2.24.31.local.patch
@@ -0,0 +1,53 @@
+diff -ru gtk+-2.24.31.orig/gtk/gtksettings.c gtk+-2.24.31/gtk/gtksettings.c
+--- gtk+-2.24.31.orig/gtk/gtksettings.c	2015-12-28 16:42:28.000000000 +0100
++++ gtk+-2.24.31/gtk/gtksettings.c	2017-10-20 00:12:56.784947298 +0200
+@@ -32,7 +32,7 @@
+ 
+ #ifdef GDK_WINDOWING_X11
+ #include "x11/gdkx.h"
+-#include <pango/pangofc-fontmap.h>
++#include <pango/pango-fontmap.h>
+ #endif
+ 
+ #ifdef GDK_WINDOWING_QUARTZ
+@@ -2354,13 +2354,14 @@
+       gboolean update_needed = FALSE;
+ 
+       /* bug 547680 */
++#ifndef __midipix__
+       if (PANGO_IS_FC_FONT_MAP (fontmap) && !FcConfigUptoDate (NULL))
+ 	{
+ 	  pango_fc_font_map_cache_clear (PANGO_FC_FONT_MAP (fontmap));
+ 	  if (FcInitReinitialize ())
+ 	    update_needed = TRUE;
+ 	}
+-
++#endif
+       last_update_timestamp = timestamp;
+       last_update_needed = update_needed;
+     }
+diff -ru gtk+-2.24.31.orig/gtk/Makefile.in gtk+-2.24.31/gtk/Makefile.in
+--- gtk+-2.24.31.orig/gtk/Makefile.in	2016-09-09 21:33:09.000000000 +0200
++++ gtk+-2.24.31/gtk/Makefile.in	2017-10-20 00:08:05.310575203 +0200
+@@ -1937,7 +1937,7 @@
+ libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
+ libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts)
+ libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts)
+-libgtk_x11_2_0_la_LIBADD = $(libadd)
++libgtk_x11_2_0_la_LIBADD = $(libadd) -latk-1.0
+ libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
+ libgtk_quartz_2_0_la_LIBADD = $(libadd)
+ libgtk_directfb_2_0_la_LIBADD = $(libadd)
+diff -ru gtk+-2.24.31.orig/Makefile.in gtk+-2.24.31/Makefile.in
+--- gtk+-2.24.31.orig/Makefile.in	2016-09-09 21:33:07.000000000 +0200
++++ gtk+-2.24.31/Makefile.in	2017-10-20 00:07:42.010704831 +0200
+@@ -564,7 +564,7 @@
+ 	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
+ 	&& DISPLAY=:$$XID && export DISPLAY
+ 
+-SRC_SUBDIRS = gdk gtk modules demos tests perf
++SRC_SUBDIRS = gdk gtk modules demos perf
+ SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
+ 
+ # require automake 1.4
+
diff --git a/vars/build.vars b/vars/build.vars
index 67f64aee..672e9600 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -262,7 +262,7 @@ libksba libudns lua ncurses ncursestw ncursesw npth popt ruby_host shared_mime_i
 LIB_PACKAGES_PACKAGES_X11="
 inputproto kbproto xcb_proto xproto fixesproto libXau libpthread_stubs xcb xextproto xtrans libX11
 libXext freetype fontconfig renderproto Xrender libXft libXfixes libXi libICE libSM libXt libXmu libXpm
-libXaw libxkbfile pixman cairo dbus pango atk gdk imlib2 libcaca";
+libXaw libxkbfile pixman cairo dbus pango atk gdk gtk2 imlib2 libcaca";
 LIB_PACKAGES_PACKAGES_LIBS="
 cmake llvm_host";
 LIB_PACKAGES_PACKAGES="
@@ -591,6 +591,10 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${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_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/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_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};