Add various fixups from master to kdelibs.

6 files changed, 128 insertions, 87 deletions

diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 58ad0799114..72f2a95f230 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,5 +1,7 @@
-AUX kdelibs-4.1.0-quit-app.patch 3854 RMD160 753e52393f5d31af079107093e782a128b26373d SHA1 2832c17d751df003159b6b1cf6b5e675a48716a2 SHA256 85b914b76994358f9044009653c91309f0e7446d751207f74ab813287c61fc7f
+AUX kdelibs-4.1.1-cmake-modules.patch 2905 RMD160 d7043d4153927ab655c4d7630389024983c6b95a SHA1 9d232044bf51f98656a48092082a5aafcb9d4699 SHA256 8836e0c8267054b2dedcf1c879e57bde67ff83c1b824337dec81d96a3d69754e
+AUX kdelibs-4.1.1-kbuildsycoca.patch 799 RMD160 ce97b9a9199d13de5a523d615aae3dc7836cd36b SHA1 9c13de4e2df63c810d7208fe7cafa8977b9bebfd SHA256 c0a6e8abe870c98a712b386eebedafde61c232bdca9b9a4e4c35c98842e099fd
+AUX kdelibs-4.1.1-konqueror-pointer.patch 736 RMD160 1599723e5fa0b8bb12d54f7552253e13ad6a6918 SHA1 b824e60220a507974d5311e689ea4ddf909050d3 SHA256 e263fd0999fb9a025993ba6a39ba96a0306d96dafcfdbac0bf6077ec9cb663e6
 DIST kdelibs-4.1.1.tar.bz2 9110725 RMD160 d9ca028f635721e20b8f13204fdd25ee475e07a5 SHA1 a567a431a4431f4ce9738d3498bb03318953fd77 SHA256 b830e3eba8d65ad257b16c920e1bf18fcc7c0db84ec244d450a0db1cc0626a8f
-EBUILD kdelibs-4.1.1-r4.ebuild 5061 RMD160 8a8d202b6305ddabfb9eeee12c18348371c4ef30 SHA1 8c42af8bbd02c7d1e21f123956113df119e57b80 SHA256 bb05fdf3bc18515ccc055eaf52b47cbd3b8610dfe94fd2ae2c59ce9c97303c50
+EBUILD kdelibs-4.1.1-r4.ebuild 5415 RMD160 5a8eb30acf8830cc507513d368c14424f1ef9ddf SHA1 6416b7f2de189f5dbcea1468d3a63a74836a2271 SHA256 95ee0c6fcf609a51d0f4ae716005fd9a24754298b7083d04196157d52e16192a
 MISC ChangeLog 2143 RMD160 4f403772e672ea4cfcb17e3798d870aec9314262 SHA1 b032d7ac21cd187d8ab9e86c09dbd8a39980c704 SHA256 ca3be3249afe915a9fff197c1accf2c8bb963d03c5aac3ba1a4e1cd5dd231a7b
 MISC metadata.xml 394 RMD160 c95f7521b847b71e8893cf55cbf338dc441a150f SHA1 2bf0ff5ba4ac7612641379788898d300d8bb5d9d SHA256 0d6c54d88d3e10b93dbe547d154f43f72fa0e7f140d233b3219bc0340dff6104
