From b702fd338cc39a6d063048f130cba30a9430f6e8 Mon Sep 17 00:00:00 2001 From: Tobias Hintze Date: Fri, 31 Mar 2006 19:36:35 +0000 Subject: [PATCH] Tobias Hintze : updated koffice from 1.4.2 to 1.5-rc1 tested in a complete crystal _build_ (no runtime check yet) rediffed without l10n updates (new import package from stf) Index: package/kde/koffice/hotfix-binutils-gcc.patch =================================================================== [2006033018410318931] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7388 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/kde/koffice/hotfix-binutils-gcc.patch | 53 ------------------- package/kde/koffice/koffice.desc | 4 +- 2 files changed, 2 insertions(+), 55 deletions(-) delete mode 100644 package/kde/koffice/hotfix-binutils-gcc.patch diff --git a/package/kde/koffice/hotfix-binutils-gcc.patch b/package/kde/koffice/hotfix-binutils-gcc.patch deleted file mode 100644 index a7740b113..000000000 --- a/package/kde/koffice/hotfix-binutils-gcc.patch +++ /dev/null @@ -1,53 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/kde/koffice/hotfix-binutils-gcc.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -Hotfix needed for new binutils (bug is in gcc) -(see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=16625) - ---- ./kchart/kdchart/KDChartEnums.h.orig 2004-08-13 14:23:43.000000000 +0200 -+++ ./kchart/kdchart/KDChartEnums.h 2004-08-13 14:24:41.000000000 +0200 -@@ -279,22 +279,25 @@ - return "TopCenter"; - case PosTopRight: - return "TopRight"; -+ } -+ switch( type ) { - case PosCenterLeft: - return "CenterLeft"; - case PosCenter: - return "Center"; - case PosCenterRight: - return "CenterRight"; -+ } -+ switch( type ) { - case PosBottomLeft: - return "BottomLeft"; - case PosBottomCenter: - return "BottomCenter"; - case PosBottomRight: - return "BottomRight"; -- default: // should not happen -- qDebug( "Unknown content position" ); -- return "TopLeft"; - } -+ qDebug( "Unknown content position" ); -+ return "TopLeft"; - } - - diff --git a/package/kde/koffice/koffice.desc b/package/kde/koffice/koffice.desc index dac9dedfd..95ff1bbf5 100644 --- a/package/kde/koffice/koffice.desc +++ b/package/kde/koffice/koffice.desc @@ -43,8 +43,8 @@ [L] GPL [S] Stable -[V] 1.4.2 +[V] 1.5.0-rc1 [P] X -?---5---9 201.200 -[D] 3671036925 koffice-1.4.2.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/koffice-1.4.2/src/ +[D] 2989702026 koffice-1.5.0-rc1.tar.bz2 ftp://ftp.kde.org/pub/kde/unstable/koffice-1.5-rc1/src/