update to 3.7.8

5 files changed, 24 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 334aff4e21f0..1502e2ae308e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xmind
 	pkgdesc = Brainstorming and Mind Mapping Software
-	pkgver = 3.7.7
+	pkgver = 3.7.8+8update8
 	pkgrel = 1
 	url = http://www.xmind.net
 	install = xmind.install
@@ -12,15 +12,13 @@ pkgbase = xmind
 	optdepends = gtk2: gtk2 or gtk3 must install one
 	optdepends = gtk3: gtk2 or gtk3 must install one
 	optdepends = lame: needed for the feature audio notes
-	source = http://www.xmind.net/xmind/downloads/xmind-8-update7-linux.zip
+	source = http://www.xmind.net/xmind/downloads/xmind-8-update8-linux.zip
 	source = XMind
-	source = XMind.ini
 	source = xmind.desktop
 	source = xmind.xml
 	source = xmind.png
 	source = xmind_file.png
-	sha512sums = 0f59201f44b23436c7e6e3fd4dd1427337e5a262e5d4f25dbc836c2f4fd42b99232c1988138ba7015523ede50e0ae829ada6359698d5af0eee529ed19cd347e3
-	sha512sums = SKIP
+	sha512sums = 77c5c05801f3ad3c0bf5550fa20c406f64f3f5fa31321a53786ac1939053f5c4f0d0fb8ab1af0a9b574e3950342325b9c32cf2e9a11bf00a1d74d2be1df75768
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 0ac3a9a405cd..5363f522d41a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,12 +6,14 @@
 
 # GTK_VERSION 2/3
 GTK_VERSION=3
-# JAVA_VERSION 8/9
-JAVA_VERSION=8
+# JAVA_VERSION 8/10
+JAVA_VERSION=10
+# JAVA_PATH
+#JAVA_PATH='/usr/lib/jvm/default-runtime/bin/java'
 
 pkgname=xmind
-pkgver=3.7.7
-_filename=$pkgname-8-update7-linux
+pkgver=3.7.8+8update8
+_filename=$pkgname-8-update8-linux
 pkgrel=1
 pkgdesc="Brainstorming and Mind Mapping Software"
 arch=('i686' 'x86_64')
@@ -21,16 +23,14 @@ depends=('java-runtime>=8')
 optdepends=('gtk2: gtk2 or gtk3 must install one'
             'gtk3: gtk2 or gtk3 must install one'
             'lame: needed for the feature audio notes')
-install='xmind.install'
+install=xmind.install
 source=("http://www.xmind.net/xmind/downloads/${_filename}.zip"
 'XMind'
-'XMind.ini'
 'xmind.desktop'
 'xmind.xml'
 'xmind.png'
 'xmind_file.png')
