[swt-gtk] 01/01: Enable compatibility with GTK 2.0
Jakub Adam
xhaakon-guest at moszumanska.debian.org
Sat Apr 30 20:29:51 UTC 2016
This is an automated email from the git hooks/post-receive script.
xhaakon-guest pushed a commit to branch master-4.3
in repository swt-gtk.
commit 81441823602de2b68bce6e07f536c3ba55175c6e
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date: Mon Apr 25 17:00:28 2016 +0200
Enable compatibility with GTK 2.0
GTK 3.20 introduced some incompatible API changes causing broken UI in SWT.
Since SWT upstream hasn't released a fixed version yet, the only solution
for now is to enable legacy GTK 2.0 support and run affected applications
with SWT_GTK3=0.
---
debian/Makefile | 2 ++
debian/changelog | 11 +++++++++++
debian/control | 15 ++++++++++++++-
debian/libswt-gtk-4-jni.install | 2 +-
debian/libswt-gtk2-4-jni.install | 1 +
debian/patches/01-make_linux.patch | 35 ++++++++++++++++++++++-------------
6 files changed, 51 insertions(+), 15 deletions(-)
diff --git a/debian/Makefile b/debian/Makefile
index de12f49..40d6d74 100644
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -9,6 +9,8 @@ RM=rm -f
all: $(JAVA)
$(MAKE) -f make_linux.mak make_atk make_awt make_cairo make_glx \
make_gnome make_swt make_webkit
+ rm -f *.o
+ GTK_VERSION=2.0 $(MAKE) -f make_linux.mak make_swtpi
clean distclean:
$(RM) $(CLEANFILES)
diff --git a/debian/changelog b/debian/changelog
index a393c42..85155fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+swt4-gtk (4.5.0-3) UNRELEASED; urgency=medium
+
+ * Enable compatibility with GTK 2.0
+ - GTK 3.20 introduced some incompatible API changes causing broken UI in
+ SWT. Since SWT upstream hasn't released a fixed version yet, the only
+ solution for now is to enable legacy GTK 2.0 support and run affected
+ applications with SWT_GTK3=0. The GTK+ 2.0 version of SWT JNI
+ libraries is packaged as libswt-gtk2-4-jni.
+
+ -- Jakub Adam <jakub.adam at ktknet.cz> Mon, 25 Apr 2016 17:08:51 +0200
+
swt4-gtk (4.5.0-2) unstable; urgency=medium
* Install artifacts into /usr/share/maven-repo.
diff --git a/debian/control b/debian/control
index 6b29fe9..800c466 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Adrian Perez <blackxored at debian.org>,
أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>,
Jakub Adam <jakub.adam at ktknet.cz>
Build-Depends: default-jdk, libgnomeui-dev, libxt-dev, libglu1-mesa-dev, fastjar, cdbs,
- debhelper (>= 9), javahelper, maven-repo-helper, libgtk-3-dev
+ debhelper (>= 9), javahelper, maven-repo-helper, libgtk-3-dev, libgtk2.0-dev
Standards-Version: 3.9.7
Vcs-Git: https://anonscm.debian.org/git/pkg-java/swt-gtk.git
Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-java/swt-gtk.git
@@ -33,6 +33,19 @@ Description: Standard Widget Toolkit for GTK+ JNI library
.
This package includes the JNI libraries (atk, awt, gtk, pi).
+Package: libswt-gtk2-4-jni
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: libswt-gnome-gtk-4-jni
+Description: Standard Widget Toolkit for GTK+ JNI library
+ The Standard Widget Toolkit (SWT) is a fast and rich Java GUI toolkit.
+ For platforms with existing SWT implementations it provides efficient, portable
+ and fast access to native controls and user interface facilities.
+ .
+ This package includes legacy version of pi JNI library that uses GTK+ 2.0 as
+ its native GUI back end. Set environment variable SWT_GTK3=0 before launching
+ the SWT application to use it.
+
Package: libswt-gnome-gtk-4-jni
Architecture: any
Depends: libswt-gtk-4-jni (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/libswt-gtk-4-jni.install b/debian/libswt-gtk-4-jni.install
index 0b04923..38206d9 100644
--- a/debian/libswt-gtk-4-jni.install
+++ b/debian/libswt-gtk-4-jni.install
@@ -1,4 +1,4 @@
libswt-atk-*[0-9].so usr/lib/jni
libswt-awt-*[0-9].so usr/lib/jni
libswt-gtk-*[0-9].so usr/lib/jni
-libswt-pi*-*[0-9].so usr/lib/jni
+libswt-pi3-*[0-9].so usr/lib/jni
diff --git a/debian/libswt-gtk2-4-jni.install b/debian/libswt-gtk2-4-jni.install
new file mode 100644
index 0000000..f88273d
--- /dev/null
+++ b/debian/libswt-gtk2-4-jni.install
@@ -0,0 +1 @@
+libswt-pi-*[0-9].so usr/lib/jni
diff --git a/debian/patches/01-make_linux.patch b/debian/patches/01-make_linux.patch
index b34ab59..aee15f7 100644
--- a/debian/patches/01-make_linux.patch
+++ b/debian/patches/01-make_linux.patch
@@ -3,11 +3,11 @@ Date: Mon, 27 Jul 2015 18:12:00 +0200
Subject: make_linux
---
- make_linux.mak | 29 ++++++++++++++++-------------
- 1 file changed, 16 insertions(+), 13 deletions(-)
+ make_linux.mak | 31 ++++++++++++++++++-------------
+ 1 file changed, 18 insertions(+), 13 deletions(-)
diff --git a/make_linux.mak b/make_linux.mak
-index 9d3aa87..a75a23a 100644
+index 9d3aa87..340208e 100644
--- a/make_linux.mak
+++ b/make_linux.mak
@@ -75,6 +75,7 @@ GLXLIBS = -lGL -lGLU -lm
@@ -48,7 +48,16 @@ index 9d3aa87..a75a23a 100644
ifndef NO_STRIP
AWT_LFLAGS := $(AWT_LFLAGS) -s
MOZILLALFLAGS := $(MOZILLALFLAGS) -s
-@@ -145,7 +148,7 @@ callback.o: callback.c callback.h
+@@ -138,6 +141,8 @@ all: make_swt make_atk make_glx make_webkit
+ #
+ make_swt: $(SWT_LIB) $(SWTPI_LIB)
+
++make_swtpi: $(SWTPI_LIB)
++
+ $(SWT_LIB): $(SWT_OBJECTS)
+ $(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
+
+@@ -145,7 +150,7 @@ callback.o: callback.c callback.h
$(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c
$(SWTPI_LIB): $(SWTPI_OBJECTS)
@@ -57,7 +66,7 @@ index 9d3aa87..a75a23a 100644
swt.o: swt.c swt.h
$(CC) $(CFLAGS) -c swt.c
-@@ -164,7 +167,7 @@ os_stats.o: os_stats.c os_structs.h os.h os_stats.h swt.h
+@@ -164,7 +169,7 @@ os_stats.o: os_stats.c os_structs.h os.h os_stats.h swt.h
make_cairo: $(CAIRO_LIB)
$(CAIRO_LIB): $(CAIRO_OBJECTS)
@@ -66,7 +75,7 @@ index 9d3aa87..a75a23a 100644
cairo.o: cairo.c cairo.h swt.h
$(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
-@@ -180,7 +183,7 @@ cairo_stats.o: cairo_stats.c cairo_structs.h cairo.h cairo_stats.h swt.h
+@@ -180,7 +185,7 @@ cairo_stats.o: cairo_stats.c cairo_structs.h cairo.h cairo_stats.h swt.h
make_cde: $(CDE_LIB)
$(CDE_LIB): $(CDE_OBJECTS)
@@ -75,7 +84,7 @@ index 9d3aa87..a75a23a 100644
#
# AWT lib
-@@ -188,7 +191,7 @@ $(CDE_LIB): $(CDE_OBJECTS)
+@@ -188,7 +193,7 @@ $(CDE_LIB): $(CDE_OBJECTS)
make_awt:$(AWT_LIB)
$(AWT_LIB): $(AWT_OBJECTS)
@@ -84,7 +93,7 @@ index 9d3aa87..a75a23a 100644
#
# Atk lib
-@@ -196,7 +199,7 @@ $(AWT_LIB): $(AWT_OBJECTS)
+@@ -196,7 +201,7 @@ $(AWT_LIB): $(AWT_OBJECTS)
make_atk: $(ATK_LIB)
$(ATK_LIB): $(ATK_OBJECTS)
@@ -93,7 +102,7 @@ index 9d3aa87..a75a23a 100644
atk.o: atk.c atk.h
$(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
-@@ -213,7 +216,7 @@ atk_stats.o: atk_stats.c atk_structs.h atk_stats.h atk.h
+@@ -213,7 +218,7 @@ atk_stats.o: atk_stats.c atk_structs.h atk_stats.h atk.h
make_gnome: $(GNOME_LIB)
$(GNOME_LIB): $(GNOME_OBJECTS)
@@ -102,7 +111,7 @@ index 9d3aa87..a75a23a 100644
gnome.o: gnome.c
$(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c
-@@ -230,7 +233,7 @@ gnome_stats.o: gnome_stats.c gnome_stats.h
+@@ -230,7 +235,7 @@ gnome_stats.o: gnome_stats.c gnome_stats.h
make_mozilla:$(MOZILLA_LIB)
$(MOZILLA_LIB): $(MOZILLA_OBJECTS)
@@ -111,7 +120,7 @@ index 9d3aa87..a75a23a 100644
xpcom.o: xpcom.cpp
$(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
-@@ -250,7 +253,7 @@ xpcom_stats.o: xpcom_stats.cpp
+@@ -250,7 +255,7 @@ xpcom_stats.o: xpcom_stats.cpp
make_xulrunner:$(XULRUNNER_LIB)
$(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
@@ -120,7 +129,7 @@ index 9d3aa87..a75a23a 100644
xpcomxul.o: xpcom.cpp
$(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp
-@@ -277,7 +280,7 @@ xpcomxul_stats.o: xpcom_stats.cpp
+@@ -277,7 +282,7 @@ xpcomxul_stats.o: xpcom_stats.cpp
make_xpcominit:$(XPCOMINIT_LIB)
$(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
@@ -129,7 +138,7 @@ index 9d3aa87..a75a23a 100644
xpcominit.o: xpcominit.cpp
$(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
-@@ -311,7 +314,7 @@ webkit_stats.o: webkitgtk_stats.c webkitgtk_stats.h
+@@ -311,7 +316,7 @@ webkit_stats.o: webkitgtk_stats.c webkitgtk_stats.h
make_glx: $(GLX_LIB)
$(GLX_LIB): $(GLX_OBJECTS)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/swt-gtk.git
More information about the pkg-java-commits
mailing list