rpms/digikam/F-8 digikam-0.9.4-libkdcraw.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 digikam.spec, 1.45, 1.46 sources, 1.12, 1.13 digikam-missing-photos.patch, 1.1, NONE
Rex Dieter
rdieter at fedoraproject.org
Wed Nov 12 19:44:40 UTC 2008
- Previous message: rpms/mkinitrd/F-10 .cvsignore, 1.210, 1.211 mkinitrd.spec, 1.295, 1.296 sources, 1.251, 1.252
- Next message: rpms/kphotoalbum/F-8 kphotoalbum-3.1.1-gcc43.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 kphotoalbum.spec, 1.16, 1.17 sources, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/digikam/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3165
Modified Files:
.cvsignore digikam.spec sources
Added Files:
digikam-0.9.4-libkdcraw.patch
Removed Files:
digikam-missing-photos.patch
Log Message:
sync w/F-9 branch
digikam-0.9.4-libkdcraw.patch:
--- NEW FILE digikam-0.9.4-libkdcraw.patch ---
diff -up digikam-0.9.4/digikam/digikam/albumfiletip.cpp.libkdcraw digikam-0.9.4/digikam/digikam/albumfiletip.cpp
--- digikam-0.9.4/digikam/digikam/albumfiletip.cpp.libkdcraw 2008-07-16 14:05:55.000000000 -0500
+++ digikam-0.9.4/digikam/digikam/albumfiletip.cpp 2008-10-14 08:46:31.000000000 -0500
@@ -48,7 +48,12 @@
// LibKDcraw includes.
+#include <libkdcraw/version.h>
+#include <libkdcraw/kdcraw.h>
+
+#if KDCRAW_VERSION < 0x000106
#include <libkdcraw/dcrawbinary.h>
+#endif
// Local includes.
@@ -366,7 +371,11 @@ void AlbumFileTip::updateText()
}
QSize dims;
+#if KDCRAW_VERSION < 0x000106
QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
+#else
+ QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+#endif
QString ext = fileInfo.extension(false).upper();
if (!ext.isEmpty() && rawFilesExt.upper().contains(ext))
diff -up digikam-0.9.4/digikam/digikam/albumsettings.cpp.libkdcraw digikam-0.9.4/digikam/digikam/albumsettings.cpp
--- digikam-0.9.4/digikam/digikam/albumsettings.cpp.libkdcraw 2008-07-16 14:05:55.000000000 -0500
+++ digikam-0.9.4/digikam/digikam/albumsettings.cpp 2008-10-14 08:46:31.000000000 -0500
@@ -36,7 +36,12 @@
// LibKDcraw includes.
+#include <libkdcraw/version.h>
+#include <libkdcraw/kdcraw.h>
+
+#if KDCRAW_VERSION < 0x000106
#include <libkdcraw/dcrawbinary.h>
+#endif
// Local includes.
@@ -184,7 +189,11 @@ void AlbumSettings::init()
// RAW files estentions supported by dcraw program and
// defines to digikam/libs/dcraw/rawfiles.h
+#if KDCRAW_VERSION < 0x000106
d->defaultRawFilefilter = QString(KDcrawIface::DcrawBinary::instance()->rawFiles());
+#else
+ d->defaultRawFilefilter = QString(KDcrawIface::KDcraw::rawFiles());
+#endif
d->imageFilefilter = d->defaultImageFilefilter;
d->movieFilefilter = d->defaultMovieFilefilter;
diff -up digikam-0.9.4/digikam/digikam/digikamapp.cpp.libkdcraw digikam-0.9.4/digikam/digikam/digikamapp.cpp
--- digikam-0.9.4/digikam/digikam/digikamapp.cpp.libkdcraw 2008-07-16 14:05:55.000000000 -0500
+++ digikam-0.9.4/digikam/digikam/digikamapp.cpp 2008-10-14 08:46:31.000000000 -0500
@@ -62,7 +62,12 @@
// LibKDcraw includes.
+#include <libkdcraw/version.h>
+#include <libkdcraw/kdcraw.h>
+
+#if KDCRAW_VERSION < 0x000106
#include <libkdcraw/dcrawbinary.h>
+#endif
// Local includes.
@@ -158,12 +163,14 @@ DigikamApp::DigikamApp()
d->validIccPath = SetupICC::iccRepositoryIsValid();
+#if KDCRAW_VERSION < 0x000106
// Check witch dcraw version available
if(d->splashScreen)
d->splashScreen->message(i18n("Checking dcraw version"), AlignLeft, white);
KDcrawIface::DcrawBinary::instance()->checkSystem();
+#endif
if(d->splashScreen)
d->splashScreen->message(i18n("Scan Albums"), AlignLeft, white);
@@ -221,7 +228,9 @@ DigikamApp::~DigikamApp()
ImageAttributesWatch::cleanUp();
LoadingCacheInterface::cleanUp();
+#if KDCRAW_VERSION < 0x000106
KDcrawIface::DcrawBinary::cleanUp();
+#endif
AlbumThumbnailLoader::cleanUp();
m_instance = 0;
@@ -275,8 +284,10 @@ void DigikamApp::show()
}
}
+#if KDCRAW_VERSION < 0x000106
// Report errors from dcraw detection.
KDcrawIface::DcrawBinary::instance()->checkReport();
+#endif
// Init album icon view zoom factor.
slotThumbSizeChanged(d->albumSettings->getDefaultIconSize());
diff -up digikam-0.9.4/digikam/digikam/albumiconview.cpp.libkdcraw digikam-0.9.4/digikam/digikam/albumiconview.cpp
--- digikam-0.9.4/digikam/digikam/albumiconview.cpp.libkdcraw 2008-07-16 14:05:55.000000000 -0500
+++ digikam-0.9.4/digikam/digikam/albumiconview.cpp 2008-10-14 08:46:31.000000000 -0500
@@ -96,7 +96,12 @@ extern "C"
// LibKDcraw includes.
+#include <libkdcraw/version.h>
+#include <libkdcraw/kdcraw.h>
+
+#if KDCRAW_VERSION < 0x000106
#include <libkdcraw/dcrawbinary.h>
+#endif
// Local includes.
@@ -1098,12 +1103,18 @@ void AlbumIconView::slotDisplayItem(Albu
QString imagefilter = settings->getImageFileFilter().lower() +
settings->getImageFileFilter().upper();
+#if KDCRAW_VERSION < 0x000106
if (KDcrawIface::DcrawBinary::instance()->versionIsRight())
{
// add raw files only if dcraw is available
imagefilter += settings->getRawFileFilter().lower() +
settings->getRawFileFilter().upper();
}
+#else
+ // add raw files only if dcraw is available
+ imagefilter += settings->getRawFileFilter().lower() +
+ settings->getRawFileFilter().upper();
+#endif
// If the current item is not an image file.
if ( !imagefilter.contains(currentFileExtension) )
diff -up digikam-0.9.4/digikam/digikam/main.cpp.libkdcraw digikam-0.9.4/digikam/digikam/main.cpp
--- digikam-0.9.4/digikam/digikam/main.cpp.libkdcraw 2008-07-16 14:05:55.000000000 -0500
+++ digikam-0.9.4/digikam/digikam/main.cpp 2008-10-14 08:46:31.000000000 -0500
@@ -57,8 +57,12 @@
// Libkdcraw includes.
+#include <libkdcraw/version.h>
#include <libkdcraw/kdcraw.h>
+
+#if KDCRAW_VERSION < 0x000106
#include <libkdcraw/dcrawbinary.h>
+#endif
// C Ansi includes.
@@ -84,7 +88,10 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[])
{
+
+#if KDCRAW_VERSION < 0x000106
QString DcrawVer = KDcrawIface::DcrawBinary::internalVersion();
+#endif
QString Exiv2Ver = KExiv2Iface::KExiv2::Exiv2Version();
@@ -112,8 +119,10 @@ int main(int argc, char *argv[])
QString("\n") +
QString(I18N_NOOP("Using KDcraw library version %1")).arg(KDcrawIface::KDcraw::version()) +
QString("\n") +
+#if KDCRAW_VERSION < 0x000106
QString(I18N_NOOP("Using Dcraw program version %1")).arg(DcrawVer) +
QString("\n") +
+#endif
QString(I18N_NOOP("Using PNG library version %1")).arg(PNG_LIBPNG_VER_STRING) +
QString("\n") +
QString(I18N_NOOP("Using Gphoto2 library version %1")).arg(Gphoto2Ver);
diff -up digikam-0.9.4/digikam/utilities/lighttable/lighttablewindow.cpp.libkdcraw digikam-0.9.4/digikam/utilities/lighttable/lighttablewindow.cpp
--- digikam-0.9.4/digikam/utilities/lighttable/lighttablewindow.cpp.libkdcraw 2008-07-16 14:05:55.000000000 -0500
+++ digikam-0.9.4/digikam/utilities/lighttable/lighttablewindow.cpp 2008-10-14 08:46:31.000000000 -0500
@@ -40,7 +40,12 @@
// LibKDcraw includes.
+#include <libkdcraw/version.h>
+#include <libkdcraw/kdcraw.h>
+
+#if KDCRAW_VERSION < 0x000106
#include <libkdcraw/dcrawbinary.h>
+#endif
// Local includes.
@@ -575,12 +580,17 @@ void LightTableWindow::loadImageInfos(co
QString imagefilter = settings->getImageFileFilter().lower() +
settings->getImageFileFilter().upper();
+#if KDCRAW_VERSION < 0x000106
if (KDcrawIface::DcrawBinary::instance()->versionIsRight())
{
// add raw files only if dcraw is available
imagefilter += settings->getRawFileFilter().lower() +
settings->getRawFileFilter().upper();
}
+#else
+ imagefilter += settings->getRawFileFilter().lower() +
+ settings->getRawFileFilter().upper();
+#endif
d->barView->blockSignals(true);
for (QPtrList<ImageInfo>::const_iterator it = l.begin(); it != l.end(); ++it)
diff -up digikam-0.9.4/digikam/utilities/cameragui/cameraui.cpp.libkdcraw digikam-0.9.4/digikam/utilities/cameragui/cameraui.cpp
--- digikam-0.9.4/digikam/utilities/cameragui/cameraui.cpp.libkdcraw 2008-07-16 14:05:55.000000000 -0500
+++ digikam-0.9.4/digikam/utilities/cameragui/cameraui.cpp 2008-10-14 08:46:31.000000000 -0500
@@ -76,7 +76,12 @@
// LibKDcraw includes.
+#include <libkdcraw/version.h>
+#include <libkdcraw/kdcraw.h>
+
+#if KDCRAW_VERSION < 0x000106
#include <libkdcraw/dcrawbinary.h>
+#endif
// Local includes.
@@ -944,14 +949,22 @@ void CameraUI::slotUpload()
QString allPictures = patternList[0];
// Add RAW file format to All Images" type mime and remplace current.
+#if KDCRAW_VERSION < 0x000106
allPictures.insert(allPictures.find("|"), QString(KDcrawIface::DcrawBinary::instance()->rawFiles()));
+#else
+ allPictures.insert(allPictures.find("|"), QString(KDcrawIface::KDcraw::rawFiles()));
+#endif
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).
+#if KDCRAW_VERSION < 0x000106
patternList.append(QString("\n%1|Camera RAW files").arg(QString(KDcrawIface::DcrawBinary::instance()->rawFiles())));
+#else
+ patternList.append(QString("\n%1|Camera RAW files").arg(QString(KDcrawIface::KDcraw::rawFiles())));
+#endif
fileformats = patternList.join("\n");
diff -up digikam-0.9.4/digikam/libs/imageproperties/imagepropertiestab.cpp.libkdcraw digikam-0.9.4/digikam/libs/imageproperties/imagepropertiestab.cpp
--- digikam-0.9.4/digikam/libs/imageproperties/imagepropertiestab.cpp.libkdcraw 2008-07-16 14:05:55.000000000 -0500
+++ digikam-0.9.4/digikam/libs/imageproperties/imagepropertiestab.cpp 2008-10-14 08:46:31.000000000 -0500
@@ -42,7 +42,12 @@
// LibKDcraw includes.
+#include <libkdcraw/version.h>
+#include <libkdcraw/kdcraw.h>
+
+#if KDCRAW_VERSION < 0x000106
#include <libkdcraw/dcrawbinary.h>
+#endif
// Local includes.
@@ -424,7 +429,11 @@ void ImagePropertiesTab::setCurrentURL(c
QSize dims;
QString compression, bitDepth, colorMode;
+#if KDCRAW_VERSION < 0x000106
QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
+#else
+ QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+#endif
QString ext = fileInfo.extension(false).upper();
if (!ext.isEmpty() && rawFilesExt.upper().contains(ext))
diff -up digikam-0.9.4/digikam/libs/thumbbar/thumbbar.cpp.libkdcraw digikam-0.9.4/digikam/libs/thumbbar/thumbbar.cpp
--- digikam-0.9.4/digikam/libs/thumbbar/thumbbar.cpp.libkdcraw 2008-07-16 14:05:55.000000000 -0500
+++ digikam-0.9.4/digikam/libs/thumbbar/thumbbar.cpp 2008-10-14 08:46:31.000000000 -0500
@@ -59,7 +59,12 @@ extern "C"
// LibKDcraw includes.
+#include <libkdcraw/version.h>
+#include <libkdcraw/kdcraw.h>
+
+#if KDCRAW_VERSION < 0x000106
#include <libkdcraw/dcrawbinary.h>
+#endif
// Local includes.
@@ -957,7 +962,11 @@ QString ThumbBarToolTip::tipContent(Thum
}
QSize dims;
+#if KDCRAW_VERSION < 0x000106
QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
+#else
+ QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+#endif
QString ext = fileInfo.extension(false).upper();
if (!ext.isEmpty() && rawFilesExt.upper().contains(ext))
diff -up digikam-0.9.4/digikam/libs/dialogs/rawcameradlg.cpp.libkdcraw digikam-0.9.4/digikam/libs/dialogs/rawcameradlg.cpp
--- digikam-0.9.4/digikam/libs/dialogs/rawcameradlg.cpp.libkdcraw 2008-07-16 14:05:55.000000000 -0500
+++ digikam-0.9.4/digikam/libs/dialogs/rawcameradlg.cpp 2008-10-14 08:46:31.000000000 -0500
@@ -39,8 +39,12 @@
// LibKDcraw includes.
+#include <libkdcraw/version.h>
#include <libkdcraw/kdcraw.h>
+
+#if KDCRAW_VERSION < 0x000106
#include <libkdcraw/dcrawbinary.h>
+#endif
// Local includes.
@@ -77,8 +81,13 @@ RawCameraDlg::RawCameraDlg(QWidget *pare
QWidget *page = makeMainWidget();
QGridLayout* grid = new QGridLayout(page, 2, 2, 0, spacingHint());
+#if KDCRAW_VERSION < 0x000106
QStringList list = KDcrawIface::DcrawBinary::instance()->supportedCamera();
QString dcrawVer = KDcrawIface::DcrawBinary::instance()->internalVersion();
+#else
+ QStringList list = KDcrawIface::KDcraw::supportedCamera();
+ QString librawVer = KDcrawIface::KDcraw::librawVersion();
+#endif
QString KDcrawVer = KDcrawIface::KDcraw::version();
// --------------------------------------------------------
@@ -94,10 +103,17 @@ RawCameraDlg::RawCameraDlg(QWidget *pare
// --------------------------------------------------------
QLabel *header = new QLabel(page);
+#if KDCRAW_VERSION < 0x000106
header->setText(i18n("<p>Using KDcraw library version %1"
"<p>Using Dcraw program version %2"
"<p>%3 models in the list")
.arg(KDcrawVer).arg(dcrawVer).arg(list.count()));
+#else
+ header->setText(i18n("<p>Using KDcraw library version %1"
+ "<p>Using LibRaw version %2"
+ "<p>%3 models in the list")
+ .arg(KDcrawVer).arg(librawVer).arg(list.count()));
+#endif
// --------------------------------------------------------
diff -up digikam-0.9.4/digikam/libs/dialogs/imagedialog.cpp.libkdcraw digikam-0.9.4/digikam/libs/dialogs/imagedialog.cpp
--- digikam-0.9.4/digikam/libs/dialogs/imagedialog.cpp.libkdcraw 2008-07-16 14:05:55.000000000 -0500
+++ digikam-0.9.4/digikam/libs/dialogs/imagedialog.cpp 2008-10-14 08:46:31.000000000 -0500
@@ -39,7 +39,12 @@
// LibKDcraw includes.
+#include <libkdcraw/version.h>
+#include <libkdcraw/kdcraw.h>
+
+#if KDCRAW_VERSION < 0x000106
#include <libkdcraw/dcrawbinary.h>
+#endif
// Local includes.
@@ -266,21 +271,27 @@ ImageDialog::ImageDialog(QWidget* parent
// All Images from list must been always the first entry given by KDE API
QString allPictures = patternList[0];
+#if KDCRAW_VERSION < 0x000106
// 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"));
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 (see file #121242 in B.K.O).
+ patternList.append(i18n("\n%1|Camera RAW files").arg(QString(KDcrawIface::DcrawBinary::instance()->rawFiles())));
}
-
+#else
+ allPictures.insert(allPictures.find("|"), QString(KDcrawIface::KDcraw::rawFiles()) + QString(" *.JPE *.TIF"));
+ 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).
- if (KDcrawIface::DcrawBinary::instance()->versionIsRight())
- {
- patternList.append(i18n("\n%1|Camera RAW files").arg(QString(KDcrawIface::DcrawBinary::instance()->rawFiles())));
- }
+ // or unavailable (see file #121242 in B.K.O).
+ patternList.append(i18n("\n%1|Camera RAW files").arg(QString(KDcrawIface::KDcraw::rawFiles())));
+#endif
d->fileformats = patternList.join("\n");
diff -up digikam-0.9.4/digikam/libs/dimg/dimg.cpp.libkdcraw digikam-0.9.4/digikam/libs/dimg/dimg.cpp
--- digikam-0.9.4/digikam/libs/dimg/dimg.cpp.libkdcraw 2008-07-16 14:05:55.000000000 -0500
+++ digikam-0.9.4/digikam/libs/dimg/dimg.cpp 2008-10-14 08:46:31.000000000 -0500
@@ -42,9 +42,13 @@ extern "C"
// LibKDcraw includes.
-#include <libkdcraw/dcrawbinary.h>
+#include <libkdcraw/version.h>
#include <libkdcraw/kdcraw.h>
+#if KDCRAW_VERSION < 0x000106
+#include <libkdcraw/dcrawbinary.h>
+#endif
+
// Local includes.
#include "pngloader.h"
@@ -493,7 +497,11 @@ DImg::FORMAT DImg::fileFormat(const QStr
return NONE;
}
+#if KDCRAW_VERSION < 0x000106
QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
+#else
+ QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+#endif
QString ext = fileInfo.extension(false).upper();
if (!ext.isEmpty())
diff -up digikam-0.9.4/digikam/showfoto/showfoto.cpp.libkdcraw digikam-0.9.4/digikam/showfoto/showfoto.cpp
--- digikam-0.9.4/digikam/showfoto/showfoto.cpp.libkdcraw 2008-07-16 14:05:55.000000000 -0500
+++ digikam-0.9.4/digikam/showfoto/showfoto.cpp 2008-10-14 08:46:31.000000000 -0500
@@ -73,7 +73,12 @@ extern "C"
// LibKDcraw includes.
+#include <libkdcraw/version.h>
+#include <libkdcraw/kdcraw.h>
+
+#if KDCRAW_VERSION < 0x000106
#include <libkdcraw/dcrawbinary.h>
+#endif
// Local includes.
@@ -174,12 +179,14 @@ ShowFoto::ShowFoto(const KURL::List& url
d->validIccPath = Digikam::SetupICC::iccRepositoryIsValid();
+#if KDCRAW_VERSION < 0x000106
// Check witch dcraw version available
if(d->splash)
d->splash->message(i18n("Checking dcraw version"), AlignLeft, white);
KDcrawIface::DcrawBinary::instance()->checkSystem();
+#endif
// Populate Themes
@@ -368,9 +375,11 @@ void ShowFoto::show()
}
}
+#if KDCRAW_VERSION < 0x000106
// Report errors from dcraw detection.
KDcrawIface::DcrawBinary::instance()->checkReport();
+#endif
}
void ShowFoto::setupConnections()
@@ -832,7 +841,12 @@ 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()) );
+#if KDCRAW_VERSION < 0x000106
+ filter.append ( QString(KDcrawIface::DcrawBinary::instance()->rawFiles()) );
+#else
+ filter.append ( QString(KDcrawIface::KDcraw::rawFiles()) );
+#endif
+
filter.append (" ");
QString patterns = filter.lower();
diff -up digikam-0.9.4/digikam/showfoto/main.cpp.libkdcraw digikam-0.9.4/digikam/showfoto/main.cpp
--- digikam-0.9.4/digikam/showfoto/main.cpp.libkdcraw 2008-07-16 14:05:55.000000000 -0500
+++ digikam-0.9.4/digikam/showfoto/main.cpp 2008-10-14 08:56:56.000000000 -0500
@@ -44,8 +44,12 @@
// Libkdcraw includes.
+#include <libkdcraw/version.h>
#include <libkdcraw/kdcraw.h>
+
+#if KDCRAW_VERSION < 0x000106
#include <libkdcraw/dcrawbinary.h>
+#endif
// C Ansi includes.
@@ -66,7 +70,9 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[])
{
+#if KDCRAW_VERSION < 0x000106
QString DcrawVer = KDcrawIface::DcrawBinary::internalVersion();
+#endif
QString Exiv2Ver = KExiv2Iface::KExiv2::Exiv2Version();
@@ -84,8 +90,10 @@ int main(int argc, char *argv[])
QString("\n") +
QString(I18N_NOOP("Using KDcraw library version %1")).arg(KDcrawIface::KDcraw::version()) +
QString("\n") +
+#if KDCRAW_VERSION < 0x000106
QString(I18N_NOOP("Using Dcraw program version %1")).arg(DcrawVer) +
QString("\n") +
+#endif
QString(I18N_NOOP("Using PNG library version %1")).arg(PNG_LIBPNG_VER_STRING);
QString Description = i18n("KDE Photo Viewer and Editor");
diff -up digikam-0.9.4/digikam/kioslave/digikamthumbnail.cpp.libkdcraw digikam-0.9.4/digikam/kioslave/digikamthumbnail.cpp
--- digikam-0.9.4/digikam/kioslave/digikamthumbnail.cpp.libkdcraw 2008-07-16 14:05:55.000000000 -0500
+++ digikam-0.9.4/digikam/kioslave/digikamthumbnail.cpp 2008-10-14 08:46:31.000000000 -0500
@@ -69,9 +69,13 @@
// LibKDcraw includes.
-#include <libkdcraw/dcrawbinary.h>
+#include <libkdcraw/version.h>
#include <libkdcraw/kdcraw.h>
+#if KDCRAW_VERSION < 0x000106
+#include <libkdcraw/dcrawbinary.h>
+#endif
+
// Local includes
#include "dimg.h"
@@ -264,7 +268,11 @@ bool kio_digikamthumbnailProtocol::loadB
// Else, use the right way depending of image file extension.
QString ext = fileInfo.extension(false).upper();
+#if KDCRAW_VERSION < 0x000106
QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
+#else
+ QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+#endif
if (!ext.isEmpty())
{
diff -up digikam-0.9.4/digikam/kioslave/digikamalbums.cpp.libkdcraw digikam-0.9.4/digikam/kioslave/digikamalbums.cpp
--- digikam-0.9.4/digikam/kioslave/digikamalbums.cpp.libkdcraw 2008-07-16 14:05:55.000000000 -0500
+++ digikam-0.9.4/digikam/kioslave/digikamalbums.cpp 2008-10-14 08:46:31.000000000 -0500
@@ -72,7 +72,12 @@ extern "C"
// LibKDcraw includes.
+#include <libkdcraw/version.h>
+#include <libkdcraw/kdcraw.h>
+
+#if KDCRAW_VERSION < 0x000106
#include <libkdcraw/dcrawbinary.h>
+#endif
// Local includes.
@@ -269,7 +274,11 @@ void kio_digikamalbums::special(const QB
if (getDimensions)
{
QFileInfo fileInfo(base + name);
+#if KDCRAW_VERSION < 0x000106
QString rawFilesExt(KDcrawIface::DcrawBinary::instance()->rawFiles());
+#else
+ QString rawFilesExt(KDcrawIface::KDcraw::rawFiles());
+#endif
QString ext = fileInfo.extension(false).upper();
if (!ext.isEmpty() && rawFilesExt.upper().contains(ext))
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-8/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 29 Dec 2007 20:47:27 -0000 1.12
+++ .cvsignore 12 Nov 2008 19:44:09 -0000 1.13
@@ -1 +1 @@
-digikam-0.9.3.tar.bz2
+digikam-0.9.4.tar.bz2
Index: digikam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-8/digikam.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- digikam.spec 18 Jul 2008 15:23:45 -0000 1.45
+++ digikam.spec 12 Nov 2008 19:44:09 -0000 1.46
@@ -1,23 +1,41 @@
+
+%if 0%{?fedora} > 6
+%define kdelibs3 kdelibs3
+%else
+%define kdelibs3 kdelibs
+BuildRequires: libutempter-devel
+%endif
+
+%if 0%{?fedora} > 8
+%define _without_included_sqlite3 --without-included-sqlite3
+BuildRequires: sqlite-devel
+%endif
+
Name: digikam
-Version: 0.9.3
-Release: 2%{?dist}.1
+Version: 0.9.4
+Release: 3%{?dist}
Summary: A digital camera accessing & photo management application
Group: Applications/Multimedia
License: GPLv2+
URL: http://www.digikam.org/
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?beta:-%{beta}}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0: digikam-missing-photos.patch
+## upstream patches
+Patch100: digikam-0.9.4-libkdcraw.patch
-BuildRequires: desktop-file-utils
-BuildRequires: gettext
-BuildRequires: kdelibs-devel
-BuildRequires: gphoto2-devel >= 2.0.0
-BuildRequires: libkexiv2-devel >= 0.1.6 libkdcraw-devel >= 0.1.2 libkipi-devel
-BuildRequires: lcms-devel libtiff-devel libpng-devel >= 1.2.7 jasper-devel
-BuildRequires: sqlite-devel >= 3.0.0
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
+BuildRequires: %{kdelibs3}-devel
+BuildRequires: gphoto2-devel
+BuildRequires: jasper-devel
+BuildRequires: libkdcraw-devel >= 0.1.4
+BuildRequires: libkexiv2-devel >= 0.1.7
+BuildRequires: libkipi-devel >= 0.1.6
+BuildRequires: lcms-devel
+BuildRequires: libtiff-devel
+BuildRequires: libpng-devel >= 1.2.7
%if 0%{?fedora} > 4 || 0%{?rhel} > 4
BuildRequires: libtool-ltdl-devel
%endif
@@ -46,10 +64,11 @@
This package contains the libraries, include files and other resources
needed to develop applications using %{name}.
+
%prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?beta:-%{beta}}
-%patch0 -p1
+%patch100 -p1 -b .libkdcraw
%build
@@ -61,9 +80,12 @@
--disable-debug \
--disable-warnings \
--disable-dependency-tracking \
- --enable-final
+ --enable-final \
+ %{?_without_included_sqlite3}
+
make %{?_smp_mflags}
+
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
@@ -82,18 +104,10 @@
rm -f $RPM_BUILD_ROOT%{_libdir}/libdigikam.la
-# Create symlinks in pixmaps directory
-# FIXME: this shouldn't be necessary anymore -- Rex
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-ln -sf ../icons/hicolor/48x48/apps/digikam.png \
- $RPM_BUILD_ROOT%{_datadir}/pixmaps/digikam.png
-ln -sf ../icons/hicolor/48x48/apps/showfoto.png \
- $RPM_BUILD_ROOT%{_datadir}/pixmaps/showfoto.png
%post
/sbin/ldconfig
update-desktop-database &> /dev/null ||:
-
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -102,15 +116,16 @@
%postun
/sbin/ldconfig
update-desktop-database &> /dev/null ||:
-
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
+
%clean
rm -rf $RPM_BUILD_ROOT
+
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING HACKING NEWS README TODO
@@ -126,7 +141,6 @@
%{_datadir}/apps/showfoto/
%{_datadir}/icons/hicolor/*/*/*
%{_mandir}/man1/*.1*
-%{_datadir}/pixmaps/*.png
%{_datadir}/services/digikam*
%{_datadir}/servicetypes/digikamimageplugin.desktop
@@ -136,16 +150,41 @@
%{_includedir}/digikam_export.h
%{_libdir}/libdigikam.so
+
%changelog
-* Mon Jul 07 2008 Marcin Garski <mgarski[AT]post.pl> 0.9.3-2
+* Thu Nov 11 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.9.4-3
+- libkdcraw patch
+- fix --without-included-sqlite3 logic
+- drop pixmaps hack
+
+* Fri Jul 18 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.9.4-2
+- --without-included-sqlite3, BR: sqlite-devel
+
+* Thu Jul 17 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.9.4-1
+- digikam-0.9.4
+
+* Mon Jul 07 2008 Marcin Garski <mgarski[AT]post.pl> 0.9.3-5
- Don't lose some photos during import (#448235)
+* Fri Mar 14 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.9.3-3
+- respin (for libkdcraw)
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.3-2
+- Autorebuild for GCC 4.3
+
* Sat Dec 22 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.3-1
- Update to 0.9.3
- BR: libkexiv2-devel >= 0.1.6 libkdcraw-devel >= 0.1.2
-* Sat Dec 15 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.2-6
-- Rebuild against new libpng (#425781)
+* Sat Dec 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.3-0.5.rc1
+- digikam-0.9.3-rc1
+- BR: kdelibs3-devel
+
+* Thu Nov 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.3-0.2.beta3
+- digikam-0.9.3-beta3
+
+* Tue Nov 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.9.3-0.1.beta2
+- digikam-0.9.3-beta2
* Tue Sep 18 2007 Marcin Garski <mgarski[AT]post.pl> 0.9.2-5
- Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-8/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 29 Dec 2007 20:47:28 -0000 1.12
+++ sources 12 Nov 2008 19:44:09 -0000 1.13
@@ -1 +1 @@
-20497c1a02394505f899ef0757ebefad digikam-0.9.3.tar.bz2
+b0f3fa00bd054b0497146e6ce24dab7c digikam-0.9.4.tar.bz2
--- digikam-missing-photos.patch DELETED ---
- Previous message: rpms/mkinitrd/F-10 .cvsignore, 1.210, 1.211 mkinitrd.spec, 1.295, 1.296 sources, 1.251, 1.252
- Next message: rpms/kphotoalbum/F-8 kphotoalbum-3.1.1-gcc43.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 kphotoalbum.spec, 1.16, 1.17 sources, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list