Hello community, here is the log from the commit of package matthewlib-java for openSUSE:Factory checked in at 2017-12-23 12:21:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/matthewlib-java (Old) and /work/SRC/openSUSE:Factory/.matthewlib-java.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "matthewlib-java" Sat Dec 23 12:21:13 2017 rev:17 rq:559492 version:0.8 Changes: -------- --- /work/SRC/openSUSE:Factory/matthewlib-java/matthewlib-java.changes 2017-09-14 21:18:15.848830955 +0200 +++ /work/SRC/openSUSE:Factory/.matthewlib-java.new/matthewlib-java.changes 2017-12-23 12:21:39.261240793 +0100 @@ -1,0 +2,7 @@ +Fri Dec 22 12:12:51 UTC 2017 - [email protected] + +- Added patch: + * libmatthew-java-0.8-jdk10.patch + + fix build with jdk10 + +------------------------------------------------------------------- New: ---- libmatthew-java-0.8-jdk10.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ matthewlib-java.spec ++++++ --- /var/tmp/diff_new_pack.ZCoLQP/_old 2017-12-23 12:21:39.937207833 +0100 +++ /var/tmp/diff_new_pack.ZCoLQP/_new 2017-12-23 12:21:39.941207638 +0100 @@ -34,9 +34,10 @@ Source0: libmatthew-java-0.8.tar.gz Patch0: install_doc.patch Patch1: classpath_fix.patch +Patch2: libmatthew-java-0.8-jdk10.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes -BuildRequires: java-devel +BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-tools Requires: javapackages-tools Requires: jre >= 1.5.0 @@ -82,6 +83,7 @@ %setup -q -n %{orig_name}-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build make \ ++++++ libmatthew-java-0.8-jdk10.patch ++++++ --- libmatthew-java-0.8/cgi-java.c 2011-06-28 10:27:11.000000000 +0200 +++ libmatthew-java-0.8/cgi-java.c 2017-12-22 13:10:21.755868074 +0100 @@ -26,7 +26,10 @@ */ #include <jni.h> -#include "cgi-java.h" +#include "cx_ath_matthew_unix_UnixServerSocket.h" +#include "cx_ath_matthew_unix_UnixSocket.h" +#include "cx_ath_matthew_unix_USInputStream.h" +#include "cx_ath_matthew_unix_USOutputStream.h" #include <stdio.h> #include <stdlib.h> #include <unistd.h> --- libmatthew-java-0.8/Makefile 2011-01-23 18:09:41.000000000 +0100 +++ libmatthew-java-0.8/Makefile 2017-12-22 13:10:57.603868209 +0100 @@ -1,7 +1,6 @@ JAVAC?=javac JAVADOC?=javadoc JAR?=jar -JAVAH?=javah GCJ?=gcj CC?=gcc LD?=gcc @@ -13,7 +12,7 @@ JVERCFLAGS+=-source 1.5 JCFLAGS+= INCLUDES+=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -JAVADOCFLAGS?=-quiet -author -link http://java.sun.com/j2se/1.4.2/docs/api/ +JAVADOCFLAGS?=-quiet -author LDVER?=$(shell ld -v | cut -d' ' -f1) UNAME?=$(shell uname -s) @@ -50,7 +49,7 @@ .classes: $(SRC) mkdir -p classes $(MAKE) .$(DEBUG)debug - $(JAVAC) $(JVERCFLAGS) $(JCFLAGS) -d classes -cp classes $^ + $(JAVAC) $(JVERCFLAGS) $(JCFLAGS) -d classes -h . -cp classes $^ touch .classes clean: rm -rf classes doc @@ -76,10 +75,10 @@ $(CC) $(CFLAGS) $(CSTD) $(CSHAREFLAG) $(INCLUDES) -c -o $@ $< lib%.so: %.o $(CC) $(LDFLAGS) $(LDSHAREFLAGS) -o $@ $< + unix-java.h: .classes - $(JAVAH) -classpath classes -o $@ cx.ath.matthew.unix.UnixServerSocket cx.ath.matthew.unix.UnixSocket cx.ath.matthew.unix.USInputStream cx.ath.matthew.unix.USOutputStream + cgi-java.h: .classes - $(JAVAH) -classpath classes -o $@ cx.ath.matthew.cgi.CGI test.cgi: cgi-$(CGIVER).jar libcgi-java.so $(GCJ) $(GCJFLAGS) $(GCJJNIFLAG) -L. -lcgi-java -o test.cgi --main=cx.ath.matthew.cgi.testcgi cgi-$(CGIVER).jar --- libmatthew-java-0.8/unix-java.c 2011-06-28 10:27:20.000000000 +0200 +++ libmatthew-java-0.8/unix-java.c 2017-12-22 13:10:16.323868053 +0100 @@ -29,7 +29,7 @@ /* _GNU_SOURCE is required to use struct ucred in glibc 2.8 */ #define _GNU_SOURCE -#include "unix-java.h" +#include "cx_ath_matthew_cgi_CGI.h" #include <stdio.h> #include <stdlib.h> #include <unistd.h>
