Accepting request 208191 from graphics

- Backported patch for colord compilation without squish
  0001-Allow-compilation-with-colord-and-without-squish.patch (forwarded request 208190 from toganm)

OBS-URL: https://build.opensuse.org/request/show/208191
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/darktable?expand=0&rev=36

0001-Allow-compilation-with-colord-and-without-squish.patch

@@ -0,0 +1,41 @@
+From f1604c556506fcfc0ae6c9c8fa21fb8c6a990d18 Mon Sep 17 00:00:00 2001
+From: Tobias Ellinghaus <me@houz.org>
+Date: Sun, 24 Nov 2013 16:17:06 +0100
+Subject: [PATCH] Allow compilation with colord and without squish
+
+Signed-off-by: Togan Muftuoglu <toganm@users.sourceforge.net>
+---
+ src/CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index a82c4ad..d7ed303 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -470,8 +470,6 @@ else(USE_GEO)
+   message(STATUS "Map mode: disabled")
+ endif(USE_GEO)
+ 
+-target_link_libraries(lib_darktable ${LIBS})
+-
+ # libcolord-gtk:
+ if(USE_COLORD)
+   find_package(Colord)
+@@ -496,11 +494,13 @@ if(USE_SQUISH)
+ add_dependencies(lib_darktable squish)
+ add_library(squish_static STATIC IMPORTED)
+ set_target_properties(squish_static PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/external/squish/libsquish.a)
+-target_link_libraries(lib_darktable ${LIBS} squish_static)
++target_link_libraries(lib_darktable squish_static)
+ add_subdirectory(external/squish)
+ add_definitions("-DHAVE_SQUISH")
+ endif(USE_SQUISH)
+ 
++target_link_libraries(lib_darktable ${LIBS})
++
+ install(TARGETS lib_darktable DESTINATION ${LIB_INSTALL}/darktable)
+ # make sure static libs is first
+ list(INSERT LIBS 0 lib_darktable ${STATIC_LIBS})
+-- 
+1.8.4.3
+

darktable.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Nov 24 17:40:52 UTC 2013 - toganm@opensuse.org
+
+- Backported patch for colord compilation without squish
+  0001-Allow-compilation-with-colord-and-without-squish.patch 
+
 -------------------------------------------------------------------
 Tue Sep 10 19:28:34 UTC 2013 - toganm@opensuse.org
 

darktable.spec

@@ -28,8 +28,13 @@ Url:            http://darktable.sourceforge.net
 # ./generate-tarball.sh 
 Source0:        %name-%version-nopatents.tar.xz
 Source1:        http://sourceforge.net/projects/darktable/files/darktable/1.2/darktable-usermanual.pdf
+# PATCH-FIX-UPSTREAM backported from git enable colord even without squish
+Patch0:         0001-Allow-compilation-with-colord-and-without-squish.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
 BuildRequires:  cmake
+BuildRequires:  libcolord-devel
 BuildRequires:  dbus-1-glib-devel
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -92,6 +97,7 @@ This package provides the user manual in pdf format
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 chmod -x tools/create_control_svg.sh tools/purge_non_existing_images.sh
@@ -109,7 +115,7 @@ cmake \
         -DCMAKE_BUILD_TYPE=Release \
         -DBINARY_PACKAGE_BUILD=1  \
         -DUSE_XMLLINT=OFF \
-        -DUSE_SQUISH=OFF -DUSE_COLORD=OFF \
+        -DUSE_SQUISH=OFF -DUSE_COLORD=ON \
         -DINSTALL_IOP_EXPERIMENTAL=On  ..
 %__make %{_smp_mflags} VERBOSE=1