Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/crypto
In directory vz-cvs-3.sog:/tmp/cvs-serv1544
Modified Files:
koffice2.info koffice2.patch
Log Message:
Lots of bit-derot, including graphicsmagick API, libpng modern version, and qt4
Index: koffice2.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/crypto/koffice2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- koffice2.patch 1 Jul 2010 01:37:10 -0000 1.1
+++ koffice2.patch 25 Feb 2012 22:47:16 -0000 1.2
@@ -1,3 +1,15 @@
+diff -Nurd koffice-2.0.0/filters/krita/gmagick/kis_image_magick_converter.cc
koffice-2.0.0-new/filters/krita/gmagick/kis_image_magick_converter.cc
+--- koffice-2.0.0/filters/krita/gmagick/kis_image_magick_converter.cc
2012-02-25 16:52:23.000000000 -0500
++++ koffice-2.0.0-new/filters/krita/gmagick/kis_image_magick_converter.cc
2009-05-20 03:18:55.000000000 -0400
+@@ -180,7 +180,7 @@
+ image -> addAnnotation(annotation);
+ }
+ // WARNING Graphics Magick 1.2 has a smaller version number than 1.1
+-#if MagickLibVersion >= 0x020000 && MagickLibVersion < 0x0100000
++#if 1
+ {
+ ImageProfileIterator profile_iterator =
AllocateImageProfileIterator( src );
+ const char * name;
diff -Nurd koffice-2.0.0/karbon/CMakeLists.txt
koffice-2.0.0-new/karbon/CMakeLists.txt
--- koffice-2.0.0/karbon/CMakeLists.txt 2009-05-20 03:27:06.000000000
-0400
+++ koffice-2.0.0-new/karbon/CMakeLists.txt 2009-06-07 09:58:57.000000000
-0400
@@ -571,6 +583,91 @@
#include <stdint.h>
#include <math.h>
+diff -Nurd koffice-2.0.0/krita/ui/kis_png_converter.cpp
koffice-2.0.0-new/krita/ui/kis_png_converter.cpp
+--- koffice-2.0.0/krita/ui/kis_png_converter.cpp 2012-02-25
11:53:04.000000000 -0500
++++ koffice-2.0.0-new/krita/ui/kis_png_converter.cpp 2012-02-25
12:12:57.000000000 -0500
+@@ -22,10 +22,15 @@
+ // documentation of libpng available at
+ // http://www.libpng.org/pub/png/libpng-1.2.5-manual.html
+
++#ifndef PNG_MAX_UINT // Removed in libpng 1.4
++#define PNG_MAX_UINT PNG_UINT_31_MAX
++#endif
++
+ #include <config-endian.h> // WORDS_BIGENDIAN
+
+ #include <limits.h>
+ #include <stdio.h>
++#include <zlib.h>
+
+ #include <QBuffer>
+ #include <QFile>
+@@ -404,7 +409,7 @@
+ }
+
+ // Initialize the internal structures
+- png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
png_voidp_NULL, png_error_ptr_NULL, png_error_ptr_NULL);
++ png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, 0,
0, 0);
+ if (!png_ptr) {
+ iod->close();
+ return (KisImageBuilder_RESULT_FAILURE);
+@@ -438,17 +443,17 @@
+ png_read_info(png_ptr, info_ptr);
+
+
+- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY && info_ptr->bit_depth <
8) {
++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY &&
png_get_bit_depth(png_ptr, info_ptr) < 8) {
+ png_set_expand(png_ptr);
+ }
+
+- if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE && info_ptr->bit_depth
< 8) {
++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE &&
png_get_bit_depth(png_ptr, info_ptr) < 8) {
+ png_set_packing(png_ptr);
+ }
+
+
+- if (info_ptr->color_type != PNG_COLOR_TYPE_PALETTE &&
+- (info_ptr->valid & PNG_INFO_tRNS)) {
++ if (png_get_color_type(png_ptr, info_ptr) != PNG_COLOR_TYPE_PALETTE &&
++ (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))) {
+ png_set_expand(png_ptr);
+ }
+ png_read_update_info(png_ptr, info_ptr);
+@@ -474,7 +479,12 @@
+ bool hasalpha = (color_type == PNG_COLOR_TYPE_RGB_ALPHA || color_type ==
PNG_COLOR_TYPE_GRAY_ALPHA);
+
+ // Read image profile
+- png_charp profile_name, profile_data;
++ png_charp profile_name;
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 5
++ png_bytep profile_data;
++#else
++ png_charp profile_data;
++#endif
+ int compression_type;
+ png_uint_32 proflen;
+
+@@ -781,7 +791,7 @@
+ int height = img->height();
+ int width = img->width();
+ // Initialize structures
+- png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
png_voidp_NULL, png_error_ptr_NULL, png_error_ptr_NULL);
++ png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, 0,
0, 0);
+ if (!png_ptr) {
+ return (KisImageBuilder_RESULT_FAILURE);
+ }
+@@ -907,7 +917,11 @@
+ } else { // Profile
+ char* name = new char[(*it)->type().length()+1];
+ strcpy(name, (*it)->type().toAscii());
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 5
++ png_set_iCCP(png_ptr, info_ptr, name, PNG_COMPRESSION_TYPE_BASE,
(const png_bytep)(*it)->annotation().data(), (*it) -> annotation() . size());
++#else
+ png_set_iCCP(png_ptr, info_ptr, name, PNG_COMPRESSION_TYPE_BASE,
(char*)(*it)->annotation().data(), (*it) -> annotation() . size());
++#endif
+ }
+ ++it;
+ }
diff -Nurd koffice-2.0.0/kspread/CMakeLists.txt
koffice-2.0.0-new/kspread/CMakeLists.txt
--- koffice-2.0.0/kspread/CMakeLists.txt 2009-05-20 03:26:47.000000000
-0400
+++ koffice-2.0.0-new/kspread/CMakeLists.txt 2009-06-07 11:01:23.000000000
-0400
@@ -743,6 +840,18 @@
+ </array>
+</dict>
+</plist>
+diff -Nurd koffice-2.0.0/kspread/commands/Undo.h
koffice-2.0.0-new/kspread/commands/Undo.h
+--- koffice-2.0.0/kspread/commands/Undo.h 2009-05-20 03:26:30.000000000
-0400
++++ koffice-2.0.0-new/kspread/commands/Undo.h 2012-02-24 18:43:21.000000000
-0500
+@@ -92,7 +92,7 @@
+ class FormulaOfCell
+ {
+ public:
+- FormulaOfCell(): m_sheetName(0) {}
++ FormulaOfCell(): m_sheetName() {}
+ FormulaOfCell( QString & sheetName, int col, int row, QString & formula )
+ : m_sheetName( sheetName ), m_col( col ), m_row( row ), m_formula(
formula )
+ {}
diff -Nurd koffice-2.0.0/kword/part/CMakeLists.txt
koffice-2.0.0-new/kword/part/CMakeLists.txt
--- koffice-2.0.0/kword/part/CMakeLists.txt 2009-05-20 03:16:02.000000000
-0400
+++ koffice-2.0.0-new/kword/part/CMakeLists.txt 2009-06-07
11:09:43.000000000 -0400
Index: koffice2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/crypto/koffice2.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- koffice2.info 9 Jan 2011 03:24:38 -0000 1.8
+++ koffice2.info 25 Feb 2012 22:47:16 -0000 1.9
@@ -1,7 +1,7 @@
Info4: <<
Package: koffice2-%type_pkg[kde]
Version: 2.0.0
-Revision: 4
+Revision: 5
Description: KDE4 - office suite
Type: kde (x11 mac)
#Distribution: 10.4, 10.5
@@ -29,7 +29,7 @@
glew (>= 1.3.5-1),
glib2-dev (>= 2.22.0-1),
gmm,
- graphicsmagick-dev (>= 1.1-1),
+ graphicsmagick-dev (>= 1.4-0.020111224),
gsl (>= 1.7-1),
kde4-buildenv (>= 4.2.4-2),
kdebase4-%type_pkg[kde]-dev (>= 4.2.4-1),
@@ -40,7 +40,7 @@
libgettext8-dev,
libgsf1.114-dev,
libkdcraw-8-%type_pkg[kde]-dev (>= 4.4.1-1),
- libpng3,
+ libpng15,
libtiff,
libwpd-0.8-dev (>= 0.8.14-1),
libxml2,
@@ -50,7 +50,11 @@
poppler4-qt4-%type_pkg[kde] (>= 0.10.7-3),
pstoedit-bin,
qca2-%type_pkg[kde] (>= 2.0.2-1),
- qt4-%type_pkg[kde] (>= 4.5.1-1),
+ phonon-%type_pkg[kde] (>= 4.5.0-1),
+ qt4-base-%type_pkg[kde] (>= 4.7.3-1),
+ qtassistant-compat-%type_pkg[kde] (>= 4.6.3-1),
+ qtassistant-compat-%type_pkg[kde]-bin (>= 4.6.3-1),
+ qtwebkit-%type_pkg[kde] (>= 2.0.0-4),
soprano-%type_pkg[kde]-dev (>= 2.2.3-7),
strigi-dev (>= 0.6.3-1),
(%type_pkg[kde] = x11) x11-dev,
@@ -62,7 +66,7 @@
Source: mirror:kde:stable/koffice-%v/src/koffice-%v.tar.bz2
Source-MD5: 46531c940d4672f5206cd60bb484f1c6
PatchFile: koffice2.patch
-PatchFile-MD5: 99c6101b482a0ad3d395bd45034aef37
+PatchFile-MD5: d7871f2a0672ee4874fb0b4f6d48fe58
CompileScript: <<
#!/bin/sh -ev
@@ -311,10 +315,10 @@
Description: KDE4 - image editor
Depends: <<
glew-shlibs (>= 1.3.5-1),
- graphicsmagick-shlibs (>= 1.1-1),
+ graphicsmagick-shlibs (>= 1.4-0.020111224),
libexiv2-0.19-shlibs,
libkdcraw-8-%type_pkg[kde]-shlibs (>= 4.4.1-1),
- libpng3-shlibs,
+ libpng15-shlibs,
libtiff-shlibs,
poppler4-qt4-%type_pkg[kde]-shlibs (>= 0.10.7-3),
qimageblitz-unified-%type_pkg[kde]-shlibs,
@@ -434,5 +438,13 @@
<<
DescDetail: KOffice is a free, integrated office suite for KDE, the K Desktop
Environment.
+DescPackaging: <<
+ Backport fixes for compatibility with libpng15 from koffice-2.3.3
+
+ GraphicsMagick interface mess...force it to use what is now
+ (gm 1.4-0.020111224) available. NB: newer koffice scrapped use
+ of gm entirely.
+<<
+
<<
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
