[kde-base/kdelibs,plasma-workspace] Fix trunk compilation (libnepomukquery moved to kdelibs)

6 files changed, 6 insertions, 239 deletions

diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 763ba594c3b..e13fb194435 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX dist/01_gentoo_set_xdg_menu_prefix.patch 606 RMD160 37290ce06adf1cf43b0006c02804d7fe762ed609 SHA1 8e86e06a70438c12085a595fd66e2354141fb056 SHA256 9c64b093340d7d25ce6c28d298cd62f3f4da141b762c663df9cd9b5b7722f7d3
 AUX dist/02_gentoo_append_xdg_config_dirs.patch 919 RMD160 1406b23f317710bf039aa6020f55781b6f2c2f6a SHA1 cc589b31277e5bb6322df0240389fa8423d8d942 SHA256 e0be8da02ea48eb6ad4dcb0d723bf2a619cc7ed57dd41f456018116fb05162f6
 AUX dist/23_solid_no_double_build.patch 838 RMD160 24bea0cd76edd2709edcdc654b74ebf1566e7ef7 SHA1 534aef07069b9b89ff3ff80619eb35f0fd588b61 SHA256 1ef6f6e7fe4b31b79126fd0cefaadab03f0e6a4bd9194fc8f4bee4750620c4ad
@@ -8,12 +5,5 @@ AUX kdelibs-4.3.74-glibc2.11.patch 2840 RMD160 65259da16778fa6e186f1ccdad395260a
 DIST kdelibs-4.3.74.tar.xz 10751380 RMD160 f6b23ac72d0fddb246e22aff6a936eb4e24e9a1c SHA1 ef23eb3e75ed8632f57238fb3f1f96959a373828 SHA256 6a83d88f182f495fb698ad465c4d4c12ede1f8190d2efb9fae753c48fdffc0a3
 EBUILD kdelibs-4.3.74.ebuild 6208 RMD160 644894db7c4cfa1e805c97ff84a68cc2d97399cf SHA1 e39759481fc526482279647dbc993ccee1c244a4 SHA256 4385ef29613e98ace01c09c179f68c6f553ab56d6dcf5afa10cb9150a507e50b
 EBUILD kdelibs-4.3.9999.ebuild 6155 RMD160 286c3cec8a85f55b46ed6bf41a85093d9a0fc066 SHA1 d788c0ddfbb7628e25a6fb910b7dcf72c8a5376d SHA256 a226bae54e5ec3f0e4010efc8fcb534ef8b2374c8e2ee09d0a64590bb0e7f714
-EBUILD kdelibs-9999.ebuild 6130 RMD160 0853e037a29a12c5b88d87ceda508365ce42c8bc SHA1 ed94a5286221a762ebd661ca2070d60a917669c6 SHA256 5aaa74a95587621fb4147bdc7c194931281c8983f96ad6dc68f5bb98bfd33b13
+EBUILD kdelibs-9999.ebuild 6252 RMD160 46c97670621f61608ab1889ee90cb37bfda9e036 SHA1 9af0b2ad03994ef0251a35a1225aaa47c935c82d SHA256 2b06e46cacfb2a2140e0c9140adc7a682b2472453004166457556b7a6d1ddbfe
 MISC metadata.xml 310 RMD160 29952f07b1829170319534936d11d39f1f7896bb SHA1 90ad5d77993322d4c25338f4005aaa4b642961c3 SHA256 1ce0cd7403862637e6e913bee33bf9f54a176bd1466d168be748e997a663095a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
-
-iEYEARECAAYFAkr1M5QACgkQ5BmOA85PVLhOLwCdHu7MbH67MBvR0oHgQntSROgU
-eUYAoJEAE3MjMN22aY8LDzJSX+Nf0G5D
-=GLTj
------END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild
index ce4271a359e..ba39cc6749b 100644
--- a/kde-base/kdelibs/kdelibs-9999.ebuild
+++ b/kde-base/kdelibs/kdelibs-9999.ebuild
@@ -61,7 +61,7 @@ COMMONDEPEND="
 		media-libs/ilmbase
 	)
 	policykit? ( sys-auth/policykit-qt )
