[Debian-Islamic-maintainers] Bug#879156: zekr: Transition to SWT 4

[Emmanuel Bourg]

Package: zekr
Version: 1.1.0+repack-2
Severity: important

Hi,

zekr depends on libswt-gtk-3-java which is going to be removed
in a near future. Could you please apply the patch provided to build
with libswt-gtk-4-java instead?

Thank you,

Emmanuel Bourg
-------------- next part --------------
diff --git a/debian/control b/debian/control
index 520b0d5..cd03d28 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends-Indep:
  liblog4j1.2-java (>= 1.2.8),
  liblucene3-java,
  velocity (>= 1.4),
- libswt-gtk-3-java,
+ libswt-gtk-4-java,
  libjlayer-java,
  libcommons-codec-java,
  libbasicplayer-java,
@@ -38,9 +38,9 @@ Architecture: all
 Depends:
  ${misc:Depends},
  ${java:Depends},
- libswt-cairo-gtk-3-jni,
- libswt-gnome-gtk-3-jni,
- libswt-webkit-gtk-3-jni | libswt-mozilla-gtk-3-jni,
+ libswt-cairo-gtk-4-jni,
+ libswt-gnome-gtk-4-jni,
+ libswt-webkit-gtk-4-jni,
  zenity,
  libjs-jquery,
  fonts-sil-scheherazade | fonts-kacst | fonts-farsiweb
diff --git a/debian/patches/02_build_xml.patch b/debian/patches/02_build_xml.patch
index e878a02..1282985 100644
--- a/debian/patches/02_build_xml.patch
+++ b/debian/patches/02_build_xml.patch
@@ -21,10 +21,11 @@ Author: Mohammad Derakhshani <mohammad at zekr.org>
  
  	<!-- Excevution tags -->
  	<property name="debug" value="off" />
-@@ -32,28 +31,28 @@
+@@ -31,29 +30,29 @@
+ 	<property name="dist_javadocs" value="${builddir}/${javadocsdir}" />
  
  	<!-- JAR file dependencies -->
- 	<property name="swt.jar" value="${libdir}/swt.jar" />
+-	<property name="swt.jar" value="${libdir}/swt.jar" />
 -	<property name="velocity.jar" value="${libdir}/velocity-1.6.2.jar" />
 -	<property name="log4j.jar" value="${libdir}/log4j-1.2.8.jar" />
 -	<property name="lucene-core.jar" value="${libdir}/lucene-core-3.0.0.jar" />
@@ -47,6 +48,7 @@ Author: Mohammad Derakhshani <mohammad at zekr.org>
 -    <property name="mp3spi.jar" value="${libdir}/mp3spi-1.9.4.jar" />
 -	<property name="jspeex.jar" value="${libdir}/jspeex-0.9.7.jar" />
 -	<property name="jorbis.jar" value="${libdir}/jorbis-0.0.17.jar" />
++	<property name="swt.jar" value="${libdir}/swt4.jar" />
 +	<property name="velocity.jar" value="${libdir}/velocity.jar" />
 +	<property name="log4j.jar" value="${libdir}/log4j-1.2.jar" />
 +	<property name="lucene-core.jar" value="${libdir}/lucene3-core.jar" />
diff --git a/debian/zekr.sh b/debian/zekr.sh
index 20305fa..2d60538 100644
--- a/debian/zekr.sh
+++ b/debian/zekr.sh
@@ -94,7 +94,7 @@ fi
 run () {
 MAIN_CLASS=net.sf.zekr.ZekrMain
 JRE_OPT=-Djava.library.path=/usr/lib/jni/
-CLASS_PATH=/usr/share/java/log4j-1.2.jar:/usr/share/java/swt.jar:/usr/share/java/commons-collections3.jar:/usr/share/java/commons-codec.jar:/usr/share/java/commons-configuration.jar:/usr/share/java/commons-lang.jar:/usr/share/java/commons-io.jar:/usr/share/java/commons-logging.jar:/usr/share/java/velocity.jar:/usr/share/java/lucene3-highlighter.jar:/usr/share/java/lucene3-core.jar:/usr/share/java/lucene3-analyzers.jar:/usr/share/java/lucene3-memory.jar:/usr/share/java/lucene3-misc.jar:/usr/share/java/jl.jar:/usr/share/java/basicplayer.jar:/usr/share/java/tritonus_share.jar:/usr/share/java/jorbis.jar:/usr/share/java/jogg.jar:/usr/share/java/jspeex.jar:/usr/share/java/mp3spi.jar:/usr/share/java/vorbisspi.jar:dist/zekr.jar:
+CLASS_PATH=/usr/share/java/log4j-1.2.jar:/usr/share/java/swt4.jar:/usr/share/java/commons-collections3.jar:/usr/share/java/commons-codec.jar:/usr/share/java/commons-configuration.jar:/usr/share/java/commons-lang.jar:/usr/share/java/commons-io.jar:/usr/share/java/commons-logging.jar:/usr/share/java/velocity.jar:/usr/share/java/lucene3-highlighter.jar:/usr/share/java/lucene3-core.jar:/usr/share/java/lucene3-analyzers.jar:/usr/share/java/lucene3-memory.jar:/usr/share/java/lucene3-misc.jar:/usr/share/java/jl.jar:/usr/share/java/basicplayer.jar:/usr/share/java/tritonus_share.jar:/usr/share/java/jorbis.jar:/usr/share/java/jogg.jar:/usr/share/java/jspeex.jar:/usr/share/java/mp3spi.jar:/usr/share/java/vorbisspi.jar:dist/zekr.jar:
 VM_ARGS="-Xms10m -Xmx80m ${EXTRA_VM_ARGS}"
 
 "$ZEKR_JAVA_CMD" $VM_ARGS -cp "$CLASS_PATH" $JRE_OPT $MAIN_CLASS $*