Update to 6.0.0

5 files changed, 54 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e9cf7704fc4b..665c9bde94f6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = papyrus
 	pkgdesc = Graphical editing tool for UML based on eclipse.
-	pkgver = 5.2.0
+	pkgver = 6.0.0
 	pkgrel = 1
 	url = http://www.eclipse.org/papyrus/
 	arch = x86_64
@@ -8,14 +8,19 @@ pkgbase = papyrus
 	makedepends = tar
 	depends = java-runtime>=11
 	depends = python
-	depends = libsecret
+	depends = perl
+	depends = bash
 	provides = papyrus
 	conflicts = papyrus
-	source = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/modeling/mdt/papyrus/rcp/2021-09/5.2.0/papyrus-2021-09-5.2.0-linux64.tar.gz
+	source = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/modeling/mdt/papyrus/rcp/2021-12/6.0.0/papyrus-2021-12-6.0.0-linux64.tar.gz
 	source = papyrus.png
 	source = papyrus.desktop
-	sha256sums = 8f8fc4e157d43cafefbf271566b093e6e00e54685396b7640c5768504f2c5737
+	source = papyrus.ini.patch
+	source = papyrus
+	sha256sums = 96bdce4f3f7d6fc87dc8ae9855d29aaaf83b172082b65c3c56562653bbc6f9e0
 	sha256sums = 0bf0ff5eacc3e955a01c171cc21d8c989707ed9eee668ce176d67cfae06c8608
 	sha256sums = 255f1d8b0277bb9e4a3f84d09294fe34a54485b29f67220733343f37db052b94
+	sha256sums = 4d9052948619d22979977455d1e87e69168d1a147b4c74490e1652586fd68280
+	sha256sums = cf7861bf3f25ade776102dcfc5faebdc2411b915c82cdb15b477e0c44a9bae45
 
 pkgname = papyrus
diff --git a/.gitignore b/.gitignore
index f59ec20aabf5..d561967e0157 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,8 @@
-*
\ No newline at end of file
+*
+
+!PKGBUILD
+!.SRCINFO
+!papyrus.png
+!papyrus.desktop
+!papyrus.ini.patch
+!papyrus
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index ce5cf2630663..173e7d8225ef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,48 +4,51 @@
 # Contributor: Alex Brinister <alex_brinister at yahoo dot com>
 
 pkgname='papyrus'
-pkgver='5.2.0'
-_eclipsever='2021-09'
+pkgver='6.0.0'
+_eclipsever='2021-12'
 pkgrel=1
 pkgdesc='Graphical editing tool for UML based on eclipse.'
 arch=('x86_64')
 url='http://www.eclipse.org/papyrus/'
 license=('EPL')
 groups=()
-depends=('java-runtime>=11' python libsecret)
+depends=('java-runtime>=11' python perl bash)
 makedepends=(tar)
 provides=('papyrus')
 conflicts=('papyrus')
-sha256sums=('8f8fc4e157d43cafefbf271566b093e6e00e54685396b7640c5768504f2c5737'
+sha256sums=('96bdce4f3f7d6fc87dc8ae9855d29aaaf83b172082b65c3c56562653bbc6f9e0'
             '0bf0ff5eacc3e955a01c171cc21d8c989707ed9eee668ce176d67cfae06c8608'
-            '255f1d8b0277bb9e4a3f84d09294fe34a54485b29f67220733343f37db052b94')
+            '255f1d8b0277bb9e4a3f84d09294fe34a54485b29f67220733343f37db052b94'
+            '4d9052948619d22979977455d1e87e69168d1a147b4c74490e1652586fd68280'
+            'cf7861bf3f25ade776102dcfc5faebdc2411b915c82cdb15b477e0c44a9bae45')
 source=(
   "http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/modeling/mdt/papyrus/rcp/${_eclipsever}/${pkgver}/papyrus-${_eclipsever}-${pkgver}-linux64.tar.gz"
   "papyrus.png"
   "papyrus.desktop"
+  "papyrus.ini.patch"
+  "papyrus"
 )
-noextract=()
 
 build() {
-  cd $srcdir
-  tar -xvzf papyrus-${_eclipsever}-${pkgver}-linux*.tar.gz
-  mkdir -p $srcdir/usr/bin/
-  echo -e '#!/bin/sh\nexec /usr/lib/papyrus/papyrus' > $srcdir/papyrus
+  cd "$srcdir/Papyrus"
+  rm -r features/org.eclipse.justj*
+  rm -r plugins/org.eclipse.justj*
+
+  patch papyrus.ini "$srcdir/papyrus.ini.patch"
 }
 
 package() {
-  cd $srcdir
-  mkdir -p $pkgdir/usr/lib/papyrus
-  mkdir -p $pkgdir/usr/bin/
-  mkdir -p $pkgdir/usr/share/icons
-  mkdir -p $pkgdir/usr/share/applications
+  cd "$srcdir"
+  mkdir -p "$pkgdir/usr/lib/papyrus"
+  mkdir -p "$pkgdir/usr/bin/"
+  mkdir -p "$pkgdir/usr/share/icons"
+  mkdir -p "$pkgdir/usr/share/applications"
 
-  install -m644 papyrus.png $pkgdir/usr/share/icons/
-  install -m755 papyrus.desktop $pkgdir/usr/share/applications/
+  install -m644 papyrus.png "$pkgdir/usr/share/icons/"
+  install -m755 papyrus.desktop "$pkgdir/usr/share/applications/"
 
   cd "$srcdir/Papyrus"
-  find . -type f -exec install -vDm755 {} $pkgdir/usr/lib/papyrus/{} \;
+  find . -type f -exec install -vDm755 {} "$pkgdir/usr/lib/papyrus/"{} \;
 
-  install -m755 $srcdir/papyrus $pkgdir/usr/bin/
-  # mv $pkgdir/usr/lib/papyrus/icon.xpm $pkgdir/usr/share/icons/papyrus.xpm
+  install -m755 "$srcdir/papyrus" "$pkgdir/usr/bin/"
 }
diff --git a/papyrus b/papyrus
new file mode 100755
index 000000000000..c4eab369edc1
--- /dev/null
+++ b/papyrus
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec /usr/lib/papyrus/papyrus
\ No newline at end of file
diff --git a/papyrus.ini.patch b/papyrus.ini.patch
new file mode 100644
index 000000000000..05162655cf69
--- /dev/null
+++ b/papyrus.ini.patch
@@ -0,0 +1,11 @@
+--- papyrus.ini.a       2022-01-30 17:57:56.324000000 +0100
++++ papyrus.ini.b       2022-01-30 17:58:03.084795835 +0100
+@@ -8,8 +8,6 @@
+ 256m
+ --launcher.defaultAction
+ openFile
+--vm
+-plugins/org.eclipse.justj.openjdk.hotspot.jre.full.linux.x86_64_11.0.13.v20211116-1829/jre/bin
+ -vmargs
+ -Xms256m
+ -Xmx1024m