[josm] 07/08: Drop 02-elemstyles.patch, openstreetmap-map-icons package no longer used.
Bas Couwenberg
sebastic at debian.org
Sat Jan 7 23:34:17 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 62bc869fa623bb85756ab6d1c3aa5996f05c99f1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Jan 7 23:50:16 2017 +0100
Drop 02-elemstyles.patch, openstreetmap-map-icons package no longer used.
---
debian/changelog | 1 +
debian/patches/00-build.patch | 20 ++---
debian/patches/02-elemstyles.patch | 110 ---------------------------
debian/patches/06-move_data_out_of_jar.patch | 2 +-
debian/patches/08-use_noto_font.patch | 2 +-
debian/patches/series | 1 -
6 files changed, 13 insertions(+), 123 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 22668fc..190dcae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ josm (0.0.svn11427+dfsg-1) UNRELEASED; urgency=medium
* Don't remove icons from JOSM source, icons from OSM SVN no longer used.
* Drop openstreetmap-map-icons dependency, icons included in JOSM now.
* Add license & copyright for preset icons.
+ * Drop 02-elemstyles.patch, openstreetmap-map-icons package no longer used.
-- Bas Couwenberg <sebastic at debian.org> Sat, 07 Jan 2017 23:23:33 +0100
diff --git a/debian/patches/00-build.patch b/debian/patches/00-build.patch
index 1790eee..36ed654 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.7.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.13.jar"/>
+ <property name="error_prone_ant.jar" location="${base.dir}/tools/error_prone_ant-2.0.14.jar"/>
<property name="javac.compiler" value="com.google.errorprone.ErrorProneAntCompilerAdapter" />
<!-- build parameter: compression level (ant -Dclevel=N)
@@ -37,6 +38,19 @@
@@ -107,6 +107,7 @@ Forwarded: not-needed
- <exclude name="org/apache/commons/compress/compressors/lzma/**"/>
- <exclude name="org/apache/commons/compress/compressors/xz/**"/>
- <exclude name="org/apache/commons/compress/compressors/CompressorStreamFactory.java"/>
+- <exclude name="org/apache/commons/compress/compressors/CompressorStreamProvider.java"/>
- <exclude name="org/apache/commons/compress/compressors/CompressorException.java"/>
- <exclude name="org/apache/commons/compress/compressors/FileNameUtil.java"/>
- <exclude name="org/apache/commons/compress/compressors/deflate/**"/>
@@ -114,11 +115,10 @@ Forwarded: not-needed
- <exclude name="org/apache/commons/compress/compressors/lzw/**"/>
- <exclude name="org/apache/commons/compress/compressors/pack200/**"/>
- <exclude name="org/apache/commons/compress/compressors/snappy/**"/>
-- <exclude name="org/apache/commons/compress/compressors/z/**"/>
+ <exclude name="org/apache/commons/compress/compressors/z/**"/>
<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"/>
-@@ -257,19 +259,13 @@ Build-Date: ${build.tstamp}
+@@ -258,19 +260,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/**"/>
@@ -141,7 +141,7 @@ Forwarded: not-needed
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
-@@ -283,16 +279,12 @@ Build-Date: ${build.tstamp}
+@@ -284,16 +280,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"/>
@@ -159,7 +159,7 @@ Forwarded: not-needed
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
-@@ -306,7 +298,6 @@ Build-Date: ${build.tstamp}
+@@ -307,7 +299,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"/>
@@ -167,7 +167,7 @@ Forwarded: not-needed
<compilerarg line="-Xmaxwarns 1000"/>
</javac>
-@@ -320,6 +311,7 @@ Build-Date: ${build.tstamp}
+@@ -321,6 +312,7 @@ Build-Date: ${build.tstamp}
</uptodate>
<mkdir dir="${build.dir}"/>
<mkdir dir="${dist.dir}"/>
@@ -175,7 +175,7 @@ Forwarded: not-needed
</target>
<target name="javadoc" depends="init-properties">
<javadoc destdir="javadoc"
-@@ -345,6 +337,7 @@ Build-Date: ${build.tstamp}
+@@ -346,6 +338,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}"/>
@@ -183,7 +183,7 @@ Forwarded: not-needed
</target>
<macrodef name="init-test-preferences">
<attribute name="testfamily"/>
-@@ -769,6 +762,7 @@ Build-Date: ${build.tstamp}
+@@ -776,6 +769,7 @@ Build-Date: ${build.tstamp}
<pathelement path="${base.dir}"/>
<pathelement path="${proj-classpath}"/>
<pathelement path="${proj-build.dir}"/>
@@ -239,7 +239,7 @@ Forwarded: not-needed
+ <touch file="build-timestamp"/>
</target>
<target name="buildplugins" depends="init">
- <foreach param="path" target="plugintrans">
+ <foreach param="path" target="plugintrans" parallel="true" maxThreads="8">
@@ -147,15 +152,14 @@
</if>
<delete dir="${po.build.dir}/plugin_${dir}"/>
diff --git a/debian/patches/02-elemstyles.patch b/debian/patches/02-elemstyles.patch
deleted file mode 100644
index 3970ef8..0000000
--- a/debian/patches/02-elemstyles.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-Description: Use openstreetmap-map-icons-* packages.
- Map icons in Debian are not distributed in the josm package, but in
- the openstreetmap-map-icons-* packages, so they can be used also by other
- applications. This patch points josm to the shared directories.
-Author: Andreas Putzo <andreas at putzo.net>
-Forwarded: not-needed
-
---- a/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
-+++ b/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
-@@ -257,11 +257,19 @@ public final class MapPaintStyles {
- if (Main.pref.getBoolean("mappaint.icon.enable-defaults", true)) {
- /* don't prefix icon path, as it should be generic */
- dirs.add("resource://images/");
-+ addDebianDirs(dirs);
- }
-
- return dirs;
- }
-
-+ public static void addDebianDirs(Collection<String> f) {
-+ f.add("/usr/share/icons/openstreetmap/classic.small");
-+ f.add("/usr/share/icons/openstreetmap/square.small");
-+ f.add("/usr/share/icons/openstreetmap/classic.big");
-+ f.add("/usr/share/icons/openstreetmap/square.big");
-+ }
-+
- public static void readFromPreferences() {
- styles.clear();
-
---- a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java
-+++ b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java
-@@ -47,6 +47,7 @@ import org.openstreetmap.josm.gui.Notifi
- import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
- import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
- import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
-+import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
- import org.openstreetmap.josm.gui.preferences.ToolbarPreferences;
- import org.openstreetmap.josm.gui.tagging.presets.items.Key;
- import org.openstreetmap.josm.gui.tagging.presets.items.Link;
-@@ -205,8 +206,15 @@ public class TaggingPreset extends Abstr
- return;
- }
- File arch = TaggingPresetReader.getZipIcons();
-- final Collection<String> s = Main.pref.getCollection("taggingpreset.icon.sources", null);
-- ImageProvider imgProv = new ImageProvider(iconName);
-+ LinkedList<String> s = new LinkedList<String>();
-+ MapPaintStyles.addDebianDirs(s);
-+ final String realIconName;
-+ if (iconName.startsWith("styles/standard/")) {
-+ realIconName = iconName.replace("styles/standard/", "");
-+ } else {
-+ realIconName = iconName;
-+ }
-+ ImageProvider imgProv = new ImageProvider(realIconName);
- imgProv.setDirs(s);
- imgProv.setId("presets");
- imgProv.setArchive(arch);
-@@ -215,7 +223,7 @@ public class TaggingPreset extends Abstr
- if (result != null) {
- GuiHelper.runInEDT(() -> result.attachImageIcon(this));
- } else {
-- Main.warn(toString() + ": " + PRESET_ICON_ERROR_MSG_PREFIX + iconName);
-+ Main.warn(toString() + ": " + PRESET_ICON_ERROR_MSG_PREFIX + realIconName);
- }
- });
- }
---- a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItem.java
-+++ b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItem.java
-@@ -9,6 +9,7 @@ import java.util.Arrays;
- import java.util.Collection;
- import java.util.EnumSet;
- import java.util.LinkedHashMap;
-+import java.util.LinkedList;
- import java.util.List;
- import java.util.Map;
- import java.util.Set;
-@@ -20,6 +21,7 @@ import org.openstreetmap.josm.Main;
- import org.openstreetmap.josm.data.osm.OsmPrimitive;
- import org.openstreetmap.josm.data.osm.Tag;
- import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-+import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
- import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
- import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
- import org.openstreetmap.josm.tools.ImageProvider;
-@@ -124,12 +126,22 @@ public abstract class TaggingPresetItem
- }
-
- protected static ImageIcon loadImageIcon(String iconName, File zipIcons, Integer maxSize) {
-- final Collection<String> s = Main.pref.getCollection("taggingpreset.icon.sources", null);
-- ImageProvider imgProv = new ImageProvider(iconName).setDirs(s).setId("presets").setArchive(zipIcons).setOptional(true);
-+ LinkedList<String> s = new LinkedList<String>();
-+ MapPaintStyles.addDebianDirs(s);
-+ String realIconName = iconName;
-+ if (iconName.startsWith("styles/standard/")) {
-+ realIconName = iconName.replace("styles/standard/", "");
-+ }
-+ ImageProvider imgProv = new ImageProvider(realIconName).setDirs(s).setId("presets").setArchive(zipIcons).setOptional(true);
- if (maxSize != null) {
- imgProv.setMaxSize(maxSize);
- }
-- return imgProv.get();
-+ ImageIcon icon = imgProv.get();
-+ if (icon == null) {
-+ System.out.println("Could not get presets icon " + realIconName);
-+ icon = new ImageIcon(realIconName);
-+ }
-+ return icon;
- }
-
- /**
diff --git a/debian/patches/06-move_data_out_of_jar.patch b/debian/patches/06-move_data_out_of_jar.patch
index f3eb8b4..f76d98b 100644
--- a/debian/patches/06-move_data_out_of_jar.patch
+++ b/debian/patches/06-move_data_out_of_jar.patch
@@ -44,7 +44,7 @@ Forwarded: not-needed
/**
--- a/src/org/openstreetmap/josm/io/CachedFile.java
+++ b/src/org/openstreetmap/josm/io/CachedFile.java
-@@ -206,11 +206,17 @@ public class CachedFile implements Close
+@@ -207,11 +207,17 @@ public class CachedFile implements Close
File file = getFile();
if (file == null) {
if (name.startsWith("resource://")) {
diff --git a/debian/patches/08-use_noto_font.patch b/debian/patches/08-use_noto_font.patch
index 497b505..9c4d649 100644
--- a/debian/patches/08-use_noto_font.patch
+++ b/debian/patches/08-use_noto_font.patch
@@ -5,7 +5,7 @@ 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
-@@ -1556,7 +1556,7 @@ public class StyledMapRenderer extends A
+@@ -1561,7 +1561,7 @@ public class StyledMapRenderer extends A
showNames = paintSettings.getShowNamesDistance() > circum;
showIcons = paintSettings.getShowIconsDistance() > circum;
isOutlineOnly = paintSettings.isOutlineOnly();
diff --git a/debian/patches/series b/debian/patches/series
index 419e6a3..0e16b21 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
00-build.patch
01-bts.patch
-02-elemstyles.patch
03-default_look_and_feel.patch
04-use_system_jmapviewer.patch
05-fix_version.patch
--
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