[gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/, kde-base/plasma-workspace/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/, kde-base/plasma-workspace/
@ 2011-02-04 13:38 tampakrap
  0 siblings, 0 replies; 16+ messages in thread
From: tampakrap @ 2011-02-04 13:38 UTC (permalink / raw
  To: gentoo-commits

commit:     6be7de3783bd15860176db13889ec47e95f46931
Author:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  4 13:35:57 2011 +0000
Commit:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
CommitDate: Fri Feb  4 13:35:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6be7de3783bd15860176db13889ec47e95f46931

[kde-base/plasma-workspace] UNTESTED: Make semantic-desktop optional again for plasma-workspace, patch by Fabiano <fabianoengler at gmail dot com>, bug 350850

---
 kde-base/plasma-workspace/Manifest                 |    3 ++-
 ...a-workspace-4.6.0-optional_akonadi-server.patch |   16 ++++++++++++++++
 .../plasma-workspace-4.6.9999.ebuild               |    1 +
 .../plasma-workspace/plasma-workspace-9999.ebuild  |    1 +
 4 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest
index 624cc57..0909cb8 100644
--- a/kde-base/plasma-workspace/Manifest
+++ b/kde-base/plasma-workspace/Manifest
@@ -1,4 +1,5 @@
 AUX plasma-workspace-4.4.2-xinerama_cmake_automagic.patch 923 RMD160 45519a7e51001e6f16cf4bc13f7ef99eeaff793a SHA1 22102eaa95aa07bce19262842fcda69e0bc751f0 SHA256 c1f605148ba9ea606924c934a3b79bb7b415346a3fbe2e7c1732cc6956a44157
-EBUILD plasma-workspace-4.6.9999.ebuild 3060 RMD160 fc9a91e95ca57898946fd5c76d69529b0181e673 SHA1 32a148703f020c5f109a3f24ba72deb9bd7199a1 SHA256 f8e7bbb6bfdf91761f041c32182a250055c6b58bc8d41a5bb29f6c1476db248f
+AUX plasma-workspace-4.6.0-optional_akonadi-server.patch 781 RMD160 feff5a1fd798c2578f192dde2c4978296ac53e6c SHA1 f5ea63a4a4ef4dc3bf62d0fa933bb0554c2086c0 SHA256 f0730ea0fd0116410102c13a28bf9120630c29dadecfaae52942596d6ff4b67c
+EBUILD plasma-workspace-4.6.9999.ebuild 3117 RMD160 c5e9f1abe3ddd8fcfb6e7644fe270e16c0a33826 SHA1 3688840170d283bf2681be5b1ee62c63b5595634 SHA256 2c4d1e355cc7cd1a1b373aed9e413b46ddc724cd09fe89deca742239a943fcf3
 EBUILD plasma-workspace-9999.ebuild 3060 RMD160 fc9a91e95ca57898946fd5c76d69529b0181e673 SHA1 32a148703f020c5f109a3f24ba72deb9bd7199a1 SHA256 f8e7bbb6bfdf91761f041c32182a250055c6b58bc8d41a5bb29f6c1476db248f
 MISC metadata.xml 426 RMD160 c97840bcdd9f62d76728bc99edf3807c6a3bb155 SHA1 050bfc476b5f6e9ad5096050ca5d1e88b79e7d7d SHA256 861524f41b7fb32a40b8d88ae98f6ec76b657bfc251b9133a40bdd48c2fd430c

diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch
new file mode 100644
index 0000000..de333bc
--- /dev/null
+++ b/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch
@@ -0,0 +1,16 @@
+diff -r -u plasma-workspace-4.6.0-orig/plasma/generic/dataengines/CMakeLists.txt plasma-workspace-4.6.0/plasma/generic/dataengines/CMakeLists.txt
+--- plasma-workspace-4.6.0-orig/plasma/generic/dataengines/CMakeLists.txt	2011-02-03 18:58:47.884000165 -0500
++++ plasma-workspace-4.6.0/plasma/generic/dataengines/CMakeLists.txt	2011-02-03 19:24:21.511000165 -0500
+@@ -28,8 +28,10 @@
+ macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several plasma dataengines")
+ 
+ if(KDEPIMLIBS_FOUND)
+-   add_subdirectory(akonadi)
+-   add_subdirectory(calendar)
++   if(AKONADI_FOUND)
++      add_subdirectory(akonadi)
++      add_subdirectory(calendar)
++   endif(AKONADI_FOUND)
+    add_subdirectory(rss)
+ endif(KDEPIMLIBS_FOUND)
+ 

diff --git a/kde-base/plasma-workspace/plasma-workspace-4.6.9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.6.9999.ebuild
index a32f61d..41a87df 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.6.9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.6.9999.ebuild
@@ -69,6 +69,7 @@ KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
+	"${FILESDIR}/${PN}-4.6.0-optional_akonadi-server.patch"
 )
 
 pkg_setup() {

diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
index a32f61d..41a87df 100644
--- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
@@ -69,6 +69,7 @@ KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
+	"${FILESDIR}/${PN}-4.6.0-optional_akonadi-server.patch"
 )
 
 pkg_setup() {



^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/, kde-base/plasma-workspace/
@ 2011-04-02 12:06 Andreas K. Huettel
  0 siblings, 0 replies; 16+ messages in thread
From: Andreas K. Huettel @ 2011-04-02 12:06 UTC (permalink / raw
  To: gentoo-commits

commit:     bfdb4fac1f571f4941876562d15b2f418537a496
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sat Apr  2 12:06:21 2011 +0000
Commit:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Apr  2 12:06:21 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=bfdb4fac

[kde-base/plasma-workspace] Update optional_akonadi-server patch

(Portage version: 2.1.9.45/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 ...a-workspace-4.6.2-optional_akonadi-server.patch |  131 ++++++++++++++++++++
 .../plasma-workspace/plasma-workspace-4.6.2.ebuild |    2 +-
 2 files changed, 132 insertions(+), 1 deletions(-)

diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.6.2-optional_akonadi-server.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.6.2-optional_akonadi-server.patch
new file mode 100644
index 0000000..aaa8381
--- /dev/null
+++ b/kde-base/plasma-workspace/files/plasma-workspace-4.6.2-optional_akonadi-server.patch
@@ -0,0 +1,131 @@
+diff -ruN plasma-workspace-4.6.2.orig/plasma/generic/dataengines/CMakeLists.txt plasma-workspace-4.6.2/plasma/generic/dataengines/CMakeLists.txt
+--- plasma-workspace-4.6.2.orig/plasma/generic/dataengines/CMakeLists.txt	2011-02-25 23:10:02.000000000 +0100
++++ plasma-workspace-4.6.2/plasma/generic/dataengines/CMakeLists.txt	2011-04-02 13:59:01.919795444 +0200
+@@ -25,10 +25,15 @@
+ endif (NEPOMUK_FOUND)
+ 
+ macro_optional_find_package(KdepimLibs 4.5.60)
+-macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several plasma dataengines")
++macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several Plasma DataEngines")
++
++macro_optional_find_package(Akonadi)
++macro_log_feature(AKONADI_FOUND "Akonadi" "Akonadi libraries" "http://pim.kde.org/akonadi/" FALSE "" "Needed for event support in the calendar DataEngine")
+ 
+ if(KDEPIMLIBS_FOUND)
+-   add_subdirectory(akonadi)
++   if(AKONADI_FOUND)
++      add_subdirectory(akonadi)
++   endif(AKONADI_FOUND)
+    add_subdirectory(calendar)
+    add_subdirectory(rss)
+ endif(KDEPIMLIBS_FOUND)
+diff -ruN plasma-workspace-4.6.2.orig/plasma/generic/dataengines/calendar/CMakeLists.txt plasma-workspace-4.6.2/plasma/generic/dataengines/calendar/CMakeLists.txt
+--- plasma-workspace-4.6.2.orig/plasma/generic/dataengines/calendar/CMakeLists.txt	2011-04-01 12:52:43.000000000 +0200
++++ plasma-workspace-4.6.2/plasma/generic/dataengines/calendar/CMakeLists.txt	2011-04-02 14:02:09.274795409 +0200
+@@ -1,7 +1,6 @@
+ project(calendar_engine)
+ 
+ find_package(KdepimLibs REQUIRED)
+-find_package(Akonadi REQUIRED)
+ find_package(Boost REQUIRED)
+ 
+ include_directories(
+@@ -14,16 +13,22 @@
+ 
+ set(calendar_engine_srcs
+     calendarengine.cpp
+-    eventdatacontainer.cpp
+-# taken from kdepim/akonadi/kcal as long as it's not yet exported:
+-    akonadi/calendar.cpp
+-    akonadi/calendarmodel.cpp
+-    akonadi/calfilterproxymodel.cpp
+-    akonadi/utils.cpp
+-    akonadi/blockalarmsattribute.cpp
+-    akonadi/collectionselection.cpp
+ )
+ 
++if(AKONADI_FOUND)
++     ADD_DEFINITIONS(-DAKONADI_FOUND)
++     set(calendar_engine_srcs ${calendar_engine_srcs}
++	eventdatacontainer.cpp
++	# taken from kdepim/akonadi/kcal as long as it's not yet exported:
++	akonadi/calendar.cpp
++	akonadi/calendarmodel.cpp
++	akonadi/calfilterproxymodel.cpp
++	akonadi/utils.cpp
++	akonadi/blockalarmsattribute.cpp
++	akonadi/collectionselection.cpp
++     )
++endif(AKONADI_FOUND)
++
+ kde4_add_plugin(plasma_engine_calendar ${calendar_engine_srcs})
+ 
+ target_link_libraries(
+@@ -31,13 +36,19 @@
+     ${KDEPIMLIBS_KHOLIDAYS_LIBRARY}
+     ${KDE4_KDECORE_LIBS}
+     ${KDE4_PLASMA_LIBS}
+-    ${KDE4_AKONADI_LIBS}
+     ${KDE4_KMIME_LIBS}
+     ${KDE4_KCALCORE_LIBS}
+     ${KDE4_KCALUTILS_LIBS}
+-    ${KDEPIMLIBS_AKONADI_KCAL_LIBS}
+ )
+ 
++if(AKONADI_FOUND)
++    target_link_libraries(
++        plasma_engine_calendar
++        ${KDE4_AKONADI_LIBS}
++        ${KDEPIMLIBS_AKONADI_KCAL_LIBS}
++    )
++endif(AKONADI_FOUND)
++
+ install(TARGETS plasma_engine_calendar DESTINATION ${PLUGIN_INSTALL_DIR})
+ install(FILES plasma-dataengine-calendar.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+ 
+diff -ruN plasma-workspace-4.6.2.orig/plasma/generic/dataengines/calendar/calendarengine.cpp plasma-workspace-4.6.2/plasma/generic/dataengines/calendar/calendarengine.cpp
+--- plasma-workspace-4.6.2.orig/plasma/generic/dataengines/calendar/calendarengine.cpp	2011-02-25 23:10:02.000000000 +0100
++++ plasma-workspace-4.6.2/plasma/generic/dataengines/calendar/calendarengine.cpp	2011-04-02 13:59:01.920795444 +0200
+@@ -32,6 +32,7 @@
+ #include <KCalCore/Todo>
+ #include <KCalCore/Journal>
+ 
++#ifdef AKONADI_FOUND
+ #include <Akonadi/ChangeRecorder>
+ #include <Akonadi/Session>
+ #include <Akonadi/Collection>
+@@ -41,6 +42,7 @@
+ #include "akonadi/calendar.h"
+ #include "akonadi/calendarmodel.h"
+ #include "eventdatacontainer.h"
++#endif
+ 
+ CalendarEngine::CalendarEngine(QObject* parent, const QVariantList& args)
+               : Plasma::DataEngine(parent),
+@@ -74,9 +76,11 @@
+         return holidayCalendarSourceRequest(requestKey, requestTokens, request);
+     }
+ 
++#ifdef AKONADI_FOUND
+     if (requestKey == "events" || requestKey == "eventsInMonth") {
+         return akonadiCalendarSourceRequest(requestKey, requestTokens, request);
+     }
++#endif
+ 
+     return false;
+ }
+@@ -272,6 +276,7 @@
+     return false;
+ }
+ 
++#ifdef AKONADI_FOUND
+ bool CalendarEngine::akonadiCalendarSourceRequest(const QString& key, const QStringList& args, const QString& request)
+ {
+     // figure out what time range was requested from the source string
+@@ -339,5 +344,6 @@
+     calendarModel->setCollectionFetchStrategy(Akonadi::EntityTreeModel::InvisibleCollectionFetch);
+     m_calendar = new CalendarSupport::Calendar(calendarModel, calendarModel, KSystemTimeZones::local());
+ }
++#endif
+ 
+ #include "calendarengine.moc"

diff --git a/kde-base/plasma-workspace/plasma-workspace-4.6.2.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.6.2.ebuild
index 5f37964..f4cc775 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.6.2.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.6.2.ebuild
@@ -69,7 +69,7 @@ KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
-	"${FILESDIR}/${PN}-4.6.0-optional_akonadi-server.patch"
+	"${FILESDIR}/${PN}-4.6.2-optional_akonadi-server.patch"
 )
 
 pkg_setup() {



^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/, kde-base/plasma-workspace/
@ 2011-04-06 22:31 Theo Chatzimichos
  0 siblings, 0 replies; 16+ messages in thread
From: Theo Chatzimichos @ 2011-04-06 22:31 UTC (permalink / raw
  To: gentoo-commits

commit:     7932a3ea67f0c6b5cd81071bfebd188b52d0de61
Author:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  6 22:27:22 2011 +0000
Commit:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
CommitDate: Wed Apr  6 22:31:24 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7932a3ea

[kde-base/plasma-workspace] Make kdepimlibs optional again
Bring back the (broken) akonadi-optional patch, please either fix it or
leave it broken until someone else does (or even file a bug).

---
 ...a-workspace-4.6.0-optional_akonadi-server.patch |  141 --------------------
 .../plasma-workspace-4.6.9999.ebuild               |   11 +-
 .../plasma-workspace/plasma-workspace-9999.ebuild  |   11 +-
 3 files changed, 16 insertions(+), 147 deletions(-)

diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch
deleted file mode 100644
index 61dc5a6..0000000
--- a/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-commit 5701ee97f896bf25de5dfbcc2699695794f25b34
-Author: Aaron Seigo <aseigo@kde.org>
-Date:   Fri Feb 4 15:48:30 2011 -0800
-
-    make akonadi optional
-    
-    based on a patch by Theo Chatzimichos, whose patch in turn was based
-    on one by Fabiano Engler via Gentoo
-    
-    REVIEW:100568
-
-diff --git a/plasma/generic/dataengines/CMakeLists.txt b/plasma/generic/dataengines/CMakeLists.txt
-index 4664a02..1278224 100644
---- a/plasma/generic/dataengines/CMakeLists.txt
-+++ b/plasma/generic/dataengines/CMakeLists.txt
-@@ -25,10 +25,15 @@ if (NEPOMUK_FOUND)
- endif (NEPOMUK_FOUND)
- 
- macro_optional_find_package(KdepimLibs 4.5.60)
--macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several plasma dataengines")
-+macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several Plasma DataEngines")
-+
-+macro_optional_find_package(Akonadi)
-+macro_log_feature(AKONADI_FOUND "Akonadi" "Akonadi libraries" "http://pim.kde.org/akonadi/" FALSE "" "Needed for event support in the calendar DataEngine")
- 
- if(KDEPIMLIBS_FOUND)
--   add_subdirectory(akonadi)
-+   if(AKONADI_FOUND)
-+      add_subdirectory(akonadi)
-+   endif(AKONADI_FOUND)
-    add_subdirectory(calendar)
-    add_subdirectory(rss)
- endif(KDEPIMLIBS_FOUND)
-diff --git a/plasma/generic/dataengines/calendar/CMakeLists.txt b/plasma/generic/dataengines/calendar/CMakeLists.txt
-index d3d76e6..a6abcdc 100644
---- a/plasma/generic/dataengines/calendar/CMakeLists.txt
-+++ b/plasma/generic/dataengines/calendar/CMakeLists.txt
-@@ -1,7 +1,6 @@
- project(calendar_engine)
- 
- find_package(KdepimLibs REQUIRED)
--find_package(Akonadi REQUIRED)
- find_package(Boost REQUIRED)
- 
- include_directories(
-@@ -14,14 +13,20 @@ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
- 
- set(calendar_engine_srcs
-     calendarengine.cpp
--    eventdatacontainer.cpp
--# taken from kdepim/akonadi/kcal as long as it's not yet exported:
--    akonadi/calendar.cpp
--    akonadi/calendarmodel.cpp
--    akonadi/calfilterproxymodel.cpp
--    akonadi/utils.cpp
- )
- 
-+if(AKONADI_FOUND)
-+    ADD_DEFINITIONS(-DAKONADI_FOUND)
-+    set(calendar_engine_srcs ${calendar_engine_srcs}
-+        eventdatacontainer.cpp
-+        # taken from kdepim/akonadi/kcal as long as it's not yet exported:
-+        akonadi/calendar.cpp
-+        akonadi/calendarmodel.cpp
-+        akonadi/calfilterproxymodel.cpp
-+        akonadi/utils.cpp
-+    )
-+endif(AKONADI_FOUND)
-+
- kde4_add_plugin(plasma_engine_calendar ${calendar_engine_srcs})
- 
- target_link_libraries(
-@@ -29,13 +34,19 @@ target_link_libraries(
-     ${KDEPIMLIBS_KHOLIDAYS_LIBRARY}
-     ${KDE4_KDECORE_LIBS}
-     ${KDE4_PLASMA_LIBS}
--    ${KDE4_AKONADI_LIBS}
-     ${KDE4_KMIME_LIBS}
-     ${KDE4_KCALCORE_LIBS}
-     ${KDE4_KCALUTILS_LIBS}
--    ${KDEPIMLIBS_AKONADI_KCAL_LIBS}
- )
- 
-+if(AKONADI_FOUND)
-+    target_link_libraries(
-+        plasma_engine_calendar
-+        ${KDE4_AKONADI_LIBS}
-+        ${KDEPIMLIBS_AKONADI_KCAL_LIBS}
-+    )
-+endif(AKONADI_FOUND)
-+
- install(TARGETS plasma_engine_calendar DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES plasma-dataengine-calendar.desktop DESTINATION ${SERVICES_INSTALL_DIR})
- 
-diff --git a/plasma/generic/dataengines/calendar/calendarengine.cpp b/plasma/generic/dataengines/calendar/calendarengine.cpp
-index 0fdd65d..53f98c0 100644
---- a/plasma/generic/dataengines/calendar/calendarengine.cpp
-+++ b/plasma/generic/dataengines/calendar/calendarengine.cpp
-@@ -32,6 +32,7 @@
- #include <KCalCore/Todo>
- #include <KCalCore/Journal>
- 
-+#ifdef AKONADI_FOUND
- #include <Akonadi/ChangeRecorder>
- #include <Akonadi/Session>
- #include <Akonadi/Collection>
-@@ -41,6 +42,7 @@
- #include "akonadi/calendar.h"
- #include "akonadi/calendarmodel.h"
- #include "eventdatacontainer.h"
-+#endif
- 
- CalendarEngine::CalendarEngine(QObject* parent, const QVariantList& args)
-               : Plasma::DataEngine(parent),
-@@ -74,9 +76,11 @@ bool CalendarEngine::sourceRequestEvent(const QString &request)
-         return holidayCalendarSourceRequest(requestKey, requestTokens, request);
-     }
- 
-+#ifdef AKONADI_FOUND
-     if (requestKey == "events" || requestKey == "eventsInMonth") {
-         return akonadiCalendarSourceRequest(requestKey, requestTokens, request);
-     }
-+#endif
- 
-     return false;
- }
-@@ -272,6 +276,7 @@ bool CalendarEngine::holidayCalendarSourceRequest(const QString& key, const QStr
-     return false;
- }
- 
-+#ifdef AKONADI_FOUND
- bool CalendarEngine::akonadiCalendarSourceRequest(const QString& key, const QStringList& args, const QString& request)
- {
-     // figure out what time range was requested from the source string
-@@ -339,5 +344,6 @@ void CalendarEngine::initAkonadiCalendar()
-     calendarModel->setCollectionFetchStrategy(Akonadi::EntityTreeModel::InvisibleCollectionFetch);
-     m_calendar = new CalendarSupport::Calendar(calendarModel, calendarModel, KSystemTimeZones::local());
- }
-+#endif
- 
- #include "calendarengine.moc"

diff --git a/kde-base/plasma-workspace/plasma-workspace-4.6.9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.6.9999.ebuild
index a32f61d..06987df 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.6.9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.6.9999.ebuild
@@ -12,15 +12,13 @@ inherit python kde4-meta
 
 DESCRIPTION="Plasma: KDE desktop framework"
 KEYWORDS=""
-IUSE="debug google-gadgets gps python qalculate semantic-desktop xinerama"
+IUSE="debug google-gadgets gps python qalculate rss semantic-desktop xinerama"
 
 COMMONDEPEND="
 	$(add_kdebase_dep kdelibs 'semantic-desktop?')
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop?')
 	$(add_kdebase_dep kephal)
 	$(add_kdebase_dep ksysguard)
 	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep libplasmaclock)
 	$(add_kdebase_dep libplasmagenericshell)
 	$(add_kdebase_dep libtaskmanager)
 	$(add_kdebase_dep solid)
@@ -36,6 +34,11 @@ COMMONDEPEND="
 		$(add_kdebase_dep pykde4)
 	)
 	qalculate? ( sci-libs/libqalculate )
+	rss? (
+		$(add_kdebase_dep kdepimlibs 'semantic-desktop?')
+		$(add_kdebase_dep libplasmaclock 'holidays')
+	)
+	!rss? ( $(add_kdebase_dep libplasmaclock '-holidays') )
 	xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="${COMMONDEPEND}
@@ -69,6 +72,7 @@ KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
+	"${FILESDIR}/${PN}-4.6.2-optional_akonadi-server.patch"
 )
 
 pkg_setup() {
@@ -98,6 +102,7 @@ src_configure() {
 		$(cmake-utils_use_with python PyQt4)
 		$(cmake-utils_use_with python PyKDE4)
 		$(cmake-utils_use_with qalculate)
+		$(cmake-utils_use_with rss KdepimLibs)
 		$(cmake-utils_use_with semantic-desktop Nepomuk)
 		$(cmake-utils_use_with semantic-desktop Soprano)
 		$(cmake-utils_use_with xinerama X11_Xinerama)

diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
index a32f61d..06987df 100644
--- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
@@ -12,15 +12,13 @@ inherit python kde4-meta
 
 DESCRIPTION="Plasma: KDE desktop framework"
 KEYWORDS=""
-IUSE="debug google-gadgets gps python qalculate semantic-desktop xinerama"
+IUSE="debug google-gadgets gps python qalculate rss semantic-desktop xinerama"
 
 COMMONDEPEND="
 	$(add_kdebase_dep kdelibs 'semantic-desktop?')
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop?')
 	$(add_kdebase_dep kephal)
 	$(add_kdebase_dep ksysguard)
 	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep libplasmaclock)
 	$(add_kdebase_dep libplasmagenericshell)
 	$(add_kdebase_dep libtaskmanager)
 	$(add_kdebase_dep solid)
@@ -36,6 +34,11 @@ COMMONDEPEND="
 		$(add_kdebase_dep pykde4)
 	)
 	qalculate? ( sci-libs/libqalculate )
+	rss? (
+		$(add_kdebase_dep kdepimlibs 'semantic-desktop?')
+		$(add_kdebase_dep libplasmaclock 'holidays')
+	)
+	!rss? ( $(add_kdebase_dep libplasmaclock '-holidays') )
 	xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="${COMMONDEPEND}
@@ -69,6 +72,7 @@ KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
+	"${FILESDIR}/${PN}-4.6.2-optional_akonadi-server.patch"
 )
 
 pkg_setup() {
@@ -98,6 +102,7 @@ src_configure() {
 		$(cmake-utils_use_with python PyQt4)
 		$(cmake-utils_use_with python PyKDE4)
 		$(cmake-utils_use_with qalculate)
+		$(cmake-utils_use_with rss KdepimLibs)
 		$(cmake-utils_use_with semantic-desktop Nepomuk)
 		$(cmake-utils_use_with semantic-desktop Soprano)
 		$(cmake-utils_use_with xinerama X11_Xinerama)



^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/, kde-base/plasma-workspace/
@ 2011-05-21 20:33 Andreas K. Huettel
  0 siblings, 0 replies; 16+ messages in thread
From: Andreas K. Huettel @ 2011-05-21 20:33 UTC (permalink / raw
  To: gentoo-commits

commit:     355dfc135755c1a39ad0c9c0f2024f3caa96c439
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sat May 21 20:53:09 2011 +0000
Commit:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat May 21 20:53:09 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=355dfc13

[kde-base/plasma-workspace] Revert upstream commit causing problems with panel placement, bug 364555

(Portage version: 2.1.9.49/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 .../plasma-workspace-4.6.2-panelplacement.patch    |  350 ++++++++++++++++++++
 .../plasma-workspace-4.6.9999.ebuild               |    1 +
 2 files changed, 351 insertions(+), 0 deletions(-)

diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.6.2-panelplacement.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.6.2-panelplacement.patch
new file mode 100644
index 0000000..e9c049e
--- /dev/null
+++ b/kde-base/plasma-workspace/files/plasma-workspace-4.6.2-panelplacement.patch
@@ -0,0 +1,350 @@
+diff --git a/plasma/desktop/shell/panelview.cpp b/plasma/desktop/shell/panelview.cpp
+index 9e76304..ac1425a 100644
+--- a/plasma/desktop/shell/panelview.cpp
++++ b/plasma/desktop/shell/panelview.cpp
+@@ -20,6 +20,7 @@
+ #include "panelview.h"
+ 
+ #include <QApplication>
++#include <QDesktopWidget>
+ #include <QGraphicsLinearLayout>
+ #include <QPropertyAnimation>
+ #include <QTimer>
+@@ -29,9 +30,8 @@
+ #include <X11/extensions/shape.h>
+ #endif
+ 
+-#include <KDebug>
+-#include <KIdleTime>
+ #include <KWindowSystem>
++#include <KDebug>
+ 
+ #include <Plasma/Containment>
+ #include <Plasma/Corona>
+@@ -309,7 +309,6 @@ PanelView::PanelView(Plasma::Containment *panel, int id, QWidget *parent)
+       m_glowBar(0),
+       m_mousePollTimer(0),
+       m_strutsTimer(new QTimer(this)),
+-      m_rehideAfterAutounhideTimer(new QTimer(this)),
+       m_spacer(0),
+       m_spacerIndex(-1),
+       m_shadowWindow(0),
+@@ -319,8 +318,7 @@ PanelView::PanelView(Plasma::Containment *panel, int id, QWidget *parent)
+       m_visibilityMode(NormalPanel),
+       m_lastHorizontal(true),
+       m_editing(false),
+-      m_triggerEntered(false),
+-      m_respectStatus(true)
++      m_triggerEntered(false)
+ {
+     // KWin setup
+     KWindowSystem::setOnAllDesktops(winId(), true);
+@@ -330,13 +328,11 @@ PanelView::PanelView(Plasma::Containment *panel, int id, QWidget *parent)
+     m_strutsTimer->setSingleShot(true);
+     connect(m_strutsTimer, SIGNAL(timeout()), this, SLOT(updateStruts()));
+ 
+-    // this timer controls checks to re-hide a panel after it's been unhidden
+-    // for the user because, e.g., something is demanding attention
+-    m_rehideAfterAutounhideTimer->setSingleShot(true);
+-    connect(m_rehideAfterAutounhideTimer, SIGNAL(timeout()), this, SLOT(checkAutounhide()));
+-
+     // Graphics view setup
+     setFrameStyle(QFrame::NoFrame);
++    //setAutoFillBackground(true);
++    //setDragMode(QGraphicsView::RubberBandDrag);
++    //setCacheMode(QGraphicsView::CacheBackground);
+     setInteractive(true);
+     setAcceptDrops(true);
+     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+@@ -356,20 +352,10 @@ PanelView::PanelView(Plasma::Containment *panel, int id, QWidget *parent)
+ 
+     const bool onScreen = panel->screen() < PlasmaApp::self()->corona()->numScreens();
+     const QRect screenRect = onScreen ?  PlasmaApp::self()->corona()->screenGeometry(panel->screen()) : QRect();
+-    const int sw = screenRect.width();
+-    const int sh = screenRect.height();
+-    m_lastSeenSize = sizes.readEntry("lastsize", m_lastHorizontal ? sw : sh);
+-
+-    if (onScreen) {
+-        const QString last = m_lastHorizontal ? "Horizontal" + QString::number(sw) :
+-                                                "Vertical" + QString::number(sh);
+-        if (sizes.hasGroup(last)) {
+-            KConfigGroup thisSize(&sizes, last);
+-            resize(thisSize.readEntry("size", m_lastHorizontal ? QSize(sw, 27) : QSize(27, sh)));
+-        }
+-    } else {
++    if (!onScreen) {
+         resize(panel->size().toSize());
+     }
++    m_lastSeenSize = sizes.readEntry("lastsize", m_lastHorizontal ? screenRect.width() : screenRect.height());
+ 
+     m_alignment = alignmentFilter((Qt::Alignment)viewConfig.readEntry("Alignment", (int)Qt::AlignLeft));
+     KConfigGroup sizeConfig(&viewConfig, (m_lastHorizontal ? "Horizontal" : "Vertical") +
+@@ -413,7 +399,7 @@ void PanelView::setContainment(Plasma::Containment *containment)
+         disconnect(oldContainment);
+     }
+ 
+-    connect(containment, SIGNAL(newStatus(Plasma::ItemStatus)), this, SLOT(statusUpdated(Plasma::ItemStatus)));
++    connect(containment, SIGNAL(newStatus(Plasma::ItemStatus)), this, SLOT(setStatus(Plasma::ItemStatus)));
+     connect(containment, SIGNAL(destroyed(QObject*)), this, SLOT(panelDeleted()));
+     connect(containment, SIGNAL(toolBoxToggled()), this, SLOT(togglePanelController()));
+     connect(containment, SIGNAL(appletAdded(Plasma::Applet *, const QPointF &)), this, SLOT(appletAdded(Plasma::Applet *)));
+@@ -436,6 +422,10 @@ void PanelView::setContainment(Plasma::Containment *containment)
+ 
+     // ensure we aren't overlapping other panels
+     const QRect screenRect = PlasmaApp::self()->corona()->screenGeometry(containment->screen());
++    const QRegion availGeom = PlasmaApp::self()->corona()->availableScreenRegion(containment->screen());
++    const int w = containment->size().width();
++    const int h = containment->size().height();
++    const int length = containment->formFactor() == Plasma::Horizontal ? w : h;
+ 
+     View::setContainment(containment);
+ 
+@@ -448,11 +438,6 @@ void PanelView::setContainment(Plasma::Containment *containment)
+ 
+     updateStruts();
+     checkShadow();
+-
+-    // if we are an autohiding panel, then see if the status mandates we do something about it
+-    if (m_visibilityMode != NormalPanel && m_visibilityMode != WindowsGoBelow) {
+-        checkUnhide(containment->status());
+-    }
+ }
+ 
+ void PanelView::themeChanged()
+@@ -463,7 +448,6 @@ void PanelView::themeChanged()
+ 
+ void PanelView::checkShadow()
+ {
+-#ifndef Q_WS_WIN
+     if (KWindowSystem::compositingActive() && containment()->property("shadowPath").isValid()) {
+         if (!m_shadowWindow) {
+             m_shadowWindow = new ShadowWindow(this);
+@@ -478,11 +462,12 @@ void PanelView::checkShadow()
+         if (m_shadowWindow->isValid() && isVisible()) {
+             m_shadowWindow->show();
+         }
+-    } else if (m_shadowWindow) {
+-        m_shadowWindow->deleteLater();
+-        m_shadowWindow = 0;
++    } else {
++        if (m_shadowWindow) {
++            m_shadowWindow->deleteLater();
++            m_shadowWindow = 0;
++        }
+     }
+-#endif
+ }
+ 
+ void PanelView::setPanelDragPosition(const QPoint &point)
+@@ -709,6 +694,8 @@ void PanelView::updatePanelGeometry()
+             geom.moveTopLeft(QPoint(screenGeom.center().x() - geom.width()/2 + 1 - geom.width()%2 + m_offset, screenGeom.top()));
+         }
+ 
++        //enable borders if needed
++        //c->setGeometry(QRect(geom.left(), c->geometry().top(), geom.width(), geom.height()));
+         break;
+ 
+     case Plasma::LeftEdge:
+@@ -720,6 +707,8 @@ void PanelView::updatePanelGeometry()
+             geom.moveTopLeft(QPoint(screenGeom.left(), screenGeom.center().y() - geom.height()/2 + 1 - geom.height()%2 + m_offset));
+         }
+ 
++        //enable borders if needed
++        //c->setGeometry(QRect(c->geometry().left(), geom.top(), geom.width(), geom.height()));
+         break;
+ 
+     case Plasma::RightEdge:
+@@ -731,6 +720,8 @@ void PanelView::updatePanelGeometry()
+             geom.moveTopRight(QPoint(screenGeom.right(), screenGeom.center().y() - geom.height()/2 + 1 - geom.height()%2 + m_offset));
+         }
+ 
++        //enable borders if needed
++        //c->setGeometry(QRect(c->geometry().left(), geom.top(), geom.width(), geom.height()));
+         break;
+ 
+     case Plasma::BottomEdge:
+@@ -743,6 +734,8 @@ void PanelView::updatePanelGeometry()
+             geom.moveBottomLeft(QPoint(screenGeom.center().x() - geom.width()/2 + 1 - geom.width()%2 + m_offset, screenGeom.bottom()));
+         }
+ 
++        //enable borders if needed
++        //c->setGeometry(QRect(geom.left(), c->geometry().top(), geom.width(), geom.height()));
+         break;
+     }
+ 
+@@ -818,7 +811,8 @@ void PanelView::pinchContainment(const QRect &screenGeom)
+     KConfigGroup sizes = config();
+     sizes = KConfigGroup(&sizes, "Sizes");
+ 
+-    if (m_lastHorizontal != horizontal || m_lastSeenSize != (horizontal ? sw : sh)) {
++    if (m_lastHorizontal != horizontal ||
++        m_lastSeenSize != (horizontal ? sw : sh)) {
+         // we're adjusting size. store the current size now
+         KConfigGroup lastSize(&sizes, (m_lastHorizontal ? "Horizontal" : "Vertical") +
+                                       QString::number(m_lastSeenSize));
+@@ -1032,23 +1026,17 @@ void PanelView::togglePanelController()
+         }
+     }
+ 
+-    if (m_panelController->isVisible()) {
+-        if (m_panelController->showingWidgetExplorer() ||
+-            m_panelController->showingActivityManager()) {
+-            m_panelController->switchToController();
+-            m_panelController->move(m_panelController->positionForPanelGeometry(geometry()));
+-        } else {
+-            Plasma::WindowEffects::slideWindow(m_panelController, location());
+-            m_panelController->close();
+-            updateStruts();
+-        }
+-    } else {
++    if (!m_panelController->isVisible()) {
+         m_editing = true;
+         m_panelController->resize(m_panelController->sizeHint());
+         m_panelController->move(m_panelController->positionForPanelGeometry(geometry()));
+         Plasma::WindowEffects::slideWindow(m_panelController, location());
+         kDebug() << "showing panel controller!" << m_panelController->geometry();
+         m_panelController->show();
++    } else {
++        Plasma::WindowEffects::slideWindow(m_panelController, location());
++        m_panelController->close();
++        updateStruts();
+     }
+ }
+ 
+@@ -1438,7 +1426,7 @@ void PanelView::unhide(bool destroyTrigger)
+     }
+ }
+ 
+-void PanelView::statusUpdated(Plasma::ItemStatus newStatus)
++void PanelView::setStatus(Plasma::ItemStatus newStatus)
+ {
+     if (newStatus == Plasma::AcceptingInputStatus) {
+         KWindowSystem::forceActiveWindow(winId());
+@@ -1447,50 +1435,14 @@ void PanelView::statusUpdated(Plasma::ItemStatus newStatus)
+ 
+ void PanelView::checkUnhide(Plasma::ItemStatus newStatus)
+ {
+-    //kDebug() << "================= got a status: " << newStatus << Plasma::ActiveStatus;
+-    m_respectStatus = true;
+-
++    //kDebug() << "================= got a new status: " << newStatus << Plasma::ActiveStatus;
+     if (newStatus > Plasma::ActiveStatus) {
+         unhide();
+-        if (newStatus == Plasma::NeedsAttentionStatus) {
+-            //kDebug() << "starting the timer!";
+-            // start our rehide timer, so that the panel doesn't stay up and stuck forever and a day
+-            m_rehideAfterAutounhideTimer->start(AUTOUNHIDE_CHECK_DELAY);
+-        }
+     } else {
+-        //kDebug() << "new status, just autohiding";
+         startAutoHide();
+     }
+ }
+ 
+-void PanelView::checkAutounhide()
+-{
+-    //kDebug() << "***************************" << KIdleTime::instance()->idleTime();
+-    if (KIdleTime::instance()->idleTime() >= AUTOUNHIDE_CHECK_DELAY) {
+-        // the user is idle .. let's not hige the panel on them quite yet, but rather given them a
+-        // chance to see this thing!
+-        connect(KIdleTime::instance(), SIGNAL(resumingFromIdle()), this, SLOT(checkAutounhide()),
+-                Qt::UniqueConnection);
+-        KIdleTime::instance()->catchNextResumeEvent();
+-        //kDebug() << "exit 1 ***************************";
+-        return;
+-    }
+-
+-    m_respectStatus = false;
+-    //kDebug() << "in to check ... who's resonsible?" << sender() << KIdleTime::instance();
+-    if (sender() == KIdleTime::instance()) {
+-        //kDebug() << "doing a 2s wait";
+-        QTimer::singleShot(2000, this, SLOT(startAutoHide()));
+-    } else {
+-        //kDebug() << "just starting autohide!";
+-        startAutoHide();
+-    }
+-
+-    // this line must come after the check on sender() as it *clears* that value!
+-    disconnect(KIdleTime::instance(), SIGNAL(resumingFromIdle()), this, SLOT(checkAutounhide()));
+-    //kDebug() << "exit 0 ***************************";
+-}
+-
+ void PanelView::unhide()
+ {
+     unhide(true);
+@@ -1503,31 +1455,10 @@ void PanelView::resetTriggerEnteredSuppression()
+ 
+ void PanelView::startAutoHide()
+ {
+-    /*
+-    kDebug() << m_editing << (containment() ? containment()->status() : 0) << Plasma::ActiveStatus
+-             << geometry().adjusted(-10, -10, 10, 10).contains(QCursor::pos()) << hasPopup();
+-    if (containment() && containment()->status() > Plasma::ActiveStatus) {
+-        foreach (Plasma::Applet *applet, containment()->applets()) {
+-            kDebug() << "     " << applet->name() << applet->status();
+-        }
+-    }
+-    */
+-
+-
+-    if (m_editing || (m_respectStatus && (containment() && containment()->status() > Plasma::ActiveStatus))) {
+-        if (m_mousePollTimer) {
+-            m_mousePollTimer->stop();
+-            disconnect(m_mousePollTimer, SIGNAL(timeout()), this, SLOT(startAutoHide()));
+-        }
+-
+-        return;
+-    }
+-
+-    // since we've gotten this far, we don't need to worry about rehiding-after-auto-unhide, so just
+-    // stop the timer
+-    m_rehideAfterAutounhideTimer->stop();
+-
+-    if (geometry().adjusted(-10, -10, 10, 10).contains(QCursor::pos()) || hasPopup()) {
++    //TODO: is 5s too long? not long enough?
++    if (m_editing || (containment() && containment()->status() > Plasma::ActiveStatus) ||
++        geometry().adjusted(-10, -10, 10, 10).contains(QCursor::pos()) ||
++        hasPopup()) {
+         if (!m_mousePollTimer) {
+             leaveEvent(0);
+         }
+diff --git a/plasma/desktop/shell/panelview.h b/plasma/desktop/shell/panelview.h
+index 9bdf780..c4be6b4 100644
+--- a/plasma/desktop/shell/panelview.h
++++ b/plasma/desktop/shell/panelview.h
+@@ -141,7 +141,7 @@ public Q_SLOTS:
+     /**
+      * Decides whether give focus to the panel
+      */
+-    void statusUpdated(Plasma::ItemStatus newStatus);
++    void setStatus(Plasma::ItemStatus newStatus);
+ 
+     /**
+      * Pinches the min/max sizes of the containment to the current screen resolution
+@@ -240,7 +240,6 @@ private Q_SLOTS:
+     void overlayMoved(PanelAppletOverlay *overlay);
+     void panelDeleted();
+     void startAutoHide();
+-    void checkAutounhide();
+ 
+     /**
+      * update the appearance of the unhide hinter
+@@ -270,7 +269,6 @@ private:
+     GlowBar *m_glowBar;
+     QTimer *m_mousePollTimer;
+     QTimer *m_strutsTimer;
+-    QTimer *m_rehideAfterAutounhideTimer;
+     QTimeLine *m_timeLine;
+     QGraphicsWidget *m_spacer;
+     int m_spacerIndex;
+@@ -292,10 +290,7 @@ private:
+ 
+     bool m_editing : 1;
+     bool m_triggerEntered : 1;
+-    bool m_respectStatus : 1;
+-
+     static const int STRUTSTIMERDELAY = 200;
+-    static const int AUTOUNHIDE_CHECK_DELAY = 3000;
+ };
+ 
+ #endif

diff --git a/kde-base/plasma-workspace/plasma-workspace-4.6.9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.6.9999.ebuild
index 0bcf186..8086797 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.6.9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.6.9999.ebuild
@@ -73,6 +73,7 @@ KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
 	"${FILESDIR}/${PN}-4.6.2-optional_akonadi-server.patch"
+	"${FILESDIR}/${PN}-4.6.2-panelplacement.patch"
 )
 
 pkg_setup() {



^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/, kde-base/plasma-workspace/
@ 2011-05-28 22:09 Andreas Hüttel
  0 siblings, 0 replies; 16+ messages in thread
From: Andreas Hüttel @ 2011-05-28 22:09 UTC (permalink / raw
  To: gentoo-commits

commit:     3c2a7c551875c1f3d7c6ed2e0af1309cee6035a4
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sat May 28 22:09:20 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat May 28 22:09:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3c2a7c55

[kde-base/plasma-workspace] Fix compilation against sci-geosciences/gpsd-2.96, bug 367567

(Portage version: 2.1.9.49/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 .../plasma-workspace-4.6.2-panelplacement.patch    |  350 --------------------
 .../files/plasma-workspace-4.6.3-gpsdapi.patch     |   74 ++++
 .../plasma-workspace-4.6.9999.ebuild               |    2 +-
 3 files changed, 75 insertions(+), 351 deletions(-)

diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.6.2-panelplacement.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.6.2-panelplacement.patch
deleted file mode 100644
index e9c049e..0000000
--- a/kde-base/plasma-workspace/files/plasma-workspace-4.6.2-panelplacement.patch
+++ /dev/null
@@ -1,350 +0,0 @@
-diff --git a/plasma/desktop/shell/panelview.cpp b/plasma/desktop/shell/panelview.cpp
-index 9e76304..ac1425a 100644
---- a/plasma/desktop/shell/panelview.cpp
-+++ b/plasma/desktop/shell/panelview.cpp
-@@ -20,6 +20,7 @@
- #include "panelview.h"
- 
- #include <QApplication>
-+#include <QDesktopWidget>
- #include <QGraphicsLinearLayout>
- #include <QPropertyAnimation>
- #include <QTimer>
-@@ -29,9 +30,8 @@
- #include <X11/extensions/shape.h>
- #endif
- 
--#include <KDebug>
--#include <KIdleTime>
- #include <KWindowSystem>
-+#include <KDebug>
- 
- #include <Plasma/Containment>
- #include <Plasma/Corona>
-@@ -309,7 +309,6 @@ PanelView::PanelView(Plasma::Containment *panel, int id, QWidget *parent)
-       m_glowBar(0),
-       m_mousePollTimer(0),
-       m_strutsTimer(new QTimer(this)),
--      m_rehideAfterAutounhideTimer(new QTimer(this)),
-       m_spacer(0),
-       m_spacerIndex(-1),
-       m_shadowWindow(0),
-@@ -319,8 +318,7 @@ PanelView::PanelView(Plasma::Containment *panel, int id, QWidget *parent)
-       m_visibilityMode(NormalPanel),
-       m_lastHorizontal(true),
-       m_editing(false),
--      m_triggerEntered(false),
--      m_respectStatus(true)
-+      m_triggerEntered(false)
- {
-     // KWin setup
-     KWindowSystem::setOnAllDesktops(winId(), true);
-@@ -330,13 +328,11 @@ PanelView::PanelView(Plasma::Containment *panel, int id, QWidget *parent)
-     m_strutsTimer->setSingleShot(true);
-     connect(m_strutsTimer, SIGNAL(timeout()), this, SLOT(updateStruts()));
- 
--    // this timer controls checks to re-hide a panel after it's been unhidden
--    // for the user because, e.g., something is demanding attention
--    m_rehideAfterAutounhideTimer->setSingleShot(true);
--    connect(m_rehideAfterAutounhideTimer, SIGNAL(timeout()), this, SLOT(checkAutounhide()));
--
-     // Graphics view setup
-     setFrameStyle(QFrame::NoFrame);
-+    //setAutoFillBackground(true);
-+    //setDragMode(QGraphicsView::RubberBandDrag);
-+    //setCacheMode(QGraphicsView::CacheBackground);
-     setInteractive(true);
-     setAcceptDrops(true);
-     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-@@ -356,20 +352,10 @@ PanelView::PanelView(Plasma::Containment *panel, int id, QWidget *parent)
- 
-     const bool onScreen = panel->screen() < PlasmaApp::self()->corona()->numScreens();
-     const QRect screenRect = onScreen ?  PlasmaApp::self()->corona()->screenGeometry(panel->screen()) : QRect();
--    const int sw = screenRect.width();
--    const int sh = screenRect.height();
--    m_lastSeenSize = sizes.readEntry("lastsize", m_lastHorizontal ? sw : sh);
--
--    if (onScreen) {
--        const QString last = m_lastHorizontal ? "Horizontal" + QString::number(sw) :
--                                                "Vertical" + QString::number(sh);
--        if (sizes.hasGroup(last)) {
--            KConfigGroup thisSize(&sizes, last);
--            resize(thisSize.readEntry("size", m_lastHorizontal ? QSize(sw, 27) : QSize(27, sh)));
--        }
--    } else {
-+    if (!onScreen) {
-         resize(panel->size().toSize());
-     }
-+    m_lastSeenSize = sizes.readEntry("lastsize", m_lastHorizontal ? screenRect.width() : screenRect.height());
- 
-     m_alignment = alignmentFilter((Qt::Alignment)viewConfig.readEntry("Alignment", (int)Qt::AlignLeft));
-     KConfigGroup sizeConfig(&viewConfig, (m_lastHorizontal ? "Horizontal" : "Vertical") +
-@@ -413,7 +399,7 @@ void PanelView::setContainment(Plasma::Containment *containment)
-         disconnect(oldContainment);
-     }
- 
--    connect(containment, SIGNAL(newStatus(Plasma::ItemStatus)), this, SLOT(statusUpdated(Plasma::ItemStatus)));
-+    connect(containment, SIGNAL(newStatus(Plasma::ItemStatus)), this, SLOT(setStatus(Plasma::ItemStatus)));
-     connect(containment, SIGNAL(destroyed(QObject*)), this, SLOT(panelDeleted()));
-     connect(containment, SIGNAL(toolBoxToggled()), this, SLOT(togglePanelController()));
-     connect(containment, SIGNAL(appletAdded(Plasma::Applet *, const QPointF &)), this, SLOT(appletAdded(Plasma::Applet *)));
-@@ -436,6 +422,10 @@ void PanelView::setContainment(Plasma::Containment *containment)
- 
-     // ensure we aren't overlapping other panels
-     const QRect screenRect = PlasmaApp::self()->corona()->screenGeometry(containment->screen());
-+    const QRegion availGeom = PlasmaApp::self()->corona()->availableScreenRegion(containment->screen());
-+    const int w = containment->size().width();
-+    const int h = containment->size().height();
-+    const int length = containment->formFactor() == Plasma::Horizontal ? w : h;
- 
-     View::setContainment(containment);
- 
-@@ -448,11 +438,6 @@ void PanelView::setContainment(Plasma::Containment *containment)
- 
-     updateStruts();
-     checkShadow();
--
--    // if we are an autohiding panel, then see if the status mandates we do something about it
--    if (m_visibilityMode != NormalPanel && m_visibilityMode != WindowsGoBelow) {
--        checkUnhide(containment->status());
--    }
- }
- 
- void PanelView::themeChanged()
-@@ -463,7 +448,6 @@ void PanelView::themeChanged()
- 
- void PanelView::checkShadow()
- {
--#ifndef Q_WS_WIN
-     if (KWindowSystem::compositingActive() && containment()->property("shadowPath").isValid()) {
-         if (!m_shadowWindow) {
-             m_shadowWindow = new ShadowWindow(this);
-@@ -478,11 +462,12 @@ void PanelView::checkShadow()
-         if (m_shadowWindow->isValid() && isVisible()) {
-             m_shadowWindow->show();
-         }
--    } else if (m_shadowWindow) {
--        m_shadowWindow->deleteLater();
--        m_shadowWindow = 0;
-+    } else {
-+        if (m_shadowWindow) {
-+            m_shadowWindow->deleteLater();
-+            m_shadowWindow = 0;
-+        }
-     }
--#endif
- }
- 
- void PanelView::setPanelDragPosition(const QPoint &point)
-@@ -709,6 +694,8 @@ void PanelView::updatePanelGeometry()
-             geom.moveTopLeft(QPoint(screenGeom.center().x() - geom.width()/2 + 1 - geom.width()%2 + m_offset, screenGeom.top()));
-         }
- 
-+        //enable borders if needed
-+        //c->setGeometry(QRect(geom.left(), c->geometry().top(), geom.width(), geom.height()));
-         break;
- 
-     case Plasma::LeftEdge:
-@@ -720,6 +707,8 @@ void PanelView::updatePanelGeometry()
-             geom.moveTopLeft(QPoint(screenGeom.left(), screenGeom.center().y() - geom.height()/2 + 1 - geom.height()%2 + m_offset));
-         }
- 
-+        //enable borders if needed
-+        //c->setGeometry(QRect(c->geometry().left(), geom.top(), geom.width(), geom.height()));
-         break;
- 
-     case Plasma::RightEdge:
-@@ -731,6 +720,8 @@ void PanelView::updatePanelGeometry()
-             geom.moveTopRight(QPoint(screenGeom.right(), screenGeom.center().y() - geom.height()/2 + 1 - geom.height()%2 + m_offset));
-         }
- 
-+        //enable borders if needed
-+        //c->setGeometry(QRect(c->geometry().left(), geom.top(), geom.width(), geom.height()));
-         break;
- 
-     case Plasma::BottomEdge:
-@@ -743,6 +734,8 @@ void PanelView::updatePanelGeometry()
-             geom.moveBottomLeft(QPoint(screenGeom.center().x() - geom.width()/2 + 1 - geom.width()%2 + m_offset, screenGeom.bottom()));
-         }
- 
-+        //enable borders if needed
-+        //c->setGeometry(QRect(geom.left(), c->geometry().top(), geom.width(), geom.height()));
-         break;
-     }
- 
-@@ -818,7 +811,8 @@ void PanelView::pinchContainment(const QRect &screenGeom)
-     KConfigGroup sizes = config();
-     sizes = KConfigGroup(&sizes, "Sizes");
- 
--    if (m_lastHorizontal != horizontal || m_lastSeenSize != (horizontal ? sw : sh)) {
-+    if (m_lastHorizontal != horizontal ||
-+        m_lastSeenSize != (horizontal ? sw : sh)) {
-         // we're adjusting size. store the current size now
-         KConfigGroup lastSize(&sizes, (m_lastHorizontal ? "Horizontal" : "Vertical") +
-                                       QString::number(m_lastSeenSize));
-@@ -1032,23 +1026,17 @@ void PanelView::togglePanelController()
-         }
-     }
- 
--    if (m_panelController->isVisible()) {
--        if (m_panelController->showingWidgetExplorer() ||
--            m_panelController->showingActivityManager()) {
--            m_panelController->switchToController();
--            m_panelController->move(m_panelController->positionForPanelGeometry(geometry()));
--        } else {
--            Plasma::WindowEffects::slideWindow(m_panelController, location());
--            m_panelController->close();
--            updateStruts();
--        }
--    } else {
-+    if (!m_panelController->isVisible()) {
-         m_editing = true;
-         m_panelController->resize(m_panelController->sizeHint());
-         m_panelController->move(m_panelController->positionForPanelGeometry(geometry()));
-         Plasma::WindowEffects::slideWindow(m_panelController, location());
-         kDebug() << "showing panel controller!" << m_panelController->geometry();
-         m_panelController->show();
-+    } else {
-+        Plasma::WindowEffects::slideWindow(m_panelController, location());
-+        m_panelController->close();
-+        updateStruts();
-     }
- }
- 
-@@ -1438,7 +1426,7 @@ void PanelView::unhide(bool destroyTrigger)
-     }
- }
- 
--void PanelView::statusUpdated(Plasma::ItemStatus newStatus)
-+void PanelView::setStatus(Plasma::ItemStatus newStatus)
- {
-     if (newStatus == Plasma::AcceptingInputStatus) {
-         KWindowSystem::forceActiveWindow(winId());
-@@ -1447,50 +1435,14 @@ void PanelView::statusUpdated(Plasma::ItemStatus newStatus)
- 
- void PanelView::checkUnhide(Plasma::ItemStatus newStatus)
- {
--    //kDebug() << "================= got a status: " << newStatus << Plasma::ActiveStatus;
--    m_respectStatus = true;
--
-+    //kDebug() << "================= got a new status: " << newStatus << Plasma::ActiveStatus;
-     if (newStatus > Plasma::ActiveStatus) {
-         unhide();
--        if (newStatus == Plasma::NeedsAttentionStatus) {
--            //kDebug() << "starting the timer!";
--            // start our rehide timer, so that the panel doesn't stay up and stuck forever and a day
--            m_rehideAfterAutounhideTimer->start(AUTOUNHIDE_CHECK_DELAY);
--        }
-     } else {
--        //kDebug() << "new status, just autohiding";
-         startAutoHide();
-     }
- }
- 
--void PanelView::checkAutounhide()
--{
--    //kDebug() << "***************************" << KIdleTime::instance()->idleTime();
--    if (KIdleTime::instance()->idleTime() >= AUTOUNHIDE_CHECK_DELAY) {
--        // the user is idle .. let's not hige the panel on them quite yet, but rather given them a
--        // chance to see this thing!
--        connect(KIdleTime::instance(), SIGNAL(resumingFromIdle()), this, SLOT(checkAutounhide()),
--                Qt::UniqueConnection);
--        KIdleTime::instance()->catchNextResumeEvent();
--        //kDebug() << "exit 1 ***************************";
--        return;
--    }
--
--    m_respectStatus = false;
--    //kDebug() << "in to check ... who's resonsible?" << sender() << KIdleTime::instance();
--    if (sender() == KIdleTime::instance()) {
--        //kDebug() << "doing a 2s wait";
--        QTimer::singleShot(2000, this, SLOT(startAutoHide()));
--    } else {
--        //kDebug() << "just starting autohide!";
--        startAutoHide();
--    }
--
--    // this line must come after the check on sender() as it *clears* that value!
--    disconnect(KIdleTime::instance(), SIGNAL(resumingFromIdle()), this, SLOT(checkAutounhide()));
--    //kDebug() << "exit 0 ***************************";
--}
--
- void PanelView::unhide()
- {
-     unhide(true);
-@@ -1503,31 +1455,10 @@ void PanelView::resetTriggerEnteredSuppression()
- 
- void PanelView::startAutoHide()
- {
--    /*
--    kDebug() << m_editing << (containment() ? containment()->status() : 0) << Plasma::ActiveStatus
--             << geometry().adjusted(-10, -10, 10, 10).contains(QCursor::pos()) << hasPopup();
--    if (containment() && containment()->status() > Plasma::ActiveStatus) {
--        foreach (Plasma::Applet *applet, containment()->applets()) {
--            kDebug() << "     " << applet->name() << applet->status();
--        }
--    }
--    */
--
--
--    if (m_editing || (m_respectStatus && (containment() && containment()->status() > Plasma::ActiveStatus))) {
--        if (m_mousePollTimer) {
--            m_mousePollTimer->stop();
--            disconnect(m_mousePollTimer, SIGNAL(timeout()), this, SLOT(startAutoHide()));
--        }
--
--        return;
--    }
--
--    // since we've gotten this far, we don't need to worry about rehiding-after-auto-unhide, so just
--    // stop the timer
--    m_rehideAfterAutounhideTimer->stop();
--
--    if (geometry().adjusted(-10, -10, 10, 10).contains(QCursor::pos()) || hasPopup()) {
-+    //TODO: is 5s too long? not long enough?
-+    if (m_editing || (containment() && containment()->status() > Plasma::ActiveStatus) ||
-+        geometry().adjusted(-10, -10, 10, 10).contains(QCursor::pos()) ||
-+        hasPopup()) {
-         if (!m_mousePollTimer) {
-             leaveEvent(0);
-         }
-diff --git a/plasma/desktop/shell/panelview.h b/plasma/desktop/shell/panelview.h
-index 9bdf780..c4be6b4 100644
---- a/plasma/desktop/shell/panelview.h
-+++ b/plasma/desktop/shell/panelview.h
-@@ -141,7 +141,7 @@ public Q_SLOTS:
-     /**
-      * Decides whether give focus to the panel
-      */
--    void statusUpdated(Plasma::ItemStatus newStatus);
-+    void setStatus(Plasma::ItemStatus newStatus);
- 
-     /**
-      * Pinches the min/max sizes of the containment to the current screen resolution
-@@ -240,7 +240,6 @@ private Q_SLOTS:
-     void overlayMoved(PanelAppletOverlay *overlay);
-     void panelDeleted();
-     void startAutoHide();
--    void checkAutounhide();
- 
-     /**
-      * update the appearance of the unhide hinter
-@@ -270,7 +269,6 @@ private:
-     GlowBar *m_glowBar;
-     QTimer *m_mousePollTimer;
-     QTimer *m_strutsTimer;
--    QTimer *m_rehideAfterAutounhideTimer;
-     QTimeLine *m_timeLine;
-     QGraphicsWidget *m_spacer;
-     int m_spacerIndex;
-@@ -292,10 +290,7 @@ private:
- 
-     bool m_editing : 1;
-     bool m_triggerEntered : 1;
--    bool m_respectStatus : 1;
--
-     static const int STRUTSTIMERDELAY = 200;
--    static const int AUTOUNHIDE_CHECK_DELAY = 3000;
- };
- 
- #endif

diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.6.3-gpsdapi.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.6.3-gpsdapi.patch
new file mode 100644
index 0000000..f24aded
--- /dev/null
+++ b/kde-base/plasma-workspace/files/plasma-workspace-4.6.3-gpsdapi.patch
@@ -0,0 +1,74 @@
+From: Rafael Fernández López <ereslibre@kde.org>
+Date: Thu, 28 Apr 2011 11:35:53 +0000
+Subject: gpsd api has changed and for GPSD_API_MAJOR_VERSION >=5 there are
+X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&amp;a=commitdiff&amp;h=a3009dd96e8519bcc205d75c29e18bbbb81fce03
+---
+gpsd api has changed and for GPSD_API_MAJOR_VERSION >=5 there are
+some calls that are slightly different. Make the dataengine compile
+against this version and previous one by adding conditional code.
+
+REVIEW: 101247
+---
+
+
+--- a/plasma/generic/dataengines/geolocation/location_gps.cpp
++++ b/plasma/generic/dataengines/geolocation/location_gps.cpp
+@@ -51,7 +51,11 @@ void Gpsd::run()
+     while (!m_abort) {
+         Plasma::DataEngine::Data d;
+ 
++#if GPSD_API_MAJOR_VERSION >= 5
++	if (gps_read(m_gpsdata) != -1) {
++#else
+         if (gps_poll(m_gpsdata) != -1) {
++#endif
+             //kDebug() << "poll ok";
+             if (m_gpsdata->online) {
+                 //kDebug() << "online";
+@@ -73,11 +77,19 @@ void Gpsd::run()
+ Gps::Gps(QObject* parent, const QVariantList& args)
+     : GeolocationProvider(parent, args),
+       m_gpsd(0)
++#if GPSD_API_MAJOR_VERSION >= 5
++    , m_gpsdata(0)
++#endif
+ {
+-    gps_data_t* gpsdata = gps_open("localhost", DEFAULT_GPSD_PORT);
+-    if (gpsdata) {
++#if GPSD_API_MAJOR_VERSION >= 5
++    m_gpsdata = new gps_data_t;
++    gps_open("localhost", DEFAULT_GPSD_PORT, m_gpsdata);
++#else
++    gps_data_t* m_gpsdata = gps_open("localhost", DEFAULT_GPSD_PORT);
++#endif
++    if (m_gpsdata) {
+         kDebug() << "gpsd found.";
+-        m_gpsd = new Gpsd(gpsdata);
++        m_gpsd = new Gpsd(m_gpsdata);
+         connect(m_gpsd, SIGNAL(dataReady(const Plasma::DataEngine::Data&)),
+                 this, SIGNAL(setData(const Plasma::DataEngine::Data&)));
+     } else {
+@@ -90,6 +102,9 @@ Gps::Gps(QObject* parent, const QVariant
+ Gps::~Gps()
+ {
+     delete m_gpsd;
++#if GPSD_API_MAJOR_VERSION >= 5
++    delete m_gpsdata;
++#endif
+ }
+ 
+ void Gps::update()
+
+--- a/plasma/generic/dataengines/geolocation/location_gps.h
++++ b/plasma/generic/dataengines/geolocation/location_gps.h
+@@ -58,6 +58,9 @@ public:
+ 
+ private:
+     Gpsd* m_gpsd;
++#if GPSD_API_MAJOR_VERSION >= 5
++    gps_data_t* m_gpsdata;
++#endif
+ };
+ 
+ #endif
+

diff --git a/kde-base/plasma-workspace/plasma-workspace-4.6.9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.6.9999.ebuild
index 4a6d547..2eaa9ed 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.6.9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.6.9999.ebuild
@@ -74,7 +74,7 @@ KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
 	"${FILESDIR}/${PN}-4.6.2-optional_akonadi-server.patch"
-	"${FILESDIR}/${PN}-4.6.2-panelplacement.patch"
+	"${FILESDIR}/${PN}-4.6.3-gpsdapi.patch"
 )
 
 pkg_setup() {



^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/, kde-base/plasma-workspace/
@ 2012-04-23 11:45 Michael Palimaka
  0 siblings, 0 replies; 16+ messages in thread
From: Michael Palimaka @ 2012-04-23 11:45 UTC (permalink / raw
  To: gentoo-commits

commit:     9ab0ba10be11e94b0c3991487d96c724e295069c
Author:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Mon Apr 23 11:45:26 2012 +0000
Commit:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Mon Apr 23 11:45:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=9ab0ba10

[kde-base/plasma-workspace] Remove xinerama use flag and patch since the library is not used directly.

(Portage version: 2.1.10.56/git/Linux x86_64, unsigned Manifest commit)

---
 ...-workspace-4.4.2-xinerama_cmake_automagic.patch |   18 ------------------
 .../plasma-workspace-4.8.49.9999.ebuild            |    9 +--------
 .../plasma-workspace/plasma-workspace-9999.ebuild  |    9 +--------
 3 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.4.2-xinerama_cmake_automagic.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.4.2-xinerama_cmake_automagic.patch
deleted file mode 100644
index 5596f41..0000000
--- a/kde-base/plasma-workspace/files/plasma-workspace-4.4.2-xinerama_cmake_automagic.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -r -u kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake kdebase-workspace-4.4.2/ConfigureChecks.cmake
---- kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake	2009-11-21 10:44:36.000000000 +0100
-+++ kdebase-workspace-4.4.2/ConfigureChecks.cmake	2010-04-02 00:04:32.000000000 +0200
-@@ -71,7 +71,14 @@
- macro_bool_to_01(X11_Xcursor_FOUND HAVE_XCURSOR) # many uses
- macro_bool_to_01(X11_Xdamage_FOUND HAVE_XDAMAGE) # kwin
- macro_bool_to_01(X11_Xfixes_FOUND HAVE_XFIXES) # klipper, kicker, kwin
-+
-+if(NOT WITH_X11_Xinerama)
-+  set(X11_Xinerama_FOUND FALSE)
-+  MESSAGE(STATUS "Disabling Xinerama as requested on commandline.")
-+endif(NOT WITH_X11_Xinerama)
-+
- macro_bool_to_01(X11_Xinerama_FOUND HAVE_XINERAMA)
-+
- macro_bool_to_01(X11_Xrandr_FOUND HAVE_XRANDR) # kwin
- macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER) # kcontrol/style, kicker
- macro_bool_to_01(X11_xf86misc_FOUND HAVE_XF86MISC) # kdesktop and kcontrol/lock

diff --git a/kde-base/plasma-workspace/plasma-workspace-4.8.49.9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.8.49.9999.ebuild
index 5743898..cd7d9b6 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.8.49.9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.8.49.9999.ebuild
@@ -12,7 +12,7 @@ inherit python kde4-meta
 
 DESCRIPTION="Plasma: KDE desktop framework"
 KEYWORDS=""
-IUSE="debug google-gadgets gps python qalculate +rss semantic-desktop xinerama"
+IUSE="debug google-gadgets gps python qalculate +rss semantic-desktop"
 
 COMMONDEPEND="
 	$(add_kdebase_dep kactivities)
@@ -40,7 +40,6 @@ COMMONDEPEND="
 		$(add_kdebase_dep libplasmaclock 'holidays')
 	)
 	!rss? ( $(add_kdebase_dep libplasmaclock '-holidays') )
-	xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="${COMMONDEPEND}
 	rss? ( dev-libs/boost )
@@ -48,7 +47,6 @@ DEPEND="${COMMONDEPEND}
 	x11-proto/damageproto
 	x11-proto/fixesproto
 	x11-proto/renderproto
-	xinerama? ( x11-proto/xineramaproto )
 "
 RDEPEND="${COMMONDEPEND}
 	$(add_kdebase_dep plasma-runtime)
@@ -71,10 +69,6 @@ KMEXTRACTONLY="
 
 KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
-)
-
 pkg_setup() {
 	python_set_active_version 2
 	python_pkg_setup
@@ -107,7 +101,6 @@ src_configure() {
 		$(cmake-utils_use_with semantic-desktop Akonadi)
 		$(cmake-utils_use_with semantic-desktop Nepomuk)
 		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with xinerama X11_Xinerama)
 		-DWITH_Xmms=OFF
 	)
 

diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
index 5743898..cd7d9b6 100644
--- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
@@ -12,7 +12,7 @@ inherit python kde4-meta
 
 DESCRIPTION="Plasma: KDE desktop framework"
 KEYWORDS=""
-IUSE="debug google-gadgets gps python qalculate +rss semantic-desktop xinerama"
+IUSE="debug google-gadgets gps python qalculate +rss semantic-desktop"
 
 COMMONDEPEND="
 	$(add_kdebase_dep kactivities)
@@ -40,7 +40,6 @@ COMMONDEPEND="
 		$(add_kdebase_dep libplasmaclock 'holidays')
 	)
 	!rss? ( $(add_kdebase_dep libplasmaclock '-holidays') )
-	xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="${COMMONDEPEND}
 	rss? ( dev-libs/boost )
@@ -48,7 +47,6 @@ DEPEND="${COMMONDEPEND}
 	x11-proto/damageproto
 	x11-proto/fixesproto
 	x11-proto/renderproto
-	xinerama? ( x11-proto/xineramaproto )
 "
 RDEPEND="${COMMONDEPEND}
 	$(add_kdebase_dep plasma-runtime)
@@ -71,10 +69,6 @@ KMEXTRACTONLY="
 
 KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
-)
-
 pkg_setup() {
 	python_set_active_version 2
 	python_pkg_setup
@@ -107,7 +101,6 @@ src_configure() {
 		$(cmake-utils_use_with semantic-desktop Akonadi)
 		$(cmake-utils_use_with semantic-desktop Nepomuk)
 		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with xinerama X11_Xinerama)
 		-DWITH_Xmms=OFF
 	)
 



^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/, kde-base/plasma-workspace/
@ 2013-02-07 22:19 Andreas Hüttel
  0 siblings, 0 replies; 16+ messages in thread
From: Andreas Hüttel @ 2013-02-07 22:19 UTC (permalink / raw
  To: gentoo-commits

commit:     c329262988dd4dd8005540858a6e409a12cc9592
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Thu Feb  7 22:19:20 2013 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Feb  7 22:19:20 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c3292629

[kde-base/plasma-workspace] Hack a workaround for bug 450818

Package-Manager: portage-2.2.0_alpha161

---
 .../files/plasma-workspace-4.10.0-norepeater.patch |  139 ++++++++++++++++++++
 .../plasma-workspace-4.10.0-r1.ebuild              |  138 +++++++++++++++++++
 2 files changed, 277 insertions(+), 0 deletions(-)

diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.10.0-norepeater.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.10.0-norepeater.patch
new file mode 100644
index 0000000..7e510aa
--- /dev/null
+++ b/kde-base/plasma-workspace/files/plasma-workspace-4.10.0-norepeater.patch
@@ -0,0 +1,139 @@
+diff --git a/plasma/generic/applets/systemtray/package/contents/ui/IconsList.qml b/plasma/generic/applets/systemtray/package/contents/ui/IconsList.qml
+index 348d3dd..16277b5 100644
+--- a/plasma/generic/applets/systemtray/package/contents/ui/IconsList.qml
++++ b/plasma/generic/applets/systemtray/package/contents/ui/IconsList.qml
+@@ -34,13 +34,13 @@ MouseArea {
+ 
+     property int icons_size:     24  ///< Size of icons, icons are square i.e. width == height
+     property int icons_margins:  4  ///< Margins for icons
+-    property alias icons_number: repeater.count  ///< [readonly] Number of icons
+-    property alias model:    repeater.model; ///< Model for grid
++    property alias icons_number: list.count  ///< [readonly] Number of icons
++    property alias model:    list.model; ///< Model for grid
+     property int cell_size: icons_size + 2*icons_margins ///< [readonly] size of grid cell
+ 
+     //Those properties are used by PlasmaCore.Dialog for size hints
+-    property int minimumWidth:   layoutColumn.childrenRect.width ///< [readonly] minimum width of component required to show whole grid
+-    property int minimumHeight:  layoutColumn.childrenRect.height ///< [readonly] minimum height of compontn required to show whole grid
++    property int minimumWidth:   list.contentItem.childrenRect.width ///< [readonly] minimum width of component required to show whole grid
++    property int minimumHeight:  list.contentItem.childrenRect.height ///< [readonly] minimum height of compontn required to show whole grid
+     property int maximumWidth: minimumWidth
+     property int maximumHeight: minimumHeight
+ 
+@@ -53,6 +53,7 @@ MouseArea {
+             id: delegate_root_item
+             width: childrenRect.width
+             height: childrenRect.height
++            z: 0
+ 
+             // we redirect some events to IconWidget or applet
+             target: task.type == TypeStatusItem ? ui_item.getIconWidget() : task
+@@ -63,8 +64,9 @@ MouseArea {
+             onClickRight: ui_item.click(Qt.RightButton)
+             onScrollVert: ui_item.scrollVert(delta)
+             onScrollHorz: ui_item.scrollHorz(delta)
+-            onEntered: {
+-                delegate_highlight.y = delegate_root_item.y
++            onChangedMousePos: {
++                var pos = mapToItem(list.contentItem, mouseX, mouseY)
++                list.currentIndex = list.indexAt(pos.x, pos.y)
+             }
+ 
+             Row {
+@@ -108,38 +110,42 @@ MouseArea {
+             }
+ 
+         }
+-
+     }
+ 
+ 
+ 
+-    PlasmaWidgets.ItemBackground {
++    Component {
+         id: delegate_highlight
+-        height: cell_size
+-        width: minimumWidth
+-
+-        opacity: root_item.containsMouse
+-        Behavior on opacity {
+-            NumberAnimation {
+-                duration: 150
+-                easing: Easing.InOutQuad
++        Item {
++            height: cell_size
++            width: minimumWidth
++
++            PlasmaWidgets.ItemBackground {
++                anchors.fill: parent
+             }
+-        }
+-        Behavior on y {
+-            NumberAnimation {
+-                duration: 250
+-                easing: Easing.InOutQuad
++            opacity: root_item.containsMouse
++            Behavior on opacity {
++                NumberAnimation {
++                    duration: 150
++                    easing: Easing.InOutQuad
++                }
+             }
+         }
+     }
+ 
+-
+-    Column {
+-        id: layoutColumn
++    ListView {
++        id: list
++        anchors.fill: parent
++        //never delete items
++        cacheBuffer: 1000
++
++        interactive: false
++        delegate: delegate_task
++        highlight: delegate_highlight
++        highlightFollowsCurrentItem: true
++        highlightMoveSpeed: -1
++        highlightMoveDuration: 250
+         spacing: 0
+-        Repeater {
+-            id: repeater
+-            delegate: delegate_task
+-        }
++        snapMode: ListView.SnapToItem
+     }
+ }
+diff --git a/plasma/generic/applets/systemtray/ui/mouseredirectarea.cpp b/plasma/generic/applets/systemtray/ui/mouseredirectarea.cpp
+index 79f5ca0..38bb815 100644
+--- a/plasma/generic/applets/systemtray/ui/mouseredirectarea.cpp
++++ b/plasma/generic/applets/systemtray/ui/mouseredirectarea.cpp
+@@ -146,14 +146,12 @@ void MouseRedirectArea::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+ void MouseRedirectArea::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
+ {
+     forwardEvent(event);
+-    emit entered();
+ }
+ 
+ 
+ void MouseRedirectArea::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
+ {
+     forwardEvent(event);
+-    emit exited();
+ }
+ 
+ void MouseRedirectArea::hoverMoveEvent(QGraphicsSceneHoverEvent *event)
+diff --git a/plasma/generic/applets/systemtray/ui/mouseredirectarea.h b/plasma/generic/applets/systemtray/ui/mouseredirectarea.h
+index 9c60070..ed1a806 100644
+--- a/plasma/generic/applets/systemtray/ui/mouseredirectarea.h
++++ b/plasma/generic/applets/systemtray/ui/mouseredirectarea.h
+@@ -67,8 +67,6 @@ signals:
+     void scrollVert(int delta);
+     void scrollHorz(int delta);
+     void changedMousePos(qreal mouseX, qreal mouseY);
+-    void entered();
+-    void exited();
+ 
+ private: //Events
+     virtual void wheelEvent(QGraphicsSceneWheelEvent *event);

diff --git a/kde-base/plasma-workspace/plasma-workspace-4.10.0-r1.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.10.0-r1.ebuild
new file mode 100644
index 0000000..be60e33
--- /dev/null
+++ b/kde-base/plasma-workspace/plasma-workspace-4.10.0-r1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.10.0.ebuild,v 1.1 2013/02/07 04:57:24 alexxy Exp $
+
+EAPI=5
+
+DECLARATIVE_REQUIRED="always"
+KDE_HANDBOOK="optional"
+KMNAME="kde-workspace"
+KMMODULE="plasma"
+PYTHON_DEPEND="python? 2"
+OPENGL_REQUIRED="always"
+inherit python kde4-meta
+
+DESCRIPTION="Plasma: KDE desktop framework"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug google-gadgets gps json python qalculate +rss semantic-desktop"
+
+COMMONDEPEND="
+	dev-libs/libdbusmenu-qt
+	!kde-misc/ktouchpadenabler
+	$(add_kdebase_dep kactivities)
+	$(add_kdebase_dep kdelibs 'semantic-desktop=')
+	$(add_kdebase_dep kephal)
+	$(add_kdebase_dep ksysguard)
+	$(add_kdebase_dep libkworkspace)
+	$(add_kdebase_dep libplasmagenericshell)
+	$(add_kdebase_dep libtaskmanager)
+	$(add_kdebase_dep solid)
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	google-gadgets? ( >=x11-misc/google-gadgets-0.11.0[qt4] )
+	gps? ( >=sci-geosciences/gpsd-2.37 )
+	json? ( dev-libs/qjson )
+	python? (
+		>=dev-python/PyQt4-4.4.0[X]
+		$(add_kdebase_dep pykde4)
+	)
+	qalculate? ( sci-libs/libqalculate )
+	rss? (
+		$(add_kdebase_dep kdepimlibs 'semantic-desktop=')
+		$(add_kdebase_dep libplasmaclock 'holidays')
+	)
+	!rss? ( $(add_kdebase_dep libplasmaclock '-holidays') )
+	semantic-desktop? (
+		dev-libs/soprano
+		$(add_kdebase_dep nepomuk-core)
+	)
+"
+DEPEND="${COMMONDEPEND}
+	rss? ( dev-libs/boost )
+	x11-proto/compositeproto
+	x11-proto/damageproto
+	x11-proto/fixesproto
+	x11-proto/renderproto
+"
+RDEPEND="${COMMONDEPEND}
+	$(add_kdebase_dep plasma-runtime)
+"
+
+PATCHES=( "${FILESDIR}/${P}"-norepeater.patch )
+
+KMEXTRA="
+	appmenu/
+	ktouchpadenabler/
+	statusnotifierwatcher/
+"
+KMEXTRACTONLY="
+	kcheckpass/
+	krunner/dbus/org.freedesktop.ScreenSaver.xml
+	krunner/dbus/org.kde.krunner.App.xml
+	ksmserver/org.kde.KSMServerInterface.xml
+	ksmserver/screenlocker/
+	libs/kephal/
+	libs/kworkspace/
+	libs/taskmanager/
+	libs/plasmagenericshell/
+	libs/ksysguard/
+	libs/kdm/kgreeterplugin.h
+	ksysguard/
+"
+
+KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
+
+pkg_setup() {
+	if use python ; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+	kde4-meta_pkg_setup
+}
+
+src_unpack() {
+	if use handbook; then
+		KMEXTRA+=" doc/plasma-desktop"
+	fi
+
+	kde4-meta_src_unpack
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with google-gadgets Googlegadgets)
+		$(cmake-utils_use_with gps libgps)
+		$(cmake-utils_use_with json QJSON)
+		$(cmake-utils_use_with python PythonLibrary)
+		$(cmake-utils_use_with qalculate)
+		$(cmake-utils_use_with rss KdepimLibs)
+		$(cmake-utils_use_with semantic-desktop Akonadi)
+		$(cmake-utils_use_with semantic-desktop NepomukCore)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		-DWITH_Xmms=OFF
+	)
+
+	kde4-meta_src_configure
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	if use python; then
+		python_mod_optimize \
+			PyKDE4/plasmascript.py \
+			/usr/share/apps/plasma_scriptengine_python
+	fi
+}
+
+pkg_postrm() {
+	kde4-meta_pkg_postrm
+
+	if use python; then
+		python_mod_cleanup \
+			PyKDE4/plasmascript.py \
+			/usr/share/apps/plasma_scriptengine_python
+	fi
+}


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/, kde-base/plasma-workspace/
@ 2013-02-13 10:38 Michael Palimaka
  0 siblings, 0 replies; 16+ messages in thread
From: Michael Palimaka @ 2013-02-13 10:38 UTC (permalink / raw
  To: gentoo-commits

commit:     1a4065fa066d2b2dd0759cac76f8699a3fec405e
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 13 10:38:22 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Feb 13 10:38:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=1a4065fa

[kde-base/plasma-workspace] Remove workaround that is now fixed in qt-core-4.8.4-r3.

Package-Manager: portage-2.1.11.51

---
 .../files/plasma-workspace-4.10.0-norepeater.patch |  139 --------------------
 .../plasma-workspace-4.10.0-r1.ebuild              |  138 -------------------
 2 files changed, 0 insertions(+), 277 deletions(-)

diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.10.0-norepeater.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.10.0-norepeater.patch
deleted file mode 100644
index 7e510aa..0000000
--- a/kde-base/plasma-workspace/files/plasma-workspace-4.10.0-norepeater.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-diff --git a/plasma/generic/applets/systemtray/package/contents/ui/IconsList.qml b/plasma/generic/applets/systemtray/package/contents/ui/IconsList.qml
-index 348d3dd..16277b5 100644
---- a/plasma/generic/applets/systemtray/package/contents/ui/IconsList.qml
-+++ b/plasma/generic/applets/systemtray/package/contents/ui/IconsList.qml
-@@ -34,13 +34,13 @@ MouseArea {
- 
-     property int icons_size:     24  ///< Size of icons, icons are square i.e. width == height
-     property int icons_margins:  4  ///< Margins for icons
--    property alias icons_number: repeater.count  ///< [readonly] Number of icons
--    property alias model:    repeater.model; ///< Model for grid
-+    property alias icons_number: list.count  ///< [readonly] Number of icons
-+    property alias model:    list.model; ///< Model for grid
-     property int cell_size: icons_size + 2*icons_margins ///< [readonly] size of grid cell
- 
-     //Those properties are used by PlasmaCore.Dialog for size hints
--    property int minimumWidth:   layoutColumn.childrenRect.width ///< [readonly] minimum width of component required to show whole grid
--    property int minimumHeight:  layoutColumn.childrenRect.height ///< [readonly] minimum height of compontn required to show whole grid
-+    property int minimumWidth:   list.contentItem.childrenRect.width ///< [readonly] minimum width of component required to show whole grid
-+    property int minimumHeight:  list.contentItem.childrenRect.height ///< [readonly] minimum height of compontn required to show whole grid
-     property int maximumWidth: minimumWidth
-     property int maximumHeight: minimumHeight
- 
-@@ -53,6 +53,7 @@ MouseArea {
-             id: delegate_root_item
-             width: childrenRect.width
-             height: childrenRect.height
-+            z: 0
- 
-             // we redirect some events to IconWidget or applet
-             target: task.type == TypeStatusItem ? ui_item.getIconWidget() : task
-@@ -63,8 +64,9 @@ MouseArea {
-             onClickRight: ui_item.click(Qt.RightButton)
-             onScrollVert: ui_item.scrollVert(delta)
-             onScrollHorz: ui_item.scrollHorz(delta)
--            onEntered: {
--                delegate_highlight.y = delegate_root_item.y
-+            onChangedMousePos: {
-+                var pos = mapToItem(list.contentItem, mouseX, mouseY)
-+                list.currentIndex = list.indexAt(pos.x, pos.y)
-             }
- 
-             Row {
-@@ -108,38 +110,42 @@ MouseArea {
-             }
- 
-         }
--
-     }
- 
- 
- 
--    PlasmaWidgets.ItemBackground {
-+    Component {
-         id: delegate_highlight
--        height: cell_size
--        width: minimumWidth
--
--        opacity: root_item.containsMouse
--        Behavior on opacity {
--            NumberAnimation {
--                duration: 150
--                easing: Easing.InOutQuad
-+        Item {
-+            height: cell_size
-+            width: minimumWidth
-+
-+            PlasmaWidgets.ItemBackground {
-+                anchors.fill: parent
-             }
--        }
--        Behavior on y {
--            NumberAnimation {
--                duration: 250
--                easing: Easing.InOutQuad
-+            opacity: root_item.containsMouse
-+            Behavior on opacity {
-+                NumberAnimation {
-+                    duration: 150
-+                    easing: Easing.InOutQuad
-+                }
-             }
-         }
-     }
- 
--
--    Column {
--        id: layoutColumn
-+    ListView {
-+        id: list
-+        anchors.fill: parent
-+        //never delete items
-+        cacheBuffer: 1000
-+
-+        interactive: false
-+        delegate: delegate_task
-+        highlight: delegate_highlight
-+        highlightFollowsCurrentItem: true
-+        highlightMoveSpeed: -1
-+        highlightMoveDuration: 250
-         spacing: 0
--        Repeater {
--            id: repeater
--            delegate: delegate_task
--        }
-+        snapMode: ListView.SnapToItem
-     }
- }
-diff --git a/plasma/generic/applets/systemtray/ui/mouseredirectarea.cpp b/plasma/generic/applets/systemtray/ui/mouseredirectarea.cpp
-index 79f5ca0..38bb815 100644
---- a/plasma/generic/applets/systemtray/ui/mouseredirectarea.cpp
-+++ b/plasma/generic/applets/systemtray/ui/mouseredirectarea.cpp
-@@ -146,14 +146,12 @@ void MouseRedirectArea::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
- void MouseRedirectArea::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
- {
-     forwardEvent(event);
--    emit entered();
- }
- 
- 
- void MouseRedirectArea::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
- {
-     forwardEvent(event);
--    emit exited();
- }
- 
- void MouseRedirectArea::hoverMoveEvent(QGraphicsSceneHoverEvent *event)
-diff --git a/plasma/generic/applets/systemtray/ui/mouseredirectarea.h b/plasma/generic/applets/systemtray/ui/mouseredirectarea.h
-index 9c60070..ed1a806 100644
---- a/plasma/generic/applets/systemtray/ui/mouseredirectarea.h
-+++ b/plasma/generic/applets/systemtray/ui/mouseredirectarea.h
-@@ -67,8 +67,6 @@ signals:
-     void scrollVert(int delta);
-     void scrollHorz(int delta);
-     void changedMousePos(qreal mouseX, qreal mouseY);
--    void entered();
--    void exited();
- 
- private: //Events
-     virtual void wheelEvent(QGraphicsSceneWheelEvent *event);

diff --git a/kde-base/plasma-workspace/plasma-workspace-4.10.0-r1.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.10.0-r1.ebuild
deleted file mode 100644
index be60e33..0000000
--- a/kde-base/plasma-workspace/plasma-workspace-4.10.0-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.10.0.ebuild,v 1.1 2013/02/07 04:57:24 alexxy Exp $
-
-EAPI=5
-
-DECLARATIVE_REQUIRED="always"
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-KMMODULE="plasma"
-PYTHON_DEPEND="python? 2"
-OPENGL_REQUIRED="always"
-inherit python kde4-meta
-
-DESCRIPTION="Plasma: KDE desktop framework"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug google-gadgets gps json python qalculate +rss semantic-desktop"
-
-COMMONDEPEND="
-	dev-libs/libdbusmenu-qt
-	!kde-misc/ktouchpadenabler
-	$(add_kdebase_dep kactivities)
-	$(add_kdebase_dep kdelibs 'semantic-desktop=')
-	$(add_kdebase_dep kephal)
-	$(add_kdebase_dep ksysguard)
-	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep libplasmagenericshell)
-	$(add_kdebase_dep libtaskmanager)
-	$(add_kdebase_dep solid)
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	google-gadgets? ( >=x11-misc/google-gadgets-0.11.0[qt4] )
-	gps? ( >=sci-geosciences/gpsd-2.37 )
-	json? ( dev-libs/qjson )
-	python? (
-		>=dev-python/PyQt4-4.4.0[X]
-		$(add_kdebase_dep pykde4)
-	)
-	qalculate? ( sci-libs/libqalculate )
-	rss? (
-		$(add_kdebase_dep kdepimlibs 'semantic-desktop=')
-		$(add_kdebase_dep libplasmaclock 'holidays')
-	)
-	!rss? ( $(add_kdebase_dep libplasmaclock '-holidays') )
-	semantic-desktop? (
-		dev-libs/soprano
-		$(add_kdebase_dep nepomuk-core)
-	)
-"
-DEPEND="${COMMONDEPEND}
-	rss? ( dev-libs/boost )
-	x11-proto/compositeproto
-	x11-proto/damageproto
-	x11-proto/fixesproto
-	x11-proto/renderproto
-"
-RDEPEND="${COMMONDEPEND}
-	$(add_kdebase_dep plasma-runtime)
-"
-
-PATCHES=( "${FILESDIR}/${P}"-norepeater.patch )
-
-KMEXTRA="
-	appmenu/
-	ktouchpadenabler/
-	statusnotifierwatcher/
-"
-KMEXTRACTONLY="
-	kcheckpass/
-	krunner/dbus/org.freedesktop.ScreenSaver.xml
-	krunner/dbus/org.kde.krunner.App.xml
-	ksmserver/org.kde.KSMServerInterface.xml
-	ksmserver/screenlocker/
-	libs/kephal/
-	libs/kworkspace/
-	libs/taskmanager/
-	libs/plasmagenericshell/
-	libs/ksysguard/
-	libs/kdm/kgreeterplugin.h
-	ksysguard/
-"
-
-KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
-
-pkg_setup() {
-	if use python ; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-	kde4-meta_pkg_setup
-}
-
-src_unpack() {
-	if use handbook; then
-		KMEXTRA+=" doc/plasma-desktop"
-	fi
-
-	kde4-meta_src_unpack
-}
-
-src_configure() {
-	mycmakeargs=(
-		$(cmake-utils_use_with google-gadgets Googlegadgets)
-		$(cmake-utils_use_with gps libgps)
-		$(cmake-utils_use_with json QJSON)
-		$(cmake-utils_use_with python PythonLibrary)
-		$(cmake-utils_use_with qalculate)
-		$(cmake-utils_use_with rss KdepimLibs)
-		$(cmake-utils_use_with semantic-desktop Akonadi)
-		$(cmake-utils_use_with semantic-desktop NepomukCore)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		-DWITH_Xmms=OFF
-	)
-
-	kde4-meta_src_configure
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	if use python; then
-		python_mod_optimize \
-			PyKDE4/plasmascript.py \
-			/usr/share/apps/plasma_scriptengine_python
-	fi
-}
-
-pkg_postrm() {
-	kde4-meta_pkg_postrm
-
-	if use python; then
-		python_mod_cleanup \
-			PyKDE4/plasmascript.py \
-			/usr/share/apps/plasma_scriptengine_python
-	fi
-}


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/, kde-base/plasma-workspace/
@ 2013-03-28 21:19 Andreas Hüttel
  0 siblings, 0 replies; 16+ messages in thread
From: Andreas Hüttel @ 2013-03-28 21:19 UTC (permalink / raw
  To: gentoo-commits

commit:     2bd53f504433a9903726b01a00d3dbda77aeca59
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 22:21:29 2013 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Mar 28 21:20:38 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2bd53f50

[kde-base/plasma-workspace] Hard-disable plasma screen locker, bug 462152

Package-Manager: portage-2.2.0_alpha169

---
 .../plasma-workspace-4.10.1-noplasmalock.patch     |   11 +++++++++++
 .../plasma-workspace-4.10.49.9999.ebuild           |    2 ++
 .../plasma-workspace/plasma-workspace-9999.ebuild  |    2 ++
 3 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.10.1-noplasmalock.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.10.1-noplasmalock.patch
new file mode 100644
index 0000000..2380d20
--- /dev/null
+++ b/kde-base/plasma-workspace/files/plasma-workspace-4.10.1-noplasmalock.patch
@@ -0,0 +1,11 @@
+diff --git a/plasma/screensaver/CMakeLists.txt b/plasma/screensaver/CMakeLists.txt
+index 514c856..9dcb5f4 100644
+--- a/plasma/screensaver/CMakeLists.txt
++++ b/plasma/screensaver/CMakeLists.txt
+@@ -1,6 +1,3 @@
+ add_subdirectory(containments)
+-if(NOT WIN32)
+-add_subdirectory(shell)
+-endif(NOT WIN32)
+ 
+ 

diff --git a/kde-base/plasma-workspace/plasma-workspace-4.10.49.9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.10.49.9999.ebuild
index 0f41df5..5c90ce3 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.10.49.9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.10.49.9999.ebuild
@@ -82,6 +82,8 @@ KMEXTRACTONLY="
 
 KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
 
+PATCHES=( "${FILESDIR}/${PN}-4.10.1-noplasmalock.patch" )
+
 pkg_setup() {
 	if use python ; then
 		python_set_active_version 2

diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
index 0f41df5..5c90ce3 100644
--- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
@@ -82,6 +82,8 @@ KMEXTRACTONLY="
 
 KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
 
+PATCHES=( "${FILESDIR}/${PN}-4.10.1-noplasmalock.patch" )
+
 pkg_setup() {
 	if use python ; then
 		python_set_active_version 2


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/, kde-base/plasma-workspace/
@ 2014-04-09 15:26 Johannes Huber
  0 siblings, 0 replies; 16+ messages in thread
From: Johannes Huber @ 2014-04-09 15:26 UTC (permalink / raw
  To: gentoo-commits

commit:     cb76b81eec363e10c89819d34f5c3edd557d65ca
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  9 15:25:53 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Apr  9 15:25:53 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=cb76b81e

[kde-base/plasma-workspace] Add patch to fix missing binary

The binary is provided by dev-qt/qttools:5, which is not packaged yet. When
bug #457024 is RESOLVED we can drop this patch.

Package-Manager: portage-2.2.10

---
 .../plasma-workspace-9999-missing-qttools.patch    | 57 ++++++++++++++++++++++
 .../plasma-workspace/plasma-workspace-9999.ebuild  |  3 ++
 2 files changed, 60 insertions(+)

diff --git a/kde-base/plasma-workspace/files/plasma-workspace-9999-missing-qttools.patch b/kde-base/plasma-workspace/files/plasma-workspace-9999-missing-qttools.patch
new file mode 100644
index 0000000..12886cd
--- /dev/null
+++ b/kde-base/plasma-workspace/files/plasma-workspace-9999-missing-qttools.patch
@@ -0,0 +1,57 @@
+diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
+index e845603..e49dd5f 100644
+--- a/startkde/startkde.cmake
++++ b/startkde/startkde.cmake
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ #
+-#  DEFAULT KDE STARTUP SCRIPT ( @KDE4WORKSPACE_VERSION@ )
++#  DEFAULT KDE STARTUP SCRIPT ( @PLASMAWORKSPACE_VERSION@ )
+ #
+ 
+ if test "x$1" = x--failsafe; then
+@@ -19,7 +19,7 @@ unset DYLD_FORCE_FLAT_NAMESPACE
+ # in case we have been started with full pathname spec without being in PATH
+ bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
+ if [ -n "$bindir" ]; then
+-  qbindir=`qtpaths --binaries-dir`
++  qbindir=`kf5-config --qt-binaries`
+   qdbus=$qbindir/qdbus
+   case $PATH in
+     $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
+@@ -64,7 +64,7 @@ fi
+ 
+ mkdir -p $configDir
+ 
+-#This is basically setting defaults so we can use them with kstartupconfig4
++#This is basically setting defaults so we can use them with kstartupconfig5
+ cat >$configDir/startupconfigkeys <<EOF
+ kcminputrc Mouse cursorTheme 'Oxygen_White'
+ kcminputrc Mouse cursorSize ''
+@@ -162,7 +162,7 @@ unset DESKTOP_LOCKED # Don't want it in the environment
+ ksplash_pid=
+ if test -z "$dl"; then
+   # languages as resolved by KLocale, for the splash screens use
+-  # klocale_languages is assembled by kdostartupconfig4 calling KLocale
++  # klocale_languages is assembled by kdostartupconfig5 calling KLocale
+   KLOCALE_LANGUAGES="$klocale_languages"
+   export KLOCALE_LANGUAGES
+   # the splashscreen and progress indicator
+@@ -191,7 +191,7 @@ fi
+ # For anything else (that doesn't set env vars, or that needs a window manager),
+ # better use the Autostart folder.
+ 
+-libpath=`kde4-config --path lib | tr : '\n'`
++libpath=`kf5-config --path lib | tr : '\n'`
+ 
+ for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
+   for file in "$prefix"*.sh; do
+@@ -200,7 +200,7 @@ for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
+ done
+ 
+ # Set the path for Qt plugins provided by KDE
+-QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`qtpaths --plugin-dir`
++QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`kf5-config --qt-plugins`
+ # TODO: Do we really need this?
+ QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$kdehome/lib/kde5/plugins/
+ export QT_PLUGIN_PATH

diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
index d5e4026..ec14a37 100644
--- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
@@ -87,6 +87,9 @@ DEPEND="${COMMON_DEPEND}
 	X? ( x11-proto/xproto )
 "
 
+# Needed until bug 457024 is resolved
+PATCHES=( "${FILESDIR}/${P}-missing-qttools.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package dbus dbusmenu-qt5)


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/, kde-base/plasma-workspace/
@ 2014-04-24 22:45 Johannes Huber
  0 siblings, 0 replies; 16+ messages in thread
From: Johannes Huber @ 2014-04-24 22:45 UTC (permalink / raw
  To: gentoo-commits

commit:     200f7a41f6917553130817c96bd3188fc06eded1
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 24 22:44:15 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Apr 24 22:44:15 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=200f7a41

[kde-base/plasma-workspace] Re-enable plasma lock

Package-Manager: portage-2.2.10

---
 .../files/plasma-workspace-4.10.1-noplasmalock.patch          | 11 -----------
 .../plasma-workspace/plasma-workspace-4.11.49.9999.ebuild     |  2 --
 2 files changed, 13 deletions(-)

diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.10.1-noplasmalock.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.10.1-noplasmalock.patch
deleted file mode 100644
index 2380d20..0000000
--- a/kde-base/plasma-workspace/files/plasma-workspace-4.10.1-noplasmalock.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/plasma/screensaver/CMakeLists.txt b/plasma/screensaver/CMakeLists.txt
-index 514c856..9dcb5f4 100644
---- a/plasma/screensaver/CMakeLists.txt
-+++ b/plasma/screensaver/CMakeLists.txt
-@@ -1,6 +1,3 @@
- add_subdirectory(containments)
--if(NOT WIN32)
--add_subdirectory(shell)
--endif(NOT WIN32)
- 
- 

diff --git a/kde-base/plasma-workspace/plasma-workspace-4.11.49.9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.11.49.9999.ebuild
index 68c6e30..d5d67ab 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.11.49.9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.11.49.9999.ebuild
@@ -82,8 +82,6 @@ KMEXTRACTONLY="
 	ksysguard/
 "
 
-PATCHES=( "${FILESDIR}/${PN}-4.10.1-noplasmalock.patch" )
-
 pkg_setup() {
 	if use python ; then
 		python-single-r1_pkg_setup


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/, kde-base/plasma-workspace/
@ 2014-05-24 22:48 Johannes Huber
  0 siblings, 0 replies; 16+ messages in thread
From: Johannes Huber @ 2014-05-24 22:48 UTC (permalink / raw
  To: gentoo-commits

commit:     b9eb662968ec77f73441c3f4fbc2e4da26ab265b
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat May 24 22:47:21 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat May 24 22:48:21 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b9eb6629

[kde-base/plasma-workspace] Drop obsolete patch, add missing RDEPEND

Package-Manager: portage-2.2.10

---
 .../plasma-workspace-9999-missing-qttools.patch    | 58 ----------------------
 .../plasma-workspace-4.96.0.ebuild                 |  6 +--
 .../plasma-workspace/plasma-workspace-9999.ebuild  |  4 +-
 3 files changed, 3 insertions(+), 65 deletions(-)

diff --git a/kde-base/plasma-workspace/files/plasma-workspace-9999-missing-qttools.patch b/kde-base/plasma-workspace/files/plasma-workspace-9999-missing-qttools.patch
deleted file mode 100644
index 3c80f21..0000000
--- a/kde-base/plasma-workspace/files/plasma-workspace-9999-missing-qttools.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
-index 14ce47a..58c3a7a 100644
---- a/startkde/startkde.cmake
-+++ b/startkde/startkde.cmake
-@@ -1,6 +1,6 @@
- #!/bin/sh
- #
--#  DEFAULT KDE STARTUP SCRIPT ( @KDE4WORKSPACE_VERSION@ )
-+#  DEFAULT KDE STARTUP SCRIPT ( @PLASMAWORKSPACE_VERSION@ )
- #
- 
- if test "x$1" = x--failsafe; then
-@@ -17,17 +17,17 @@ trap 'echo GOT SIGHUP' HUP
- unset DYLD_FORCE_FLAT_NAMESPACE
- 
- # in case we have been started with full pathname spec without being in PATH
--bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
--if [ -n "$bindir" ]; then
--  qbindir=`qtpaths --binaries-dir`
--  qdbus=$qbindir/qdbus
--  case $PATH in
--    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
--    *) PATH=$bindir:$PATH; export PATH;;
--  esac
--else
-+#bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
-+#if [ -n "$bindir" ]; then
-+#  qbindir=`qtpaths --binaries-dir`
-+#  qdbus=$qbindir/qdbus
-+#  case $PATH in
-+#    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
-+#    *) PATH=$bindir:$PATH; export PATH;;
-+#  esac
-+#else
-   qdbus=qdbus
--fi
-+#fi
- 
- # Check if a KDE session already is running and whether it's possible to connect to X
- kcheckrunning
-@@ -162,7 +162,7 @@ unset DESKTOP_LOCKED # Don't want it in the environment
- ksplash_pid=
- if test -z "$dl"; then
-   # languages as resolved by KLocale, for the splash screens use
--  # klocale_languages is assembled by kdostartupconfig4 calling KLocale
-+  # klocale_languages is assembled by kdostartupconfig5 calling KLocale
-   KLOCALE_LANGUAGES="$klocale_languages"
-   export KLOCALE_LANGUAGES
-   # the splashscreen and progress indicator
-@@ -200,7 +200,7 @@ for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
- done
- 
- # Set the path for Qt plugins provided by KDE
--QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`qtpaths --plugin-dir`
-+QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`kf5-config --qt-plugins`
- # TODO: Do we really need this?
- QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$kdehome/lib/kde5/plugins/
- export QT_PLUGIN_PATH

diff --git a/kde-base/plasma-workspace/plasma-workspace-4.96.0.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.96.0.ebuild
index 66ab734..f5b10a7 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.96.0.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.96.0.ebuild
@@ -72,7 +72,8 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
 	$(add_kdebase_dep milou)
-	dev-qt/qtquickcontrols:5
+	dev-qt/qdbus:5
+	dev-qt/qtquickcontrols:5[widgets]
 	!kde-base/freespacenotifier:4
 	!kde-base/libkworkspace:4
 	!kde-base/libtaskmanager:4
@@ -90,9 +91,6 @@ DEPEND="${COMMON_DEPEND}
 	X? ( x11-proto/xproto )
 "
 
-# Needed until bug 457024 is resolved
-PATCHES=( "${FILESDIR}/${PN}-9999-missing-qttools.patch" )
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package dbus dbusmenu-qt5)

diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
index 0ed1cfa..b90ecee 100644
--- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
@@ -72,6 +72,7 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
 	$(add_kdebase_dep milou)
+	dev-qt/qdbus:5
 	dev-qt/qtquickcontrols:5[widgets]
 	!kde-base/freespacenotifier:4
 	!kde-base/libkworkspace:4
@@ -90,9 +91,6 @@ DEPEND="${COMMON_DEPEND}
 	X? ( x11-proto/xproto )
 "
 
-# Needed until bug 457024 is resolved
-PATCHES=( "${FILESDIR}/${P}-missing-qttools.patch" )
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package dbus dbusmenu-qt5)


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/, kde-base/plasma-workspace/
@ 2014-05-25 15:49 Johannes Huber
  0 siblings, 0 replies; 16+ messages in thread
From: Johannes Huber @ 2014-05-25 15:49 UTC (permalink / raw
  To: gentoo-commits

commit:     5d1ea4d2f22709cfc4da33c2b6dd790c5ba5d271
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun May 25 15:48:48 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun May 25 15:48:48 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5d1ea4d2

[kde-base/plasma-workspace] Add prison support

Package-Manager: portage-2.2.10

---
 ...plasma-workspace-9999-cmake-enable-prison.patch | 56 ++++++++++++++++++++++
 kde-base/plasma-workspace/metadata.xml             |  3 +-
 .../plasma-workspace/plasma-workspace-9999.ebuild  |  6 ++-
 3 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/kde-base/plasma-workspace/files/plasma-workspace-9999-cmake-enable-prison.patch b/kde-base/plasma-workspace/files/plasma-workspace-9999-cmake-enable-prison.patch
new file mode 100644
index 0000000..dc18fd1
--- /dev/null
+++ b/kde-base/plasma-workspace/files/plasma-workspace-9999-cmake-enable-prison.patch
@@ -0,0 +1,56 @@
+From faf9e0a0af6a2842b9f4ebf4cd901062cc006e04 Mon Sep 17 00:00:00 2001
+From: Johannes Huber <johu@gentoo.org>
+Date: Sun, 25 May 2014 17:29:16 +0200
+Subject: [PATCH] [klipper] Re-enable prison
+
+---
+ klipper/CMakeLists.txt | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/klipper/CMakeLists.txt b/klipper/CMakeLists.txt
+index 57425da..20d88ca 100644
+--- a/klipper/CMakeLists.txt
++++ b/klipper/CMakeLists.txt
+@@ -14,16 +14,16 @@ set(libklipper_common_SRCS
+     clipcommandprocess.cpp
+ )
+ 
+-# find_package(Prison QUIET CONFIG)
+-# set_package_properties(Prison PROPERTIES DESCRIPTION "Prison library"
+-#                        URL "http://projects.kde.org/prison"
+-#                        TYPE OPTIONAL
+-#                        PURPOSE "Needed to create mobile barcodes from clipboard data"
+-#                       )
+-# if (PRISON_FOUND)
+-#     add_definitions(-DHAVE_PRISON)
+-#     include_directories(${PRISON_INCLUDE_DIR})
+-# endif ()
++find_package(Prison QUIET CONFIG)
++set_package_properties(Prison PROPERTIES DESCRIPTION "Prison library"
++                       URL "http://projects.kde.org/prison"
++                       TYPE OPTIONAL
++                       PURPOSE "Needed to create mobile barcodes from clipboard data"
++                      )
++if (PRISON_FOUND)
++     add_definitions(-DHAVE_PRISON)
++     include_directories(${PRISON_INCLUDE_DIR})
++endif ()
+ 
+ 
+ kde4_add_app_icon(libklipper_common_SRCS "${KDE4_ICON_INSTALL_DIR}/oxygen/*/apps/klipper.png")
+@@ -40,9 +40,9 @@ target_link_libraries(kdeinit_klipper Qt5::X11Extras KF5::GlobalAccel KF5::Windo
+ if (X11_Xfixes_FOUND)
+   target_link_libraries(kdeinit_klipper ${X11_Xfixes_LIB})
+ endif ()
+-# if (PRISON_FOUND)
+-#   target_link_libraries(kdeinit_klipper ${PRISON_LIBRARIES})
+-# endif ()
++if (PRISON_FOUND)
++  target_link_libraries(kdeinit_klipper ${PRISON_LIBRARIES})
++endif ()
+ 
+ install(TARGETS kdeinit_klipper ${INSTALL_TARGETS_DEFAULT_ARGS})
+ install(TARGETS klipper         ${INSTALL_TARGETS_DEFAULT_ARGS})
+-- 
+1.9.3
+

diff --git a/kde-base/plasma-workspace/metadata.xml b/kde-base/plasma-workspace/metadata.xml
index efbee28..14094dc 100644
--- a/kde-base/plasma-workspace/metadata.xml
+++ b/kde-base/plasma-workspace/metadata.xml
@@ -3,9 +3,10 @@
 <pkgmetadata>
 	<herd>kde</herd>
 	<use>
+		<flag name="json">Enable JSON support via <pkg>dev-libs/qjson</pkg></flag>
 		<flag name="kdepim">KDE PIM integration via <pkg>kde-base/kdepimlibs</pkg></flag>
 		<flag name="nepomuk">Enable Nepomuk based semantic desktop support (deprecated)</flag>
-		<flag name="json">Enable JSON support via <pkg>dev-libs/qjson</pkg></flag>
+		<flag name="prison">Enable support for barcodes/QRcodes</flag>
 		<flag name="qalculate">Enable Qalculate runner using <pkg>sci-libs/libqalculate</pkg></flag>
 	</use>
 </pkgmetadata>

diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
index db8b2ff..2bc9036 100644
--- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="KDE Plasma workspace"
 KEYWORDS=""
-IUSE="dbus X"
+IUSE="dbus prison X"
 
 COMMON_DEPEND="
 	$(add_kdebase_dep libksysguard)
@@ -59,6 +59,7 @@ COMMON_DEPEND="
 	sys-libs/zlib
 	x11-libs/libkscreen2:5
 	dbus? ( dev-libs/libdbusmenu-qt[qt5] )
+	prison? ( media-libs/prison:5 )
 	X? (
 		dev-qt/qtx11extras:5
 		x11-libs/libICE
@@ -92,9 +93,12 @@ DEPEND="${COMMON_DEPEND}
 	X? ( x11-proto/xproto )
 "
 
+PATCHES=( "${FILESDIR}/${P}-cmake-enable-prison.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
+		$(cmake-utils_use_find_package prison)
 		$(cmake-utils_use_find_package X X11)
 	)
 


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/, kde-base/plasma-workspace/
@ 2014-05-28 14:42 Johannes Huber
  0 siblings, 0 replies; 16+ messages in thread
From: Johannes Huber @ 2014-05-28 14:42 UTC (permalink / raw
  To: gentoo-commits

commit:     c956632e0b0b798755fb4a331bf1232540c627c0
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed May 28 14:42:16 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed May 28 14:42:16 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c956632e

[kde-base/plasma-workspace] Enable startup/shutdown script support

Package-Manager: portage-2.2.10

---
 kde-base/plasma-workspace/files/agent-shutdown.sh  | 13 +++++++
 kde-base/plasma-workspace/files/agent-startup.sh   | 29 ++++++++++++++++
 .../files/plasma-workspace-startkde-script.patch   | 40 ++++++++++++++++++++++
 .../plasma-workspace/plasma-workspace-9999.ebuild  | 26 ++++++++++++--
 4 files changed, 105 insertions(+), 3 deletions(-)

diff --git a/kde-base/plasma-workspace/files/agent-shutdown.sh b/kde-base/plasma-workspace/files/agent-shutdown.sh
new file mode 100644
index 0000000..fff8056
--- /dev/null
+++ b/kde-base/plasma-workspace/files/agent-shutdown.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# This file is executed at plasma shutdown.
+# Uncomment the following lines to kill the agents
+# that were started at session startup.
+
+#if [ -n "${GPG_AGENT_INFO}" ]; then
+#  kill $(echo ${GPG_AGENT_INFO} | cut -d':' -f 2) >/dev/null 2>&1
+#fi
+
+#if [ -n "${SSH_AGENT_PID}" ]; then
+#  eval "$(ssh-agent -s -k)"
+#fi

diff --git a/kde-base/plasma-workspace/files/agent-startup.sh b/kde-base/plasma-workspace/files/agent-startup.sh
new file mode 100644
index 0000000..03e017a
--- /dev/null
+++ b/kde-base/plasma-workspace/files/agent-startup.sh
@@ -0,0 +1,29 @@
+# Agents startup file
+#
+# This file is sourced at plasma startup, so that
+# the environment variables set here are available
+# throughout the session.
+
+# Uncomment the following lines to start gpg-agent
+# and/or ssh-agent at plasma startup.
+# If you do so, do not forget to uncomment the respective
+# lines in PLASMADIR/shutdown/agent-shutdown.sh to
+# properly kill the agents when the session ends.
+
+#if [ -x /usr/bin/gpg-agent ]; then
+#  eval "$(/usr/bin/gpg-agent --daemon)"
+#fi 
+
+#if [ -x /usr/bin/ssh-agent ]; then
+#  eval "$(/usr/bin/ssh-agent -s)"
+#fi
+
+# Uncomment the following lines to start rxvt-unicode which has the ability to
+# run multiple terminals in one single process, thus starting up faster and 
+# saving resources.
+# The --opendisplay ensures that the daemon quits when the X server terminates,
+# therefore we don't need matching lines in agent-shutdown.sh.
+
+#if [ -x /usr/bin/urxvtd ]; then
+#	/usr/bin/urxvtd --opendisplay --fork --quiet
+#fi

diff --git a/kde-base/plasma-workspace/files/plasma-workspace-startkde-script.patch b/kde-base/plasma-workspace/files/plasma-workspace-startkde-script.patch
new file mode 100644
index 0000000..8fb3756
--- /dev/null
+++ b/kde-base/plasma-workspace/files/plasma-workspace-startkde-script.patch
@@ -0,0 +1,40 @@
+From 6c3f73efc0619020a0c17219b1f7e1e3cd49478f Mon Sep 17 00:00:00 2001
+From: Johannes Huber <johu@gentoo.org>
+Date: Wed, 28 May 2014 16:00:41 +0200
+Subject: [PATCH] [startkde] Gentoo FHS script support
+
+---
+ startkde/startkde.cmake | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
+index f073b93..1c41364 100644
+--- a/startkde/startkde.cmake
++++ b/startkde/startkde.cmake
+@@ -206,6 +206,11 @@ for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
+   done
+ done
+ 
++# Gentoo part for FHS installs
++for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/startup/"*.sh; do
++  test -r "${file}" && . "${file}"
++done
++
+ # Set the path for Qt plugins provided by KDE
+ QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`qtpaths --plugin-dir`
+ # TODO: Do we really need this?
+@@ -411,6 +416,11 @@ for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/shutdown/,p'`; do
+   done
+ done
+ 
++# Gentoo part for FHS installs
++for file in "@GENTOO_PORTAGE_EPREFIX@/etc/plasma/shutdown/"*.sh; do
++  test -r "${file}" && . "${file}"
++done
++
+ unset KDE_FULL_SESSION
+ xprop -root -remove KDE_FULL_SESSION
+ unset KDE_SESSION_VERSION
+-- 
+1.9.3
+

diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
index 2bc9036..9aa7ed8 100644
--- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
@@ -93,7 +93,10 @@ DEPEND="${COMMON_DEPEND}
 	X? ( x11-proto/xproto )
 "
 
-PATCHES=( "${FILESDIR}/${P}-cmake-enable-prison.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-startkde-script.patch"
+	"${FILESDIR}/${P}-cmake-enable-prison.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(
@@ -108,8 +111,25 @@ src_configure() {
 src_install() {
 	kde5_src_install
 
+	# startup and shutdown scripts
+	insinto /etc/plasma/startup
+	doins "${FILESDIR}/agent-startup.sh"
+
+	insinto /etc/plasma/shutdown
+	doins "${FILESDIR}/agent-shutdown.sh"
+
 	# x11 session script
-	echo startkde > "${T}"/KDE-5
+	echo startkde > "${T}"/Plasma
 	exeinto /etc/X11/Sessions
-	doexe "${T}"/KDE-5
+	doexe "${T}"/Plasma
+}
+
+pkg_postinst () {
+	kde5_pkg_postinst
+
+	echo
+	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
+	elog "edit ${EPREFIX}/etc/plasma/startup/agent-startup.sh and"
+	elog "${EPREFIX}/etc/plasma/shutdown/agent-shutdown.sh"
+	echo
 }


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/, kde-base/plasma-workspace/
@ 2014-05-30  6:10 Johannes Huber
  0 siblings, 0 replies; 16+ messages in thread
From: Johannes Huber @ 2014-05-30  6:10 UTC (permalink / raw
  To: gentoo-commits

commit:     4989f2d3f7bfd59914ba8ef24f605e60cefe2d63
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri May 30 06:09:55 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri May 30 06:09:55 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4989f2d3

[kde-base/plasma-workspace] Drop patch, applied upstream

Package-Manager: portage-2.2.10

---
 ...plasma-workspace-9999-cmake-enable-prison.patch | 73 ----------------------
 .../plasma-workspace/plasma-workspace-9999.ebuild  |  5 +-
 2 files changed, 1 insertion(+), 77 deletions(-)

diff --git a/kde-base/plasma-workspace/files/plasma-workspace-9999-cmake-enable-prison.patch b/kde-base/plasma-workspace/files/plasma-workspace-9999-cmake-enable-prison.patch
deleted file mode 100644
index 23d6e6f..0000000
--- a/kde-base/plasma-workspace/files/plasma-workspace-9999-cmake-enable-prison.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff --git a/klipper/CMakeLists.txt b/klipper/CMakeLists.txt
-index 7a57b30b8b59a77c3d0702095dd72bb275d22e57..a46ac2def2faed4b0452c99cca6323da0adba348 100644
---- a/klipper/CMakeLists.txt
-+++ b/klipper/CMakeLists.txt
-@@ -16,15 +16,15 @@ set(libklipper_common_SRCS
-     clipcommandprocess.cpp
- )
- 
--# find_package(Prison QUIET CONFIG)
--# set_package_properties(Prison PROPERTIES DESCRIPTION "Prison library"
--#                        URL "http://projects.kde.org/prison"
--#                        TYPE OPTIONAL
--#                        PURPOSE "Needed to create mobile barcodes from clipboard data"
--#                       )
--# if (PRISON_FOUND)
--#     include_directories(${PRISON_INCLUDE_DIR})
--# endif ()
-+find_package(Prison "1.2.0" QUIET CONFIG)
-+set_package_properties(Prison PROPERTIES DESCRIPTION "Prison library"
-+                       URL "http://projects.kde.org/prison"
-+                       TYPE OPTIONAL
-+                       PURPOSE "Needed to create mobile barcodes from clipboard data"
-+                      )
-+if (PRISON_FOUND)
-+    include_directories(${PRISON_INCLUDE_DIR})
-+endif ()
- 
- set(HAVE_PRISON ${PRISON_FOUND})
- configure_file(config-klipper.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-klipper.h )
-@@ -52,9 +52,9 @@ target_link_libraries(kdeinit_klipper
- if (X11_Xfixes_FOUND)
-   target_link_libraries(kdeinit_klipper ${X11_Xfixes_LIB})
- endif ()
--# if (PRISON_FOUND)
--#   target_link_libraries(kdeinit_klipper ${PRISON_LIBRARIES})
--# endif ()
-+if (PRISON_FOUND)
-+  target_link_libraries(kdeinit_klipper ${PRISON_LIBRARIES})
-+endif ()
- 
- install(TARGETS kdeinit_klipper ${INSTALL_TARGETS_DEFAULT_ARGS})
- install(TARGETS klipper         ${INSTALL_TARGETS_DEFAULT_ARGS})
-diff --git a/klipper/klipper.cpp b/klipper/klipper.cpp
-index 1ce578afb078b3b4e791e780975802082559bdf4..8847af324ff0c0c8e07d7e69ca473945cf001772 100644
---- a/klipper/klipper.cpp
-+++ b/klipper/klipper.cpp
-@@ -887,10 +887,12 @@ void Klipper::slotShowBarcode()
-     using namespace prison;
-     const HistoryStringItem* item = dynamic_cast<const HistoryStringItem*>(m_history->first());
- 
--    KDialog dlg;
-+    QDialog dlg;
-     dlg.setModal( true );
--    dlg.setCaption( i18n("Mobile Barcode") );
--    dlg.setButtons( KDialog::Ok );
-+    dlg.setWindowTitle( i18n("Mobile Barcode") );
-+    QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Ok, &dlg);
-+    buttons->button(QDialogButtonBox::Ok)->setShortcut(Qt::CTRL | Qt::Key_Return);
-+    connect(buttons, &QDialogButtonBox::accepted, &dlg, &QDialog::accept);
- 
-     QWidget* mw = new QWidget(&dlg);
-     QHBoxLayout* layout = new QHBoxLayout(mw);
-@@ -907,7 +909,9 @@ void Klipper::slotShowBarcode()
-     layout->addWidget(datamatrix);
- 
-     mw->setFocus();
--    dlg.setMainWidget( mw );
-+    QVBoxLayout *vBox = new QVBoxLayout(&dlg);
-+    vBox->addWidget(mw);
-+    vBox->addWidget(buttons);
-     dlg.adjustSize();
- 
-     dlg.exec();

diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
index 9aa7ed8..cdd940c 100644
--- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
@@ -93,10 +93,7 @@ DEPEND="${COMMON_DEPEND}
 	X? ( x11-proto/xproto )
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-startkde-script.patch"
-	"${FILESDIR}/${P}-cmake-enable-prison.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-startkde-script.patch" )
 
 src_configure() {
 	local mycmakeargs=(


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/, kde-base/plasma-workspace/
@ 2014-09-19 17:38 Johannes Huber
  0 siblings, 0 replies; 16+ messages in thread
From: Johannes Huber @ 2014-09-19 17:38 UTC (permalink / raw
  To: gentoo-commits

commit:     5c72708dd5c2fc20fef298c050a54866ccb7523a
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 19 17:38:01 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Sep 19 17:38:20 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5c72708d

[kde-base/plasma-workspace] Add upstream patch, fixes build with Qt 5.4

Spotted by Franz Fellner <alpine.art.de <AT> gmail.com>, bug #523220.

Package-Manager: portage-2.2.13

---
 .../files/plasma-workspace-5.0.2-qt54.patch        | 82 ++++++++++++++++++++++
 .../plasma-workspace/plasma-workspace-5.0.2.ebuild |  5 +-
 2 files changed, 86 insertions(+), 1 deletion(-)

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
new file mode 100644
index 0000000..17d016e
--- /dev/null
+++ b/kde-base/plasma-workspace/files/plasma-workspace-5.0.2-qt54.patch
@@ -0,0 +1,82 @@
+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/plasma-workspace/plasma-workspace-5.0.2.ebuild b/kde-base/plasma-workspace/plasma-workspace-5.0.2.ebuild
index 0044ebd..507fea3 100644
--- a/kde-base/plasma-workspace/plasma-workspace-5.0.2.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-5.0.2.ebuild
@@ -99,7 +99,10 @@ DEPEND="${COMMON_DEPEND}
 	X? ( x11-proto/xproto )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-startkde-script.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-startkde-script.patch"
+	"${FILESDIR}/${P}-qt54.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(


^ permalink raw reply related	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2014-09-19 17:38 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-30  6:10 [gentoo-commits] proj/kde:master commit in: kde-base/plasma-workspace/files/, kde-base/plasma-workspace/ Johannes Huber
  -- strict thread matches above, loose matches on Subject: below --
2014-09-19 17:38 Johannes Huber
2014-05-28 14:42 Johannes Huber
2014-05-25 15:49 Johannes Huber
2014-05-24 22:48 Johannes Huber
2014-04-24 22:45 Johannes Huber
2014-04-09 15:26 Johannes Huber
2013-03-28 21:19 Andreas Hüttel
2013-02-13 10:38 Michael Palimaka
2013-02-07 22:19 Andreas Hüttel
2012-04-23 11:45 Michael Palimaka
2011-05-28 22:09 Andreas Hüttel
2011-05-21 20:33 Andreas K. Huettel
2011-04-06 22:31 Theo Chatzimichos
2011-04-02 12:06 Andreas K. Huettel
2011-02-04 13:38 tampakrap

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox