packages: kde4-koffice/kde4-koffice.spec, kde4-koffice/koffice-2.3.3-no-qde...

[arekm]

Author: arekm                        Date: Thu Jan 26 21:02:53 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 14; updated kde4 deps; fix build

---- Files affected:
packages/kde4-koffice:
   kde4-koffice.spec (1.131 -> 1.132) , koffice-2.3.3-no-qdebug-pixmap.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/kde4-koffice/kde4-koffice.spec
diff -u packages/kde4-koffice/kde4-koffice.spec:1.131 packages/kde4-koffice/kde4-koffice.spec:1.132
--- packages/kde4-koffice/kde4-koffice.spec:1.131	Fri Jan 13 15:49:35 2012
+++ packages/kde4-koffice/kde4-koffice.spec	Thu Jan 26 22:02:48 2012
@@ -11,8 +11,8 @@
 
 %define		_state		stable
 %define		orgname		koffice
-%define		kdever		4.6.0
-%define		qtver		4.7.1
+%define		kdever		4.8.0
+%define		qtver		4.8.0
 
 Summary:	KOffice - powerful office suite for KDE
 Summary(pl.UTF-8):	KOffice - potężny pakiet biurowy dla KDE
@@ -22,13 +22,14 @@
 Summary(zh_CN.UTF-8):	KDE 的办公应用软件集。
 Name:		kde4-koffice
 Version:	2.3.3
-Release:	13
+Release:	14
 License:	GPL/LGPL
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{orgname}-%{version}/%{orgname}-%{version}.tar.bz2
 # Source0-md5:	1ebb955d54b6d6032999cc92e4b13bfe
 URL:		http://www.koffice.org/
 Patch0:		%{name}-libwpg02.patch
+Patch1:		koffice-2.3.3-no-qdebug-pixmap.patch
 BuildRequires:	GraphicsMagick-devel
 BuildRequires:	OpenEXR-devel
 BuildRequires:	OpenGL-GLU-devel
@@ -49,10 +50,10 @@
 BuildRequires:	lcms-devel >= 1.18
 BuildRequires:	libexif-devel >= 0.6.12
 BuildRequires:	libjpeg-devel
-BuildRequires:	libkdcraw-devel >= %{kdever}
-BuildRequires:	libkexiv2-devel >= %{kdever}
-BuildRequires:	libkipi-devel >= %{kdever}
-BuildRequires:	libksane-devel >= %{kdever}
+BuildRequires:	kde4-libkdcraw-devel >= %{kdever}
+BuildRequires:	kde4-libkexiv2-devel >= %{kdever}
+BuildRequires:	kde4-libkipi-devel >= %{kdever}
+BuildRequires:	kde4-libksane-devel >= %{kdever}
 BuildRequires:	libpng-devel
 BuildRequires:	libpqxx-devel
 BuildRequires:	libtiff-devel
@@ -61,7 +62,7 @@
 BuildRequires:	libxml2-devel >= 0:2.4.8
 BuildRequires:	libxslt-devel >= 1.0.7
 BuildRequires:	mysql-devel
-BuildRequires:	okular-devel >= %{kdever}
+BuildRequires:	kde4-okular-devel >= %{kdever}
 BuildRequires:	openjpeg-devel >= 1.3
 BuildRequires:	pkgconfig
 %if %{with pdf}
@@ -337,6 +338,7 @@
 %prep
 %setup -q -n %{orgname}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 install -d build
@@ -949,6 +951,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.132  2012/01/26 21:02:48  arekm
+- rel 14; updated kde4 deps; fix build
+
 Revision 1.131  2012/01/13 14:49:35  arekm
 - release 13
 

================================================================
Index: packages/kde4-koffice/koffice-2.3.3-no-qdebug-pixmap.patch
diff -u /dev/null packages/kde4-koffice/koffice-2.3.3-no-qdebug-pixmap.patch:1.1
--- /dev/null	Thu Jan 26 22:02:53 2012
+++ packages/kde4-koffice/koffice-2.3.3-no-qdebug-pixmap.patch	Thu Jan 26 22:02:48 2012
@@ -0,0 +1,11 @@
+diff -up koffice-2.3.3/plugins/chartshape/kdchart/kdchart/KDChartBackgroundAttributes.cpp.no-qdebug-pixmap koffice-2.3.3/plugins/chartshape/kdchart/kdchart/KDChartBackgroundAttributes.cpp
+--- koffice-2.3.3/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp.no-qdebug-pixmap	2011-02-17 13:10:38.000000000 +0100
++++ koffice-2.3.3/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp	2011-09-08 15:03:31.932039128 +0200
+@@ -150,7 +150,6 @@ QDebug operator<<(QDebug dbg, const KDCh
+ 	<< "visible="<<ba.isVisible()
+ 	<< "brush="<<ba.brush()
+ 	<< "pixmapmode="<<ba.pixmapMode()
+-	<< "pixmap="<<ba.pixmap()
+ 	<< ")";
+     return dbg;
+ }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-koffice/kde4-koffice.spec?r1=1.131&r2=1.132&f=u