diff --git a/.cvsignore b/.cvsignore index 057c9d9..5770ba8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ kdegraphics-4.2.90.tar.bz2 +kdegraphics-4.2.95.tar.bz2 diff --git a/kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch b/kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch deleted file mode 100644 index 0b7ad49..0000000 --- a/kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch +++ /dev/null @@ -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). diff --git a/kdegraphics.spec b/kdegraphics.spec index 621fdfc..acf2d9f 100644 --- a/kdegraphics.spec +++ b/kdegraphics.spec @@ -7,8 +7,8 @@ Summary: K Desktop Environment - Graphics Applications Epoch: 7 -Version: 4.2.90 -Release: 2%{?dist} +Version: 4.2.95 +Release: 1%{?dist} Name: kdegraphics #Obsoletes: kdegraphics4 < %{version}-%{release} @@ -18,9 +18,6 @@ Group: Applications/Multimedia License: GPLv2 URL: http://www.kde.org/ Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegraphics-%{version}.tar.bz2 -# work around Kolourpaint crash with Qt 4.5 (kde#183850) -# patch from the upstream bug report -Patch0: kdegraphics-4.2.2-kolourpaint-kde#183850-workaround.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## upstream patches @@ -99,7 +96,6 @@ Summary: A kioslave for displaying WinHelp files %prep %setup -q -n kdegraphics-%{version} -%patch0 -p1 -b .kolourpaint-kde#183850-workaround %build @@ -235,6 +231,9 @@ fi %changelog +* Fri Jun 26 2009 Than Ngo - 4.2.95-1 +- 4.3rc1 + * Mon Jun 22 2009 Rex Dieter - 4.2.90-2 - rebuild (poppler reduced libs) diff --git a/sources b/sources index def3939..1a0da69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -55c5f83e261230de96b4d4b52c419d7b kdegraphics-4.2.90.tar.bz2 +7feb16636779a580fd19c6193fdfa6cc kdegraphics-4.2.95.tar.bz2