diff options
Diffstat (limited to 'extra/kdiff3')
| -rw-r--r-- | extra/kdiff3/PKGBUILD | 16 | ||||
| -rw-r--r-- | extra/kdiff3/docbook.patch | 40 |
2 files changed, 7 insertions, 49 deletions
diff --git a/extra/kdiff3/PKGBUILD b/extra/kdiff3/PKGBUILD index 6fc1c62cc..feb20a0f2 100644 --- a/extra/kdiff3/PKGBUILD +++ b/extra/kdiff3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 100978 2010-11-27 05:30:04Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id: PKGBUILD 136960 2011-09-03 21:15:57Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=kdiff3 -pkgver=0.9.95 -pkgrel=2 +pkgver=0.9.96 +pkgrel=1 pkgdesc="A KDE file comparator/merge tool" arch=('i686' 'x86_64' 'mips64el') url="http://kdiff3.sourceforge.net/" @@ -12,14 +12,12 @@ depends=('kdebase-runtime') 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') +source=(http://downloads.sourceforge.net/sourceforge/kdiff3/${pkgname}-${pkgver}.tar.gz) +md5sums=('46b96befddf3448a3cb673f018c6f6f9') +sha1sums=('d7efdacdfd7ea3c7ec9f7dee32aba5962c1709a5') build() { 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 diff --git a/extra/kdiff3/docbook.patch b/extra/kdiff3/docbook.patch deleted file mode 100644 index b957e51fd..000000000 --- a/extra/kdiff3/docbook.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 - >"> |