[freeplane] 03/06: update/refresh patches for 1.5.18
Felix Natter
fnatter-guest at moszumanska.debian.org
Sat Dec 10 17:23:47 UTC 2016
This is an automated email from the git hooks/post-receive script.
fnatter-guest pushed a commit to branch master
in repository freeplane.
commit 49f5f8ac6654c2b453b454541e16b68b852e9570
Author: Felix Natter <fnatter at gmx.net>
Date: Sat Dec 10 17:39:59 2016 +0100
update/refresh patches for 1.5.18
---
debian/patches/10_build_usr_share_java.patch | 100 +++++++++++++--------------
debian/patches/20_freeplane_sh.patch | 6 +-
debian/patches/30_disable_update_check.patch | 2 +-
debian/patches/40_allow_usj_codebase.patch | 2 +-
debian/patches/50_jgoodies-1.9.patch | 47 -------------
debian/patches/series | 1 -
6 files changed, 55 insertions(+), 103 deletions(-)
diff --git a/debian/patches/10_build_usr_share_java.patch b/debian/patches/10_build_usr_share_java.patch
index 03adeaf..3f5b52e 100644
--- a/debian/patches/10_build_usr_share_java.patch
+++ b/debian/patches/10_build_usr_share_java.patch
@@ -9,42 +9,21 @@ Forwarded: not-needed
Last-Update: 2016-02-04
--- a/build.gradle
+++ b/build.gradle
-@@ -7,30 +7,46 @@
- ext.globalBuild = rootDir.path + '/BUILD'
-
- repositories {
-- maven { url "http://dl.bintray.com/freeplane/freeplane" }
-- // this is necessary to grab both binary and source jars
-- // for local (git) dependencies
-- flatDir name: 'localGitDepsRepository',
-- dirs: [rootDir.path + "/freeplane/lib",
-- rootDir.path + "/freeplane_plugin_jsyntaxpane/lib",
-- rootDir.path + "/freeplane_plugin_svg/lib"]
+@@ -1,3 +1,5 @@
++apply from: 'debian.gradle'
++
+ allprojects {
+ // in a multi-project setup, all projects must have the same version number!
+ // the real (specific) version number is in freeplane/viewer-resources/version.properties!
+@@ -15,6 +17,7 @@
+ rootDir.path + "/freeplane_plugin_jsyntaxpane/lib",
+ rootDir.path + "/freeplane_plugin_latex/lib",
+ rootDir.path + "/freeplane_plugin_svg/lib"]
+ flatDir name: '/usr/share/java', dir: '/usr/share/java'
}
}
-
-+def isDebianJar(File jar) {
-+ def ret = jar.path.startsWith("/usr/share/java/") ||
-+ jar.path.startsWith("/usr/share/maven-repo/")
-+ return ret;
-+}
-+
-+def relpath(File basePath, File targetPath) {
-+ def relPath = ""
-+ // targetPath is either '/usr/share/java/**' or '/usr/share/maven-repo/**'!
-+ def commonPrefix = '/usr/share'
-+ def parent = basePath
-+ while (parent.path != commonPrefix) {
-+ parent = parent.parentFile
-+ relPath += '../'
-+ }
-+ def targetPathRel = targetPath.path.replaceFirst(/^${commonPrefix}/, '').substring(1)
-+ relPath += targetPathRel
-+}
-+
-+
+@@ -22,16 +25,18 @@
// this is used for (linux) packages, where the dependencies
// live on the file system (/usr/share/java/*.jar on Debian):
def externalizeJar(File jar) {
@@ -68,7 +47,7 @@ Last-Update: 2016-02-04
}
def filterAndExternalizePluginDependencies(runtime_files) {
-@@ -76,12 +92,6 @@
+@@ -77,12 +82,6 @@
failOnError = false
}
@@ -81,16 +60,16 @@ Last-Update: 2016-02-04
dependencies {
testCompile group: 'junit', name: 'junit', version: '4.11'
}
-@@ -103,14 +113,10 @@
+@@ -104,14 +103,9 @@
// OSGi projects (/plugin/, freeplane) need this for compilation (e.g. resolve Bundle),
// and freeplane_framework needs to copy it to BUILD/framework.jar
configure(subprojects.findAll {it.name =~ /plugin/ || it.name =~ /^freeplane$/ || it.name =~ /^freeplane_framework$/}){
- repositories {
- maven {
-- url 'http://www.knopflerfish.org/maven2/'
+- url 'https://dl.bintray.com/knopflerfish/knopflerfish-maven/'
- }
- }
-
+-
dependencies {
- compile group: 'org.knopflerfish', name:'framework', version: '7.1.2'
+ //compile group: 'org.knopflerfish', name:'framework', version: '7.1.2'
@@ -98,7 +77,7 @@ Last-Update: 2016-02-04
}
}
-@@ -123,11 +129,13 @@
+@@ -124,11 +118,13 @@
else
ext.pluginid = project.name.replace("freeplane_plugin_", "org.freeplane.plugin.")
@@ -117,7 +96,7 @@ Last-Update: 2016-02-04
task filterOSGiManifestForEclipse(type: Copy) {
from('build/tmp/jar/MANIFEST.MF') {
-@@ -179,18 +187,11 @@
+@@ -180,18 +176,11 @@
configure(subprojects.findAll {it.name =~ /plugin/ }) {
task copyOSGiJars(type: Copy) {
@@ -155,12 +134,12 @@ Last-Update: 2016-02-04
compile project(':JOrtho_0.4_freeplane')
-@@ -13,19 +14,17 @@
+@@ -13,19 +14,18 @@
'commons-io:commons-io:2.4',
'commons-codec:commons-codec:1.7',
- 'com.jgoodies:jgoodies-forms:1.6.0',
-- 'com.jgoodies:jgoodies-common:1.4.0'
-+ //'com.jgoodies:jgoodies-common:1.4.0'
+ 'com.jgoodies:jgoodies-forms:1.9.0',
+- 'com.jgoodies:jgoodies-common:1.8.1'
++ //'com.jgoodies:jgoodies-common:1.8.1'
+ ':idw'
compile ('com.lightdev.app.shtm.simplyhtml:SimplyHTML:0.16.18') {
@@ -171,16 +150,16 @@ Last-Update: 2016-02-04
- testCompile 'junit:junit:4.12',
- 'org.hamcrest:hamcrest-all:1.3',
- 'org.mockito:mockito-all:1.10.19'
--
-- // from flatDir "localGitDepsRepository":
-- compile ':idw-gpl-1.6.1'
+ //testCompile 'junit:junit:4.12',
+ // 'org.hamcrest:hamcrest-all:1.3',
+ // 'org.mockito:mockito-all:1.10.19'
+
+- // from flatDir "localGitDepsRepository":
+- compile ':idw-gpl-1.6.1'
}
sourceSets {
-@@ -179,16 +178,17 @@
+@@ -180,16 +180,17 @@
}
task copyOSGiJars(type: Copy) {
@@ -207,7 +186,7 @@ Last-Update: 2016-02-04
}
into(globalBuild + '/core/' + pluginid + '/lib/')
}
-@@ -311,7 +311,7 @@
+@@ -312,7 +313,7 @@
jar.dependsOn viewerJar
jar.dependsOn editorJar
jar.dependsOn osgiJar
@@ -230,12 +209,12 @@ Last-Update: 2016-02-04
jar {
--- a/freeplane_plugin_latex/build.gradle
+++ b/freeplane_plugin_latex/build.gradle
-@@ -1,7 +1,8 @@
+@@ -1,8 +1,7 @@
dependencies {
compile project(':freeplane')
compile project(':freeplane_plugin_jsyntaxpane')
-- compile group: 'org.scilab.forge', name: 'jlatexmath', version:'1.0.2'
-+ //compile group: 'org.scilab.forge', name: 'jlatexmath', version:'1.0.2'
+- // from flatDir "localGitDepsRepository" (jlatexmath-1.0.3 is not in maven!)
+- compile ':jlatexmath-1.0.3'
+ compile ':jlatexmath'
}
@@ -281,3 +260,24 @@ Last-Update: 2016-02-04
}
jar {
+--- /dev/null
++++ b/debian.gradle
+@@ -0,0 +1,18 @@
++def isDebianJar(File jar) {
++ def ret = jar.path.startsWith("/usr/share/java/") ||
++ jar.path.startsWith("/usr/share/maven-repo/")
++ return ret;
++}
++
++def relpath(File basePath, File targetPath) {
++ def relPath = ""
++ // targetPath is either '/usr/share/java/**' or '/usr/share/maven-repo/**'!
++ def commonPrefix = '/usr/share'
++ def parent = basePath
++ while (parent.path != commonPrefix) {
++ parent = parent.parentFile
++ relPath += '../'
++ }
++ def targetPathRel = targetPath.path.replaceFirst(/^${commonPrefix}/, '').substring(1)
++ relPath += targetPathRel
++}
diff --git a/debian/patches/20_freeplane_sh.patch b/debian/patches/20_freeplane_sh.patch
index a1f4ce4..0770596 100644
--- a/debian/patches/20_freeplane_sh.patch
+++ b/debian/patches/20_freeplane_sh.patch
@@ -98,8 +98,8 @@ Last-Update: 2016-05-05
fi
output_debug_info
-@@ -174,7 +188,8 @@
- #JAVA_OPTS="-Dorg.freeplane.nosplash=true $JAVA_OPTS"
+@@ -179,7 +193,8 @@
+ fi
_debug "Calling: "\
-"${JAVACMD}" -Xmx512m\
@@ -108,7 +108,7 @@ Last-Update: 2016-05-05
"-Dorg.freeplane.userfpdir=$userfpdir"\
"-Dorg.freeplane.old_userfpdir=$old_userfpdir"\
"-Dorg.freeplane.globalresourcedir=${freedir}/resources"\
-@@ -186,7 +201,8 @@
+@@ -191,7 +206,8 @@
( echo "${DEBUG}" | grep -qe "exit" ) && exit 0 # do not start Freeplane
# now actually launch Freeplane
diff --git a/debian/patches/30_disable_update_check.patch b/debian/patches/30_disable_update_check.patch
index 6b7574d..38c090f 100644
--- a/debian/patches/30_disable_update_check.patch
+++ b/debian/patches/30_disable_update_check.patch
@@ -15,7 +15,7 @@ Last-Update: 2016-02-04
connector_shape=CUBIC_CURVE
--- a/freeplane/external-resources/xml/mindmapmodemenu.xml
+++ b/freeplane/external-resources/xml/mindmapmodemenu.xml
-@@ -463,7 +463,7 @@
+@@ -467,7 +467,7 @@
<Entry builder="separator" />
</Entry>
<Entry name="help">
diff --git a/debian/patches/40_allow_usj_codebase.patch b/debian/patches/40_allow_usj_codebase.patch
index f452f73..d579de7 100644
--- a/debian/patches/40_allow_usj_codebase.patch
+++ b/debian/patches/40_allow_usj_codebase.patch
@@ -5,7 +5,7 @@ Forwarded: not-needed
Last-Update: 2016-05-05
--- a/freeplane_framework/script/freeplane.policy
+++ b/freeplane_framework/script/freeplane.policy
-@@ -2,6 +2,18 @@
+@@ -6,6 +6,18 @@
permission java.security.AllPermission;
};
diff --git a/debian/patches/50_jgoodies-1.9.patch b/debian/patches/50_jgoodies-1.9.patch
deleted file mode 100644
index 595d711..0000000
--- a/debian/patches/50_jgoodies-1.9.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Description: Fix building against jgoodies-forms-1.9
-Author: Oliver Kopp <kopp.dev at gmail.com>
-Applied-Upstream: https://github.com/freeplane/freeplane/commit/95684d2e9f753cd79819d1c72a05258662592e6f
-Reviewed-by: Felix Natter <fnatter at gmx.net>
-Last-Update: 2016-11-20
---- a/freeplane/src/main/java/org/freeplane/core/resources/components/OptionPanel.java
-+++ b/freeplane/src/main/java/org/freeplane/core/resources/components/OptionPanel.java
-@@ -50,6 +50,7 @@
- import javax.swing.filechooser.FileNameExtensionFilter;
- import javax.swing.tree.DefaultMutableTreeNode;
-
-+import com.jgoodies.forms.factories.Borders;
- import org.apache.commons.lang.StringUtils;
- import org.dpolivaev.mnemonicsetter.MnemonicSetter;
- import org.freeplane.core.resources.ResourceController;
-@@ -134,7 +135,8 @@
- final TabProperty newTab = (TabProperty) control;
- bottomLayout = new FormLayout(newTab.getName(), "");
- bottomBuilder = new DefaultFormBuilder(bottomLayout);
-- bottomBuilder.setDefaultDialogBorder();
-+ //bottomBuilder.setDefaultDialogBorder();
-+ bottomBuilder.border(Borders.DIALOG);
- final JScrollPane bottomComponent = new JScrollPane(bottomBuilder.getPanel());
- UITools.setScrollbarIncrement(bottomComponent);
- final String tabName = TextUtils.getOptionalText(newTab.getLabel());
---- a/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/StyleEditorPanel.java
-+++ b/freeplane/src/main/java/org/freeplane/features/styles/mindmapmode/StyleEditorPanel.java
-@@ -116,6 +116,9 @@
- import com.jgoodies.forms.factories.Borders;
- import com.jgoodies.forms.layout.FormLayout;
-
-+import com.jgoodies.forms.factories.*;
-+import com.jgoodies.forms.layout.*;
-+
- public class StyleEditorPanel extends JPanel {
- private static final int FONT_SIZE = Math.round(UITools.FONT_SCALE_FACTOR * 8);
- private static final TranslatedObject AUTOMATIC_LAYOUT_DISABLED = new TranslatedObject("automatic_layout_disabled");
-@@ -842,7 +845,8 @@
- final String form = "right:max(20dlu;p), 2dlu, p, 1dlu,right:max(20dlu;p), 4dlu, 80dlu, 7dlu";
- final FormLayout rightLayout = new FormLayout(form, "");
- final DefaultFormBuilder rightBuilder = new DefaultFormBuilder(rightLayout);
-- rightBuilder.border(Borders.DLU2);
-+ //rightBuilder.border(Borders.DLU2);
-+ rightBuilder.border(Paddings.DLU2);
- new SeparatorProperty("OptionPanel.separator.NodeStyle").layout(rightBuilder);
- if (addStyleBox) {
- addAutomaticLayout(rightBuilder);
diff --git a/debian/patches/series b/debian/patches/series
index 6ddfac3..d177a01 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
20_freeplane_sh.patch
30_disable_update_check.patch
40_allow_usj_codebase.patch
-50_jgoodies-1.9.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/freeplane.git
More information about the pkg-java-commits
mailing list