Date: Wednesday, March 8, 2023 @ 14:50:41
  Author: artafinde
Revision: 1416835

upgpkg: freeplane 1.10.6u1-1

Modified:
  freeplane/trunk/PKGBUILD

----------+
 PKGBUILD |   98 +++++++++++++++++++++++++++----------------------------------
 1 file changed, 44 insertions(+), 54 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2023-03-08 14:20:34 UTC (rev 1416834)
+++ PKGBUILD    2023-03-08 14:50:41 UTC (rev 1416835)
@@ -2,7 +2,8 @@
 # Contributor: [email protected]
 
 pkgname=freeplane
-pkgver=1.10.6
+pkgver=1.10.6u1
+_basever=1.10.6
 pkgrel=1
 pkgdesc="A Java mindmapping tool"
 arch=('any')
@@ -10,67 +11,56 @@
 license=('GPL2')
 _jrever=11
 _jdkver=17
-makedepends=('gradle' "jdk${_jdkver}-openjdk" 'gnu-free-fonts' 'fontconfig')
+makedepends=('gradle' "jdk${_jdkver}-openjdk" 'gnu-free-fonts' 'fontconfig' 
'unzip')
 depends=("java-runtime>=${_jrever}" "java-runtime<=${_jdkver}")
 
source=("https://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}_src-${pkgver}.tar.gz";
-        "freeplane.desktop" "freeplane.run")
-b2sums=('6cc7aa0243761c82fe308f1a0a783eebf29e16818a2a342676f5ac5ed4e4386f2d99a223c875f61683d7d83690096921bb8424b3ec38b16abf9ddc993080d966'
+        "freeplane.desktop" "freeplane.run"
+        
"0001-Upgrade-ospackage-plugin-to-support-gradle-8.patch::https://github.com/inglor/freeplane/commit/ef9398cf209a1326a78b8b265c6e199f0fff9757.patch";
+        
"0002-Add-dependsOn-for-tasks-which-fail-with-gradle-8.x.patch::https://github.com/inglor/freeplane/commit/068213e1a6b10d02928c501bd5feefda5caddf0a.patch";)
+b2sums=('043779d9a60ce86313430737508f75b1968590e55a11b7baa123660f80d0ebaff0dcad0c481e0295ce00fa953d432c73c1370f0598c0888f8b6181a0688535f5'
         
'87c25331e01823e38668e4b394a51a279c05b24b088f4ffc1482d3783e24018da8f9e51b3ad1a62c5a863f85a6ccb30bbe8999cb861dc1b93d5483019644cfa5'
-        
'24ca56b7c7894b9bb38600b4d37973769243e1bdb221f33125b60bf4f878a3b630775710fab9dee97fa45a69319455037e294860ba7fbd608529982c6b0b1538')
+        
'24ca56b7c7894b9bb38600b4d37973769243e1bdb221f33125b60bf4f878a3b630775710fab9dee97fa45a69319455037e294860ba7fbd608529982c6b0b1538'
+        
'791afe92acb939dbe9d6394944e129576952772ad4a70126f6390cff6a5e0bce45b2cc457270d383100f6fcb417c35ae6ead54ec47fde7b174f157f92eaedee7'
+        
'1cfedcafd79fd51d796e6e96f1ba9cad56894518f90a0ddccbb5308ef0f2ec96a80f24fc34864da6466d0811b050a512996bc8c7138f47af03350cf8e1b9fc70')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  export JAVA_HOME="/usr/lib/jvm/java-${_jdkver}-openjdk"
-  export PATH="/usr/lib/jvm/java-${_jdkver}-openjdk/bin:$PATH"
-  gradle -Dorg.gradle.daemon=false build
+  patch -Np1 < 
"${srcdir}/0001-Upgrade-ospackage-plugin-to-support-gradle-8.patch"
+  patch -Np1 < 
"${srcdir}/0002-Add-dependsOn-for-tasks-which-fail-with-gradle-8.x.patch"
 }
 
