Репозиторий Sisyphus
Последнее обновление: 1 октября 2023 | Пакетов: 18631 | Посещений: 37855772
en ru br
Репозитории ALT
D:0.9.4-alt0.7
5.1: 0.9.6-alt2
4.1: 0.9.3-alt3
4.0: 0.9.1-alt1.M40.2
3.0: 0.7.3-alt1
www.altlinux.org/Changes

Другие репозитории
Upstream:0.9.4-beta1

Группа :: Графика
Пакет: digikam

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: digikam-0.9.4-rc1-compat.patch
Скачать


diff -urN digikam-0.9.4-rc1.orig/digikam/configure.in.in digikam-0.9.4-rc1/digikam/configure.in.in
--- digikam-0.9.4-rc1.orig/digikam/configure.in.in	2008-06-17 10:22:59 +0300
+++ digikam-0.9.4-rc1/digikam/configure.in.in	2008-06-18 19:38:46 +0300
@@ -211,7 +211,7 @@
 if test "$PKGCONFIGFOUND" = "yes" ; then
    have_libkdcraw=no
 
-   KDE_PKG_CHECK_MODULES(LIBKDCRAW, libkdcraw >= 0.1.4,
+   KDE_PKG_CHECK_MODULES(LIBKDCRAW, libkdcraw >= 0.1.3,
                          have_libkdcraw=yes, have_libkdcraw=no)
 
    if test "x$have_libkdcraw" = "xno"; then
diff -urN digikam-0.9.4-rc1.orig/digikam/digikam/main.cpp digikam-0.9.4-rc1/digikam/digikam/main.cpp
--- digikam-0.9.4-rc1.orig/digikam/digikam/main.cpp	2008-06-17 10:22:59 +0300
+++ digikam-0.9.4-rc1/digikam/digikam/main.cpp	2008-06-18 19:38:46 +0300
@@ -48,7 +48,9 @@
 // KIPI Includes.
 
 #include <libkipi/version.h>
+#if KIPI_VERSION >= 0x000106
 #include <libkipi/interface.h>
+#endif
 
 // Libkexiv2 includes.
 
@@ -57,7 +59,10 @@
 
 // Libkdcraw includes.
 
+#include <libkdcraw/version.h>
+#if KDCRAW_VERSION >= 0x000104
 #include <libkdcraw/kdcraw.h>
+#endif
 #include <libkdcraw/dcrawbinary.h>
 
 // C Ansi includes.
@@ -104,13 +109,25 @@
     Kexiv2Ver = KExiv2Iface::KExiv2::version();
 #endif
 
+#if KIPI_VERSION >= 0x000106
     QString libInfo     = QString(I18N_NOOP("Using Kipi library version %1")).arg(KipiVer) + 
+#else
+    QString libInfo     = QString(I18N_NOOP("Using Kipi library version %1")).arg(kipi_version) +
+#endif
                           QString("\n") + 
+#if KEXIV2_VERSION >= 0x000107
                           QString(I18N_NOOP("Using KExiv2 library version %1")).arg(Kexiv2Ver) +
+#else
+                          QString(I18N_NOOP("Using KExiv2 library version %1")).arg(kexiv2_version) +
+#endif
                           QString("\n") +
                           QString(I18N_NOOP("Using Exiv2 library version %1")).arg(Exiv2Ver) +
                           QString("\n") +
+#if KDCRAW_VERSION >= 0x000104
                           QString(I18N_NOOP("Using KDcraw library version %1")).arg(KDcrawIface::KDcraw::version()) +
+#else
+                          QString(I18N_NOOP("Using KDcraw library version %1")).arg(kdcraw_version) +
+#endif
                           QString("\n") +
                           QString(I18N_NOOP("Using Dcraw program version %1")).arg(DcrawVer) +
                           QString("\n") +
diff -urN digikam-0.9.4-rc1.orig/digikam/showfoto/main.cpp digikam-0.9.4-rc1/digikam/showfoto/main.cpp
--- digikam-0.9.4-rc1.orig/digikam/showfoto/main.cpp	2008-06-17 10:22:59 +0300
+++ digikam-0.9.4-rc1/digikam/showfoto/main.cpp	2008-06-18 19:38:46 +0300
@@ -44,7 +44,10 @@
 
 // Libkdcraw includes.
 
+#include <libkdcraw/version.h>
+#if KDCRAW_VERSION >= 0x000104
 #include <libkdcraw/kdcraw.h>
+#endif
 #include <libkdcraw/dcrawbinary.h>
 
 // C Ansi includes.
@@ -78,11 +81,19 @@
     Kexiv2Ver = KExiv2Iface::KExiv2::version();
 #endif
 
+#if KEXIV2_VERSION >= 0x000107
     QString libInfo     = QString(I18N_NOOP("Using KExiv2 library version %1")).arg(Kexiv2Ver) +
+#else
+    QString libInfo     = QString(I18N_NOOP("Using KExiv2 library version %1")).arg(kexiv2_version) +
+#endif
                           QString("\n") +                           
                           QString(I18N_NOOP("Using Exiv2 library version %1")).arg(Exiv2Ver) +
                           QString("\n") +                           
+#if KDCRAW_VERSION >= 0x000104
                           QString(I18N_NOOP("Using KDcraw library version %1")).arg(KDcrawIface::KDcraw::version()) +
+#else
+                          QString(I18N_NOOP("Using KDcraw library version %1")).arg(kdcraw_version) +
+#endif
                           QString("\n") +                           
                           QString(I18N_NOOP("Using Dcraw program version %1")).arg(DcrawVer) +
                           QString("\n") +                           
diff -urN digikam-0.9.4-rc1.orig/digikam/utilities/imageeditor/editor/editorwindow.cpp digikam-0.9.4-rc1/digikam/utilities/imageeditor/editor/editorwindow.cpp
--- digikam-0.9.4-rc1.orig/digikam/utilities/imageeditor/editor/editorwindow.cpp	2008-06-17 10:22:59 +0300
+++ digikam-0.9.4-rc1/digikam/utilities/imageeditor/editor/editorwindow.cpp	2008-06-18 19:38:46 +0300
@@ -79,6 +79,8 @@
 #include <kwin.h>
 #include <kcombobox.h>
 
+#include <libkdcraw/version.h>
+
 // Local includes.
 
 #include "ddebug.h"
@@ -918,10 +920,15 @@
         m_IOFileSettings->rawDecodingSettings.outputColorSpace = KDcrawIface::RawDecodingSettings::SRGB;
 
     m_IOFileSettings->rawDecodingSettings.sixteenBitsImage        = config->readBoolEntry("SixteenBitsImage", false);
+#if KDCRAW_VERSION >= 0x000104
     m_IOFileSettings->rawDecodingSettings.whiteBalance            = (KDcrawIface::RawDecodingSettings::WhiteBalance)config->readNumEntry("WhiteBalance",
                                                                     KDcrawIface::RawDecodingSettings::CAMERA);
     m_IOFileSettings->rawDecodingSettings.customWhiteBalance      = config->readNumEntry("CustomWhiteBalance", 6500);
     m_IOFileSettings->rawDecodingSettings.customWhiteBalanceGreen = config->readDoubleNumEntry("CustomWhiteBalanceGreen", 1.0);
+#else
+    m_IOFileSettings->rawDecodingSettings.automaticColorBalance   = config->readBoolEntry("AutomaticColorBalance", true);
+    m_IOFileSettings->rawDecodingSettings.cameraColorBalance      = config->readBoolEntry("CameraColorBalance", true);
+#endif
     m_IOFileSettings->rawDecodingSettings.RGBInterpolate4Colors   = config->readBoolEntry("RGBInterpolate4Colors", false);
     m_IOFileSettings->rawDecodingSettings.DontStretchPixels       = config->readBoolEntry("DontStretchPixels", false);
     m_IOFileSettings->rawDecodingSettings.enableNoiseReduction    = config->readBoolEntry("EnableNoiseReduction", false);
diff -urN digikam-0.9.4-rc1.orig/digikam/utilities/setup/setupdcraw.cpp digikam-0.9.4-rc1/digikam/utilities/setup/setupdcraw.cpp
--- digikam-0.9.4-rc1.orig/digikam/utilities/setup/setupdcraw.cpp	2008-06-17 10:22:59 +0300
+++ digikam-0.9.4-rc1/digikam/utilities/setup/setupdcraw.cpp	2008-06-18 19:38:46 +0300
@@ -44,6 +44,7 @@
 
 // LibKDcraw includes.
 
+#include <libkdcraw/version.h>
 #include <libkdcraw/dcrawsettingswidget.h>
 
 // Local includes.
@@ -89,9 +90,14 @@
     KConfig* config = kapp->config();
     config->setGroup("ImageViewer Settings");
     config->writeEntry("SixteenBitsImage", d->dcrawSettings->sixteenBits());
+#if KDCRAW_VERSION >= 0x000104
     config->writeEntry("WhiteBalance", d->dcrawSettings->whiteBalance());
     config->writeEntry("CustomWhiteBalance", d->dcrawSettings->customWhiteBalance());
     config->writeEntry("CustomWhiteBalanceGreen", d->dcrawSettings->customWhiteBalanceGreen());
+#else
+    config->writeEntry("CameraColorBalance", d->dcrawSettings->useCameraWB());
+    config->writeEntry("AutomaticColorBalance", d->dcrawSettings->useAutoColorBalance());
+#endif
     config->writeEntry("RGBInterpolate4Colors", d->dcrawSettings->useFourColor());
     config->writeEntry("DontStretchPixels", d->dcrawSettings->useDontStretchPixels());
     config->writeEntry("EnableNoiseReduction", d->dcrawSettings->useNoiseReduction());
@@ -117,11 +123,16 @@
     d->dcrawSettings->setcaBlueMultiplier(config->readDoubleNumEntry("caBlueMultiplier", 1.0));
     d->dcrawSettings->setDontStretchPixels(config->readBoolEntry("DontStretchPixels", false));
     d->dcrawSettings->setUnclipColor(config->readNumEntry("UnclipColors", 0));
+#if KDCRAW_VERSION >= 0x000104
     d->dcrawSettings->setWhiteBalance((KDcrawIface::RawDecodingSettings::WhiteBalance)
                                       config->readNumEntry("WhiteBalance",
                                       KDcrawIface::RawDecodingSettings::CAMERA));
     d->dcrawSettings->setCustomWhiteBalance(config->readNumEntry("CustomWhiteBalance", 6500));
     d->dcrawSettings->setCustomWhiteBalanceGreen(config->readDoubleNumEntry("CustomWhiteBalanceGreen", 1.0));
+#else
+    d->dcrawSettings->setCameraWB(config->readBoolEntry("CameraColorBalance", true));
+    d->dcrawSettings->setAutoColorBalance(config->readBoolEntry("AutomaticColorBalance", true));
+#endif
     d->dcrawSettings->setFourColor(config->readBoolEntry("RGBInterpolate4Colors", false));
     d->dcrawSettings->setQuality((KDcrawIface::RawDecodingSettings::DecodingQuality)
                                   config->readNumEntry("RAWQuality",
diff -urN digikam-0.9.4-rc1.orig/README digikam-0.9.4-rc1/README
--- digikam-0.9.4-rc1.orig/README	2008-06-17 10:22:59 +0300
+++ digikam-0.9.4-rc1/README	2008-06-18 19:38:46 +0300
@@ -91,7 +91,7 @@
 libgphoto2 >= 2.x.x (>=2.4.x recommended)  http://www.gphoto.org
 libkipi    >= 0.1.5 (>=0.1.6 recommended)  http://www.kipi-plugins.org
 libkexiv2  >= 0.1.6 (>=0.1.7 recommended)  http://www.kipi-plugins.org
-libkdcraw  >= 0.1.4                        http://www.kipi-plugins.org
+libkdcraw  >= 0.1.3 (>=0.1.4 recommended)  http://www.kipi-plugins.org
 liblcms    >= 1.14.x                       http://www.littlecms.com
 libtiff    >= 3.6.x (>=3.8.2 recommended)  http://www.remotesensing.org/libtiff
 libpng     >= 1.2.x                        http://www.libpng.org/pub/png/libpng.html
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin