915b8ac7a9
Update to 4.4.0 OBS-URL: https://build.opensuse.org/request/show/256860 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=128
81 lines
3.1 KiB
Diff
81 lines
3.1 KiB
Diff
diff -U 3 -H -d -r -N -- digikam-4.4.0.orig/core/CMakeLists.txt digikam-4.4.0/core/CMakeLists.txt
|
|
--- digikam-4.4.0.orig/core/CMakeLists.txt 2014-10-08 14:32:43.000000000 +0200
|
|
+++ digikam-4.4.0/core/CMakeLists.txt 2014-10-12 15:05:05.917642046 +0200
|
|
@@ -115,21 +115,23 @@
|
|
|
|
# check the libkdcraw version
|
|
|
|
+# Check is done by FindKdcraw.cmake in another way - this way does not seem valid any more
|
|
+# TODO: find a proper fix
|
|
SET(KDCRAW_MIN_VERSION "2.2.0")
|
|
|
|
-IF (KDCRAW_VERSION)
|
|
-
|
|
- MESSAGE(STATUS "libkdcraw: Found version ${KDCRAW_VERSION} (required: ${KDCRAW_MIN_VERSION})")
|
|
- IF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION})
|
|
- SET(KDCRAW_FOUND FALSE)
|
|
- ENDIF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION})
|
|
-
|
|
-ELSE (KDCRAW_VERSION)
|
|
-
|
|
- MESSAGE(WARNING "libkdcraw: Version information not found, your version is probably too old.")
|
|
- SET(KDCRAW_FOUND FALSE)
|
|
-
|
|
-ENDIF (KDCRAW_VERSION)
|
|
+# IF (KDCRAW_VERSION)
|
|
+#
|
|
+# MESSAGE(STATUS "libkdcraw: Found version ${KDCRAW_VERSION} (required: ${KDCRAW_MIN_VERSION})")
|
|
+# IF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION})
|
|
+# SET(KDCRAW_FOUND FALSE)
|
|
+# ENDIF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION})
|
|
+#
|
|
+# ELSE (KDCRAW_VERSION)
|
|
+#
|
|
+# MESSAGE(WARNING "libkdcraw: Version information not found, your version is probably too old.")
|
|
+# SET(KDCRAW_FOUND FALSE)
|
|
+#
|
|
+# ENDIF (KDCRAW_VERSION)
|
|
|
|
# LCMS version 1 and 2 library handling
|
|
# See bug #294105
|
|
diff -U 3 -H -d -r -N -- digikam-4.4.0.orig/extra/kipi-plugins/CMakeLists.txt digikam-4.4.0/extra/kipi-plugins/CMakeLists.txt
|
|
--- digikam-4.4.0.orig/extra/kipi-plugins/CMakeLists.txt 2014-10-08 14:33:05.000000000 +0200
|
|
+++ digikam-4.4.0/extra/kipi-plugins/CMakeLists.txt 2014-10-12 15:05:05.917642046 +0200
|
|
@@ -64,21 +64,23 @@
|
|
|
|
# Check the libkdcraw version
|
|
|
|
+# Check is done by FindKdcraw.cmake in another way - this way does not seem valid any more
|
|
+# TODO: find a proper fix
|
|
SET(KDCRAW_MIN_VERSION "2.2.0")
|
|
|
|
-IF (KDCRAW_VERSION)
|
|
-
|
|
- MESSAGE(STATUS "libkdcraw: Found version ${KDCRAW_VERSION} (required: ${KDCRAW_MIN_VERSION})")
|
|
- IF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION})
|
|
- SET(KDCRAW_FOUND FALSE)
|
|
- ENDIF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION})
|
|
-
|
|
-ELSE (KDCRAW_VERSION)
|
|
-
|
|
- MESSAGE(WARNING "libkdcraw: Version information not found, your version is probably too old.")
|
|
- SET(KDCRAW_FOUND FALSE)
|
|
-
|
|
-ENDIF (KDCRAW_VERSION)
|
|
+# IF (KDCRAW_VERSION)
|
|
+#
|
|
+# MESSAGE(STATUS "libkdcraw: Found version ${KDCRAW_VERSION} (required: ${KDCRAW_MIN_VERSION})")
|
|
+# IF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION})
|
|
+# SET(KDCRAW_FOUND FALSE)
|
|
+# ENDIF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION})
|
|
+#
|
|
+# ELSE (KDCRAW_VERSION)
|
|
+#
|
|
+# MESSAGE(WARNING "libkdcraw: Version information not found, your version is probably too old.")
|
|
+# SET(KDCRAW_FOUND FALSE)
|
|
+#
|
|
+# ENDIF (KDCRAW_VERSION)
|
|
|
|
# Optional dependencies detection required by some plugins
|
|
MACRO_OPTIONAL_FIND_PACKAGE(EXPAT) # For DNGConverter: XMP SDK need Expat library to compile.
|