rpms/kdebase-workspace/devel kdebase-workspace-4.0.3-kde#158301.patch, 1.1, 1.2 kdebase-workspace.spec, 1.72, 1.73

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23948/devel

Modified Files:
	kdebase-workspace-4.0.3-kde#158301.patch 
	kdebase-workspace.spec 
Log Message:
Rediff patch to apply against 4.0.3.

kdebase-workspace-4.0.3-kde#158301.patch:

Index: kdebase-workspace-4.0.3-kde#158301.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace-4.0.3-kde#158301.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-workspace-4.0.3-kde#158301.patch	19 Apr 2008 14:41:28 -0000	1.1
+++ kdebase-workspace-4.0.3-kde#158301.patch	19 Apr 2008 14:59:40 -0000	1.2
@@ -1,34 +1,6 @@
-Index: libs/plasma/containment.h
-===================================================================
---- libs/plasma/containment.h	(revision 791851)
-+++ libs/plasma/containment.h	(revision 791852)
-@@ -265,6 +265,14 @@
-          */
-         void hideToolbox();
- 
-+        /**
-+         * Returns a list of applet-related QAction instances.
-+         *
-+         * @return A list of actions. The default implementation returns an
-+         *         empty list.
-+         **/
-+        virtual QList<QAction*> contextAppletActions(Applet *applet);
-+
-     Q_SIGNALS:
-         /**
-          * This signal is emitted when a new applet is created by the containment
-@@ -331,6 +339,7 @@
-         void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
-         void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
-         bool sceneEventFilter(QGraphicsItem *watched, QEvent *event);
-+        void repositionApplet(Applet* applet, int index);
- 
-     protected Q_SLOTS:
-         /**
-Index: libs/plasma/containment.cpp
-===================================================================
---- libs/plasma/containment.cpp	(revision 791851)
-+++ libs/plasma/containment.cpp	(revision 791852)
+diff -ur kdebase-workspace-4.0.3/libs/plasma/containment.cpp kdebase-workspace-4.0.3-kde#158301/libs/plasma/containment.cpp
+--- kdebase-workspace-4.0.3/libs/plasma/containment.cpp	2008-03-27 21:34:44.000000000 +0100
++++ kdebase-workspace-4.0.3-kde#158301/libs/plasma/containment.cpp	2008-04-19 16:55:46.000000000 +0200
 @@ -271,6 +271,11 @@
                  desktopMenu.addSeparator();
              }
@@ -90,10 +62,35 @@
  } // Plasma namespace
  
  #include "containment.moc"
-Index: plasma/containments/panel/panel.cpp
-===================================================================
---- plasma/containments/panel/panel.cpp	(revision 791851)
-+++ plasma/containments/panel/panel.cpp	(revision 791852)
+diff -ur kdebase-workspace-4.0.3/libs/plasma/containment.h kdebase-workspace-4.0.3-kde#158301/libs/plasma/containment.h
+--- kdebase-workspace-4.0.3/libs/plasma/containment.h	2008-03-27 21:34:44.000000000 +0100
++++ kdebase-workspace-4.0.3-kde#158301/libs/plasma/containment.h	2008-04-19 16:55:46.000000000 +0200
+@@ -265,6 +265,14 @@
+          */
+         void hideToolbox();
+ 
++        /**
++         * Returns a list of applet-related QAction instances.
++         *
++         * @return A list of actions. The default implementation returns an
++         *         empty list.
++         **/
++        virtual QList<QAction*> contextAppletActions(Applet *applet);
++
+     Q_SIGNALS:
+         /**
+          * This signal is emitted when a new applet is created by the containment
+@@ -331,6 +339,7 @@
+         void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
+         void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
+         bool sceneEventFilter(QGraphicsItem *watched, QEvent *event);
++        void repositionApplet(Applet* applet, int index);
+ 
+     protected Q_SLOTS:
+         /**
+diff -ur kdebase-workspace-4.0.3/plasma/containments/panel/panel.cpp kdebase-workspace-4.0.3-kde#158301/plasma/containments/panel/panel.cpp
+--- kdebase-workspace-4.0.3/plasma/containments/panel/panel.cpp	2008-03-27 21:34:50.000000000 +0100
++++ kdebase-workspace-4.0.3-kde#158301/plasma/containments/panel/panel.cpp	2008-04-19 16:57:14.000000000 +0200
 @@ -21,6 +21,7 @@
  #include <limits>
  
@@ -106,8 +103,8 @@
        m_drawLeft(true),
        m_drawRight(true),
        m_drawBottom(true),
--      m_size(40)
-+      m_size(40),
+-      m_size(48)
++      m_size(48),
 +      m_moveAppletAction(0),
 +      m_movedApplet(0)
  {
@@ -187,10 +184,9 @@
  K_EXPORT_PLASMA_APPLET(panel, Panel)
  
  #include "panel.moc"
-Index: plasma/containments/panel/panel.h
-===================================================================
---- plasma/containments/panel/panel.h	(revision 791851)
-+++ plasma/containments/panel/panel.h	(revision 791852)
+diff -ur kdebase-workspace-4.0.3/plasma/containments/panel/panel.h kdebase-workspace-4.0.3-kde#158301/plasma/containments/panel/panel.h
+--- kdebase-workspace-4.0.3/plasma/containments/panel/panel.h	2008-03-27 21:34:50.000000000 +0100
++++ kdebase-workspace-4.0.3-kde#158301/plasma/containments/panel/panel.h	2008-04-19 16:55:46.000000000 +0200
 @@ -48,12 +48,18 @@
                          const QRect &contentsRect);
      void paintBackground(QPainter *painter, const QRect &contentsRect);


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- kdebase-workspace.spec	19 Apr 2008 14:41:28 -0000	1.72
+++ kdebase-workspace.spec	19 Apr 2008 14:59:40 -0000	1.73
@@ -146,7 +146,7 @@
 
 # plasma-4.0-openSUSE patches:
 %patch200 -p0 -b .plasma-default-wallpaper
-%patch201 -p0 -b .kde#158301
+%patch201 -p1 -b .kde#158301
 
 %build