[upd] 3.0.0→3.1.1

2 files changed, 22 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f6721f1141f0..49ef985e2bf2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,17 @@
 pkgbase = midieditor
 	pkgdesc = Graphical interface to edit, play, and record Midi data
-	pkgver = 3.0.0
+	pkgver = 3.1.1
 	pkgrel = 1
-	url = http://midieditor.sourceforge.net/
+	url = https://midieditor.org
 	arch = i686
 	arch = x86_64
 	license = GPL3
-	makedepends = subversion
-	makedepends = imagemagick
-	depends = qt4
-	depends = sfml
-	source = midieditor-3.0.0::svn+https://svn.code.sf.net/p/midieditor/code/trunk#revision=66
+	makedepends = qt5-tools
+	depends = qt5-multimedia
+	source = midieditor-3.1.1.tar.gz::https://github.com/markusschwenk/midieditor/archive/3.1.1.tar.gz
 	source = midieditor.sh
 	source = MidiEditor.desktop
-	sha256sums = SKIP
+	sha256sums = b2dbb25a917ab1b66d43570a37671be662f1e2e9fcc2e888f83310b755b41205
 	sha256sums = f7b7668c2a0ead8eb837e0943d494644cc18199af91485bb41a550ac47cc8d73
 	sha256sums = 14fa01e93af2ab167d359c203457f73c3072da7aebea90a4e91cf502e1196ef4
 
diff --git a/PKGBUILD b/PKGBUILD
index 4aa5644acc44..4c8a8b2a8257 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,33 @@
 # Maintainer: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
 
 pkgname=midieditor
-pkgver=3.0.0
+pkgver=3.1.1
 pkgrel=1
 pkgdesc="Graphical interface to edit, play, and record Midi data"
 arch=('i686' 'x86_64')
-url="http://midieditor.sourceforge.net/"
+url="https://midieditor.org"
 license=('GPL3')
-depends=('qt4' 'sfml')
-makedepends=('subversion' 'imagemagick')
-source=($pkgname-$pkgver::'svn+https://svn.code.sf.net/p/midieditor/code/trunk#revision=66' # 3.0.0 is not tagged
+depends=('qt5-multimedia')
+makedepends=('qt5-tools')
+source=($pkgname-$pkgver.tar.gz::"https://github.com/markusschwenk/$pkgname/archive/$pkgver.tar.gz"
         "$pkgname.sh"
         "MidiEditor.desktop")
-sha256sums=('SKIP'
+sha256sums=('b2dbb25a917ab1b66d43570a37671be662f1e2e9fcc2e888f83310b755b41205'
             'f7b7668c2a0ead8eb837e0943d494644cc18199af91485bb41a550ac47cc8d73'
             '14fa01e93af2ab167d359c203457f73c3072da7aebea90a4e91cf502e1196ef4')
 
 prepare() {
-  cd $pkgname-$pkgver
-
-  # convert icon
-  convert -resize 48x48 run_environment/graphics/$pkgname.png ../$pkgname.png
+  # generate manual/assistant
+  cp -rup $pkgname-$pkgver/midieditor-manual manual
+  cp -rup $pkgname-$pkgver/packaging/manual/* manual/
+  cd manual
+  qcollectiongenerator midieditor-collection.qhcp -o midieditor-collection.qhc
 }
 
 build() {
   cd $pkgname-$pkgver
 
-  qmake-qt4
+  qmake
   make
 }
 
@@ -38,12 +39,11 @@ package() {
   install -Dm0755 MidiEditor "$pkgdir"/usr/lib/midieditor/MidiEditor
 
   # data
-  cd run_environment
-  install -d "$pkgdir"/usr/share/midieditor/assistant
-  install -m0644 assistant/$pkgname-*.q* "$pkgdir"/usr/share/midieditor/assistant/
-  cp -rup graphics metronome $pkgname.ico version_info.xml "$pkgdir"/usr/share/midieditor/
+  install -d "$pkgdir"/usr/share/midieditor
+  cp -rup packaging/metronome "$pkgdir"/usr/share/midieditor/
+  cp -rup "$srcdir"/manual "$pkgdir"/usr/share/midieditor/assistant
 
   # .desktop entry
   install -Dm0644 "$srcdir"/MidiEditor.desktop "$pkgdir"/usr/share/applications/MidiEditor.desktop
-  install -Dm0644 "$srcdir"/$pkgname.png "$pkgdir"/usr/share/pixmaps/$pkgname.png
+  install -Dm0644 packaging/unix/midieditor/logo48.png "$pkgdir"/usr/share/pixmaps/$pkgname.png
 }