Conan_Kudo / build / midipix_build

Forked from build/midipix_build 4 years ago
Clone

Blame patches/gtk2-2.24.31.local.patch

Lucio Andrés Illanes Albornoz 54326a
diff -ru gtk+-2.24.31.orig/gtk/gtksettings.c gtk+-2.24.31/gtk/gtksettings.c
Lucio Andrés Illanes Albornoz 54326a
--- gtk+-2.24.31.orig/gtk/gtksettings.c	2015-12-28 16:42:28.000000000 +0100
Lucio Andrés Illanes Albornoz 54326a
+++ gtk+-2.24.31/gtk/gtksettings.c	2017-10-20 00:12:56.784947298 +0200
Lucio Andrés Illanes Albornoz 54326a
@@ -32,7 +32,7 @@
Lucio Andrés Illanes Albornoz 54326a
 
Lucio Andrés Illanes Albornoz 54326a
 #ifdef GDK_WINDOWING_X11
Lucio Andrés Illanes Albornoz 54326a
 #include "x11/gdkx.h"
Lucio Andrés Illanes Albornoz 54326a
-#include <pango/pangofc-fontmap.h>
Lucio Andrés Illanes Albornoz 54326a
+#include <pango/pango-fontmap.h>
Lucio Andrés Illanes Albornoz 54326a
 #endif
Lucio Andrés Illanes Albornoz 54326a
 
Lucio Andrés Illanes Albornoz 54326a
 #ifdef GDK_WINDOWING_QUARTZ
Lucio Andrés Illanes Albornoz 54326a
@@ -2354,13 +2354,14 @@
Lucio Andrés Illanes Albornoz 54326a
       gboolean update_needed = FALSE;
Lucio Andrés Illanes Albornoz 54326a
 
Lucio Andrés Illanes Albornoz 54326a
       /* bug 547680 */
Lucio Andrés Illanes Albornoz 54326a
+#ifndef __midipix__
Lucio Andrés Illanes Albornoz 54326a
       if (PANGO_IS_FC_FONT_MAP (fontmap) && !FcConfigUptoDate (NULL))
Lucio Andrés Illanes Albornoz 54326a
 	{
Lucio Andrés Illanes Albornoz 54326a
 	  pango_fc_font_map_cache_clear (PANGO_FC_FONT_MAP (fontmap));
Lucio Andrés Illanes Albornoz 54326a
 	  if (FcInitReinitialize ())
Lucio Andrés Illanes Albornoz 54326a
 	    update_needed = TRUE;
Lucio Andrés Illanes Albornoz 54326a
 	}
Lucio Andrés Illanes Albornoz 54326a
-
Lucio Andrés Illanes Albornoz 54326a
+#endif
Lucio Andrés Illanes Albornoz 54326a
       last_update_timestamp = timestamp;
Lucio Andrés Illanes Albornoz 54326a
       last_update_needed = update_needed;
Lucio Andrés Illanes Albornoz 54326a
     }
Lucio Andrés Illanes Albornoz 54326a
diff -ru gtk+-2.24.31.orig/gtk/Makefile.in gtk+-2.24.31/gtk/Makefile.in
Lucio Andrés Illanes Albornoz 54326a
--- gtk+-2.24.31.orig/gtk/Makefile.in	2016-09-09 21:33:09.000000000 +0200
Lucio Andrés Illanes Albornoz 54326a
+++ gtk+-2.24.31/gtk/Makefile.in	2017-10-20 00:08:05.310575203 +0200
Lucio Andrés Illanes Albornoz 54326a
@@ -1937,7 +1937,7 @@
Lucio Andrés Illanes Albornoz 54326a
 libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
Lucio Andrés Illanes Albornoz 54326a
 libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts)
Lucio Andrés Illanes Albornoz 54326a
 libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts)
Lucio Andrés Illanes Albornoz 54326a
-libgtk_x11_2_0_la_LIBADD = $(libadd)
Lucio Andrés Illanes Albornoz 54326a
+libgtk_x11_2_0_la_LIBADD = $(libadd) -latk-1.0
Lucio Andrés Illanes Albornoz 54326a
 libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
Lucio Andrés Illanes Albornoz 54326a
 libgtk_quartz_2_0_la_LIBADD = $(libadd)
Lucio Andrés Illanes Albornoz 54326a
 libgtk_directfb_2_0_la_LIBADD = $(libadd)
Lucio Andrés Illanes Albornoz 54326a
diff -ru gtk+-2.24.31.orig/Makefile.in gtk+-2.24.31/Makefile.in
Lucio Andrés Illanes Albornoz 54326a
--- gtk+-2.24.31.orig/Makefile.in	2016-09-09 21:33:07.000000000 +0200
Lucio Andrés Illanes Albornoz 54326a
+++ gtk+-2.24.31/Makefile.in	2017-10-20 00:07:42.010704831 +0200
Lucio Andrés Illanes Albornoz 54326a
@@ -564,7 +564,7 @@
Lucio Andrés Illanes Albornoz 54326a
 	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
Lucio Andrés Illanes Albornoz 54326a
 	&& DISPLAY=:$$XID && export DISPLAY
Lucio Andrés Illanes Albornoz 54326a
 
Lucio Andrés Illanes Albornoz 54326a
-SRC_SUBDIRS = gdk gtk modules demos tests perf
Lucio Andrés Illanes Albornoz (arab, vxp) b1166e
+SRC_SUBDIRS = gdk gtk modules perf
Lucio Andrés Illanes Albornoz 54326a
 SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
Lucio Andrés Illanes Albornoz 54326a
 
Lucio Andrés Illanes Albornoz 54326a
 # require automake 1.4
Lucio Andrés Illanes Albornoz 54326a