[freeplane] 01/03: add patch to build against jgoodies-forms-1.9

[Felix Natter]

This is an automated email from the git hooks/post-receive script.

fnatter-guest pushed a commit to branch master
in repository freeplane.

commit 47e3c37735a7b2919cc79c98914f92eb085eca08
Author: Felix Natter <fnatter at gmx.net>
Date:   Sun Nov 20 14:16:06 2016 +0100

    add patch to build against jgoodies-forms-1.9
---
 debian/changelog                     |  6 ++++++
 debian/control                       |  4 ++--
 debian/patches/50_jgoodies-1.9.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 4 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 24eb3ba..2792b3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+freeplane (1.5.16-2) experimental; urgency=medium
+
+  * apply patch to build against jgoodies 1.9
+
+ -- Felix Natter <fnatter at gmx.net>  Sun, 20 Nov 2016 14:09:33 +0100
+
 freeplane (1.5.16-1) unstable; urgency=medium
 
   * New upstream version.
diff --git a/debian/control b/debian/control
index 974f4ea..b568512 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends-Indep: javahelp2,
                      groovy,
                      libcommons-lang-java (>= 2.6),
                      libcommons-io-java,
-                     libjgoodies-forms-java (>= 1.6.0),
+                     libjgoodies-forms-java (>= 1.9.0),
                      simplyhtml (>= 0.16.18),
                      libbatik-java,
                      librhino-java,
@@ -45,7 +45,7 @@ Depends: ${misc:Depends},
          groovy,
          libcommons-lang-java (>= 2.6),
          libcommons-io-java,
-         libjgoodies-forms-java (>= 1.6.0),
+         libjgoodies-forms-java (>= 1.9.0),
          simplyhtml (>= 0.16.18),
          libbatik-java,
          librhino-java,
diff --git a/debian/patches/50_jgoodies-1.9.patch b/debian/patches/50_jgoodies-1.9.patch
new file mode 100644
index 0000000..6127212
--- /dev/null
+++ b/debian/patches/50_jgoodies-1.9.patch
@@ -0,0 +1,26 @@
+Description: Fix building against jgoodies-forms-1.9
+Author: Oliver Kopp <kopp.dev at gmail.com>
+Forwarded: https://github.com/freeplane/freeplane/pull/60
+Applied-Upstream: PENDING
+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());
diff --git a/debian/patches/series b/debian/patches/series
index d177a01..6ddfac3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 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