diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
| commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
| tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /sci-geosciences/josm/files | |
| download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip | |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sci-geosciences/josm/files')
| -rw-r--r-- | sci-geosciences/josm/files/josm-7347-dist-optimized-fix.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/sci-geosciences/josm/files/josm-7347-dist-optimized-fix.patch b/sci-geosciences/josm/files/josm-7347-dist-optimized-fix.patch new file mode 100644 index 000000000000..7ad808c9c98d --- /dev/null +++ b/sci-geosciences/josm/files/josm-7347-dist-optimized-fix.patch @@ -0,0 +1,34 @@ +Index: trunk/build.xml + +This is the fix for josm bug #7351, which affects Gentoo builds. +=================================================================== +--- a/trunk/build.xml ++++ b/trunk/build.xml +@@ -230,6 +230,8 @@ + <compilerarg value="-Xlint:static"/> + <compilerarg value="-Xlint:try"/> + <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"/> + </javac> + <copy todir="build" failonerror="no" includeemptydirs="no"> + <fileset dir="resources"/> +@@ -419,7 +421,7 @@ + -keep class JOSM + -keep class * extends org.openstreetmap.josm.io.FileImporter + -keep class * extends org.openstreetmap.josm.io.FileExporter +- -keep class org.openstreetmap.josm.data.imagery.types.Adapter1 ++ -keep class org.w3._2001.xmlschema.Adapter1 + -keep class org.openstreetmap.josm.actions.search.SearchCompiler$Never + + -keepclassmembers enum * { +@@ -432,7 +434,8 @@ + public protected *; + } + +- # Disable annoying [proguard] Note: the configuration keeps the entry point '...', but not the descriptor class '...'. This notes should not be a problem as we don't use obfuscation ++ # Disable annoying [proguard] Note: the configuration keeps the entry point '...', but not the descriptor class '...'. ++ # This note should not be a problem as we don't use obfuscation + -dontnote + </proguard> + </target> |