Hello community, here is the log from the commit of package skinlf for openSUSE:Factory checked in at 2017-09-23 21:33:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/skinlf (Old) and /work/SRC/openSUSE:Factory/.skinlf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "skinlf" Sat Sep 23 21:33:11 2017 rev:5 rq:527475 version:6.7 Changes: -------- --- /work/SRC/openSUSE:Factory/skinlf/skinlf.changes 2014-07-21 22:34:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.skinlf.new/skinlf.changes 2017-09-23 21:33:11.855004815 +0200 @@ -1,0 +2,9 @@ +Wed Sep 20 08:09:35 UTC 2017 - [email protected] + +- Fix build with jdk9: specify java source and target 1.6 +- Added patch: + * skinlf-6.7-getpeer.patch + + Get the inaccessible getPeer by reflection if it exists, + throw exception otherwise + +------------------------------------------------------------------- New: ---- skinlf-6.7-getpeer.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skinlf.spec ++++++ --- /var/tmp/diff_new_pack.os66yb/_old 2017-09-23 21:33:12.650892887 +0200 +++ /var/tmp/diff_new_pack.os66yb/_new 2017-09-23 21:33:12.650892887 +0200 @@ -1,7 +1,7 @@ # # spec file for package skinlf # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,18 +21,20 @@ Version: 6.7 Release: 0 Summary: Allows developers to write skinnable application using the Swing toolkit -License: Apache-1.1 and Zlib -Group: Development/Libraries/Java # Included software nanoxml is licensed under zlib, while skinlf is itself Apache-1.1 +License: Apache-1.1 AND Zlib +Group: Development/Libraries/Java Url: http://skinlf.l2fprod.com/index.html # Upstream download link https://skinlf.dev.java.net/files/documents/66/37801/skinlf-6.7-20060722.zip seems dead Source0: %{name}-%{version}-%{_version2}.tar.bz2 Source1: imageconversion.jar Source2: %{name}-build.xml Source3: %{name}-resources.tar.bz2 -Patch1: skinlf-no-jimi.patch +Patch0: skinlf-no-jimi.patch +Patch1: skinlf-6.7-getpeer.patch BuildRequires: ant BuildRequires: dos2unix +BuildRequires: fdupes BuildRequires: java-devel >= 1.5 BuildRequires: jpackage-utils BuildRequires: laf-plugin @@ -41,7 +43,6 @@ Requires: jpackage-utils Requires: laf-plugin Requires: xalan-j2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -93,10 +94,11 @@ dos2unix -o $i chmod 644 $i done -%patch1 +%patch0 +%patch1 -p1 %build -ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 jar javadocs +ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 jar javadocs %install # jars @@ -108,6 +110,7 @@ # javadoc install -dm 755 %{buildroot}%{_javadocdir}/%{name} cp -pr docs/* %{buildroot}%{_javadocdir}/%{name} +%fdupes -s %{buildroot}%{_javadocdir}/%{name} # demo install -dm 755 %{buildroot}%{_datadir}/%{name} @@ -118,7 +121,7 @@ cat > bin/alwaysontop.sh << EOF #!/bin/bash -%{java} -cp %{_javadir}/%{name}.jar:%{_datadir}/%{name}/%{name}_demo.jar examples.alwaysontop +%java -cp %{_javadir}/%{name}.jar:%{_datadir}/%{name}/%{name}_demo.jar examples.alwaysontop EOF cat > bin/demo.sh << EOF @@ -129,7 +132,7 @@ else shift fi -%{java} -cp %{_javadir}/%{name}.jar:%{_javadir}/laf-plugin.jar:%{_datadir}/%{name}/%{name}_demo.jar examples.demo \$THEMEPACK \$@ +%java -cp %{_javadir}/%{name}.jar:%{_javadir}/laf-plugin.jar:%{_datadir}/%{name}/%{name}_demo.jar examples.demo \$THEMEPACK \$@ EOF # install startscripts for demo-apps @@ -137,16 +140,13 @@ %{buildroot}%{_datadir}/%{name} %files -%defattr(-,root,root) %doc AUTHORS CHANGES LICENSE LICENSE_nanoxml README THANKS %{_javadir}/%{name}*.jar %files javadoc -%defattr(0644,root,root,0755) %doc %{_javadocdir}/%{name} %files demo -%defattr(-,root,root) %dir %{_datadir}/%{name} %{_datadir}/%{name}/*.jar %{_datadir}/%{name}/*.sh ++++++ skinlf-6.7-getpeer.patch ++++++ --- skinlf-6.7/src/com/l2fprod/gui/nativeskin/win32/Win32NativeSkin.java 2017-09-20 09:40:46.096375168 +0200 +++ skinlf-6.7/src/com/l2fprod/gui/nativeskin/win32/Win32NativeSkin.java 2017-09-20 10:07:02.226568456 +0200 @@ -200,7 +200,7 @@ * @return The HWND value */ private static int getHWND(Window window) { - if (window.getPeer() == null) { + if (!window.isDisplayable()) { window.addNotify(); } @@ -217,7 +217,7 @@ drawingSurfaceInfo = Class.forName("sun.awt.DrawingSurface"). getMethod("getDrawingSurfaceInfo", null). - invoke(window.getPeer(), null); + invoke(window.getClass().getMethod("getPeer").invoke(window), null); if (null != drawingSurfaceInfo) { // drawingSurfaceInfo.lock();
