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

[Jaroslav Lichtblau]

    Date: Monday, May 12, 2014 @ 22:33:12
  Author: jlichtblau
Revision: 111067

upgpkg: kchmviewer 6.1-1

Added:
  kchmviewer/trunk/kchmviewer-build.patch
Modified:
  kchmviewer/trunk/PKGBUILD
  kchmviewer/trunk/kchmviewer.changelog

------------------------+
 PKGBUILD               |   16 ++++++++++------
 kchmviewer-build.patch |   23 +++++++++++++++++++++++
 kchmviewer.changelog   |    3 +++
 3 files changed, 36 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-12 19:35:38 UTC (rev 111066)
+++ PKGBUILD	2014-05-12 20:33:12 UTC (rev 111067)
@@ -3,23 +3,27 @@
 # Contributor: Alexander Bogdanov <andorn at gmail.com>
 
 pkgname=kchmviewer
-pkgver=6.0
-pkgrel=3
+pkgver=6.1
+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' 'kdebase-runtime' 'xdg-utils')
-makedepends=('automoc4' 'cmake')
+makedepends=('automoc4' 'cmake' 'patch')
 options=('libtool')
 install=$pkgname.install
 changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('81c856434a86977039c36cb10f2427cc8cb1ea29a778f24fff2285d49c717979')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+        $pkgname-build.patch)
+sha256sums=('f673c3aaca735d799d14b9f6f1b302e9bb77d5c0a0b601b4b5e0beed1c99fe78'
+            '567bdcaa1809618fe3a441345586a491247b76e4dd46db8ff8497bd53d74adbc')
 
 build() {
   cd $pkgname-$pkgver
 
+  patch -Np1 -i "${srcdir}"/$pkgname-build.patch
+
   cmake . -DCMAKE_INSTALL_PREFIX=/usr
   make
 }
@@ -30,7 +34,7 @@
   make DESTDIR=${pkgdir} install
 
 #icon file
-  install -D -m644 ${srcdir}/$pkgname-$pkgver/packages/$pkgname.png \
+  install -D -m644 "${srcdir}"/$pkgname-$pkgver/packages/$pkgname.png \
     ${pkgdir}/usr/share/pixmaps/$pkgname.png
 
 #msits.protocol file provided by kdegraphics-okular package

Added: kchmviewer-build.patch
===================================================================
--- kchmviewer-build.patch	                        (rev 0)
+++ kchmviewer-build.patch	2014-05-12 20:33:12 UTC (rev 111067)
@@ -0,0 +1,23 @@
+diff -ruN kchmviewer-6.1-orig/packages/kchmviewer.desktop kchmviewer-6.1/packages/kchmviewer.desktop
+--- kchmviewer-6.1-orig/packages/kchmviewer.desktop	2009-12-15 07:02:57.000000000 +0100
++++ kchmviewer-6.1/packages/kchmviewer.desktop	2014-05-12 20:37:00.983182220 +0200
+@@ -3,7 +3,6 @@
+ Categories=Qt;KDE;Office;Viewer;
+ Terminal=false
+ Type=Application
+-Encoding=UTF-8
+ Exec=kchmviewer %f
+ Icon=kchmviewer
+ GenericName=CHM file viewer
+diff -ruN kchmviewer-6.1-orig/src/CMakeLists.txt kchmviewer-6.1/src/CMakeLists.txt
+--- kchmviewer-6.1-orig/src/CMakeLists.txt	2011-12-19 08:16:43.000000000 +0100
++++ kchmviewer-6.1/src/CMakeLists.txt	2014-05-12 20:35:51.195078972 +0200
+@@ -8,7 +8,7 @@
+ 	dialog_chooseurlfromlist.cpp
+ 	dialog_setup.cpp
+ 	kde-qt.cpp
+-	keyeventfilter.cpp
++#	keyeventfilter.cpp
+ 	main.cpp
+ 	mainwindow.cpp
+ 	navigationpanel.cpp

Modified: kchmviewer.changelog
===================================================================
--- kchmviewer.changelog	2014-05-12 19:35:38 UTC (rev 111066)
+++ kchmviewer.changelog	2014-05-12 20:33:12 UTC (rev 111067)
@@ -1,3 +1,6 @@
+2014-05-12  Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+	* kchmviewer 6.1-1
+
 2011-12-21  Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
 	* kchmviewer 6.0-1