aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2014-04-04 07:58:33 (EDT)
committerAlexander Kurtakov2014-04-04 07:58:33 (EDT)
commit303bc451db63825aaa5c4bc5a4ce37bcc41bb271 (patch)
treef5d5b6c184c1bbdf1912106c968481c645286fcf
parent96675bcf5baf23c96b8cf86f8de4ffb2f11055ec (diff)
downloadeclipse.platform.swt-303bc451db63825aaa5c4bc5a4ce37bcc41bb271.zip
eclipse.platform.swt-303bc451db63825aaa5c4bc5a4ce37bcc41bb271.tar.gz
eclipse.platform.swt-303bc451db63825aaa5c4bc5a4ce37bcc41bb271.tar.xz
Bug 431789 - PrintDialog.open crashes with GTK 3.10refs/changes/42/24442/1
Add gtk+-unix-print cflags to build files for aix. Change-Id: Ic41f34e508041eee4bb8ffd528996dbd1b46e568 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_aix.mak5
1 files changed, 3 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_aix.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_aix.mak
index 5dc0ca5..0df50bf 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_aix.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_aix.mak
@@ -14,6 +14,7 @@
include make_common.mak
SWT_VERSION=$(maj_ver)$(min_ver)
+GTK_VERSION?=2.0
# Define the various shared libraries to be build.
WS_PREFIX = gtk
@@ -38,7 +39,7 @@ GLX_LIB = lib$(GLX_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).a
CAIROCFLAGS = `pkg-config --cflags cairo`
CAIROLIBS = `pkg-config --libs cairo` -lcairo
-GTKCFLAGS = `pkg-config --cflags gtk+-2.0`
+GTKCFLAGS = `pkg-config --cflags gtk+-2.0 gtk+-unix-print-$(GTK_VERSION)`
GTKLIBS = `pkg-config --libs gtk+-2.0 gthread-2.0` $(XLIB64) -L/usr/X11R6/lib -lXtst -lX11
CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
@@ -46,7 +47,7 @@ CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
AWT_LFLAGS = -shared -s ${SWT_LFLAGS}
AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt -lX11
-ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0`
+ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0 gtk+-unix-print-$(GTK_VERSION)`
ATKLIBS = `pkg-config --libs atk gtk+-2.0`
GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`