Author: glen Date: Tue Jan 19 11:16:50 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- add gcc44.patch
---- Files affected:
packages/kdepim:
kdepim.spec (1.298 -> 1.299) , gcc44.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/kdepim/kdepim.spec
diff -u packages/kdepim/kdepim.spec:1.298 packages/kdepim/kdepim.spec:1.299
--- packages/kdepim/kdepim.spec:1.298 Mon Jan 18 19:23:32 2010
+++ packages/kdepim/kdepim.spec Tue Jan 19 12:16:44 2010
@@ -17,7 +17,7 @@
Summary(uk.UTF-8): Персональный планувальник (PIM) для KDE
Name: kdepim
Version: 3.5.10
-Release: 6
+Release: 7
Epoch: 9
License: GPL
Group: X11/Applications
@@ -35,6 +35,7 @@
Patch8: %{name}-sparc64.patch
Patch9: %{name}-inotify.patch
Patch10: kde-am.patch
+Patch11: gcc44.patch
BuildRequires: autoconf
BuildRequires: autoconf
BuildRequires: automake
@@ -514,6 +515,7 @@
%patch8 -p1
%patch9 -p1
%patch10 -p1
+%patch11 -p1
%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Office;Calendar;/' \
korganizer/korganizer.desktop
@@ -1234,6 +1236,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.299 2010/01/19 11:16:44 glen
+- add gcc44.patch
+
Revision 1.298 2010/01/18 18:23:32 glen
- kdelibs-libs removed; rel 6
================================================================
Index: packages/kdepim/gcc44.patch
diff -u /dev/null packages/kdepim/gcc44.patch:1.1
--- /dev/null Tue Jan 19 12:16:50 2010
+++ packages/kdepim/gcc44.patch Tue Jan 19 12:16:44 2010
@@ -0,0 +1,15 @@
+Revert stupididy from http://websvn.kde.org/?view=revision&revision=462288
+
+fixes build with gcc 4.4
+
+--- kdepim-3.5.10/indexlib/memvector.tcc~ 2010-01-19 13:14:35.000000000
+0200
++++ kdepim-3.5.10/indexlib/memvector.tcc 2010-01-19 13:14:36.764665735
+0200
+@@ -33,7 +33,7 @@
+ data_->resize( n_s * byte_io::byte_lenght<value_type>() +
byte_io::byte_lenght<unsigned>() );
+ iterator p_end = end();
+ byte_io::write<unsigned>( data_->rw_base( 0 ), n_s );
+- while ( operator !=<unsigned, unsigned>(p_end, end()) ) {
++ while ( p_end != end() ) {
+ *p_end = value_type();
+ ++p_end;
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdepim/kdepim.spec?r1=1.298&r2=1.299&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
