Hello community, here is the log from the commit of package gluegen2 for openSUSE:Factory checked in at 2015-10-19 22:50:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gluegen2 (Old) and /work/SRC/openSUSE:Factory/.gluegen2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gluegen2" Changes: -------- --- /work/SRC/openSUSE:Factory/gluegen2/gluegen2.changes 2015-09-02 00:36:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gluegen2.new/gluegen2.changes 2015-10-20 00:04:17.000000000 +0200 @@ -1,0 +2,12 @@ +Sun Oct 11 16:43:59 UTC 2015 - badshah...@gmail.com + +- Update to version 2.3.2: + + See http://jogamp.org/deployment/v2.3.2/archive/ChangeLogs/gluegen-ShortLog-v2.3.2.txt + for a list of changes. +- Upstream switched to using tar.xz for source tarballs; adapt + %setup acordingly, drop p7zip BuildRequires. +- Add gluegen2-no-static-libstdc++.patch to prevent the buildtools + from adding a "-static-libstdc++" option to linker, adding this + flag causes builds to fail. + +------------------------------------------------------------------- Old: ---- gluegen-v2.3.1.tar.7z jcpp-v2.3.1.tar.7z New: ---- gluegen-v2.3.2.tar.xz gluegen2-no-static-libstdc++.patch jcpp-v2.3.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gluegen2.spec ++++++ --- /var/tmp/diff_new_pack.fcpFQs/_old 2015-10-20 00:04:20.000000000 +0200 +++ /var/tmp/diff_new_pack.fcpFQs/_new 2015-10-20 00:04:20.000000000 +0200 @@ -19,14 +19,14 @@ %define src_name gluegen-v%{version} %define jcppsrc_name jcpp-v%{version} Name: gluegen2 -Version: 2.3.1 +Version: 2.3.2 Release: 0 Summary: Tool for automatic generation the Java and JNI code License: BSD-2-Clause Group: Development/Libraries/Java Url: http://jogamp.org/gluegen/www/ -Source0: http://jogamp.org/deployment/v%{version}/archive/Sources/%{src_name}.tar.7z -Source1: http://jogamp.org/deployment/v%{version}/archive/Sources/%{jcppsrc_name}.tar.7z +Source0: http://jogamp.org/deployment/v%{version}/archive/Sources/%{src_name}.tar.xz +Source1: http://jogamp.org/deployment/v%{version}/archive/Sources/%{jcppsrc_name}.tar.xz Patch0: gluegen2-jar-paths.patch Patch1: gluegen2-0001-renamed-library.patch Patch2: gluegen2-0003-disable-executable-tmp-tests.patch @@ -35,6 +35,8 @@ # PATCH-FIX-OPENSUSE gluegen2-disable-tests.patch badshah...@gmail.com -- Remove junit tests from the "all" targets as this requires additional dependencies (jardiff) Patch5: gluegen2-disable-tests.patch Patch6: gluegen2-add-ppc64-aarch64.patch +# PATCH-FIX-UPSTREAM gluegen2-no-static-libstdc++.patch badshah...@gmail.com -- Do not use -static-libstdc++ option for linker, causes build failures +Patch7: gluegen2-no-static-libstdc++.patch BuildRequires: ant BuildRequires: ant-antlr BuildRequires: ant-contrib @@ -44,7 +46,6 @@ BuildRequires: java-devel BuildRequires: javapackages-tools BuildRequires: junit >= 4.8 -BuildRequires: p7zip Requires: java Requires: javapackages-tools BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -75,16 +76,8 @@ This package contains gluegen source code needed to build packages. %prep -# Manual setup for 7z compressed archive -%setup -q -c -T -n %{src_name} -cd .. -%{_bindir}/7za e -y %{SOURCE0} -tar -xf %{src_name}.tar -%{_bindir}/7za e -y %{SOURCE1} -tar -xf %{jcppsrc_name}.tar -rm %{src_name}.tar -rm %{jcppsrc_name}.tar -cd %{src_name} +%setup -q -n %{jcppsrc_name} -T -b 1 +%setup -q -n %{src_name} -T -b 0 cp -pr ../%{jcppsrc_name}/src ./jcpp/ %patch0 -p1 @@ -93,6 +86,7 @@ %patch3 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 # Fix wrong-script-end-of-line-encoding rm make/scripts/*.bat ++++++ gluegen2-add-ppc64-aarch64.patch ++++++ --- /var/tmp/diff_new_pack.fcpFQs/_old 2015-10-20 00:04:20.000000000 +0200 +++ /var/tmp/diff_new_pack.fcpFQs/_new 2015-10-20 00:04:20.000000000 +0200 @@ -13,11 +13,11 @@ make/gluegen-cpptasks-base.xml | 70 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 87 insertions(+), 3 deletions(-) -Index: gluegen-v2.3.1/make/build.xml +Index: gluegen-v2.3.2/make/build.xml =================================================================== ---- gluegen-v2.3.1.orig/make/build.xml -+++ gluegen-v2.3.1/make/build.xml -@@ -307,6 +307,24 @@ +--- gluegen-v2.3.2.orig/make/build.xml ++++ gluegen-v2.3.2/make/build.xml +@@ -306,6 +306,24 @@ <property name="linker.cfg.id" value="linker.cfg.linux.ppc" /> </target> @@ -42,19 +42,19 @@ <target name="declare.linux.s390" if="isLinuxs390"> <echo message="Linux.s390" /> <property name="compiler.cfg.id" value="compiler.cfg.linux" /> -@@ -325,7 +343,7 @@ +@@ -324,7 +342,7 @@ <property name="linker.cfg.id" value="linker.cfg.linux.sparc" /> </target> - <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6" if="isLinux" > + <target name="declare.linux" depends="declare.linux.x86,declare.linux.amd64,declare.linux.ia64,declare.linux.hppa,declare.linux.mips,declare.linux.mipsel,declare.linux.ppc,declare.linux.ppc64,declare.linux.ppc64le,declare.linux.s390,declare.linux.s390x,declare.linux.sparc,declare.linux.armv6,declare.linux.aarch64" if="isLinux" > <property name="c.src.dir.os" value="unix" /> - <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" /> </target> -Index: gluegen-v2.3.1/make/gluegen-cpptasks-base.xml + +Index: gluegen-v2.3.2/make/gluegen-cpptasks-base.xml =================================================================== ---- gluegen-v2.3.1.orig/make/gluegen-cpptasks-base.xml -+++ gluegen-v2.3.1/make/gluegen-cpptasks-base.xml +--- gluegen-v2.3.2.orig/make/gluegen-cpptasks-base.xml ++++ gluegen-v2.3.2/make/gluegen-cpptasks-base.xml @@ -43,11 +43,14 @@ - isLinuxARM64 - isLinuxARMv6Armel (set in gluegen.cpptasks.detected.os.2) @@ -163,7 +163,7 @@ <linker id="linker.cfg.linux.s390" name="${gcc.compat.compiler}"> </linker> -@@ -1497,6 +1549,20 @@ +@@ -1505,6 +1557,20 @@ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/ppc" /> </target> @@ -184,12 +184,12 @@ <target name="gluegen.cpptasks.declare.compiler.linux.s390" if="isLinuxs390"> <echo message="Linux.s390" /> <property name="compiler.cfg.id.base" value="compiler.cfg.linux" /> -@@ -1518,7 +1584,7 @@ +@@ -1526,7 +1592,7 @@ <property name="java.lib.dir.platform" value="${java.home.dir}/jre/lib/sparc" /> </target> - <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv6,gluegen.cpptasks.declare.compiler.linux.aarch64,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.hppa,gluegen.cpptasks.declare.compiler.linux.mips,gluegen.cpptasks.declare.compiler.linux.mipsel,gluegen.cpptasks.declare.compiler.linux.ppc,gluegen.cpptasks.declare.compiler.linux.s390,gluegen.cpptasks.declare.compiler.linux.s390x,gluegen.cpptasks.declare.compiler.linux.sparc" if="isLinux"> + <target name="gluegen.cpptasks.declare.compiler.linux" depends="gluegen.cpptasks.declare.compiler.linux.x86,gluegen.cpptasks.declare.compiler.linux.amd64,gluegen.cpptasks.declare.compiler.linux.ia64,gluegen.cpptasks.declare.compiler.linux.armv6,gluegen.cpptasks.declare.compiler.linux.aarch64,gluegen.cpptasks.declare.compiler.linux.alpha,gluegen.cpptasks.declare.compiler.linux.hppa,gluegen.cpptasks.declare.compiler.linux.mips,gluegen.cpptasks.declare.compiler.linux.mipsel,gluegen.cpptasks.declare.compiler.linux.ppc,gluegen.cpptasks.declare.compiler.linux.ppc64,gluegen.cpptasks.declare.compiler.linux.ppc64le,gluegen.cpptasks.declare.compiler.linux.s390,gluegen.cpptasks.declare.compiler.linux.s390x,gluegen.cpptasks.declare.compiler.linux.sparc" if="isLinux"> - <property name="java.includes.dir.platform" value="${java.includes.dir}/linux" /> + <property name="java.includes.dir.platform" value="${java.includes.dir}/x11" /> </target> ++++++ gluegen2-no-static-libstdc++.patch ++++++ Index: gluegen-v2.3.2/make/gluegen-cpptasks-base.xml =================================================================== --- gluegen-v2.3.2.orig/make/gluegen-cpptasks-base.xml +++ gluegen-v2.3.2/make/gluegen-cpptasks-base.xml @@ -1218,19 +1218,16 @@ <linker id="linker.cfg.linux" name="${gcc.compat.compiler}"> <linkerarg value="-static-libgcc" if="isGCC"/> - <linkerarg value="-static-libstdc++" if="isGCC"/> </linker> <linker id="linker.cfg.linux.x86" name="${gcc.compat.compiler}"> <linkerarg value="-m32"/> <linkerarg value="-static-libgcc" if="isGCC"/> - <linkerarg value="-static-libstdc++" if="isGCC"/> </linker> <linker id="linker.cfg.linux.amd64" name="${gcc.compat.compiler}"> <linkerarg value="-m64"/> <linkerarg value="-static-libgcc" if="isGCC"/> - <linkerarg value="-static-libstdc++" if="isGCC"/> </linker> <!-- Using default compiler settings - utilize: @@ -1242,7 +1239,6 @@ <linkerarg value="-nostdlib" /> <linkerarg value="-Bdynamic" /> <linkerarg value="-static-libgcc" if="isGCC"/> - <linkerarg value="-static-libstdc++" if="isGCC"/> </linker> <linker id="linker.cfg.linux.aarch64" name="${gcc.compat.compiler}"> @@ -1250,7 +1246,6 @@ <linkerarg value="-nostdlib" /> <linkerarg value="-Bdynamic" /> <linkerarg value="-static-libgcc" if="isGCC"/> - <linkerarg value="-static-libstdc++" if="isGCC"/> </linker> <linker id="linker.cfg.linux.alpha" name="${gcc.compat.compiler}"> @@ -1297,19 +1292,16 @@ <linker id="linker.cfg.solaris" name="${gcc.compat.compiler}"> <linkerarg value="-m32"/> <linkerarg value="-static-libgcc" if="isGCC"/> - <linkerarg value="-static-libstdc++" if="isGCC"/> </linker> <linker id="linker.cfg.solaris.sparcv9" name="${gcc.compat.compiler}"> <linkerarg value="-xarch=v9a" /> <linkerarg value="-static-libgcc" if="isGCC"/> - <linkerarg value="-static-libstdc++" if="isGCC"/> </linker> <linker id="linker.cfg.solaris.amd64" name="${gcc.compat.compiler}"> <linkerarg value="-m64"/> <linkerarg value="-static-libgcc" if="isGCC"/> - <linkerarg value="-static-libstdc++" if="isGCC"/> <!-- linkerarg value="-xarch=amd64" / --> </linker> @@ -1325,7 +1317,6 @@ <linkerarg value="x86_64" if="use.macosx64"/> <linkerarg value="-mmacosx-version-min=10.5"/> <linkerarg value="-static-libgcc" if="isGCC"/> - <linkerarg value="-static-libstdc++" if="isGCC"/> <!-- Note: Apple doesn't seem to provide ppc64 binaries on Leopard --> </linker> @@ -1335,7 +1326,6 @@ <linker id="linker.cfg.linux64.mingw64" classname="net.sf.antcontrib.cpptasks.gcc.GccLinker"> <linkerarg value="-m64"/> <linkerarg value="-static-libgcc" if="isGCC"/> - <linkerarg value="-static-libstdc++" if="isGCC"/> </linker> <!--linker id="linker.cfg.linux64.mingw32" classname="net.sf.antcontrib.cpptasks.gcc.Gcc32Linker"--> @@ -1343,7 +1333,6 @@ <linkerarg value="-m32"/> <linkerarg value="-Wl,--kill-at" /> <!-- remove @ from function names, ie no __stdcall @nn --> <linkerarg value="-static-libgcc" if="isGCC"/> - <linkerarg value="-static-libstdc++" if="isGCC"/> </linker> <linker id="linker.cfg.win32.mingw" name="${gcc.compat.compiler}" incremental="false"> @@ -1352,7 +1341,6 @@ <linkerarg value="-Wl,--enable-stdcall-fixup"/> <!-- for linking against dll directly --> <linkerarg value="-Wl,--kill-at" /> <!-- remove @ from function names, ie no __stdcall @nn --> <linkerarg value="-static-libgcc" if="isGCC"/> - <linkerarg value="-static-libstdc++" if="isGCC"/> </linker> <linker id="linker.cfg.win64.mingw" name="${gcc.compat.compiler}" incremental="false"> @@ -1361,7 +1349,6 @@ <linkerarg value="-Wl,--enable-stdcall-fixup"/> <!-- for linking against dll directly --> <linkerarg value="-Wl,--kill-at" /> <!-- remove @ from function names, ie no __stdcall @nn --> <linkerarg value="-static-libgcc" if="isGCC"/> - <linkerarg value="-static-libstdc++" if="isGCC"/> </linker> <linker id="linker.cfg.win32.msvc" name="msvc" incremental="false">
