[josm] 06/07: Refresh patches.
Bas Couwenberg
sebastic at debian.org
Mon Apr 3 06:47:53 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository josm.
commit 5ccfc016356ff6285ab3da20f6851dfc0dfdce16
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Apr 3 08:04:46 2017 +0200
Refresh patches.
---
debian/changelog | 1 +
debian/patches/00-build.patch | 39 +++++++++++++++------------
debian/patches/01-bts.patch | 4 +--
debian/patches/03-default_look_and_feel.patch | 2 +-
debian/patches/04-use_system_jmapviewer.patch | 2 +-
debian/patches/05-fix_version.patch | 2 +-
debian/patches/06-move_data_out_of_jar.patch | 2 +-
debian/patches/08-use_noto_font.patch | 11 --------
8 files changed, 29 insertions(+), 34 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ea61d32..e477334 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ josm (0.0.svn11826+dfsg-1) UNRELEASED; urgency=medium
* Add josm-plugins to Conflicts, as it Breaks newer josm revisions.
* Add proj-data to dependencies for grid shift files.
* Update copyright for japicc.
+ * Refresh patches.
-- Bas Couwenberg <sebastic at debian.org> Mon, 03 Apr 2017 07:42:45 +0200
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index c52b3ab..5596f7f 100644
--- a/debian/patches/00-build.patch
+++ b/debian/patches/00-build.patch
@@ -16,7 +16,7 @@ Forwarded: not-needed
- <property name="groovy.jar" location="${base.dir}/tools/groovy-all-2.4.8.jar"/>
+ <property name="groovy.jar" location="/usr/share/java/groovy-all.jar"/>
+ <property name="antcontrib.jar" value="/usr/share/java/ant-contrib.jar"/>
- <property name="error_prone_ant.jar" location="${base.dir}/tools/error_prone_ant-2.0.15.jar"/>
+ <property name="error_prone_ant.jar" location="${base.dir}/tools/error_prone_ant-2.0.19.jar"/>
<property name="javac.compiler" value="com.google.errorprone.ErrorProneAntCompilerAdapter" />
<!-- build parameter: compression level (ant -Dclevel=N)
@@ -37,6 +38,19 @@
@@ -39,7 +39,7 @@ Forwarded: not-needed
<path id="test.classpath">
<fileset dir="${test.dir}/lib">
<include name="**/*.jar"/>
-@@ -92,10 +106,9 @@
+@@ -97,10 +111,9 @@
<!--
** Creates the REVISION file to be included in the distribution
-->
@@ -52,7 +52,7 @@ Forwarded: not-needed
<tstamp>
<format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
</tstamp>
-@@ -106,8 +119,10 @@
+@@ -111,8 +124,10 @@
<echo file="${revision.dir}/REVISION">
# automatically generated by JOSM build.xml - do not edit
Revision: ${version.entry.commit.revision}
@@ -64,7 +64,7 @@ Forwarded: not-needed
</echo>
</target>
<!--
-@@ -127,7 +142,7 @@ Build-Date: ${build.tstamp}
+@@ -132,7 +147,7 @@ Build-Date: ${build.tstamp}
<copy file="README" todir="build"/>
<copy file="LICENSE" todir="build"/>
<!-- create josm-custom.jar -->
@@ -73,7 +73,7 @@ Forwarded: not-needed
<jar destfile="${dist.dir}/josm-custom.jar" basedir="${build.dir}" level="${clevel}">
<!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
<manifest>
-@@ -137,6 +152,8 @@ Build-Date: ${build.tstamp}
+@@ -142,6 +157,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"/>
@@ -82,19 +82,21 @@ Forwarded: not-needed
</manifest>
<zipfileset dir="images" prefix="images"/>
<zipfileset dir="data" prefix="data"/>
-@@ -207,10 +224,7 @@ Build-Date: ${build.tstamp}
+@@ -212,38 +229,21 @@ Build-Date: ${build.tstamp}
</target>
<target name="javacc" depends="init" unless="javacc.notRequired">
<mkdir dir="${mapcss.dir}/parsergen"/>
-- <exec append="false" executable="java" failifexecutionfails="true">
-- <arg value="-cp"/>
-- <arg value="${javacc.home}/javacc.jar"/>
-- <arg value="javacc"/>
+- <java classname="javacc" fork="true" failonerror="true">
+- <classpath path="${javacc.home}/javacc.jar"/>
+ <exec append="false" executable="javacc" failifexecutionfails="true">
<arg value="-DEBUG_PARSER=false"/>
<arg value="-DEBUG_TOKEN_MANAGER=false"/>
<arg value="-JDK_VERSION=1.8"/>
-@@ -221,26 +235,10 @@ Build-Date: ${build.tstamp}
+ <arg value="-GRAMMAR_ENCODING=UTF-8"/>
+ <arg value="-OUTPUT_DIRECTORY=${mapcss.dir}/parsergen"/>
+ <arg value="${mapcss.dir}/MapCSSParser.jj"/>
+- </java>
++ </exec>
</target>
<target name="compile" depends="init,javacc">
<!-- COTS -->
@@ -122,7 +124,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"/>
-@@ -261,19 +259,13 @@ Build-Date: ${build.tstamp}
+@@ -264,19 +264,13 @@ 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/**"/>
@@ -145,7 +147,7 @@ Forwarded: not-needed
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
-@@ -287,16 +279,12 @@ Build-Date: ${build.tstamp}
+@@ -290,16 +284,12 @@ 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"/>
@@ -163,16 +165,19 @@ Forwarded: not-needed
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
-@@ -310,8 +298,6 @@ Build-Date: ${build.tstamp}
+@@ -313,11 +303,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"/>
- <compilerarg value="-Xep:ReferenceEquality:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
- <compilerarg value="-Xep:ImmutableEnumChecker:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
+- <compilerarg value="-Xep:FutureReturnValueIgnored:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
+- <compilerarg value="-Xep:FloatingPointLiteralPrecision:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
+- <compilerarg value="-Xep:ShortCircuitBoolean:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
<compilerarg line="-Xmaxwarns 1000"/>
</javac>
-@@ -325,6 +311,7 @@ Build-Date: ${build.tstamp}
+@@ -331,6 +316,7 @@ Build-Date: ${build.tstamp}
</uptodate>
<mkdir dir="${build.dir}"/>
<mkdir dir="${dist.dir}"/>
@@ -180,7 +185,7 @@ Forwarded: not-needed
</target>
<target name="javadoc" depends="init-properties">
<javadoc destdir="javadoc"
-@@ -354,6 +341,7 @@ Build-Date: ${build.tstamp}
+@@ -360,6 +346,7 @@ Build-Date: ${build.tstamp}
<delete file="${src.dir}/org/w3/_2001/xmlschema/Adapter1.java"/>
<delete dir="${src.dir}/org/openstreetmap/josm/data/imagery/types"/>
<delete file="${epsg.output}"/>
@@ -188,7 +193,7 @@ Forwarded: not-needed
</target>
<macrodef name="init-test-preferences">
<attribute name="testfamily"/>
-@@ -784,6 +772,7 @@ Build-Date: ${build.tstamp}
+@@ -808,6 +795,7 @@ Build-Date: ${build.tstamp}
<pathelement path="${base.dir}"/>
<pathelement path="${proj-classpath}"/>
<pathelement path="${proj-build.dir}"/>
diff --git a/debian/patches/01-bts.patch b/debian/patches/01-bts.patch
index c27bb55..9d34e74 100644
--- a/debian/patches/01-bts.patch
+++ b/debian/patches/01-bts.patch
@@ -66,7 +66,7 @@ Forwarded: not-needed
*
--- a/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
+++ b/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java
-@@ -35,6 +35,7 @@ import org.openstreetmap.josm.gui.prefer
+@@ -36,6 +36,7 @@ import org.openstreetmap.josm.gui.prefer
import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.io.OsmApi;
import org.openstreetmap.josm.plugins.PluginHandler;
@@ -74,7 +74,7 @@ Forwarded: not-needed
import org.openstreetmap.josm.tools.PlatformHookUnixoid;
import org.openstreetmap.josm.tools.Shortcut;
import org.openstreetmap.josm.tools.Utils;
-@@ -297,7 +298,7 @@ public final class ShowStatusReportActio
+@@ -294,7 +295,7 @@ public final class ShowStatusReportActio
switch (ed.showDialog().getValue()) {
case 1: ta.copyToClipboard(); break;
diff --git a/debian/patches/03-default_look_and_feel.patch b/debian/patches/03-default_look_and_feel.patch
index 61fc1d9..09c6483 100644
--- a/debian/patches/03-default_look_and_feel.patch
+++ b/debian/patches/03-default_look_and_feel.patch
@@ -6,7 +6,7 @@ Forwarded: not-needed
--- a/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
+++ b/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
-@@ -80,7 +80,7 @@ public class PlatformHookUnixoid impleme
+@@ -81,7 +81,7 @@ public class PlatformHookUnixoid impleme
@Override
public String getDefaultStyle() {
diff --git a/debian/patches/04-use_system_jmapviewer.patch b/debian/patches/04-use_system_jmapviewer.patch
index 8b6b670..11a5a81 100644
--- a/debian/patches/04-use_system_jmapviewer.patch
+++ b/debian/patches/04-use_system_jmapviewer.patch
@@ -5,7 +5,7 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -158,7 +158,6 @@ Debian-Release: ${debian.version}
+@@ -163,7 +163,6 @@ Debian-Release: ${debian.version}
<zipfileset dir="images" prefix="images"/>
<zipfileset dir="data" prefix="data"/>
<zipfileset dir="styles" prefix="styles"/>
diff --git a/debian/patches/05-fix_version.patch b/debian/patches/05-fix_version.patch
index 1a1f10a..204b208 100644
--- a/debian/patches/05-fix_version.patch
+++ b/debian/patches/05-fix_version.patch
@@ -8,7 +8,7 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -147,7 +147,7 @@ Debian-Release: ${debian.version}
+@@ -152,7 +152,7 @@ Debian-Release: ${debian.version}
<!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
<manifest>
<attribute name="Main-class" value="JOSM"/>
diff --git a/debian/patches/06-move_data_out_of_jar.patch b/debian/patches/06-move_data_out_of_jar.patch
index 9034df5..286945e 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -6,7 +6,7 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
-@@ -155,9 +155,9 @@ Debian-Release: ${debian.version}
+@@ -160,9 +160,9 @@ Debian-Release: ${debian.version}
<attribute name="Debian-Release" value="${debian.version}"/>
<attribute name="Class-Path" value="${classpathprop}"/>
</manifest>
diff --git a/debian/patches/08-use_noto_font.patch b/debian/patches/08-use_noto_font.patch
index 14afbb8..2bb48a7 100644
--- a/debian/patches/08-use_noto_font.patch
+++ b/debian/patches/08-use_noto_font.patch
@@ -3,17 +3,6 @@ Author: Bas Couwenberg <sebastic at debian.org>
Bug-Debian: https://bugs.debian.org/804683
Forwarded: https://josm.openstreetmap.de/ticket/12085
---- a/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
-+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
-@@ -1558,7 +1558,7 @@ public class StyledMapRenderer extends A
- showNames = paintSettings.getShowNamesDistance() > circum;
- showIcons = paintSettings.getShowIconsDistance() > circum;
- isOutlineOnly = paintSettings.isOutlineOnly();
-- orderFont = new Font(Main.pref.get("mappaint.font", "Droid Sans"), Font.PLAIN, Main.pref.getInteger("mappaint.fontsize", 8));
-+ orderFont = new Font(Main.pref.get("mappaint.font", "Noto Sans"), Font.PLAIN, Main.pref.getInteger("mappaint.fontsize", 8));
-
- antialiasing = Main.pref.getBoolean("mappaint.use-antialiasing", true) ?
- RenderingHints.VALUE_ANTIALIAS_ON : RenderingHints.VALUE_ANTIALIAS_OFF;
--- a/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.java
@@ -124,7 +124,7 @@ public abstract class StyleElement imple
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git
More information about the Pkg-grass-devel
mailing list