Update of /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6189/crypto/finkinfo
Modified Files:
digikam.info
Added Files:
kipi-plugins4.info kipi-plugins4.patch
Log Message:
digikam update, now with kipi-plugins
--- NEW FILE: kipi-plugins4.info ---
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)
<<
<<
<<
Index: digikam.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/digikam.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- digikam.info 22 Mar 2009 18:48:54 -0000 1.1
+++ digikam.info 11 Apr 2009 13:20:57 -0000 1.2
@@ -1,39 +1,41 @@
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
Maintainer: Benjamin Reed <digi...@fink.racoonfink.com>
Depends: <<
- kdebase4-runtime-%type_pkg[kde] (>= 4.2.1-2),
+ kdebase4-runtime-%type_pkg[kde] (>= 4.2.2-1),
+ kipi-plugins4-%type_pkg[kde],
%N-shlibs (>= %v-%r)
<<
BuildDepends: <<
- automoc-%type_pkg[kde] (>= 0.9.88-1),
+ automoc-%type_pkg[kde] (>= 0.9.89-0),
cmake (>= 2.6.3-1),
dbus-dev (>= 1.2.12-1),
fink (>= 0.28.0-1),
fontconfig2-dev (>= 2.4.1-1),
freetype219 (>= 2.3.7-7),
glib2-dev (>= 2.14.0-1),
- kde4-buildenv (>= 4.2.1-4),
- kdebase4-%type_pkg[kde]-dev (>= 4.2.1-2),
+ kde4-buildenv (>= 4.2.2-3),
+ kdebase4-%type_pkg[kde]-dev (>= 4.2.2-1),
kdeedu4-%type_pkg[kde]-dev (>= 4.2.0-1),
- kdelibs4-%type_pkg[kde]-dev (>= 4.2.1-2),
- kdepimlibs4-%type_pkg[kde]-dev (>= 4.2.1-2),
+ kdelibs4-%type_pkg[kde]-dev (>= 4.2.2-3),
+ kdepimlibs4-%type_pkg[kde]-dev (>= 4.2.2-1),
lcms,
lensfun,
libexiv2-0.18,
+ libjasper.1,
libgettext3-dev,
libgphoto2,
libkdcraw-7-%type_pkg[kde]-dev,
libkexiv2-7-%type_pkg[kde]-dev,
libkipi-6-%type_pkg[kde]-dev,
pkgconfig (>= 0.22-3),
- qt4-%type_pkg[kde] (>= 4.5.0-3),
+ qt4-%type_pkg[kde] (>= 4.5.0-4),
soprano-%type_pkg[kde]-dev (>= 2.2.3-2),
strigi-dev (>= 0.6.3-1),
(%type_pkg[kde] = x11) x11-dev,
@@ -69,11 +71,10 @@
SplitOff: <<
Package: %N-shlibs
Depends: <<
- kdelibs4-%type_pkg[kde]-shlibs (>= 4.2.1-2),
- kdepimlibs4-%type_pkg[kde]-shlibs (>= 4.2.1-2),
+ kdelibs4-%type_pkg[kde]-shlibs (>= 4.2.2-3),
lcms-shlibs,
+ libjasper.1-shlibs,
lensfun-shlibs,
- libexiv2-shlibs-0.18,
libkdcraw-7-%type_pkg[kde]-shlibs,
libkexiv2-7-%type_pkg[kde]-shlibs,
libkipi-6-%type_pkg[kde]-shlibs,
@@ -97,7 +98,7 @@
<<
<<
-PostInstScript: %p/lib/%type_pkg[kde]/bin/kbuildsycoca-global.sh >/dev/null
2>&1 || :
+PostInstScript: %p/lib/%type_pkg[kde]/bin/kde4-postinst.sh >/dev/null 2>&1 || :
DescDetail: <<
digiKam is an advanced digital photo management application for linux.
--- NEW FILE: kipi-plugins4.patch ---
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
