Author: ranger
Date: Sat Apr 11 14:46:53 2009
New Revision: 1486
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1486&repname=user%3a+ranger>
Log:
various updates
Added:
trunk/experimental/common/crypto/finkinfo/kipi-plugins4.info
trunk/experimental/common/crypto/finkinfo/kipi-plugins4.patch
Modified:
trunk/experimental/10.4/crypto/finkinfo/digikam.info
trunk/experimental/10.4/crypto/finkinfo/gecko-sharp.info
trunk/experimental/10.4/crypto/finkinfo/gecko-sharp1.info
trunk/experimental/10.4/crypto/finkinfo/gnome-desktop-sharp2.info
trunk/experimental/10.4/crypto/finkinfo/gnome-sharp2.info
trunk/experimental/10.4/crypto/finkinfo/gtk-sharp-monodoc.info
trunk/experimental/10.4/crypto/finkinfo/gtk-sharp.info
trunk/experimental/10.4/crypto/finkinfo/gtk-sharp2.info
trunk/experimental/10.4/crypto/finkinfo/gtksourceview-sharp.info
trunk/experimental/10.4/crypto/finkinfo/libgdiplus.info
trunk/experimental/10.4/crypto/finkinfo/net-jabber-pm.info
trunk/experimental/10.4/crypto/finkinfo/net-xmpp-pm.info
trunk/experimental/10.4/crypto/finkinfo/xml-stream-pm.info
trunk/experimental/common/crypto/finkinfo/digikam.info
Modified: trunk/experimental/10.4/crypto/finkinfo/digikam.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/crypto/finkinfo/digikam.info&rev=1486&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/crypto/finkinfo/digikam.info (original)
+++ trunk/experimental/10.4/crypto/finkinfo/digikam.info Sat Apr 11 14:46:53
2009
@@ -1,7 +1,7 @@
Info4: <<
Package: digikam-%type_pkg[kde]
Version: 0.10.0
-Revision: 1
+Revision: 2
Description: KDE4 - photo management
Type: kde (x11 mac)
License: GPL/LGPL
@@ -9,6 +9,7 @@
Depends: <<
kdebase4-runtime-%type_pkg[kde] (>= 4.2.2-1),
+ kipi-plugins4-%type_pkg[kde],
%N-shlibs (>= %v-%r)
<<
BuildDepends: <<
Modified: trunk/experimental/10.4/crypto/finkinfo/gecko-sharp.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/crypto/finkinfo/gecko-sharp.info&rev=1486&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/crypto/finkinfo/gecko-sharp.info (original)
+++ trunk/experimental/10.4/crypto/finkinfo/gecko-sharp.info Sat Apr 11
14:46:53 2009
@@ -24,7 +24,7 @@
gtk-sharp2 (>= 2.12.8-1),
mono-dev (>= 2.4-1),
monodoc (>= 2.0-1),
- pango1-xft2-ft219-dev (>= 1.18.4-4),
+ pango1-xft2-ft219-dev (>= 1.20.5-1),
pkgconfig (>= 0.22-3)
<<
Conflicts: <<
Modified: trunk/experimental/10.4/crypto/finkinfo/gecko-sharp1.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/crypto/finkinfo/gecko-sharp1.info&rev=1486&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/crypto/finkinfo/gecko-sharp1.info (original)
+++ trunk/experimental/10.4/crypto/finkinfo/gecko-sharp1.info Sat Apr 11
14:46:53 2009
@@ -24,7 +24,7 @@
gtk-sharp (>= 1.0.10-11),
mono-dev (>= 2.4-1),
monodoc (>= 2.0-1),
- pango1-xft2-ft219-dev (>= 1.18.4-4),
+ pango1-xft2-ft219-dev (>= 1.20.5-1),
pkgconfig (>= 0.22-3)
<<
Conflicts: gecko-sharp1 (<< 0.6-4)
Modified: trunk/experimental/10.4/crypto/finkinfo/gnome-desktop-sharp2.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/crypto/finkinfo/gnome-desktop-sharp2.info&rev=1486&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/crypto/finkinfo/gnome-desktop-sharp2.info (original)
+++ trunk/experimental/10.4/crypto/finkinfo/gnome-desktop-sharp2.info Sat Apr
11 14:46:53 2009
@@ -22,7 +22,7 @@
BuildDepends: <<
atk1 (>= 1.20.0-1),
audiofile (>= 0.2.6-11),
- cairo (>= 1.8-1),
+ cairo (>= 1.8.6-1),
dbus-dev (>= 1.2.12-1),
expat1,
freetype219 (>= 2.3.7-7),
@@ -49,7 +49,7 @@
libwnck1.22,
mono-dev (>= 2.4-1),
orbit2-dev (>= 2.14.10-1),
- pango1-xft2-ft219-dev (>= 1.18.4-4),
+ pango1-xft2-ft219-dev (>= 1.20.5-1),
pixman (>= 0.12.0-1),
pkgconfig (>= 0.22-3),
startup-notification-dev (>= 0.9-1),
Modified: trunk/experimental/10.4/crypto/finkinfo/gnome-sharp2.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/crypto/finkinfo/gnome-sharp2.info&rev=1486&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/crypto/finkinfo/gnome-sharp2.info (original)
+++ trunk/experimental/10.4/crypto/finkinfo/gnome-sharp2.info Sat Apr 11
14:46:53 2009
@@ -14,7 +14,7 @@
BuildDepends: <<
atk1 (>= 1.20.0-1),
audiofile (>= 0.2.6-11),
- cairo (>= 1.8-1),
+ cairo (>= 1.8.6-1),
dbus-dev (>= 1.2.12-1),
esound,
expat1,
@@ -37,10 +37,10 @@
libgnomeprint2.2-dev (>= 2.18.2-1),
libgnomeprintui2.2-dev (>= 2.18.1-1),
libjpeg,
- libxml2 (>= 2.6.30-1),
+ libxml2 (>= 2.6.32-1),
mono-dev (>= 2.4-1),
orbit2-dev (>= 2.14.10-1),
- pango1-xft2-ft219-dev (>= 1.18.4-4),
+ pango1-xft2-ft219-dev (>= 1.20.5-1),
pixman (>= 0.12.0-1),
pkgconfig (>= 0.22-3),
popt
Modified: trunk/experimental/10.4/crypto/finkinfo/gtk-sharp-monodoc.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/crypto/finkinfo/gtk-sharp-monodoc.info&rev=1486&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/crypto/finkinfo/gtk-sharp-monodoc.info (original)
+++ trunk/experimental/10.4/crypto/finkinfo/gtk-sharp-monodoc.info Sat Apr 11
14:46:53 2009
@@ -16,7 +16,7 @@
gtk+2-dev (>= 2.14.3-1),
libglade2 (>= 2.6.2-1),
mono-dev (>= 2.4-1),
- pango1-xft2-ft219-dev (>= 1.18.4-4),
+ pango1-xft2-ft219-dev (>= 1.20.5-1),
pkgconfig (>= 0.22-3)
<<
Replaces: <<
Modified: trunk/experimental/10.4/crypto/finkinfo/gtk-sharp.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/crypto/finkinfo/gtk-sharp.info&rev=1486&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/crypto/finkinfo/gtk-sharp.info (original)
+++ trunk/experimental/10.4/crypto/finkinfo/gtk-sharp.info Sat Apr 11 14:46:53
2009
@@ -17,7 +17,7 @@
BuildDepends: <<
atk1 (>= 1.20.0-1),
audiofile (>= 0.2.6-11),
- cairo (>= 1.8-1),
+ cairo (>= 1.8.6-1),
dbus-dev (>= 1.2.12-1),
expat1,
freetype219 (>= 2.3.7-7),
@@ -39,10 +39,10 @@
libgnomeui2-dev (>= 2.20.0-1),
libjpeg,
librsvg2 (>= 2.20.0-1),
- libxml2 (>= 2.6.30-1),
+ libxml2 (>= 2.6.32-1),
mono-dev (>= 2.4-1),
orbit2-dev (>= 2.14.10-1),
- pango1-xft2-ft219-dev (>= 1.18.4-4),
+ pango1-xft2-ft219-dev (>= 1.20.5-1),
pixman (>= 0.12.0-1),
pkgconfig (>= 0.22-3),
popt,
Modified: trunk/experimental/10.4/crypto/finkinfo/gtk-sharp2.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/crypto/finkinfo/gtk-sharp2.info&rev=1486&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/crypto/finkinfo/gtk-sharp2.info (original)
+++ trunk/experimental/10.4/crypto/finkinfo/gtk-sharp2.info Sat Apr 11 14:46:53
2009
@@ -17,7 +17,7 @@
BuildDepends: <<
atk1 (>= 1.20.0-1),
audiofile (>= 0.2.6-11),
- cairo (>= 1.8-1),
+ cairo (>= 1.8.6-1),
dbus-dev (>= 1.2.12-1),
expat1,
freetype219 (>= 2.3.7-7),
@@ -39,10 +39,10 @@
libgnomeui2-dev (>= 2.20.0-1),
libjpeg,
librsvg2 (>= 2.20.0-1),
- libxml2 (>= 2.6.30-1),
+ libxml2 (>= 2.6.32-1),
mono-dev (>= 2.4-1),
orbit2-dev (>= 2.14.10-1),
- pango1-xft2-ft219-dev (>= 1.18.4-4),
+ pango1-xft2-ft219-dev (>= 1.20.5-1),
pixman (>= 0.12.0-1),
pkgconfig (>= 0.22-3),
popt,
Modified: trunk/experimental/10.4/crypto/finkinfo/gtksourceview-sharp.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/crypto/finkinfo/gtksourceview-sharp.info&rev=1486&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/crypto/finkinfo/gtksourceview-sharp.info (original)
+++ trunk/experimental/10.4/crypto/finkinfo/gtksourceview-sharp.info Sat Apr 11
14:46:53 2009
@@ -22,7 +22,7 @@
libgnomeprint2.2-dev (>= 2.18.0-1),
mono-dev (>= 2.4-1),
mono-tools (>= 2.4-1),
- pango1-xft2-ft219-dev (>= 1.18.4-4),
+ pango1-xft2-ft219-dev (>= 1.20.5-1),
pkgconfig (>= 0.22-3)
<<
Modified: trunk/experimental/10.4/crypto/finkinfo/libgdiplus.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/crypto/finkinfo/libgdiplus.info&rev=1486&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/crypto/finkinfo/libgdiplus.info (original)
+++ trunk/experimental/10.4/crypto/finkinfo/libgdiplus.info Sat Apr 11 14:46:53
2009
@@ -7,14 +7,14 @@
Maintainer: Benjamin Reed <libgdip...@fink.racoonfink.com>
Depends: <<
- cairo-shlibs (>= 1.8-1),
+ cairo-shlibs (>= 1.8.6-1),
libexif12-shlibs,
libtiff-shlibs,
giflib-shlibs (>= 4.1.6-1),
mono (>= 2.4-1)
<<
BuildDepends: <<
- cairo (>= 1.8-1),
+ cairo (>= 1.8.6-1),
expat1,
fink (>= 0.28.0-1),
fontconfig2-dev (>= 2.4.1-1),
Modified: trunk/experimental/10.4/crypto/finkinfo/net-jabber-pm.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/crypto/finkinfo/net-jabber-pm.info&rev=1486&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/crypto/finkinfo/net-jabber-pm.info (original)
+++ trunk/experimental/10.4/crypto/finkinfo/net-jabber-pm.info Sat Apr 11
14:46:53 2009
@@ -5,7 +5,7 @@
Architecture: (%type_pkg[perl] = 581) powerpc, (%type_pkg[perl] = 584) powerpc
Distribution: (%type_pkg[perl] = 581) 10.3, (%type_pkg[perl] = 581) 10.4,
(%type_pkg[perl] = 584) 10.3, (%type_pkg[perl] = 584) 10.4
Description: Perl module for the XMPP protocol
-Type: perl(5.8.1 5.8.4 5.8.6 5.8.8)
+Type: perl(5.8.1 5.8.4 5.8.6 5.8.8 5.10.0)
License: LGPL
Maintainer: Benjamin Reed <net-jabber...@fink.racoonfink.com>
Modified: trunk/experimental/10.4/crypto/finkinfo/net-xmpp-pm.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/crypto/finkinfo/net-xmpp-pm.info&rev=1486&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/crypto/finkinfo/net-xmpp-pm.info (original)
+++ trunk/experimental/10.4/crypto/finkinfo/net-xmpp-pm.info Sat Apr 11
14:46:53 2009
@@ -5,7 +5,7 @@
Architecture: (%type_pkg[perl] = 581) powerpc, (%type_pkg[perl] = 584) powerpc
Distribution: (%type_pkg[perl] = 581) 10.3, (%type_pkg[perl] = 581) 10.4,
(%type_pkg[perl] = 584) 10.3, (%type_pkg[perl] = 584) 10.4
Description: Perl module for the XMPP protocol
-Type: perl(5.8.1 5.8.4 5.8.6 5.8.8)
+Type: perl(5.8.1 5.8.4 5.8.6 5.8.8 5.10.0)
License: LGPL
Maintainer: Benjamin Reed <net-xmpp...@fink.racoonfink.com>
Modified: trunk/experimental/10.4/crypto/finkinfo/xml-stream-pm.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/crypto/finkinfo/xml-stream-pm.info&rev=1486&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/crypto/finkinfo/xml-stream-pm.info (original)
+++ trunk/experimental/10.4/crypto/finkinfo/xml-stream-pm.info Sat Apr 11
14:46:53 2009
@@ -5,7 +5,7 @@
Architecture: (%type_pkg[perl] = 581) powerpc, (%type_pkg[perl] = 584) powerpc
Distribution: (%type_pkg[perl] = 581) 10.3, (%type_pkg[perl] = 581) 10.4,
(%type_pkg[perl] = 584) 10.3, (%type_pkg[perl] = 584) 10.4
Description: Parse streamed XML data
-Type: perl(5.8.1 5.8.4 5.8.6 5.8.8)
+Type: perl(5.8.1 5.8.4 5.8.6 5.8.8 5.10.0)
License: LGPL
Maintainer: Benjamin Reed <xml-stream...@fink.racoonfink.com>
Modified: trunk/experimental/common/crypto/finkinfo/digikam.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/crypto/finkinfo/digikam.info&rev=1486&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/crypto/finkinfo/digikam.info (original)
+++ trunk/experimental/common/crypto/finkinfo/digikam.info Sat Apr 11 14:46:53
2009
@@ -1,7 +1,7 @@
Info4: <<
Package: digikam-%type_pkg[kde]
Version: 0.10.0
-Revision: 1
+Revision: 2
Type: kde (x11 mac)
Description: KDE4 - photo management
License: GPL/LGPL
@@ -22,6 +22,7 @@
Depends: <<
kdebase4-runtime-%type_pkg[kde] (>= 4.2.1-1),
+ kipi-plugins4-%type_pkg[kde],
%N-shlibs (>= %v-%r)
<<
Added: trunk/experimental/common/crypto/finkinfo/kipi-plugins4.info
URL:
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/common/crypto/finkinfo/kipi-plugins4.info&rev=1486&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/crypto/finkinfo/kipi-plugins4.info (added)
+++ trunk/experimental/common/crypto/finkinfo/kipi-plugins4.info Sat Apr 11
14:46:53 2009
@@ -1,0 +1,125 @@
+Info4: <<
+Package: kipi-plugins4-%type_pkg[kde]
+Version: 0.2.0
+Revision: 1
+Type: kde (x11 mac)
+Description: KDE4 - image plugins
+License: GPL/LGPL
+Maintainer: Benjamin Reed <kipi-plugi...@fink.racoonfink.com>
+
+DescDetail: <<
+KIPI (KDE Image Plugin Interface) is an effort to develop a common plugin
+structure for Digikam, KPhotoAlbum, Showimg and GwenView. Its aim is to
+share image plugins among graphic applications. Kipi is based on the old
+digiKam plugins implementation.
+
+One of the nicest things about KDE Photo Management Programs like
+"digiKam", "KPhotoAlbum", "GwenView" and "ShowImg" is how easily its
+functionality can be extended, by using plugins. Plugins can manipulate
+image files in almost any way that users can. Their advantage is that it
+is much easier to add a capability to the host application by writing a
+small plugin than by modifying the host application core. Many valuable
+plugins have C++ source code that only comes to 100-200 lines or so.
+
+Kipi plugins are additional functions for the KDE Images Managment Host
+Programs. They can add extra menus and shortcuts, and extend the host
+programs features. You can install as many or as few as you like, from
+within host programs.
+<<
+
+Source: mirror:sourceforge:kipi/kipi-plugins-%v.tar.bz2
+Source-MD5: cae41d263cc368719f6a51d511bdeab9
+PatchFile: kipi-plugins4.patch
+PatchFile-MD5: 2ae5fd224abc43d836a145439f1e7598
+
+Depends: <<
+ kdebase4-runtime-%type_pkg[kde] (>= 4.2.1-1),
+ %N-shlibs (>= %v-%r)
+<<
+
+# TODO
+# package:
+# opencv
+
+BuildDepends: <<
+ automoc-%type_pkg[kde] (>= 0.9.88-1),
+ cmake (>= 2.6.3-1),
+ dbus-dev (>= 1.2.12-1),
+ expat1,
+ fink (>= 0.28.0-1),
+ fontconfig2-dev (>= 2.4.1-1),
+ freetype219 (>= 2.3.7-7),
+ glib2-dev (>= 2.14.0-1),
+ gtk+2-dev (>= 2.12.0-1),
+ kde4-buildenv (>= 4.2-3),
+ kdebase4-%type_pkg[kde]-dev (>= 4.2.0-1),
+ kdelibs4-%type_pkg[kde]-dev (>= 4.2.0-1),
+ kdepimlibs4-%type_pkg[kde]-dev (>= 4.2.0-1),
+ libjasper.1,
+ libjpeg,
+ libgettext3-dev,
+ libgphoto2,
+ libgpod4,
+ libkdcraw-7-%type_pkg[kde]-dev,
+ libkexiv2-7-%type_pkg[kde]-dev,
+ libkipi-6-%type_pkg[kde]-dev,
+ libksane-0-%type_pkg[kde]-dev,
+ libpng3,
+ libtiff,
+ libxml2,
+ libxslt,
+ pkgconfig (>= 0.22-3),
+ qt4-%type_pkg[kde] (>= 4.4.0-1),
+ sane-backends-dev,
+ soprano-%type_pkg[kde]-dev (>= 2.2.1-1),
+ strigi-dev (>= 0.6.3-1),
+ (%type_pkg[kde] = x11) x11-dev,
+ system-openssl-dev
+<<
+GCC: 4.0
+
+CompileScript: <<
+#!/bin/sh -ev
+
+ export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[kde]"
+ . %p/sbin/kde4-buildenv.sh
+
+ mkdir -p build
+ pushd build
+ cmake \
+ -DBUILD_po:BOOL=OFF \
+ -DGPOD_INCLUDE_DIR:PATH=%p/include/gpod-1.0
-DGPOD_LIBRARIES:FILEPATH=%p/lib/libgpod.dylib \
+ -DGDK_INCLUDE_DIR:PATH=%p/include/gtk-2.0
-DGDK_LIBRARIES:FILEPATH=%p/lib/libgdk_pixbuf-2.0.dylib \
+ $KDE4_CMAKE_ARGS \
+ ..
+ make
+ popd
+<<
+
+InstallScript: <<
+#!/bin/sh -ev
+
+ pushd build
+ make -j1 install/fast DESTDIR="%d"
+ popd
+<<
+
+PostInstScript: %p/lib/%type_pkg[kde]/bin/kde4-postinst.sh >/dev/null 2>&1 || :
+
+SplitOff: <<
+ Package: %N-shlibs
+ Depends: <<
+ kdelibs4-%type_pkg[kde]-shlibs (>= 4.2.0-1),
+ libkdcraw-7-%type_pkg[kde]-shlibs,
+ libkexiv2-7-%type_pkg[kde]-shlibs,
+ libkipi-6-%type_pkg[kde]-shlibs,
+ <<
+ Files: <<
+ lib/%type_pkg[kde]/lib/libkipiplugins.1*.dylib
+ <<
+ Shlibs: <<
+ %p/lib/%type_pkg[kde]/lib/libkipiplugins.1.dylib 1.0.0 %n (>=
0.2.0-1)
+ <<
+<<
+
+<<
Added: trunk/experimental/common/crypto/finkinfo/kipi-plugins4.patch
URL:
<http://svn.finkproject.org/websvn/filedetails.php?path=/trunk/experimental/common/crypto/finkinfo/kipi-plugins4.patch&rev=1486&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/crypto/finkinfo/kipi-plugins4.patch (added)
+++ trunk/experimental/common/crypto/finkinfo/kipi-plugins4.patch Sat Apr 11
14:46:53 2009
@@ -1,0 +1,204 @@
+diff -Nurd kipi-plugins-0.2.0/CMakeLists.txt
kipi-plugins-0.2.0-patched/CMakeLists.txt
+--- kipi-plugins-0.2.0/CMakeLists.txt 2009-03-17 04:59:48.000000000 -0400
++++ kipi-plugins-0.2.0-patched/CMakeLists.txt 2009-04-10 23:37:59.000000000
-0400
+@@ -57,11 +57,9 @@
+ MACRO_OPTIONAL_FIND_PACKAGE(GObject) # For ipodexport.
+ MACRO_OPTIONAL_FIND_PACKAGE(KdepimLibs) # For Calendar (libkcal).
+
+-# LINUX Only.
+-IF(NOT WIN32 AND NOT APPLE)
++IF(NOT WIN32)
+ MACRO_OPTIONAL_FIND_PACKAGE(Sane) # For AcquireImages.
+- MACRO_OPTIONAL_FIND_PACKAGE(X11) # For AdvancedSlideshow and
ImageViewer.
+-ENDIF(NOT WIN32 AND NOT APPLE)
++ENDIF(NOT WIN32)
+
+ IF(NOT WIN32)
+ # Check KDcraw version installed to compile fine DngConverter plugin.
+@@ -78,15 +76,14 @@
+
+ INCLUDE(MacroOptionalDependPackage)
+
+-# LINUX Only.
+-IF(NOT WIN32 AND NOT APPLE)
++IF(NOT WIN32)
+ MACRO_OPTIONAL_DEPEND_PACKAGE(KSane "ksane")
+ IF(DEPEND_PACKAGE_KSane)
+ MACRO_OPTIONAL_FIND_PACKAGE(KSane) # For AcquireImages
+ ELSE(DEPEND_PACKAGE_KSane)
+ SET(KSANE_FOUND FALSE)
+ ENDIF(DEPEND_PACKAGE_KSane)
+-ENDIF(NOT WIN32 AND NOT APPLE)
++ENDIF(NOT WIN32)
+
+ #
==================================================================================================
+ # Log messages
+@@ -215,7 +212,7 @@
+ ENDIF(KDEPIMLIBS_FOUND)
+
+ # LINUX Only.
+-IF(NOT WIN32 AND NOT APPLE)
++IF(NOT WIN32)
+ IF(X11_FOUND AND X11_Xrandr_FOUND)
+ MESSAGE(STATUS " libX11 library found................ YES (optional)")
+ ELSE(X11_FOUND AND X11_Xrandr_FOUND)
+@@ -227,7 +224,7 @@
+ ELSE(KSANE_FOUND)
+ MESSAGE(STATUS " libksane library found.............. NO (optional)")
+ ENDIF(KSANE_FOUND)
+-ENDIF(NOT WIN32 AND NOT APPLE)
++ENDIF(NOT WIN32)
+
+ # Optional plugins results
----------------------------------------------------------------------------
+
+@@ -247,7 +244,7 @@
+ MESSAGE(STATUS " HtmlExport will be compiled......... NO (optional -
Look README file for more details about dependencies)")
+ ENDIF(LIBXML2_FOUND AND LIBXSLT_FOUND)
+
+-IF(NOT WIN32 AND NOT APPLE)
++IF(NOT WIN32)
+
+ IF(X11_FOUND AND X11_Xrandr_FOUND AND OPENGL_FOUND AND OPENGL_GLU_FOUND)
+ MESSAGE(STATUS " AdvancedSlideshow will be compiled.. YES (optional)")
+@@ -263,7 +260,7 @@
+ MESSAGE(STATUS " AcquireImages will be compiled...... NO (optional -
Look README file for more details about dependencies)")
+ ENDIF(SANE_FOUND AND KSANE_FOUND)
+
+-ELSE(NOT WIN32 AND NOT APPLE)
++ELSE(NOT WIN32)
+
+ IF(OPENGL_FOUND AND OPENGL_GLU_FOUND)
+ MESSAGE(STATUS " AdvancedSlideshow will be compiled.. YES (optional)")
+@@ -273,7 +270,7 @@
+ MESSAGE(STATUS " ImageViewer will be compiled........ NO (optional -
Look README file for more details about dependencies)")
+ ENDIF(OPENGL_FOUND AND OPENGL_GLU_FOUND)
+
+-ENDIF(NOT WIN32 AND NOT APPLE)
++ENDIF(NOT WIN32)
+
+ IF(EXPAT_FOUND AND KDCRAW_FOR_DNGCONVERTER)
+ MESSAGE(STATUS " DNGConverter will be compiled....... YES (optional)")
+@@ -378,7 +375,7 @@
+ ADD_SUBDIRECTORY(htmlexport)
+ ENDIF(LIBXML2_FOUND AND LIBXSLT_FOUND)
+
+- IF(NOT WIN32 AND NOT APPLE)
++ IF(Q_WS_X11)
+
+ # Plugins which depend on OpenGL
+ IF(X11_FOUND AND X11_Xrandr_FOUND AND OPENGL_FOUND AND
OPENGL_GLU_FOUND)
+@@ -392,7 +389,7 @@
+ ADD_SUBDIRECTORY(acquireimages)
+ ENDIF(SANE_FOUND AND KSANE_FOUND)
+
+- ELSE(NOT WIN32 AND NOT APPLE)
++ ELSE(Q_WS_X11)
+
+ # Plugins which depend on OpenGL
+ IF(OPENGL_FOUND AND OPENGL_GLU_FOUND)
+@@ -403,7 +400,7 @@
+ # Under Windows, this plugin use TWAIN interface
+ ADD_SUBDIRECTORY(acquireimages)
+
+- ENDIF(NOT WIN32 AND NOT APPLE)
++ ENDIF(Q_WS_X11)
+
+ IF(EXPAT_FOUND AND KDCRAW_FOR_DNGCONVERTER)
+ IF(CMAKE_USE_PTHREADS_INIT OR CMAKE_USE_WIN32_THREADS_INIT)
+diff -Nurd kipi-plugins-0.2.0/acquireimages/CMakeLists.txt
kipi-plugins-0.2.0-patched/acquireimages/CMakeLists.txt
+--- kipi-plugins-0.2.0/acquireimages/CMakeLists.txt 2009-03-17
04:52:18.000000000 -0400
++++ kipi-plugins-0.2.0-patched/acquireimages/CMakeLists.txt 2009-04-11
08:14:42.000000000 -0400
+@@ -38,7 +38,7 @@
+
+ ELSE(WIN32)
+
+- INCLUDE_DIRECTORIES(${KSANE_INCLUDE_DIR})
++ INCLUDE_DIRECTORIES(${KSANE_INCLUDE_DIR} ${JPEG_INCLUDE_DIR}
${PNG_PNG_INCLUDE_DIR} ${TIFF_INCLUDE_DIR})
+
+ SET(kipiplugin_acquireimages_PART_SRCS
+ plugin_acquireimages.cpp
+diff -Nurd kipi-plugins-0.2.0/advancedslideshow/listsounditems.h
kipi-plugins-0.2.0-patched/advancedslideshow/listsounditems.h
+--- kipi-plugins-0.2.0/advancedslideshow/listsounditems.h 2009-03-17
04:52:27.000000000 -0400
++++ kipi-plugins-0.2.0-patched/advancedslideshow/listsounditems.h
2009-04-10 23:25:46.000000000 -0400
+@@ -33,7 +33,6 @@
+ #include <QListWidgetItem>
+
+ // Phonon includes
+-#include <Phonon/Global>
+ #include <Phonon/MediaObject>
+
+ // KDE includes.
+diff -Nurd kipi-plugins-0.2.0/advancedslideshow/playbackwidget.h
kipi-plugins-0.2.0-patched/advancedslideshow/playbackwidget.h
+--- kipi-plugins-0.2.0/advancedslideshow/playbackwidget.h 2009-03-17
04:52:27.000000000 -0400
++++ kipi-plugins-0.2.0-patched/advancedslideshow/playbackwidget.h
2009-04-10 23:27:08.000000000 -0400
+@@ -29,7 +29,6 @@
+ // Phonon includes
+ #include <Phonon/MediaObject>
+ #include <Phonon/AudioOutput>
+-#include <Phonon/Global>
+ #include <Phonon/VolumeSlider>
+
+ // KDE includes.
+diff -Nurd kipi-plugins-0.2.0/dngconverter/CMakeLists.txt
kipi-plugins-0.2.0-patched/dngconverter/CMakeLists.txt
+--- kipi-plugins-0.2.0/dngconverter/CMakeLists.txt 2009-03-17
04:52:57.000000000 -0400
++++ kipi-plugins-0.2.0-patched/dngconverter/CMakeLists.txt 2009-04-10
22:41:33.000000000 -0400
+@@ -23,6 +23,9 @@
+ )
+ ELSE(WIN32)
+ IF(APPLE)
++ INCLUDE_DIRECTORIES(
++
/System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework/Headers
++ )
+ ADD_DEFINITIONS(
+ # Set MACOS-X rules.
+ -DMAC_ENV=1
+diff -Nurd
kipi-plugins-0.2.0/dngconverter/dngwriter/extra/dng_sdk/dng_date_time.cpp
kipi-plugins-0.2.0-patched/dngconverter/dngwriter/extra/dng_sdk/dng_date_time.cpp
+--- kipi-plugins-0.2.0/dngconverter/dngwriter/extra/dng_sdk/dng_date_time.cpp
2009-03-17 04:52:55.000000000 -0400
++++
kipi-plugins-0.2.0-patched/dngconverter/dngwriter/extra/dng_sdk/dng_date_time.cpp
2009-04-10 22:44:30.000000000 -0400
+@@ -24,7 +24,7 @@
+ #include <time.h>
+
+ #if qMacOS
+-#include <CoreServices/CoreServices.h>
++#include <CoreFoundation/CoreFoundation.h>
+ #endif
+
+ #if qWinOS
+diff -Nurd
kipi-plugins-0.2.0/dngconverter/dngwriter/extra/dng_sdk/dng_string.cpp
kipi-plugins-0.2.0-patched/dngconverter/dngwriter/extra/dng_sdk/dng_string.cpp
+--- kipi-plugins-0.2.0/dngconverter/dngwriter/extra/dng_sdk/dng_string.cpp
2009-03-17 04:52:55.000000000 -0400
++++
kipi-plugins-0.2.0-patched/dngconverter/dngwriter/extra/dng_sdk/dng_string.cpp
2009-04-10 22:48:55.000000000 -0400
+@@ -22,7 +22,8 @@
+ #include "dng_utils.h"
+
+ #if qMacOS
+-#include <CoreServices/CoreServices.h>
++#include <CoreFoundation/CoreFoundation.h>
++#include <CarbonCore.h>
+ #endif
+
+ #if qWinOS
+diff -Nurd
kipi-plugins-0.2.0/dngconverter/dngwriter/extra/dng_sdk/dng_utils.cpp
kipi-plugins-0.2.0-patched/dngconverter/dngwriter/extra/dng_sdk/dng_utils.cpp
+--- kipi-plugins-0.2.0/dngconverter/dngwriter/extra/dng_sdk/dng_utils.cpp
2009-03-17 04:52:55.000000000 -0400
++++
kipi-plugins-0.2.0-patched/dngconverter/dngwriter/extra/dng_sdk/dng_utils.cpp
2009-04-10 22:46:07.000000000 -0400
+@@ -18,7 +18,7 @@
+ #include "dng_assertions.h"
+
+ #if qMacOS
+-#include <CoreServices/CoreServices.h>
++#include <CoreFoundation/CoreFoundation.h>
+ #endif
+
+ #if qWinOS
+diff -Nurd kipi-plugins-0.2.0/dngconverter/test/CMakeLists.txt
kipi-plugins-0.2.0-patched/dngconverter/test/CMakeLists.txt
+--- kipi-plugins-0.2.0/dngconverter/test/CMakeLists.txt 2009-03-17
04:52:45.000000000 -0400
++++ kipi-plugins-0.2.0-patched/dngconverter/test/CMakeLists.txt
2009-04-10 23:13:12.000000000 -0400
+@@ -27,6 +27,9 @@
+ ${EXPAT_LIBRARY}
+ ${CMAKE_THREAD_LIBS_INIT}
+ )
++IF(APPLE)
++TARGET_LINK_LIBRARIES(dngvalidate "-framework CoreFoundation" "-framework
Carbon")
++ENDIF(APPLE)
+
+ # =======================================================
+ # RAW2DNG command line tool
------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
