[kde-base] Remove usused patches

13 files changed, 0 insertions, 619 deletions

diff --git a/kde-base/kalzium/Manifest b/kde-base/kalzium/Manifest
index 95a688a4829..0101b702794 100644
--- a/kde-base/kalzium/Manifest
+++ b/kde-base/kalzium/Manifest
@@ -1,4 +1,3 @@
-AUX kalzium-include-order.patch 869 RMD160 a5c0529a625d2a7754b8ca2d15d682647480f157 SHA1 844538eed8d246734faed9f788ef1d516a29caad SHA256 f07de6f154bdbe6e6bff8cd2fce22cb8dc702ed255edbe549eba263281df57c6
 DIST kdeedu-4.2.91.tar.lzma 53464552 RMD160 8a4846bd52074bf1508a54ae54749b03fe99b240 SHA1 f0b06516818e44b3639a9334f1b49e858c703525 SHA256 1012ddbe465531f91bb0cffcb3cd183470168c8d3c4441555675cdb2c1afb651
 DIST kdeedu-4.2.95.tar.bz2 58100801 RMD160 b7f0002d7d737c5eb87ca880892bab3901a84f41 SHA1 e6fa008023bb536cf727023d878774b2b424cde2 SHA256 1f737bc3ef3b9768e4d3ae03656ae547453d0d6295eb318e110752e775534f0f
 EBUILD kalzium-4.2.91.ebuild 949 RMD160 c5fac96659f79d04373035d82158abb121fcebbd SHA1 158b537062d71790380e613dee86e34ed5898bab SHA256 2b8a314e26b390aaaaf702aa259edb78a2759e84a2696e7ff0d15ca872177f39
diff --git a/kde-base/kalzium/files/kalzium-include-order.patch b/kde-base/kalzium/files/kalzium-include-order.patch
deleted file mode 100644
index 1faffa2e381..00000000000
--- a/kde-base/kalzium/files/kalzium-include-order.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- kalzium-4.2.1/work/kalzium-4.2.1/kalzium/libavogadro-kalzium/src/CMakeLists.txt	2009-02-26 09:17:16.000000000 -0500
-+++ /root/CMakeLists.txt	2009-03-11 18:19:48.000000000 -0400
-@@ -15,10 +15,12 @@
-   ${CMAKE_CURRENT_BINARY_DIR}/config.h
- )
- 
--include(${QT_USE_FILE})
-+# Ensure the Avogadro include directory is always first
-+get_directory_property(tmp_include_dirs INCLUDE_DIRECTORIES)
-+set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES
-+	"${libavogadro-kalzium_SOURCE_DIR}/include;${tmp_include_dirs}")
- 
- include_directories(
--  ${libavogadro-kalzium_SOURCE_DIR}/include
-   ${CMAKE_SOURCE_DIR}
-   ${CMAKE_CURRENT_BINARY_DIR}
-   ${CMAKE_CURRENT_BINARY_DIR}/..
-@@ -26,6 +28,8 @@
-   ${EIGEN_INCLUDE_DIR}
- )
- 
-+include(${QT_USE_FILE})
-+
- # Need to build with visibility enabled if KDE is
- if(__KDE_HAVE_GCC_VISIBILITY)
-   add_definitions(-DHAVE_GCC_VISIBILITY)
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index bf618dfc57e..a7c1d46ee20 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,8 +1,6 @@
-AUX dist/09_disable_debug_messages_if_not_explicitly_enabled.patch 1840 RMD160 097372c9264497b1aabb8b21e8b9959c24cca2f1 SHA1 f19dd9bbf3ed0868442a970a4c588640922c6cbc SHA256 92b8a8c8f46f06a0bfd93babb52f6d87c7b3f5dc6478b4f5d8e8c56c9e4e5bce
 AUX dist/20_use_dejavu_as_default_font.patch 1543 RMD160 805f4c6e685b8b6598acb1c69b5f6d41fa6ce010 SHA1 09eeafca53dd1c4b9347fd9d295949d37022e2f5 SHA256 9a6b141d5eb5fd73700086fef591074674563a2e5b374d3af4c6cea52726fc03
 AUX dist/23_solid_no_double_build.patch 838 RMD160 24bea0cd76edd2709edcdc654b74ebf1566e7ef7 SHA1 534aef07069b9b89ff3ff80619eb35f0fd588b61 SHA256 1ef6f6e7fe4b31b79126fd0cefaadab03f0e6a4bd9194fc8f4bee4750620c4ad
 AUX dist/create_exe_symlink.cmake-sandbox-violation.patch 594 RMD160 fe8d9557e82bbf9d5df16d8f69f7addae1012bf8 SHA1 e99f1e647a8546d86fac79125ee80c549aa44ab9 SHA256 7997f74901718bea0dca35b0d0936004e47365db5aaf7efe87db80f69761e314
-AUX kdelibs-4.2-fixx11h.h.patch 460 RMD160 153e677156f30d2b308c5344b12989be466e9d2c SHA1 da868fc661ce8ec514d70533b7fe6232151eb653 SHA256 307c78bb8a0056b6773380d55429458df9fd2516608077e9437fb1c0592aa7f5
 DIST kdelibs-4.2.91.tar.lzma 8887884 RMD160 c12636567a179747d51de25f68992aeee7bfb4f1 SHA1 9d178a4b831771d9d80bf9328e7643b10f748db3 SHA256 f5d74128ef64d69500b6d723e9f48d26cde9c0796e91585d877251ee5f4bb3d7
 DIST kdelibs-4.2.95.tar.bz2 10501910 RMD160 4af90d7961b52d99147473a1d7dce4d74f3a3a2b SHA1 b192709dc94af6a3575ade53296d45d15cb8cfec SHA256 2cb9c05244f4fc1ddf1f94d8c2c907495dfced5cb6ceb5ad96a33807587df839
 EBUILD kdelibs-4.2.91.ebuild 5845 RMD160 843bd5fcb3f0edf110b306a1d8c06ef61405e71a SHA1 c2c432822ef60de48e4dc48a7799a93c5a410b5a SHA256 751ad680c2a1a4d14f97b39eabd9ab4921c0d6ef4952314cee465da08da27ece
diff --git a/kde-base/kdelibs/files/dist/09_disable_debug_messages_if_not_explicitly_enabled.patch b/kde-base/kdelibs/files/dist/09_disable_debug_messages_if_not_explicitly_enabled.patch
deleted file mode 100644
index 171cb1849c9..00000000000
--- a/kde-base/kdelibs/files/dist/09_disable_debug_messages_if_not_explicitly_enabled.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-
-We build with debugging symbols enabled, that's why we get a lot of debugging
-messages on the konsole. This patch disables these messages. Kdebugdialog
-can be used to enable them. 
-See also 04_disable_debug_by_default.diff in kdebase-runtime.
-
-In KDE 4.3 trunk this has been committed as r916186.
---- a/kdecore/kdebugrc
-+++ b/kdecore/kdebugrc
-@@ -82,7 +82,7 @@ InfoOutput=4
- 
- # KMail
- [5006]
--InfoOutput=2
-+InfoOutput=4
- 
- # KitchenSync (Syncing Algorithm)
- [5250]
---- a/kdecore/io/kdebug.cpp
-+++ b/kdecore/io/kdebug.cpp
-@@ -181,6 +181,11 @@ struct KDebugPrivate
-         QtOutput = 2,
-         SyslogOutput = 3,
-         NoOutput = 4,
-+#ifdef QT_NO_DEBUG
-+        DefaultOutput = NoOutput,
-+#else
-+        DefaultOutput = QtOutput,
-+#endif
-         Unknown = 5
-     };
- 
-@@ -313,7 +318,7 @@ struct KDebugPrivate
-         }
- 
-         KConfigGroup cg(config, QString::number(area));
--        int mode = cg.readEntry(key, 2);
-+        int mode = cg.readEntry(key, int(DefaultOutput));
-         return OutputMode(mode);
-     }
- 
---- a/kdecore/io/kdebug.h
-+++ b/kdecore/io/kdebug.h
-@@ -31,12 +31,13 @@
-  *  @{
-  * KDE debug message streams let you and the user control just how many debug
-  * messages you see. Debug message printing is controlled by (un)defining
-- * QT_NO_DEBUG when compiling your source. If QT_NO_DEBUG is defined then no debug
-- * messages are printed.
-+ * QT_NO_DEBUG when compiling your source. If QT_NO_DEBUG is defined then debug
-+ * messages are not printed by default but can still be enabled by runtime
-+ * configuration, e.g. via kdebugdialog or by editing kdebugrc.
-  */
- 
- #if !defined(KDE_NO_DEBUG_OUTPUT)
--# if defined(QT_NO_DEBUG) || defined(QT_NO_DEBUG_OUTPUT) || defined(QT_NO_DEBUG_STREAM)
-+# if defined(QT_NO_DEBUG_OUTPUT) || defined(QT_NO_DEBUG_STREAM)
- #  define KDE_NO_DEBUG_OUTPUT
- # endif
- #endif
-
diff --git a/kde-base/kdelibs/files/kdelibs-4.2-fixx11h.h.patch b/kde-base/kdelibs/files/kdelibs-4.2-fixx11h.h.patch
deleted file mode 100644
index 0263856e5a4..00000000000
--- a/kde-base/kdelibs/files/kdelibs-4.2-fixx11h.h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kdeui/util/fixx11h.h	2009/03/04 21:28:02	935354
-+++ kdeui/util/fixx11h.h	2009/03/27 14:43:00	945494
-@@ -89,11 +89,16 @@
- #ifdef Bool
- #ifndef FIXX11H_Bool
- #define FIXX11H_Bool
--typedef Bool XBool;
--#undef Bool
--typedef XBool Bool;
-+#ifdef _XTYPEDEF_BOOL /* Xdefs.h has typedef'ed Bool already */
-+ #undef Bool
-+#else
-+ typedef Bool XBool;
-+ #undef Bool
-+ typedef XBool Bool;
-+#endif
- #endif
- #undef Bool
-+#define _XTYPEDEF_BOOL
- #endif
- // template <---
-
diff --git a/kde-base/kdeplasma-addons/Manifest b/kde-base/kdeplasma-addons/Manifest
index b72d5af0871..383e2c91c9f 100644
--- a/kde-base/kdeplasma-addons/Manifest
+++ b/kde-base/kdeplasma-addons/Manifest
@@ -1,4 +1,3 @@
-AUX lancelot-qt45.patch 8420 RMD160 cd81bd189b9d6586d4ba5f999fb49fe2dcd377a1 SHA1 1acbd515b4d21e723f9d27cc3d7f51c060d21b4f SHA256 5bc08c1efce81559c28930af210cb0526903d11af0300246879b65040332e134
 DIST kdeplasma-addons-4.2.91.tar.lzma 4426810 RMD160 a58b9be2197d6670d4171f5d3020cb17e00f6004 SHA1 1952b571ca2f1d35b196a925190a1254a93894f1 SHA256 8e0defc3692aa70518eca550cb8d9008c05c686b275e9df40fd0f58fd7898222
 DIST kdeplasma-addons-4.2.95.tar.bz2 1395735 RMD160 5e78c64981aa08cb37656ddae2ae7ff87f3b5a80 SHA1 50b0c30edfeadd46a374c142d774fee3de6aec93 SHA256 65b4536375887cd75b7f8507f688a35746507d6ed787cf8060a6647d61fa37ed
 EBUILD kdeplasma-addons-4.2.91.ebuild 2042 RMD160 bd5e6dbbc669afb601e4a0fda1b9e0098ce5ca54 SHA1 58cf1a8bea6d5db0a5fcf903a95a6a9453f93cb9 SHA256 b3b68d67f00b81a9c410aeff36518623f9e191527a38e003c418317792d9db02
diff --git a/kde-base/kdeplasma-addons/files/lancelot-qt45.patch b/kde-base/kdeplasma-addons/files/lancelot-qt45.patch
deleted file mode 100644
index b1c9887d55d..00000000000
--- a/kde-base/kdeplasma-addons/files/lancelot-qt45.patch
+++ /dev/null
@@ -1,263 +0,0 @@
---- applets/lancelot/libs/lancelot/Global.cpp~	2008-12-21 20:20:19.000000000 +0000
-+++ applets/lancelot/libs/lancelot/Global.cpp	2009-02-14 20:57:06.000000000 +0000
-@@ -326,8 +326,11 @@
- 
-     d->confMain = new KConfig("lancelot" + app + "rc");
- 
-+    Plasma::Theme::defaultTheme()->setUseGlobalSettings(true);
-+    qDebug() << "What is the plasma theme: " << Plasma::Theme::defaultTheme()->themeName();
-     QString search = "desktoptheme/" + Plasma::Theme::defaultTheme()->themeName() + "/lancelot/" + app + "theme.config";
-     kDebug() << search;
-+    qDebug() << "Trying:" << search;
- 
-     QString path =  KStandardDirs::locate( "data", search );
-     if (path == "") {
-@@ -338,6 +341,8 @@
-         path = "lancelotrc";
-     }
-     kDebug() << path;
-+    
-+    qDebug() << "Using theme:" << path;
-     d->confTheme = new KConfig(path);
- 
-     Instance::Private::activeInstance = this;
---- applets/lancelot/libs/lancelot/widgets/PassagewayView.cpp~	2009-01-06 17:23:55.000000000 +0000
-+++ applets/lancelot/libs/lancelot/widgets/PassagewayView.cpp	2009-02-14 21:35:13.000000000 +0000
-@@ -20,6 +20,10 @@
- #include "PassagewayView.h"
- 
- #include <QWidget>
-+#include <QGraphicsSceneMouseEvent>
-+#include <QGraphicsView>
-+#include <QApplication>
-+#include <climits>
- 
- namespace Lancelot {
- 
-@@ -65,6 +69,8 @@
-       : layout(NULL), buttonsLayout(NULL), listsLayout(NULL), parent(p), focusIndex(0)
-     {
-         parent->setLayout(layout = new NodeLayout());
-+        layout->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));
-+        layout->setMaximumSize(INT_MAX, INT_MAX);
- 
-         layout->addItem(
-             buttonsLayout = new QGraphicsLinearLayout(Qt::Horizontal),
-@@ -72,6 +78,9 @@
-             NodeLayout::NodeCoordinate(1, 0, 0, 32)
-         );
- 
-+        buttonsLayout->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));
-+        buttonsLayout->setMaximumSize(INT_MAX, INT_MAX);
-+        
-         ExtenderButton * spacer =
-             new ExtenderButton(parent);
-         spacer->setGroupByName("PassagewayView-Spacer");
-@@ -88,6 +97,9 @@
- 
-         listsLayout->setSizer(new PassagewayViewSizer());
- 
-+        listsLayout->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));
-+        listsLayout->setMaximumSize(INT_MAX, INT_MAX);
-+
-         buttonsLayout->setSpacing(0.0);
- 
-         next(Step("", QIcon(), entranceModel));
-@@ -161,7 +173,11 @@
-             path.takeLast();
- 
-             buttonsLayout->removeItem(button);
--            layout->activate();
-+
-+            // This really shouldn't be needed :(
-+            buttonsLayout->setGeometry(buttonsLayout->geometry());
-+            
-+            
-             listsLayout->pop();
- 
-             button->deleteLater();
-@@ -196,19 +212,18 @@
-         list->setCategoriesGroupByName("ActionListView-CategoriesPass");
-         list->setCategoriesActivable(true);
- 
--        // if (lists.count() > 0) {
--        //     lists.last()->clearSelection();
--        // }
--
-         focusIndex = lists.count();
-         lists.append(list);
- 
--        // list->initialSelection();
-         path.append(step);
- 
-         buttonsLayout->addItem(button);
-         listsLayout->push(list);
- 
-+        // This really shouldn't be needed :(
-+        buttonsLayout->setGeometry(buttonsLayout->geometry());
-+        listsLayout->setGeometry(listsLayout->geometry());
-+
-         QObject::connect(
-             list, SIGNAL(activated(int)),
-             parent, SLOT(listItemActivated(int))
---- applets/lancelot/app/src/models/ContactsKopete.cpp	2009/02/14 16:58:48	926097
-+++ applets/lancelot/app/src/models/ContactsKopete.cpp	2009/02/15 10:37:30	926398
-@@ -22,7 +22,7 @@
- #include <KStandardDirs>
- #include <KDebug>
- 
--#define UPDATE_INTERVAL 30000
-+#define UPDATE_INTERVAL 15000
- #define CHECK_RUNNING_INTERVAL 5000
- 
- namespace Models {
---- applets/lancelot/libs/lancelot/layouts/CardLayout.cpp	2008/08/16 21:14:21	848082
-+++ applets/lancelot/libs/lancelot/layouts/CardLayout.cpp	2009/02/15 10:37:30	926398
-@@ -31,6 +31,35 @@
-     {
-     }
- 
-+    void _hide(QGraphicsWidget * widget) {
-+        // since Qt has some strange bug (or it
-+        // just doesn't behave as it should,
-+        // this is a temporary solution
-+        // so instead of hiding the item,
-+        // we are moving it somewhere
-+        // out of bounds
-+        // this is a very dirty hack!
-+
-+        QRectF g = widget->geometry();
-+        if (g.left() < 0) {
-+            return;
-+        }
-+        g.moveRight(- g.left());
-+        widget->setGeometry(g);
-+    }
-+
-+    void _show(QGraphicsWidget * widget) {
-+        // see the comment in _hide
-+
-+        QRectF g = widget->geometry();
-+        if (g.left() >= 0) {
-+            return;
-+        }
-+
-+        g.moveLeft(- g.right());
-+        widget->setGeometry(g);
-+    }
-+
-     void relayout()
-     {
-         QRectF g = q->geometry();
-@@ -40,9 +69,11 @@
-         }
- 
-         foreach (QGraphicsWidget * l, widgets) {
--            l->show();
-+            _show(l);
-             l->setGeometry(g);
--            if (shown != l) l->hide();
-+            if (shown != l) {
-+                _hide(l);
-+            }
-         }
-     }
- 
-@@ -107,6 +138,7 @@
-     if (widget) {
-         d->widgets[id] = widget;
-         // widget->hide(); // BUGS in QT
-+        d->_hide(widget);
-     } else {
-         d->removeItem(id);
-     }
-@@ -142,17 +174,17 @@
-     if (!d->widgets.contains(id)) return;
-     if (d->shown == d->widgets[id]) return;
-     if (d->shown) {
--        d->shown->hide();
-+        d->_hide(d->shown);
-     }
-     d->shown = d->widgets[id];
-     d->shown->setGeometry(geometry());
--    d->shown->show();
-+    d->_show(d->shown);
- }
- 
- void CardLayout::hideAll()
- {
-     if (!d->shown) return;
--    d->shown->hide();
-+    d->_hide(d->shown);
-     d->shown = NULL;
- }
- 
---- applets/lancelot/libs/lancelot/layouts/FullBorderLayout.cpp	2008/11/24 16:25:50	888490
-+++ applets/lancelot/libs/lancelot/layouts/FullBorderLayout.cpp	2009/02/15 10:37:30	926398
-@@ -41,10 +41,10 @@
-     {
-     }
- 
--    QMap< FullBorderLayout::Place, QGraphicsLayoutItem * > itemPositions;
--    QMap< FullBorderLayout::Border, qreal > sizes;
-+    QMap < FullBorderLayout::Place, QGraphicsLayoutItem * > itemPositions;
-+    QMap < FullBorderLayout::Border, qreal > sizes;
- 
--    void calculateBorderSizes(qreal & top, qreal & bottom, qreal & left, qreal & right) const
-+    void calculateBorderSizes(qreal & top, qreal & bottom, qreal & left, qreal & right) // const
-     {
-         // top
-         top = sizes[FullBorderLayout::TopBorder];
-@@ -121,7 +121,8 @@
- void FullBorderLayout::setGeometry(const QRectF & rect)
- {
-     QGraphicsLayout::setGeometry(rect);
--    kDebug() << rect;
-+    // WHATA HELL!?
-+    qDebug() << "FullBorderLayout::setGeometry()";
- 
-     QRectF effectiveRect = geometry();
-     qreal left = 0, top = 0, right = 0, bottom = 0;
-@@ -158,7 +159,6 @@
-     itemRect.setHeight(effectiveRect.height() - topBorder - bottomBorder);
- 
-     if (d->itemPositions[Right]) {
--        kDebug() << "right" << itemRect;
-         d->itemPositions[Right]->setGeometry(itemRect);
-     }
- 
-@@ -197,7 +197,6 @@
-             );
- 
-     if (d->itemPositions[Center]) {
--        kDebug() << "center" << itemRect;
-         d->itemPositions[Center]->setGeometry(itemRect);
-     }
- }
---- applets/lancelot/libs/lancelot/widgets/CustomListView.cpp	2009/02/08 10:49:35	923110
-+++ applets/lancelot/libs/lancelot/widgets/CustomListView.cpp	2009/02/15 10:37:30	926398
-@@ -163,9 +163,9 @@
-             QGraphicsWidget * item = itemForIndex(i);
-             QRectF itemGeometry = item->geometry();
-             if (viewport.intersects(itemGeometry)) {
--                if (q->isVisible()) {
-+                //if (q->isVisible()) {
-                     item->show();
--                }
-+                //}
-                 transform.reset();
-                 if (!viewport.contains(itemGeometry)) {
-                     QRectF clip = viewport.intersect(itemGeometry);
---- applets/lancelot/libs/lancelot/widgets/ScrollPane.cpp	2009/01/18 18:26:08	913061
-+++ applets/lancelot/libs/lancelot/widgets/ScrollPane.cpp	2009/02/15 10:37:30	926398
-@@ -229,8 +229,10 @@
- 
- void ScrollPane::setGeometry(const QRectF & rect) //>
- {
-+    QRectF old_geometry = geometry();
-     Widget::setGeometry(rect);
- 
-+    if (rect == old_geometry) return ;
-     scrollableWidgetSizeUpdateNeeded();
- } //<
- 
diff --git a/kde-base/knetworkconf/Manifest b/kde-base/knetworkconf/Manifest
index 98d4ef6042e..5e9a51e905f 100644
--- a/kde-base/knetworkconf/Manifest
+++ b/kde-base/knetworkconf/Manifest
@@ -1,4 +1,3 @@
-AUX backends-scriptsdir.patch 291 RMD160 f7bc6ef2980daaa8521e7aaba5b09420416ff57b SHA1 1698cc54e4281122ee8bc392362125cecf305511 SHA256 ba39329442433642e33b9f5d991759dd89e9055713a66578613a199ded0ed646
 DIST kdeadmin-4.2.91.tar.lzma 1665477 RMD160 06da545f80b02889e79a5e5dbae62c1fb1e0cf9a SHA1 5a8db22bba90b6a3fea2266201cb43902e8b2043 SHA256 678ec8ee8d75e738c925a5e4638ed7e9b83f2d4c487c14a49c6ead37eeba4ee5
 DIST kdeadmin-4.2.95.tar.bz2 1875049 RMD160 c8a85defe3948f4c89ed58797134b113c7c6cbe3 SHA1 1bbd01abef6dc5f66f71d2e02c6bca86fbd0e6c4 SHA256 832cb80b656463ad0518bb17af89a70a0b5c71a5ec44963c47fd187a553b30e7
 EBUILD knetworkconf-4.2.91.ebuild 305 RMD160 b7c9a24a2b6e81ddf6cc3e0160a9b3ba1e370cc0 SHA1 a46d90778391c48e9ecd1c40fd903fe010038358 SHA256 52899f5e7800f1e2bf65f638b72cadc521ef93a378c59e35d9de45a373bb5b47
diff --git a/kde-base/knetworkconf/files/backends-scriptsdir.patch b/kde-base/knetworkconf/files/backends-scriptsdir.patch
deleted file mode 100644
index 8512eb43521..00000000000
--- a/kde-base/knetworkconf/files/backends-scriptsdir.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- knetworkconf/backends/CMakeLists.txt.orig   2009-02-27 10:22:42.000000000 -0600
-+++ knetworkconf/backends/CMakeLists.txt        2009-02-27 10:22:58.000000000 -0600
-@@ -1,4 +1,4 @@
--
-+set(scriptsdir "${DATA_INSTALL_DIR}/knetworkconf/backends")
-
-
- ########### install files ###############
\ No newline at end of file
diff --git a/kde-base/libkworkspace/Manifest b/kde-base/libkworkspace/Manifest
index ef1ac7e83ae..40a803bcbcb 100644
--- a/kde-base/libkworkspace/Manifest
+++ b/kde-base/libkworkspace/Manifest
@@ -1,4 +1,3 @@
-AUX 4.2-fix_logoff.patch 632 RMD160 a1347f49003d8a6bb4ada13f143ad0ee4c0175b1 SHA1 7af5f97fd235d5ae9f7df6246157bfc24305c47a SHA256 5acf15d8adf2f3e7e6e19980283e7d072f8ce5428d223c0c5643b2e70bd49afb
 DIST kdebase-workspace-4.2.91.tar.lzma 49413489 RMD160 a95d4f0242168a4037d235aff99fb6609b5ae42a SHA1 e2e2a140efe164fcb0c096e5a5ac727f26c09746 SHA256 f5173236e44f5799b339455afb86814f814917793d2fb9bb8dd86536fdee71c1
 DIST kdebase-workspace-4.2.95.tar.bz2 62146294 RMD160 23891dba8968652b1bf8c4b66a701fa26ba293ac SHA1 91d18bd00f1d54e8de4153aade7338fa4f3ae0d4 SHA256 15437fc9066ee2d62a74ecf11975d2267b5fcd376c62db64872ae87165dbe4c9
 EBUILD libkworkspace-4.2.91.ebuild 658 RMD160 398d9062d7e5b98c9903e384de5d35336ae8efec SHA1 5ec9b708d36651fba373f0b2af3a506b00c7a221 SHA256 23947a3d1ec7ec2ab09f2a7305b1aff393f6bc92f1d8e6e5dc977688fff04a9a
diff --git a/kde-base/libkworkspace/files/4.2-fix_logoff.patch b/kde-base/libkworkspace/files/4.2-fix_logoff.patch
deleted file mode 100644
index 1d71da79b57..00000000000
--- a/kde-base/libkworkspace/files/4.2-fix_logoff.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: trunk/KDE/kdebase/workspace/libs/kworkspace/kdisplaymanager.cpp
-===================================================================
---- trunk/KDE/kdebase/workspace/libs/kworkspace/kdisplaymanager.cpp	(revision 911248)
-+++ trunk/KDE/kdebase/workspace/libs/kworkspace/kdisplaymanager.cpp	(revision 911249)
-@@ -201,7 +201,7 @@
-               KWorkSpace::ShutdownMode shutdownMode, /* NOT Default */
-               const QString &bootOption )
- {
--	if (shutdownType == KWorkSpace::ShutdownTypeNone)
-+	if (shutdownType == KWorkSpace::ShutdownTypeNone || shutdownType == KWorkSpace::ShutdownTypeLogout)
- 		return;
- 
- 	bool cap_ask;
diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest
index d751feca305..67fcc1443cb 100644
--- a/kde-base/plasma-workspace/Manifest
+++ b/kde-base/plasma-workspace/Manifest
@@ -1,4 +1,3 @@
-AUX plasma-workspace-fake-panel-transparency.patch 7861 RMD160 01c2e93ff164bdc2a4db17eedf0649c60dc327ee SHA1 943c49b2b49eac015acb3e29e0789abdb1cd3b0e SHA256 522b268f35f2416fe453eaac03e6865e9dfd0f7643cb0af8c2c9f42aa014ab24
 DIST kdebase-workspace-4.2.91.tar.lzma 49413489 RMD160 a95d4f0242168a4037d235aff99fb6609b5ae42a SHA1 e2e2a140efe164fcb0c096e5a5ac727f26c09746 SHA256 f5173236e44f5799b339455afb86814f814917793d2fb9bb8dd86536fdee71c1
 DIST kdebase-workspace-4.2.95.tar.bz2 62146294 RMD160 23891dba8968652b1bf8c4b66a701fa26ba293ac SHA1 91d18bd00f1d54e8de4153aade7338fa4f3ae0d4 SHA256 15437fc9066ee2d62a74ecf11975d2267b5fcd376c62db64872ae87165dbe4c9
 EBUILD plasma-workspace-4.2.91.ebuild 2661 RMD160 1cdbe6100e84903a8f6cccd7aa05d4d67b26ebe6 SHA1 c457aa71b340edca580f646eb6af5c3c3b83b803 SHA256 b69f776160871a2ab422756f3fbbfecef59a5d4b8312cc860c651128c1e9afc3
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) {