+build() {
+  cd "$pkgname-$pkgver"
+  export JAVA_HOME="/usr/lib/jvm/java-$_jdkver-openjdk"
+  export PATH="/usr/lib/jvm/java-$_jdkver-openjdk/bin:$PATH"
+  /usr/bin/gradle -Dorg.gradle.daemon=false build dist
+
+  install -dm755 "$srcdir/$pkgname-$pkgver/dist"
+  unzip -d "$srcdir/$pkgname-$pkgver/dist" \
+    "$srcdir/$pkgname-$pkgver/DIST/${pkgname}_bin-$_basever.zip"
+}
+
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/BIN"
-  # Copy plugins
-  find plugins -type f | while read file ; do
-    install -Dm644 "${file}" "${pkgdir}/usr/share/freeplane/${file}"
-  done
-  # Copy docs (excluding API JavaDocs)
-  find doc -type f ! -path "*api*"| while read file; do
-    install -Dm644 "${file}" "${pkgdir}/usr/share/freeplane/${file}"
-  done
-  # Copy various
-  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/BIN"/framework.jar 
"${pkgdir}"/usr/share/freeplane/framework.jar
-  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/BIN"/freeplane.l4j.ini 
"${pkgdir}"/usr/share/freeplane/freeplane.l4j.ini
-  install -Dm755 "${srcdir}/${pkgname}-${pkgver}/BIN"/freeplane.policy 
"${pkgdir}"/usr/share/freeplane/freeplane.policy
-  install -Dm755 "${srcdir}/${pkgname}-${pkgver}/BIN"/freeplane.sh 
"${pkgdir}"/usr/share/freeplane/freeplane.sh
-  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/BIN"/freeplaneConsole.l4j.ini 
"${pkgdir}"/usr/share/freeplane/freeplaneConsole.l4j.ini
-  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/BIN"/freeplaneIcons.dll 
"${pkgdir}"/usr/share/freeplane/freeplaneIcons.dll
-  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/BIN"/freeplanelauncher.jar 
"${pkgdir}"/usr/share/freeplane/freeplanelauncher.jar
-  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/BIN"/gitinfo.txt 
"${pkgdir}"/usr/share/freeplane/gitinfo.txt
-  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/BIN"/init.xargs 
"${pkgdir}"/usr/share/freeplane/init.xargs
-  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/BIN"/props.xargs 
"${pkgdir}"/usr/share/freeplane/props.xargs
-  # Copy core
-  install -dm755 
"${pkgdir}"/usr/share/freeplane/core/org.freeplane.core/META-INF/
-  install -Dm644 
"${srcdir}/${pkgname}-${pkgver}/BIN"/core/org.freeplane.core/META-INF/* 
"${pkgdir}"/usr/share/freeplane/core/org.freeplane.core/META-INF/
-  install -dm755 "${pkgdir}"/usr/share/freeplane/core/org.freeplane.core/lib
-  install -Dm644 
"${srcdir}/${pkgname}-${pkgver}/BIN"/core/org.freeplane.core/lib/* 
"${pkgdir}"/usr/share/freeplane/core/org.freeplane.core/lib
-  # Copy resources
-  install -dm755 "${pkgdir}"/usr/share/freeplane/resources/ortho/
-  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/BIN"/resources/ortho/* 
"${pkgdir}"/usr/share/freeplane/resources/ortho/
-  install -dm755 "${pkgdir}"/usr/share/freeplane/resources/templates/
-  install -dm755 "${pkgdir}"/usr/share/freeplane/resources/templates/
-  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/BIN"/resources/templates/* 
"${pkgdir}"/usr/share/freeplane/resources/templates/
-  install -dm755 "${pkgdir}"/usr/share/freeplane/resources/xslt/
-  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/BIN"/resources/xslt/* 
"${pkgdir}"/usr/share/freeplane/resources/xslt/
-  install -dm755 "${pkgdir}"/usr/share/freeplane/resources/xml/
-  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/BIN"/resources/xml/* 
"${pkgdir}"/usr/share/freeplane/resources/xml/
-  install -Dm644 
"${srcdir}/${pkgname}-${pkgver}/BIN"/resources/gitinfo.properties 
"${pkgdir}"/usr/share/freeplane/resources/gitinfo.properties
-  install -Dm644 
"${srcdir}/${pkgname}-${pkgver}/BIN"/resources/linkDecoration.ini 
"${pkgdir}"/usr/share/freeplane/resources/linkDecoration.ini
-  # Copy scripts
-  install -dm755 "${pkgdir}"/usr/share/freeplane/scripts/
-  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/BIN"/scripts/* 
"${pkgdir}"/usr/share/freeplane/scripts/
-  
+  install -dm755 "$pkgdir/usr/share/freeplane/"
+  cd "$srcdir/$pkgname-$pkgver/dist/$pkgname-${_basever}"
+  cp -dr --no-preserve='ownership' core doc plugins resources scripts 
framework.jar freeplane.l4j.ini \
+    freeplane.png freeplane.policy freeplane.sh freeplaneConsole.l4j.ini 
freeplaneIcons.dll \
+    freeplanelauncher.jar gitinfo.txt init.xargs license.txt props.xargs \
+    "$pkgdir/usr/share/freeplane/"
+
+  # Install license
+  install -dm755 "$pkgdir/usr/share/licenses/$pkgname"
+  mv license.txt "$pkgdir/usr/share/licenses/$pkgname/license.txt"
+
+  # Install icons
+  install -dm755 "$pkgdir/usr/share/pixmaps/"
+  mv freeplane.svg "$pkgdir"/usr/share/pixmaps/freeplane.svg
+
   # Install the desktop entry
-  install -Dm644 "${srcdir}"/freeplane.desktop 
"${pkgdir}"/usr/share/applications/freeplane.desktop
-  # Install icons
-  install -Dm644 "${srcdir}/${pkgname}-${pkgver}/BIN"/freeplane.svg 
"${pkgdir}"/usr/share/pixmaps/freeplane.svg
+  install -Dm644 "$srcdir/freeplane.desktop" 
"$pkgdir"/usr/share/applications/$pkgname.desktop
+
   # Install the executable script
-  install -Dm755 "${srcdir}"/freeplane.run "${pkgdir}"/usr/bin/freeplane
+  install -Dm755 "$srcdir/freeplane.run" "$pkgdir"/usr/bin/freeplane
 }
+
+# vim:set ft=sh sw=2 sts=2 et:

Reply via email to