[arch-commits] Commit in kdegraphics/trunk (183850-workaround.patch PKGBUILD)

[Pierre Schmitz]

    Date: Thursday, April 30, 2009 @ 20:23:50
  Author: pierre
Revision: 37182

KDE 4.2.3 first try

Modified:
  kdegraphics/trunk/PKGBUILD
Deleted:
  kdegraphics/trunk/183850-workaround.patch

-------------------------+
 183850-workaround.patch |   12 ------------
 PKGBUILD                |   12 +++---------
 2 files changed, 3 insertions(+), 21 deletions(-)

Deleted: 183850-workaround.patch
===================================================================
--- 183850-workaround.patch	2009-05-01 00:22:59 UTC (rev 37181)
+++ 183850-workaround.patch	2009-05-01 00:23:50 UTC (rev 37182)
@@ -1,12 +0,0 @@
-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: PKGBUILD
===================================================================
--- PKGBUILD	2009-05-01 00:22:59 UTC (rev 37181)
+++ PKGBUILD	2009-05-01 00:23:50 UTC (rev 37182)
@@ -14,17 +14,11 @@
 replaces=('gwenview' 'gwenview-i18n' 'libkexiv2' 'libkdcraw')
 options=('docs')
 install='kdegraphics.install'
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        '183850-workaround.patch')
-md5sums=('29e9a466cd2b282a5139aeca8cc312a2'
-         '1e63a65780b0aae6f817102be3d468ef')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('29e9a466cd2b282a5139aeca8cc312a2')
 
 build() {
-	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 ../
+	cd $srcdir
 	mkdir build
 	cd build
 	cmake ../${pkgname}-${pkgver} \