[arch-commits] Commit in kdiff3/trunk (4 files)

Fri Nov 26 21:37:44 UTC 2010

Date: Friday, November 26, 2010 @ 16:37:44
  Author: eric
Revision: 100963

upgpkg: kdiff3 0.9.95-2
Fixed kdiff3_part.rc location (close FS#20703), Added plugin, Added docbook-xml makedepends, Added docbook patch, Added install scriptlet to update icon cache

Added:
  kdiff3/trunk/docbook.patch
  kdiff3/trunk/kdiff3.install
Modified:
  kdiff3/trunk/PKGBUILD
Deleted:
  kdiff3/trunk/ChangeLog

----------------+
 ChangeLog      |   24 ------------------------
 PKGBUILD       |   27 +++++++++++++++++----------
 docbook.patch  |   40 ++++++++++++++++++++++++++++++++++++++++
 kdiff3.install |   11 +++++++++++
 4 files changed, 68 insertions(+), 34 deletions(-)

Deleted: ChangeLog
===================================================================

--- ChangeLog	2010-11-26 21:31:04 UTC (rev 100962)
+++ ChangeLog	2010-11-26 21:37:44 UTC (rev 100963)
@@ -1,24 +0,0 @@
-2009-03-22  Eric Belanger  <eric at archlinux.org>
-
-	* kdiff3 0.9.95-1
-	* Upstream update
-
-2009-01-21  Eric Belanger  <eric at archlinux.org>
-
-	* kdiff3 0.9.94-1
-	* Upstream update
-
-2009-01-08  Eric Belanger  <eric at archlinux.org>
-
-	* kdiff3 0.9.93-1
-	* Upstream update
-	* Updated depends to kdelibs
-	* Switched to cmake build system
-	* Added cmake and automoc4 makedepends
-	
-2008-07-27  Eric Belanger  <eric at archlinux.org>
-
-	* kdiff3 0.9.92-2
-	* Rebuild for kde3
-	* Added ChangeLog
-	* Added cvs Id tag to PKGBUILD

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-11-26 21:31:04 UTC (rev 100962)
+++ PKGBUILD	2010-11-26 21:37:44 UTC (rev 100963)
@@ -1,25 +1,32 @@
 # $Id$
 # Maintainer: Eric Belanger <eric at archlinux.org>
-# Contributor: Eric Belanger <eric at archlinux.org>
 
 pkgname=kdiff3
 pkgver=0.9.95
-pkgrel=1
+pkgrel=2
 pkgdesc="A KDE file comparator/merge tool"
 arch=('i686' 'x86_64')
 url="http://kdiff3.sourceforge.net/"
 license=('GPL')
 depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz)
-md5sums=('652a98bf79ba762a8a646d4a0fddb323')
-sha1sums=('1fb27e8b42463ea23ad0169e20819352c1c476b7')
+makedepends=('cmake' 'automoc4' 'kdebase-lib' 'docbook-xml')
+optdepends=('kdebase-lib: for the plugin')
+install=kdiff3.install
+source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz docbook.patch)
+md5sums=('652a98bf79ba762a8a646d4a0fddb323' '7a91d1ab6f62c41dc65082ae99bdeff0')
+sha1sums=('1fb27e8b42463ea23ad0169e20819352c1c476b7' '96a856fc7d9829f64bb59853a6dffba8a70d794e')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 < ../docbook.patch
+  sed -i 's|kdiff3_part.rc DESTINATION ${DATA_INSTALL_DIR}/kdiff3|kdiff3_part.rc DESTINATION ${DATA_INSTALL_DIR}/kdiff3part|' src-QT4/CMakeLists.txt
   mkdir release
   cd release
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+  make
 }
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}/release"
+  make DESTDIR=${pkgdir} install
+}

Added: docbook.patch
===================================================================
--- docbook.patch	                        (rev 0)
+++ docbook.patch	2010-11-26 21:37:44 UTC (rev 100963)
@@ -0,0 +1,40 @@
+diff -r --unified kdiff3-0.9.95/doc/de/index.docbook kdiff3-0.9.95-neu/doc/de/index.docbook
+--- kdiff3-0.9.95/doc/de/index.docbook	2010-10-11 23:51:27.575286877 +0200
++++ kdiff3-0.9.95-neu/doc/de/index.docbook	2010-10-11 23:52:40.138829992 +0200
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+   <!ENTITY kdiff3 "<application
+ >KDiff3</application
+ >">
+diff -r --unified kdiff3-0.9.95/doc/fr/index.docbook kdiff3-0.9.95-neu/doc/fr/index.docbook
+--- kdiff3-0.9.95/doc/fr/index.docbook	2010-10-11 23:51:27.610931550 +0200
++++ kdiff3-0.9.95-neu/doc/fr/index.docbook	2010-10-11 23:52:23.739728901 +0200
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+   <!ENTITY kdiff3 "<application
+ >KDiff3</application
+ >">
+diff -r --unified kdiff3-0.9.95/doc/it/index.docbook kdiff3-0.9.95-neu/doc/it/index.docbook
+--- kdiff3-0.9.95/doc/it/index.docbook	2010-10-11 23:51:27.580378903 +0200
++++ kdiff3-0.9.95-neu/doc/it/index.docbook	2010-10-11 23:52:32.462829209 +0200
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+   <!ENTITY kdiff3 "<application
+ >KDiff3</application
+ >">
+diff -r --unified kdiff3-0.9.95/doc/nl/index.docbook kdiff3-0.9.95-neu/doc/nl/index.docbook
+--- kdiff3-0.9.95/doc/nl/index.docbook	2010-10-11 23:51:27.575286877 +0200
++++ kdiff3-0.9.95-neu/doc/nl/index.docbook	2010-10-11 23:52:45.371829602 +0200
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+   <!ENTITY kdiff3 "<application
+ >KDiff3</application
+ >">

Added: kdiff3.install
===================================================================
--- kdiff3.install	                        (rev 0)
+++ kdiff3.install	2010-11-26 21:37:44 UTC (rev 100963)
@@ -0,0 +1,11 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}


