From 889a138bc71b5fe2a62f957676f68b1126844c73 Mon Sep 17 00:00:00 2001
From: Johannes Huber <johu@gentoo.org>
Date: Mon, 10 Sep 2012 11:05:43 +0000
Subject: Revision bump adds upstream patch which fixes a focus issue spotted
by Bernd Buschinski <b.buschinski@googlemail.com> wrt bug #434464. Remove
old.
(Portage version: 2.2.0_alpha124/cvs/Linux i686)
---
kde-base/konqueror/ChangeLog | 11 ++++-
.../konqueror/files/konqueror-4.9.1-focus.patch | 43 ++++++++++++++++++
kde-base/konqueror/konqueror-4.9.1-r1.ebuild | 53 ++++++++++++++++++++++
kde-base/konqueror/konqueror-4.9.1.ebuild | 51 ---------------------
4 files changed, 105 insertions(+), 53 deletions(-)
create mode 100644 kde-base/konqueror/files/konqueror-4.9.1-focus.patch
create mode 100644 kde-base/konqueror/konqueror-4.9.1-r1.ebuild
delete mode 100644 kde-base/konqueror/konqueror-4.9.1.ebuild
(limited to 'kde-base')
diff --git a/kde-base/konqueror/ChangeLog b/kde-base/konqueror/ChangeLog
index 16e331b8e6b9..7c14ebdb63d2 100644
--- a/kde-base/konqueror/ChangeLog
+++ b/kde-base/konqueror/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for kde-base/konqueror
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.253 2012/09/04 18:45:02 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.254 2012/09/10 11:05:43 johu Exp $
+
+*konqueror-4.9.1-r1 (10 Sep 2012)
+
+ 10 Sep 2012; Johannes Huber <johu@gentoo.org>
+ +files/konqueror-4.9.1-focus.patch, +konqueror-4.9.1-r1.ebuild,
+ -konqueror-4.9.1.ebuild:
+ Revision bump adds upstream patch which fixes a focus issue spotted by Bernd
+ Buschinski <b.buschinski@googlemail.com> wrt bug #434464. Remove old.
*konqueror-4.9.1 (04 Sep 2012)
@@ -1049,4 +1057,3 @@
+konqueror-3.4.0_beta1.ebuild:
Adding the split ebuilds to portage. For KDE 3.4, we've created separate
ebuilds for all the KDE apps.
-
diff --git a/kde-base/konqueror/files/konqueror-4.9.1-focus.patch b/kde-base/konqueror/files/konqueror-4.9.1-focus.patch
new file mode 100644
index 000000000000..4fdbdb0679cf
--- /dev/null
+++ b/kde-base/konqueror/files/konqueror-4.9.1-focus.patch
@@ -0,0 +1,43 @@
+commit 5fa3dbc49f8cac8253e198298948832ca7d38674
+Author: Dawit Alemayehu <adawit@kde.org>
+Date: Wed Sep 5 03:14:52 2012 -0400
+
+ Fix commit a2ae8003352442efdb5731b3fd3de3107b0c1e99. :(
+
+ Do not attempt to change focus when the active view is not the current one.
+ Fixes location bar address being changed when opening URLs in a background tab.
+
+diff --git a/konqueror/src/konqview.cpp b/konqueror/src/konqview.cpp
+index 0130292..2ee9896 100644
+--- a/konqueror/src/konqview.cpp
++++ b/konqueror/src/konqview.cpp
+@@ -518,19 +518,20 @@ void KonqView::slotRequestFocus( KParts::ReadOnlyPart * )
+ void KonqView::setLoading( bool loading, bool hasPending /*= false*/)
+ {
+ //kDebug() << "loading=" << loading << "hasPending=" << hasPending;
+- if (loading) {
++ m_bLoading = loading;
++ m_bPendingRedirection = hasPending;
++ if ( m_pMainWindow->currentView() == this ) {
++ m_pMainWindow->updateToolBarActions( hasPending );
+ // Make sure the focus is restored on the part's widget and not the combo
+ // box if it starts loading a request. See #304933.
+- QWidget* partWidget = (m_pPart ? m_pPart->widget() : 0);
+- if (partWidget && !partWidget->hasFocus()) {
+- //kDebug() << "SET FOCUS on the widget";
+- partWidget->setFocus();
++ if (loading) {
++ QWidget* partWidget = (m_pPart ? m_pPart->widget() : 0);
++ if (partWidget && !partWidget->hasFocus()) {
++ //kDebug() << "SET FOCUS on the widget";
++ partWidget->setFocus();
++ }
+ }
+ }
+- m_bLoading = loading;
+- m_bPendingRedirection = hasPending;
+- if ( m_pMainWindow->currentView() == this )
+- m_pMainWindow->updateToolBarActions( hasPending );
+
+ m_pMainWindow->viewManager()->setLoading( this, loading || hasPending );
+ }
diff --git a/kde-base/konqueror/konqueror-4.9.1-r1.ebuild b/kde-base/konqueror/konqueror-4.9.1-r1.ebuild
new file mode 100644
index 000000000000..2c97d121784b
--- /dev/null
+++ b/kde-base/konqueror/konqueror-4.9.1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-4.9.1-r1.ebuild,v 1.1 2012/09/10 11:05:43 johu Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-baseapps"
+inherit flag-o-matic kde4-meta
+
+DESCRIPTION="KDE: Web browser, file manager, ..."
+KEYWORDS="~amd64 ~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}-focus.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
+
+ echo
+ elog "If you want to use konqueror as a filemanager, install the dolphin kpart:"
+ elog "emerge -1 kde-base/dolphin:${SLOT}"
+ elog
+ elog "To use Java on webpages: emerge jre"
+ echo
+}
diff --git a/kde-base/konqueror/konqueror-4.9.1.ebuild b/kde-base/konqueror/konqueror-4.9.1.ebuild
deleted file mode 100644
index 5950018dca7b..000000000000
--- a/kde-base/konqueror/konqueror-4.9.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-4.9.1.ebuild,v 1.1 2012/09/04 18:45:02 johu Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-baseapps"
-inherit flag-o-matic kde4-meta
-
-DESCRIPTION="KDE: Web browser, file manager, ..."
-KEYWORDS="~amd64 ~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/
-"
-
-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
-
- echo
- elog "If you want to use konqueror as a filemanager, install the dolphin kpart:"
- elog "emerge -1 kde-base/dolphin:${SLOT}"
- elog
- elog "To use Java on webpages: emerge jre"
- echo
-}
--
cgit v1.2.3-65-gdbad