[digikam] fix build with old libkipi

nucleo nucleo at fedoraproject.org
Tue Jan 3 15:31:25 UTC 2012


commit 6a87049f46099b297713c57e7993a438c144a3bc
Author: nucleo <nucleo at fedoraproject.org>
Date:   Tue Jan 3 17:31:20 2012 +0200

    fix build with old libkipi

 digikam-2.5.0-libkipi-1.4.0.patch |   68 +++++++++++++++++++++++++++++++++++++
 digikam.spec                      |    5 +++
 2 files changed, 73 insertions(+), 0 deletions(-)
---
diff --git a/digikam-2.5.0-libkipi-1.4.0.patch b/digikam-2.5.0-libkipi-1.4.0.patch
new file mode 100644
index 0000000..d44c12c
--- /dev/null
+++ b/digikam-2.5.0-libkipi-1.4.0.patch
@@ -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
+
+diff --git a/utilities/setup/setupplugins.cpp b/utilities/setup/setupplugins.cpp
+index 0f4030a..b8efb35 100644
+--- a/utilities/setup/setupplugins.cpp
++++ b/utilities/setup/setupplugins.cpp
+@@ -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 @@ SetupPlugins::SetupPlugins(QWidget* parent)
+ 
+     panel->setLayout(mainLayout);
+ 
++#if KIPI_VERSION < 0x010400
++    d->checkAllBtn->setVisible(false);
++    d->clearBtn->setVisible(false);
++#endif
++
+     initPlugins();
+ 
+     // --------------------------------------------------------
+@@ -158,14 +163,18 @@ void SetupPlugins::applyPlugins()
+ 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();
+ }
+ 
+diff --git a/utilities/setup/setupplugins.h b/utilities/setup/setupplugins.h
+index 271a569..114e0fa 100644
+--- a/utilities/setup/setupplugins.h
++++ b/utilities/setup/setupplugins.h
+@@ -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
diff --git a/digikam.spec b/digikam.spec
index 78023db..b2f23ef 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -24,6 +24,8 @@ Patch0: digikam-2.5.0-clapack-atlas.patch
 Patch50: digikam-2.4.1-dngconverter_hicolor_icons.patch
 
 ## upstream patches
+# http://commits.kde.org/digikam/25cc9c9876a5233bd630105d0110319892d4e18c
+Patch100: digikam-2.5.0-libkipi-1.4.0.patch
 
 # for clapack, see also the clapack-atlas patch
 BuildRequires: atlas-devel
@@ -202,6 +204,9 @@ mv extra/kipi-plugins/dngconverter/icons/oxygen \
    extra/kipi-plugins/dngconverter/icons/hicolor
 %patch50 -p1 -b .dngconverter_hicolor_icons
 
+pushd core
+%patch100 -p1 -b .libkipi-1.4.0
+popd
 
 %build
 


More information about the scm-commits mailing list