aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2014-04-04 04:58:14 -0400
committerAlexander Kurtakov2014-04-04 04:58:14 -0400
commit96675bcf5baf23c96b8cf86f8de4ffb2f11055ec (patch)
tree60fb9d19e796f9b60f8c0daf7f6aca98f10e9ffc
parentfdc33a723aa604a4f9e0308d0c0a8d79e6a49e8f (diff)
downloadeclipse.platform.swt-96675bcf5baf23c96b8cf86f8de4ffb2f11055ec.zip
eclipse.platform.swt-96675bcf5baf23c96b8cf86f8de4ffb2f11055ec.tar.gz
eclipse.platform.swt-96675bcf5baf23c96b8cf86f8de4ffb2f11055ec.tar.xz
Bug 431789 - PrintDialog.open crashes with GTK 3.10
Add gtk+-unix-print cflags to build files for other unixes. Change-Id: Iac93ef7628157091860bed7b4084fcb93b1ff31d Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak5
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_hpux.mak5
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris.mak5
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris_x86.mak5
4 files changed, 12 insertions, 8 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak
index 0bf9416..d2da90e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.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
@@ -45,7 +46,7 @@ CAIROCFLAGS = `pkg-config --cflags cairo`
CAIROLIBS = `pkg-config --libs-only-L cairo` -lcairo
# Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0)
-GTKCFLAGS = `pkg-config --cflags gtk+-2.0`
+GTKCFLAGS = `pkg-config --cflags gtk+-2.0 gtk+-unix-print-$(GTK_VERSION)`
GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L/usr/X11R6/lib $(XLIB64) -lXtst
CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
@@ -53,7 +54,7 @@ CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
AWT_LFLAGS = -shared
AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt
-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-only-L atk gtk+-2.0` -latk-1.0 -lgtk-x11-2.0
GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_hpux.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_hpux.mak
index b6d0f30..55a8e99 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_hpux.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_hpux.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).so
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
@@ -47,7 +48,7 @@ AWT_LFLAGS = -shared -s ${SWT_LFLAGS}
AWT_LIBS = -L$(AWT_LIB_PATH) -L$(AWT_LIB_PATH)/server -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`
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris.mak
index 308e1c4..aa7f78d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris.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
@@ -45,7 +46,7 @@ CAIROCFLAGS = `pkg-config --cflags cairo`
CAIROLIBS = `pkg-config --libs-only-L cairo` -lcairo
# Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0)
-GTKCFLAGS = `pkg-config --cflags gtk+-2.0`
+GTKCFLAGS = `pkg-config --cflags gtk+-2.0 gtk+-unix-print-$(GTK_VERSION)`
GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L/usr/openwin/lib -Wl,-R -Wl,/usr/openwin/lib -lXtst
CDE_LIBS = -L$(CDE_HOME)/lib$(SWT_CDE_64SUFFIX) -R$(CDE_HOME)/lib$(SWT_CDE_64SUFFIX) -lXt -lX11 -lDtSvc
@@ -53,7 +54,7 @@ CDE_LIBS = -L$(CDE_HOME)/lib$(SWT_CDE_64SUFFIX) -R$(CDE_HOME)/lib$(SWT_CDE_64SUF
AWT_LFLAGS = -G -s $(SWT_LFLAGS)
AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt
-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-only-L atk gtk+-2.0` -latk-1.0 -lgtk-x11-2.0
GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris_x86.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris_x86.mak
index e0a3896..e0e8b33 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris_x86.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris_x86.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
@@ -45,7 +46,7 @@ CAIROCFLAGS = `pkg-config --cflags cairo`
CAIROLIBS = `pkg-config --libs-only-L cairo` -lcairo
# Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0)
-GTKCFLAGS = `pkg-config --cflags gtk+-2.0`
+GTKCFLAGS = `pkg-config --cflags gtk+-2.0 gtk+-unix-print-$(GTK_VERSION)`
GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L/usr/X11R6/lib $(XLIB64) -lXtst
CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
@@ -53,7 +54,7 @@ CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
AWT_LFLAGS = -G
AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt
-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-only-L atk gtk+-2.0` -latk-1.0 -lgtk-x11-2.0
GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`