mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-21 20:38:45 +00:00
Code Issues Releases Activity

Update graphics/digikam-kde4 to 0.10.0-rc1

Browse Source 
PR:		ports/131534
Submitted by:	Matt Tosto <datahead4 at gmail.com>
This commit is contained in:
Max Brazhnikov 2009-02-14 23:32:33 +00:00
parent 07bce0b646
commit dbf0201f5a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=228348
25 changed files with 596 additions and 1150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
graphics/digikam-kde4/Makefile
View File

@ -6,41 +6,30 @@
#
PORTNAME= digikam
DISTVERSION= 0.9.4
PORTREVISION= 3
DISTVERSION= 0.10.0-rc1
CATEGORIES= graphics kde
MASTER_SITES= SFE
MAINTAINER= ale@FreeBSD.org
COMMENT= An advanced digital photo management application for KDE
MAINTAINER= datahead4@gmail.com
COMMENT= An advanced digital photo management application for KDE4
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
kipi.2:${PORTSDIR}/graphics/libkipi \
gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \
kexiv2.5:${PORTSDIR}/graphics/libkexiv2 \
lcms.1:${PORTSDIR}/graphics/lcms \
kdcraw.4:${PORTSDIR}/graphics/libkdcraw \
png.5:${PORTSDIR}/graphics/png \
sqlite3.8:${PORTSDIR}/databases/sqlite3 \
jasper.4:${PORTSDIR}/graphics/jasper
jasper.4:${PORTSDIR}/graphics/jasper \
kipi.6:${PORTSDIR}/graphics/kdegraphics4
LATEST_LINK= ${PORTNAME}-kde4
USE_BZIP2= yes
USE_AUTOTOOLS= libtool:15
USE_GMAKE= yes
USE_KDELIBS_VER=3
USE_KDE4= automoc4 kdehier kdeprefix kdelibs pimlibs
USE_QT_VER= 4
QT_COMPONENTS= corelib gui sql qmake_build moc_build rcc_build uic_build
USE_CMAKE= yes
USE_GETTEXT= yes
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
CONFIGURE_ARGS= --without-included-sqlite3
MAN1= digitaglinktree.1
post-patch:
@${REINPLACE_CMD} -e 's|-O2||g;s|-fno-schedule-insns -fno-inline||g' \
${WRKSRC}/${CONFIGURE_SCRIPT}
@${REINPLACE_CMD} -e 's@-lpthread@${PTHREAD_LIBS}@g' ${WRKSRC}/${CONFIGURE_SCRIPT}
@${REINPLACE_CMD} 's/install-data-local: install-apidox/install-data-local:/' \
${WRKSRC}/digikam/Makefile.in ${WRKSRC}/digikam/digikam/Makefile.in
.include <bsd.port.mk>

6
graphics/digikam-kde4/distinfo
View File

@ -1,3 +1,3 @@
MD5 (digikam-0.9.4.tar.bz2) = b0f3fa00bd054b0497146e6ce24dab7c
SHA256 (digikam-0.9.4.tar.bz2) = 39da391d31669a705a4a7347e259f6b9c30eeaa9dc29768ca2534ecd859f3f47
SIZE (digikam-0.9.4.tar.bz2) = 11579318
MD5 (digikam-0.10.0-rc1.tar.bz2) = 08aaf686bb79ee7aade12075ddb2aca4
SHA256 (digikam-0.10.0-rc1.tar.bz2) = 415ade28dc2d66fd6b993852029539118fa39ee696f89716ec8951cfc7571ebb
SIZE (digikam-0.10.0-rc1.tar.bz2) = 10954564

157
graphics/digikam-kde4/files/patch-CMakeLists.txt Normal file
View File

