summaryrefslogtreecommitdiffhomepage
path: root/patches/gtk2-2.24.31.local.patch
blob: fe47cd61cef2e80140c9d2db984fb367afeabf47 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
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 -lglib-2.0 -lgobject-2.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 perf
 SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
 
 # require automake 1.4

--- gtk+-2.24.31/configure.orig	2016-09-09 19:33:11.000000000 +0000
+++ gtk+-2.24.31/configure	2017-11-28 09:52:56.536000000 +0000
@@ -24351,7 +24351,7 @@
 GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
 ATK_PREFIX="`$PKG_CONFIG --variable=prefix atk`"
 PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`"
-CAIRO_PREFIX="`pkg-config --variable=prefix cairo`"
+CAIRO_PREFIX="`$PKG_CONFIG --variable=prefix cairo`"