[arch-commits] Commit in kdebase/trunk (PKGBUILD kdebug-324511.patch)

2013-11-04 Thread Andrea Scarpino 
Date: Monday, November 4, 2013 @ 16:15:20
  Author: andrea
Revision: 198792

Cleanup

Modified:
  kdebase/trunk/PKGBUILD
Deleted:
  kdebase/trunk/kdebug-324511.patch

-+
 PKGBUILD|2 --
 kdebug-324511.patch |   25 -
 2 files changed, 27 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-11-04 15:14:52 UTC (rev 198791)
+++ PKGBUILD2013-11-04 15:15:20 UTC (rev 198792)
@@ -24,8 +24,6 @@
 
 prepare() {
   mkdir build
-
-  cd kde-baseapps-${pkgver}
 }
 
 build() {

Deleted: kdebug-324511.patch
===
--- kdebug-324511.patch 2013-11-04 15:14:52 UTC (rev 198791)
+++ kdebug-324511.patch 2013-11-04 15:15:20 UTC (rev 198792)
@@ -1,25 +0,0 @@
-commit 43a981481ab9161a83dd200db39c093e2502f68a
-Author: Bernd Buschinski b.buschin...@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 );

[arch-commits] Commit in kdebase/trunk (PKGBUILD kdebug-324511.patch)

2013-09-10 Thread Andrea Scarpino 
Date: Wednesday, September 11, 2013 @ 00:37:57
  Author: andrea
Revision: 194222

Fix bookmarks not shown in toolbar
(FS#36852)

Added:
  kdebase/trunk/kdebug-324511.patch
Modified:
  kdebase/trunk/PKGBUILD

-+
 PKGBUILD|   17 -
 kdebug-324511.patch |   25 +
 2 files changed, 37 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-09-10 22:37:20 UTC (rev 194221)
+++ PKGBUILD2013-09-10 22:37:57 UTC (rev 194222)
@@ -13,18 +13,25 @@
  '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 \

Added: kdebug-324511.patch
===
--- kdebug-324511.patch (rev 0)
+++ kdebug-324511.patch 2013-09-10 22:37:57 UTC (rev 194222)
@@ -0,0 +1,25 @@
+commit 43a981481ab9161a83dd200db39c093e2502f68a
+Author: Bernd Buschinski b.buschin...@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 );