-sha512sums=('0f59201f44b23436c7e6e3fd4dd1427337e5a262e5d4f25dbc836c2f4fd42b99232c1988138ba7015523ede50e0ae829ada6359698d5af0eee529ed19cd347e3'
-'SKIP'
+sha512sums=('77c5c05801f3ad3c0bf5550fa20c406f64f3f5fa31321a53786ac1939053f5c4f0d0fb8ab1af0a9b574e3950342325b9c32cf2e9a11bf00a1d74d2be1df75768'
 'SKIP'
 'SKIP'
 'SKIP'
@@ -42,9 +42,10 @@ package() {
     cp -r ${srcdir}/configuration   ${pkgdir}/usr/share/${pkgname}/
     cp -r ${srcdir}/features        ${pkgdir}/usr/share/${pkgname}/
     cp -r ${srcdir}/plugins         ${pkgdir}/usr/share/${pkgname}/
-    cp ${srcdir}/*.html             ${pkgdir}/usr/share/${pkgname}/
     cp ${srcdir}/*.xml              ${pkgdir}/usr/share/${pkgname}/
-    cp ${srcdir}/*.txt              ${pkgdir}/usr/share/${pkgname}/
+    mkdir -p ${pkgdir}/usr/share/licenses/${pkgname}
+    cp ${srcdir}/{epl-v10,lgpl-3.0}.html    ${pkgdir}/usr/share/licenses/${pkgname}/
+    cp ${srcdir}/xpla.txt                   ${pkgdir}/usr/share/licenses/${pkgname}/
     if [[ "$CARCH" == "i686" ]]; then
         cp -r ${srcdir}/XMind_i386  ${pkgdir}/usr/share/${pkgname}/XMind
     else
@@ -59,22 +60,17 @@ package() {
     mkdir -p ${pkgdir}/usr/share/pixmaps
     cp ${srcdir}/*.png              ${pkgdir}/usr/share/pixmaps/
     # fix configuration
-    cp ${srcdir}/XMind.ini ${pkgdir}/usr/share/${pkgname}/XMind/
-    if [[ "$CARCH" == "i686" ]]; then
-        sed -i "s/CARCH/x86/g" ${pkgdir}/usr/share/${pkgname}/XMind/XMind.ini
-    else
-        sed -i "s/CARCH/x86_64/g" ${pkgdir}/usr/share/${pkgname}/XMind/XMind.ini
+    sed -i "s|^./configuration$|@user.home/.xmind/configuration|" ${pkgdir}/usr/share/${pkgname}/XMind/XMind.ini
+    sed -i "s|^../workspace$|@user.home/.xmind/workspace|" ${pkgdir}/usr/share/${pkgname}/XMind/XMind.ini
+    if [[ "$GTK_VERSION" != "2" ]]; then
+        sed -i "s|^2$|3|" ${pkgdir}/usr/share/${pkgname}/XMind/XMind.ini
     fi
-    if [[ "$GTK_VERSION" == "2" ]]; then
-        sed -i "s/GTK_VERSION/2/g" ${pkgdir}/usr/share/${pkgname}/XMind/XMind.ini
-    else
-        sed -i "s/GTK_VERSION/3/g" ${pkgdir}/usr/share/${pkgname}/XMind/XMind.ini
+    if [[ "$JAVA_VERSION" != "8" ]]; then
+        echo "--add-modules=java.se.ee" >> ${pkgdir}/usr/share/${pkgname}/XMind/XMind.ini
     fi
-    if [[ "$JAVA_VERSION" == "8" ]]; then
-        sed -i "s/JAVA_VERSION//g" ${pkgdir}/usr/share/${pkgname}/XMind/XMind.ini
-    else
-        sed -i "s/JAVA_VERSION/--add-modules=java.se.ee/g" ${pkgdir}/usr/share/${pkgname}/XMind/XMind.ini
+    if [[ "$JAVA_PATH" != "" ]]; then
+        sed -i "s|^-vmargs$|-vm\n${JAVA_PATH}\n-vmargs|" ${pkgdir}/usr/share/${pkgname}/XMind/XMind.ini
     fi
     mkdir -p ${pkgdir}/usr/bin
-    cp ${srcdir}/XMind ${pkgdir}/usr/bin/
+    cp ${srcdir}/XMind              ${pkgdir}/usr/bin/
 }
diff --git a/XMind.ini b/XMind.ini
deleted file mode 100644
index b5a80c91c4cf..000000000000
--- a/XMind.ini
+++ /dev/null
@@ -1,17 +0,0 @@
--configuration
-@user.home/.xmind/configuration
--data
-@user.home/.xmind/workspace
--startup
-/usr/share/xmind/plugins/org.eclipse.equinox.launcher_1.3.200.v20160318-1642.jar
---launcher.library
-/usr/share/xmind/plugins/org.eclipse.equinox.launcher.gtk.linux.CARCH_1.1.400.v20160518-1444
---launcher.defaultAction
-openFile
---launcher.GTK_version
-GTK_VERSION
--eclipse.keyring
-@user.home/.xmind/secure_storage_linux
--vmargs
--Dfile.encoding=UTF-8
-JAVA_VERSION
diff --git a/xmind.desktop b/xmind.desktop
index e32b472ca1e7..116a60fbad42 100644
--- a/xmind.desktop
+++ b/xmind.desktop
@@ -5,8 +5,6 @@ GenericName=Brainstorming and Mind Mapping Software
 Comment=Launch XMind 8 Update 7
 Icon=xmind
 Exec=XMind %F
-TryExec=XMind
 Terminal=false
-StartupNotify=true
 Categories=Office;
 MimeType=application/xmind;x-scheme-handler/xmind;
diff --git a/xmind.install b/xmind.install
index bf15b74ab22c..137e9228392c 100644
--- a/xmind.install
+++ b/xmind.install
@@ -1,7 +1,7 @@
 post_install() {
     echo 'If XMind crashed on start, trying delete ~/.xmind'
     echo ''
-    echo 'If you want to change gtk version or java version, please edit PKGBUILD and rebuild the package or edit /usr/share/xmind/XMind/XMind.ini. Change number to your gtk version after "--launcher.GTK_version", and add "--add-modules=java.se.ee" at the end of file if you use java 9 or delete it if not.'
+    echo 'If you want to change gtk version or java version, please edit PKGBUILD and rebuild the package. Or edit /usr/share/xmind/XMind/XMind.ini, change number to your gtk version after "--launcher.GTK_version", and add/delete "--add-modules=java.se.ee" at the end of file if you use java 10/8.'
 }
 
 post_upgrade() {