Page MenuHomeSolus
Files F10693355

D10400.diff
No OneTemporary
Actions

D10400.diff
View Options

diff --git a/files/0001-Add-jcenter-to-repositories.patch b/files/0001-Add-jcenter-to-repositories.patch
new file mode 100644
--- /dev/null
+++ b/files/0001-Add-jcenter-to-repositories.patch
@@ -0,0 +1,24 @@
+From e7ad21d07bdce8fe5b8bdbd38f08527beef656ec Mon Sep 17 00:00:00 2001
+From: Campbell Jones <git@serebit.com>
+Date: Wed, 20 Jan 2021 14:56:57 -0500
+Subject: [PATCH] Add jcenter to repositories
+
+---
+ build.gradle | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/build.gradle b/build.gradle
+index 49146e7dc..ae50100ea 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -32,6 +32,7 @@ allprojects {
+
+ repositories {
+ mavenCentral()
++ jcenter()
+ maven { url 'https://resources.knopflerfish.org/repo/maven2/release/' }
+ maven { url "${project.gradle.gradleUserHomeDir}/local-artifacts" }
+ maven { url 'https://dl.bintray.com/freeplane/freeplane' }
+--
+2.30.0
+
diff --git a/files/0001-fix-failing-gradle-build.patch b/files/0001-fix-failing-gradle-build.patch
deleted file mode 100644
--- a/files/0001-fix-failing-gradle-build.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From e1d6707ffd56e705fd68a2c24caf5f4cc44e5dcf Mon Sep 17 00:00:00 2001
-From: Beniamin Kalinowski <beniamin.kalinowski@gmail.com>
-Date: Fri, 22 May 2020 10:49:22 +0200
-Subject: [PATCH] fix failing gradle build (#160)
-
----
- build.gradle | 2 +-
- .../ui/menubuilders/menu/MenuBuildProcessFactoryTest.java | 5 +++++
- freeplane_api/src/main/java/org/freeplane/api/Connector.java | 4 ++--
- .../src/main/java/org/freeplane/api/ConnectorRO.java | 4 ++--
- freeplane_api/src/main/java/org/freeplane/api/Link.java | 4 ++--
- 5 files changed, 12 insertions(+), 7 deletions(-)
-
-diff --git a/build.gradle b/build.gradle
-index caef729e8..49146e7dc 100644
---- a/build.gradle
-+++ b/build.gradle
-@@ -8,7 +8,7 @@ buildscript {
- }
-
- plugins {
-- id 'nebula.ospackage' version '8.1.0'
-+ id 'nebula.ospackage' version '8.3.0'
- id 'com.github.ben-manes.versions' version '0.28.0'
- id 'org.owasp.dependencycheck' version '5.3.0' apply false
- }
-diff --git a/freeplane/src/test/java/org/freeplane/core/ui/menubuilders/menu/MenuBuildProcessFactoryTest.java b/freeplane/src/test/java/org/freeplane/core/ui/menubuilders/menu/MenuBuildProcessFactoryTest.java
-index 10fab77d7..0bd087951 100644
---- a/freeplane/src/test/java/org/freeplane/core/ui/menubuilders/menu/MenuBuildProcessFactoryTest.java
-+++ b/freeplane/src/test/java/org/freeplane/core/ui/menubuilders/menu/MenuBuildProcessFactoryTest.java
-@@ -11,6 +11,7 @@ import javax.swing.JMenu;
-
- import org.freeplane.core.ui.IUserInputListenerFactory;
- import org.freeplane.core.ui.components.FreeplaneMenuBar;
-+import org.freeplane.core.ui.menubuilders.HeadlessFreeplaneRunner;
- import org.freeplane.core.ui.menubuilders.XmlEntryStructureBuilder;
- import org.freeplane.core.ui.menubuilders.action.EntriesForAction;
- import org.freeplane.core.ui.menubuilders.action.IAcceleratorMap;
-@@ -29,6 +30,10 @@ public class MenuBuildProcessFactoryTest {
- private PhaseProcessor phaseProcessor;
- private FreeplaneActions freeplaneActions;
-
-+ static {
-+ new HeadlessFreeplaneRunner();
-+ }
-+
- @Before
- public void setup() {
- freeplaneActions = mock(FreeplaneActions.class);
-diff --git a/freeplane_api/src/main/java/org/freeplane/api/Connector.java b/freeplane_api/src/main/java/org/freeplane/api/Connector.java
-index 14e317de8..f6b5265c0 100644
---- a/freeplane_api/src/main/java/org/freeplane/api/Connector.java
-+++ b/freeplane_api/src/main/java/org/freeplane/api/Connector.java
-@@ -42,7 +42,7 @@ public interface Connector extends ConnectorRO {
- void setDashArray(int[] dashArray);
-
- /**
-- * 0 <= opacity <= 255
-+ * 0 &lt;= opacity &lt;= 255
- *
- * Since 1.7.10
- */
-@@ -65,4 +65,4 @@ public interface Connector extends ConnectorRO {
- void setLabelFontSize(int size);
-
-
--}
-\ No newline at end of file
-+}
-diff --git a/freeplane_api/src/main/java/org/freeplane/api/ConnectorRO.java b/freeplane_api/src/main/java/org/freeplane/api/ConnectorRO.java
-index f12cde32b..9808db91c 100644
---- a/freeplane_api/src/main/java/org/freeplane/api/ConnectorRO.java
-+++ b/freeplane_api/src/main/java/org/freeplane/api/ConnectorRO.java
-@@ -22,7 +22,7 @@ public interface ConnectorRO {
- int[] getDashArray();
-
- /**
-- * 0 <= opacity <= 255
-+ * 0 &lt;= opacity &lt;= 255
- *
- * Since 1.7.10
- */
-@@ -71,4 +71,4 @@ public interface ConnectorRO {
- /** returns a Point.
- * @since 1.3.3 */
- List<Integer> getEndInclination();
--}
-\ No newline at end of file
-+}
-diff --git a/freeplane_api/src/main/java/org/freeplane/api/Link.java b/freeplane_api/src/main/java/org/freeplane/api/Link.java
-index ba5f681d4..fc7df8a41 100644
---- a/freeplane_api/src/main/java/org/freeplane/api/Link.java
-+++ b/freeplane_api/src/main/java/org/freeplane/api/Link.java
-@@ -43,7 +43,7 @@ public interface Link extends LinkRO {
- boolean set(String target);
-
- /** removes the link. Same as <code>node.link.text = null</code>.
-- * @return <tt>true</tt> if there was a link to remove.
-+ * @return <code>true</code> if there was a link to remove.
- * @since 1.4 */
- boolean remove();
--}
-\ No newline at end of file
-+}
---
-2.27.0
-
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,15 +1,16 @@
name : freeplane
-version : 1.8.5
-release : 10
+version : 1.8.10
+release : 11
source :
- - https://github.com/freeplane/freeplane/archive/release-1.8.5.tar.gz : 68e9688ef3d689c13a219f8b6ccad90607ab08cdba9d1f84cd47f02a24def426
+ - https://github.com/freeplane/freeplane/archive/release-1.8.10.tar.gz : d4420a75e8338a26ebde77da3c5caa81ceebcc162150857066b9266f41a4d6a4
homepage : https://www.freeplane.org
license : GPL-2.0-or-later
component : office
-networking : yes
+homepage : https://www.freeplane.org/
summary : An application for mind mapping, plus knowledge and project management
description: |
Freeplane is a free and open source software application that supports thinking, sharing information and getting things done at work, in school and at home. The software can be used for mind mapping and analyzing the information contained in mind maps.
+networking : yes
builddeps :
- font-ubuntu-ttf # Tests
- fontconfig # Tests
@@ -19,10 +20,9 @@
- openjdk-11
setup : |
rm -rf freeplane_mac
+ %patch -p1 < $pkgfiles/0001-Add-jcenter-to-repositories.patch
build : |
- %patch -p1 < $pkgfiles/0001-fix-failing-gradle-build.patch
- export GRADLE_USER_HOME=$workdir/.gradle
- gradle --no-daemon build
+ GRADLE_USER_HOME=$workdir/.gradle_home gradle --no-daemon build
install : |
install -dm00755 $installdir/usr/share/freeplane
cp -a BIN/* $installdir/usr/share/freeplane
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -1,7 +1,7 @@
<PISI>
<Source>
<Name>freeplane</Name>
- <Homepage>https://www.freeplane.org</Homepage>
+ <Homepage>https://www.freeplane.org/</Homepage>
<Packager>
<Name>Campbell Jones</Name>
<Email>dev@serebit.com</Email>
@@ -23,7 +23,7 @@
<Path fileType="executable">/usr/bin/freeplane</Path>
<Path fileType="data">/usr/share/applications/freeplane.desktop</Path>
<Path fileType="data">/usr/share/freeplane/core/org.freeplane.core/META-INF/MANIFEST.MF</Path>
- <Path fileType="data">/usr/share/freeplane/core/org.freeplane.core/lib/SimplyHTML-0.17.6.jar</Path>
+ <Path fileType="data">/usr/share/freeplane/core/org.freeplane.core/lib/SimplyHTML-0.17.9.jar</Path>
<Path fileType="data">/usr/share/freeplane/core/org.freeplane.core/lib/annotations-16.0.1.jar</Path>
<Path fileType="data">/usr/share/freeplane/core/org.freeplane.core/lib/common-image-3.5.jar</Path>
<Path fileType="data">/usr/share/freeplane/core/org.freeplane.core/lib/common-io-3.5.jar</Path>
@@ -34,10 +34,10 @@
<Path fileType="data">/usr/share/freeplane/core/org.freeplane.core/lib/darcula-2018.2.jar</Path>
<Path fileType="data">/usr/share/freeplane/core/org.freeplane.core/lib/data-url-1.0.1.jar</Path>
<Path fileType="data">/usr/share/freeplane/core/org.freeplane.core/lib/emoji-12.1.4.jar</Path>
- <Path fileType="data">/usr/share/freeplane/core/org.freeplane.core/lib/freeplane_mac-1.8.5.jar</Path>
+ <Path fileType="data">/usr/share/freeplane/core/org.freeplane.core/lib/freeplane_mac-1.8.10.jar</Path>
<Path fileType="data">/usr/share/freeplane/core/org.freeplane.core/lib/freeplaneapi_viewer.jar</Path>
- <Path fileType="data">/usr/share/freeplane/core/org.freeplane.core/lib/freeplaneeditor-1.8.5.jar</Path>
- <Path fileType="data">/usr/share/freeplane/core/org.freeplane.core/lib/freeplaneosgi-1.8.5.jar</Path>
+ <Path fileType="data">/usr/share/freeplane/core/org.freeplane.core/lib/freeplaneeditor-1.8.10.jar</Path>
+ <Path fileType="data">/usr/share/freeplane/core/org.freeplane.core/lib/freeplaneosgi-1.8.10.jar</Path>
<Path fileType="data">/usr/share/freeplane/core/org.freeplane.core/lib/freeplaneviewer.jar</Path>
<Path fileType="data">/usr/share/freeplane/core/org.freeplane.core/lib/idw-gpl-1.6.1.jar</Path>
<Path fileType="data">/usr/share/freeplane/core/org.freeplane.core/lib/imageio-core-3.5.jar</Path>
@@ -45,7 +45,7 @@
<Path fileType="data">/usr/share/freeplane/core/org.freeplane.core/lib/imageio-metadata-3.5.jar</Path>
<Path fileType="data">/usr/share/freeplane/core/org.freeplane.core/lib/jgoodies-common-1.8.1.jar</Path>
<Path fileType="data">/usr/share/freeplane/core/org.freeplane.core/lib/jgoodies-forms-1.9.0.jar</Path>
- <Path fileType="data">/usr/share/freeplane/core/org.freeplane.core/lib/jortho-1.8.5.jar</Path>
+ <Path fileType="data">/usr/share/freeplane/core/org.freeplane.core/lib/jortho-1.8.10.jar</Path>
<Path fileType="data">/usr/share/freeplane/core/org.freeplane.core/lib/kitfox-svg-salamander-1.1.1-p1.jar</Path>
<Path fileType="data">/usr/share/freeplane/doc/Freeplane_LaTeX.mm</Path>
<Path fileType="data">/usr/share/freeplane/doc/Images/Preferences_Joining nodes.png</Path>
@@ -108,8 +108,7 @@
<Path fileType="data">/usr/share/freeplane/doc/api/jquery/images/ui-icons_454545_256x240.png</Path>
<Path fileType="data">/usr/share/freeplane/doc/api/jquery/images/ui-icons_888888_256x240.png</Path>
<Path fileType="data">/usr/share/freeplane/doc/api/jquery/images/ui-icons_cd0a0a_256x240.png</Path>
- <Path fileType="data">/usr/share/freeplane/doc/api/jquery/jquery-3.3.1.js</Path>
- <Path fileType="data">/usr/share/freeplane/doc/api/jquery/jquery-migrate-3.0.1.js</Path>
+ <Path fileType="data">/usr/share/freeplane/doc/api/jquery/jquery-3.5.1.js</Path>
<Path fileType="data">/usr/share/freeplane/doc/api/jquery/jquery-ui.css</Path>
<Path fileType="data">/usr/share/freeplane/doc/api/jquery/jquery-ui.js</Path>
<Path fileType="data">/usr/share/freeplane/doc/api/jquery/jquery-ui.min.css</Path>
@@ -270,20 +269,20 @@
<Path fileType="data">/usr/share/freeplane/freeplanelauncher.jar</Path>
<Path fileType="data">/usr/share/freeplane/init.xargs</Path>
<Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.bugreport/META-INF/MANIFEST.MF</Path>
- <Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.bugreport/lib/plugin-1.8.5.jar</Path>
+ <Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.bugreport/lib/plugin-1.8.10.jar</Path>
<Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.formula/META-INF/MANIFEST.MF</Path>
- <Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.formula/lib/plugin-1.8.5.jar</Path>
+ <Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.formula/lib/plugin-1.8.10.jar</Path>
<Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.jsyntaxpane/META-INF/MANIFEST.MF</Path>
<Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.jsyntaxpane/lib/jsyntaxpane-0.9.6~r156-7.jar</Path>
- <Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.jsyntaxpane/lib/plugin-1.8.5.jar</Path>
+ <Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.jsyntaxpane/lib/plugin-1.8.10.jar</Path>
<Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.latex/META-INF/MANIFEST.MF</Path>
<Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.latex/lib/jlatexmath-1.0.7.jar</Path>
<Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.latex/lib/jlatexmath-font-cyrillic-1.0.7.jar</Path>
<Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.latex/lib/jlatexmath-font-greek-1.0.7.jar</Path>
- <Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.latex/lib/plugin-1.8.5.jar</Path>
+ <Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.latex/lib/plugin-1.8.10.jar</Path>
<Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.openmaps/META-INF/MANIFEST.MF</Path>
<Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.openmaps/lib/jmapviewer-2.9.jar</Path>
- <Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.openmaps/lib/plugin-1.8.5.jar</Path>
+ <Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.openmaps/lib/plugin-1.8.10.jar</Path>
<Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.script/META-INF/MANIFEST.MF</Path>
<Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.script/lib/groovy-3.0.1.jar</Path>
<Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.script/lib/groovy-console-3.0.1.jar</Path>
@@ -302,7 +301,7 @@
<Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.script/lib/groovy-xml-3.0.1.jar</Path>
<Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.script/lib/ivy-2.5.0.jar</Path>
<Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.script/lib/jline-2.14.6.jar</Path>
- <Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.script/lib/plugin-1.8.5.jar</Path>
+ <Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.script/lib/plugin-1.8.10.jar</Path>
<Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.svg/META-INF/MANIFEST.MF</Path>
<Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.svg/lib/batik-anim-1.12.jar</Path>
<Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.svg/lib/batik-awt-util-1.12.jar</Path>
@@ -328,7 +327,7 @@
<Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.svg/lib/fop-core-2.4.jar</Path>
<Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.svg/lib/fop-events-2.4.jar</Path>
<Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.svg/lib/fop-util-2.4.jar</Path>
- <Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.svg/lib/plugin-1.8.5.jar</Path>
+ <Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.svg/lib/plugin-1.8.10.jar</Path>
<Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.svg/lib/xml-apis-1.4.01.jar</Path>
<Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.svg/lib/xml-apis-ext-1.3.04.jar</Path>
<Path fileType="data">/usr/share/freeplane/plugins/org.freeplane.plugin.svg/lib/xmlgraphics-commons-2.4.jar</Path>
@@ -380,12 +379,12 @@
</Files>
</Package>
<History>
- <Update release="10">
- <Date>2020-06-07</Date>
- <Version>1.8.5</Version>
+ <Update release="11">
+ <Date>2021-01-20</Date>
+ <Version>1.8.10</Version>
<Comment>Packaging update</Comment>
<Name>Campbell Jones</Name>
<Email>dev@serebit.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Apr 25 2023, 11:20 PM (15 w, 3 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5793672
Default Alt Text
D10400.diff (16 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.