rpms/kdebase-workspace/devel kdebase-workspace-4.1.2-panel-autohide.patch, 1.1, 1.2 kdebase-workspace.spec, 1.127, 1.128 kdebase-workspace-4.1.2-panel-autohide-867559.patch, 1.1, NONE

Kevin Kofler kkofler at fedoraproject.org
Thu Oct 9 21:45:54 UTC 2008


Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14250/devel

Modified Files:
	kdebase-workspace-4.1.2-panel-autohide.patch 
	kdebase-workspace.spec 
Removed Files:
	kdebase-workspace-4.1.2-panel-autohide-867559.patch 
Log Message:
Remove unrelated panelappletoverlay.cpp changes from http://websvn.kde.org/?view=rev&revision=857606 (which need library changes) from kdebase-workspace-4.1.2-panel-autohide.patch.
Remove kdebase-workspace-4.1.2-panel-autohide-867559.patch, actually a followup for the above, not related to autohide.

kdebase-workspace-4.1.2-panel-autohide.patch:

Index: kdebase-workspace-4.1.2-panel-autohide.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace-4.1.2-panel-autohide.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-workspace-4.1.2-panel-autohide.patch	9 Oct 2008 05:59:48 -0000	1.1
+++ kdebase-workspace-4.1.2-panel-autohide.patch	9 Oct 2008 21:45:23 -0000	1.2
@@ -913,75 +913,6 @@
  }
  
  #include "panelcontroller.moc"
-Index: plasma/plasma/panelappletoverlay.cpp
-===================================================================
---- plasma/plasma/panelappletoverlay.cpp	(revision 864492)
-+++ plasma/plasma/panelappletoverlay.cpp	(revision 864493)
-@@ -19,6 +19,7 @@
- 
- #include "panelappletoverlay.h"
- 
-+#include <QApplication>
- #include <QGraphicsLinearLayout>
- #include <QPainter>
- #include <QTimer>
-@@ -30,6 +31,7 @@
- #include <plasma/containment.h>
- #include <plasma/paintutils.h>
- #include <plasma/theme.h>
-+#include <plasma/view.h>
- 
- class AppletMoveSpacer : public QGraphicsWidget
- {
-@@ -141,6 +143,17 @@
-         return;
-     }
- 
-+    if (event->button() != Qt::LeftButton) {
-+        kDebug() << "sending even to" << (QWidget*)parent();
-+        Plasma::View *view = dynamic_cast<Plasma::View*>(parent());
-+
-+        if (view && view->containment()) {
-+            view->containment()->showContextMenu(mapToParent(event->pos()), event->globalPos());
-+        }
-+
-+        return;
-+    }
-+
-     m_clickDrag = false;
-     if (!m_spacer) {
-         m_spacer = new AppletMoveSpacer(m_applet);
-@@ -167,6 +180,10 @@
- {
-     Q_UNUSED(event)
- 
-+    if (!m_spacer) {
-+        return;
-+    }
-+
-     QPoint p = mapToParent(event->pos());
-     QRect g = geometry();
- 
-@@ -199,6 +216,11 @@
- {
-     Q_UNUSED(event)
- 
-+    releaseMouse();
-+    if (!m_spacer) {
-+        return;
-+    }
-+
-     if (!m_origin.isNull()) {
-         //kDebug() << m_clickDrag << m_origin << mapToParent(event->pos());
-         if (m_orientation == Qt::Horizontal) {
-@@ -221,7 +243,6 @@
-     m_spacer = 0;
-     m_layout->insertItem(m_index, m_applet);
-     m_applet->setZValue(m_applet->zValue() - 1);
--    releaseMouse();
- }
- 
- void PanelAppletOverlay::enterEvent(QEvent *event)
 Index: plasma/plasma/panelcontroller.h
 ===================================================================
 --- plasma/plasma/panelcontroller.h	(revision 864492)


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- kdebase-workspace.spec	9 Oct 2008 05:59:48 -0000	1.127
+++ kdebase-workspace.spec	9 Oct 2008 21:45:24 -0000	1.128
@@ -45,18 +45,18 @@
 # Fedora changes:
 # * removed theme changes
 # * removed hunks from plasmacontroller.cpp which rename theme elements
+# * removed unrelated panelappletoverlay.cpp changes from
+#   http://websvn.kde.org/?view=rev&revision=857606 which need library changes
 Patch104: kdebase-workspace-4.1.2-panel-autohide.patch
 # panel autohide bugfixes
 # (use sed -i -e 's!plasma/shells/desktop!plasma/plasma!g' to backport):
 # http://websvn.kde.org/?view=rev&revision=866710
 # http://websvn.kde.org/?view=rev&revision=866715
 Patch105: kdebase-workspace-4.1.2-panel-autohide-fix-flicker.patch
-# http://websvn.kde.org/?view=rev&revision=867559
-Patch106: kdebase-workspace-4.1.2-panel-autohide-867559.patch
 # http://websvn.kde.org/?view=rev&revision=868231
-Patch107: kdebase-workspace-4.1.2-panel-autohide-868231.patch
+Patch106: kdebase-workspace-4.1.2-panel-autohide-868231.patch
 # http://websvn.kde.org/?view=rev&revision=869277
-Patch108: kdebase-workspace-4.1.2-panel-autohide-869277.patch
+Patch107: kdebase-workspace-4.1.2-panel-autohide-869277.patch
 # end panel autohide bugfixes
 
 # FIXME: "inconsistent naming System Monitor vs KSysGuard" http://bugs.kde.org/162151
@@ -195,7 +195,6 @@
 %patch105 -p0 -b .panel-autohide2
 %patch106 -p0 -b .panel-autohide3
 %patch107 -p0 -b .panel-autohide4
-%patch108 -p0 -b .panel-autohide5
 
 
 %build


--- kdebase-workspace-4.1.2-panel-autohide-867559.patch DELETED ---




More information about the scm-commits mailing list