diff options
| -rw-r--r-- | patches/gtk2-2.24.31.local.patch | 28 | ||||
| -rw-r--r-- | vars/build.vars | 2 |
2 files changed, 1 insertions, 29 deletions
diff --git a/patches/gtk2-2.24.31.local.patch b/patches/gtk2-2.24.31.local.patch index 8022794e..fe47cd61 100644 --- a/patches/gtk2-2.24.31.local.patch +++ b/patches/gtk2-2.24.31.local.patch @@ -1,31 +1,3 @@ -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 diff --git a/vars/build.vars b/vars/build.vars index f175fddc..4b7c822d 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -666,7 +666,7 @@ NATIVE_PACKAGES_DEPS_X11_PYTHON="${PREFIX}/bin/python"; : ${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_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_IMLIB2_SHA256SUM:=3f698cd285cbbfc251c1d6405f249b99fafffafa5e0a5ecf0ca7ae49bbc0a272}; : ${PKG_IMLIB2_VERSION:=1.4.10}; |