Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8d5d7f301d58aa43b4a894b5e03bbc15bf1f5fdf
commit 8d5d7f301d58aa43b4a894b5e03bbc15bf1f5fdf Author: bouleetbil <bouleet...@frogdev.info> Date: Thu Aug 20 10:23:35 2009 +0200 koffice-1.6.3-8-i686 *rebuild with kdebase>=3.5.10-3 for #3869 *added some patchs diff --git a/source/kde-extra/koffice/FrugalBuild b/source/kde-extra/koffice/FrugalBuild index 8604062..b0d0709 100644 --- a/source/kde-extra/koffice/FrugalBuild +++ b/source/kde-extra/koffice/FrugalBuild @@ -4,10 +4,10 @@ pkgname=koffice pkgver=1.6.3 -pkgrel=7 +pkgrel=8 pkgdesc="An integrated Office suite for KDE" url="http://www.koffice.org"; -depends=('libkexif' 'kdebase>=3.5.9' 'libpqxx=2.6.9' 'wv2' 'libmysqlclient' 'libwpd' \ +depends=('libkexif' 'kdebase>=3.5.10-3' 'libpqxx=2.6.9' 'wv2' 'libmysqlclient' 'libwpd' \ 'python>=2.6' 'ruby>=1.8.4-2' 'imagemagick' 'poppler-qt>=0.8.0' 'imagemagick' 'readline') makedepends=('doxygen' 'qt-docs>=3.3.6' 'kdebindings>=3.5.9' 'mysql' 'pkgconfig' 'postgresql') groups=('kde-extra') @@ -21,7 +21,7 @@ source=(ftp://ftp.fu-berlin.de/pub/unix/X11/gui/kde/stable/$pkgname-latest/src/$ desktop-files.patch \ ftp://ftp.kde.org/pub/kde/security_patches/koffice-xpdf-CVE-2007-3387.diff \ ftp://ftp.kde.org/pub/kde/security_patches/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff \ - gcc-43.patch) + gcc-43.patch digest_cc.diff glibc210.diff) subpkgs=("$pkgname-docs") subdescs=('Koffice Documentation.') @@ -29,10 +29,12 @@ subdepends=("$pkgname>=$pkgver") subgroups=('kde-extra') subarchs=('i686 x86_64 ppc') - sha1sums=('de84214dec913eac1d47dab04dd93f3d81729fd3' \ 'a5efbe2b1effecde988ef55cf65eebb5d8c95a4a' \ 'bff4f540389a77320bc87e2dedece50b82932e59' \ 'a3d1d85567ccf729a2237f4aa837f7e025ce00ae' \ - '807e3717de8710621007556a41e72fe89ee5cba2') + '807e3717de8710621007556a41e72fe89ee5cba2' \ + '76f840156fa3105ceebd3628796af26d9d1bc951' \ + '58ee7b81dca085692d063f064ece89b514135f65') + # optimization OK diff --git a/source/kde-extra/koffice/digest_cc.diff b/source/kde-extra/koffice/digest_cc.diff new file mode 100644 index 0000000..596c59f --- /dev/null +++ b/source/kde-extra/koffice/digest_cc.diff @@ -0,0 +1,11 @@ +--- kspread-1.6.3_p20090204/kspread/digest.cc 2006/03/24 09:20:42 522032 ++++ kspread-1.6.3_p20090204/kspread/digest.cc 2009/02/26 10:09:03 932093 +@@ -50,7 +50,7 @@ + + #if SIZEOF_INT == 4 + typedef unsigned int sal_uInt32; +-#elif ++#else + typedef unsigned long sal_uInt32; + #endif + diff --git a/source/kde-extra/koffice/glibc210.diff b/source/kde-extra/koffice/glibc210.diff new file mode 100644 index 0000000..4916368 --- /dev/null +++ b/source/kde-extra/koffice/glibc210.diff @@ -0,0 +1,47 @@ +--- kword-1.6.3_p20090519/filters/kword/pdf/xpdf/goo/gfile.cc 2009-05-25 15:51:25.000000000 +0100 ++++ kword-1.6.3_p20090519/filters/kword/pdf/xpdf/goo/gfile.cc 2009-05-25 15:51:20.000000000 +0100 +@@ -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); +@@ -300,7 +300,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); _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
