Author: glen Date: Tue Sep 8 07:59:21 2009 GMT Module: packages Tag: HEAD ---- Log message: - add branch.diff; updates/hacks to make build in current th
---- Files affected: packages/koffice: koffice.spec (1.205 -> 1.206) , ImageMagick.patch (NONE -> 1.1) (NEW), ac264.patch (NONE -> 1.1) (NEW), bug-155852.patch (NONE -> 1.1) (NEW), typo.patch (1.2 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/koffice/koffice.spec diff -u packages/koffice/koffice.spec:1.205 packages/koffice/koffice.spec:1.206 --- packages/koffice/koffice.spec:1.205 Tue Aug 25 01:42:04 2009 +++ packages/koffice/koffice.spec Tue Sep 8 09:59:16 2009 @@ -1,4 +1,8 @@ # $Revision$, $Date$ +# +# Conditional build: +%bcond_with gmagick # build with graphicsmagick + # TODO: # - move libkexidb*.so to -common package? i.e. kspread needs them. # - remove /usr/share/doc/kde/HTML/en/koffice-apidocs parts from non-apidoc packages. @@ -22,6 +26,7 @@ Group: X11/Applications Source0: ftp://ftp.kde.org/pub/kde/%{_state}/koffice-%{version}/src/%{name}-%{version}.tar.bz2 # Source0-md5: 386d388094734f9759977c3267098e30 +Patch100: %{name}-branch.diff Patch0: kde-common-PLD.patch Patch1: %{name}-build.patch Patch2: %{name}-python25-64bit.patch @@ -29,11 +34,14 @@ Patch4: %{name}-gcc.patch Patch5: %{name}-gmagick.patch Patch6: kde-am.patch -Patch7: typo.patch -Patch8: gcc44.patch +Patch7: gcc44.patch +Patch8: bug-155852.patch +Patch9: ImageMagick.patch +Patch10: ac264.patch URL: http://www.koffice.org/ -BuildRequires: GraphicsMagick-devel >= 1.1.7 +%{?with_gmagick:BuildRequires: GraphicsMagick-devel >= 1.1.7} BuildRequires: ImageMagick-c++-devel >= 1:6.2.4.0 +BuildRequires: ImageMagick-devel >= 1:6.5.5.7-2 BuildRequires: OpenEXR-devel BuildRequires: OpenGL-GLU-devel BuildRequires: arts-qt-devel >= %{artsver} @@ -65,6 +73,7 @@ BuildRequires: which BuildRequires: wv2-devel >= 0.1.9 BuildRequires: zlib-devel +%{!?with_gmagick:BuildConflicts: GraphicsMagick-devel} Requires: wv2 >= 0.1.9 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -295,8 +304,8 @@ %description krita -l pl.UTF-8 Krita jest aplikacją do edycji grafiki bitmapowej. Wspiera różne -przestrzenie barw, jak np. RGB, skala szarości, CMYK, Lab, YCBCR -oraz LMS - zarówno w trybie 8 jak i 16 bitowym na kanał. +przestrzenie barw, jak np. RGB, skala szarości, CMYK, Lab, YCBCR oraz +LMS - zarówno w trybie 8 jak i 16 bitowym na kanał. %package kross-python Summary: KOffice - Kross Python @@ -398,15 +407,19 @@ %prep %setup -q +(find kexi/3rdparty -name '*.[ch]'; echo filters/kword/mswrite/structures_generated.h) | xargs grep -Fl '$''Id' | xargs %{__sed} -i -e 's/$''Id:.*$/$''Id$/' +%patch100 -p0 %patch0 -p1 %patch1 -p1 #%patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 +%{?with_gmagick:%patch5 -p1} %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 +%patch10 -p1 %{__sed} -i 's/Categories=Qt;KDE;Office/Categories=Qt;KDE;Office;X-Misc;/' \ tools/kthesaurus/KThesaurus.desktop @@ -1044,6 +1057,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.206 2009/09/08 07:59:16 glen +- add branch.diff; updates/hacks to make build in current th + Revision 1.205 2009/08/24 23:42:04 glen - add gcc44.patch ================================================================ Index: packages/koffice/ImageMagick.patch diff -u /dev/null packages/koffice/ImageMagick.patch:1.1 --- /dev/null Tue Sep 8 09:59:21 2009 +++ packages/koffice/ImageMagick.patch Tue Sep 8 09:59:16 2009 @@ -0,0 +1,19 @@ +--- koffice-1.6.3/filters/krita/magick/kis_image_magick_converter.cc~ 2009-09-08 10:53:13.000000000 +0300 ++++ koffice-1.6.3/filters/krita/magick/kis_image_magick_converter.cc 2009-09-08 10:53:23.817951140 +0300 +@@ -22,6 +22,7 @@ + #include <unistd.h> + + #include <magick/api.h> ++#include <magick/quantum-private.h> + + #include <qfile.h> + #include <qfileinfo.h> +@@ -365,7 +366,7 @@ + m_img = 0; + + while ((image = RemoveFirstImageFromList(&images))) { +- ViewInfo *vi = OpenCacheView(image); ++ CacheView *vi = OpenCacheView(image); + + // Determine image depth -- for now, all channels of an imported image are of the same depth + unsigned long imageDepth = image->depth; ================================================================ Index: packages/koffice/ac264.patch diff -u /dev/null packages/koffice/ac264.patch:1.1 --- /dev/null Tue Sep 8 09:59:21 2009 +++ packages/koffice/ac264.patch Tue Sep 8 09:59:16 2009 @@ -0,0 +1,24 @@ +--- koffice-1.6.3/admin/configure.in.min~ 2007-05-31 00:50:22.000000000 +0300 ++++ koffice-1.6.3/admin/configure.in.min 2009-09-08 02:21:01.730812762 +0300 +@@ -44,6 +44,9 @@ + AM_CONFIG_HEADER(config.h) dnl at the distribution this done + + dnl Checks for programs. ++AC_PROG_CC ++AC_PROG_CXX ++ + AC_CHECK_COMPILERS + AC_ENABLE_SHARED(yes) + AC_ENABLE_STATIC(no) +--- koffice-1.6.3/configure.in.in~ 2009-09-08 02:13:38.000000000 +0300 ++++ koffice-1.6.3/configure.in.in 2009-09-08 02:22:09.490806965 +0300 +@@ -3,6 +3,9 @@ + # Remember to synchronize the version number with the file koffice/lib/kofficecore/kofficeversion.h + AM_INIT_AUTOMAKE(koffice, "1.6.3") + ++AC_PROG_CC ++AC_PROG_CXX ++ + CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS" + + AC_CHECK_HEADERS(unistd.h sys/param.h floatingpoint.h paths.h) ================================================================ Index: packages/koffice/bug-155852.patch diff -u /dev/null packages/koffice/bug-155852.patch:1.1 --- /dev/null Tue Sep 8 09:59:21 2009 +++ packages/koffice/bug-155852.patch Tue Sep 8 09:59:16 2009 @@ -0,0 +1,11 @@ +--- koffice-1.6.3/filters/krita/tiff/kis_tiff_converter.cc~ 2009-09-08 09:13:56.000000000 +0300 ++++ koffice-1.6.3/filters/krita/tiff/kis_tiff_converter.cc 2009-09-08 09:17:39.014978963 +0300 +@@ -242,7 +242,7 @@ + // Read image profile + kdDebug() << "Reading profile" << endl; + KisProfile* profile = 0; +- quint32 EmbedLen; ++ DWORD EmbedLen; + LPBYTE EmbedBuffer; + + if (TIFFGetField(image, TIFFTAG_ICCPROFILE, &EmbedLen, &EmbedBuffer)) { ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/koffice/koffice.spec?r1=1.205&r2=1.206&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