@ -0,0 +1,157 @@
--- CMakeLists.txt.orig 2009-01-21 12:32:12.000000000 -0600
+++ CMakeLists.txt 2009-01-27 21:31:03.000000000 -0600
@@ -45,39 +45,126 @@
MACRO_OPTIONAL_FIND_PACKAGE(PNG)
MACRO_OPTIONAL_FIND_PACKAGE(TIFF)
MACRO_OPTIONAL_FIND_PACKAGE(Jasper)
-MACRO_OPTIONAL_FIND_PACKAGE(Kdcraw)
-MACRO_OPTIONAL_FIND_PACKAGE(Kexiv2)
-MACRO_OPTIONAL_FIND_PACKAGE(Kipi)
IF(ENABLE_GPHOTO2)
MACRO_OPTIONAL_FIND_PACKAGE(Gphoto2)
ENDIF(ENABLE_GPHOTO2)
-# Check KDcraw version installed to compile fine.
-IF(NOT WIN32)
- FIND_PACKAGE(PkgConfig)
- PKG_CHECK_MODULES(Kdcraw libkdcraw>=0.4.0)
- IF(Kdcraw_FOUND)
- SET(KDCRAW_FOR_DIGIKAM TRUE)
- ELSE(Kdcraw_FOUND)
- SET(KDCRAW_FOR_DIGIKAM FALSE)
- ENDIF(Kdcraw_FOUND)
-ELSE(NOT WIN32)
- SET(KDCRAW_FOR_DIGIKAM TRUE)
-ENDIF(NOT WIN32)
-
-# Check KExiv2 version installed to compile fine.
-IF(NOT WIN32)
- FIND_PACKAGE(PkgConfig)
- PKG_CHECK_MODULES(Kexiv2 libkexiv2>=0.5.0)
- IF(Kexiv2_FOUND)
- SET(KEXIV2_FOR_DIGIKAM TRUE)
- ELSE(Kexiv2_FOUND)
- SET(KEXIV2_FOR_DIGIKAM FALSE)
- ENDIF(Kexiv2_FOUND)
-ELSE(NOT WIN32)
- SET(KEXIV2_FOR_DIGIKAM TRUE)
-ENDIF(NOT WIN32)
+# use pkg-config to get the directories and then use these values
+# in the FIND_PATH() and FIND_LIBRARY() calls
+INCLUDE(UsePkgConfig)
+
+message(STATUS "Check Kexiv2 library using pkg-config...")
+PKGCONFIG(libkexiv2-kde4 _KEXIV2IncDir _KEXIV2LinkDir _KEXIV2LinkFlags _KEXIV2Cflags)
+if(_KEXIV2LinkFlags)
+ # query pkg-config asking for a libkexiv2 >= 0.2.0
+ EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkexiv2-kde4 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull)
+ if(_return_VALUE STREQUAL "0")
+ message(STATUS "Found libkexiv2 release >= 0.2.0")
+ set(KEXIV2_FOR_DIGIKAM TRUE)
+ else(_return_VALUE STREQUAL "0")
+ message(STATUS "Found libkexiv2 release < 0.2.0, too old")
+ set(KEXIV2_FOR_DIGIKAM FALSE)
+ set(KEXIV2_FOUND FALSE)
+ endif(_return_VALUE STREQUAL "0")
+else(_KEXIV2LinkFlags)
+ set(KEXIV2_FOR_DIGIKAM FALSE)
+ set(KEXIV2_FOUND FALSE)
+endif(_KEXIV2LinkFlags)
+if(KEXIV2_FOR_DIGIKAM)
+ set(KEXIV2_DEFINITIONS "${_KEXIV2Cflags}")
+ FIND_PATH(KEXIV2_INCLUDE_DIR libkexiv2/version.h ${_KEXIV2IncDir})
+ FIND_LIBRARY(KEXIV2_LIBRARIES NAMES kexiv2 PATHS ${_KEXIV2LinkDir})
+ if(KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES)
+ set(KEXIV2_FOUND TRUE)
+ endif(KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES)
+endif(KEXIV2_FOR_DIGIKAM)
+if(KEXIV2_FOUND)
+ message(STATUS "Found libkexiv2: ${KEXIV2_LIBRARIES}")
+else(KEXIV2_FOUND)
+ if (NOT KEXIV2_INCLUDE_DIR)
+ message(FATAL_ERROR "Could NOT find libkexiv2 header files")
+ endif (NOT KEXIV2_INCLUDE_DIR)
+ if (NOT KEXIV2_LIBRARIES)
+ message(FATAL_ERROR "Could NOT find libkexiv2 library")
+ endif (NOT KEXIV2_LIBRARIES)
+endif(KEXIV2_FOUND)
+MARK_AS_ADVANCED(KEXIV2_INCLUDE_DIR KEXIV2_LIBRARIES)
+
+message(STATUS "Check Kdcraw library using pkg-config...")
+PKGCONFIG(libkdcraw-kde4 _KDCRAWIncDir _KDCRAWLinkDir _KDCRAWLinkFlags _KDCRAWCflags)
+if(_KDCRAWLinkFlags)
+ # query pkg-config asking for a libkdcraw >= 0.4.0
+ EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.4.0 libkdcraw-kde4 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull)
+ if(_return_VALUE STREQUAL "0")
+ message(STATUS "Found libkdcraw release >= 0.4.0")
+ set(KDCRAW_FOR_DIGIKAM TRUE)
+ else(_return_VALUE STREQUAL "0")
+ message(STATUS "Found libkdcraw release < 0.4.0, too old")
+ set(KDCRAW_FOR_DIGIKAM FALSE)
+ set(KDCRAW_FOUND FALSE)
+ endif(_return_VALUE STREQUAL "0")
+else(_KDCRAWLinkFlags)
+ set(KDCRAW_FOR_DIGIKAM FALSE)
+ set(KDCRAW_FOUND FALSE)
+endif(_KDCRAWLinkFlags)
+if(KDCRAW_FOR_DIGIKAM)
+ set(KDCRAW_DEFINITIONS "${_KDCRAWCflags}")
+ FIND_PATH(KDCRAW_INCLUDE_DIR libkdcraw/version.h ${_KDCRAWIncDir})
+ FIND_LIBRARY(KDCRAW_LIBRARIES NAMES kdcraw PATHS ${_KDCRAWLinkDir})
+ if(KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES)
+ set(KDCRAW_FOUND TRUE)
+ endif(KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES)
+endif(KDCRAW_FOR_DIGIKAM)
+if(KDCRAW_FOUND)
+ message(STATUS "Found libkdcraw: ${KDCRAW_LIBRARIES}")
+else(KDCRAW_FOUND)
+ if (NOT KDCRAW_INCLUDE_DIR)
+ message(FATAL_ERROR "Could NOT find libkdcraw header files")
+ endif (NOT KDCRAW_INCLUDE_DIR)
+ if (NOT KDCRAW_LIBRARIES)
+ message(FATAL_ERROR "Could NOT find libkdcraw library")
+ endif (NOT KDCRAW_LIBRARIES)
+endif(KDCRAW_FOUND)
+MARK_AS_ADVANCED(KDCRAW_INCLUDE_DIR KDCRAW_LIBRARIES)
+
+# Check Kipi version installed to compile fine.
+message(STATUS "Check Kipi library using pkg-config...")
+PKGCONFIG(libkipi-kde4 _KIPIIncDir _KIPILinkDir _KIPILinkFlags _KIPICflags)
+if(_KIPILinkFlags)
+ # query pkg-config asking for a libkipi >= 0.2.0
+ EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.2.0 libkipi-kde4 RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull)
+ if(_return_VALUE STREQUAL "0")
+ message(STATUS "Found libkipi release >= 0.2.0")
+ set(KIPI_FOR_DIGIKAM TRUE)
+ else(_return_VALUE STREQUAL "0")
+ message(STATUS "Found libkipi release < 0.2.0, too old")
+ set(KIPI_FOR_DIGIKAM FALSE)
+ set(KIPI_FOUND FALSE)
+ endif(_return_VALUE STREQUAL "0")
+else(_KIPILinkFlags)
+ set(KIPI_FOR_DIGIKAM FALSE)
+ set(KIPI_FOUND FALSE)
+endif(_KIPILinkFlags)
+if(KIPI_FOR_DIGIKAM)
+ set(KIPI_DEFINITIONS "${_KIPICflags}")
+ FIND_PATH(KIPI_INCLUDE_DIR libkipi/version.h ${_KIPIIncDir})
+ FIND_LIBRARY(KIPI_LIBRARIES NAMES kipi PATHS ${_KIPILinkDir})
+ if(KIPI_INCLUDE_DIR AND KIPI_LIBRARIES)
+ set(KIPI_FOUND TRUE)
+ endif(KIPI_INCLUDE_DIR AND KIPI_LIBRARIES)
+endif(KIPI_FOR_DIGIKAM)
+if(KIPI_FOUND)
+ message(STATUS "Found libkipi: ${KIPI_LIBRARIES}")
+else(KIPI_FOUND)
+ if (NOT KIPI_INCLUDE_DIR)
+ message(FATAL_ERROR "Could NOT find libkipi header files")
+ endif (NOT KIPI_INCLUDE_DIR)
+ if (NOT KIPI_LIBRARIES)
+ message(FATAL_ERROR "Could NOT find libkipi library")
+ endif (NOT KIPI_LIBRARIES)
+endif(KIPI_FOUND)
+MARK_AS_ADVANCED(KIPI_INCLUDE_DIR KIPI_LIBRARIES)
# ==================================================================================================
# Optional depencies

