[arch-commits] Commit in kdebase-workspace/repos (3 files)
Pierre Schmitz
pierre at archlinux.org
Tue Apr 14 13:56:49 UTC 2009
Date: Tuesday, April 14, 2009 @ 09:56:49
Author: pierre
Revision: 35618
Merged revisions 35613 via svnmerge from
svn+ssh://svn.archlinux.org/srv/svn-packages/kdebase-workspace/trunk
........
r35613 | andrea | 2009-04-14 15:04:32 +0200 (Di, 14 Apr 2009) | 1 line
upgpkg: kdebase-workspace 4.2.2-2
........
Added:
kdebase-workspace/repos/extra-x86_64/fix-calendar-resizing-bug.patch
(from rev 35613, kdebase-workspace/trunk/fix-calendar-resizing-bug.patch)
Modified:
kdebase-workspace/repos/extra-x86_64/ (properties)
kdebase-workspace/repos/extra-x86_64/PKGBUILD
---------------------------------+
PKGBUILD | 11 ++++--
fix-calendar-resizing-bug.patch | 64 ++++++++++++++++++++++++++++++++++++++
2 files changed, 72 insertions(+), 3 deletions(-)
Property changes on: kdebase-workspace/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /kdebase-workspace/trunk:1-31574
+ /kdebase-workspace/trunk:1-35617
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2009-04-14 13:14:24 UTC (rev 35617)
+++ extra-x86_64/PKGBUILD 2009-04-14 13:56:49 UTC (rev 35618)
@@ -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
Copied: kdebase-workspace/repos/extra-x86_64/fix-calendar-resizing-bug.patch (from rev 35613, kdebase-workspace/trunk/fix-calendar-resizing-bug.patch)
===================================================================
--- extra-x86_64/fix-calendar-resizing-bug.patch (rev 0)
+++ extra-x86_64/fix-calendar-resizing-bug.patch 2009-04-14 13:56:49 UTC (rev 35618)
@@ -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