diff options
| author | root <root@rshg054.dnsready.net> | 2013-09-12 01:43:12 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-09-12 01:43:12 -0700 |
| commit | 67c663ff9aaeee1572097ef4eceb39c039d91f42 (patch) | |
| tree | 4d2b7879f5acbe2a2782593532b37a13c7a9c87b /extra/kdebase | |
| parent | 2cfbbdcb041073ed1f9aff2f2fd630b24e039e6d (diff) | |
Thu Sep 12 01:42:53 PDT 2013
Diffstat (limited to 'extra/kdebase')
| -rw-r--r-- | extra/kdebase/PKGBUILD | 19 | ||||
| -rw-r--r-- | extra/kdebase/kdebug-324511.patch | 25 |
2 files changed, 38 insertions, 6 deletions
diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD index ead5769e7..576774403 100644 --- a/extra/kdebase/PKGBUILD +++ b/extra/kdebase/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 194054 2013-09-10 13:23:34Z andrea $ +# $Id: PKGBUILD 194224 2013-09-10 22:47:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -13,18 +13,25 @@ pkgname=('kdebase-dolphin' 'kdebase-lib' 'kdebase-plasma') pkgver=4.11.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'nepomuk-widgets') -source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz") -sha1sums=('a8781b2d7d431024cd5355a1e57d387d5945e12f') +source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz" + 'kdebug-324511.patch') +sha1sums=('a8781b2d7d431024cd5355a1e57d387d5945e12f' + 'ff32bee8ef0ee154f1885fa4cd91a6754d980343') + +prepare() { + mkdir build + + cd kde-baseapps-${pkgver} + patch -p1 -i "${srcdir}"/kdebug-324511.patch +} build() { - cd ${srcdir} - mkdir build cd build cmake ../kde-baseapps-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/extra/kdebase/kdebug-324511.patch b/extra/kdebase/kdebug-324511.patch new file mode 100644 index 000000000..cca2a7254 --- /dev/null +++ b/extra/kdebase/kdebug-324511.patch @@ -0,0 +1,25 @@ +commit 43a981481ab9161a83dd200db39c093e2502f68a +Author: Bernd Buschinski <b.buschinski@googlemail.com> +Date: Wed Sep 4 16:23:35 2013 +0200 + + Fix toplevel bookmarks not showing in toolbar + regression from d1963e23 + +diff --git a/konqueror/src/konqbookmarkbar.cpp b/konqueror/src/konqbookmarkbar.cpp +index 2141575..199e15f 100644 +--- a/konqueror/src/konqbookmarkbar.cpp ++++ b/konqueror/src/konqbookmarkbar.cpp +@@ -184,10 +184,12 @@ void KBookmarkBar::fillBookmarkBar(const KBookmarkGroup & parent) + + if (!bm.isGroup()) + { +- if ( bm.isSeparator() ) ++ if ( bm.isSeparator() ) ++ { + if (m_toolBar) { + m_toolBar->addSeparator(); + } ++ } + else + { + KAction *action = new KBookmarkAction( bm, m_pOwner, 0 ); |