Commit 080307a7 authored by Bas Couwenberg's avatar Bas Couwenberg

Refresh patches.

parent f7e153fc
......@@ -3,6 +3,7 @@ josm (0.0.svn14382+dfsg-1) UNRELEASED; urgency=medium
* New tested snapshot.
* Use embedded svgsalamander for setImageDataInlineOnly symbol.
* Add license & copyright for svgsalamander sources.
* Refresh patches.
-- Bas Couwenberg <sebastic@debian.org> Mon, 29 Oct 2018 10:24:40 +0100
......
......@@ -17,7 +17,7 @@ Forwarded: not-needed
<property name="error_prone_core.jar" location="${tools.dir}/error_prone_core.jar"/>
<property name="error_prone_javac.jar" location="${tools.dir}/error_prone_javac.jar"/>
<property name="jformatstring.jar" location="${spotbugs.dir}/jFormatString-3.0.0.jar"/>
@@ -71,10 +72,22 @@
@@ -72,10 +73,22 @@
<isset property="isJava9"/>
</condition>
<path id="groovy.classpath">
......@@ -42,7 +42,7 @@ Forwarded: not-needed
<path id="test.classpath">
<fileset dir="${test.dir}/lib">
<include name="**/*.jar"/>
@@ -141,10 +154,9 @@
@@ -142,10 +155,9 @@
<!--
** Creates the REVISION file to be included in the distribution
-->
......@@ -55,7 +55,7 @@ Forwarded: not-needed
<tstamp>
<format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
</tstamp>
@@ -155,8 +167,10 @@
@@ -156,8 +168,10 @@
<echo file="${revision.dir}/REVISION">
# automatically generated by JOSM build.xml - do not edit
Revision: ${version.entry.commit.revision}
......@@ -67,7 +67,7 @@ Forwarded: not-needed
</echo>
</target>
<!--
@@ -176,7 +190,7 @@ Build-Date: ${build.tstamp}
@@ -177,7 +191,7 @@ Build-Date: ${build.tstamp}
<copy file="README" todir="${build.dir}"/>
<copy file="LICENSE" todir="${build.dir}"/>
<!-- create josm-custom.jar -->
......@@ -76,7 +76,7 @@ Forwarded: not-needed
<jar destfile="${dist.jar}" basedir="${build.dir}" level="${clevel}">
<!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
<manifest>
@@ -186,6 +200,8 @@ Build-Date: ${build.tstamp}
@@ -187,6 +201,8 @@ Build-Date: ${build.tstamp}
<attribute name="Permissions" value="all-permissions"/>
<attribute name="Codebase" value="josm.openstreetmap.de"/>
<attribute name="Application-Name" value="JOSM - Java OpenStreetMap Editor"/>
......@@ -85,7 +85,7 @@ Forwarded: not-needed
<!-- Java 9 stuff. Entries are safely ignored by Java 8 -->
<attribute name="Add-Exports" value="java.base/sun.security.util java.base/sun.security.x509 java.desktop/com.apple.eawt java.desktop/com.sun.imageio.spi javafx.graphics/com.sun.javafx.application jdk.deploy/com.sun.deploy.config" />
<attribute name="Add-Opens" value="java.base/java.lang java.base/java.nio java.base/jdk.internal.loader java.base/jdk.internal.ref java.desktop/javax.imageio.spi java.desktop/javax.swing.text.html java.prefs/java.util.prefs" />
@@ -260,43 +276,21 @@ Build-Date: ${build.tstamp}
@@ -261,43 +277,21 @@ Build-Date: ${build.tstamp}
</target>
<target name="javacc" depends="init" unless="javacc.notRequired">
<mkdir dir="${mapcss.dir}/parsergen"/>
......@@ -132,7 +132,7 @@ Forwarded: not-needed
<exclude name="org/apache/commons/jcs/JCS.java"/>
<exclude name="org/apache/commons/jcs/access/GroupCacheAccess.java"/>
<exclude name="org/apache/commons/jcs/access/PartitionedCacheAccess.java"/>
@@ -317,22 +311,15 @@ Build-Date: ${build.tstamp}
@@ -318,22 +312,15 @@ Build-Date: ${build.tstamp}
<exclude name="org/apache/commons/jcs/utils/net/**"/>
<exclude name="org/apache/commons/jcs/utils/props/**"/>
<exclude name="org/apache/commons/jcs/utils/servlet/**"/>
......@@ -158,7 +158,7 @@ Forwarded: not-needed
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
@@ -346,19 +333,14 @@ Build-Date: ${build.tstamp}
@@ -347,19 +334,14 @@ Build-Date: ${build.tstamp}
<compilerarg value="-Xlint:unchecked"/>
<!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
<compilerarg value="-XDignore.symbol.file"/>
......@@ -179,7 +179,7 @@ Forwarded: not-needed
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
@@ -372,7 +354,6 @@ Build-Date: ${build.tstamp}
@@ -373,7 +355,6 @@ Build-Date: ${build.tstamp}
<compilerarg value="-Xlint:unchecked"/>
<!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
<compilerarg value="-XDignore.symbol.file"/>
......@@ -187,7 +187,7 @@ Forwarded: not-needed
<compilerarg line="-Xmaxwarns 1000"/>
<exclude name="org/openstreetmap/josm/io/audio/fx/*.java" if:set="noJavaFX"/>
</javac>
@@ -387,6 +368,7 @@ Build-Date: ${build.tstamp}
@@ -388,6 +369,7 @@ Build-Date: ${build.tstamp}
</uptodate>
<mkdir dir="${build.dir}"/>
<mkdir dir="${dist.dir}"/>
......@@ -195,7 +195,7 @@ Forwarded: not-needed
</target>
<target name="javadoc" depends="init-properties">
<javadoc destdir="javadoc"
@@ -422,6 +404,7 @@ Build-Date: ${build.tstamp}
@@ -423,6 +405,7 @@ Build-Date: ${build.tstamp}
<delete dir="${src.dir}/org/openstreetmap/josm/data/imagery/types"/>
<delete file="${epsg.output}"/>
<delete file="${pmd.dir}/cache"/>
......@@ -203,7 +203,7 @@ Forwarded: not-needed
</target>
<macrodef name="init-test-preferences">
<attribute name="testfamily"/>
@@ -984,6 +967,7 @@ Build-Date: ${build.tstamp}
@@ -985,6 +968,7 @@ Build-Date: ${build.tstamp}
<pathelement path="${base.dir}"/>
<pathelement path="${proj-classpath}"/>
<pathelement path="${proj-build.dir}"/>
......@@ -222,31 +222,31 @@ Forwarded: not-needed
<property name="josm.presets" value="${josm.build.dir}/data/defaultpresets.xml"/>
<property name="plugin.dir" value="../plugins"/>
<property name="maps.srcfile" value="https://josm.openstreetmap.de/maps"/>
@@ -13,8 +13,8 @@
<property name="i18n_data.install.dir" value="${josm.build.dir}/data_nodist/trans"/>
@@ -14,8 +14,8 @@
<property name="po.build.dir" value="${i18n.build.dir}"/>
<property name="ant.build.javac.target" value="1.5"/>
<property name="gettext.keywords" value="-k -ktrc:1c,2 -kmarktrc:1c,2 -ktr -kmarktr -ktrn:1,2 -ktrnc:1c,2,3"/>
- <property name="gettexttasks.jar" value="lib/gettext-ant-tasks-0.9.7.jar"/>
- <property name="antcontrib.jar" value="lib/ant-contrib-1.0b3.jar"/>
+ <property name="gettexttasks.jar" value="/usr/share/java/gettext-ant-tasks.jar"/>
+ <property name="antcontrib.jar" value="/usr/share/java/ant-contrib.jar"/>
<property name="grand.jar" value="lib/grand-1.9.5.jar"/>
<target name="init" description="Loads the Ant gettext and contrib tasks">
<taskdef name="gettext-extract" classname="org.xnap.commons.ant.gettext.GettextExtractKeysTask" classpath="${gettexttasks.jar}"/>
<!-- for the <foreach> possibility -->
@@ -87,7 +87,7 @@
@@ -90,7 +90,7 @@
<arg line="po/core.pot po/maplist.pot po/presets.pot"/>
</exec>
<delete file="po/josm.raw.pot"/>
</target>
- <target name="po/core.pot" description="Extracts message keys from the JOSM core source code" depends="trans_.java,init">
- <target name="po/core.pot" description="Extracts message keys from the JOSM core source code" depends="init">
+ <target name="po/core.pot" description="Extracts message keys from the JOSM core source code" depends="builddir,init">
<gettext-extract keysFile="core.pot" poDirectory="po" keywords="-k -ktrc:1c,2 -kmarktrc:1c,2 -ktr -kmarktr -ktrn:1,2 -ktrnc:1c,2,3">
<gettext-extract keysFile="core.pot" poDirectory="po" keywords="${gettext.keywords} --exclude-file=excludes.pot">
<fileset dir="${josm.build.dir}/src" includes="**/*.java"/>
<fileset dir="${i18n.build.dir}" includes="specialmessages.java"/>
@@ -129,9 +129,14 @@
<delete file="${po.build.dir}/data.pot"/>
<delete file="${po.build.dir}/plugins.raw.pot"/>
@@ -121,9 +121,14 @@
<fileset dir="${i18n.build.dir}" includes="trans_tag2link.java"/>
</gettext-extract>
</target>
- <target name="build" depends="pot,allpot">
- <target name="build" depends="pot">
- <antcall target="buildcore"/>
- <antcall target="buildplugins"/>
+ <target name="build.check">
......@@ -260,7 +260,19 @@ Forwarded: not-needed
</target>
<target name="buildplugins" depends="init">
<foreach param="path" target="plugintrans" parallel="true" maxThreads="8">
@@ -194,15 +199,14 @@
@@ -141,9 +146,9 @@
<antcall target="coretrans"/>
<antcall target="pluginlisttrans"/>
</target>
- <target name="coretrans" depends="po/core+maplist+presets.pot">
+ <target name="coretrans" depends="po/core.pot">
<exec executable="perl" failonerror="true">
- <arg line="i18n.pl --potfile=po/core+maplist+presets.pot --basedir=${i18n.install.dir}/ po/*.po"/>
+ <arg line="i18n.pl --potfile=po/core.pot --basedir=${i18n.install.dir}/ po/*.po"/>
</exec>
</target>
<target name="pluginlisttrans" depends="po/pluginlist.pot">
@@ -186,15 +191,14 @@
</else>
</if>
</target>
......@@ -271,12 +283,12 @@ Forwarded: not-needed
+ </target>
<target name="clean">
<delete dir="${i18n.build.dir}"/>
- <delete file="po/josm.pot"/>
- <delete file="build.dot"/>
- <delete file="build.png"/>
- <delete>
- <fileset dir="po" includes="*.*~" defaultexcludes="false"/>
- </delete>
- <delete>
- <fileset dir="po" includes="*.po" defaultexcludes="false"/>
- <fileset dir="po" includes="*.pot" defaultexcludes="false"/>
- </delete>
+ <delete file="build-timestamp"/>
</target>
......
......@@ -5,7 +5,7 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
@@ -210,7 +210,6 @@ Debian-Release: ${debian.version}
@@ -211,7 +211,6 @@ Debian-Release: ${debian.version}
<zipfileset dir="images" prefix="images"/>
<zipfileset dir="data" prefix="data"/>
<zipfileset dir="styles" prefix="styles"/>
......
......@@ -8,7 +8,7 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
@@ -195,7 +195,7 @@ Debian-Release: ${debian.version}
@@ -196,7 +196,7 @@ Debian-Release: ${debian.version}
<!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
<manifest>
<attribute name="Main-class" value="org.openstreetmap.josm.gui.MainApplication"/>
......
......@@ -6,7 +6,7 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
@@ -207,9 +207,6 @@ Debian-Release: ${debian.version}
@@ -208,9 +208,6 @@ Debian-Release: ${debian.version}
<attribute name="Add-Opens" value="java.base/java.lang java.base/java.nio java.base/jdk.internal.loader java.base/jdk.internal.ref java.desktop/javax.imageio.spi java.desktop/javax.swing.text.html java.prefs/java.util.prefs" />
</manifest>
<service type="java.text.spi.DecimalFormatSymbolsProvider" provider="org.openstreetmap.josm.tools.JosmDecimalFormatSymbolsProvider" />
......@@ -41,7 +41,7 @@ Forwarded: not-needed
/**
--- a/src/org/openstreetmap/josm/io/CachedFile.java
+++ b/src/org/openstreetmap/josm/io/CachedFile.java
@@ -223,11 +223,17 @@ public class CachedFile implements Close
@@ -225,11 +225,17 @@ public class CachedFile implements Close
File file = getFile();
if (file == null) {
if (name != null && name.startsWith("resource://")) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment