Apply the patches for kwin and kdebase-kioslaves.

Package-Manager: portage-2.1.2_pre3-r2

3 files changed, 142 insertions, 0 deletions

diff --git a/kde-base/kdebase/files/digest-kdebase-3.5.5-r1 b/kde-base/kdebase/files/digest-kdebase-3.5.5-r1
new file mode 100644
index 000000000000..f51965cf1cbe
--- /dev/null
+++ b/kde-base/kdebase/files/digest-kdebase-3.5.5-r1
@@ -0,0 +1,6 @@
+MD5 420445e2dbddfd83ebc25e85a9b9cdda kdebase-3.5-patchset-03.tar.bz2 21409
+RMD160 941b919097d03347b10bccb51db2fa5e89d7ba16 kdebase-3.5-patchset-03.tar.bz2 21409
+SHA256 59c691754627f78daf7693e82496d808cf1cc31e2d6f32af829ec4ccfd776574 kdebase-3.5-patchset-03.tar.bz2 21409
+MD5 0c685af1cbca75f9c77b3ed231ba0468 kdebase-3.5.5.tar.bz2 23851886
+RMD160 6cf804de0487347a3e1d4ea6e5ba5114d23d9806 kdebase-3.5.5.tar.bz2 23851886
+SHA256 f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0 kdebase-3.5.5.tar.bz2 23851886
diff --git a/kde-base/kdebase/files/kdebase-kioslaves-3.5.5-fstab.patch b/kde-base/kdebase/files/kdebase-kioslaves-3.5.5-fstab.patch
new file mode 100644
index 000000000000..3f0721e75fb7
--- /dev/null
+++ b/kde-base/kdebase/files/kdebase-kioslaves-3.5.5-fstab.patch
@@ -0,0 +1,73 @@
+From: Stephan Kulow <coolo@kde.org>
+To: kde-commits@kde.org
+Subject: branches/KDE/3.5/kdebase/kioslave/media/mediamanager
+Date: Mon, 09 Oct 2006 09:32:17 +0000
+Message-Id: <1160386337.725673.25740.nullmailer@svn.kde.org>
+Cc: kde-packager@kde.org
+Content-Type: text/plain;
+  charset="us-ascii"
+Content-Transfer-Encoding: 7bit
+X-Length: 6245
+
+SVN commit 593835 by coolo:
+
+devices that are in fstab should show up no matter what HAL thinks
+CCMAIL: kde-packager@kde.org
+
+
+ M  +16 -7     halbackend.cpp  
+
+
+--- branches/KDE/3.5/kdebase/kioslave/media/mediamanager/halbackend.cpp #593834:593835
+@@ -215,11 +215,6 @@
+              !libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_blank", NULL) )
+             return;
+ 
+-        if ( ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") == "filesystem" &&
+-               !libhal_device_get_property_bool(m_halContext, udi, "volume.is_mounted", NULL ) ) &&
+-             ( libhal_device_get_property_bool(m_halContext, udi, "volume.ignore", NULL ) ) )
+-            return;
+-
+         /* Query drive udi */
+         QString driveUdi = libhal_device_get_property_QString(m_halContext, udi, "block.storage_device");
+         /* We don't list floppy volumes because we list floppy drives */
+@@ -240,7 +235,19 @@
+ 
+         /* Create medium */
+         Medium* medium = new Medium(udi, "");
++        setVolumeProperties(medium);
+ 
++        if ( isInFstab( medium ).isNull() )
++        {
++            // if it's not mountable by user and not by HAL, don't show it at all
++            if ( ( libhal_device_get_property_QString(m_halContext, udi, "volume.fsusage") == "filesystem" &&
++                   !libhal_device_get_property_bool(m_halContext, udi, "volume.is_mounted", NULL ) ) &&
++                 ( libhal_device_get_property_bool(m_halContext, udi, "volume.ignore", NULL ) ) )
++            {
++                delete medium;
++                return;
++            }
++        }
+         QMap<QString,QString> options = MediaManagerUtils::splitOptions(mountoptions(udi));
+         kdDebug() << "automount " << options["automount"] << endl;
+         if (options["automount"] == "true" && allowNotification ) {
+@@ -248,7 +255,6 @@
+             if (!error.isEmpty())
+                 kdDebug() << "error " << error << endl;
+         }
+-        setVolumeProperties(medium);
+         m_mediaList.addMedium(medium, allowNotification);
+ 
+         return;
+@@ -992,7 +998,10 @@
+ 
+     for (; it!=end; ++it)
+     {
+-        kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << (*it)->realDeviceName() << "- -" << (*it)->mountedFrom() << endl;
++        QString reald = (*it)->realDeviceName();
++        if ( reald.endsWith( "/" ) )
++            reald = reald.left( reald.length() - 1 );
++        kdDebug() << "isInFstab -" << medium->deviceNode() << "- -" << reald << "- -" << (*it)->mountedFrom() << "-" << endl;
+         if ((*it)->mountedFrom() == medium->deviceNode() || ( !medium->deviceNode().isEmpty() && (*it)->realDeviceName() == medium->deviceNode() ) )
+ 	{
+             QStringList opts = (*it)->mountOptions();
diff --git a/kde-base/kdebase/files/kwin-3.5.5-input-shape.patch b/kde-base/kdebase/files/kwin-3.5.5-input-shape.patch
new file mode 100644
index 000000000000..94cd32d24636
--- /dev/null
+++ b/kde-base/kdebase/files/kwin-3.5.5-input-shape.patch
@@ -0,0 +1,63 @@
+From l.lunak@kde.org Tue Oct 10 12:25:53 2006
+To: kde-commits@kde.org
+Subject: branches/KDE/3.5/kdebase/kwin
+Message-Id: <1160475953.522428.2616.nullmailer@svn.kde.org>
+Cc: kde-packager@kde.org,
+ 135250-done@bugs.kde.org
+Content-Type: text/plain;
+  charset="us-ascii"
+Content-Transfer-Encoding: 7bit
+X-Length: 6070
+X-UID: 85
+
+SVN commit 594159 by lunakl:
+
+Build the input shape on a helper window instead of directly,
+this avoids having a hole in the shape temporarily. This seems
+to break non-click-to-focus mouse policies on some systems
+(works fine here though).
+BUG: 135250
+CCMAIL: kde-packager@kde.org
+
+
+
+ M  +19 -6     client.cpp  
+
+
+--- branches/KDE/3.5/kdebase/kwin/client.cpp #594158:594159
+@@ -477,16 +477,29 @@
+     // calls it or when the decoration is created/destroyed
+ 
+     if( Shape::version() >= 0x11 ) // 1.1, has input shape support
+-        { // there appears to be no way to find out if a window has input
+-          // shape set or not, so always set propagate the input shape
+-          // (it's the same like the bounding shape by default)
+-        XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, 0, 0,
++        { // There appears to be no way to find out if a window has input
++          // shape set or not, so always propagate the input shape
++          // (it's the same like the bounding shape by default).
++          // Also, build the shape using a helper window, not directly
++          // in the frame window, because the sequence set-shape-to-frame,
++          // remove-shape-of-client, add-input-shape-of-client has the problem
++          // that after the second step there's a hole in the input shape
++          // until the real shape of the client is added and that can make
++          // the window lose focus (which is a problem with mouse focus policies)
++        static Window helper_window = None;
++        if( helper_window == None )
++            helper_window = XCreateSimpleWindow( qt_xdisplay(), qt_xrootwin(),
++                0, 0, 1, 1, 0, 0, 0 );
++        XResizeWindow( qt_xdisplay(), helper_window, width(), height());
++        XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput, 0, 0,
+                            frameId(), ShapeBounding, ShapeSet );
+-        XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput,
++        XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput,
+                            clientPos().x(), clientPos().y(),
+                            window(), ShapeBounding, ShapeSubtract );
+-        XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput,
++        XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput,
+                            clientPos().x(), clientPos().y(),
+                            window(), ShapeInput, ShapeUnion );
++        XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, 0, 0,
++                           helper_window, ShapeInput, ShapeSet );
+         }
+     }