-	semantic-desktop? ( >=dev-libs/soprano-2.3.0[dbus] )
+	semantic-desktop? ( >=dev-libs/soprano-2.3.67[dbus] )
 	spell? (
 		app-dicts/aspell-en
 		app-text/aspell
@@ -108,6 +108,8 @@ add_blocker libplasma
 add_blocker kdebase 0 3.5.9-r4:3.5
 add_blocker kdebase-startkde 0 3.5.10:3.5
 add_blocker kdelibs 0 '<3.5.10:3.5'
+# libnepomukquery moved to kdelibs from plasma-workspace between 4.3.74 -> 4.3.75
+add_blocker plasma-workspace '<4.3.75'
 
 PATCHES=(
 	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix.patch"
diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest
index bd13b28f18f..96c2f382bf8 100644
--- a/kde-base/plasma-workspace/Manifest
+++ b/kde-base/plasma-workspace/Manifest
@@ -1,6 +1,5 @@
-AUX plasma-workspace-fake-panel-transparency.patch 7861 RMD160 01c2e93ff164bdc2a4db17eedf0649c60dc327ee SHA1 943c49b2b49eac015acb3e29e0789abdb1cd3b0e SHA256 522b268f35f2416fe453eaac03e6865e9dfd0f7643cb0af8c2c9f42aa014ab24
 DIST kdebase-workspace-4.3.74.tar.xz 60932980 RMD160 f9ef7643b8dd68a701df0ea202610f73096f9d0a SHA1 f615766bd6bc95ee7693e86a7ffe0013a8dcb316 SHA256 7a5ada921e9d1a5a0c5f16299ab6e7fc6367c9d9bec66e1d01dec524abcef82b
 EBUILD plasma-workspace-4.3.74.ebuild 2597 RMD160 4f0dd58ef3637343ae2f4113a310df2f749ac999 SHA1 a6b7b50f1265d35e5c0d7a1e6c7f6816344d9e9b SHA256 a15d42afb4e22e04f11fdcaa4808a8197b7554f576077c3a2cb3178ca01a5ede
 EBUILD plasma-workspace-4.3.9999.ebuild 2448 RMD160 551d89b1a845e35339f5e633be1502641eb6379d SHA1 f65134299449e82e8e4a6c975ed4a2932af87c8a SHA256 0afee652dd66616165c1c8580a8691bd3597d18987814d758defea636f8c294b
-EBUILD plasma-workspace-9999.ebuild 2555 RMD160 79186e1739e08d39ea5cbbb1202856b0208c029b SHA1 98eaf8f2a69fb5be72bba372836e672658f13761 SHA256 3fca4248473f8bbfa6f60bda1a410a31dab37a7f26648c4c522641999b83551f
-MISC metadata.xml 449 RMD160 19c2bcb28e42f2d6c4956bc6613a78b40bdcf6e9 SHA1 ecc16308b948cdfe376f9f1866a17e39a67d95f9 SHA256 bd0a9f51be1c790d4d8bf022490432bc7649fc6233e21aad7874021361a0fcf7
+EBUILD plasma-workspace-9999.ebuild 2497 RMD160 ab3bb41b9078e1f522c0a77b2022d86223ce717f SHA1 5da0cf1e876a454e4497d6c6321219afae24d654 SHA256 7028d20038b04705413241ba16827073152148ad6afd6ccb184c9bf6e15275a4
+MISC metadata.xml 332 RMD160 ca0d953faef7f42984b0853648b9524c304c7c46 SHA1 e79c7f7b292068daf0a6d5db386ff58fc4f9d6cd SHA256 55cde5f777627192cf9ae1935355902d496a45070fffe5a5ba2abd41168b4ce8
diff --git a/kde-base/plasma-workspace/files/plasma-workspace-fake-panel-transparency.patch b/kde-base/plasma-workspace/files/plasma-workspace-fake-panel-transparency.patch
deleted file mode 100644
index fe2e42b66a9..00000000000
--- a/kde-base/plasma-workspace/files/plasma-workspace-fake-panel-transparency.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-Index: plasma/containments/panel/panel.h
-===================================================================
---- plasma/containments/panel/panel.h	(Revision 940781)
-+++ plasma/containments/panel/panel.h	(Arbeitskopie)
-@@ -54,6 +54,9 @@
- protected:
-     void saveState(KConfigGroup &config) const;
-
-+  public slots:
-+    void setBlendInterface(bool);
-+
- private slots:
-     void themeUpdated();
-     void backgroundChanged();
-@@ -83,6 +86,7 @@
-     bool m_maskDirty;
-     int m_spacerIndex;
-     Spacer *m_spacer;
-+    bool m_blendInterface;
-
-     friend class Spacer;
- };
-Index: plasma/containments/panel/panel.cpp
-===================================================================
---- plasma/containments/panel/panel.cpp	(Revision 940781)
-+++ plasma/containments/panel/panel.cpp	(Arbeitskopie)
-@@ -93,7 +93,8 @@
-       m_currentSize(QSize(Kephal::ScreenUtils::screenSize(screen()).width(), 35)),
-       m_maskDirty(true),
-       m_spacerIndex(-1),
--      m_spacer(0)
-+      m_spacer(0),
-+      m_blendInterface(false)
- {
-     m_background = new Plasma::FrameSvg(this);
-     m_background->setImagePath("widgets/panel-background");
-@@ -495,6 +496,10 @@
-     }
- }
-
-+void Panel::setBlendInterface(bool blend) {
-+    m_blendInterface = blend;
-+}
-+
- void Panel::saveState(KConfigGroup &config) const
- {
-     config.writeEntry("minimumSize", minimumSize());
-@@ -564,8 +569,8 @@
-         }
-     }
-
--    // blit the background (saves all the per-pixel-products that blending does)
--    painter->setCompositionMode(QPainter::CompositionMode_Source);
-+    // blit the background (saves all per-pixel-products that blending does)
-+    painter->setCompositionMode(m_blendInterface ? QPainter::CompositionMode_SourceOver : QPainter::CompositionMode_Source);
-     painter->setRenderHint(QPainter::Antialiasing);
-
-     m_background->paintFrame(painter, option->exposedRect);
-Index: plasma/shells/desktop/desktopview.h
-===================================================================
---- plasma/shells/desktop/desktopview.h	(Revision 940781)
-+++ plasma/shells/desktop/desktopview.h	(Arbeitskopie)
-@@ -82,6 +82,7 @@
-     void setContainment(Plasma::Containment *containment);
-
- protected:
-+    void paintEvent(QPaintEvent* event);
-     void wheelEvent(QWheelEvent *event);
-     void drawBackground(QPainter *painter, const QRectF &rect);
-
-Index: plasma/shells/desktop/desktopview.cpp
-===================================================================
---- plasma/shells/desktop/desktopview.cpp	(Revision 940781)
-+++ plasma/shells/desktop/desktopview.cpp	(Arbeitskopie)
-@@ -42,6 +42,7 @@
- #include "dashboardview.h"
- #include "plasmaapp.h"
- #include "plasma-shell-desktop.h"
-+#include "panelview.h"
-
- #ifdef Q_WS_WIN
- #include "windows.h"
-@@ -263,6 +264,15 @@
-     }
- }
-
-+void DesktopView::paintEvent(QPaintEvent* event) {
-+    foreach(PanelView* view, PlasmaApp::self()->panelViews()) {
-+        QRect intersection = view->geometry() & QRect(mapToGlobal(event->rect().topLeft()), mapToGlobal(event->rect().bottomRight()));
-+        if(!intersection.isEmpty())
-+            view->undergroundChanged(QRect(view->mapFromGlobal(intersection.topLeft()), view->mapFromGlobal(intersection.bottomRight())));
-+    }
-+    QGraphicsView::paintEvent(event);
-+}
-+
- void DesktopView::wheelEvent(QWheelEvent* event)
- {
-     QGraphicsItem * item = scene() ? scene()->itemAt(sceneRect().topLeft() + event->pos()) : 0;
-Index: plasma/shells/desktop/panelview.h
-===================================================================
---- plasma/shells/desktop/panelview.h	(Revision 940781)
-+++ plasma/shells/desktop/panelview.h	(Arbeitskopie)
-@@ -177,6 +177,11 @@
-      */
-     void recreateUnhideTrigger();
-
-+    /**
-+     * Notification that the undergound of this panel-view has changed
-+     */
-+    void undergroundChanged(QRect area);
-+
- protected Q_SLOTS:
-     void updateStruts();
-
-Index: plasma/shells/desktop/panelview.cpp
-===================================================================
---- plasma/shells/desktop/panelview.cpp	(Revision 940781)
-+++ plasma/shells/desktop/panelview.cpp	(Arbeitskopie)
-@@ -44,6 +44,7 @@
- #include "plasmaapp.h"
-
- #include <kephal/screens.h>
-+#include "desktopview.h"
-
- class GlowBar : public QWidget
- {
-@@ -1197,13 +1198,43 @@
-     Plasma::View::leaveEvent(event);
- }
-
--void PanelView::drawBackground(QPainter *painter, const QRectF &rect)
--{
--    if (PlasmaApp::hasComposite()) {
--        painter->setCompositionMode(QPainter::CompositionMode_Source);
--        painter->fillRect(rect.toAlignedRect(), Qt::transparent);
--    } else {
--        Plasma::View::drawBackground(painter, rect);
-+bool useDesktopTransparency = true;
-+
-+void PanelView::undergroundChanged(QRect area) {
-+    if(!PlasmaApp::hasComposite() && useDesktopTransparency)
-+        update(area);
-+}
-+
-+void PanelView::drawBackground(QPainter *painter, const QRectF &_rect)
-+{
-+      QRectF rect(_rect);
-+      DesktopView* desktopView = PlasmaApp::self()->viewForPanel(this);
-+      if(containment())
-+          QMetaObject::invokeMethod(containment(), "setBlendInterface", Q_ARG(bool, false));
-+
-+      if (PlasmaApp::hasComposite()) {
-+          painter->setCompositionMode(QPainter::CompositionMode_Source);
-+          painter->fillRect(rect.toAlignedRect(), Qt::transparent);
-+      } else if(desktopView && useDesktopTransparency) {
-+          painter->setCompositionMode(QPainter::CompositionMode_Source);
-+
-+          //Map 'rect' from the panel into the desktop view
-+          QRectF desktopRect = mapFromScene(rect).boundingRect();
-+          desktopRect.translate(pos().x(), pos().y());
-+          desktopRect.translate(-desktopView->pos().x(), -desktopView->pos().y());
-+          QRect grab = desktopRect.toRect();
-+          grab &= QRect(QPoint(0, 0), desktopView->size()); //Sometimes the scene-mapping maps one pixel too far outside, so restrict the area
-+
-+          useDesktopTransparency = false; //Disable desktop transparency temporarily to prevent endless updating from within undergoundChanged
-+          QPixmap grabbed = QPixmap::grabWidget(desktopView, grab);
-+          useDesktopTransparency = true;
-+
-+          painter->drawPixmap(rect, grabbed, QRectF(0, 0, grab.width(), grab.height()));
-+
-+      if(containment()) //Tell the panel to blend the interface over the background, so it isn't discarded
-+          QMetaObject::invokeMethod(containment(), "setBlendInterface", Q_ARG(bool, true));
-+      }else{
-+          Plasma::View::drawBackground(painter, rect);
-     }
- }
-
-Index: plasma/shells/desktop/plasmaapp.h
-===================================================================
---- plasma/shells/desktop/plasmaapp.h	(Revision 940781)
-+++ plasma/shells/desktop/plasmaapp.h	(Arbeitskopie)
-@@ -80,6 +80,11 @@
-      */
-     QList<PanelView*> panelViews() const;
-
-+    /**
-+     * Returns the currently active desktop that this panel is visible on, or zero
-+     */
-+    DesktopView* viewForPanel(PanelView* panel) const;
-+
-     static bool isPanelContainment(Plasma::Containment *containment);
-
- #ifdef Q_WS_X11
-Index: plasma/shells/desktop/plasmaapp.cpp
-===================================================================
---- plasma/shells/desktop/plasmaapp.cpp	(Revision 940781)
-+++ plasma/shells/desktop/plasmaapp.cpp	(Arbeitskopie)
-@@ -446,6 +446,21 @@
-     }
- }
-
-+DesktopView* PlasmaApp::viewForPanel(PanelView* panel) const {
-+
-+    int currentDesktop = -1;
-+    if (AppSettings::perVirtualDesktopViews())
-+        currentDesktop = KWindowSystem::currentDesktop()-1;
-+
-+
-+    foreach (DesktopView *view, m_desktops)
-+        if((view->desktop() == currentDesktop || currentDesktop == -1) && !(view->geometry() & panel->geometry()).isEmpty())
-+            if(!view->isHidden())
-+                return view;
-+
-+    return 0;
-+}
-+
- DesktopView* PlasmaApp::viewForScreen(int screen, int desktop) const
- {
-     foreach (DesktopView *view, m_desktops) {
diff --git a/kde-base/plasma-workspace/metadata.xml b/kde-base/plasma-workspace/metadata.xml
index 0f5d3abb77e..f24d0d98fb9 100644
--- a/kde-base/plasma-workspace/metadata.xml
+++ b/kde-base/plasma-workspace/metadata.xml
@@ -5,6 +5,5 @@
 <use>
 	<flag name="google-gadgets">Add google-gadgets support</flag>
 	<flag name="rss">Enables building RSSNOW plasmoid (requires <pkg>kde-base/kdepimlibs</pkg>)</flag>
-	<flag name="xcomposite">Disable this flag to enable experimental fake transparency support for plasma panel.</flag>
 </use>
 </pkgmetadata>
diff --git a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
index 90b12293e6c..baae6a1da7d 100644
--- a/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-9999.ebuild
@@ -47,10 +47,6 @@ RDEPEND="${COMMONDEPEND}
 	$(add_kdebase_dep soliduiserver)
 "
 
-KMEXTRA="
-	libs/nepomukquery/
-	libs/nepomukqueryclient/
-"
 KMEXTRACTONLY="
 	krunner/dbus/org.freedesktop.ScreenSaver.xml
 	krunner/dbus/org.kde.krunner.App.xml