[arch-commits] Commit in kdebase-workspace/trunk (2 files)

Andrea Scarpino andrea at archlinux.org
Tue Apr 14 09:04:33 EDT 2009


    Date: Tuesday, April 14, 2009 @ 09:04:32
  Author: andrea
Revision: 35613

upgpkg: kdebase-workspace 4.2.2-2

Added:
  kdebase-workspace/trunk/fix-calendar-resizing-bug.patch
Modified:
  kdebase-workspace/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |   11 ++++--
 fix-calendar-resizing-bug.patch |   64 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-04-14 11:59:57 UTC (rev 35612)
+++ PKGBUILD	2009-04-14 13:04:32 UTC (rev 35613)
@@ -3,7 +3,7 @@
 
 pkgname=kdebase-workspace
 pkgver=4.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Base Workspace"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -24,7 +24,8 @@
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
         'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
         'fixpath.patch'
-        'fixsolidbluetooth.patch')
+        'fixsolidbluetooth.patch'
+	'fix-calendar-resizing-bug.patch')
 md5sums=('ac494815044eefc3a181488871225eda'
          '721e97031b62aee8914e8617e86f9235'
          '5d80164932e0d44d8b802d3929a004ab'
@@ -32,13 +33,17 @@
          '552337fd9a3982d809ea16c7f0033d42'
          '367a3538f54db71f108b34cfa31088ac'
          '47a1f12673f66e62e2463efd7037a26a'
-         'd0331f95af08ae65552cb3d4117e8651')
+         'd0331f95af08ae65552cb3d4117e8651'
+         '72ac4e9355193022d3367aa0725b2981')
 
 build() {
 	cd $srcdir/${pkgname}-${pkgver}
 	patch -p0 -i ${srcdir}/kdm-zsh-profile.patch
 	patch -p0 -i ${srcdir}/fixpath.patch
 	patch -p1 -i ${srcdir}/fixsolidbluetooth.patch
+	#fixed in kde 4.2.3
+	patch -p5 -i ${srcdir}/fix-calendar-resizing-bug.patch
+
 	cd ../
 	mkdir build
 	cd build

Added: fix-calendar-resizing-bug.patch
===================================================================
--- fix-calendar-resizing-bug.patch	                        (rev 0)
+++ fix-calendar-resizing-bug.patch	2009-04-14 13:04:32 UTC (rev 35613)
@@ -0,0 +1,64 @@
+--- branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.cpp	2009/04/10 10:20:25	951826
++++ branches/KDE/4.2/kdebase/workspace/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"
+--- branches/KDE/4.2/kdebase/workspace/plasma/applets/calendar/calendar.h	2009/04/10 10:20:25	951826
++++ 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)



More information about the arch-commits mailing list