Upstream version 3.3

2 files changed, 12 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 070aeac7639e..48b72768025a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ganttproject
 	pkgdesc = A project scheduling application featuring gantt chart, resource management, calendaring.
-	pkgver = 3.2.3240
-	pkgrel = 2
+	pkgver = 3.3.3300
+	pkgrel = 1
 	url = https://www.ganttproject.biz/
 	arch = i686
 	arch = x86_64
@@ -10,9 +10,9 @@ pkgbase = ganttproject
 	depends = jre11-openjdk
 	depends = java11-openjfx
 	depends = hicolor-icon-theme
-	source = https://dl.ganttproject.biz/ganttproject-3.2.3240/ganttproject-3.2.3240.zip
+	source = https://dl.ganttproject.biz/ganttproject-3.3.3300/ganttproject-3.3.3300.zip
 	source = ganttproject.desktop
-	sha256sums = 38dbddaf4c55ff7731e3a061dde9a8b38236789409ee3b5ab8228d96688748bd
+	sha256sums = 2938e7937ea4bad16d47cb63da21eab5e2f21f9c8e292919bbf0f8e108162bd7
 	sha256sums = 7f80539115a2ffa518516671596b7e35659d46c91ac39133cc5accda9dec3862
 
 pkgname = ganttproject
diff --git a/PKGBUILD b/PKGBUILD
index 7d34f59c1da7..cdabb1654cd9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,10 +6,10 @@
 # Original Author: David Fuhr <david.fuhr@web.de>
 
 pkgname=ganttproject
-_version=3.2
-_build=3240
+_version=3.3
+_build=3300
 pkgver=$_version.$_build
-pkgrel=2
+pkgrel=1
 pkgdesc="A project scheduling application featuring gantt chart, resource management, calendaring."
 arch=('i686' 'x86_64')
 url="https://www.ganttproject.biz/"
@@ -22,20 +22,20 @@ source=("https://dl.ganttproject.biz/$pkgname-$pkgver/$pkgname-$pkgver.zip"
 prepare() {
 	# add JavaFX path to startup script
 	# (credits to ulyssesrr for the new fix)
-	sed -i '/^BOOT_CLASS/ aJFX_ARGS="--module-path \/usr\/lib\/jvm\/java-11-openjfx\/lib\/ --add-modules=ALL-MODULE-PATH"' $srcdir/ganttproject-$pkgver/ganttproject
-	sed -i -r '/Xmx[0-9]+m/ s/\$JAVA_EXPORTS/$JFX_ARGS $JAVA_EXPORTS/' $srcdir/ganttproject-$pkgver/ganttproject
+	sed -i '/^BOOT_CLASS/ aJFX_ARGS="--module-path \/usr\/lib\/jvm\/java-11-openjfx\/lib\/ --add-modules=ALL-MODULE-PATH"' $srcdir/ganttproject
+	sed -i -r '/Xmx[0-9]+m/ s/\$JAVA_EXPORTS/$JFX_ARGS $JAVA_EXPORTS/' $srcdir/ganttproject
 }
 
 package() {
 	mkdir -p "$pkgdir/opt/"
-	cp --recursive "$srcdir/ganttproject-$pkgver" "$pkgdir/opt/$pkgname"
+	cp --recursive "$srcdir" "$pkgdir/opt/$pkgname"
 
 	chmod 755 "$pkgdir/opt/$pkgname/ganttproject"
 	install -D -m0644 "$srcdir/ganttproject.desktop" "$pkgdir/usr/share/applications/ganttproject.desktop"
-	install -D -m0644 "$srcdir/ganttproject-$pkgver/plugins/base/ganttproject/resources/icons/ganttproject.png" "$pkgdir/usr/share/icons/hicolor/64x64/apps/ganttproject.png"
+	install -D -m0644 "$srcdir/plugins/base/ganttproject/resources/icons/ganttproject.png" "$pkgdir/usr/share/icons/hicolor/64x64/apps/ganttproject.png"
 	mkdir -p "$pkgdir/usr/bin"
 	ln -s "/opt/$pkgname/ganttproject" "$pkgdir/usr/bin/ganttproject"
 }
 
-sha256sums=('38dbddaf4c55ff7731e3a061dde9a8b38236789409ee3b5ab8228d96688748bd'
+sha256sums=('2938e7937ea4bad16d47cb63da21eab5e2f21f9c8e292919bbf0f8e108162bd7'
             '7f80539115a2ffa518516671596b7e35659d46c91ac39133cc5accda9dec3862')