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

[Steven Michael Robbins]

Author: smr
Date: 2016-08-11 05:43:50 +0000 (Thu, 11 Aug 2016)
New Revision: 20632

Added:
   kde-extras/digikam/trunk/debian/patches/cmake-fix-doc-translated.patch
   kde-extras/digikam/trunk/debian/patches/upstream-gcc6-fix.patch
Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/patches/series
Log:
Patches to fix doc-translated and 32-bit build.

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2016-08-11 05:21:29 UTC (rev 20631)
+++ kde-extras/digikam/trunk/debian/changelog	2016-08-11 05:43:50 UTC (rev 20632)
@@ -4,8 +4,9 @@
     - Add NEWS.Debian to describe configuration migration.
   * Update patches.
     - cmake-disable-doc-translated-showfoto.patch: Remove.
+    - upstream-gcc6-fix.patch: New.  GCC 6.1/32bit fix from upstream git.
 
- -- Steve M. Robbins <smr at debian.org>  Wed, 10 Aug 2016 22:56:38 -0500
+ -- Steve M. Robbins <smr at debian.org>  Thu, 11 Aug 2016 00:42:31 -0500
 
 digikam (4:5.0.0-1) experimental; urgency=medium
 

Added: kde-extras/digikam/trunk/debian/patches/cmake-fix-doc-translated.patch
===================================================================
--- kde-extras/digikam/trunk/debian/patches/cmake-fix-doc-translated.patch	                        (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/cmake-fix-doc-translated.patch	2016-08-11 05:43:50 UTC (rev 20632)
@@ -0,0 +1,42 @@
+--- digikam-5.1.0.orig/doc-translated/digikam/it/CMakeLists.txt
++++ digikam-5.1.0/doc-translated/digikam/it/CMakeLists.txt
+@@ -1 +1,2 @@
+-KDOCTOOLS_CREATE_HANDBOOK( showfoto/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/it/ SUBDIR digikam )
+\ No newline at end of file
++KDOCTOOLS_CREATE_HANDBOOK( digikam/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/it/ SUBDIR digikam )
++KDOCTOOLS_CREATE_HANDBOOK( showfoto/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/it/ SUBDIR showfoto )
+--- digikam-5.1.0.orig/doc-translated/digikam/nl/CMakeLists.txt
++++ digikam-5.1.0/doc-translated/digikam/nl/CMakeLists.txt
+@@ -1 +1,2 @@
+-KDOCTOOLS_CREATE_HANDBOOK( showfoto/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/nl/ SUBDIR digikam )
+\ No newline at end of file
++KDOCTOOLS_CREATE_HANDBOOK( digikam/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/nl/ SUBDIR digikam )
++KDOCTOOLS_CREATE_HANDBOOK( showfoto/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/nl/ SUBDIR showfoto )
+--- digikam-5.1.0.orig/doc-translated/digikam/pt/CMakeLists.txt
++++ digikam-5.1.0/doc-translated/digikam/pt/CMakeLists.txt
+@@ -1 +1,2 @@
+-KDOCTOOLS_CREATE_HANDBOOK( showfoto/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/pt/ SUBDIR digikam )
+\ No newline at end of file
++KDOCTOOLS_CREATE_HANDBOOK( digikam/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/pt/ SUBDIR digikam )
++KDOCTOOLS_CREATE_HANDBOOK( showfoto/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/pt/ SUBDIR showfoto )
+--- digikam-5.1.0.orig/doc-translated/digikam/pt_BR/CMakeLists.txt
++++ digikam-5.1.0/doc-translated/digikam/pt_BR/CMakeLists.txt
+@@ -1 +1,2 @@
+-KDOCTOOLS_CREATE_HANDBOOK( showfoto/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/pt_BR/ SUBDIR digikam )
+\ No newline at end of file
++KDOCTOOLS_CREATE_HANDBOOK( digikam/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/pt_BR/ SUBDIR digikam )
++KDOCTOOLS_CREATE_HANDBOOK( showfoto/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/pt_BR/ SUBDIR showfoto )
+--- digikam-5.1.0.orig/doc-translated/digikam/sv/CMakeLists.txt
++++ digikam-5.1.0/doc-translated/digikam/sv/CMakeLists.txt
+@@ -1 +1,2 @@
+-KDOCTOOLS_CREATE_HANDBOOK( showfoto/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/sv/ SUBDIR digikam )
+\ No newline at end of file
++KDOCTOOLS_CREATE_HANDBOOK( digikam/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/sv/ SUBDIR digikam )
++KDOCTOOLS_CREATE_HANDBOOK( showfoto/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/sv/ SUBDIR showfoto )
+--- digikam-5.1.0.orig/doc-translated/digikam/uk/CMakeLists.txt
++++ digikam-5.1.0/doc-translated/digikam/uk/CMakeLists.txt
+@@ -1 +1,2 @@
+-KDOCTOOLS_CREATE_HANDBOOK( showfoto/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/uk/ SUBDIR digikam )
+\ No newline at end of file
++KDOCTOOLS_CREATE_HANDBOOK( digikam/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/uk/ SUBDIR digikam )
++KDOCTOOLS_CREATE_HANDBOOK( showfoto/index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/uk/ SUBDIR showfoto )

Modified: kde-extras/digikam/trunk/debian/patches/series
===================================================================
--- kde-extras/digikam/trunk/debian/patches/series	2016-08-11 05:21:29 UTC (rev 20631)
+++ kde-extras/digikam/trunk/debian/patches/series	2016-08-11 05:43:50 UTC (rev 20632)
@@ -1 +1,3 @@
 cmake-disable-jasper.patch
+cmake-fix-doc-translated.patch
+upstream-gcc6-fix.patch

Added: kde-extras/digikam/trunk/debian/patches/upstream-gcc6-fix.patch
===================================================================
--- kde-extras/digikam/trunk/debian/patches/upstream-gcc6-fix.patch	                        (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/upstream-gcc6-fix.patch	2016-08-11 05:43:50 UTC (rev 20632)
@@ -0,0 +1,41 @@
+From: Gilles Caulier <caulier.gilles at gmail.com>
+Date: Tue, 09 Aug 2016 18:41:17 +0000
+Subject: apply patch #100514 to fix broken compilation under 32 bits platform with GCC 6.1
+X-Git-Url: http://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=067a88d8c84a5149469961d54b1d5c93df6a3167
+---
+apply patch #100514 to fix broken compilation under 32 bits platform with GCC 6.1
+BUGS: 366542
+FIXED-IN: 5.2.0
+---
+
+
+--- a/core/libs/rawengine/libraw/libraw/libraw_types.h
++++ b/core/libs/rawengine/libraw/libraw/libraw_types.h
+@@ -612,10 +612,10 @@
+ #elif defined(__INTEL__)
+ #define LibRawBigEndian 0
+ 
+-#elif defined(_M_IX86)
++#elif defined(_M_IX86) || defined(__i386__)
+ #define LibRawBigEndian 0
+ 
+-#elif defined(_M_X64) || defined(__amd64__)
++#elif defined(_M_X64) || defined(__amd64__) || defined(__x86_64__)
+ #define LibRawBigEndian 0
+ 
+ #elif defined(__LITTLE_ENDIAN__)
+@@ -625,6 +625,13 @@
+ #define LibRawBigEndian 1
+ #elif defined(_ARM_)
+ #define LibRawBigEndian 0
++
++#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
++#define LibRawBigEndian 0
++
++#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
++#define LibRawBigEndian 1
++
+ #else
+ #ifndef qXCodeRez
+ #error Unable to figure out byte order.
+