Tony Mancill pushed to branch master at Debian Java Maintainers / swt-gtk
Commits: 95ed4c96 by tony mancill at 2019-01-07T05:29:29Z Add patch for 32-bit builds (Closes: #904754) - - - - - e257f23e by tony mancill at 2019-01-07T05:56:38Z prepare changelog for upload to unstable - - - - - 3 changed files: - debian/changelog - + debian/patches/0004-Use-is64-defined-for-build.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +swt4-gtk (4.10.0-3) unstable; urgency=medium + + * Team upload. + * Patch build system to respect DEB_HOST_ARCH_BITS value passed to it. + Fixes runtime problem with 32-bit builds. (Closes: #904754) + + -- tony mancill <[email protected]> Sun, 06 Jan 2019 20:59:52 -0800 + swt4-gtk (4.10.0-2) unstable; urgency=medium * Team upload. ===================================== debian/patches/0004-Use-is64-defined-for-build.patch ===================================== @@ -0,0 +1,28 @@ +From: tony mancill <[email protected]> +Subject: Use the value of is64 defined by the build +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=904754 + +--- a/bundles/org.eclipse.swt/buildFragment.xml ++++ b/bundles/org.eclipse.swt/buildFragment.xml +@@ -234,20 +234,10 @@ + </target> + + <target name="is64"> +- <condition property="is64" value="true"> +- <or> +- <equals arg1="${swt.arch}" arg2="x86_64"/> +- <equals arg1="${swt.arch}" arg2="ia64"/> +- <equals arg1="${swt.arch}" arg2="ppc64le"/> +- <equals arg1="${swt.arch}" arg2="s390x"/> +- <equals arg1="${swt.arch}" arg2="sparcv9"/> +- <equals arg1="${swt.arch}" arg2="aarch64"/> +- </or> +- </condition> + <echo>Is64=${is64}</echo> + </target> + +- <target name="replace64" depends="is64" unless="is64"> ++ <target name="replace64" depends="is64" unless="${is64}"> + <echo>Converting java files to 32 bit</echo> + <replace dir="${copy.src.dir}" includes="**/*.java" value="int /*long*/" token="long /*int*/"/> + <replace dir="${copy.src.dir}" includes="**/*.java" value="int[] /*long[]*/" token="long[] /*int[]*/"/> ===================================== debian/patches/series ===================================== @@ -1,3 +1,4 @@ 01-make_linux.patch search-usr-lib-jni.diff 0003-Set-javac-release-to-7-for-JDK-1.10-compatibility.patch +0004-Use-is64-defined-for-build.patch View it on GitLab: https://salsa.debian.org/java-team/swt-gtk/compare/3c294affe47a2f1a7aa56a495638562d76f55b9e...e257f23e26c8116d94bfa96be4fbac143c1ad01a -- View it on GitLab: https://salsa.debian.org/java-team/swt-gtk/compare/3c294affe47a2f1a7aa56a495638562d76f55b9e...e257f23e26c8116d94bfa96be4fbac143c1ad01a You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
