Author: glen Date: Mon Aug 24 19:44:24 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- gcc44 patch
---- Files affected:
packages/kdenetwork:
kdenetwork.spec (1.273 -> 1.274) , gcc44.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/kdenetwork/kdenetwork.spec
diff -u packages/kdenetwork/kdenetwork.spec:1.273 packages/kdenetwork/kdenetwork.spec:1.274
--- packages/kdenetwork/kdenetwork.spec:1.273 Wed Jun 17 23:20:59 2009
+++ packages/kdenetwork/kdenetwork.spec Mon Aug 24 21:44:19 2009
@@ -41,6 +41,7 @@
Patch5: %{name}-libjingle.patch
Patch6: %{name}-gcc.patch
Patch7: kde-am.patch
+Patch8: gcc44.patch
URL: http://www.kde.org/
BuildRequires: alsa-lib-devel
BuildRequires: autoconf
@@ -1036,6 +1037,7 @@
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Network;FileTransfer;/' \
-e 's/Terminal=0/Terminal=false/' -e '/\[Desktop Entry\]/aEncoding=UTF-8' \
@@ -1741,6 +1743,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.274 2009/08/24 19:44:19 glen
+- gcc44 patch
+
Revision 1.273 2009/06/17 21:20:59 hawk
- release 7
================================================================
Index: packages/kdenetwork/gcc44.patch
diff -u /dev/null packages/kdenetwork/gcc44.patch:1.1
--- /dev/null Mon Aug 24 21:44:24 2009
+++ packages/kdenetwork/gcc44.patch Mon Aug 24 21:44:19 2009
@@ -0,0 +1,22 @@
+--- kdenetwork-3.5.10/kopete/protocols/groupwise/libgroupwise/rtf.ll~ 2009-08-24 22:36:11.000000000 +0300
++++ kdenetwork-3.5.10/kopete/protocols/groupwise/libgroupwise/rtf.ll 2009-08-24 22:36:12.436257872 +0300
+@@ -570,7 +570,7 @@
+
+ FontDef& def = p->fonts[m_nFont-1];
+
+- char *pp = strchr(str, ';');
++ const char *pp = strchr(str, ';');
+ unsigned size;
+ if (pp != NULL)
+ size = (pp - str);
+--- kdenetwork-3.5.10/kopete/protocols/groupwise/libgroupwise/rtf.cc~ 2005-09-10 11:20:20.000000000 +0300
++++ kdenetwork-3.5.10/kopete/protocols/groupwise/libgroupwise/rtf.cc 2009-08-24 22:36:34.696012692 +0300
+@@ -2235,7 +2235,7 @@
+
+ FontDef& def = p->fonts[m_nFont-1];
+
+- char *pp = strchr(str, ';');
++ const char *pp = strchr(str, ';');
+ unsigned size;
+ if (pp != NULL)
+ size = (pp - str);
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdenetwork/kdenetwork.spec?r1=1.273&r2=1.274&f=u