rpms/kdebase-workspace/F-10 kdebase-workspace-4.2.2-kde#187699.patch, 1.1, 1.2 kdebase-workspace.spec, 1.170, 1.171 kdebase-workspace-4.1.72-plasma-konsole.patch, 1.1, NONE kdebase-workspace-4.2.1-kde#185585.patch, 1.1, NONE kdebase-workspace-4.2.1-kde#185736.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21476/F-10

Modified Files:
	kdebase-workspace-4.2.2-kde#187699.patch 
	kdebase-workspace.spec 
Removed Files:
	kdebase-workspace-4.1.72-plasma-konsole.patch 
	kdebase-workspace-4.2.1-kde#185585.patch 
	kdebase-workspace-4.2.1-kde#185736.patch 
Log Message:
fix kde#187699 patch
drop unused patches


kdebase-workspace-4.2.2-kde#187699.patch:

Index: kdebase-workspace-4.2.2-kde#187699.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace-4.2.2-kde#187699.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-workspace-4.2.2-kde#187699.patch	12 Apr 2009 19:00:37 -0000	1.1
+++ kdebase-workspace-4.2.2-kde#187699.patch	12 Apr 2009 19:23:13 -0000	1.2
@@ -1,29 +1,6 @@
---- branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.h	2009/03/03 19:59:16	934794
-+++ branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.h	2009/04/10 10:21:06	951827
-@@ -45,12 +45,9 @@
-          */
-         QGraphicsWidget *graphicsWidget();
- 
--    protected:
--        void updateDate();
--        void timerEvent(QTimerEvent *event);
--
-     protected slots:
-         void configAccepted();
-+        void updateDate();
- 
-     private:
-         void paintIcon();
-@@ -58,7 +55,6 @@
-         Plasma::Calendar *m_calendarDialog;
-         Plasma::Svg *m_theme;
-         int m_date;
--        int m_updateTimerId;
- };
- 
- K_EXPORT_PLASMA_APPLET(calendar, CalendarTest)
---- branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.cpp	2009/03/03 19:59:16	934794
-+++ branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.cpp	2009/04/10 10:21:06	951827
+diff -up kdebase-workspace-4.2.2/plasma/applets/calendar/calendar.cpp.kde#187699 kdebase-workspace-4.2.2/plasma/applets/calendar/calendar.cpp
+--- kdebase-workspace-4.2.2/plasma/applets/calendar/calendar.cpp.kde#187699	2009-03-26 09:42:28.000000000 -0500
++++ kdebase-workspace-4.2.2/plasma/applets/calendar/calendar.cpp	2009-04-12 14:16:05.000000000 -0500
 @@ -19,6 +19,7 @@
  
  #include <QGraphicsLayout>
@@ -32,15 +9,17 @@
  
  #include <KDebug>
  #include <KIcon>
-@@ -35,7 +36,6 @@
+@@ -34,8 +35,7 @@ CalendarTest::CalendarTest(QObject *pare
+     : Plasma::PopupApplet(parent, args),
      m_calendarDialog(0),
      m_theme(0),
-     m_date(0),
+-    m_date(0),
 -    m_updateTimerId(0)
++    m_date(0)
  {
      setAspectRatioMode(Plasma::IgnoreAspectRatio);
      setCacheMode(DeviceCoordinateCache);
-@@ -116,18 +116,9 @@
+@@ -116,18 +116,9 @@ void CalendarTest::updateDate()
      QDateTime d = QDateTime::currentDateTime();
      m_date = d.date().day();
      int updateIn = (24 * 60 * 60) - (d.toTime_t() + KSystemTimeZones::local().currentOffset()) % (24 * 60 * 60);
@@ -60,3 +39,28 @@
 -}
  
  #include "calendar.moc"
+diff -up kdebase-workspace-4.2.2/plasma/applets/calendar/calendar.h.kde#187699 kdebase-workspace-4.2.2/plasma/applets/calendar/calendar.h
+--- kdebase-workspace-4.2.2/plasma/applets/calendar/calendar.h.kde#187699	2009-03-26 09:42:28.000000000 -0500
++++ kdebase-workspace-4.2.2/plasma/applets/calendar/calendar.h	2009-04-12 14:12:17.000000000 -0500
+@@ -45,12 +45,9 @@ class CalendarTest : public Plasma::Popu
+          */
+         QGraphicsWidget *graphicsWidget();
+ 
+-    protected:
+-        void updateDate();
+-        void timerEvent(QTimerEvent *event);
+-
+     protected slots:
+         void configAccepted();
++        void updateDate();
+ 
+     private:
+         void paintIcon();
+@@ -58,7 +55,6 @@ class CalendarTest : public Plasma::Popu
+         Plasma::Calendar *m_calendarDialog;
+         Plasma::Svg *m_theme;
+         int m_date;
+-        int m_updateTimerId;
+ };
+ 
+ K_EXPORT_PLASMA_APPLET(calendar, CalendarTest)


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -r1.170 -r1.171
--- kdebase-workspace.spec	12 Apr 2009 19:00:37 -0000	1.170
+++ kdebase-workspace.spec	12 Apr 2009 19:23:13 -0000	1.171
@@ -241,7 +241,7 @@
 %endif
 %patch103 -p1 -b .kde#180576
 %patch105 -p0 -b .desktopnumbers
-%patch106 -p5 -b .kde#187699
+%patch106 -p1 -b .kde#187699
 
 
 %build


--- kdebase-workspace-4.1.72-plasma-konsole.patch DELETED ---


--- kdebase-workspace-4.2.1-kde#185585.patch DELETED ---


--- kdebase-workspace-4.2.1-kde#185736.patch DELETED ---