summaryrefslogtreecommitdiff
path: root/community/kdesvn
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-03-02 18:53:10 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2012-03-02 18:53:10 +0100
commit588ef662386ce30b28688e95f11f7fc7a52f8e25 (patch)
treea62b104d7b70d82767fbde6aeb782b1359302459 /community/kdesvn
parent9ea487ed90ebf891571ea8fffd34c154cbf981df (diff)
parentb479098a1b8d7cb545339cb225a7cde4988b2748 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/kdesvn/PKGBUILD community/lwm/PKGBUILD community/sakura/PKGBUILD extra/openmpi/PKGBUILD extra/qt/PKGBUILD
Diffstat (limited to 'community/kdesvn')
-rw-r--r--community/kdesvn/PKGBUILD33
-rw-r--r--community/kdesvn/kdesvn-1.5.5-doctype-version.patch9
-rw-r--r--community/kdesvn/kdesvn-1.5.5-qt48.patch14
-rw-r--r--community/kdesvn/kdesvn.install7
4 files changed, 46 insertions, 17 deletions
diff --git a/community/kdesvn/PKGBUILD b/community/kdesvn/PKGBUILD
index f0d900b55..2b3d3b2cd 100644
--- a/community/kdesvn/PKGBUILD
+++ b/community/kdesvn/PKGBUILD
@@ -1,24 +1,29 @@
-# $Id: PKGBUILD 26469 2010-09-15 21:07:57Z jlichtblau $
+# $Id: PKGBUILD 66895 2012-02-29 22:49:56Z giovanni $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
pkgname=kdesvn
pkgver=1.5.5
-pkgrel=1
+pkgrel=2
pkgdesc="A pure C++ SVN-client for KDE"
arch=('i686' 'x86_64' 'mips64el')
-url="http://www.alwins-world.de/programs/kdesvn/"
+url="http://kdesvn.alwins-world.de/"
license=('GPL')
-depends=('hicolor-icon-theme' 'kdelibs' 'subversion' 'xdg-utils' 'qt')
+depends=('kdebase-runtime' 'subversion')
makedepends=('automoc4' 'cmake')
conflicts=('qsvn')
-options=('libtool')
-install=$pkgname.install
-changelog=$pkgname.changelog
-source=(http://kdesvn.alwins-world.de/downloads/$pkgname-$pkgver.tar.bz2)
-md5sums=('8f11d31cc55fba408b7971541ee261d0')
+install=kdesvn.install
+source=("http://kdesvn.alwins-world.de/downloads/${pkgname}-${pkgver}.tar.bz2"
+ 'kdesvn-1.5.5-qt48.patch'
+ 'kdesvn-1.5.5-doctype-version.patch')
+md5sums=('8f11d31cc55fba408b7971541ee261d0'
+ 'a7440581e373e06e4290e1f0d905c6f2'
+ '64368d7cb40ce9fe7656f886337628b8')
build() {
- cd ${srcdir}/$pkgname-$pkgver
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ patch -Np1 -i "${srcdir}/kdesvn-1.5.5-qt48.patch"
+ patch -Np1 -i "${srcdir}/kdesvn-1.5.5-doctype-version.patch"
cmake . \
-DCMAKE_INSTALL_PREFIX=/usr \
@@ -30,13 +35,13 @@ build() {
}
package() {
- cd ${srcdir}/$pkgname-$pkgver
+ cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR=${pkgdir} install
+ make DESTDIR="${pkgdir}" install
-#removing conflicting files - kdesdk
+ #removing conflicting files - kdesdk
rm -f ${pkgdir}/usr/share/kde4/services/svn*
-#removing $srcdir reference
+ #removing $srcdir reference
rm -rf ${pkgdir}/usr/share/doc
}
diff --git a/community/kdesvn/kdesvn-1.5.5-doctype-version.patch b/community/kdesvn/kdesvn-1.5.5-doctype-version.patch
new file mode 100644
index 000000000..908960b72
--- /dev/null
+++ b/community/kdesvn/kdesvn-1.5.5-doctype-version.patch
@@ -0,0 +1,9 @@
+--- a/doc/nl/index.docbook 2010-08-09 19:00:17.000000000 +0200
++++ b/doc/nl/index.docbook 2010-08-09 19:00:26.000000000 +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 kdesvn "<application>kdesvn</application>">
+ <!ENTITY kappname "&kdesvn;"><!-- Do *not* replace kappname-->
+ <!ENTITY package "kde-module"><!-- kdebase, kdeadmin, etc -->
diff --git a/community/kdesvn/kdesvn-1.5.5-qt48.patch b/community/kdesvn/kdesvn-1.5.5-qt48.patch
new file mode 100644
index 000000000..a1ac51b51
--- /dev/null
+++ b/community/kdesvn/kdesvn-1.5.5-qt48.patch
@@ -0,0 +1,14 @@
+Source: Ubuntu
+https://launchpad.net/ubuntu/precise/+source/kdesvn/1.5.5-3ubuntu1
+
+--- kdesvn-1.5.5.orig/src/svnfrontend/graphtree/revgraphview.h
++++ kdesvn-1.5.5/src/svnfrontend/graphtree/revgraphview.h
+@@ -49,7 +49,7 @@ typedef svn::SharedPointer<KTemporaryFil
+ /**
+ @author Rajko Albrecht <ral@alwins-world.de>
+ */
+-class RevGraphView : virtual public QGraphicsView
++class RevGraphView : public QGraphicsView
+ {
+ Q_OBJECT
+ public:
diff --git a/community/kdesvn/kdesvn.install b/community/kdesvn/kdesvn.install
index b711352cb..5c501dc49 100644
--- a/community/kdesvn/kdesvn.install
+++ b/community/kdesvn/kdesvn.install
@@ -1,11 +1,12 @@
post_install() {
- which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
}
post_upgrade() {
- post_install $1
+ post_install
}
post_remove() {
- post_install $1
+ post_install
}