rev 19233 - in kde-extras/digikam/trunk/debian: . patches

[Mark Purcell]

Author: msp
Date: 2012-06-02 05:14:43 +0000 (Sat, 02 Jun 2012)
New Revision: 19233

Added:
   kde-extras/digikam/trunk/debian/patches/
   kde-extras/digikam/trunk/debian/patches/dngconverter_BYTE_ORDER.diff
   kde-extras/digikam/trunk/debian/patches/sendimages-icedove.diff
   kde-extras/digikam/trunk/debian/patches/series
Modified:
   kde-extras/digikam/trunk/debian/changelog
Log:
* Fix "FTBFS on mips ("error: #error Unable to figure out byte
  order.")" rediscover dngconverter_BYTE_ORDER.diff (Closes: #670454)
* Fix "Cannot send pictures via icedove !" rediscover sendimages-icedove.diff
  (Closes: #661786)

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2012-06-02 04:37:12 UTC (rev 19232)
+++ kde-extras/digikam/trunk/debian/changelog	2012-06-02 05:14:43 UTC (rev 19233)
@@ -2,6 +2,10 @@
 
   * Build-Depends: libopencv-dev
     - Fixes "FTBFS: opencv not found" (Closes: #674325)
+  * Fix "FTBFS on mips ("error: #error Unable to figure out byte
+    order.")" rediscover dngconverter_BYTE_ORDER.diff (Closes: #670454)
+  * Fix "Cannot send pictures via icedove !" rediscover sendimages-icedove.diff
+    (Closes: #661786)
 
  -- Mark Purcell <msp at debian.org>  Sat, 02 Jun 2012 14:36:31 +1000
 

Copied: kde-extras/digikam/trunk/debian/patches/dngconverter_BYTE_ORDER.diff (from rev 19081, kde-extras/kipi-plugins/trunk/debian/patches/dngconverter_s390_support.diff)
===================================================================
--- kde-extras/digikam/trunk/debian/patches/dngconverter_BYTE_ORDER.diff	                        (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/dngconverter_BYTE_ORDER.diff	2012-06-02 05:14:43 UTC (rev 19233)
@@ -0,0 +1,29 @@
+From: Modestas Vainius <modax at debian.org>
+Subject: Improve big/little endian detection in dngconverter.
+Forwarded: https://bugs.kde.org/show_bug.cgi?id=301027
+Origin: vendor
+
+__BYTE_ORDER__ is a standard GNU C macro [1]. Neither of other checks passes on
+s390 causing a FTBFS.
+
+[1] http://gcc.gnu.org/onlinedocs/cpp/Common-Predefined-Macros.html
+
+Index: digikam-2.6.0~rc/extra/kipi-plugins/dngconverter/dngwriter/extra/dng_sdk/dng_flags.h
+===================================================================
+--- digikam-2.6.0~rc.orig/extra/kipi-plugins/dngconverter/dngwriter/extra/dng_sdk/dng_flags.h	2012-05-09 22:52:34.000000000 +1000
++++ digikam-2.6.0~rc/extra/kipi-plugins/dngconverter/dngwriter/extra/dng_sdk/dng_flags.h	2012-06-02 14:59:22.000000000 +1000
+@@ -94,6 +94,14 @@
+ #elif defined(__BIG_ENDIAN__)
+ #define qDNGBigEndian 1
+ 
++#elif defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && \
++    __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
++#define qDNGBigEndian 1
++
++#elif defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
++    __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
++#define qDNGBigEndian 0
++
+ #else
+ 
+ #ifndef qXCodeRez

Copied: kde-extras/digikam/trunk/debian/patches/sendimages-icedove.diff (from rev 19081, kde-extras/kipi-plugins/trunk/debian/patches/sendimages-icedove.diff)
===================================================================
--- kde-extras/digikam/trunk/debian/patches/sendimages-icedove.diff	                        (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/sendimages-icedove.diff	2012-06-02 05:14:43 UTC (rev 19233)
@@ -0,0 +1,45 @@
+Index: digikam-2.6.0~rc/extra/kipi-plugins/sendimages/sendimages.cpp
+===================================================================
+--- digikam-2.6.0~rc.orig/extra/kipi-plugins/sendimages/sendimages.cpp	2012-05-09 22:52:34.000000000 +1000
++++ digikam-2.6.0~rc/extra/kipi-plugins/sendimages/sendimages.cpp	2012-06-02 15:06:22.000000000 +1000
+@@ -524,6 +524,7 @@
+ 
+                 case EmailSettings::NETSCAPE:
+                 case EmailSettings::THUNDERBIRD:
++                case EmailSettingsContainer::ICEDOVE:
+                 case EmailSettings::GMAILAGENT:
+                 {
+                     QString prog;
+@@ -531,6 +532,8 @@
+                         prog = QString("netscape");
+                     else if (d->settings.emailProgram == EmailSettings::THUNDERBIRD)
+                         prog = QString("thunderbird");
++                    else if (d->settings.emailProgram == EmailSettingsContainer::ICEDOVE)
++                        prog = QString("icedove");
+                     else
+                         prog = QString("gmailagent");
+ 
+Index: digikam-2.6.0~rc/extra/kipi-plugins/sendimages/emailsettings.h
+===================================================================
+--- digikam-2.6.0~rc.orig/extra/kipi-plugins/sendimages/emailsettings.h	2012-05-09 22:52:34.000000000 +1000
++++ digikam-2.6.0~rc/extra/kipi-plugins/sendimages/emailsettings.h	2012-06-02 15:08:09.000000000 +1000
+@@ -70,6 +70,7 @@
+         NETSCAPE,
+         SYLPHEED,
+         SYLPHEEDCLAWS,
++        ICEDOVE,
+         THUNDERBIRD
+     };
+ 
+Index: digikam-2.6.0~rc/extra/kipi-plugins/sendimages/settingswidget.cpp
+===================================================================
+--- digikam-2.6.0~rc.orig/extra/kipi-plugins/sendimages/settingswidget.cpp	2012-05-09 22:52:34.000000000 +1000
++++ digikam-2.6.0~rc/extra/kipi-plugins/sendimages/settingswidget.cpp	2012-06-02 15:07:25.000000000 +1000
+@@ -98,6 +98,7 @@
+     d->mailAgentName->insertItem(EmailSettings::SYLPHEED,      "Sylpheed");
+     d->mailAgentName->insertItem(EmailSettings::SYLPHEEDCLAWS, "Sylpheed-Claws");
+     d->mailAgentName->insertItem(EmailSettings::THUNDERBIRD,   "Thunderbird");
++    d->mailAgentName->insertItem(EmailSettings::ICEDOVE,       "Icedove");
+     d->mailAgentName->setCurrentIndex(EmailSettings::DEFAULT);
+     d->mailAgentName->setWhatsThis(i18n("Select your preferred external email program here. "
+                                         "<b>Default</b> is the current email program set in KDE "

Added: kde-extras/digikam/trunk/debian/patches/series
===================================================================
--- kde-extras/digikam/trunk/debian/patches/series	                        (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/series	2012-06-02 05:14:43 UTC (rev 19233)
@@ -0,0 +1,2 @@
+dngconverter_BYTE_ORDER.diff
+sendimages-icedove.diff