Backport patch from upstream fixing an issue where top level bookmarks do not appear in the toolbar, wrt bug #483666.

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)

3 files changed, 98 insertions, 1 deletions

diff --git a/kde-base/konqueror/ChangeLog b/kde-base/konqueror/ChangeLog
index b6709982b0da..50681967e9da 100644
--- a/kde-base/konqueror/ChangeLog
+++ b/kde-base/konqueror/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/konqueror
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.308 2013/09/03 19:50:14 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.309 2013/09/05 11:55:21 kensington Exp $
+
+*konqueror-4.11.1-r1 (05 Sep 2013)
+
+  05 Sep 2013; Michael Palimaka <kensington@gentoo.org>
+  +files/konqueror-4.11.1-bookmarks.patch, +konqueror-4.11.1-r1.ebuild:
+  Backport patch from upstream fixing an issue where top level bookmarks do not
+  appear in the toolbar, wrt bug #483666.
 
   03 Sep 2013; Chris Reffett <creffett@gentoo.org> -konqueror-4.11.0.ebuild:
   Drop KDE 4.11.0
diff --git a/kde-base/konqueror/files/konqueror-4.11.1-bookmarks.patch b/kde-base/konqueror/files/konqueror-4.11.1-bookmarks.patch
new file mode 100644
index 000000000000..66aae072473b
--- /dev/null
+++ b/kde-base/konqueror/files/konqueror-4.11.1-bookmarks.patch
@@ -0,0 +1,31 @@
+From 43a981481ab9161a83dd200db39c093e2502f68a Mon Sep 17 00:00:00 2001
+From: Bernd Buschinski <b.buschinski@googlemail.com>
+Date: Wed, 4 Sep 2013 16:23:35 +0200
+Subject: [PATCH] Fix toplevel bookmarks not showing in toolbar regression from
+ d1963e23
+
+---
+ konqueror/src/konqbookmarkbar.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+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 );
+-- 
+1.8.3.2
+
diff --git a/kde-base/konqueror/konqueror-4.11.1-r1.ebuild b/kde-base/konqueror/konqueror-4.11.1-r1.ebuild
new file mode 100644
index 000000000000..10644f840cf5
--- /dev/null
+++ b/kde-base/konqueror/konqueror-4.11.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-4.11.1-r1.ebuild,v 1.1 2013/09/05 11:55:21 kensington Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-baseapps"
+inherit flag-o-matic kde4-meta
+
+DESCRIPTION="KDE: Web browser, file manager, ..."
+HOMEPAGE="
+	http://www.kde.org/applications/internet/konqueror/
+	http://konqueror.org/
+"
+KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+bookmarks debug svg"
+# 4 of 4 tests fail. Last checked for 4.0.3
+RESTRICT="test"
+
+DEPEND="
+	$(add_kdebase_dep libkonq)
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kfind)
+	$(add_kdebase_dep kfmclient)
+	bookmarks? ( $(add_kdebase_dep keditbookmarks) )
+	svg? ( $(add_kdebase_dep svgpart) )
+"
+
+KMEXTRACTONLY="
+	konqueror/client/
+	lib/konq/
+"
+
+PATCHES=( "${FILESDIR}/${P}-bookmarks.patch" )
+
+src_prepare() {
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
+
+	kde4-meta_src_prepare
+
+	# Do not install *.desktop files for kfmclient
+	sed -e "/kfmclient\.desktop/d" -i konqueror/CMakeLists.txt \
+		|| die "Failed to omit .desktop files"
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	if ! has_version kde-base/dolphin:${SLOT} ; then
+		elog "If you want to use konqueror as a filemanager, install the dolphin kpart:"
+		elog "kde-base/dolphin:${SLOT}"
+	fi
+
+	if ! has_version virtual/jre ; then
+		elog "To use Java on webpages install virtual/jre."
+	fi
+}