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

Jaroslav Lichtblau jlichtblau at archlinux.org
Sun Dec 14 21:20:30 UTC 2014


    Date: Sunday, December 14, 2014 @ 22:20:30
  Author: jlichtblau
Revision: 123890

upgpkg: kchmviewer 7.1-1

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

------------------------+
 PKGBUILD               |   26 ++++++++------------------
 kchmviewer-build.patch |   23 -----------------------
 kchmviewer.changelog   |    3 +++
 3 files changed, 11 insertions(+), 41 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-12-14 21:12:03 UTC (rev 123889)
+++ PKGBUILD	2014-12-14 21:20:30 UTC (rev 123890)
@@ -1,29 +1,25 @@
 # $Id$
-# Maintainer: Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+# Maintainer: Jaroslav Lichtblau <svetlemory at archlinux.org>
 # Contributor: Alexander Bogdanov <andorn at gmail.com>
 
 pkgname=kchmviewer
-pkgver=6.1
-pkgrel=2
+pkgver=7.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' 'patch')
+depends=('desktop-file-utils' 'chmlib' 'kdebase-runtime' 'xdg-utils' 'libzip')
+makedepends=('automoc4' 'cmake')
 options=('libtool')
 install=$pkgname.install
 changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-        $pkgname-build.patch)
-sha256sums=('f673c3aaca735d799d14b9f6f1b302e9bb77d5c0a0b601b4b5e0beed1c99fe78'
-            '567bdcaa1809618fe3a441345586a491247b76e4dd46db8ff8497bd53d74adbc')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
+sha256sums=('a410d0a343d8a871cc860e2983079981806eb70cbf0c970fa1bcf5689821144f')
 
 build() {
   cd $pkgname-$pkgver
 
-  patch -Np1 -i "${srcdir}"/$pkgname-build.patch
-
   cmake . -DCMAKE_INSTALL_PREFIX=/usr
   make
 }
@@ -34,11 +30,5 @@
   make DESTDIR="${pkgdir}" install
 
 #icon file
-  install -D -m644 "${srcdir}"/$pkgname-$pkgver/packages/$pkgname.png \
-    "${pkgdir}"/usr/share/pixmaps/$pkgname.png
-
-#msits.protocol file provided by kdegraphics-okular package
-  rm -rf "${pkgdir}"/usr/share/kde4
-#kio_msits.so file provided by kdegraphics-okular package - FS#14376
-  rm -rf "${pkgdir}"/usr/lib
+  install -Dm644 packages/$pkgname.png "${pkgdir}"/usr/share/pixmaps/$pkgname.png
 }

Deleted: kchmviewer-build.patch
===================================================================
--- kchmviewer-build.patch	2014-12-14 21:12:03 UTC (rev 123889)
+++ kchmviewer-build.patch	2014-12-14 21:20:30 UTC (rev 123890)
@@ -1,23 +0,0 @@
-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-12-14 21:12:03 UTC (rev 123889)
+++ kchmviewer.changelog	2014-12-14 21:20:30 UTC (rev 123890)
@@ -1,3 +1,6 @@
+2014-12-14  Jaroslav Lichtblau <svetlemodry at aarchlinux.org>
+	* kchmviewer 7.1-1
+
 2014-05-12  Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
 	* kchmviewer 6.1-1
 



More information about the arch-commits mailing list