[arch-commits] Commit in kchmviewer/trunk (3 files)

[Jaroslav Lichtblau]

    Date: Thursday, December 8, 2016 @ 18:14:20
  Author: jlichtblau
Revision: 198483

upgpkg: kchmviewer 7.7-1 - new upstream release

Added:
  kchmviewer/trunk/kchmviewer-7.7-underlinking.patch
Modified:
  kchmviewer/trunk/PKGBUILD
  kchmviewer/trunk/kchmviewer.changelog

-----------------------------------+
 PKGBUILD                          |   23 ++++++++++++++++-------
 kchmviewer-7.7-underlinking.patch |   11 +++++++++++
 kchmviewer.changelog              |    3 +++
 3 files changed, 30 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-12-08 18:00:24 UTC (rev 198482)
+++ PKGBUILD	2016-12-08 18:14:20 UTC (rev 198483)
@@ -3,21 +3,30 @@
 # Contributor: Alexander Bogdanov <andorn at gmail.com>
 
 pkgname=kchmviewer
-pkgver=7.5
-pkgrel=3
+pkgver=7.7
+pkgrel=1
 pkgdesc="A .chm files (MS HTML help file format) viewer"
 arch=('i686' 'x86_64')
 url="http://kchmviewer.sourceforge.net/"
 license=('GPL')
-depends=('desktop-file-utils' 'chmlib' 'xdg-utils' 'libzip' 'qt5-webkit')
+depends=('desktop-file-utils' 'chmlib' 'xdg-utils' 'libzip' 'qtwebkit' 'zip')
+makedepends=('patch')
 changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('c81f8fb7ac1fe8a5284e03b0d91def61cbd5638f2276c5de8046251755352e53')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+        $pkgname-$pkgver-underlinking.patch)
+sha256sums=('27cbac45c786b1718550a87e6f86010e161302b426c6396ff2a3091b913b17dd'
+            'bb9345a0ecaf70e06cfad06c6c2dbbfca79c3462e1f4bb459e80ecaa31ea58cc')
 
+prepare() {
+  cd $pkgname-$pkgver
+
+  patch -Np1 -i "${srcdir}"/$pkgname-$pkgver-underlinking.patch
+}
+
 build() {
   cd $pkgname-$pkgver
 
-  qmake PREFIX=/usr
+  qmake-qt4 PREFIX=/usr
   make
 }
 
@@ -24,7 +33,7 @@
 package() {
   cd $pkgname-$pkgver
 
-#   make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" install
 
   install -Dm755 bin/$pkgname "${pkgdir}"/usr/bin/$pkgname
 #icon/desktop file

Added: kchmviewer-7.7-underlinking.patch
===================================================================
--- kchmviewer-7.7-underlinking.patch	                        (rev 0)
+++ kchmviewer-7.7-underlinking.patch	2016-12-08 18:14:20 UTC (rev 198483)
@@ -0,0 +1,11 @@
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -108,7 +108,7 @@
+     HEADERS += dbus_interface.h
+     SOURCES += dbus_interface.cpp
+     CONFIG += dbus
+-    LIBS += ../lib/libebook/libebook.a
++    LIBS += ../lib/libebook/libebook.a -lchm -lzip
+     POST_TARGETDEPS += ../lib/libebook/libebook.a
+ }
+ 

Modified: kchmviewer.changelog
===================================================================
--- kchmviewer.changelog	2016-12-08 18:00:24 UTC (rev 198482)
+++ kchmviewer.changelog	2016-12-08 18:14:20 UTC (rev 198483)
@@ -1,3 +1,6 @@
+2016-12-08  Jaroslav Lichtblau <svetlemodry at archlinux.org>
+	* kchmviewer 7.7-1
+
 2016-04-30  Jaroslav Lichtblau <svetlemodry at archlinux.org>
 	* kchmviewer 7.5-2 pacman hooks rebuild