Hello community,
here is the log from the commit of package koffice
checked in at Thu Sep 25 13:16:31 CEST 2008.
--------
--- KDE/koffice/koffice.changes 2007-11-15 22:40:09.000000000 +0100
+++ /mounts/work_src_done/STABLE/koffice/koffice.changes 2008-09-25 11:52:39.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Sep 25 11:52:31 CEST 2008 - dmueller@suse.de
+
+- fix build against newer graphicsmagick
+
+-------------------------------------------------------------------
New:
----
graphicsmagick-1.2.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ koffice.spec ++++++
--- /var/tmp/diff_new_pack.X20418/_old 2008-09-25 13:16:08.000000000 +0200
+++ /var/tmp/diff_new_pack.X20418/_new 2008-09-25 13:16:08.000000000 +0200
@@ -1,15 +1,23 @@
#
# spec file for package koffice (Version 1.6.3)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
+
Name: koffice
BuildRequires: ImageMagick-devel OpenEXR-devel aspell-devel doxygen graphviz kdebindings3-javascript kdelibs3-devel kdelibs3-devel-doc libpqxx-devel mysql-devel postgresql-devel python-devel qt3-devel-doc readline-devel sqlite-devel wv2-devel
%if %suse_version > 1020
@@ -36,7 +44,7 @@
Group: Productivity/Office/Suite
Summary: Libraries and Base Files for the KDE Office Suite
Version: 1.6.3
-Release: 78
+Release: 211
Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: koffice-%{version}.tar.bz2
@@ -52,6 +60,7 @@
Patch12: r729712.diff
Patch13: koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff
Patch14: gcc-4.3.diff
+Patch15: graphicsmagick-1.2.diff
%description
Base files and libraries for koffice applications. The applications are
@@ -67,6 +76,7 @@
The KDE Team
%package python
+License: GPL v2 or later; LGPL v2.1 or later
Summary: Python support and scripts for KOffice scripting
Group: Productivity/Office/Suite
@@ -80,7 +90,9 @@
The KDE Team
%if %suse_version > 930
+
%package ruby
+License: GPL v2 or later; LGPL v2.1 or later
Summary: Ruby support and scripts for KOffice scripting
Group: Productivity/Office/Suite
@@ -94,7 +106,9 @@
The KDE Team
%endif
+
%package devel
+License: GPL v2 or later; LGPL v2.1 or later
Requires: koffice kdelibs3-devel
Summary: The Build Enviroment from KOffice
Group: Development/Libraries/KDE
@@ -110,6 +124,7 @@
The KDE Team
%package database
+License: GPL v2 or later; LGPL v2.1 or later
Summary: Database Application Based on KOffice Libraries (kexi)
Group: Productivity/Databases/Clients
@@ -123,6 +138,7 @@
The KDE Team
%package database-mysql
+License: GPL v2 or later; LGPL v2.1 or later
Summary: KOffice Database Application MySQL Back-End
Group: Productivity/Databases/Clients
@@ -137,6 +153,7 @@
The KDE Team
%package database-psql
+License: GPL v2 or later; LGPL v2.1 or later
Summary: KOffice Database Application PostgreSQL Back-End
Group: Productivity/Databases/Clients
@@ -151,6 +168,7 @@
The KDE Team
%package wordprocessing
+License: GPL v2 or later; LGPL v2.1 or later
# usesubdirs kword kformula filters/kword tools/thesaurus tools/kthesaurus tools/spell autocorrect doc/kword doc/thesaurus doc/kformula kpdfimport
Summary: A KDE Word Processor
Group: Productivity/Publishing/Word
@@ -169,6 +187,7 @@
The KDE Team
%package spreadsheet
+License: GPL v2 or later; LGPL v2.1 or later
# usesubdirs kspread kchart filters/kspread doc/kspread
# filters/excel97
Summary: A Spreadsheet for KDE
@@ -188,6 +207,7 @@
The KDE Team
%package presentation
+License: GPL v2 or later; LGPL v2.1 or later
# usesubdirs kpresenter filters/kpresenter doc/kpresenter
# filters/powerpoint97
Summary: A KOffice Program to Create Presentations
@@ -204,6 +224,7 @@
The KDE Team
%package illustration
+License: GPL v2 or later; LGPL v2.1 or later
# usesubdirs kivio karbon filters/karbon doc/kivio
Summary: Illustration and Image Manipulation Applications Based on KOffice Libraries (krita, karbon, kivio)
Group: Productivity/Graphics/Vector Editors
@@ -227,6 +248,7 @@
The KDE Team
%package planning
+License: GPL v2 or later; LGPL v2.1 or later
# usesubdirs kplato
Summary: Project managent applications based on KOffice libraries
Group: Productivity/Office/Management
@@ -243,6 +265,7 @@
The KDE Team
%package extra
+License: GPL v2 or later; LGPL v2.1 or later
# usesubdirs kugar doc/kugar filters/kugar
Summary: Small Add-On Applications for KOffice
Group: Productivity/Office/Other
@@ -275,6 +298,7 @@
%patch12
%patch13
%patch14
+%patch15
rm -rf ascend
. /etc/opt/kde3/common_options
update_admin --no-unsermake
@@ -779,3 +803,4 @@
/opt/kde3/%_lib/libkformdesigner.so
/opt/kde3/%_lib/libkexi*.la
/opt/kde3/%_lib/libkformdesigner.la
+
++++++ graphicsmagick-1.2.diff ++++++
--- filters/krita/gmagick/kis_image_magick_converter.cc
+++ filters/krita/gmagick/kis_image_magick_converter.cc
@@ -182,6 +182,7 @@
image -> addAnnotation(annotation);
}
+#if 0
for(int i = 0; i < src->generic_profiles; i++)
{
QByteArray rawdata;
@@ -193,6 +194,7 @@
image -> addAnnotation(annotation);
}
+#endif
const ImageAttribute* imgAttr = GetImageAttribute(src, NULL);
while(imgAttr)
@@ -480,7 +482,7 @@
Q_UINT8 opacity = OPACITY_OPAQUE;
const ImageAttribute * attr = GetImageAttribute(image, "[layer-opacity]");
if (attr != 0) {
- opacity = Q_UINT8_MAX - Downscale(QString(attr->value).toInt());
+ opacity = Q_UINT8_MAX - ScaleQuantumToChar(QString(attr->value).toInt());
}
KisPaintLayerSP layer = 0;
@@ -534,17 +536,17 @@
while (!hiter.isDone())
{
Q_UINT8 *ptr= hiter.rawData();
- *(ptr++) = Downscale(pp->red); // cyan
- *(ptr++) = Downscale(pp->green); // magenta
- *(ptr++) = Downscale(pp->blue); // yellow
- *(ptr++) = Downscale(indexes[x]); // Black
+ *(ptr++) = ScaleQuantumToChar(pp->red); // cyan
+ *(ptr++) = ScaleQuantumToChar(pp->green); // magenta
+ *(ptr++) = ScaleQuantumToChar(pp->blue); // yellow
+ *(ptr++) = ScaleQuantumToChar(indexes[x]); // Black
// XXX: Warning! This ifdef messes up the paren matching big-time!
#ifdef HAVE_MAGICK6
if (image->matte != MagickFalse) {
#else
if (image->matte == true) {
#endif
- *(ptr++) = OPACITY_OPAQUE - Downscale(pp->opacity);
+ *(ptr++) = OPACITY_OPAQUE - ScaleQuantumToChar(pp->opacity);
}
else {
*(ptr++) = OPACITY_OPAQUE;
@@ -578,10 +580,10 @@
{
Q_UINT8 *ptr= hiter.rawData();
// XXX: not colorstrategy and bitdepth independent
- *(ptr++) = Downscale(pp->blue);
- *(ptr++) = Downscale(pp->green);
- *(ptr++) = Downscale(pp->red);
- *(ptr++) = OPACITY_OPAQUE - Downscale(pp->opacity);
+ *(ptr++) = ScaleQuantumToChar(pp->blue);
+ *(ptr++) = ScaleQuantumToChar(pp->green);
+ *(ptr++) = ScaleQuantumToChar(pp->red);
+ *(ptr++) = OPACITY_OPAQUE - ScaleQuantumToChar(pp->opacity);
pp++;
++hiter;
@@ -608,8 +610,8 @@
{
Q_UINT8 *ptr= hiter.rawData();
// XXX: not colorstrategy and bitdepth independent
- *(ptr++) = Downscale(pp->blue);
- *(ptr++) = OPACITY_OPAQUE - Downscale(pp->opacity);
+ *(ptr++) = ScaleQuantumToChar(pp->blue);
+ *(ptr++) = OPACITY_OPAQUE - ScaleQuantumToChar(pp->opacity);
pp++;
++hiter;
@@ -812,13 +814,13 @@
while (!it.isDone()) {
Q_UINT8 * d = it.rawData();
- pp -> red = Upscale(d[PIXEL_CYAN]);
- pp -> green = Upscale(d[PIXEL_MAGENTA]);
- pp -> blue = Upscale(d[PIXEL_YELLOW]);
+ pp -> red = ScaleCharToQuantum(d[PIXEL_CYAN]);
+ pp -> green = ScaleCharToQuantum(d[PIXEL_MAGENTA]);
+ pp -> blue = ScaleCharToQuantum(d[PIXEL_YELLOW]);
if (alpha)
- pp -> opacity = Upscale(OPACITY_OPAQUE - d[PIXEL_CMYK_ALPHA]);
+ pp -> opacity = ScaleCharToQuantum(OPACITY_OPAQUE - d[PIXEL_CMYK_ALPHA]);
- indexes[x]= Upscale(d[PIXEL_BLACK]);
+ indexes[x]= ScaleCharToQuantum(d[PIXEL_BLACK]);
x++;
pp++;
@@ -848,11 +850,11 @@
while (!it.isDone()) {
Q_UINT8 * d = it.rawData();
- pp -> red = Upscale(d[PIXEL_RED]);
- pp -> green = Upscale(d[PIXEL_GREEN]);
- pp -> blue = Upscale(d[PIXEL_BLUE]);
+ pp -> red = ScaleCharToQuantum(d[PIXEL_RED]);
+ pp -> green = ScaleCharToQuantum(d[PIXEL_GREEN]);
+ pp -> blue = ScaleCharToQuantum(d[PIXEL_BLUE]);
if (alpha)
- pp -> opacity = Upscale(OPACITY_OPAQUE - d[PIXEL_ALPHA]);
+ pp -> opacity = ScaleCharToQuantum(OPACITY_OPAQUE - d[PIXEL_ALPHA]);
pp++;
++it;
@@ -879,11 +881,11 @@
else {
while (!it.isDone()) {
Q_UINT8 * d = it.rawData();
- pp -> red = Upscale(d[PIXEL_GRAY]);
- pp -> green = Upscale(d[PIXEL_GRAY]);
- pp -> blue = Upscale(d[PIXEL_GRAY]);
+ pp -> red = ScaleCharToQuantum(d[PIXEL_GRAY]);
+ pp -> green = ScaleCharToQuantum(d[PIXEL_GRAY]);
+ pp -> blue = ScaleCharToQuantum(d[PIXEL_GRAY]);
if (alpha)
- pp -> opacity = Upscale(OPACITY_OPAQUE - d[PIXEL_GRAY_ALPHA]);
+ pp -> opacity = ScaleCharToQuantum(OPACITY_OPAQUE - d[PIXEL_GRAY_ALPHA]);
pp++;
++it;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org