Hello community, here is the log from the commit of package jedit for openSUSE:Factory checked in at 2017-12-23 12:21:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jedit (Old) and /work/SRC/openSUSE:Factory/.jedit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jedit" Sat Dec 23 12:21:08 2017 rev:28 rq:559396 version:5.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/jedit/jedit.changes 2017-09-20 17:10:07.827181664 +0200 +++ /work/SRC/openSUSE:Factory/.jedit.new/jedit.changes 2017-12-23 12:21:35.541422168 +0100 @@ -1,0 +2,8 @@ +Fri Dec 22 15:35:13 UTC 2017 - [email protected] + +- Added patch: + * jedit-jdk10.patch + + Fix building with jdk10 + + Do not use custom doclet APIs removed in jdk10 + +------------------------------------------------------------------- New: ---- jedit-jdk10.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jedit.spec ++++++ --- /var/tmp/diff_new_pack.vzX4XD/_old 2017-12-23 12:21:36.289385698 +0100 +++ /var/tmp/diff_new_pack.vzX4XD/_new 2017-12-23 12:21:36.293385503 +0100 @@ -34,6 +34,7 @@ #svn co https://jedit.svn.sourceforge.net/svnroot/jedit/build-support/trunk build-support Source7: build-support-r22713.tar.gz Patch0: jedit-encoding.patch +Patch1: jedit-jdk10.patch BuildRequires: ant >= 1.8.2 BuildRequires: ant-apache-bsf BuildRequires: ant-contrib @@ -45,7 +46,7 @@ BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes BuildRequires: hicolor-icon-theme -BuildRequires: java-devel >= 1.6.0 +BuildRequires: java-devel >= 1.6 BuildRequires: jsr-305 BuildRequires: junit BuildRequires: xerces-j2-xml-apis @@ -81,9 +82,12 @@ %prep %setup -q -D -n jEdit -a 6 -a 7 %patch0 -p1 +%patch1 -p1 find . -name '*jar' -delete +rm -f doclet/GenerateTocXML.java + %build DOCBOOK=%{_datadir}/xml/docbook/stylesheet/nwalsh/current ++++++ jedit-jdk10.patch ++++++ diff -urEbwB jEdit/build.xml jEdit.new/build.xml --- jEdit/build.xml 2017-12-22 16:28:40.455841825 +0100 +++ jEdit.new/build.xml 2017-12-22 16:34:02.138815906 +0100 @@ -744,7 +744,6 @@ <dependset> <srcfileset dir="${basedir}"> <include name="build.xml"/> - <include name="doclet/**/*.java"/> <include name="org/**/*.java"/> <include name="org/**/package.html"/> </srcfileset> @@ -759,27 +758,11 @@ </contrib:then> <contrib:else> <mkdir dir="${classes.dir}/javadoc"/> - <javac srcdir="${basedir}" - destdir="${classes.dir}/javadoc" - includes="doclet/**" - debug="true" - debuglevel="${config.build.debuglevel}" - nowarn="${config.build.nowarn}" - deprecation="${config.build.deprecation}" - source="${target.java.version}" - target="${target.java.version}" - compiler="modern" - encoding="UTF-8" - includeAntRuntime="true"> - <compilerarg line="${config.build.compilerarg}"/> - </javac> <javadoc locale="en" sourcepath="${basedir}" destdir="${classes.dir}/javadoc/api" packagenames="org.*" - doclet="doclet.GenerateTocXML" - docletpath="${classes.dir}/javadoc" version="true" use="true" author="true"
