Updated to 5.06.002

3 files changed, 55 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 90df4322de3c..f2313c3fce0c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,26 @@
 # Generated by mksrcinfo v8
-# Sun May  1 23:57:37 UTC 2016
-pkgbase = greenpak-designer-dev
+# Sat Jun 18 19:27:00 UTC 2016
+pkgbase = greenpak-designer
 	pkgdesc = GreenPAK1-5 Designer
-	pkgver = 5.05.001
+	pkgver = 5.06.002
 	pkgrel = 1
 	url = http://www.silego.com/softdoc/software.html
-	install = greenpak-designer-dev.install
+	install = greenpak-designer.install
 	arch = i686
 	arch = x86_64
 	license = custom
+	makedepends = patchelf
 	depends = desktop-file-utils
-	depends = glu
 	depends = graphviz
 	depends = gtk-update-icon-cache
 	depends = libusb
-	depends = qtwebkit
+	depends = qt5-webengine
 	depends = shared-mime-info
+	conflicts = greenpak-designer-dev
+	replaces = greenpak-designer-dev
 	options = !strip
-	source = http://www.silego.com/uploads/resources/GP1-5_Designer_v5.05.001_LNX_Setup.zip
-	sha256sums = 1114394668fef7c1a4096037c80af8f8ed7a1c3e080fdbd7cf0fe934fd5ec68f
+	source = http://www.silego.com/uploads/resources/GP1-5_Designer_v5.06.002_LNX_Setup.zip
+	sha256sums = 3304e90957c2b19dd73ac0d73c7e87525134681faac64591dcc31ec28613b452
 
-pkgname = greenpak-designer-dev
+pkgname = greenpak-designer
 
diff --git a/PKGBUILD b/PKGBUILD
index 2ee4a446ab35..8b1e7359f78a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,23 @@
 # Maintainer: Forest Crossman <cyrozap at gmail dot com>
 
-pkgname=greenpak-designer-dev
-_pkgver=5.05
-_pkgrel=1
+pkgname=greenpak-designer
+_pkgver=5.06
+_pkgrel=2
 pkgver=$_pkgver.$(printf "%03d" $_pkgrel)
 pkgrel=1
 pkgdesc="GreenPAK1-5 Designer"
 arch=('i686' 'x86_64')
 url="http://www.silego.com/softdoc/software.html"
 license=('custom')
-depends=('desktop-file-utils' 'glu' 'graphviz' 'gtk-update-icon-cache' 'libusb' 'qtwebkit' 'shared-mime-info')
+makedepends=('patchelf')
+depends=('desktop-file-utils' 'graphviz' 'gtk-update-icon-cache' 'libusb' 'qt5-webengine' 'shared-mime-info')
+conflicts=('greenpak-designer-dev')
+replaces=('greenpak-designer-dev')
 options=('!strip')
 install=${pkgname}.install
 
 source=("http://www.silego.com/uploads/resources/GP1-5_Designer_v${pkgver}_LNX_Setup.zip")
-sha256sums=('1114394668fef7c1a4096037c80af8f8ed7a1c3e080fdbd7cf0fe934fd5ec68f')
+sha256sums=('3304e90957c2b19dd73ac0d73c7e87525134681faac64591dcc31ec28613b452')
 
 if [[ $CARCH == 'i686' ]]; then
   _arch='i386'
@@ -27,10 +30,45 @@ package() {
   ar p ${pkgname}_${_pkgver}-${_pkgrel}_${_arch}.deb data.tar.xz | \
     tar -xJ --exclude="usr/share/doc-base" --exclude="usr/share/lintian" -C "${pkgdir}"/
 
-  # Shuffle some files
+  # Move /lib files to /usr/lib
+  install -dm 755 "${pkgdir}/usr/lib"
   mv "${pkgdir}"/lib/* "${pkgdir}"/usr/lib/
   rm -r "${pkgdir}"/lib
 
+  # Remove unneeded binaries
+  rm -r "${pkgdir}/usr/local/${pkgname}/bin"/{platforms,QtWebEngineProcess}
+
+  # Move binaries to /usr/bin
+  mv "${pkgdir}/usr/local/${pkgname}/bin" "${pkgdir}"/usr/bin
+
+  # Remove unneeded libraries
+  rm -r "${pkgdir}/usr/local/${pkgname}/lib"/{graphviz,libcdt.so*,libcgraph.so*,libgvc.so*,libgvpr.so*,libpathplan.so*,libxdot.so*,libQt5*,libusb-1.0.so*}
+
+  # Move libraries to subdirectory in /usr/lib
+  install -dm 755 "${pkgdir}/usr/lib/${pkgname}"
+  mv "${pkgdir}/usr/local/${pkgname}/lib"/* "${pkgdir}/usr/lib/${pkgname}"
+  rm -r "${pkgdir}/usr/local/${pkgname}/lib"
+
+  # Remove unneeded support files
+  rm -r "${pkgdir}/usr/local/${pkgname}"/{plugins,resources,translations}
+
+  # Move supporting files to /usr/share
+  mv "${pkgdir}/usr/local/${pkgname}" "${pkgdir}/usr/share/${pkgname}"
+  rm -r "${pkgdir}"/usr/local
+
+  # Redefine library search paths
+  for _exec in "${pkgdir}/usr/bin"/*; do
+    patchelf --set-rpath "\$ORIGIN/../lib:/usr/lib/${pkgname}" $_exec
+  done
+  for _lib in "${pkgdir}/usr/lib/${pkgname}"/*; do
+    patchelf --set-rpath "\$ORIGIN/..:/usr/lib/${pkgname}" $_lib
+  done
+
+  # Fix desktop launchers
+  for _launcher in "${pkgdir}/usr/share/applications"/*.desktop; do
+    sed -i "s!local/greenpak-designer/!!g" $_launcher
+  done
+
   # Install license file
   install -dm 755 "${pkgdir}/usr/share/licenses/${pkgname}"
   ln -s "/usr/share/doc/${pkgname}/copyright" "${pkgdir}/usr/share/licenses/${pkgname}/copyright"
diff --git a/greenpak-designer-dev.install b/greenpak-designer.install
index dfcf48a13bc4..dfcf48a13bc4 100644
--- a/greenpak-designer-dev.install
+++ b/greenpak-designer.install