summaryrefslogtreecommitdiff
path: root/extra/kdelibs/PKGBUILD
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-05-28 02:44:47 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-05-28 02:44:47 -0300
commitc3b94090a6330f678ade2f767e76ab7802d3463e (patch)
treee3d2321dce46bfdbc070fcee19e2852566510fe8 /extra/kdelibs/PKGBUILD
parent652c41cc5fd8dc5f23ef6a6c93f488911e1054c7 (diff)
parent33feb015eb09eee76827f359e685fce981d88111 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/chmsee/PKGBUILD community/flumotion/PKGBUILD community/gnash/PKGBUILD community/kadu/PKGBUILD community/mythplugins/PKGBUILD community/performous/PKGBUILD community/sleuthkit/PKGBUILD community/virtualbox/PKGBUILD community/wbar/PKGBUILD core/attr/PKGBUILD core/binutils/PKGBUILD core/heimdal/PKGBUILD core/sqlite3/PKGBUILD extra/acpid/PKGBUILD extra/apache-ant/PKGBUILD extra/aria2/PKGBUILD extra/boost/PKGBUILD extra/bs/PKGBUILD extra/bzr/PKGBUILD extra/cvsps/PKGBUILD extra/dosbox/PKGBUILD extra/ettercap-gtk/PKGBUILD extra/fetchmail/PKGBUILD extra/gnome-desktop-sharp/PKGBUILD extra/gnome-panel/PKGBUILD extra/gptfdisk/PKGBUILD extra/gqmpeg/PKGBUILD extra/gstreamer0.10-base/PKGBUILD extra/gstreamer0.10-ugly/PKGBUILD extra/gtk-theme-switch2/PKGBUILD extra/icecast/PKGBUILD extra/kdeedu/PKGBUILD extra/kmldonkey/PKGBUILD extra/kmplayer/PKGBUILD extra/libbtctl/PKGBUILD extra/libftdi/PKGBUILD extra/liborigin2/PKGBUILD extra/libpst/PKGBUILD extra/libx86/PKGBUILD extra/lsdvd/PKGBUILD extra/mc/PKGBUILD extra/monotone/PKGBUILD extra/multitail/PKGBUILD extra/nbsmtp/PKGBUILD extra/nickle/PKGBUILD extra/nppangband/PKGBUILD extra/numlockx/PKGBUILD extra/pidgin/PKGBUILD extra/poppler/PKGBUILD extra/python-gtkglext/PKGBUILD extra/scim/PKGBUILD extra/socat/PKGBUILD extra/speedcrunch/PKGBUILD extra/transmission/PKGBUILD extra/vbetool/PKGBUILD extra/vlc/PKGBUILD extra/xchat-gnome/xchat-gnome.install libre/kernel26-libre/PKGBUILD libre/pacman/PKGBUILD libre/xchat-gnome-libre/PKGBUILD libre/xchat-gnome-libre/gtk2-2.20.patch libre/xchat-gnome-libre/xchat-gnome-0.26.1-deprecated-symbol.patch libre/xchat-gnome-libre/xchat-gnome.install multilib/nspluginwrapper/PKGBUILD testing/libgweather/libgweather.install testing/mesa/PKGBUILD
Diffstat (limited to 'extra/kdelibs/PKGBUILD')
-rw-r--r--extra/kdelibs/PKGBUILD13
1 files changed, 9 insertions, 4 deletions
diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD
index 572d2bdb3..428e753e8 100644
--- a/extra/kdelibs/PKGBUILD
+++ b/extra/kdelibs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 122843 2011-05-06 11:48:02Z andrea $
+# $Id: PKGBUILD 124805 2011-05-24 14:15:20Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=kdelibs
pkgver=4.6.3
-pkgrel=2
+pkgrel=3
pkgdesc="KDE Core Libraries"
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
@@ -19,11 +19,13 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl'
replaces=('arts' 'kdelibs-experimental')
install='kdelibs.install'
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
- 'kde-applications-menu.patch' 'archlinux-menu.patch' 'abs-syntax-highlight.patch')
+ 'kde-applications-menu.patch' 'archlinux-menu.patch'
+ 'abs-syntax-highlight.patch' 'fix-double-POST-action.patch')
sha1sums=('c7fb089c9d52a6b1d9188b9e788753373a3288e4'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
'63a850ab4196b9d06934f2b4a13acd9f7739bc67'
- 'd994f262356af5b9e4e9619646e471bd98c91efb')
+ 'd994f262356af5b9e4e9619646e471bd98c91efb'
+ 'c8ef05943e71a28c4604217d31fc6ca83e48476c')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -35,6 +37,9 @@ build() {
# add syntax highlightning for PKGBUILD and .install files
patch -p1 -i $srcdir/abs-syntax-highlight.patch
+ # Already fixed upstream
+ patch -p1 -i $srcdir/fix-double-POST-action.patch
+
cd ${srcdir}
mkdir build
cd build