packages: kdepim/kdepim.spec, kdepim/gcc45.patch (NEW) - arts bcond (off) -...

[glen]

Author: glen                         Date: Thu Jul  8 20:26:05 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- arts bcond (off)
- fix build with gcc 4.5

---- Files affected:
packages/kdepim:
   kdepim.spec (1.305 -> 1.306) , gcc45.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/kdepim/kdepim.spec
diff -u packages/kdepim/kdepim.spec:1.305 packages/kdepim/kdepim.spec:1.306
--- packages/kdepim/kdepim.spec:1.305	Mon Feb 15 19:30:28 2010
+++ packages/kdepim/kdepim.spec	Thu Jul  8 22:26:00 2010
@@ -1,6 +1,6 @@
 # $Revision$, $Date$
 # TODO
-# - subpackages for akregator, korganizer(?), kitchensync
+# - subpackages for akregator, korganizer(?)
 # - unpackaged:
 #   /usr/bin/kabcdistlistupdater
 #   /usr/lib64/libknodecommon.so
@@ -11,7 +11,8 @@
 %bcond_without	hidden_visibility	# don't use gcc hidden visibility
 %bcond_without	kitchensync		# build with kitchensync
 %bcond_without	indexlib		# disable full text indexing support
-#
+%bcond_with	arts			# build with aRts support
+
 %define		_state		stable
 %define		_minlibsevr	9:%{version}
 %define		_minbaseevr	9:%{version}
@@ -23,7 +24,7 @@
 Summary(uk.UTF-8):	Персональный планувальник (PIM) для KDE
 Name:		kdepim
 Version:	3.5.10
-Release:	7
+Release:	7.10
 Epoch:		9
 License:	GPL
 Group:		X11/Applications
@@ -42,8 +43,9 @@
 Patch9:		%{name}-inotify.patch
 Patch10:	kde-am.patch
 Patch11:	kdepim-3.5.10-gcc_4.4-2.patch
+Patch12:	gcc45.patch
 BuildRequires:	autoconf
-BuildRequires:	autoconf
+BuildRequires:	autoconf < 2.64
 BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	bluez-libs-devel
@@ -537,6 +539,7 @@
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Office;Calendar;/' \
 	korganizer/korganizer.desktop
@@ -581,7 +584,7 @@
 	%{__make} -f admin/Makefile.common cvs
 fi
 
-export PKG_CONFIG_PATH=%{_libdir}/pkgconfig
+export PKG_CONFIG_PATH=%{_pkgconfigdir}
 
 %configure \
 	--%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
@@ -589,6 +592,7 @@
 	--disable-final \
 	%{?with_hidden_visibility:--enable-gcc-hidden-visibility} \
 	%{?with_indexlib:--enable-indexlib} \
+	--with%{!?with_arts:out}-arts \
 %if "%{_lib}" == "lib64"
 	--enable-libsuffix=64 \
 %endif
@@ -991,6 +995,7 @@
 
 %if %{with kitchensync}
 %files kitchensync
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kitchensync
 %attr(755,root,root) %{_libdir}/libkitchensync.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libkitchensync.so.0
@@ -1276,6 +1281,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.306  2010/07/08 20:26:00  glen
+- arts bcond (off)
+- fix build with gcc 4.5
+
 Revision 1.305  2010/02/15 18:30:28  glen
 - kitchensync to subpackage
 - indexlib bcond

================================================================
Index: packages/kdepim/gcc45.patch
diff -u /dev/null packages/kdepim/gcc45.patch:1.1
--- /dev/null	Thu Jul  8 22:26:05 2010
+++ packages/kdepim/gcc45.patch	Thu Jul  8 22:26:00 2010
@@ -0,0 +1,34 @@
+--- /home/glen/BUILD/kdepim-3.5.10/konsolekalendar/main.cpp~	2008-02-13 11:39:54.000000000 +0200
++++ /home/glen/BUILD/kdepim-3.5.10/konsolekalendar/main.cpp	2010-07-08 23:23:01.418447242 +0300
+@@ -799,13 +799,13 @@
+   if ( !args->isSet( "time" )     && !args->isSet( "epoch-start" ) &&
+        !args->isSet( "end-time" ) && !args->isSet( "epoch-end" ) ) {
+     // set default start date/time
+-    startdatetime = QDateTime::QDateTime( startdate, starttime );
++    startdatetime = QDateTime( startdate, starttime );
+     kdDebug() << "main | datetimestamp | "
+               << "setting startdatetime from "
+               << "default startdate (today) and starttime"
+               << endl;
+     // set default end date/time
+-    enddatetime = QDateTime::QDateTime( enddate, endtime );
++    enddatetime = QDateTime( enddate, endtime );
+     kdDebug() << "main | datetimestamp | "
+               << "setting enddatetime from "
+               << "default enddate (today) and endtime"
+@@ -814,13 +814,13 @@
+ 
+   // Set startdatetime, enddatetime if still necessary
+   if ( startdatetime.isNull() ) {
+-    startdatetime = QDateTime::QDateTime( startdate, starttime );
++    startdatetime = QDateTime( startdate, starttime );
+     kdDebug() << "main | datetimestamp | "
+               << "setting startdatetime from startdate and starttime"
+               << endl;
+   }
+   if ( enddatetime.isNull() ) {
+-    enddatetime = QDateTime::QDateTime( enddate, endtime );
++    enddatetime = QDateTime( enddate, endtime );
+     kdDebug() << "main | datetimestamp | "
+               << "setting enddatetime from enddate and endtime"
+               << endl;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdepim/kdepim.spec?r1=1.305&r2=1.306&f=u