rev 14554 - in trunk/packages/kdeplasma-addons/debian: . patches
Fathi Boudra
fabo at alioth.debian.org
Sat May 2 15:26:19 UTC 2009
Author: fabo
Date: 2009-05-02 15:26:19 +0000 (Sat, 02 May 2009)
New Revision: 14554
Added:
trunk/packages/kdeplasma-addons/debian/patches/02_missing_bball_image_bug525090.diff
Modified:
trunk/packages/kdeplasma-addons/debian/changelog
trunk/packages/kdeplasma-addons/debian/control
trunk/packages/kdeplasma-addons/debian/patches/series
Log:
Prepare kdeplasma-addons 4.2.3
New upstream release.
Fix section for debug package.
Bump Standards-Version from 3.8.0 to 3.8.1 (no changes needed).
Add 02_missing_bball_image_bug525090.diff patch: Fix missing bball image.
(Closes: 525090)
Modified: trunk/packages/kdeplasma-addons/debian/changelog
===================================================================
--- trunk/packages/kdeplasma-addons/debian/changelog 2009-05-02 15:23:56 UTC (rev 14553)
+++ trunk/packages/kdeplasma-addons/debian/changelog 2009-05-02 15:26:19 UTC (rev 14554)
@@ -1,3 +1,13 @@
+kdeplasma-addons (4:4.2.3-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * Fix section for debug package.
+ * Bump Standards-Version from 3.8.0 to 3.8.1 (no changes needed).
+ * Add 02_missing_bball_image_bug525090.diff patch: Fix missing bball image.
+ (Closes: 525090)
+
+ -- Fathi Boudra <fabo at debian.org> Sat, 02 May 2009 15:20:47 +0200
+
kdeplasma-addons (4:4.2.2-1) unstable; urgency=low
* New upstream release.
Modified: trunk/packages/kdeplasma-addons/debian/control
===================================================================
--- trunk/packages/kdeplasma-addons/debian/control 2009-05-02 15:23:56 UTC (rev 14553)
+++ trunk/packages/kdeplasma-addons/debian/control 2009-05-02 15:26:19 UTC (rev 14554)
@@ -7,7 +7,7 @@
Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, pkg-kde-tools (>= 0.4.2),
kdelibs5-dev (>= 4:4.2.2), kdepimlibs5-dev (>= 4:4.2.2), libqt4-opengl-dev,
kdebase-workspace-dev (>= 4:4.2.2), libboost-dev, libkexiv2-7-dev, python
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Homepage: http://plasma.kde.org/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/kdeplasma-addons
Vcs-Svn: svn://svn.debian.org/pkg-kde/trunk/packages/kdeplasma-addons
@@ -119,7 +119,7 @@
plasma addons module.
Package: kdeplasma-addons-dbg
-Section: libdevel
+Section: debug
Architecture: any
Priority: extra
Conflicts: kdeplasmoids-dbg
Added: trunk/packages/kdeplasma-addons/debian/patches/02_missing_bball_image_bug525090.diff
===================================================================
--- trunk/packages/kdeplasma-addons/debian/patches/02_missing_bball_image_bug525090.diff (rev 0)
+++ trunk/packages/kdeplasma-addons/debian/patches/02_missing_bball_image_bug525090.diff 2009-05-02 15:26:19 UTC (rev 14554)
@@ -0,0 +1,76 @@
+--- a/applets/bball/bball.cpp
++++ b/applets/bball/bball.cpp
+@@ -101,7 +101,7 @@ void bballApplet::readConfiguration()
+
+ //Appearance
+ m_image_url = cg.readEntry ("ImgURL", KStandardDirs::locate ("data", "bball/bball.svg"));
+- m_ball_img = QImage (m_image_url);
++ m_ball_img.setImagePath(m_image_url);
+ m_overlay_enabled = cg.readEntry ("OverlayEnabled", false);
+ m_overlay_colour = cg.readEntry ("OverlayColour", QColor ());
+ m_overlay_opacity = cg.readEntry ("OverlayOpactiy", 0);
+@@ -171,7 +171,7 @@ void bballApplet::configAccepted ()
+ if(KIO::NetAccess::exists(ui.imageUrl->url (), KIO::NetAccess::SourceSide, NULL))
+ {
+ m_image_url = ui.imageUrl->url ().path ();
+- m_ball_img = QImage (m_image_url);
++ m_ball_img.setImagePath(m_image_url);
+ cg.writeEntry ("ImgURL", m_image_url);
+ }
+ else
+@@ -229,7 +229,7 @@ void bballApplet::configAccepted ()
+ //mouse - undo the mouse clicked
+ m_mouse_pressed = false;
+
+- update ();
++ update();
+ }
+
+ QSizeF bballApplet::contentSizeHint() const
+@@ -256,10 +256,11 @@ void bballApplet::updateScaledBallImage(
+ kDebug() << m_overlay_colour;
+ kDebug() << m_overlay_opacity;
+
+- m_ball_scaled_img = m_ball_img.scaled( m_radius * 2, m_radius * 2 );
++ m_ball_img.resize( m_radius * 2, m_radius * 2 );
++ m_pixmap = m_ball_img.pixmap();
+ if (m_overlay_enabled)
+ {
+- QPainter p(&m_ball_scaled_img);
++ QPainter p(&m_pixmap);
+ p.setPen (QColor (0, 0, 0, 0));
+ p.setBrush (m_overlay_colour);
+ p.drawPie (m_pie_size, 0, 5760);
+@@ -415,8 +416,7 @@ void bballApplet::paintInterface (QPaint
+ p->translate(m_radius, m_radius);
+ p->rotate(m_angle);
+ p->translate(-m_radius, -m_radius);
+- p->drawImage(QPoint (0, 0), m_ball_scaled_img);
+-
++ p->drawPixmap(QPoint (0, 0), m_pixmap);
+ }
+
+ void bballApplet::mousePressEvent (QGraphicsSceneMouseEvent * event)
+--- a/applets/bball/bball.h
++++ b/applets/bball/bball.h
+@@ -79,7 +79,8 @@ private:
+ QRectF m_position, m_screen, m_pie_size;
+ QPointF m_old_mouse, m_mouse;
+ qreal m_angle;
+- QImage m_ball_img, m_ball_scaled_img;
++ Plasma::Svg m_ball_img;
++ QPixmap m_pixmap;
+ double m_x_vel, m_y_vel, m_gravity, m_resitution, m_friction, m_circum_vel, m_auto_bounce_strength;
+ bool m_mouse_pressed, m_sound_enabled, m_auto_bounce_enabled, m_overlay_enabled;
+ QTimer *m_timer;
+--- a/applets/bball/bballConfig.ui
++++ b/applets/bball/bballConfig.ui
+@@ -45,7 +45,7 @@
+ </sizepolicy>
+ </property>
+ <property name="filter" >
+- <string>*.png *.gif *.svg *.jpeg *.jpg</string>
++ <string>*.png *.gif *.svg *.svgz *.jpeg *.jpg</string>
+ </property>
+ </widget>
+ </item>
Modified: trunk/packages/kdeplasma-addons/debian/patches/series
===================================================================
--- trunk/packages/kdeplasma-addons/debian/patches/series 2009-05-02 15:23:56 UTC (rev 14553)
+++ trunk/packages/kdeplasma-addons/debian/patches/series 2009-05-02 15:26:19 UTC (rev 14554)
@@ -1 +1,2 @@
01_lancelot_qt4.5_support.diff
+02_missing_bball_image_bug525090.diff
More information about the pkg-kde-commits
mailing list