[arch-commits] Commit in (3 files)

Andrea Scarpino andrea at archlinux.org
Thu Apr 30 20:01:44 EDT 2009


    Date: Thursday, April 30, 2009 @ 20:01:44
  Author: andrea
Revision: 37180

removed patches not needed in 4.2.3

Modified:
  autofs/trunk/PKGBUILD
Deleted:
  kdebase-workspace/trunk/fix-calendar-resizing-bug.patch
  kdelibs/trunk/fix-kickoff-menu-focus.patch

---------------------------------------------------------+
 autofs/trunk/PKGBUILD                                   |    2 
 kdebase-workspace/trunk/fix-calendar-resizing-bug.patch |   64 --------------
 kdelibs/trunk/fix-kickoff-menu-focus.patch              |   12 --
 3 files changed, 1 insertion(+), 77 deletions(-)

Modified: autofs/trunk/PKGBUILD
===================================================================
--- autofs/trunk/PKGBUILD	2009-04-30 23:52:40 UTC (rev 37179)
+++ autofs/trunk/PKGBUILD	2009-05-01 00:01:44 UTC (rev 37180)
@@ -17,7 +17,7 @@
   'autofs' 'autofs.conf.d' 'auto.master' 'auto.misc'
   'heimdal.patch')
 md5sums=('2646dde61edd08dd952255558c733c08'
-         'b4984b3161f50cba3d189b0ec594d014'
+         'e307bf6d2638e46eeb916cf42fe029b2'
          '47f597c870410055e0fdb66103daf928'
          'a6cefb591e77b31b79dbb7243646c96b'
          'd8a15ec9186c5c0b36e5cea1e2739e8a'

Deleted: kdebase-workspace/trunk/fix-calendar-resizing-bug.patch
===================================================================
--- kdebase-workspace/trunk/fix-calendar-resizing-bug.patch	2009-04-30 23:52:40 UTC (rev 37179)
+++ kdebase-workspace/trunk/fix-calendar-resizing-bug.patch	2009-05-01 00:01:44 UTC (rev 37180)
@@ -1,64 +0,0 @@
---- plasma/applets/calendar/calendar.cpp	2009/04/10 10:20:25	951826
-+++ plasma/applets/calendar/calendar.cpp	2009/04/10 16:57:05	951969
-@@ -19,6 +19,7 @@
- 
- #include <QGraphicsLayout>
- #include <QPainter>
-+#include <QTimer>
- 
- #include <KDebug>
- #include <KIcon>
-@@ -34,8 +35,7 @@
-     : Plasma::PopupApplet(parent, args),
-     m_calendarDialog(0),
-     m_theme(0),
--    m_date(0),
--    m_updateTimerId(0)
-+    m_date(0)
- {
-     setAspectRatioMode(Plasma::IgnoreAspectRatio);
-     setCacheMode(DeviceCoordinateCache);
-@@ -116,18 +116,9 @@
-     QDateTime d = QDateTime::currentDateTime();
-     m_date = d.date().day();
-     int updateIn = (24 * 60 * 60) - (d.toTime_t() + KSystemTimeZones::local().currentOffset()) % (24 * 60 * 60);
--    m_updateTimerId = startTimer(updateIn * 1000);
-+    QTimer::singleShot(updateIn * 1000, this, SLOT(updateDate()));
-     constraintsEvent(Plasma::FormFactorConstraint);
- }
- 
--void CalendarTest::timerEvent(QTimerEvent *event)
--{
--    if (event->timerId() != m_updateTimerId) {
--        return;
--    }
--
--    killTimer(m_updateTimerId);
--    updateDate();
--}
- 
- #include "calendar.moc"
---- plasma/applets/calendar/calendar.h	2009/04/10 10:20:25	951826
-+++ 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)

Deleted: kdelibs/trunk/fix-kickoff-menu-focus.patch
===================================================================
--- kdelibs/trunk/fix-kickoff-menu-focus.patch	2009-04-30 23:52:40 UTC (rev 37179)
+++ kdelibs/trunk/fix-kickoff-menu-focus.patch	2009-05-01 00:01:44 UTC (rev 37180)
@@ -1,12 +0,0 @@
---- branches/KDE/4.2/kdelibs/plasma/popupapplet.cpp	2009/04/09 04:18:10	951366
-+++ branches/KDE/4.2/kdelibs/plasma/popupapplet.cpp	2009/04/09 04:21:08	951367
-@@ -275,8 +275,7 @@
-                 //stuff out of your Dialog (extenders). Monitor WindowDeactivate events so we can
-                 //emulate the same kind of behavior as Qt::Popup (close when you click somewhere
-                 //else.
--                //Use Qt::Tool otherwise dialogs get shown over screensaver (bug #179924).
--                Qt::WindowFlags wflags = Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint;
-+                Qt::WindowFlags wflags = Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint;
- 
-                 if (passive) {
-                     wflags |= Qt::X11BypassWindowManagerHint;



More information about the arch-commits mailing list