diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2013-09-11 03:21:51 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2013-09-11 03:21:51 -0300 |
| commit | a9a8a7067fef31299cddc4b2628dbf73b398f395 (patch) | |
| tree | 47e075883d277d449a026065ce95c4137c41c406 /libre/kdebase-konqueror-libre | |
| parent | 77d60420680c065b7ed54e8348ec6ae4475d7f44 (diff) | |
| download | abslibre-a9a8a7067fef31299cddc4b2628dbf73b398f395.tar.gz abslibre-a9a8a7067fef31299cddc4b2628dbf73b398f395.tar.bz2 abslibre-a9a8a7067fef31299cddc4b2628dbf73b398f395.zip | |
kdebase-konqueror-libre-4.11.1-2: fix bookmarks not shown in toolbar
* See https://bugs.archlinux.org/task/36852
Diffstat (limited to 'libre/kdebase-konqueror-libre')
| -rw-r--r-- | libre/kdebase-konqueror-libre/PKGBUILD | 23 | ||||
| -rw-r--r-- | libre/kdebase-konqueror-libre/kdebug-324511.patch | 25 |
2 files changed, 38 insertions, 10 deletions
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD index 6a82a8ca6..368ee981c 100644 --- a/libre/kdebase-konqueror-libre/PKGBUILD +++ b/libre/kdebase-konqueror-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 194033 2013-09-10 12:51:41Z andrea $ +# $Id: PKGBUILD 194222 2013-09-10 22:37:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> @@ -7,15 +7,17 @@ _pkgname='kdebase-konqueror' pkgname='kdebase-konqueror-libre' pkgver=4.11.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://kde.org/applications/internet/konqueror/" 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" - "konq-about-fsdg.diff") + 'kdebug-324511.patch' + 'konq-about-fsdg.diff') sha1sums=('a8781b2d7d431024cd5355a1e57d387d5945e12f' + 'ff32bee8ef0ee154f1885fa4cd91a6754d980343' 'd6cbb53c04179b8180f9439eca156b7ff2e76b3a') pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation' depends=('kdebase-dolphin' 'kdebase-keditbookmarks') @@ -25,15 +27,16 @@ conflicts=('kdebase-nsplugins' 'kdebase-konqueror') replaces=('kdebase-nsplugins' 'kdebase-konqueror') provides=("kdebase-konqueror=$pkgver") -build() { - cd kde-baseapps-${pkgver} - - # Don't recommend nonfree software or Google. - patch -Np1 -i "${srcdir}/konq-about-fsdg.diff" +prepare() { + mkdir build - cd .. + cd kde-baseapps-${pkgver} + patch -p1 -i "${srcdir}"/kdebug-324511.patch + # Don't recommend nonfree software or Google. + patch -Np1 -i "${srcdir}/konq-about-fsdg.diff" +} - mkdir build +build() { cd build cmake ../kde-baseapps-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/libre/kdebase-konqueror-libre/kdebug-324511.patch b/libre/kdebase-konqueror-libre/kdebug-324511.patch new file mode 100644 index 000000000..cca2a7254 --- /dev/null +++ b/libre/kdebase-konqueror-libre/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 ); |