diff --git a/kde-base/kdelibs/files/kdelibs-4.1.0-quit-app.patch b/kde-base/kdelibs/files/kdelibs-4.1.0-quit-app.patch
deleted file mode 100644
index c1c1c069ff1..00000000000
--- a/kde-base/kdelibs/files/kdelibs-4.1.0-quit-app.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- branches/KDE/4.1/kdelibs/kdeui/widgets/kmainwindow.cpp	2008/08/01 00:12:03	840376
-+++ branches/KDE/4.1/kdelibs/kdeui/widgets/kmainwindow.cpp	2008/08/01 00:14:54	840377
-@@ -226,6 +226,11 @@
- {
-     KGlobal::ref();
- 
-+    // We set allow quit to true, so when the refcounting reaches 0 the application instance will
-+    // be exited. This has a similar purpose than setQuitOnLastWindowClosed (from
-+    // QApplication), but it honors (de)refing from KGlobal.
-+    KGlobal::setAllowQuit(true);
-+
-     q = _q;
- 
-     q->setAnimated(KGlobalSettings::graphicEffectsLevel() & KGlobalSettings::SimpleAnimationEffects);
---- branches/KDE/4.1/kdelibs/kdecore/kernel/kglobal.cpp	2008/08/01 00:12:03	840376
-+++ branches/KDE/4.1/kdelibs/kdecore/kernel/kglobal.cpp	2008/08/01 00:14:54	840377
-@@ -251,11 +251,14 @@
- 
- /**
-  * This counter indicates when to quit the application.
-- * It starts at 1, is decremented in KMainWindow when the last window is closed, but
-- * is incremented by operations that should outlive the last window closed
-- * (e.g. a file copy for a file manager, or 'compacting folders on exit' for a mail client).
-+ * It starts at 0, is incremented by KMainWindow, systray icons, running jobs, etc.
-+ * and decremented again when those things are destroyed.
-+ * This mechanism allows dialogs and jobs to outlive the last window closed
-+ * e.g. a file copy for a file manager, or 'compacting folders on exit' for a mail client,
-+ * the job progress widget with "keep open" checked, etc.
-  */
--static int s_refCount = 1;
-+static int s_refCount = 0;
-+static bool s_allowQuit = false;
- 
- void KGlobal::ref()
- {
-@@ -267,9 +270,14 @@
- {
-     --s_refCount;
-     //kDebug() << "KGlobal::deref() : refCount = " << s_refCount;
--    if (s_refCount <= 0) {
-+    if (s_refCount <= 0 && s_allowQuit) {
-         QCoreApplication::instance()->quit();
-     }
- }
- 
-+void KGlobal::setAllowQuit(bool allowQuit)
-+{
-+    s_allowQuit = allowQuit;
-+}
-+
- #undef PRIVATE_DATA
---- branches/KDE/4.1/kdelibs/kdecore/kernel/kglobal.h	2008/08/01 00:15:47	840378
-+++ branches/KDE/4.1/kdelibs/kdecore/kernel/kglobal.h	2008/08/01 00:18:28	840379
-@@ -409,6 +409,16 @@
-      * "last window closed" event, but some events should outlive the last window closed
-      * (e.g. a file copy for a file manager, or 'compacting folders on exit' for a mail client).
-      *
-+     * We have some use cases that we want to take care of (the format is "action refcount"):
-+     * - open window -> setAllowQuit(true) 1 ; close window 0 => EXIT
-+     * - job start 1; job end 0 [don't exit yet]; open window -> setAllowQuit(true) 1 ; close window 0 => EXIT
-+     * - job start 1; open window -> setAllowQuit(true) 2; close window 1; job end 0 => EXIT
-+     * - job start 1; open window -> setAllowQuit(true) 2; job end 1; close window 0 => EXIT
-+     * - open dialog 0; close dialog 0; => DO NOT EXIT
-+     * - job start 1; job end 0; create two main objects 2; delete both main objects 0 => EXIT
-+     * - open window -> setAllowQuit(true) 1; add systray icon 2; close window 1 => DO NOT EXIT
-+     * - open window -> setAllowQuit(true) 1; add systray icon 2; remove systray icon 1; close window 0 => EXIT
-+     *
-      * Note that for this to happen you must call qApp->setQuitOnLastWindowClosed(false),
-      * in main() for instance.
-      */
-@@ -421,6 +431,13 @@
-     KDECORE_EXPORT void deref();
- 
-     /**
-+     * If refcounting reaches 0 (or less), and @p allowQuit is true, the instance of the application
-+     * will automatically be exited. Otherwise, the application will not exit automatically.
-+     * @since 4.2
-+     */
-+    KDECORE_EXPORT void setAllowQuit(bool allowQuit);
-+
-+    /**
-      * The component currently active (useful in a multi-component
-      * application, such as a KParts application).
-      * Don't use this - it's mainly for KAboutDialog and KBugReport.
diff --git a/kde-base/kdelibs/files/kdelibs-4.1.1-cmake-modules.patch b/kde-base/kdelibs/files/kdelibs-4.1.1-cmake-modules.patch
new file mode 100644
index 00000000000..95d79288761
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.1.1-cmake-modules.patch
@@ -0,0 +1,69 @@
+diff -Naur a/cmake/modules/FindKdcraw.cmake b/cmake/modules/FindKdcraw.cmake
+--- a/cmake/modules/FindKdcraw.cmake	2008-05-21 13:06:10.000000000 +0200
++++ b/cmake/modules/FindKdcraw.cmake	2008-09-22 16:33:42.000000000 +0200
+@@ -69,14 +69,22 @@
+     if(KDCRAW_VERSION_GOOD_FOUND)
+         set(KDCRAW_DEFINITIONS "${_KDCRAWCflags}")
+     
++        # first try pkgconfig dir, fallback to cmake defaults
+         FIND_PATH(KDCRAW_INCLUDE_DIR libkdcraw/version.h
++        PATHS
+         ${_KDCRAWIncDir}
++        ${KDE4_INCLUDE_DIR}
++        NO_DEFAULT_PATH
+         )
++        FIND_PATH(KDCRAW_INCLUDE_DIR libkdcraw/version.h)
+     
+         FIND_LIBRARY(KDCRAW_LIBRARIES NAMES kdcraw
+         PATHS
+         ${_KDCRAWLinkDir}
++        ${KDE4_LIB_DIR}
++        NO_DEFAULT_PATH
+         )
++        FIND_LIBRARY(KDCRAW_LIBRARIES NAMES kdcraw)
+     
+         if (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES)
+             set(KDCRAW_FOUND TRUE)
+diff -Naur a/cmake/modules/FindKexiv2.cmake b/cmake/modules/FindKexiv2.cmake
+--- a/cmake/modules/FindKexiv2.cmake	2008-05-21 13:06:10.000000000 +0200
++++ b/cmake/modules/FindKexiv2.cmake	2008-09-22 16:32:47.000000000 +0200
+@@ -68,14 +68,22 @@
+     if(KEXIV2_VERSION_GOOD_FOUND)
+         set(KEXIV2_DEFINITIONS "${_KEXIV2Cflags}")
+     
++        # first try specific paths, use cmake defaults as fallback
+         FIND_PATH(KEXIV2_INCLUDE_DIR libkexiv2/version.h
++        PATHS
+         ${_KEXIV2IncDir}
++        ${KDE4_INCLUDE_DIR}
++        NO_DEFAULT_PATH
+         )
++        FIND_PATH(KEXIV2_INCLUDE_DIR libkexiv2/version.h)
+     
+         FIND_LIBRARY(KEXIV2_LIBRARIES NAMES kexiv2
+         PATHS
+         ${_KEXIV2LinkDir}
++        ${KDE4_LIB_DIR}
++        NO_DEFAULT_PATH
+         )
++        FIND_LIBRARY(KEXIV2_LIBRARIES NAMES kexiv2)
+     
+         if (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES)
+             set(KEXIV2_FOUND TRUE)
+diff -Naur a/cmake/modules/FindKipi.cmake b/cmake/modules/FindKipi.cmake
+--- a/cmake/modules/FindKipi.cmake	2008-05-21 13:06:10.000000000 +0200
++++ b/cmake/modules/FindKipi.cmake	2008-09-22 16:21:37.000000000 +0200
+@@ -68,8 +68,11 @@
+     if(KIPI_VERSION_GOOD_FOUND)
+         set(KIPI_DEFINITIONS ${_KIPICflags})
+ 
+-        find_path(KIPI_INCLUDE_DIR NAMES libkipi/version.h PATHS ${KDE4_INCLUDE_DIR} ${_KIPIIncDir})
+-        find_library(KIPI_LIBRARIES NAMES kipi PATHS ${KDE4_LIB_DIR} ${_KIPILinkDir})
++        # as suggested by cmake documentation, first try specific path, then default to searching everything else
++        find_path(KIPI_INCLUDE_DIR NAMES libkipi/version.h PATHS ${_KIPIIncDir} ${KDE4_INCLUDE_DIR} NO_DEFAULT_PATH)
++        find_path(KIPI_INCLUDE_DIR NAMES libkipi/version.h)
++        find_library(KIPI_LIBRARIES NAMES kipi PATHS ${_KIPILinkDir} ${KDE4_LIB_DIR} NO_DEFAULT_PATH)
++        find_library(KIPI_LIBRARIES NAMES kipi)
+ 
+         if (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES)
+             set(KIPI_FOUND TRUE)
diff --git a/kde-base/kdelibs/files/kdelibs-4.1.1-kbuildsycoca.patch b/kde-base/kdelibs/files/kdelibs-4.1.1-kbuildsycoca.patch
new file mode 100644
index 00000000000..065aefb704b
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.1.1-kbuildsycoca.patch
@@ -0,0 +1,29 @@
+Index: kdecore/io/ksavefile.cpp
+===================================================================
+--- trunk/KDE/kdelibs/kdecore/io/ksavefile.cpp	(revision 863691)
++++ trunk/KDE/kdelibs/kdecore/io/ksavefile.cpp	(revision 863692)
+@@ -27,6 +27,7 @@
+ 
+ #include <QtCore/QDir>
+ #include <QProcess>
++#include <QTemporaryFile>
+ 
+ #include <kconfig.h>
+ #include <kde_file.h>
+@@ -34,7 +35,6 @@
+ #include <kstandarddirs.h>
+ #include <kconfiggroup.h>
+ #include <kcomponentdata.h>
+-#include "ktemporaryfile.h"
+ 
+ class KSaveFile::Private
+ {
+@@ -102,7 +102,7 @@
+     }
+ 
+     //Create our temporary file
+-    KTemporaryFile tempFile(d->componentData);
++    QTemporaryFile tempFile;
+     tempFile.setAutoRemove(false);
+     tempFile.setFileTemplate(d->realFileName + "XXXXXX.new");
+     if (!tempFile.open()) {
diff --git a/kde-base/kdelibs/files/kdelibs-4.1.1-konqueror-pointer.patch b/kde-base/kdelibs/files/kdelibs-4.1.1-konqueror-pointer.patch
new file mode 100644
index 00000000000..e93d2530923
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.1.1-konqueror-pointer.patch
@@ -0,0 +1,13 @@
+Index: trunk/KDE/kdelibs/khtml/xml/dom_selection.cpp
+===================================================================
+--- trunk/KDE/kdelibs/khtml/xml/dom_selection.cpp	(revision 855318)
++++ trunk/KDE/kdelibs/khtml/xml/dom_selection.cpp	(revision 855319)
+@@ -807,7 +807,7 @@
+ 
+ static bool startAndEndLineNodesIncludingNode(NodeImpl *node, int offset, Selection &selection)
+ {
+-    if (node && (node->nodeType() == Node::TEXT_NODE || node->nodeType() == Node::CDATA_SECTION_NODE)) {
++    if (node && node->renderer() && (node->nodeType() == Node::TEXT_NODE || node->nodeType() == Node::CDATA_SECTION_NODE)) {
+         int pos;
+         int selectionPointY;
+         RenderText *renderer = static_cast<RenderText *>(node->renderer());
diff --git a/kde-base/kdelibs/kdelibs-4.1.1-r4.ebuild b/kde-base/kdelibs/kdelibs-4.1.1-r4.ebuild
index 5ea024bfd20..48b35a48d50 100644
--- a/kde-base/kdelibs/kdelibs-4.1.1-r4.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.1.1-r4.ebuild
@@ -74,6 +74,10 @@ RDEPEND="${COMMONDEPEND}
 	x11-apps/iceauth
 "
 
+PATCHES=( "${FILESDIR}/${P}-konqueror-pointer.patch"
+	"${FILESDIR}/${P}-kbuildsycoca.patch"
+	"${FILESDIR}/${P}-cmake-modules.patch" )
+
 src_compile() {
 	if use zeroconf; then
 		if has_version net-dns/avahi; then
@@ -84,9 +88,14 @@ src_compile() {
 			die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found."
 		fi
 	fi
-
+	if use kdeprefix; then
+		HME=".kde$(basename $KDEDIR)"
+	else
+		HME=".kde4"
+	fi
 	mycmakeargs="${mycmakeargs}
 		-DWITH_HSPELL=OFF
+		-DKDE_DEFAULT_HOME=${HME}
 		$(cmake-utils_has 3dnow X86_3DNOW)
 		$(cmake-utils_has altivec PPC_ALTIVEC)
 		$(cmake-utils_has mmx X86_MMX)
@@ -162,6 +171,9 @@ src_install() {
 	cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}"
 	SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
 	EOF
+	# Ensure that the correct permissions are present on ${KDEDIR}/share/config
+	chmod 755 ${KDEDIR}/share/config
+
 }
 
 pkg_postinst() {