Merge branch 'master' of git.overlays.gentoo.org:proj/kde

7 files changed, 19 insertions, 244 deletions

diff --git a/kde-base/kwin/files/kwin-5.0.2-qt54.patch b/kde-base/kwin/files/kwin-5.0.2-qt54.patch
deleted file mode 100644
index e490a94a6e0..00000000000
--- a/kde-base/kwin/files/kwin-5.0.2-qt54.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-commit c00c67bf29c10862a973289486a535c8566d5110
-Author: Martin Gräßlin <mgraesslin@kde.org>
-Date:   Wed Sep 3 09:47:21 2014 +0200
-
-    [scripting] Drop qmlRegisterType for QQuickWindow
-    
-    Not needed as one can just do:
-    import QtQuick.Window;
-    
-    This fixes a build problem with Qt 5.4.
-    
-    BUG: 338277
-
-diff --git a/scripting/scripting.cpp b/scripting/scripting.cpp
-index 3bc4358..9dc7bad 100644
---- a/scripting/scripting.cpp
-+++ b/scripting/scripting.cpp
-@@ -620,7 +620,6 @@ void KWin::Scripting::init()
-     qmlRegisterType<KWin::ScriptingClientModel::ClientModelByScreenAndDesktop>("org.kde.kwin", 2, 0, "ClientModelByScreenAndDesktop");
-     qmlRegisterType<KWin::ScriptingClientModel::ClientFilterModel>("org.kde.kwin", 2, 0, "ClientFilterModel");
-     qmlRegisterType<KWin::Client>();
--    qmlRegisterType<QQuickWindow>();
-     qmlRegisterType<QAbstractItemModel>();
- 
-     m_qmlEngine->rootContext()->setContextProperty(QStringLiteral("workspace"), m_workspaceWrapper);
-diff --git a/scripts/desktopchangeosd/contents/ui/osd.qml b/scripts/desktopchangeosd/contents/ui/osd.qml
-index fbf7dd7..e2ff86c 100644
---- a/scripts/desktopchangeosd/contents/ui/osd.qml
-+++ b/scripts/desktopchangeosd/contents/ui/osd.qml
-@@ -18,6 +18,7 @@ You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *********************************************************************/
- import QtQuick 2.0;
-+import QtQuick.Window 2.0;
- import org.kde.plasma.core 2.0 as PlasmaCore;
- import org.kde.plasma.components 2.0 as Plasma;
- import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons;
diff --git a/kde-base/libkonq/files/libkonq-5-cmake.patch b/kde-base/libkonq/files/libkonq-5-cmake.patch
deleted file mode 100644
index d3f1a7336c2..00000000000
--- a/kde-base/libkonq/files/libkonq-5-cmake.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Install headers required by kfind.
-
-diff --git a/lib/konq/src/CMakeLists.txt b/lib/konq/src/CMakeLists.txt
-index 1186f32..9c05b9f 100644
---- a/lib/konq/src/CMakeLists.txt
-+++ b/lib/konq/src/CMakeLists.txt
-@@ -60,6 +60,7 @@ install(FILES
-     konq_historyentry.h
-     konq_historyprovider.h
-     konq_operations.h
-+    konq_popupmenu.h
-     konq_popupmenuplugin.h
-     kversioncontrolplugin.h
-     kversioncontrolplugin2.h
diff --git a/kde-base/libkonq/libkonq-9999.ebuild b/kde-base/libkonq/libkonq-9999.ebuild
index 762c4b131fe..a7e38e9eff2 100644
--- a/kde-base/libkonq/libkonq-9999.ebuild
+++ b/kde-base/libkonq/libkonq-9999.ebuild
@@ -41,6 +41,4 @@ RDEPEND="${DEPEND}
 
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/${PN}-5-cmake.patch" )
-
 S=${S}/lib/konq
diff --git a/kde-base/plasma-desktop/files/plasma-desktop-5.0.2-qt54.patch b/kde-base/plasma-desktop/files/plasma-desktop-5.0.2-qt54.patch
deleted file mode 100644
index 28a92b7e243..00000000000
--- a/kde-base/plasma-desktop/files/plasma-desktop-5.0.2-qt54.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From: Aleix Pol <aleixpol@kde.org>
-Date: Fri, 01 Aug 2014 16:35:40 +0000
-Subject: Fix build in Qt 5.4
-X-Git-Url: http://quickgit.kde.org/?p=plasma-desktop.git&a=commitdiff&h=2ca1f09aea56eb55a508a6c6bb55b2456950f42b
----
-Fix build in Qt 5.4
----
-
-
---- a/applets/kickoff/core/applicationmodel.cpp
-+++ b/applets/kickoff/core/applicationmodel.cpp
-@@ -185,7 +185,7 @@
-         const KSycocaEntry::Ptr p = (*it);
- 
-         if (p->isType(KST_KService)) {
--            const KService::Ptr service = p;
-+            const KService::Ptr service = KService::Ptr(static_cast<KService*>(p.data()));
- 
-             if (service->noDisplay()) {
-                 continue;
-@@ -235,7 +235,7 @@
- 
-             existingServices[appName] = service;
-         } else if (p->isType(KST_KServiceGroup)) {
--            const KServiceGroup::Ptr serviceGroup = p;
-+            const KServiceGroup::Ptr serviceGroup = KServiceGroup::Ptr(static_cast<KServiceGroup*>(p.data()));
- 
-             if (serviceGroup->noDisplay() || serviceGroup->childCount() == 0) {
-                 continue;
-@@ -612,13 +612,13 @@
-         KSycocaEntry::Ptr e = (*it);
- 
-         if (e->isType(KST_KServiceGroup)) {
--            KServiceGroup::Ptr g(e);
-+            KServiceGroup::Ptr g(KServiceGroup::Ptr(static_cast<KServiceGroup*>(e.data())));
-             if (!g->noDisplay()) {
-                 if (createNewProgramListForPath(g->relPath()))
-                     seenProgramsChanged = true;
-             }
-         } else if (e->isType(KST_KService)) {
--            KService::Ptr s(e);
-+            KService::Ptr s(KService::Ptr(static_cast<KService*>(e.data())));
-             if (s->isApplication() && !s->noDisplay()) {
-                 QString shortStorageId = s->storageId().remove(".desktop");
-                 QHash<QString, QDate>::Iterator it_find = d->seenPrograms.find(shortStorageId);
-
-From: Kevin Funk <kfunk@kde.org>
-Date: Wed, 06 Aug 2014 06:30:39 +0000
-Subject: Make compile with Qt 5.4
-X-Git-Url: http://quickgit.kde.org/?p=plasma-desktop.git&a=commitdiff&h=ee4927f4f6ba794afaa256ac2e66e46659d6f4e8
----
-Make compile with Qt 5.4
-
-BUG: 337932
----
-
-
---- a/applets/kicker/plugin/appsmodel.cpp
-+++ b/applets/kicker/plugin/appsmodel.cpp
-@@ -252,7 +252,7 @@
-             const KSycocaEntry::Ptr p = (*it);
- 
-             if (p->isType(KST_KServiceGroup)) {
--                KServiceGroup::Ptr subGroup = static_cast<KServiceGroup::Ptr >(p);
-+                KServiceGroup::Ptr subGroup(static_cast<KServiceGroup*>(p.data()));
- 
-                 if (!subGroup->noDisplay() && subGroup->childCount() > 0) {
-                     m_entryList << new AppGroupEntry(subGroup, this, m_flat, m_appNameFormat);
-@@ -295,7 +295,7 @@
-         const KSycocaEntry::Ptr p = (*it);
- 
-         if (p->isType(KST_KService)) {
--            const KService::Ptr service = static_cast<KService::Ptr>(p);
-+            const KService::Ptr service(static_cast<KService*>(p.data()));
- 
-             if (!service->noDisplay()) {
-                 bool found = false;
-@@ -314,11 +314,12 @@
- 
-         } else if (p->isType(KST_KServiceGroup)) {
-             if (m_flat) {
--                processServiceGroup(static_cast<KServiceGroup::Ptr>(p));
-+                const KServiceGroup::Ptr serviceGroup(static_cast<KServiceGroup*>(p.data()));
-+                processServiceGroup(serviceGroup);
- 
-                 m_sortNeeded = true;
-             } else {
--                const KServiceGroup::Ptr subGroup = static_cast<KServiceGroup::Ptr>(p);
-+                const KServiceGroup::Ptr subGroup(static_cast<KServiceGroup*>(p.data()));
- 
-                 if (!subGroup->noDisplay() && subGroup->childCount() > 0) {
-                     m_entryList << new AppGroupEntry(subGroup, this, m_flat, m_appNameFormat);
-
diff --git a/kde-base/plasma-workspace/files/plasma-workspace-5.0.2-qt54.patch b/kde-base/plasma-workspace/files/plasma-workspace-5.0.2-qt54.patch
deleted file mode 100644
index 17d016e7208..00000000000
--- a/kde-base/plasma-workspace/files/plasma-workspace-5.0.2-qt54.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From: Aleix Pol <aleixpol@kde.org>
-Date: Fri, 01 Aug 2014 09:36:43 +0000
-Subject: Fix build in Qt 5.4
-X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=04cb7ba53ebf8959cb783f62f343795ca4baa69c
----
-Fix build in Qt 5.4
-
-See https://git.reviewboard.kde.org/r/119242/
----
-
-
---- a/containmentactions/applauncher/launch.cpp
-+++ b/containmentactions/applauncher/launch.cpp
-@@ -54,7 +54,7 @@
- {
-     foreach (KSycocaEntry::Ptr p, group->entries(true, false, true)) {
-         if (p->isType(KST_KService)) {
--            const KService::Ptr service = p;
-+            const KService::Ptr service(static_cast<KService*>(p.data()));
-             QAction *action = new QAction(QIcon::fromTheme(service->icon()), service->genericName().isEmpty() ? service->name() : service->genericName(), this);
-             connect(action, &QAction::triggered, [action](){
-                 KService::Ptr service = KService::serviceByStorageId(action->data().toString());
-@@ -67,7 +67,7 @@
-                 m_actions << action;
-             }
-         } else if (p->isType(KST_KServiceGroup)) {
--            const KServiceGroup::Ptr service = p;
-+            const KServiceGroup::Ptr service(static_cast<KServiceGroup*>(p.data()));
-             if (service->childCount() == 0) {
-                 continue;
-             }
-
-From: Kevin Funk <kfunk@kde.org>
-Date: Wed, 06 Aug 2014 06:23:06 +0000
-Subject: Make compile with Qt 5.4
-X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=0686e449ac4cf611ac3aa2e0bbf37b79aa172582
----
-Make compile with Qt 5.4
-
-BUG: 337929
----
-
-
---- a/dataengines/apps/appsource.cpp
-+++ b/dataengines/apps/appsource.cpp
-@@ -73,11 +73,11 @@
-     QStringList entries;
-     foreach (KSycocaEntry::Ptr p, m_group->entries(true, false, true)) {
-         if (p->isType(KST_KService)) {
--            const KService::Ptr service = p;
-+            const KService::Ptr service(static_cast<KService*>(p.data()));
-             entries << service->storageId();
-         } else if (p->isType(KST_KServiceGroup)) {
--            const KServiceGroup::Ptr service = p;
--            entries << service->entryPath();
-+            const KServiceGroup::Ptr serviceGroup(static_cast<KServiceGroup*>(p.data()));
-+            entries << serviceGroup->entryPath();
-         } else if (p->isType(KST_KServiceSeparator)) {
-             entries << "---";
-         } else {
-
---- a/kioslave/applications/kio_applications.cpp
-+++ b/kioslave/applications/kio_applications.cpp
-@@ -155,7 +155,7 @@
- 
-     foreach (const KSycocaEntry::Ptr &e, grp->entries(true, true)) {
-         if (e->isType(KST_KServiceGroup)) {
--            KServiceGroup::Ptr g(e);
-+            KServiceGroup::Ptr g(static_cast<KServiceGroup*>(e.data()));
-             QString groupCaption = g->caption();
- 
-             kDebug() << "ADDING SERVICE GROUP WITH PATH " << g->relPath();
-@@ -177,7 +177,7 @@
-             createDirEntry(entry, groupCaption, dirUrl.url(), "inode/directory", g->icon());
- 
-         } else {
--            KService::Ptr service(e);
-+            KService::Ptr service(static_cast<KService*>(e.data()));
- 
-             kDebug() << "the entry name is" << service->desktopEntryName()
-                      << "with path" << service->entryPath();
-
diff --git a/kde-base/print-manager/print-manager-4.14.2.ebuild b/kde-base/print-manager/print-manager-4.14.2.ebuild
index 680616e65c9..c976a3f35dc 100644
--- a/kde-base/print-manager/print-manager-4.14.2.ebuild
+++ b/kde-base/print-manager/print-manager-4.14.2.ebuild
@@ -8,7 +8,7 @@ inherit kde4-base
 
 DESCRIPTION="Manage print jobs and printers in KDE"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
+IUSE="debug +gtk"
 
 DEPEND="
 	>=net-print/cups-1.5.0[dbus]
@@ -17,7 +17,24 @@ RDEPEND="${DEPEND}
 	!kde-base/printer-applet:4
 	!kde-base/system-config-printer-kde:4
 	!kde-misc/print-manager
-	app-admin/system-config-printer-gnome
+	gtk? ( app-admin/system-config-printer-gnome )
 "
 
 PATCHES=( "${FILESDIR}/${PN}-4.14.1-cups20.patch" )
+
+pkg_postinst(){
+	if ! use gtk ; then
+		ewarn
+		ewarn "By switching off \"gtk\" USE flag, you have chosen to do without"
+		ewarn "an important, though optional, runtime dependency:"
+		ewarn
+		ewarn "app-admin/system-config-printer-gnome"
+		ewarn
+		ewarn "${PN} will work nevertheless, but is going to be less comfortable"
+		ewarn "and will show the following error status during runtime:"
+		ewarn
+		ewarn "\"Failed to group devices: 'The name org.fedoraproject.Config.Printing"
+		ewarn "was not provided by any .service files'\""
+		ewarn
+	fi
+}
diff --git a/kde-base/pykde4/files/pykde4-4.13.3-pyqt4-4.11.patch b/kde-base/pykde4/files/pykde4-4.13.3-pyqt4-4.11.patch
deleted file mode 100644
index 8c322ef2b31..00000000000
--- a/kde-base/pykde4/files/pykde4-4.13.3-pyqt4-4.11.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.kde.org/show_bug.cgi?id=332223
-
-diff -up pykde4-4.12.3/sip/phonon/backendcapabilities.sip.sip4_15_5 pykde4-4.12.3/sip/phonon/backendcapabilities.sip
---- pykde4-4.12.3/sip/phonon/backendcapabilities.sip.sip4_15_5	2014-01-18 13:18:35.000000000 -0600
-+++ pykde4-4.12.3/sip/phonon/backendcapabilities.sip	2014-03-16 16:56:36.865132943 -0500
-@@ -26,7 +26,7 @@ namespace Phonon
- {
- namespace BackendCapabilities
- {
--class Notifier : QObject /NoDefaultCtors,PyQt4NoQMetaObject/
-+class Notifier : QObject /NoDefaultCtors,PyQtNoQMetaObject/
- {
- 
- signals: