Hello community,
here is the log from the commit of package libjnidispatch for openSUSE:Factory
checked in at 2017-09-20 17:12:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libjnidispatch (Old)
and /work/SRC/openSUSE:Factory/.libjnidispatch.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libjnidispatch"
Wed Sep 20 17:12:37 2017 rev:17 rq:527333 version:4.5.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libjnidispatch/libjnidispatch.changes
2017-06-01 16:32:13.383449663 +0200
+++ /work/SRC/openSUSE:Factory/.libjnidispatch.new/libjnidispatch.changes
2017-09-20 17:12:47.548697770 +0200
@@ -1,0 +2,23 @@
+Tue Sep 19 14:53:38 UTC 2017 - fst...@suse.com
+
+- Upstream version 4.5.0
+- Removed patch:
+ * reproducible.patch
+ + integrated upstream
+- Added patch:
+ * jna-getpeer.patch
+ + upstream workaround to the inaccessibility of the getPeer
+ method
+ + Fix build with jdk9
+- Modified patch:
+ * jna-build.patch
+ + rediff to the new context
+
+-------------------------------------------------------------------
+Tue Sep 19 12:19:45 UTC 2017 - fst...@suse.com
+
+- Build with source and target levels 1.6
+- Force building with java-devel < 1.9, since the code uses APIs
+ removed in jdk9
+
+-------------------------------------------------------------------
Old:
----
4.2.2.tar.gz
reproducible.patch
New:
----
4.5.0.tar.gz
jna-getpeer.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libjnidispatch.spec ++++++
--- /var/tmp/diff_new_pack.kAzn5g/_old 2017-09-20 17:12:49.976356031 +0200
+++ /var/tmp/diff_new_pack.kAzn5g/_new 2017-09-20 17:12:49.976356031 +0200
@@ -18,7 +18,7 @@
Name: libjnidispatch
-Version: 4.2.2
+Version: 4.5.0
Release: 0
Summary: Java Native Access (shared library)
License: LGPL-2.1+ or Apache-2.0
@@ -28,18 +28,19 @@
Source1: jna-4.1.0.pom
Source2: libjnidispatch-rpmlintrc
Patch0: jna-build.patch
-Patch1: reproducible.patch
+Patch1: jna-getpeer.patch
BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: dos2unix
-BuildRequires: java-devel >= 1.5.0
+BuildRequires: fdupes
+BuildRequires: java-devel >= 1.6
BuildRequires: javapackages-local
BuildRequires: javapackages-tools
BuildRequires: junit
BuildRequires: libffi-devel
BuildRequires: xorg-x11-libX11-devel
BuildRequires: xorg-x11-libXt-devel
-Requires: java >= 1.5.0
+Requires: java >= 1.6
Provides: jna-native = %{version}-%{release}
Obsoletes: jna-native < %{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -83,24 +84,24 @@
find . -name '*jar' | xargs rm
rm -rf dist
dos2unix OTHERS
-# Then apply patches
+# Then apply patch
%patch0 -p1 -b .orig
%patch1 -p1
#FIXME: DirectTest fails
-rm test/com/sun/jna/DirectTest.java test/com/sun/jna/PerformanceTest.java
+#rm test/com/sun/jna/DirectTest.java test/com/sun/jna/PerformanceTest.java
sed -i 's|soname,\$@|soname,%{name}.so|' native/Makefile
%build
-
+build-jar-repository -s -p lib ant
ant \
jar \
native \
platform-jar \
-Dcflags_extra.native="%{optflags}" \
-Dbuild-native=true \
- -Dcompatibility=1.5 \
+ -Dcompatibility=1.6 \
-Ddynlink.native=true \
javadoc
@@ -124,6 +125,7 @@
install -d -m 755 %{buildroot}%{_javadocdir}/jna
cp -pr doc/javadoc/* %{buildroot}%{_javadocdir}/jna
+%fdupes -s %{buildroot}%{_javadocdir}/jna
%files
%defattr(0644,root,root,0755)
++++++ 4.2.2.tar.gz -> 4.5.0.tar.gz ++++++
/work/SRC/openSUSE:Factory/libjnidispatch/4.2.2.tar.gz
/work/SRC/openSUSE:Factory/.libjnidispatch.new/4.5.0.tar.gz differ: char 12,
line 1
++++++ jna-build.patch ++++++
--- /var/tmp/diff_new_pack.kAzn5g/_old 2017-09-20 17:12:50.028348712 +0200
+++ /var/tmp/diff_new_pack.kAzn5g/_new 2017-09-20 17:12:50.032348149 +0200
@@ -1,17 +1,15 @@
-Index: jna-4.1.0/build.xml
-===================================================================
---- jna-4.1.0.orig/build.xml
-+++ jna-4.1.0/build.xml
-@@ -290,7 +290,7 @@
+--- jna-4.5.0/build.xml 2017-09-13 22:12:57.000000000 +0200
++++ jna-4.5.0/build.xml 2017-09-19 16:29:45.193799835 +0200
+@@ -337,7 +337,7 @@
<target name="-setup" depends="-dynamic-properties">
<path id="compile-test.path">
<path id="test.libs">
- <fileset dir="lib">
+ <fileset dir="/usr/share/java">
<include name="junit.jar"/>
+ <include name="hamcrest-core-1.3.jar"/>
</fileset>
- <fileset dir="lib/test"/>
-@@ -332,7 +332,7 @@
+@@ -382,7 +382,7 @@
</srcfiles>
</uptodate>
</target>
@@ -20,7 +18,7 @@
description="Build primary jar">
<!-- Bundle native components with primary jar to facilitate
easy distribution to common platforms.
-@@ -379,137 +379,10 @@
+@@ -414,152 +414,10 @@
<!-- Note that no terminal "*" is included in this list,
which will force failure on unsupported platforms.
-->
@@ -63,12 +61,18 @@
-processor=x86-64;osname=linux,
-com/sun/jna/linux-arm/libjnidispatch.so;
-processor=arm;osname=linux,
+-com/sun/jna/linux-armel/libjnidispatch.so;
+-processor=armel;osname=linux,
-com/sun/jna/linux-aarch64/libjnidispatch.so;
-processor=aarch64;osname=linux,
-com/sun/jna/linux-ia64/libjnidispatch.so;
-processor=ia64;osname=linux,
-com/sun/jna/linux-sparcv9/libjnidispatch.so;
-processor=sparcv9;osname=linux,
+-com/sun/jna/linux-mips64el/libjnidispatch.so;
+-processor=mips64el;osname=linux,
+-com/sun/jna/linux-s390x/libjnidispatch.so;
+-processor=S390x;osname=linux,
-
-com/sun/jna/freebsd-x86/libjnidispatch.so;
-processor=x86;osname=freebsd,
@@ -107,6 +111,9 @@
- <zipfileset src="${lib.native}/linux-arm.jar"
- includes="*jnidispatch*"
- prefix="com/sun/jna/linux-arm"/>
+- <zipfileset src="${lib.native}/linux-armel.jar"
+- includes="*jnidispatch*"
+- prefix="com/sun/jna/linux-armel"/>
- <zipfileset src="${lib.native}/linux-aarch64.jar"
- includes="*jnidispatch*"
- prefix="com/sun/jna/linux-aarch64"/>
@@ -125,6 +132,12 @@
- <zipfileset src="${lib.native}/linux-sparcv9.jar"
- includes="*jnidispatch*"
- prefix="com/sun/jna/linux-sparcv9"/>
+- <zipfileset src="${lib.native}/linux-mips64el.jar"
+- includes="*jnidispatch*"
+- prefix="com/sun/jna/linux-mips64el"/>
+- <zipfileset src="${lib.native}/linux-s390x.jar"
+- includes="*jnidispatch*"
+- prefix="com/sun/jna/linux-s390x"/>
- <zipfileset src="${lib.native}/sunos-x86.jar"
- includes="*jnidispatch*"
- prefix="com/sun/jna/sunos-x86"/>
@@ -158,7 +171,7 @@
</jar>
<zip zipfile="${build}/${minjar}">
<zipfileset src="${build}/${jar}" excludes="**/*jnidispatch*"/>
-@@ -782,7 +674,7 @@ osname=macosx;processor=x86;processor=x8
+@@ -978,7 +836,7 @@
</javac>
</target>
@@ -167,7 +180,7 @@
description="Compile all test code">
<javac classpathref="compile-test.path"
source="${test.compatibility}"
-@@ -822,8 +714,6 @@ osname=macosx;processor=x86;processor=x8
+@@ -1024,8 +882,6 @@
<mkdir dir="${build}/jws"/>
<copy todir="${build}/jws" file="${build}/${jar}"/>
<copy todir="${build}/jws" file="${build}/${testjar}"/>
@@ -176,20 +189,18 @@
<jar jarfile="${build}/jws/jnidispatch.jar">
<fileset dir="${build.native}" includes="*jnidispatch.*"/>
</jar>
-@@ -1011,7 +901,7 @@ osname=macosx;processor=x86;processor=x8
+@@ -1228,7 +1084,7 @@
</jar>
</target>
-- <target name="dist" depends="jar,javadoc,contrib-jars,compile-tests,native"
-+ <target name="dist" depends="jar,javadoc,contrib-jars,compile-tests"
+- <target name="dist"
depends="jar,aar,javadoc,contrib-jars,compile-tests,native"
++ <target name="dist" depends="jar,aar,javadoc,contrib-jars,compile-tests"
description="Build distribution files">
- <copy todir="${dist}">
- <fileset dir="${build}" includes="${jar},${minjar}"/>
-Index: jna-4.1.0/native/Makefile
-===================================================================
---- jna-4.1.0.orig/native/Makefile
-+++ jna-4.1.0/native/Makefile
-@@ -80,7 +80,7 @@ ARSFX=.a
+ <copy todir="${dist}" force="true" overwrite="true">
+ <fileset dir="${build}" includes="${jar},${minjar},${aar}"/>
+--- jna-4.5.0/native/Makefile 2017-09-13 22:12:57.000000000 +0200
++++ jna-4.5.0/native/Makefile 2017-09-19 16:27:21.845797388 +0200
+@@ -83,7 +83,7 @@
JNISFX=$(LIBSFX)
CC=gcc
LD=$(CC)
@@ -207,3 +218,4 @@
# end defaults
# Android build (cross-compile) requires the android NDK.
+Only in jna-4.5.0/native: Makefile.orig
++++++ jna-getpeer.patch ++++++
--- jna-4.5.0/contrib/platform/src/com/sun/jna/platform/WindowUtils.java
2017-09-13 22:12:57.000000000 +0200
+++ jna-4.5.0/contrib/platform/src/com/sun/jna/platform/WindowUtils.java
2017-09-19 16:46:13.777724232 +0200
@@ -1389,11 +1389,13 @@
whenDisplayable(w, new Runnable() {
@Override
public void run() {
- Object peer = w.getPeer();
try {
- Class<?> cls = peer.getClass();
- Method m = cls.getMethod("setAlpha", new Class[]{
float.class });
- m.invoke(peer, Float.valueOf(alpha));
+ // This will work with old Apple AWT implementations
and
+ // not with openjdk
+ Method getPeer = w.getClass().getMethod("getPeer");
+ Object peer = getPeer.invoke(w);
+ Method setAlpha =
peer.getClass().getMethod("setAlpha", new Class[]{ float.class });
+ setAlpha.invoke(peer, Float.valueOf(alpha));
}
catch (Exception e) {
}
