diff options
27 files changed, 53 insertions, 503 deletions
diff --git a/graphics/digikam-doc/Makefile b/graphics/digikam-doc/Makefile index 296de4e92fc3..669a1f5c7832 100644 --- a/graphics/digikam-doc/Makefile +++ b/graphics/digikam-doc/Makefile @@ -6,7 +6,7 @@ # PORTNAME= digikam-doc -PORTVERSION= 0.9.4 +PORTVERSION= 0.9.5 CATEGORIES= graphics kde MASTER_SITES= SFE MASTER_SITE_SUBDIR= digikam diff --git a/graphics/digikam-doc/distinfo b/graphics/digikam-doc/distinfo index 60c56d5d5795..c35e996e51cf 100644 --- a/graphics/digikam-doc/distinfo +++ b/graphics/digikam-doc/distinfo @@ -1,3 +1,3 @@ -MD5 (digikam-doc-0.9.4.tar.bz2) = 1d8c8a16976186e511efefd8e06ba91a -SHA256 (digikam-doc-0.9.4.tar.bz2) = 0fe52595f7a992fb9749ad2fe26050d19421fe5960cb8b6c328b774bfee5f3e7 -SIZE (digikam-doc-0.9.4.tar.bz2) = 58242503 +MD5 (digikam-doc-0.9.5.tar.bz2) = 7b9c2bc4de1cc2486737cf4b4eb0a1ec +SHA256 (digikam-doc-0.9.5.tar.bz2) = 8ed9c108110c8c50362241c69bcba5c45ec54987a9640d1e8c5752785a17e484 +SIZE (digikam-doc-0.9.5.tar.bz2) = 55368251 diff --git a/graphics/digikam-doc/files/patch-configure b/graphics/digikam-doc/files/patch-configure new file mode 100644 index 000000000000..6f5a48fee18c --- /dev/null +++ b/graphics/digikam-doc/files/patch-configure @@ -0,0 +1,22 @@ +--- configure.orig 2009-03-18 08:14:13.000000000 +0100 ++++ configure 2009-03-18 08:14:52.000000000 +0100 +@@ -33346,10 +33346,6 @@ + + ac_config_files="$ac_config_files doc/pt_BR_digikam/Makefile" + +-ac_config_files="$ac_config_files doc/pt_digikam/Makefile" +- +-ac_config_files="$ac_config_files doc/pt_showfoto/Makefile" +- + ac_config_files="$ac_config_files doc/ru_digikam/Makefile" + + ac_config_files="$ac_config_files doc/showfoto/Makefile" +@@ -33988,8 +33984,6 @@ + "doc/nl_digikam/Makefile") CONFIG_FILES="$CONFIG_FILES doc/nl_digikam/Makefile" ;; + "doc/nl_showfoto/Makefile") CONFIG_FILES="$CONFIG_FILES doc/nl_showfoto/Makefile" ;; + "doc/pt_BR_digikam/Makefile") CONFIG_FILES="$CONFIG_FILES doc/pt_BR_digikam/Makefile" ;; +- "doc/pt_digikam/Makefile") CONFIG_FILES="$CONFIG_FILES doc/pt_digikam/Makefile" ;; +- "doc/pt_showfoto/Makefile") CONFIG_FILES="$CONFIG_FILES doc/pt_showfoto/Makefile" ;; + "doc/ru_digikam/Makefile") CONFIG_FILES="$CONFIG_FILES doc/ru_digikam/Makefile" ;; + "doc/showfoto/Makefile") CONFIG_FILES="$CONFIG_FILES doc/showfoto/Makefile" ;; + "doc/sv_digikam/Makefile") CONFIG_FILES="$CONFIG_FILES doc/sv_digikam/Makefile" ;; diff --git a/graphics/digikam-doc/pkg-plist b/graphics/digikam-doc/pkg-plist index aa71882130e0..a3e18d491574 100644 --- a/graphics/digikam-doc/pkg-plist +++ b/graphics/digikam-doc/pkg-plist @@ -22,6 +22,7 @@ share/doc/HTML/de/showfoto/common share/doc/HTML/de/showfoto/index.cache.bz2 share/doc/HTML/de/showfoto/index.docbook share/doc/HTML/en/digikam/2Greens.png +share/doc/HTML/en/digikam/542px-CIExy1931_sRGB.svg.png share/doc/HTML/en/digikam/DAM-Metadata.png share/doc/HTML/en/digikam/DAM-Workflow.png share/doc/HTML/en/digikam/DAM-errors.png @@ -67,6 +68,7 @@ share/doc/HTML/en/digikam/channelmixerdialog.png share/doc/HTML/en/digikam/channelmixerpreview.png share/doc/HTML/en/digikam/charcoalpreview.png share/doc/HTML/en/digikam/cimg-logo.png +share/doc/HTML/en/digikam/color-management.docbook share/doc/HTML/en/digikam/colormanagement.png share/doc/HTML/en/digikam/common share/doc/HTML/en/digikam/credits-annex.docbook @@ -183,12 +185,12 @@ share/doc/HTML/en/digikam/maininterfacetagsview.png share/doc/HTML/en/digikam/maininterfacetoolbar.png share/doc/HTML/en/digikam/menu-descriptions.docbook share/doc/HTML/en/digikam/menualbum.png -share/doc/HTML/en/digikam/menualbumexport.png -share/doc/HTML/en/digikam/menualbumimport.png share/doc/HTML/en/digikam/menucamera.png +share/doc/HTML/en/digikam/menuexport.png share/doc/HTML/en/digikam/menuhelp.png share/doc/HTML/en/digikam/menuimage.png share/doc/HTML/en/digikam/menuimagemetadata.png +share/doc/HTML/en/digikam/menuimport.png share/doc/HTML/en/digikam/menuselect.png share/doc/HTML/en/digikam/menusettings.png share/doc/HTML/en/digikam/menutag.png @@ -438,8 +440,19 @@ share/doc/HTML/es/showfoto/setupgeneral.png share/doc/HTML/es/showfoto/setupplugins.png share/doc/HTML/es/showfoto/setupslideshow.png share/doc/HTML/et/digikam/common +share/doc/HTML/et/digikam/credits-annex.docbook +share/doc/HTML/et/digikam/editor-color.docbook +share/doc/HTML/et/digikam/editor-decorate.docbook +share/doc/HTML/et/digikam/editor-enhance.docbook +share/doc/HTML/et/digikam/editor-filters.docbook +share/doc/HTML/et/digikam/editor-transform.docbook +share/doc/HTML/et/digikam/file-formats.docbook +share/doc/HTML/et/digikam/ie-menu.docbook share/doc/HTML/et/digikam/index.cache.bz2 share/doc/HTML/et/digikam/index.docbook +share/doc/HTML/et/digikam/menu-descriptions.docbook +share/doc/HTML/et/digikam/photo-editing.docbook +share/doc/HTML/et/digikam/sidebar.docbook share/doc/HTML/et/showfoto/common share/doc/HTML/et/showfoto/index.cache.bz2 share/doc/HTML/et/showfoto/index.docbook @@ -506,40 +519,17 @@ share/doc/HTML/nl/digikam/setupmimetypes.png share/doc/HTML/nl/digikam/setupmisc.png share/doc/HTML/nl/digikam/tagsview.png share/doc/HTML/nl/digikam/targetalbumdialog.png -share/doc/HTML/nl/showfoto/autolevelspreview.png share/doc/HTML/nl/showfoto/common share/doc/HTML/nl/showfoto/convert_brown.png -share/doc/HTML/nl/showfoto/convert_bw.png -share/doc/HTML/nl/showfoto/convert_bwgreen.png share/doc/HTML/nl/showfoto/convert_bworange.png -share/doc/HTML/nl/showfoto/convert_bwred.png share/doc/HTML/nl/showfoto/convert_bwyellow.png share/doc/HTML/nl/showfoto/convert_cold.png -share/doc/HTML/nl/showfoto/convert_original.png share/doc/HTML/nl/showfoto/convert_platinium.png -share/doc/HTML/nl/showfoto/convert_selenium.png -share/doc/HTML/nl/showfoto/convert_sepia.png -share/doc/HTML/nl/showfoto/digikamlogo.png -share/doc/HTML/nl/showfoto/editoradjustcurves.png -share/doc/HTML/nl/showfoto/editoradjustlevels.png share/doc/HTML/nl/showfoto/editorautosizebutton.png share/doc/HTML/nl/showfoto/editorbcgadjust.png -share/doc/HTML/nl/showfoto/editorblurplugin.png -share/doc/HTML/nl/showfoto/editorcolorbalance.png share/doc/HTML/nl/showfoto/editorcropbutton.png -share/doc/HTML/nl/showfoto/editorhsladjust.png -share/doc/HTML/nl/showfoto/editorimageselection.png -share/doc/HTML/nl/showfoto/editornoisereductionplugin.png -share/doc/HTML/nl/showfoto/editorraindropsplugin.png -share/doc/HTML/nl/showfoto/editorratiocroptool.png -share/doc/HTML/nl/showfoto/editorredeyescorrection.png -share/doc/HTML/nl/showfoto/editorresizetool.png share/doc/HTML/nl/showfoto/editorsharpenplugin.png -share/doc/HTML/nl/showfoto/editorunsharpedmaskplugin.png -share/doc/HTML/nl/showfoto/equalizepreview.png -share/doc/HTML/nl/showfoto/exifviewer.png share/doc/HTML/nl/showfoto/histogramdescription.png -share/doc/HTML/nl/showfoto/histogramimageplugin.png share/doc/HTML/nl/showfoto/histogramsample1.png share/doc/HTML/nl/showfoto/histogramsample2.png share/doc/HTML/nl/showfoto/histogramsample3.png @@ -551,9 +541,6 @@ share/doc/HTML/nl/showfoto/normalizepreview.png share/doc/HTML/nl/showfoto/revertbutton.png share/doc/HTML/nl/showfoto/rulethirdlinesexample.png share/doc/HTML/nl/showfoto/setupgeneral.png -share/doc/HTML/nl/showfoto/setupimageeditor.png -share/doc/HTML/nl/showfoto/stretchcontrastpreview.png -share/doc/HTML/nl/showfoto/zoombuttons.png share/doc/HTML/pt_BR/digikam/albumproperties.png share/doc/HTML/pt_BR/digikam/common share/doc/HTML/pt_BR/digikam/convert_brown.png @@ -581,6 +568,11 @@ share/doc/HTML/pt_BR/digikam/setupkipi.png share/doc/HTML/ru/digikam/common share/doc/HTML/ru/digikam/index.cache.bz2 share/doc/HTML/ru/digikam/index.docbook +share/doc/HTML/sv/digikam/DAM-Metadata.png +share/doc/HTML/sv/digikam/DAM-Workflow.png +share/doc/HTML/sv/digikam/DAM-errors.png +share/doc/HTML/sv/digikam/DAM-pyramid.png +share/doc/HTML/sv/digikam/DAM-transmission.png share/doc/HTML/sv/digikam/ICCworkflowlogic.png share/doc/HTML/sv/digikam/addcamera.png share/doc/HTML/sv/digikam/adjustcurvesdialog.png @@ -603,6 +595,7 @@ share/doc/HTML/sv/digikam/cameraclientsetting3.png share/doc/HTML/sv/digikam/camerafolderselectiondialog.png share/doc/HTML/sv/digikam/cameratargetalbumdialog.png share/doc/HTML/sv/digikam/channelmixerdialog.png +share/doc/HTML/sv/digikam/color-management.docbook share/doc/HTML/sv/digikam/colormanagement.png share/doc/HTML/sv/digikam/commentstags.png share/doc/HTML/sv/digikam/common diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile index c10ad4ed08de..5bebf2c0e3ad 100644 --- a/graphics/digikam/Makefile +++ b/graphics/digikam/Makefile @@ -6,8 +6,7 @@ # PORTNAME= digikam -DISTVERSION= 0.9.4 -PORTREVISION= 4 +DISTVERSION= 0.9.5 CATEGORIES= graphics kde MASTER_SITES= SFE diff --git a/graphics/digikam/distinfo b/graphics/digikam/distinfo index 51190294f9bf..b2fba377ecbb 100644 --- a/graphics/digikam/distinfo +++ b/graphics/digikam/distinfo @@ -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.9.5.tar.bz2) = fc4085169256cffd77aa8e8025792b89 +SHA256 (digikam-0.9.5.tar.bz2) = a44790732ffd32a538473160c97fefeab92d506bd9d76b293d442319e18ceda3 +SIZE (digikam-0.9.5.tar.bz2) = 11343390 diff --git a/graphics/digikam/files/patch-digikam_digikam_albumfiletip.cpp b/graphics/digikam/files/patch-digikam_digikam_albumfiletip.cpp deleted file mode 100644 index 58621ce26eb8..000000000000 --- a/graphics/digikam/files/patch-digikam_digikam_albumfiletip.cpp +++ /dev/null @@ -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)) diff --git a/graphics/digikam/files/patch-digikam_digikam_albumiconview.cpp b/graphics/digikam/files/patch-digikam_digikam_albumiconview.cpp deleted file mode 100644 index 71dd220e1956..000000000000 --- a/graphics/digikam/files/patch-digikam_digikam_albumiconview.cpp +++ /dev/null @@ -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() + diff --git a/graphics/digikam/files/patch-digikam_digikam_albumsettings.cpp b/graphics/digikam/files/patch-digikam_digikam_albumsettings.cpp deleted file mode 100644 index cbce4b610719..000000000000 --- a/graphics/digikam/files/patch-digikam_digikam_albumsettings.cpp +++ /dev/null @@ -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; diff --git a/graphics/digikam/files/patch-digikam_digikam_digikamapp.cpp b/graphics/digikam/files/patch-digikam_digikam_digikamapp.cpp deleted file mode 100644 index 263bcac94ed8..000000000000 --- a/graphics/digikam/files/patch-digikam_digikam_digikamapp.cpp +++ /dev/null @@ -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()); diff --git a/graphics/digikam/files/patch-digikam_digikam_main.cpp b/graphics/digikam/files/patch-digikam_digikam_main.cpp deleted file mode 100644 index 64915434d2dc..000000000000 --- a/graphics/digikam/files/patch-digikam_digikam_main.cpp +++ /dev/null @@ -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") + diff --git a/graphics/digikam/files/patch-digikam_digikam_scanlib.cpp b/graphics/digikam/files/patch-digikam_digikam_scanlib.cpp deleted file mode 100644 index a80ded1fbe8e..000000000000 --- a/graphics/digikam/files/patch-digikam_digikam_scanlib.cpp +++ /dev/null @@ -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; diff --git a/graphics/digikam/files/patch-digikam_kioslave_digikamalbums.cpp b/graphics/digikam/files/patch-digikam_kioslave_digikamalbums.cpp deleted file mode 100644 index c6a9fd200db8..000000000000 --- a/graphics/digikam/files/patch-digikam_kioslave_digikamalbums.cpp +++ /dev/null @@ -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)) diff --git a/graphics/digikam/files/patch-digikam_kioslave_digikamdates.cpp b/graphics/digikam/files/patch-digikam_kioslave_digikamdates.cpp deleted file mode 100644 index 8c509b5e08bd..000000000000 --- a/graphics/digikam/files/patch-digikam_kioslave_digikamdates.cpp +++ /dev/null @@ -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; diff --git a/graphics/digikam/files/patch-digikam_kioslave_digikamthumbnail.cpp b/graphics/digikam/files/patch-digikam_kioslave_digikamthumbnail.cpp deleted file mode 100644 index d73ca7a1a4b7..000000000000 --- a/graphics/digikam/files/patch-digikam_kioslave_digikamthumbnail.cpp +++ /dev/null @@ -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()) - { diff --git a/graphics/digikam/files/patch-digikam_libs_dialogs_imagedialog.cpp b/graphics/digikam/files/patch-digikam_libs_dialogs_imagedialog.cpp deleted file mode 100644 index 28b76d221629..000000000000 --- a/graphics/digikam/files/patch-digikam_libs_dialogs_imagedialog.cpp +++ /dev/null @@ -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"); diff --git a/graphics/digikam/files/patch-digikam_libs_dialogs_rawcameradlg.cpp b/graphics/digikam/files/patch-digikam_libs_dialogs_rawcameradlg.cpp deleted file mode 100644 index 38bcac52aa7e..000000000000 --- a/graphics/digikam/files/patch-digikam_libs_dialogs_rawcameradlg.cpp +++ /dev/null @@ -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())); - diff --git a/graphics/digikam/files/patch-digikam_libs_dimg_dimg.cpp b/graphics/digikam/files/patch-digikam_libs_dimg_dimg.cpp deleted file mode 100644 index 67037fc560a7..000000000000 --- a/graphics/digikam/files/patch-digikam_libs_dimg_dimg.cpp +++ /dev/null @@ -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()) diff --git a/graphics/digikam/files/patch-digikam_libs_imageproperties_imagepropertiestab.cpp b/graphics/digikam/files/patch-digikam_libs_imageproperties_imagepropertiestab.cpp deleted file mode 100644 index cb4605498e7c..000000000000 --- a/graphics/digikam/files/patch-digikam_libs_imageproperties_imagepropertiestab.cpp +++ /dev/null @@ -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)) diff --git a/graphics/digikam/files/patch-digikam_libs_lprof_lcmsprf.h b/graphics/digikam/files/patch-digikam_libs_lprof_lcmsprf.h deleted file mode 100644 index 4c890dae968b..000000000000 --- a/graphics/digikam/files/patch-digikam_libs_lprof_lcmsprf.h +++ /dev/null @@ -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 ----------------------------------------------------- */ - diff --git a/graphics/digikam/files/patch-digikam_libs_thumbbar_thumbbar.cpp b/graphics/digikam/files/patch-digikam_libs_thumbbar_thumbbar.cpp deleted file mode 100644 index d1c59f4fa7fb..000000000000 --- a/graphics/digikam/files/patch-digikam_libs_thumbbar_thumbbar.cpp +++ /dev/null @@ -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)) diff --git a/graphics/digikam/files/patch-digikam_showfoto_main.cpp b/graphics/digikam/files/patch-digikam_showfoto_main.cpp deleted file mode 100644 index 2069051b1412..000000000000 --- a/graphics/digikam/files/patch-digikam_showfoto_main.cpp +++ /dev/null @@ -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); - diff --git a/graphics/digikam/files/patch-digikam_showfoto_showfoto.cpp b/graphics/digikam/files/patch-digikam_showfoto_showfoto.cpp deleted file mode 100644 index ff44d74528be..000000000000 --- a/graphics/digikam/files/patch-digikam_showfoto_showfoto.cpp +++ /dev/null @@ -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(); diff --git a/graphics/digikam/files/patch-digikam_utilities_cameragui_cameraui.cpp b/graphics/digikam/files/patch-digikam_utilities_cameragui_cameraui.cpp deleted file mode 100644 index 82bbc0e1beaf..000000000000 --- a/graphics/digikam/files/patch-digikam_utilities_cameragui_cameraui.cpp +++ /dev/null @@ -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"); - diff --git a/graphics/digikam/files/patch-digikam_utilities_cameragui_gpcamera.cpp b/graphics/digikam/files/patch-digikam_utilities_cameragui_gpcamera.cpp deleted file mode 100644 index f941396355d3..000000000000 --- a/graphics/digikam/files/patch-digikam_utilities_cameragui_gpcamera.cpp +++ /dev/null @@ -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" diff --git a/graphics/digikam/files/patch-digikam_utilities_lighttable_lighttablewindow.cpp b/graphics/digikam/files/patch-digikam_utilities_lighttable_lighttablewindow.cpp deleted file mode 100644 index c9475220dc4b..000000000000 --- a/graphics/digikam/files/patch-digikam_utilities_lighttable_lighttablewindow.cpp +++ /dev/null @@ -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() + diff --git a/graphics/digikam/pkg-plist b/graphics/digikam/pkg-plist index 5c7328a1a2a4..00d1cddc95a5 100644 --- a/graphics/digikam/pkg-plist +++ b/graphics/digikam/pkg-plist @@ -6,7 +6,6 @@ include/digikam/bcgmodifier.h include/digikam/cietonguewidget.h include/digikam/colorgradientwidget.h include/digikam/colormodifier.h -include/digikam/ctrlpaneldlg.h include/digikam/curveswidget.h include/digikam/dcolor.h include/digikam/dcolorblend.h @@ -34,14 +33,12 @@ include/digikam/iccprofilewidget.h include/digikam/icctransform.h include/digikam/imagecurves.h include/digikam/imagedialog.h -include/digikam/imagedlgbase.h -include/digikam/imageguidedlg.h include/digikam/imageguidewidget.h include/digikam/imagehistogram.h include/digikam/imageiface.h include/digikam/imagelevels.h include/digikam/imagepaniconwidget.h -include/digikam/imagepannelwidget.h +include/digikam/imagepanelwidget.h include/digikam/imageplugin.h include/digikam/imageregionwidget.h include/digikam/imagewidget.h @@ -696,6 +693,7 @@ share/apps/digikam/themes/Blue share/apps/digikam/themes/Clean share/apps/digikam/themes/DLR share/apps/digikam/themes/Dark +share/apps/digikam/themes/DarkRoom share/apps/digikam/themes/Dessert share/apps/digikam/themes/Digikasa share/apps/digikam/themes/Dreary |