Date: Saturday, April 11, 2009 @ 13:25:08
Author: andrea
Revision: 35255
Merged revisions 34911 via svnmerge from
svn+ssh://archlinux.org/srv/svn-packages/kdegraphics/trunk
........
r34911 | pierre | 2009-04-11 16:54:41 +0200 (Sat, 11 Apr 2009) | 2 lines
upgpkg: kdegraphics 4.2.2-2
FS#14181
........
Added:
kdegraphics/repos/extra-i686/183850-workaround.patch
(from rev 34911, kdegraphics/trunk/183850-workaround.patch)
Modified:
kdegraphics/repos/extra-i686/ (properties)
kdegraphics/repos/extra-i686/PKGBUILD
-------------------------+
183850-workaround.patch | 12 ++++++++++++
PKGBUILD | 14 ++++++++++----
2 files changed, 22 insertions(+), 4 deletions(-)
Property changes on: kdegraphics/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /kdegraphics/trunk:1-31770
+ /kdegraphics/trunk:1-35254
Copied: kdegraphics/repos/extra-i686/183850-workaround.patch (from rev 34911, kdegraphics/trunk/183850-workaround.patch)
===================================================================
--- extra-i686/183850-workaround.patch (rev 0)
+++ extra-i686/183850-workaround.patch 2009-04-11 17:25:08 UTC (rev 35255)
@@ -0,0 +1,12 @@
+diff -ur kdegraphics-4.2.2/kolourpaint/pixmapfx/kpPixmapFX_MaskOps.cpp kdegraphics-4.2.2-kolourpaint-kde#183850-workaround/kolourpaint/pixmapfx/kpPixmapFX_MaskOps.cpp
+--- kdegraphics-4.2.2/kolourpaint/pixmapfx/kpPixmapFX_MaskOps.cpp 2008-12-21 21:19:06.000000000 +0100
++++ kdegraphics-4.2.2-kolourpaint-kde#183850-workaround/kolourpaint/pixmapfx/kpPixmapFX_MaskOps.cpp 2009-04-03 15:23:49.000000000 +0200
+@@ -252,7 +252,7 @@
+ // Copy RGB layer.
+ *destPixmapPtr = QPixmap (oldPixmap.width (), oldPixmap.height ());
+ QPainter p (destPixmapPtr);
+- p.drawPixmap (QPoint (0, 0), oldPixmap);
++ p.drawImage (QPoint (0, 0), oldPixmap.toImage());
+ p.end ();
+
+ // Copy mask layer (if any).
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-04-11 17:16:01 UTC (rev 35254)
+++ extra-i686/PKGBUILD 2009-04-11 17:25:08 UTC (rev 35255)
@@ -3,7 +3,7 @@
pkgname=kdegraphics
pkgver=4.2.2
-pkgrel=1
+pkgrel=2
pkgdesc="KDE Graphics is a collection of graphic oriented applications:"
arch=('i686' 'x86_64')
url='http://www.kde.org'
@@ -14,11 +14,17 @@
replaces=('gwenview' 'gwenview-i18n' 'libkexiv2' 'libkdcraw')
options=('docs')
install='kdegraphics.install'
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('92ccbd703885a1f7788e4f27f281a75c')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
+ '183850-workaround.patch')
+md5sums=('92ccbd703885a1f7788e4f27f281a75c'
+ '1e63a65780b0aae6f817102be3d468ef')
build() {
- cd $srcdir
+ cd $srcdir/${pkgname}-${pkgver}
+ # workaround for bug in Qt; see http://bugs.kde.org/show_bug.cgi?id=183850
+ # should be removed with Qt 4.5.1
+ patch -p1 -i $srcdir/183850-workaround.patch
+ cd ../
mkdir build
cd build
cmake ../${pkgname}-${pkgver} \