Hello community, here is the log from the commit of package libjnidispatch for openSUSE:Factory checked in at 2018-07-27 10:57:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libjnidispatch (Old) and /work/SRC/openSUSE:Factory/.libjnidispatch.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libjnidispatch" Fri Jul 27 10:57:40 2018 rev:22 rq:625464 version:4.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libjnidispatch/libjnidispatch.changes 2018-06-19 12:04:54.615254619 +0200 +++ /work/SRC/openSUSE:Factory/.libjnidispatch.new/libjnidispatch.changes 2018-07-27 10:58:19.473885673 +0200 @@ -1,0 +2,15 @@ +Thu Jul 26 11:50:51 UTC 2018 - [email protected] + +- Fix dealing with different java environments +- Fix license warning + +------------------------------------------------------------------- +Wed Jun 13 12:01:21 UTC 2018 - [email protected] + +- do not apply nojavah on Leap 42.3 - breaks build +- quiet warnings + + jna-msgsize.patch + + jna-callback.patch + + delete jna-no-werror.patch + +------------------------------------------------------------------- Old: ---- jna-no-werror.patch New: ---- jna-callback.patch jna-msgsize.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libjnidispatch.spec ++++++ --- /var/tmp/diff_new_pack.hDRpu0/_old 2018-07-27 10:58:20.877888359 +0200 +++ /var/tmp/diff_new_pack.hDRpu0/_new 2018-07-27 10:58:20.881888367 +0200 @@ -17,6 +17,8 @@ # +%define maven_xml %( [ -d %{_datadir}/maven-metadata ] && echo 1 ) + Name: libjnidispatch Version: 4.5.1 Release: 0 @@ -30,7 +32,8 @@ Patch0: jna-build.patch Patch1: jna-getpeer.patch Patch2: jna-4.5.1-nojavah.patch -Patch3: jna-no-werror.patch +Patch4: jna-msgsize.patch +Patch5: jna-callback.patch BuildRequires: ant BuildRequires: ant-junit BuildRequires: dos2unix @@ -88,8 +91,11 @@ # Then apply patch %patch0 -p1 -b .orig %patch1 -p1 +%if 0%{?suse_version} >= 01500 %patch2 -p1 -%patch3 -p1 +%endif +%patch4 -p1 +%patch5 -p1 #FIXME: DirectTest fails #rm test/com/sun/jna/DirectTest.java test/com/sun/jna/PerformanceTest.java @@ -124,22 +130,31 @@ # let's name maven fragment jna as expected install -p -m 644 %{SOURCE1} %{buildroot}/%{_mavenpomdir}/JPP-jna.pom %add_maven_depmap JPP-jna.pom jna.jar +%if 0%{?maven_xml} mv %{buildroot}%{_datadir}/maven-metadata/libjnidispatch.xml %{buildroot}%{_datadir}/maven-metadata/jna.xml +%else +mv %{buildroot}%{_datadir}/maven-fragments/libjnidispatch %{buildroot}%{_datadir}/maven-fragments/jna +%endif install -d -m 755 %{buildroot}%{_javadocdir}/jna cp -pr doc/javadoc/* %{buildroot}%{_javadocdir}/jna %fdupes -s %{buildroot}%{_javadocdir}/jna %files -%doc LICENSE +%license LICENSE %attr(0755,root,root) %{_libdir}/libjnidispatch.so %files -n jna -%doc CHANGES.md LICENSE OTHERS README.md TODO +%license LICENSE +%doc CHANGES.md OTHERS README.md TODO %{_javadir}/jna.jar %{_javadir}/jna-platform.jar %{_mavenpomdir}/JPP-jna.pom +%if 0%{?maven_xml} %{_datadir}/maven-metadata/jna.xml +%else +%{_datadir}/maven-fragments/jna +%endif %files -n jna-javadoc %{_javadocdir}/jna ++++++ jna-callback.patch ++++++ --- jna-4.5.1/native/testlib.c~ 2017-12-27 20:27:16.000000000 +0100 +++ jna-4.5.1/native/testlib.c 2018-06-13 20:48:41.724621101 +0200 @@ -796,8 +796,8 @@ } EXPORT callback_t -callCallbackWithCallback(cb_callback_t cb) { - return (*cb)((callback_t)cb); +callCallbackWithCallback(cb_callback_t cb, callback_t arg) { + return (*cb)(arg); } static int32_t --- jna-4.5.1/test/com/sun/jna/CallbacksTest.java~ 2017-12-27 20:27:16.000000000 +0100 +++ jna-4.5.1/test/com/sun/jna/CallbacksTest.java 2018-06-13 20:49:38.461620074 +0200 @@ -191,9 +191,9 @@ int callCallbackWithByReferenceArgument(CopyArgToByReference cb, int arg, IntByReference result); TestStructure.ByValue callCallbackWithStructByValue(TestStructure.TestCallback callback, TestStructure.ByValue cbstruct); interface CbCallback extends Callback { - CbCallback callback(CbCallback arg); + Callback callback(Callback arg); } - CbCallback callCallbackWithCallback(CbCallback cb); + Callback callCallbackWithCallback(CbCallback cb, Callback arg); interface Int32CallbackX extends Callback { public int callback(int arg); --- jna-4.5.1/test/com/sun/jna/DirectCallbacksTest.java~ 2017-12-27 20:27:16.000000000 +0100 +++ jna-4.5.1/test/com/sun/jna/DirectCallbacksTest.java 2018-06-13 20:50:42.942752879 +0200 @@ -65,7 +65,7 @@ @Override public native TestStructure.ByValue callCallbackWithStructByValue(TestStructure.TestCallback callback, TestStructure.ByValue cbstruct); @Override - public native CbCallback callCallbackWithCallback(CbCallback cb); + public native Callback callCallbackWithCallback(CbCallback cb, Callback arg); @Override public native Int32CallbackX returnCallback(); @Override --- jna-4.5.1/test/com/sun/jna/CallbacksTest.java~ 2018-06-13 20:49:38.461620074 +0200 +++ jna-4.5.1/test/com/sun/jna/CallbacksTest.java 2018-06-13 20:52:51.645006532 +0200 @@ -840,7 +840,7 @@ return arg; } }; - TestLibrary.CbCallback cb2 = lib.callCallbackWithCallback(cb); + TestLibrary.CbCallback cb2 = lib.callCallbackWithCallback(cb, cb); assertEquals("Callback reference should be reused", cb, cb2); } @@ -856,7 +856,7 @@ throw ERROR; } }; - TestLibrary.CbCallback cb2 = lib.callCallbackWithCallback(cb); + TestLibrary.CbCallback cb2 = lib.callCallbackWithCallback(cb, cb); String output = s.toString(); assertTrue("Default handler not called", output.length() > 0); } @@ -887,7 +887,7 @@ throw ERROR; } }; - TestLibrary.CbCallback cb2 = lib.callCallbackWithCallback(cb); + TestLibrary.CbCallback cb2 = lib.callCallbackWithCallback(cb, cb); assertNotNull("Exception handler not called", CALLBACK[0]); assertEquals("Wrong callback argument to handler", cb, CALLBACK[0]); assertEquals("Wrong exception passed to handler", @@ -932,7 +932,7 @@ } }; TestLibrary.CbCallback cb = new TestProxy(); - TestLibrary.CbCallback cb2 = lib.callCallbackWithCallback(cb); + TestLibrary.CbCallback cb2 = lib.callCallbackWithCallback(cb, cb); assertNotNull("Exception handler not called", CALLBACK[0]); assertEquals("Wrong callback argument to handler", cb, CALLBACK[0]); assertEquals("Wrong exception passed to handler", --- jna-4.5.1/test/com/sun/jna/CallbacksTest.java~ 2018-06-13 20:52:51.645006532 +0200 +++ jna-4.5.1/test/com/sun/jna/CallbacksTest.java 2018-06-13 20:56:38.888929160 +0200 @@ -840,7 +840,7 @@ return arg; } }; - TestLibrary.CbCallback cb2 = lib.callCallbackWithCallback(cb, cb); + TestLibrary.Callback cb2 = lib.callCallbackWithCallback(cb, cb); assertEquals("Callback reference should be reused", cb, cb2); } @@ -856,7 +856,7 @@ throw ERROR; } }; - TestLibrary.CbCallback cb2 = lib.callCallbackWithCallback(cb, cb); + TestLibrary.Callback cb2 = lib.callCallbackWithCallback(cb, cb); String output = s.toString(); assertTrue("Default handler not called", output.length() > 0); } @@ -887,7 +887,7 @@ throw ERROR; } }; - TestLibrary.CbCallback cb2 = lib.callCallbackWithCallback(cb, cb); + TestLibrary.Callback cb2 = lib.callCallbackWithCallback(cb, cb); assertNotNull("Exception handler not called", CALLBACK[0]); assertEquals("Wrong callback argument to handler", cb, CALLBACK[0]); assertEquals("Wrong exception passed to handler", ++++++ jna-msgsize.patch ++++++ --- jna-4.5.1/native/dispatch.c~ 2017-12-27 20:27:16.000000000 +0100 +++ jna-4.5.1/native/dispatch.c 2018-06-13 13:33:07.683171230 +0200 @@ -652,7 +652,7 @@ int err = GET_LAST_ERROR(); JNA_set_last_error(env, err); if ((flags & THROW_LAST_ERROR) && err) { - char emsg[MSG_SIZE]; + char emsg[MSG_SIZE - 13]; snprintf(msg, sizeof(msg), "[%d] %s", err, STR_ERROR(err, emsg, sizeof(emsg))); throw_type = ELastError; throw_msg = msg; @@ -1891,7 +1891,7 @@ int err = GET_LAST_ERROR(); JNA_set_last_error(env, err); if (data->throw_last_error && err) { - char emsg[MSG_SIZE]; + char emsg[MSG_SIZE - 13]; snprintf(msg, sizeof(msg), "[%d] %s", err, STR_ERROR(err, emsg, sizeof(emsg))); throw_type = ELastError; throw_msg = msg;
