packages: koffice/koffice.spec, koffice/gcc44.patch (NEW) - add gcc44.patch

[glen]

Author: glen                         Date: Mon Aug 24 23:42:09 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add gcc44.patch

---- Files affected:
packages/koffice:
   koffice.spec (1.204 -> 1.205) , gcc44.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/koffice/koffice.spec
diff -u packages/koffice/koffice.spec:1.204 packages/koffice/koffice.spec:1.205
--- packages/koffice/koffice.spec:1.204	Tue Aug 25 00:56:16 2009
+++ packages/koffice/koffice.spec	Tue Aug 25 01:42:04 2009
@@ -30,6 +30,7 @@
 Patch5:		%{name}-gmagick.patch
 Patch6:		kde-am.patch
 Patch7:		typo.patch
+Patch8:		gcc44.patch
 URL:		http://www.koffice.org/
 BuildRequires:	GraphicsMagick-devel >= 1.1.7
 BuildRequires:	ImageMagick-c++-devel >= 1:6.2.4.0
@@ -405,6 +406,7 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 %{__sed} -i 's/Categories=Qt;KDE;Office/Categories=Qt;KDE;Office;X-Misc;/' \
 	tools/kthesaurus/KThesaurus.desktop
@@ -1042,6 +1044,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.205  2009/08/24 23:42:04  glen
+- add gcc44.patch
+
 Revision 1.204  2009/08/24 22:56:16  glen
 - add typo.patch; rel 15
 

================================================================
Index: packages/koffice/gcc44.patch
diff -u /dev/null packages/koffice/gcc44.patch:1.1
--- /dev/null	Tue Aug 25 01:42:09 2009
+++ packages/koffice/gcc44.patch	Tue Aug 25 01:42:04 2009
@@ -0,0 +1,47 @@
+--- koffice-1.6.3/filters/kword/pdf/xpdf/goo/gfile.cc~	2009-08-25 02:39:40.000000000 +0300
++++ koffice-1.6.3/filters/kword/pdf/xpdf/goo/gfile.cc	2009-08-25 02:40:01.601199662 +0300
+@@ -277,7 +277,7 @@
+ GString *grabPath(const char *fileName) {
+ #ifdef VMS
+   //---------- VMS ----------
+-  char *p;
++  const char *p;
+ 
+   if ((p = strrchr(fileName, ']')))
+     return new GString(fileName, p + 1 - fileName);
+@@ -287,7 +287,7 @@
+ 
+ #elif defined(__EMX__) || defined(WIN32)
+   //---------- OS/2+EMX and Win32 ----------
+-  char *p;
++  const char *p;
+ 
+   if ((p = strrchr(fileName, '/')))
+     return new GString(fileName, p - fileName);
+@@ -299,7 +299,7 @@
+ 
+ #elif defined(ACORN)
+   //---------- RISCOS ----------
+-  char *p;
++  const char *p;
+ 
+   if ((p = strrchr(fileName, '.')))
+     return new GString(fileName, p - fileName);
+@@ -307,7 +307,7 @@
+ 
+ #elif defined(MACOS)
+   //---------- MacOS ----------
+-  char *p;
++  const char *p;
+ 
+   if ((p = strrchr(fileName, ':')))
+     return new GString(fileName, p - fileName);
+@@ -315,7 +315,7 @@
+ 
+ #else
+   //---------- Unix ----------
+-  char *p;
++  const char *p;
+ 
+   if ((p = strrchr(fileName, '/')))
+     return new GString(fileName, p - fileName);
================================================================

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