20
graphics/digikam-kde4/files/patch-digikam_digikam_albumfiletip.cpp
View File

@ -1,20 +0,0 @@
--- digikam/digikam/albumfiletip.cpp.orig 2008-10-12 15:02:22.000000000 +0200
+++ digikam/digikam/albumfiletip.cpp 2008-10-12 15:02:50.000000000 +0200
@@ -48,7 +48,7 @@
// LibKDcraw includes.
-#include <libkdcraw/dcrawbinary.h>
+#include <libkdcraw/kdcraw.h>
// Local includes.
@@ -366,7 +366,7 @@ void AlbumFileTip::updateText()
}
QSize dims;
- QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
+ QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
QString ext = fileInfo.extension(false).upper();
if (!ext.isEmpty() && rawFilesExt.upper().contains(ext))

18
graphics/digikam-kde4/files/patch-digikam_digikam_albumiconview.cpp
View File

@ -1,18 +0,0 @@
--- digikam/digikam/albumiconview.cpp.orig 2008-10-12 15:01:31.000000000 +0200
+++ digikam/digikam/albumiconview.cpp 2008-10-12 15:02:03.000000000 +0200
@@ -96,7 +96,6 @@ extern "C"
// LibKDcraw includes.
-#include <libkdcraw/dcrawbinary.h>
// Local includes.
@@ -1098,7 +1097,6 @@ void AlbumIconView::slotDisplayItem(Albu
QString imagefilter = settings->getImageFileFilter().lower() +
settings->getImageFileFilter().upper();
- if (KDcrawIface::DcrawBinary::instance()->versionIsRight())
{
// add raw files only if dcraw is available
imagefilter += settings->getRawFileFilter().lower() +

20
graphics/digikam-kde4/files/patch-digikam_digikam_albumsettings.cpp
View File

@ -1,20 +0,0 @@
--- digikam/digikam/albumsettings.cpp.orig 2008-10-12 15:02:59.000000000 +0200
+++ digikam/digikam/albumsettings.cpp 2008-10-12 15:03:20.000000000 +0200
@@ -36,7 +36,7 @@
// LibKDcraw includes.
-#include <libkdcraw/dcrawbinary.h>
+#include <libkdcraw/kdcraw.h>
// Local includes.
@@ -184,7 +184,7 @@ void AlbumSettings::init()
// RAW files estentions supported by dcraw program and
// defines to digikam/libs/dcraw/rawfiles.h
- d->defaultRawFilefilter = QString(KDcrawIface::DcrawBinary::instance()->rawFiles());
+ d->defaultRawFilefilter = QString(KDcrawIface::KDcraw::rawFiles());
d->imageFilefilter = d->defaultImageFilefilter;
d->movieFilefilter = d->defaultMovieFilefilter;

34
graphics/digikam-kde4/files/patch-digikam_digikam_digikamapp.cpp
View File

@ -1,34 +0,0 @@
--- digikam/digikam/digikamapp.cpp.orig 2008-10-12 14:53:14.000000000 +0200
+++ digikam/digikam/digikamapp.cpp 2008-10-12 14:55:23.000000000 +0200
@@ -62,7 +62,6 @@
// LibKDcraw includes.
-#include <libkdcraw/dcrawbinary.h>
// Local includes.
@@ -163,7 +162,6 @@ DigikamApp::DigikamApp()
if(d->splashScreen)
d->splashScreen->message(i18n("Checking dcraw version"), AlignLeft, white);
- KDcrawIface::DcrawBinary::instance()->checkSystem();
if(d->splashScreen)
d->splashScreen->message(i18n("Scan Albums"), AlignLeft, white);
@@ -221,7 +219,6 @@ DigikamApp::~DigikamApp()
ImageAttributesWatch::cleanUp();
LoadingCacheInterface::cleanUp();
- KDcrawIface::DcrawBinary::cleanUp();
AlbumThumbnailLoader::cleanUp();
m_instance = 0;
@@ -276,7 +273,6 @@ void DigikamApp::show()
}
// Report errors from dcraw detection.
- KDcrawIface::DcrawBinary::instance()->checkReport();
// Init album icon view zoom factor.
slotThumbSizeChanged(d->albumSettings->getDefaultIconSize());

28
graphics/digikam-kde4/files/patch-digikam_digikam_main.cpp
View File

@ -1,28 +0,0 @@
--- digikam/digikam/main.cpp.orig 2008-10-12 14:55:41.000000000 +0200
+++ digikam/digikam/main.cpp 2008-10-12 15:00:03.000000000 +0200
@@ -58,7 +58,6 @@
// Libkdcraw includes.
#include <libkdcraw/kdcraw.h>
-#include <libkdcraw/dcrawbinary.h>
// C Ansi includes.
@@ -84,7 +83,7 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[])
{
- QString DcrawVer = KDcrawIface::DcrawBinary::internalVersion();
+ QString DcrawVer = KDcrawIface::KDcraw::librawVersion();
QString Exiv2Ver = KExiv2Iface::KExiv2::Exiv2Version();
@@ -112,8 +111,8 @@ int main(int argc, char *argv[])
QString("\n") +
QString(I18N_NOOP("Using KDcraw library version %1")).arg(KDcrawIface::KDcraw::version()) +
QString("\n") +
- QString(I18N_NOOP("Using Dcraw program version %1")).arg(DcrawVer) +
+ QString(I18N_NOOP("Using LibRaw library version %1")).arg(DcrawVer) +
QString("\n") +
QString(I18N_NOOP("Using PNG library version %1")).arg(PNG_LIBPNG_VER_STRING) +
QString("\n") +

20
graphics/digikam-kde4/files/patch-digikam_digikam_scanlib.cpp
View File

@ -1,20 +0,0 @@
--- digikam/digikam/scanlib.cpp.orig 2008-07-16 21:05:55.000000000 +0200
+++ digikam/digikam/scanlib.cpp 2008-10-12 09:57:53.000000000 +0200
@@ -299,7 +299,7 @@
int items = 0;
QDir dir( directory );
- if ( !dir.exists() or !dir.isReadable() )
+ if ( !dir.exists() || !dir.isReadable() )
return 0;
const QFileInfoList *list = dir.entryInfoList();
@@ -326,7 +326,7 @@
void ScanLib::allFiles(const QString& directory)
{
QDir dir( directory );
- if ( !dir.exists() or !dir.isReadable() )
+ if ( !dir.exists() || !dir.isReadable() )
{
DWarning() << "Folder does not exist or is not readable: "
<< directory << endl;

20
graphics/digikam-kde4/files/patch-digikam_kioslave_digikamalbums.cpp
View File

@ -1,20 +0,0 @@
--- digikam/kioslave/digikamalbums.cpp.orig 2008-10-12 14:51:40.000000000 +0200
+++ digikam/kioslave/digikamalbums.cpp 2008-10-12 14:52:08.000000000 +0200
@@ -72,7 +72,7 @@ extern "C"
// LibKDcraw includes.
-#include <libkdcraw/dcrawbinary.h>
+#include <libkdcraw/kdcraw.h>
// Local includes.
@@ -269,7 +269,7 @@ void kio_digikamalbums::special(const QB
if (getDimensions)
{
QFileInfo fileInfo(base + name);
- QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
+ QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
QString ext = fileInfo.extension(false).upper();
if (!ext.isEmpty() && rawFilesExt.upper().contains(ext))

11
graphics/digikam-kde4/files/patch-digikam_kioslave_digikamdates.cpp
View File

@ -1,11 +0,0 @@
--- digikam/kioslave/digikamdates.cpp.orig 2008-07-16 21:05:55.000000000 +0200
+++ digikam/kioslave/digikamdates.cpp 2008-07-17 08:28:24.000000000 +0200
@@ -199,7 +199,7 @@
.arg(moEndStr, 2)
.arg(yrStart, 4)
.arg(moStartStr, 2),
- &values, false);
+ &values);
Q_LLONG imageid;
QString name;

19
graphics/digikam-kde4/files/patch-digikam_kioslave_digikamthumbnail.cpp
View File

@ -1,19 +0,0 @@
--- digikam/kioslave/digikamthumbnail.cpp.orig 2008-10-12 14:52:20.000000000 +0200
+++ digikam/kioslave/digikamthumbnail.cpp 2008-10-12 14:52:51.000000000 +0200
@@ -69,7 +69,6 @@
// LibKDcraw includes.
-#include <libkdcraw/dcrawbinary.h>
#include <libkdcraw/kdcraw.h>
// Local includes
@@ -264,7 +263,7 @@ bool kio_digikamthumbnailProtocol::loadB
// Else, use the right way depending of image file extension.
QString ext = fileInfo.extension(false).upper();
- QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
+ QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
if (!ext.isEmpty())
{

33
graphics/digikam-kde4/files/patch-digikam_libs_dialogs_imagedialog.cpp
View File

@ -1,33 +0,0 @@
--- digikam/libs/dialogs/imagedialog.cpp.orig 2008-10-12 14:50:22.000000000 +0200
+++ digikam/libs/dialogs/imagedialog.cpp 2008-10-12 14:51:29.000000000 +0200
@@ -39,7 +39,7 @@
// LibKDcraw includes.
-#include <libkdcraw/dcrawbinary.h>
+#include <libkdcraw/kdcraw.h>
// Local includes.
@@ -267,9 +267,8 @@ ImageDialog::ImageDialog(QWidget* parent
QString allPictures = patternList[0];
// Add other files format witch are missing to All Images" type mime provided by KDE and remplace current.
- if (KDcrawIface::DcrawBinary::instance()->versionIsRight())
{
- allPictures.insert(allPictures.find("|"), QString(KDcrawIface::DcrawBinary::instance()->rawFiles()) + QString(" *.JPE *.TIF"));
+ allPictures.insert(allPictures.find("|"), QString(KDcrawIface::KDcraw::rawFiles()) + QString(" *.JPE *.TIF"));
patternList.remove(patternList[0]);
patternList.prepend(allPictures);
}
@@ -277,9 +276,8 @@ ImageDialog::ImageDialog(QWidget* parent
// Added RAW file formats supported by dcraw program like a type mime.
// Nota: we cannot use here "image/x-raw" type mime from KDE because it uncomplete
// or unavailable(dcraw_0)(see file #121242 in B.K.O).
- if (KDcrawIface::DcrawBinary::instance()->versionIsRight())
{
- patternList.append(i18n("\n%1|Camera RAW files").arg(QString(KDcrawIface::DcrawBinary::instance()->rawFiles())));
+ patternList.append(i18n("\n%1|Camera RAW files").arg(QString(KDcrawIface::KDcraw::rawFiles())));
}
d->fileformats = patternList.join("\n");

30
graphics/digikam-kde4/files/patch-digikam_libs_dialogs_rawcameradlg.cpp
View File

@ -1,30 +0,0 @@
--- digikam/libs/dialogs/rawcameradlg.cpp.orig 2008-07-16 21:05:55.000000000 +0200
+++ digikam/libs/dialogs/rawcameradlg.cpp 2008-10-12 15:18:00.000000000 +0200
@@ -40,7 +40,6 @@
// LibKDcraw includes.
#include <libkdcraw/kdcraw.h>
-#include <libkdcraw/dcrawbinary.h>
// Local includes.
@@ -77,8 +76,8 @@
QWidget *page = makeMainWidget();
QGridLayout* grid = new QGridLayout(page, 2, 2, 0, spacingHint());
- QStringList list = KDcrawIface::DcrawBinary::instance()->supportedCamera();
- QString dcrawVer = KDcrawIface::DcrawBinary::instance()->internalVersion();
+ QStringList list = KDcrawIface::KDcraw::supportedCamera();
+ QString dcrawVer = KDcrawIface::KDcraw::librawVersion();
QString KDcrawVer = KDcrawIface::KDcraw::version();
// --------------------------------------------------------
@@ -95,7 +94,7 @@
QLabel *header = new QLabel(page);
header->setText(i18n("<p>Using KDcraw library version %1"
- "<p>Using Dcraw program version %2"
+ "<p>Using LibRaw library version %2"
"<p>%3 models in the list")
.arg(KDcrawVer).arg(dcrawVer).arg(list.count()));

19
graphics/digikam-kde4/files/patch-digikam_libs_dimg_dimg.cpp
View File

@ -1,19 +0,0 @@
--- digikam/libs/dimg/dimg.cpp.orig 2008-10-12 10:03:41.000000000 +0200
+++ digikam/libs/dimg/dimg.cpp 2008-10-12 10:07:25.000000000 +0200
@@ -42,7 +42,6 @@
// LibKDcraw includes.
-#include <libkdcraw/dcrawbinary.h>
#include <libkdcraw/kdcraw.h>
// Local includes.
@@ -493,7 +492,7 @@
return NONE;
}
- QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
+ QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
QString ext = fileInfo.extension(false).upper();
if (!ext.isEmpty())

20
graphics/digikam-kde4/files/patch-digikam_libs_imageproperties_imagepropertiestab.cpp
View File

@ -1,20 +0,0 @@
--- digikam/libs/imageproperties/imagepropertiestab.cpp.orig 2008-10-12 14:48:42.000000000 +0200
+++ digikam/libs/imageproperties/imagepropertiestab.cpp 2008-10-12 14:49:11.000000000 +0200
@@ -42,7 +42,7 @@
// LibKDcraw includes.
-#include <libkdcraw/dcrawbinary.h>
+#include <libkdcraw/kdcraw.h>
// Local includes.
@@ -424,7 +424,7 @@ void ImagePropertiesTab::setCurrentURL(c
QSize dims;
QString compression, bitDepth, colorMode;
- QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
+ QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
QString ext = fileInfo.extension(false).upper();
if (!ext.isEmpty() && rawFilesExt.upper().contains(ext))

10
graphics/digikam-kde4/files/patch-digikam_libs_lprof_lcmsprf.h
View File

@ -1,10 +0,0 @@
--- digikam/libs/lprof/lcmsprf.h.orig 2007-09-18 08:30:45.000000000 +0200
+++ digikam/libs/lprof/lcmsprf.h 2007-09-18 08:36:16.000000000 +0200
@@ -59,6 +59,7 @@
#define max(a,b) ((a) > (b)?(a):(b))
#endif
+typedef int BOOL;
/* Matrix operations - arbitrary size ----------------------------------------------------- */

20
graphics/digikam-kde4/files/patch-digikam_libs_thumbbar_thumbbar.cpp
View File

@ -1,20 +0,0 @@
--- digikam/libs/thumbbar/thumbbar.cpp.orig 2008-10-12 14:49:37.000000000 +0200
+++ digikam/libs/thumbbar/thumbbar.cpp 2008-10-12 14:50:05.000000000 +0200
@@ -59,7 +59,7 @@ extern "C"
// LibKDcraw includes.
-#include <libkdcraw/dcrawbinary.h>
+#include <libkdcraw/kdcraw.h>
// Local includes.
@@ -957,7 +957,7 @@ QString ThumbBarToolTip::tipContent(Thum
}
QSize dims;
- QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
+ QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
QString ext = fileInfo.extension(false).upper();
if (!ext.isEmpty() && rawFilesExt.upper().contains(ext))

28
graphics/digikam-kde4/files/patch-digikam_showfoto_main.cpp
View File

@ -1,28 +0,0 @@
--- digikam/showfoto/main.cpp.orig 2008-10-12 15:05:29.000000000 +0200
+++ digikam/showfoto/main.cpp 2008-10-12 15:06:03.000000000 +0200
@@ -45,7 +45,6 @@
// Libkdcraw includes.
#include <libkdcraw/kdcraw.h>
-#include <libkdcraw/dcrawbinary.h>
// C Ansi includes.
@@ -66,7 +65,7 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[])
{
- QString DcrawVer = KDcrawIface::DcrawBinary::internalVersion();
+ QString DcrawVer = KDcrawIface::KDcraw::librawVersion();
QString Exiv2Ver = KExiv2Iface::KExiv2::Exiv2Version();
@@ -84,7 +83,7 @@ int main(int argc, char *argv[])
QString("\n") +
QString(I18N_NOOP("Using KDcraw library version %1")).arg(KDcrawIface::KDcraw::version()) +
QString("\n") +
- QString(I18N_NOOP("Using Dcraw program version %1")).arg(DcrawVer) +
+ QString(I18N_NOOP("Using LibRaw library version %1")).arg(DcrawVer) +
QString("\n") +
QString(I18N_NOOP("Using PNG library version %1")).arg(PNG_LIBPNG_VER_STRING);

36
graphics/digikam-kde4/files/patch-digikam_showfoto_showfoto.cpp
View File

@ -1,36 +0,0 @@
--- digikam/showfoto/showfoto.cpp.orig 2008-10-12 15:04:49.000000000 +0200
+++ digikam/showfoto/showfoto.cpp 2008-10-12 15:05:20.000000000 +0200
@@ -73,7 +73,7 @@ extern "C"
// LibKDcraw includes.
-#include <libkdcraw/dcrawbinary.h>
+#include <libkdcraw/kdcraw.h>
// Local includes.
@@ -179,7 +179,6 @@ ShowFoto::ShowFoto(const KURL::List& url
if(d->splash)
d->splash->message(i18n("Checking dcraw version"), AlignLeft, white);
- KDcrawIface::DcrawBinary::instance()->checkSystem();
// Populate Themes
@@ -370,7 +369,6 @@ void ShowFoto::show()
// Report errors from dcraw detection.
- KDcrawIface::DcrawBinary::instance()->checkReport();
}
void ShowFoto::setupConnections()
@@ -832,7 +830,7 @@ void ShowFoto::openFolder(const KURL& ur
// Added RAW files estentions supported by dcraw program and
// defines to digikam/libs/dcraw/rawfiles.h
filter.append (" ");
- filter.append ( QString(KDcrawIface::DcrawBinary::instance()->rawFiles()) );
+ filter.append ( QString(KDcrawIface::KDcraw::rawFiles()) );
filter.append (" ");
QString patterns = filter.lower();

28
graphics/digikam-kde4/files/patch-digikam_utilities_cameragui_cameraui.cpp
View File

@ -1,28 +0,0 @@
--- digikam/utilities/cameragui/cameraui.cpp.orig 2008-10-12 15:04:12.000000000 +0200
+++ digikam/utilities/cameragui/cameraui.cpp 2008-10-12 15:04:41.000000000 +0200
@@ -76,7 +76,7 @@
// LibKDcraw includes.
-#include <libkdcraw/dcrawbinary.h>
+#include <libkdcraw/kdcraw.h>
// Local includes.
@@ -944,14 +944,14 @@ void CameraUI::slotUpload()
QString allPictures = patternList[0];
// Add RAW file format to All Images" type mime and remplace current.
- allPictures.insert(allPictures.find("|"), QString(KDcrawIface::DcrawBinary::instance()->rawFiles()));
+ allPictures.insert(allPictures.find("|"), QString(KDcrawIface::KDcraw::rawFiles()));
patternList.remove(patternList[0]);
patternList.prepend(allPictures);
// Added RAW file formats supported by dcraw program like a type mime.
// Nota: we cannot use here "image/x-raw" type mime from KDE because it uncomplete
// or unavailable(dcraw_0)(see file #121242 in B.K.O).
- patternList.append(QString("\n%1|Camera RAW files").arg(QString(KDcrawIface::DcrawBinary::instance()->rawFiles())));
+ patternList.append(QString("\n%1|Camera RAW files").arg(QString(KDcrawIface::KDcraw::rawFiles())));
fileformats = patternList.join("\n");

30
graphics/digikam-kde4/files/patch-digikam_utilities_cameragui_gpcamera.cpp
View File

@ -1,30 +0,0 @@
--- digikam/utilities/cameragui/gpcamera.cpp.orig 2007-09-18 09:23:44.000000000 +0200
+++ digikam/utilities/cameragui/gpcamera.cpp 2007-09-18 09:24:48.000000000 +0200
@@ -22,13 +22,6 @@
*
* ============================================================ */
-// C Ansi includes.
-
-extern "C"
-{
-#include <gphoto2.h>
-}
-
// C++ includes.
#include <cstdio>
@@ -47,6 +40,13 @@
#include <klocale.h>
+// C Ansi includes.
+
+extern "C"
+{
+#include <gphoto2.h>
+}
+
// Local includes.
#include "ddebug.h"

18
graphics/digikam-kde4/files/patch-digikam_utilities_lighttable_lighttablewindow.cpp
View File

@ -1,18 +0,0 @@
--- digikam/utilities/lighttable/lighttablewindow.cpp.orig 2008-10-12 15:03:34.000000000 +0200
+++ digikam/utilities/lighttable/lighttablewindow.cpp 2008-10-12 15:03:58.000000000 +0200
@@ -40,7 +40,6 @@
// LibKDcraw includes.
-#include <libkdcraw/dcrawbinary.h>
// Local includes.
@@ -575,7 +574,6 @@ void LightTableWindow::loadImageInfos(co
QString imagefilter = settings->getImageFileFilter().lower() +
settings->getImageFileFilter().upper();
- if (KDcrawIface::DcrawBinary::instance()->versionIsRight())
{
// add raw files only if dcraw is available
imagefilter += settings->getRawFileFilter().lower() +

3
graphics/digikam-kde4/pkg-descr
View File

@ -12,6 +12,3 @@ Digikam also uses the very flexible Kipi plugin architecture.
Install the graphics/kipi-plugins port to extend Digikam's features.
WWW: http://www.digikam.org/
- Alex Dupre
ale@FreeBSD.org

1085
graphics/digikam-kde4/pkg-plist
View File

File diff suppressed because it is too large Load Diff