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

Wed Jan 4 06:14:18 UTC 2012

Author: msp
Date: 2012-01-04 06:14:17 +0000 (Wed, 04 Jan 2012)
New Revision: 19042

Added:
   kde-extras/digikam/trunk/debian/patches/changeset_r25cc9c9876a5233bd630105d0110319892d4e18c.diff
Removed:
   kde-extras/digikam/trunk/debian/patches/bashim-fix
   kde-extras/digikam/trunk/debian/patches/link_qjson.diff
Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/patches/highgui_c.h
   kde-extras/digikam/trunk/debian/patches/series
   kde-extras/digikam/trunk/debian/rules
Log:
* Fix "Please build with --as-needed to avoid unneccessary
  dependencies" Patch from Daniel Schall (Closes: #653590)
* Drop patches/bashim-fix - included upstream
* Drop patches/link_qjson.diff - fixed upstream
* Refresh patches/highgui_c.h
* Add changeset_r25cc9c9876a5233bd630105d0110319892d4e18c.diff
  upstream fixes FTBFS
* dh_install -Xmultithread - drop development file

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================

--- kde-extras/digikam/trunk/debian/changelog	2012-01-03 23:45:21 UTC (rev 19041)
+++ kde-extras/digikam/trunk/debian/changelog	2012-01-04 06:14:17 UTC (rev 19042)
@@ -1,8 +1,16 @@
 digikam (4:2.5.0-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * Fix "Please build with --as-needed to avoid unneccessary
+    dependencies" Patch from Daniel Schall (Closes: #653590)
+  * Drop patches/bashim-fix - included upstream
+  * Drop patches/link_qjson.diff - fixed upstream
+  * Refresh patches/highgui_c.h
+  * Add changeset_r25cc9c9876a5233bd630105d0110319892d4e18c.diff
+    upstream fixes FTBFS
+  * dh_install -Xmultithread - drop development file
 
- -- Mark Purcell <msp at debian.org>  Wed, 04 Jan 2012 10:44:49 +1100
+ -- Mark Purcell <msp at debian.org>  Wed, 04 Jan 2012 16:07:09 +1100
 
 digikam (4:2.4.1-1) experimental; urgency=low
 

Added: kde-extras/digikam/trunk/debian/patches/changeset_r25cc9c9876a5233bd630105d0110319892d4e18c.diff
===================================================================
--- kde-extras/digikam/trunk/debian/patches/changeset_r25cc9c9876a5233bd630105d0110319892d4e18c.diff	                        (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/changeset_r25cc9c9876a5233bd630105d0110319892d4e18c.diff	2012-01-04 06:14:17 UTC (rev 19042)
@@ -0,0 +1,68 @@
+commit 25cc9c9876a5233bd630105d0110319892d4e18c
+Author: Gilles Caulier <caulier.gilles at gmail.com>
+Date:   Tue Jan 3 15:16:37 2012 +0100
+
+    enable checkall and clearall buttons only with libkipi version 1.4.0
+    BUGS: 290496
+
+Index: digikam-2.5.0/core/utilities/setup/setupplugins.cpp
+===================================================================
+--- digikam-2.5.0.orig/core/utilities/setup/setupplugins.cpp	2012-01-03 11:32:01.000000000 +1100
++++ digikam-2.5.0/core/utilities/setup/setupplugins.cpp	2012-01-04 13:44:29.000000000 +1100
+@@ -6,8 +6,8 @@
+  * Date        : 2004-01-02
+  * Description : setup Kipi plugins tab.
+  *
+- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
+- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
++ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
++ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
+  *
+  * This program is free software; you can redistribute it
+  * and/or modify it under the terms of the GNU General
+@@ -100,6 +100,11 @@
+ 
+     panel->setLayout(mainLayout);
+ 
++#if KIPI_VERSION < 0x010400
++    d->checkAllBtn->setVisible(false);
++    d->clearBtn->setVisible(false);
++#endif
++
+     initPlugins();
+ 
+     // --------------------------------------------------------
+@@ -158,14 +163,18 @@
+ void SetupPlugins::slotCheckAll()
+ {
+     QApplication::setOverrideCursor(Qt::WaitCursor);
++#if KIPI_VERSION >= 0x010400
+     d->kipiConfig->slotCheckAll();
++#endif
+     QApplication::restoreOverrideCursor();
+ }
+ 
+ void SetupPlugins::slotClear()
+ {
+     QApplication::setOverrideCursor(Qt::WaitCursor);
++#if KIPI_VERSION >= 0x010400
+     d->kipiConfig->slotClear();
++#endif
+     QApplication::restoreOverrideCursor();
+ }
+ }  // namespace Digikam
+Index: digikam-2.5.0/core/utilities/setup/setupplugins.h
+===================================================================
+--- digikam-2.5.0.orig/core/utilities/setup/setupplugins.h	2012-01-03 11:32:01.000000000 +1100
++++ digikam-2.5.0/core/utilities/setup/setupplugins.h	2012-01-04 13:44:29.000000000 +1100
+@@ -6,8 +6,8 @@
+  * Date        : 2004-01-02
+  * Description : setup Kipi plugins tab.
+  *
+- * Copyright (C) 2004-2011 by Gilles Caulier <caulier dot gilles at gmail dot com>
+- * Copyright (C) 2011 by Andi Clemens <andi dot clemens at googlemail dot com>
++ * Copyright (C) 2004-2012 by Gilles Caulier <caulier dot gilles at gmail dot com>
++ * Copyright (C) 2011-2012 by Andi Clemens <andi dot clemens at googlemail dot com>
+  *
+  * This program is free software; you can redistribute it
+  * and/or modify it under the terms of the GNU General

Modified: kde-extras/digikam/trunk/debian/patches/highgui_c.h
===================================================================
--- kde-extras/digikam/trunk/debian/patches/highgui_c.h	2012-01-03 23:45:21 UTC (rev 19041)
+++ kde-extras/digikam/trunk/debian/patches/highgui_c.h	2012-01-04 06:14:17 UTC (rev 19042)
@@ -1,5 +1,9 @@
---- digikam-2.0.0.orig/extra/kipi-plugins/removeredeyes/detection/locators/haarclassifier/haarclassifierlocator.h
-+++ digikam-2.0.0/extra/kipi-plugins/removeredeyes/detection/locators/haarclassifier/haarclassifierlocator.h
+# https://bugs.kde.org/show_bug.cgi?id=288462
+#
+Index: digikam-2.5.0/extra/kipi-plugins/removeredeyes/detection/locators/haarclassifier/haarclassifierlocator.h
+===================================================================
+--- digikam-2.5.0.orig/extra/kipi-plugins/removeredeyes/detection/locators/haarclassifier/haarclassifierlocator.h	2012-01-03 11:31:38.000000000 +1100
++++ digikam-2.5.0/extra/kipi-plugins/removeredeyes/detection/locators/haarclassifier/haarclassifierlocator.h	2012-01-04 11:09:35.000000000 +1100
 @@ -34,7 +34,7 @@
  #include <highgui.h>
  #else
@@ -9,8 +13,10 @@
  #endif
  
  // Local includes
---- digikam-2.0.0.orig/extra/libkface/libkface/image.cpp
-+++ digikam-2.0.0/extra/libkface/libkface/image.cpp
+Index: digikam-2.5.0/extra/libkface/libkface/image.cpp
+===================================================================
+--- digikam-2.5.0.orig/extra/libkface/libkface/image.cpp	2012-01-03 11:31:50.000000000 +1100
++++ digikam-2.5.0/extra/libkface/libkface/image.cpp	2012-01-04 11:09:35.000000000 +1100
 @@ -37,7 +37,7 @@
  
  #include <opencv/cv.h>
@@ -20,10 +26,12 @@
  
  // Libface includes
  
---- digikam-2.0.0.orig/extra/libkface/libkface/kfaceutils.cpp
-+++ digikam-2.0.0/extra/libkface/libkface/kfaceutils.cpp
+Index: digikam-2.5.0/extra/libkface/libkface/kfaceutils.cpp
+===================================================================
+--- digikam-2.5.0.orig/extra/libkface/libkface/kfaceutils.cpp	2012-01-03 11:31:50.000000000 +1100
++++ digikam-2.5.0/extra/libkface/libkface/kfaceutils.cpp	2012-01-04 11:09:35.000000000 +1100
 @@ -45,7 +45,7 @@
- // OpenCV includes.
+ // OpenCV includes
  
  #include <opencv/cxcore.h>
 -#include <opencv/highgui.h>
@@ -31,8 +39,10 @@
  
  namespace KFaceIface
  {
---- digikam-2.0.0.orig/extra/libkface/libface/Haarcascades.cpp
-+++ digikam-2.0.0/extra/libkface/libface/Haarcascades.cpp
+Index: digikam-2.5.0/extra/libkface/libface/Haarcascades.cpp
+===================================================================
+--- digikam-2.5.0.orig/extra/libkface/libface/Haarcascades.cpp	2012-01-03 11:31:50.000000000 +1100
++++ digikam-2.5.0/extra/libkface/libface/Haarcascades.cpp	2012-01-04 11:09:35.000000000 +1100
 @@ -43,7 +43,7 @@
  #include <highgui.h>
  #else
@@ -42,8 +52,10 @@
  #endif
  
  #include "Haarcascades.h"
---- digikam-2.0.0.orig/extra/libkface/libface/LibFaceUtils.h
-+++ digikam-2.0.0/extra/libkface/libface/LibFaceUtils.h
+Index: digikam-2.5.0/extra/libkface/libface/LibFaceUtils.h
+===================================================================
+--- digikam-2.5.0.orig/extra/libkface/libface/LibFaceUtils.h	2012-01-03 11:31:50.000000000 +1100
++++ digikam-2.5.0/extra/libkface/libface/LibFaceUtils.h	2012-01-04 11:09:35.000000000 +1100
 @@ -38,7 +38,7 @@
  #include <cxcore.h>
  #include <cv.h>
@@ -53,8 +65,10 @@
  #include <opencv/cxcore.h>
  #include <opencv/cv.h>
  #endif
---- digikam-2.0.0.orig/extra/libkface/libface/FaceDetect.cpp
-+++ digikam-2.0.0/extra/libkface/libface/FaceDetect.cpp
+Index: digikam-2.5.0/extra/libkface/libface/FaceDetect.cpp
+===================================================================
+--- digikam-2.5.0.orig/extra/libkface/libface/FaceDetect.cpp	2012-01-03 11:31:50.000000000 +1100
++++ digikam-2.5.0/extra/libkface/libface/FaceDetect.cpp	2012-01-04 11:09:35.000000000 +1100
 @@ -40,7 +40,7 @@
  #include <highgui.h>
  #else

Modified: kde-extras/digikam/trunk/debian/patches/series
===================================================================
--- kde-extras/digikam/trunk/debian/patches/series	2012-01-03 23:45:21 UTC (rev 19041)
+++ kde-extras/digikam/trunk/debian/patches/series	2012-01-04 06:14:17 UTC (rev 19042)
@@ -1,3 +1,2 @@
-link_qjson.diff
-bashim-fix
 highgui_c.h
+changeset_r25cc9c9876a5233bd630105d0110319892d4e18c.diff

Modified: kde-extras/digikam/trunk/debian/rules
===================================================================
--- kde-extras/digikam/trunk/debian/rules	2012-01-03 23:45:21 UTC (rev 19041)
+++ kde-extras/digikam/trunk/debian/rules	2012-01-04 06:14:17 UTC (rev 19042)
@@ -3,12 +3,15 @@
 %:
 	dh $@ --with kde --parallel 
 
+override_dh_auto_configure:
+	LDFLAGS="$(LDFLAGS) -Wl,--as-needed" dh_auto_configure --buildsystem=kde
+
 override_dh_installchangelogs:
 	dh_installchangelogs core/ChangeLog 
 
 # conflicts with oxygen-icon-theme package
 override_dh_install:
-	dh_install -Xoxygen -XREADME.MACOSX --fail-missing
+	dh_install -Xmultithread -Xoxygen -XREADME.MACOSX --fail-missing
 
 override_dh_strip:
 	dh_strip -a --dbg-package=digikam-dbg


