Hello community, here is the log from the commit of package darktable for openSUSE:Factory checked in at 2013-11-25 16:02:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/darktable (Old) and /work/SRC/openSUSE:Factory/.darktable.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "darktable" Changes: -------- --- /work/SRC/openSUSE:Factory/darktable/darktable.changes 2013-09-11 12:51:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.darktable.new/darktable.changes 2013-11-25 16:02:12.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Nov 24 17:40:52 UTC 2013 - tog...@opensuse.org + +- Backported patch for colord compilation without squish + 0001-Allow-compilation-with-colord-and-without-squish.patch + +------------------------------------------------------------------- New: ---- 0001-Allow-compilation-with-colord-and-without-squish.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ darktable.spec ++++++ --- /var/tmp/diff_new_pack.dyi7UL/_old 2013-11-25 16:02:13.000000000 +0100 +++ /var/tmp/diff_new_pack.dyi7UL/_new 2013-11-25 16:02:13.000000000 +0100 @@ -28,8 +28,13 @@ # ./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 @@ %prep %setup -q +%patch0 -p1 chmod -x tools/create_control_svg.sh tools/purge_non_existing_images.sh @@ -109,7 +115,7 @@ -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 ++++++ 0001-Allow-compilation-with-colord-and-without-squish.patch ++++++ >From f1604c556506fcfc0ae6c9c8fa21fb8c6a990d18 Mon Sep 17 00:00:00 2001 From: Tobias Ellinghaus <m...@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 <tog...@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 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
