the Fink project is an effort to port
popular Unix programs to Mac OS X
Info4: <<
Package: koffice2-%type_pkg[kde]
Version: 2.0.0
Revision: 7
Description: KDE4 - office suite
Type: kde (x11 mac)
#Distribution: 10.4, 10.5
License: GPL/LGPL
Maintainer: Benjamin Reed
Depends: <<
karbon2-%type_pkg[kde] (>= %v-%r),
kplato2-%type_pkg[kde] (>= %v-%r),
kpresenter2-%type_pkg[kde] (>= %v-%r),
krita2-%type_pkg[kde] (>= %v-%r),
kspread2-%type_pkg[kde] (>= %v-%r),
kword2-%type_pkg[kde] (>= %v-%r)
<<
BuildDepends: <<
automoc-%type_pkg[kde] (>= 0.9.89-0),
# boost1.35.systempython,
boost1.46.1.cmake,
cmake (>= 2.6.3-1),
dbus1.3-dev,
eigen2,
fink (>= 0.29.7-1),
fink-package-precedence,
flag-sort,
fontconfig2-dev (>= 2.10.0-1),
freetype219 (>= 2.4.11-1),
glew (>= 1.3.5-1),
glib2-dev (>= 2.22.0-1),
gmm,
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),
kdelibs4-%type_pkg[kde]-dev (>= 4.2.4-1),
kdepimlibs4-%type_pkg[kde]-dev (>= 4.2.4-1),
lcms,
libexiv2-0.19,
libgsf1.114-dev,
libkdcraw-8-%type_pkg[kde]-dev (>= 4.4.1-1),
libpng15,
libtiff,
libwpd-0.8-dev (>= 0.8.14-1),
libxml2 (>= 2.8.0-1),
libxslt,
# opengtl-dev,
openexr-dev,
phonon-%type_pkg[kde] (>= 4.5.0-1),
pkgconfig (>= 0.23),
poppler4.4-qt4-%type_pkg[kde],
pstoedit-bin,
qca2-%type_pkg[kde] (>= 2.0.2-1),
qimageblitz-unified-%type_pkg[kde],
qt4-base-%type_pkg[kde] (>= 4.7.3-1),
(%type_pkg[kde] = x11) x11-dev,
system-openssl-dev,
wv2 (>= 0.2.3-1)
<<
GCC: 4.0
Source: mirror:kde:stable/koffice-%v/src/koffice-%v.tar.bz2
Source-MD5: 46531c940d4672f5206cd60bb484f1c6
PatchFile: koffice2.patch
PatchFile-MD5: d7871f2a0672ee4874fb0b4f6d48fe58
PatchScript: <<
%{default_script}
perl -pi -e 's/OpenCTL/koffice_does_not_like_fink_OpenCTL_yet/' cmake/modules/FindOpenCTL.cmake
perl -pi -e 's/Spnav/Spnav_not_available_in_fink/' plugins/CMakeLists.txt
<<
SetCFLAGS: -MD
SetCXXFLAGS: -MD
CompileScript: <<
#!/bin/sh -ev
export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[kde]"
. %p/sbin/kde4-buildenv.sh
export CMAKE_INCLUDE_PATH="%p/include/libwpd-0.8:$CMAKE_INCLUDE_PATH"
set -v
mkdir -p build
pushd build
touch config.h
CC='flag-sort gcc' CXX='flag-sort g++' cmake \
-DGLEW_INCLUDE_DIR:PATH=%p/include \
-DGLEW_GLEW_LIBRARY:PATH=%p/lib/libGLEW.dylib \
-DGSL_INCLUDE_DIR:PATH=%p/include \
-DGSL_LIBRARIES:FILEPATH=%p/lib/libgsl.dylib \
-DKDCRAW_INCLUDE_DIR:PATH=%p/opt/kde4/%type_pkg[kde]/include \
-DKDCRAW_LIBRARIES:FILEPATH=%p/opt/kde4/%type_pkg[kde]/lib/libkdcraw.dylib \
-DPSTOEDIT_EXECUTABLE:FILEPATH=%p/bin/pstoedit \
-DWPD_INCLUDE_DIR:PATH=%p/include/libwpd-0.8 \
-DWPD_LIBRARIES:FILEPATH=%p/lib/libwpd-0.8.dylib \
-DWV2_INCLUDE_DIR:STRING='-I%p/include -I%p/include/libgsf-1 -I%p/include/glib-2.0 -I%p/lib/glib-2.0/include -I%p/include/libxml2 -I%p/include' \
-DWV2_LIBRARIES:FILEPATH=%p/lib/libwv2.dylib \
$KDE4_CMAKE_ARGS ..
make VERBOSE=1
fink-package-precedence --depfile-ext='\.d' .
popd
<<
InstallScript: <<
#!/bin/sh -ev
pushd build
make -j1 install/fast DESTDIR="%d"
popd
mkdir -p %i/share/doc/installed-packages
touch %i/share/doc/installed-packages/%N
touch %i/share/doc/installed-packages/%N-base
<<
SplitOff: <<
Package: karbon2-%type_pkg[kde]
Description: KDE4 - vector drawing program
Depends: <<
karbon2-%type_pkg[kde]-shlibs (>= %v-%r),
pstoedit-bin,
kdelibs4-%type_pkg[kde]-shlibs (>= 4.2.4-1),
qt4-base-%type_pkg[kde]-qt3support-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtcore-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtgui-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtxml-shlibs (>= 4.7.3-1),
%N-base (>= %v-%r)
<<
Replaces: %N-dev (<< 2.0.0-1)
Files: <<
opt/kde4/%type_pkg[kde]/bin/karbon*
opt/kde4/%type_pkg[kde]/lib/kde4/karbon*
opt/kde4/%type_pkg[kde]/lib/kde4/libkarbon*
opt/kde4/%type_pkg[kde]/lib/libkdeinit4_karbon.dylib
opt/kde4/%type_pkg[kde]/share/applications/kde4/karbon*
opt/kde4/%type_pkg[kde]/share/apps/karbon
opt/kde4/%type_pkg[kde]/share/config/karbon*
opt/kde4/%type_pkg[kde]/share/doc/HTML/en/karbon
opt/kde4/%type_pkg[kde]/share/kde4/services/ServiceMenus/karbon*
opt/kde4/%type_pkg[kde]/share/kde4/services/karbon*
opt/kde4/%type_pkg[kde]/share/kde4/servicetypes/karbon*
opt/kde4/%type_pkg[kde]/share/templates/.source/*.karbon
opt/kde4/%type_pkg[kde]/share/templates/Illustration.*
<<
Shlibs: !%p/opt/kde4/%type_pkg[kde]/lib/libkdeinit4_karbon.dylib
PostInstScript: %p/opt/kde4/%type_pkg[kde]/bin/kde4-postinst.sh || :
<<
SplitOff10: <<
Package: %N-base-shlibs
Description: KDE4 - koffice base shared libraries
Depends: <<
karbon2-%type_pkg[kde]-shlibs (>= %v-%r),
kdelibs4-%type_pkg[kde]-shlibs (>= 4.2.4-1),
kdepimlibs4-%type_pkg[kde]-shlibs,
lcms-shlibs,
libwpd-0.8-shlibs (>= 0.8.14-1),
libxml2-shlibs (>= 2.8.0-1),
libxslt-shlibs (>= 1.1.0-1),
qca2-%type_pkg[kde]-shlibs (>= 2.0.2-1),
qt4-base-%type_pkg[kde]-qt3support-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtcore-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtdbus-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtgui-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtopengl-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtsvg-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtxml-shlibs (>= 4.7.3-1),
wv2-shlibs (>= 0.2.3-1)
<<
Files: <<
opt/kde4/%type_pkg[kde]/lib/kde4
opt/kde4/%type_pkg[kde]/lib/libchartshapelib.5*.dylib
opt/kde4/%type_pkg[kde]/lib/libflake.5*.dylib
opt/kde4/%type_pkg[kde]/lib/libkchartcommon.5*.dylib
opt/kde4/%type_pkg[kde]/lib/libkdchart.5*.dylib
opt/kde4/%type_pkg[kde]/lib/libkochart.5*.dylib
opt/kde4/%type_pkg[kde]/lib/libkoffice*.5*.dylib
opt/kde4/%type_pkg[kde]/lib/libkoguiutils.5*.dylib
opt/kde4/%type_pkg[kde]/lib/libkokross.5*.dylib
opt/kde4/%type_pkg[kde]/lib/libkomain.5*.dylib
opt/kde4/%type_pkg[kde]/lib/libkoodf.5*.dylib
opt/kde4/%type_pkg[kde]/lib/libkopageapp.5*.dylib
opt/kde4/%type_pkg[kde]/lib/libkoresources.5*.dylib
opt/kde4/%type_pkg[kde]/lib/libkostore.5*.dylib
opt/kde4/%type_pkg[kde]/lib/libkotext.5*.dylib
opt/kde4/%type_pkg[kde]/lib/libkowmf.5*.dylib
opt/kde4/%type_pkg[kde]/lib/libkwmf.5*.dylib
opt/kde4/%type_pkg[kde]/lib/libkwordexportfilters.5*.dylib
opt/kde4/%type_pkg[kde]/lib/libpigmentcms.5*.dylib
<<
Shlibs: <<
%p/opt/kde4/%type_pkg[kde]/lib/libchartshapelib.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
%p/opt/kde4/%type_pkg[kde]/lib/libflake.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkchartcommon.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkdchart.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkochart.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkoffice_graya_u16.5.dylib 5.0.0 %n (>= 1.9.99.0-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkofficegrayau8colorspace.5.dylib 5.0.0 %n (>= 1.9.99.0-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkoguiutils.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkokross.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkomain.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkoodf.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkopageapp.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkoresources.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkostore.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkotext.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkowmf.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkwmf.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkwordexportfilters.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
%p/opt/kde4/%type_pkg[kde]/lib/libpigmentcms.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
<<
<<
SplitOff11: <<
Package: karbon2-%type_pkg[kde]-shlibs
Description: KDE4 - karbon shared libraries
Depends: <<
karbon2-%type_pkg[kde]-shlibs (>= %v-%r),
koffice2-%type_pkg[kde]-base-shlibs (>= %v-%r),
kdelibs4-%type_pkg[kde]-shlibs (>= 4.2.4-1),
qt4-base-%type_pkg[kde]-qt3support-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtcore-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtgui-shlibs (>= 4.7.3-1),
%N-base (>= %v-%r)
<<
Replaces: karbon2-%type_pkg[kde] (<< 1.9.99.0-2)
Files: <<
opt/kde4/%type_pkg[kde]/lib/libkarboncommon.5*.dylib
opt/kde4/%type_pkg[kde]/lib/libkarbonui.5*.dylib
<<
Shlibs: <<
%p/opt/kde4/%type_pkg[kde]/lib/libkarboncommon.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkarbonui.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
<<
<<
SplitOff12: <<
Package: %N-base
Description: KDE4 - koffice base package
Depends: <<
kdebase4-runtime-%type_pkg[kde] (>= 4.2.4-1),
kdelibs4-%type_pkg[kde]-shlibs (>= 4.2.4-1),
qt4-base-%type_pkg[kde]-qt3support-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtcore-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtgui-shlibs (>= 4.7.3-1),
%N-base-shlibs (>= %v-%r)
<<
Files: <<
opt/kde4/%type_pkg[kde]/bin
opt/kde4/%type_pkg[kde]/lib/libkdeinit4_*.dylib
opt/kde4/%type_pkg[kde]/share/applications/kde4
opt/kde4/%type_pkg[kde]/share/apps/kchart
opt/kde4/%type_pkg[kde]/share/apps/koffice
opt/kde4/%type_pkg[kde]/share/apps/musicshape
opt/kde4/%type_pkg[kde]/share/apps/xsltfilter
opt/kde4/%type_pkg[kde]/share/color
opt/kde4/%type_pkg[kde]/share/doc/HTML/en/kchart
opt/kde4/%type_pkg[kde]/share/doc/HTML/en/koffice
opt/kde4/%type_pkg[kde]/share/doc/HTML/en/thesaurus
opt/kde4/%type_pkg[kde]/share/icons
opt/kde4/%type_pkg[kde]/share/kde4/services
opt/kde4/%type_pkg[kde]/share/kde4/servicetypes
<<
Shlibs: !%p/opt/kde4/%type_pkg[kde]/lib/libkdeinit4_kthesaurus.dylib
PostInstScript: %p/opt/kde4/%type_pkg[kde]/bin/kde4-postinst.sh || :
<<
SplitOff13: <<
Package: %N-dev
Description: KDE4 - koffice development headers and libs
Depends: %N (>= %v-%r)
BuildDependsOnly: true
Files: <<
opt/kde4/%type_pkg[kde]/include
opt/kde4/%type_pkg[kde]/lib
opt/kde4/%type_pkg[kde]/share/apps/cmake
<<
<<
SplitOff2: <<
Package: kplato2-%type_pkg[kde]
Description: KDE4 - project management and scheduling
Depends: <<
kdelibs4-%type_pkg[kde]-shlibs (>= 4.2.4-1),
kdepimlibs4-%type_pkg[kde]-shlibs,
koffice2-%type_pkg[kde]-base-shlibs (>= %v-%r),
qt4-base-%type_pkg[kde]-qt3support-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtcore-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtdbus-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtgui-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtxml-shlibs (>= 4.7.3-1),
%N-base (>= %v-%r)
<<
Files: <<
opt/kde4/%type_pkg[kde]/bin/kplato*
opt/kde4/%type_pkg[kde]/lib/kde4/krossmodulekplato*
opt/kde4/%type_pkg[kde]/lib/kde4/libkplato*
opt/kde4/%type_pkg[kde]/lib/libkdeinit4_kplato.dylib
opt/kde4/%type_pkg[kde]/lib/libkplatokernel.5*.dylib
opt/kde4/%type_pkg[kde]/lib/libkplatomodels.5*.dylib
opt/kde4/%type_pkg[kde]/lib/libkplatoprivate.5*.dylib
opt/kde4/%type_pkg[kde]/lib/libkplatoui.5*.dylib
opt/kde4/%type_pkg[kde]/share/applications/kde4/kplato*
opt/kde4/%type_pkg[kde]/share/apps/kplato
opt/kde4/%type_pkg[kde]/share/config/kplato*
opt/kde4/%type_pkg[kde]/share/doc/HTML/en/kplato
opt/kde4/%type_pkg[kde]/share/icons/hicolor/128x128/apps/kplato.png
opt/kde4/%type_pkg[kde]/share/icons/hicolor/128x128/mimetypes/application-x-vnd.kde.kplato.png
opt/kde4/%type_pkg[kde]/share/icons/hicolor/16x16/apps/kplato.png
opt/kde4/%type_pkg[kde]/share/icons/hicolor/16x16/mimetypes/application-x-vnd.kde.kplato.png
opt/kde4/%type_pkg[kde]/share/icons/hicolor/22x22/apps/kplato.png
opt/kde4/%type_pkg[kde]/share/icons/hicolor/22x22/mimetypes/application-x-vnd.kde.kplato.png
opt/kde4/%type_pkg[kde]/share/icons/hicolor/32x32/apps/kplato.png
opt/kde4/%type_pkg[kde]/share/icons/hicolor/32x32/mimetypes/application-x-vnd.kde.kplato.png
opt/kde4/%type_pkg[kde]/share/icons/hicolor/48x48/apps/kplato.png
opt/kde4/%type_pkg[kde]/share/icons/hicolor/48x48/mimetypes/application-x-vnd.kde.kplato.png
opt/kde4/%type_pkg[kde]/share/icons/hicolor/64x64/apps/kplato.png
opt/kde4/%type_pkg[kde]/share/icons/hicolor/64x64/mimetypes/application-x-vnd.kde.kplato.png
opt/kde4/%type_pkg[kde]/share/icons/hicolor/scalable/apps/kplato.svgz
opt/kde4/%type_pkg[kde]/share/icons/hicolor/scalable/mimetypes/application-x-vnd.kde.kplato.svgz
opt/kde4/%type_pkg[kde]/share/kde4/services/kplato*
opt/kde4/%type_pkg[kde]/share/kde4/services/krossmodulekplato*
<<
Shlibs: <<
!%p/opt/kde4/%type_pkg[kde]/lib/libkdeinit4_kplato.dylib
%p/opt/kde4/%type_pkg[kde]/lib/libkplatokernel.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkplatomodels.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkplatoprivate.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkplatoui.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
<<
PostInstScript: %p/opt/kde4/%type_pkg[kde]/bin/kde4-postinst.sh || :
<<
SplitOff3: <<
Package: kpresenter2-%type_pkg[kde]
Description: KDE4 - presentation program
Depends: <<
kdelibs4-%type_pkg[kde]-shlibs (>= 4.2.4-1),
koffice2-%type_pkg[kde]-base-shlibs (>= %v-%r),
phonon-%type_pkg[kde]-shlibs (>= 4.5.0-1),
qt4-base-%type_pkg[kde]-qt3support-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtcore-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtdbus-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtgui-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtxml-shlibs (>= 4.7.3-1),
%N-base (>= %v-%r)
<<
Files: <<
opt/kde4/%type_pkg[kde]/bin/kpresenter*
opt/kde4/%type_pkg[kde]/lib/kde4/kpr*
opt/kde4/%type_pkg[kde]/lib/kde4/libkpresenter*
opt/kde4/%type_pkg[kde]/lib/libkdeinit4_kpresenter.dylib
opt/kde4/%type_pkg[kde]/lib/libkpresenterprivate.5*.dylib
opt/kde4/%type_pkg[kde]/share/applications/kde4/kpresenter*
opt/kde4/%type_pkg[kde]/share/apps/kpresenter
opt/kde4/%type_pkg[kde]/share/doc/HTML/en/kpresenter
opt/kde4/%type_pkg[kde]/share/icons/hicolor/16x16/apps/kpresenter.png
opt/kde4/%type_pkg[kde]/share/icons/hicolor/22x22/apps/kpresenter.png
opt/kde4/%type_pkg[kde]/share/icons/hicolor/32x32/apps/kpresenter.png
opt/kde4/%type_pkg[kde]/share/icons/hicolor/48x48/apps/kpresenter.png
opt/kde4/%type_pkg[kde]/share/kde4/services/ServiceMenus/kpresenter*
opt/kde4/%type_pkg[kde]/share/kde4/services/kpr*
opt/kde4/%type_pkg[kde]/share/kde4/servicetypes/kpr*
opt/kde4/%type_pkg[kde]/share/templates/.source/*.kpt
opt/kde4/%type_pkg[kde]/share/templates/Presentation.*
<<
Shlibs: <<
!%p/opt/kde4/%type_pkg[kde]/lib/libkdeinit4_kpresenter.dylib
%p/opt/kde4/%type_pkg[kde]/lib/libkpresenterprivate.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
<<
PostInstScript: %p/opt/kde4/%type_pkg[kde]/bin/kde4-postinst.sh || :
<<
SplitOff4: <<
Package: krita2-%type_pkg[kde]
Description: KDE4 - image editor
Depends: <<
glew-shlibs (>= 1.3.5-1),
graphicsmagick-shlibs (>= 1.4-0.020111224),
kdelibs4-%type_pkg[kde]-shlibs (>= 4.2.4-1),
koffice2-%type_pkg[kde]-base-shlibs (>= %v-%r),
lcms-shlibs,
libexiv2-0.19-shlibs,
libjpeg8-shlibs,
libkdcraw-8-%type_pkg[kde]-shlibs (>= 4.4.1-1),
libpng15-shlibs,
libtiff-shlibs,
poppler4.4-qt4-%type_pkg[kde]-shlibs,
qimageblitz-unified-%type_pkg[kde]-shlibs,
qt4-base-%type_pkg[kde]-qt3support-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtcore-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtgui-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtopengl-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtxml-shlibs (>= 4.7.3-1),
%N-base (>= %v-%r)
<<
Replaces: %N-dev (<< 2.0.0-1)
Files: <<
opt/kde4/%type_pkg[kde]/bin/krita*
opt/kde4/%type_pkg[kde]/lib/kde4/krita*
opt/kde4/%type_pkg[kde]/lib/kde4/libkrita*
opt/kde4/%type_pkg[kde]/lib/libkdeinit4_krita.dylib
opt/kde4/%type_pkg[kde]/lib/libKritaRulerAssistantCommon.5*.dylib
opt/kde4/%type_pkg[kde]/lib/libkrita*.5*.dylib
opt/kde4/%type_pkg[kde]/share/applications/kde4/krita*
opt/kde4/%type_pkg[kde]/share/apps/krita*
opt/kde4/%type_pkg[kde]/share/config/krita*
opt/kde4/%type_pkg[kde]/share/doc/HTML/en/krita
opt/kde4/%type_pkg[kde]/share/icons/hicolor/128x128/apps/krita.png
opt/kde4/%type_pkg[kde]/share/icons/hicolor/16x16/apps/krita.png
opt/kde4/%type_pkg[kde]/share/icons/hicolor/22x22/apps/krita.png
opt/kde4/%type_pkg[kde]/share/icons/hicolor/32x32/apps/krita.png
opt/kde4/%type_pkg[kde]/share/icons/hicolor/48x48/apps/krita.png
opt/kde4/%type_pkg[kde]/share/icons/hicolor/64x64/apps/krita.png
opt/kde4/%type_pkg[kde]/share/kde4/services/ServiceMenus/krita*
opt/kde4/%type_pkg[kde]/share/kde4/services/krita*
opt/kde4/%type_pkg[kde]/share/kde4/servicetypes/krita*
opt/kde4/%type_pkg[kde]/share/mime/packages/krita*
<<
Shlibs: <<
!%p/opt/kde4/%type_pkg[kde]/lib/libkdeinit4_krita.dylib
%p/opt/kde4/%type_pkg[kde]/lib/libKritaRulerAssistantCommon.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkrita_xyz_u16.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkritabasicdynamiccoloringprogram.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkritabasicdynamicshapeprogram.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkritadynamicbrush.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkritagrayscale.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkritaimage.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkritalibbrush.5.dylib 5.0.0 %n (>= 1.9.99.0-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkritalibpaintop.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkritaui.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
<<
PostInstScript: %p/opt/kde4/%type_pkg[kde]/bin/kde4-postinst.sh || :
<<
SplitOff5: <<
Package: kspread2-%type_pkg[kde]
Description: KDE4 - spreadsheet application
Depends: <<
gsl-shlibs (>= 1.7-1),
kdelibs4-%type_pkg[kde]-shlibs (>= 4.2.4-1),
koffice2-%type_pkg[kde]-base-shlibs (>= %v-%r),
qt4-base-%type_pkg[kde]-qt3support-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtcore-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtdbus-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtgui-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtsql-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtxml-shlibs (>= 4.7.3-1),
%N-base (>= %v-%r)
<<
Files: <<
opt/kde4/%type_pkg[kde]/bin/kspread*
opt/kde4/%type_pkg[kde]/lib/kde4/krossmodulekspread*
opt/kde4/%type_pkg[kde]/lib/kde4/kspread*
opt/kde4/%type_pkg[kde]/lib/kde4/libcsv*
opt/kde4/%type_pkg[kde]/lib/kde4/libgnumeric*
opt/kde4/%type_pkg[kde]/lib/kde4/libkspread*
opt/kde4/%type_pkg[kde]/lib/kde4/libopencalc*
opt/kde4/%type_pkg[kde]/lib/kde4/libqpro*
opt/kde4/%type_pkg[kde]/lib/kde4/spreadsheet*
opt/kde4/%type_pkg[kde]/lib/libkdeinit4_kspread.dylib
opt/kde4/%type_pkg[kde]/lib/libkspreadcommon.5*.dylib
opt/kde4/%type_pkg[kde]/share/applications/kde4/kspread*
opt/kde4/%type_pkg[kde]/share/apps/kspread
opt/kde4/%type_pkg[kde]/share/config.kcfg/kspread*
opt/kde4/%type_pkg[kde]/share/doc/HTML/en/kspread
opt/kde4/%type_pkg[kde]/share/icons/hicolor/16x16/apps/kspread.png
opt/kde4/%type_pkg[kde]/share/icons/hicolor/22x22/apps/kspread.png
opt/kde4/%type_pkg[kde]/share/icons/hicolor/32x32/apps/kspread.png
opt/kde4/%type_pkg[kde]/share/icons/hicolor/48x48/apps/kspread.png
opt/kde4/%type_pkg[kde]/share/kde4/services/ServiceMenus/kspread*
opt/kde4/%type_pkg[kde]/share/kde4/services/krossmodulekspread*
opt/kde4/%type_pkg[kde]/share/kde4/services/kspread*
opt/kde4/%type_pkg[kde]/share/kde4/services/spreadsheetshape*
opt/kde4/%type_pkg[kde]/share/kde4/servicetypes/kspread*
opt/kde4/%type_pkg[kde]/share/templates/.source/*.kst
opt/kde4/%type_pkg[kde]/share/templates/SpreadSheet.*
<<
Shlibs: <<
!%p/opt/kde4/%type_pkg[kde]/lib/libkdeinit4_kspread.dylib
%p/opt/kde4/%type_pkg[kde]/lib/libkspreadcommon.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
<<
PostInstScript: %p/opt/kde4/%type_pkg[kde]/bin/kde4-postinst.sh || :
<<
SplitOff6: <<
Package: kword2-%type_pkg[kde]
Description: KDE4 - word processor
Depends: <<
kdelibs4-%type_pkg[kde]-shlibs (>= 4.2.4-1),
koffice2-%type_pkg[kde]-base-shlibs (>= %v-%r),
qt4-base-%type_pkg[kde]-qt3support-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtcore-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtgui-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtxml-shlibs (>= 4.7.3-1),
%N-base (>= %v-%r)
<<
Replaces: %N-dev (<< 2.0.0-1)
Files: <<
opt/kde4/%type_pkg[kde]/bin/kword*
opt/kde4/%type_pkg[kde]/lib/kde4/krossmodulekword*
opt/kde4/%type_pkg[kde]/lib/kde4/libkword*
opt/kde4/%type_pkg[kde]/lib/kde4/libmswrite*
opt/kde4/%type_pkg[kde]/lib/kde4/liboowriter*
opt/kde4/%type_pkg[kde]/lib/libkdeinit4_kword.dylib
opt/kde4/%type_pkg[kde]/lib/libkwordprivate.5*.dylib
opt/kde4/%type_pkg[kde]/share/applications/kde4/kword*
opt/kde4/%type_pkg[kde]/share/apps/kword
opt/kde4/%type_pkg[kde]/share/config/kword*
opt/kde4/%type_pkg[kde]/share/doc/HTML/en/kword
opt/kde4/%type_pkg[kde]/share/icons/hicolor/16x16/apps/kword.png
opt/kde4/%type_pkg[kde]/share/icons/hicolor/22x22/apps/kword.png
opt/kde4/%type_pkg[kde]/share/icons/hicolor/32x32/apps/kword.png
opt/kde4/%type_pkg[kde]/share/icons/hicolor/48x48/apps/kword.png
opt/kde4/%type_pkg[kde]/share/kde4/services/ServiceMenus/kword*
opt/kde4/%type_pkg[kde]/share/kde4/services/krossmodulekword*
opt/kde4/%type_pkg[kde]/share/kde4/services/kword*
opt/kde4/%type_pkg[kde]/share/templates/.source/*.kwt
opt/kde4/%type_pkg[kde]/share/templates/TextDocument.*
<<
Shlibs: <<
!%p/opt/kde4/%type_pkg[kde]/lib/libkdeinit4_kword.dylib
%p/opt/kde4/%type_pkg[kde]/lib/libkwordprivate.5.dylib 5.0.0 %n (>= 1.9.98.7-1)
<<
PostInstScript: %p/opt/kde4/%type_pkg[kde]/bin/kde4-postinst.sh || :
<<
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.
Annoying flag hackery needed to avoid getting x11's png.h
<<
<<
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
@@ -49,6 +49,12 @@
kde4_add_app_icon( karbon_KDEINIT_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/hi*-app-karbon.png" )
kde4_add_kdeinit_executable( karbon ${karbon_KDEINIT_SRCS})
+if (Q_WS_MAC)
+ set_target_properties(karbon PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.template)
+ set_target_properties(karbon PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.koffice.karbon")
+ set_target_properties(karbon PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Karbon 2")
+endif (Q_WS_MAC)
+
target_link_libraries(kdeinit_karbon komain ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} karboncommon karbonui )
install(TARGETS kdeinit_karbon ${INSTALL_TARGETS_DEFAULT_ARGS})
diff -Nurd koffice-2.0.0/karbon/Info.plist.template koffice-2.0.0-new/karbon/Info.plist.template
--- koffice-2.0.0/karbon/Info.plist.template 1969-12-31 19:00:00.000000000 -0500
+++ koffice-2.0.0-new/karbon/Info.plist.template 2009-06-06 15:21:53.000000000 -0400
@@ -0,0 +1,148 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nurd koffice-2.0.0/kchart/kdchart/kdablibfakes/src/KDABLibFakes.h koffice-2.0.0-new/kchart/kdchart/kdablibfakes/src/KDABLibFakes.h
--- koffice-2.0.0/kchart/kdchart/kdablibfakes/src/KDABLibFakes.h 2009-05-20 03:21:27.000000000 -0400
+++ koffice-2.0.0-new/kchart/kdchart/kdablibfakes/src/KDABLibFakes.h 2009-06-06 15:04:48.000000000 -0400
@@ -43,7 +43,7 @@
#ifndef KDAB_LIB_FAKES_H
#define KDAB_LIB_FAKES_H
-#if defined Q_OS_DARWIN
+#if defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
/* On Mac OS X, ensure that
#define _GLIBCPP_USE_C99 1
#endif
@@ -72,7 +72,7 @@
#include
#define ISNAN(x ) _isnan(x )
#define ISINF(x ) (!(_finite(x ) + _isnan(x ) ) )
-#elif defined (Q_OS_DARWIN) || defined (Q_OS_CYGWIN)
+#elif defined (Q_OS_DARWIN) || defined(Q_OS_MAC) || defined (Q_OS_CYGWIN)
#define ISNAN(x) std::isnan(x)
#define ISINF(x) std::isinf(x)
#else
diff -Nurd koffice-2.0.0/kplato/CMakeLists.txt koffice-2.0.0-new/kplato/CMakeLists.txt
--- koffice-2.0.0/kplato/CMakeLists.txt 2009-05-20 03:26:59.000000000 -0400
+++ koffice-2.0.0-new/kplato/CMakeLists.txt 2009-06-07 10:28:38.000000000 -0400
@@ -92,6 +92,12 @@
kde4_add_kdeinit_executable( kplato ${kplato_KDEINIT_SRCS})
+if (Q_WS_MAC)
+ set_target_properties(kplato PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.template)
+ set_target_properties(kplato PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.koffice.kplato")
+ set_target_properties(kplato PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KPlato 2")
+endif (Q_WS_MAC)
+
target_link_libraries(kdeinit_kplato komain ${KDE4_KDEUI_LIBS})
install(TARGETS kdeinit_kplato ${INSTALL_TARGETS_DEFAULT_ARGS})
diff -Nurd koffice-2.0.0/kplato/Info.plist.template koffice-2.0.0-new/kplato/Info.plist.template
--- koffice-2.0.0/kplato/Info.plist.template 1969-12-31 19:00:00.000000000 -0500
+++ koffice-2.0.0-new/kplato/Info.plist.template 2009-06-07 10:28:29.000000000 -0400
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nurd koffice-2.0.0/kplato/workpackage/CMakeLists.txt koffice-2.0.0-new/kplato/workpackage/CMakeLists.txt
--- koffice-2.0.0/kplato/workpackage/CMakeLists.txt 2009-05-20 03:26:58.000000000 -0400
+++ koffice-2.0.0-new/kplato/workpackage/CMakeLists.txt 2009-06-07 10:41:51.000000000 -0400
@@ -81,6 +81,12 @@
kde4_add_kdeinit_executable( kplatowork ${kplatowork_KDEINIT_SRCS})
+if (Q_WS_MAC)
+ set_target_properties(kplatowork PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.template)
+ set_target_properties(kplatowork PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.koffice.kplato.work")
+ set_target_properties(kplatowork PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KPlato Work 2")
+endif (Q_WS_MAC)
+
target_link_libraries(
kdeinit_kplatowork
kplatoworkapp
diff -Nurd koffice-2.0.0/kplato/workpackage/Info.plist.template koffice-2.0.0-new/kplato/workpackage/Info.plist.template
--- koffice-2.0.0/kplato/workpackage/Info.plist.template 1969-12-31 19:00:00.000000000 -0500
+++ koffice-2.0.0-new/kplato/workpackage/Info.plist.template 2009-06-07 10:34:42.000000000 -0400
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nurd koffice-2.0.0/kpresenter/part/CMakeLists.txt koffice-2.0.0-new/kpresenter/part/CMakeLists.txt
--- koffice-2.0.0/kpresenter/part/CMakeLists.txt 2009-05-20 03:25:49.000000000 -0400
+++ koffice-2.0.0-new/kpresenter/part/CMakeLists.txt 2009-06-07 10:50:27.000000000 -0400
@@ -122,6 +122,12 @@
kde4_add_kdeinit_executable( kpresenter ${kpresenter_KDEINIT_SRCS})
+if (Q_WS_MAC)
+ set_target_properties(kpresenter PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.template)
+ set_target_properties(kpresenter PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.koffice.kpresenter")
+ set_target_properties(kpresenter PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KPresenter 2")
+endif (Q_WS_MAC)
+
target_link_libraries(kdeinit_kpresenter ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} komain )
install(TARGETS kdeinit_kpresenter ${INSTALL_TARGETS_DEFAULT_ARGS})
diff -Nurd koffice-2.0.0/kpresenter/part/Info.plist.template koffice-2.0.0-new/kpresenter/part/Info.plist.template
--- koffice-2.0.0/kpresenter/part/Info.plist.template 1969-12-31 19:00:00.000000000 -0500
+++ koffice-2.0.0-new/kpresenter/part/Info.plist.template 2009-06-07 10:50:12.000000000 -0400
@@ -0,0 +1,122 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nurd koffice-2.0.0/krita/CMakeLists.txt koffice-2.0.0-new/krita/CMakeLists.txt
--- koffice-2.0.0/krita/CMakeLists.txt 2009-05-20 03:21:23.000000000 -0400
+++ koffice-2.0.0-new/krita/CMakeLists.txt 2009-06-07 10:53:08.000000000 -0400
@@ -114,6 +114,12 @@
kde4_add_kdeinit_executable(krita ${krita_KDEINIT_SRCS})
+ if (Q_WS_MAC)
+ set_target_properties(krita PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.template)
+ set_target_properties(krita PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.koffice.krita")
+ set_target_properties(krita PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Krita 2")
+ endif (Q_WS_MAC)
+
target_link_libraries(kdeinit_krita kritaui)
install(TARGETS kdeinit_krita ${INSTALL_TARGETS_DEFAULT_ARGS})
diff -Nurd koffice-2.0.0/krita/Info.plist.template koffice-2.0.0-new/krita/Info.plist.template
--- koffice-2.0.0/krita/Info.plist.template 1969-12-31 19:00:00.000000000 -0500
+++ koffice-2.0.0-new/krita/Info.plist.template 2009-06-07 10:52:44.000000000 -0400
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nurd koffice-2.0.0/krita/image/kis_random_generator.cc koffice-2.0.0-new/krita/image/kis_random_generator.cc
--- koffice-2.0.0/krita/image/kis_random_generator.cc 2009-05-20 03:20:49.000000000 -0400
+++ koffice-2.0.0-new/krita/image/kis_random_generator.cc 2009-06-06 15:04:48.000000000 -0400
@@ -20,8 +20,8 @@
*/
#include "kis_random_generator.h"
-#include
#define __STDC_LIMIT_MACROS
+#include
#include
#include
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
#include
#include
+#include
#include
#include
@@ -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
@@ -253,6 +253,12 @@
kde4_add_kdeinit_executable( kspread ${kspread_KDEINIT_SRCS})
+if (Q_WS_MAC)
+ set_target_properties(kspread PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.template)
+ set_target_properties(kspread PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.koffice.kspread")
+ set_target_properties(kspread PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KSpread 2")
+endif (Q_WS_MAC)
+
target_link_libraries(kdeinit_kspread ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} komain )
install(TARGETS kdeinit_kspread ${INSTALL_TARGETS_DEFAULT_ARGS})
diff -Nurd koffice-2.0.0/kspread/Info.plist.template koffice-2.0.0-new/kspread/Info.plist.template
--- koffice-2.0.0/kspread/Info.plist.template 1969-12-31 19:00:00.000000000 -0500
+++ koffice-2.0.0-new/kspread/Info.plist.template 2009-06-07 11:01:17.000000000 -0400
@@ -0,0 +1,152 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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
@@ -107,6 +107,12 @@
kde4_add_kdeinit_executable( kword ${kword_KDEINIT_SRCS})
+if (Q_WS_MAC)
+ set_target_properties(kword PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.template)
+ set_target_properties(kword PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.koffice.kword")
+ set_target_properties(kword PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KWord 2")
+endif (Q_WS_MAC)
+
target_link_libraries(kdeinit_kword ${KDE4_KDEUI_LIBS} komain )
install(TARGETS kdeinit_kword ${INSTALL_TARGETS_DEFAULT_ARGS})
diff -Nurd koffice-2.0.0/kword/part/Info.plist.template koffice-2.0.0-new/kword/part/Info.plist.template
--- koffice-2.0.0/kword/part/Info.plist.template 1969-12-31 19:00:00.000000000 -0500
+++ koffice-2.0.0-new/kword/part/Info.plist.template 2009-06-07 11:09:29.000000000 -0400
@@ -0,0 +1,161 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nurd koffice-2.0.0/libs/flake/CMakeLists.txt koffice-2.0.0-new/libs/flake/CMakeLists.txt
--- koffice-2.0.0/libs/flake/CMakeLists.txt 2009-05-20 03:25:59.000000000 -0400
+++ koffice-2.0.0-new/libs/flake/CMakeLists.txt 2009-06-06 15:04:48.000000000 -0400
@@ -1,4 +1,4 @@
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${KOMAIN_INCLUDES} ${PIGMENT_INCLUDES})
+include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${KOMAIN_INCLUDES} ${PIGMENT_INCLUDES} ${OPENGL_INCLUDE_DIR})
if(KDE4_BUILD_TESTS)
# only with this definition will the FLAKE_TEST_EXPORT macro do something