Update to V4 and Qt5

4 files changed, 36 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 33446e2cbd32..a58fc49d5ac5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
 pkgbase = masterpdfeditor
-	pkgdesc = A complete solution for creation and editing PDF files. (Free for non-commercial use)
-	pkgver = 3.7.10
-	pkgrel = 2
+	pkgdesc = A complete solution for creation and editing PDF files
+	pkgver = 4.0.30
+	pkgrel = 1
 	url = http://code-industry.net/free-pdf-editor.php
-	arch = i686
 	arch = x86_64
 	license = custom
-	depends = qt4
+	makedepends = patchelf
+	depends = qt5-base
+	depends = qt5-svg
+	depends = sane
 	source = masterpdfeditor.desktop
-	sha256sums = 29218c206e5b78776bc3ec44a760773273274bb56baee5e19e06c3ec55db59fd
-	source_i686 = http://get.code-industry.net/public/master-pdf-editor-3.7.10_i386.tar.gz
-	sha256sums_i686 = 31608b43a06096787b5b5714facf3cfff099c5d351e325f2f89ddaa20531cffd
-	source_x86_64 = http://get.code-industry.net/public/master-pdf-editor-3.7.10_amd64.tar.gz
-	sha256sums_x86_64 = 7bdfc50e65c5ab881a447dffbae6ad8fd3abbd9d6ee92beef8e6cc8f23ffab0e
+	sha256sums = 7c585afe0760855a0a509d6edf10d9f1dd6b73c045ec6cac39939a96d0ce796b
+	source_x86_64 = http://get.code-industry.net/public/master-pdf-editor-4.0.30_qt5.amd64.tar.gz
+	sha256sums_x86_64 = 5c0fc5446c5c543e8b87ac75e7589ee55c63a583cd5a9748a713320f2a46f89c
 
 pkgname = masterpdfeditor
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..71a9d16c2b38
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*~
+*/
+*.tar.*
+*.log
diff --git a/PKGBUILD b/PKGBUILD
index 4a7481f4cf00..e98108d44cef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,27 @@
-# Maintainer: Jiachen Yang <farseerfc@gmail.com>
+# Maintainer: Doug Newgard <scimmia at archlinux dot info>
+# Contributor: Jiachen Yang <farseerfc@gmail.com>
 # Contributor: Miguel Revilla <yo@miguelrevilla.com>
 # Contributor: Ferik <djferik at gmail dot com>
 
 pkgname=masterpdfeditor
-pkgver=3.7.10
-pkgrel=2
-pkgdesc="A complete solution for creation and editing PDF files. (Free for non-commercial use)"
-url="http://code-industry.net/free-pdf-editor.php"
-arch=('i686' 'x86_64')
+pkgver=4.0.30
+pkgrel=1
+pkgdesc='A complete solution for creation and editing PDF files'
+url='http://code-industry.net/free-pdf-editor.php'
+arch=('x86_64')
 license=('custom')
-depends=('qt4')
-
-source=(${pkgname}.desktop)
-source_i686=(http://get.code-industry.net/public/master-pdf-editor-${pkgver}_i386.tar.gz)
-source_x86_64=(http://get.code-industry.net/public/master-pdf-editor-${pkgver}_amd64.tar.gz)
-
-sha256sums=('29218c206e5b78776bc3ec44a760773273274bb56baee5e19e06c3ec55db59fd')
-sha256sums_i686=('31608b43a06096787b5b5714facf3cfff099c5d351e325f2f89ddaa20531cffd')
-sha256sums_x86_64=('7bdfc50e65c5ab881a447dffbae6ad8fd3abbd9d6ee92beef8e6cc8f23ffab0e')
+depends=('qt5-base' 'qt5-svg' 'sane')
+makedepends=('patchelf')
+source=('masterpdfeditor.desktop')
+source_x86_64=("http://get.code-industry.net/public/master-pdf-editor-${pkgver}_qt5.amd64.tar.gz")
+sha256sums=('7c585afe0760855a0a509d6edf10d9f1dd6b73c045ec6cac39939a96d0ce796b')
+sha256sums_x86_64=('5c0fc5446c5c543e8b87ac75e7589ee55c63a583cd5a9748a713320f2a46f89c')
 
 package() {
-	mkdir -p "${pkgdir}/opt/masterpdfeditor"
-	cd "${srcdir}/master-pdf-editor-3"
-	/bin/tar cf - * | ( cd "${pkgdir}"/opt/masterpdfeditor; tar xfp - )
-	install -D -m755 "${srcdir}"/master-pdf-editor-3/lang/*.qm "${pkgdir}"/opt/masterpdfeditor/lang
-	install -D -m755 "${srcdir}"/master-pdf-editor-3/lang/*.ts "${pkgdir}"/opt/masterpdfeditor/lang
-	install -D -m644 "${srcdir}"/master-pdf-editor-3/license.txt "${pkgdir}"/usr/share/licenses/masterpdfeditor/LICENSE
-	install -D -m644 "${srcdir}"/master-pdf-editor-3/masterpdfeditor3.png "${pkgdir}"/usr/share/pixmaps/pdfeditor.png
-	install -D -m644 "${srcdir}"/masterpdfeditor.desktop "${pkgdir}"/usr/share/applications/masterpdfeditor.desktop
-	rm "${pkgdir}"/opt/masterpdfeditor/license.txt
-	chmod 644 "${pkgdir}"/opt/masterpdfeditor/lang/*
-	chmod 755 "${pkgdir}"/opt/masterpdfeditor/lang
-	mkdir -p "${pkgdir}"/usr/bin
-	ln -s /opt/masterpdfeditor/masterpdfeditor3 "${pkgdir}"/usr/bin/pdfeditor
+  install -d "$pkgdir"{/opt/,/usr/bin/,/usr/share/applications/}
+  cp -a --no-preserve=ownership master-pdf-editor-${pkgver%%.*} "$pkgdir/opt/"
+  sed "s/VERMAJ/${pkgver%%.*}/g" masterpdfeditor.desktop > "$pkgdir/usr/share/applications/masterpdfeditor${pkgver%%.*}.desktop"
+  ln -s /opt/master-pdf-editor-${pkgver%%.*}/masterpdfeditor${pkgver%%.*} -t "$pkgdir/usr/bin/"
+  install -Dm644 master-pdf-editor-${pkgver%%.*}/license.txt -t "$pkgdir/usr/share/licenses/$pkgname/"
+  patchelf --remove-rpath "$pkgdir/opt/master-pdf-editor-${pkgver%%.*}/masterpdfeditor${pkgver%%.*}"
 }
diff --git a/masterpdfeditor.desktop b/masterpdfeditor.desktop
index dbd5ffbbf7ae..f6e334a4d0d9 100644
--- a/masterpdfeditor.desktop
+++ b/masterpdfeditor.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Type=Application
 Name=Master PDF Editor
-GenericName=Master PDF Editor
+GenericName=PDF Editor
 Comment=Edit your PDF and XPS files
-Exec=/opt/masterpdfeditor/masterpdfeditor3 %f
-Icon=pdfeditor.png
+Exec=/opt/master-pdf-editor-VERMAJ/masterpdfeditorVERMAJ %f
+Icon=/opt/master-pdf-editor-VERMAJ/masterpdfeditorVERMAJ.png
 Categories=Office;Publishing;
 MimeType=application/pdf