From 7de1a6a0746b7d5c480d6700ae74d6e0f2c0c5f4 Mon Sep 17 00:00:00 2001 From: Lluís Batlle i Rossell Date: Tue, 19 Jun 2012 17:42:08 +0000 Subject: Updating digikam to 2.6.0. It builds. svn path=/nixpkgs/trunk/; revision=34564 --- pkgs/applications/graphics/digikam/default.nix | 6 +- .../graphics/digikam/ftbfs-libkipi.patch | 68 ---------------------- .../digikam/libkvkontakte-not-topdir.patch | 33 ----------- 3 files changed, 2 insertions(+), 105 deletions(-) delete mode 100644 pkgs/applications/graphics/digikam/ftbfs-libkipi.patch delete mode 100644 pkgs/applications/graphics/digikam/libkvkontakte-not-topdir.patch (limited to 'pkgs/applications/graphics/digikam') diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 1c152195d68e..a293311e2a43 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -4,11 +4,11 @@ liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost shared_desktop_ontologies, marble, mysql }: stdenv.mkDerivation rec { - name = "digikam-2.5.0"; + name = "digikam-2.6.0"; src = fetchurl { url = "mirror://sourceforge/digikam/${name}.tar.bz2"; - sha256 = "06l52j8i45vyfj3b81ivifqsqdjlcj4g68d8w06c5lhzniwjqaam"; + sha256 = "1prnaywnbv0xpw6knqagzc4gn1vsj9kw2hvdasjwknc9ljiyl721"; }; buildNativeInputs = [ cmake automoc4 pkgconfig ]; @@ -20,8 +20,6 @@ stdenv.mkDerivation rec { # Make digikam find some FindXXXX.cmake KDEDIRS="${marble}:${qjson}"; - patches = [ ./libkvkontakte-not-topdir.patch ./ftbfs-libkipi.patch ]; - meta = { description = "Photo Management Program"; license = "GPL"; diff --git a/pkgs/applications/graphics/digikam/ftbfs-libkipi.patch b/pkgs/applications/graphics/digikam/ftbfs-libkipi.patch deleted file mode 100644 index cf7e77f7ef8a..000000000000 --- a/pkgs/applications/graphics/digikam/ftbfs-libkipi.patch +++ /dev/null @@ -1,68 +0,0 @@ -commit 25cc9c9876a5233bd630105d0110319892d4e18c -Author: Gilles Caulier -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/core/utilities/setup/setupplugins.cpp b/utilities/setup/setupplugins.cpp -index 0f4030a..b8efb35 100644 ---- a/core/utilities/setup/setupplugins.cpp -+++ b/core/utilities/setup/setupplugins.cpp -@@ -6,8 +6,8 @@ - * Date : 2004-01-02 - * Description : setup Kipi plugins tab. - * -- * Copyright (C) 2004-2011 by Gilles Caulier -- * Copyright (C) 2011 by Andi Clemens -+ * Copyright (C) 2004-2012 by Gilles Caulier -+ * Copyright (C) 2011-2012 by Andi Clemens - * - * 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/core/utilities/setup/setupplugins.h b/utilities/setup/setupplugins.h -index 271a569..114e0fa 100644 ---- a/core/utilities/setup/setupplugins.h -+++ b/core/utilities/setup/setupplugins.h -@@ -6,8 +6,8 @@ - * Date : 2004-01-02 - * Description : setup Kipi plugins tab. - * -- * Copyright (C) 2004-2011 by Gilles Caulier -- * Copyright (C) 2011 by Andi Clemens -+ * Copyright (C) 2004-2012 by Gilles Caulier -+ * Copyright (C) 2011-2012 by Andi Clemens - * - * This program is free software; you can redistribute it - * and/or modify it under the terms of the GNU General diff --git a/pkgs/applications/graphics/digikam/libkvkontakte-not-topdir.patch b/pkgs/applications/graphics/digikam/libkvkontakte-not-topdir.patch deleted file mode 100644 index ee92a886c79d..000000000000 --- a/pkgs/applications/graphics/digikam/libkvkontakte-not-topdir.patch +++ /dev/null @@ -1,33 +0,0 @@ -commit 0f0cfa14805519cfd9e0b97ee9668dc4f86379de -Author: Yury G. Kudryashov -Date: Wed Jan 18 05:07:13 2012 +0400 - - Use CMAKE_CURRENT_{SOURCE,BINARY}_DIR - - Some projects (e.g., digikam) include snapshots of this library into their - release tarballs, so the libkvkontakte_SOURCE_DIR != CMAKE_SOURCE_DIR. - -diff --git a/extra/libkvkontakte/CMakeLists.txt b/extra/libkvkontakte/CMakeLists.txt -index f19b28b..4310a74 100644 ---- a/extra/libkvkontakte/CMakeLists.txt -+++ b/extra/libkvkontakte/CMakeLists.txt -@@ -21,7 +21,7 @@ set(INCLUDE_INSTALL_DIR include ) - - - # === Closer to the code, close to the body === --set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") -+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") - find_package(KDE4 REQUIRED) - include(KDE4Defaults) - include(MacroLibrary) -@@ -35,8 +35,8 @@ macro_log_feature(QJSON_FOUND "QJSON" "Qt library for handling JSON data" "http: - add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) - - include_directories( -- ${CMAKE_SOURCE_DIR} -- ${CMAKE_BINARY_DIR} -+ ${CMAKE_CURRENT_SOURCE_DIR} -+ ${CMAKE_CURRENT_BINARY_DIR} - ${KDE4_INCLUDES} - ${QJSON_INCLUDE_DIR} - ) -- cgit 1.4.1