[updpkg]: cajviewer 9.0

2 files changed, 32 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 427b45e6ba3a..2201d4829209 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cajviewer
 	pkgdesc = CAJViewer for Linux. Document Viewer for TEB, CAJ, NH, KDH and PDF format
-	pkgver = 1.3.22_1
-	pkgrel = 2
+	pkgver = 9.0
+	pkgrel = 1
 	url = http://cajviewer.cnki.net/
 	arch = x86_64
 	license = custom
@@ -9,11 +9,8 @@ pkgbase = cajviewer
 	depends = gcc-libs
 	depends = bash
 	depends = hicolor-icon-theme
-	source = cajviewer.sh
-	source = cajviewer.desktop
-	sha256sums = 28debde2450cfae595fae4b8ed85e4785d2214f6864905dc54b62d902b057d5a
-	sha256sums = 2d602dc832fd45d4bfa1d8abba58ceec5d5a35e327788ee8774af55a57a7e87f
-	source_x86_64 = https://download.cnki.net/cajviewer_1.3.22-1_amd64.deb
-	sha256sums_x86_64 = 2b9193a5980bc9afede11d7e7ea56ce6a185b9b351789b69c366be356ab40059
+	options = !strip
+	source_x86_64 = https://download.cnki.net/cajviewer_9.0_amd64.deb
+	sha256sums_x86_64 = 526e294b5d73e2d69ef76edf5417ba289f98d3fde9b7cc88331f58c4aa980b32
 
 pkgname = cajviewer
diff --git a/PKGBUILD b/PKGBUILD
index 677b4cc7fa74..9ead8717d78f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,8 @@
 # Contributor: TheGoliath <hidden>
 
 pkgname=cajviewer
-_pkgname=CAJViewer
-pkgver=1.3.22_1
-pkgrel=2
+pkgver=9.0
+pkgrel=1
 pkgdesc="CAJViewer for Linux. Document Viewer for TEB, CAJ, NH, KDH and PDF format"
 arch=('x86_64')
 url="http://cajviewer.cnki.net/"
@@ -21,53 +20,50 @@ depends=(
 #        'qt5-webchannel'
 #        'qt5-webengine'
 )
-source=("${pkgname}.sh"
-        "${pkgname}.desktop")
-source_x86_64=("https://download.cnki.net/${pkgname}_${pkgver//_/-}_amd64.deb")
+source_x86_64=("https://download.cnki.net/${pkgname}_${pkgver}_amd64.deb")
 
 # strip will cause cajviewer core dumped 
-# options=('!strip')
-sha256sums=('28debde2450cfae595fae4b8ed85e4785d2214f6864905dc54b62d902b057d5a'
-            '2d602dc832fd45d4bfa1d8abba58ceec5d5a35e327788ee8774af55a57a7e87f')
-sha256sums_x86_64=('2b9193a5980bc9afede11d7e7ea56ce6a185b9b351789b69c366be356ab40059')
+options=('!strip')
+sha256sums_x86_64=('526e294b5d73e2d69ef76edf5417ba289f98d3fde9b7cc88331f58c4aa980b32')
 
 _install() {
   find ${@: 2} -type f,l -exec install -Dm$1 {} ${pkgdir}/{} \;
 }
 
 prepare() {
+  cd ${srcdir}
+
   install -dm755 build
   tar -xf data.* -C build
-
-  cd "$srcdir/build"
-  mv opt/apps/${pkgname}  opt/${pkgname}
 }
 
 package() {
   cd "$srcdir/build"
   
-  # binary wrapper
-  install -Dm755 ${srcdir}/${pkgname}.sh ${pkgdir}/usr/bin/${pkgname}
-
-  _install 755 opt/${pkgname}/${_pkgname}
-  _install 644 opt/${pkgname}/Resource
-  _install 644 opt/${pkgname}/qt.conf
-  _install 644 opt/${pkgname}/VERSION
-
+  _install 644 opt/${pkgname}/bin
+  _install 644 opt/${pkgname}/doc/
   # _install 644 opt/${pkgname}/lib -name "libreaderex_x64.so"
-  _install 644 opt/${pkgname}/lib
-  _install 644 opt/${pkgname}/libexec
-  _install 644 opt/${pkgname}/plugins
-  _install 644 opt/${pkgname}/resources
-  _install 644 opt/${pkgname}/translations
+  _install 644 opt/${pkgname}/lib/
+  _install 644 opt/${pkgname}/libexec/
+  _install 644 opt/${pkgname}/plugins/
+  _install 644 opt/${pkgname}/resources/
+  _install 644 opt/${pkgname}/translations/
+  _install 644 opt/${pkgname}/${pkgname}.png
+  _install 644 opt/${pkgname}/VERSION
   
+  for _exe in backgroundprocess CAJViewer start.sh
+  do
+    chmod 0755 ${pkgdir}/opt/${pkgname}/bin/${_exe}
+  done
+  chmod 0755 ${pkgdir}/opt/${pkgname}/libexec/QtWebEngineProcess
+  install -dm755 ${pkgdir}/usr/bin/
+  ln -s /opt/${pkgname}/bin/start.sh ${pkgdir}/usr/bin/${pkgname}
 
-  # mime
-  _install 644 usr/share/mime/packages/
-  _install 644 usr/share/icons/hicolor/
 
-  install -Dm644 ${srcdir}/${pkgname}.desktop -t ${pkgdir}/usr/share/applications
-  install -Dm644 opt/${pkgname}/${pkgname}.png -t ${pkgdir}/usr/share/pixmaps
+  # mime
+  _install 644 usr/share/mime/
+  _install 644 usr/share/icons/
+  _install 644 usr/share/applications/
 }
 
 # vim: set sw=2 ts=2 et: