diff --git a/FindMarbleWidget.cmake b/FindMarbleWidget.cmake new file mode 100644 index 0000000..a50c724 --- /dev/null +++ b/FindMarbleWidget.cmake @@ -0,0 +1,42 @@ +# - Try to find marblewidget library +# Once done this will define +# +# MARBLEWIDGET_FOUND - system has MARBLEWIDGET library +# LIBMARBLEWIDGET_INCLUDE_DIR - the LIBMARBLEWIDGET include directory +# LIBMARBLEWIDGET_LIBRARY - the marblewidget library +# +# copyright 2008 by Patrick Spendrin +# use this file as you like +# + +if(LIBMARBLEWIDGET_INCLUDE_DIR AND LIBMARBLEWIDGET_LIBRARY) + + # Already in cache + set(MARBLEWIDGET_FOUND TRUE) + +else(LIBMARBLEWIDGET_INCLUDE_DIR AND LIBMARBLEWIDGET_LIBRARY) + find_path(LIBMARBLEWIDGET_INCLUDE_DIR Quaternion.h PATH_SUFFIXES marble) + + if (WIN32 AND CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) + set (LIBRARY_NAME marblewidgetd) + else(WIN32 AND CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) + set (LIBRARY_NAME marblewidget) + endif (WIN32 AND CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) + find_library(LIBMARBLEWIDGET_LIBRARY ${LIBRARY_NAME}) + + if(LIBMARBLEWIDGET_INCLUDE_DIR AND LIBMARBLEWIDGET_LIBRARY) + set(MARBLEWIDGET_FOUND TRUE) + endif(LIBMARBLEWIDGET_INCLUDE_DIR AND LIBMARBLEWIDGET_LIBRARY) + + if(MARBLEWIDGET_FOUND) + if (NOT MARBLEWIDGET_FIND_QUIETLY) + message(STATUS "Found Marble: ${LIBMARBLEWIDGET_LIBRARY}") + endif (NOT MARBLEWIDGET_FIND_QUIETLY) + else(MARBLEWIDGET_FOUND) + if(MARBLEWIDGET_FIND_REQUIRED) + message(FATAL_ERROR "Could NOT find any Marble library") + endif(MARBLEWIDGET_FIND_REQUIRED) + endif(MARBLEWIDGET_FOUND) + + mark_as_advanced(LIBMARBLEWIDGET_INCLUDE_DIR LIBMARBLEWIDGET_LIBRARY) +endif(LIBMARBLEWIDGET_INCLUDE_DIR AND LIBMARBLEWIDGET_LIBRARY) diff --git a/digikam-1.8.0-libjpeg_version-3.patch b/digikam-1.8.0-libjpeg_version-3.patch deleted file mode 100644 index 1e2c590..0000000 --- a/digikam-1.8.0-libjpeg_version-3.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up digikam-1.8.0/CMakeLists.txt.libjpeg_version digikam-1.8.0/CMakeLists.txt ---- digikam-1.8.0/CMakeLists.txt.libjpeg_version 2011-01-23 13:33:57.000000000 -0600 -+++ digikam-1.8.0/CMakeLists.txt 2011-02-04 12:17:54.102537201 -0600 -@@ -154,6 +154,7 @@ ENDIF(NOT APPLE) - # Extract version of libjpeg so that we can use the appropriate dir - # See bug #227313, #228483 - FILE(READ "${JPEG_INCLUDE_DIR}/jpeglib.h" jpeglib_h_content) -+FILE(READ "${JPEG_INCLUDE_DIR}/jconfig.h" jpeglib_h_content) - STRING(REGEX REPLACE ".*#define +JPEG_LIB_VERSION +([0-9]+).*" "\\1" jpeglib_version "${jpeglib_h_content}") - MESSAGE(STATUS "Identified libjpeg version: ${jpeglib_version}") - diff --git a/digikam-1.8.0-libjpeg_version.patch b/digikam-1.8.0-libjpeg_version.patch deleted file mode 100644 index 344dcaa..0000000 --- a/digikam-1.8.0-libjpeg_version.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up digikam-1.8.0/CMakeLists.txt.libjpeg_version digikam-1.8.0/CMakeLists.txt ---- digikam-1.8.0/CMakeLists.txt.libjpeg_version 2011-01-23 13:33:57.000000000 -0600 -+++ digikam-1.8.0/CMakeLists.txt 2011-02-03 13:37:16.546888612 -0600 -@@ -151,17 +151,8 @@ ELSE(NOT APPLE) - SET(CLAPACK_FOUND FALSE) - ENDIF(NOT APPLE) - --# Extract version of libjpeg so that we can use the appropriate dir --# See bug #227313, #228483 --FILE(READ "${JPEG_INCLUDE_DIR}/jpeglib.h" jpeglib_h_content) --STRING(REGEX REPLACE ".*#define +JPEG_LIB_VERSION +([0-9]+).*" "\\1" jpeglib_version "${jpeglib_h_content}") --MESSAGE(STATUS "Identified libjpeg version: ${jpeglib_version}") -- --IF ("${jpeglib_version}" LESS 80) -- SET(DIGIKAM_LIBJPEG_DIR libjpeg-62) --ELSE ("${jpeglib_version}" LESS 80) -- SET(DIGIKAM_LIBJPEG_DIR libjpeg-80) --ENDIF ("${jpeglib_version}" LESS 80) -+# hardcode libjpeg version to 62 -+SET(DIGIKAM_LIBJPEG_DIR libjpeg-62) - - # Check KDcraw version installed to compile fine. - IF(NOT WIN32) diff --git a/digikam-1.9.0-marble.patch b/digikam-1.9.0-marble.patch new file mode 100644 index 0000000..f4dc607 --- /dev/null +++ b/digikam-1.9.0-marble.patch @@ -0,0 +1,22 @@ +diff -up digikam-1.9.0/CMakeLists.txt.marble digikam-1.9.0/CMakeLists.txt +--- digikam-1.9.0/CMakeLists.txt.marble 2011-08-08 14:01:07.651933241 -0500 ++++ digikam-1.9.0/CMakeLists.txt 2011-08-08 14:06:09.382210824 -0500 +@@ -222,8 +222,18 @@ MACRO_BOOL_TO_01(KDEPIMLIBS_FOUND HAVE_K + SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} ) + + # Check MarbleWidget library for geolocation. ++# Special handling for Marble: support both FindMarbleWidget and FindMarble, + MACRO_OPTIONAL_FIND_PACKAGE(MarbleWidget) + MACRO_BOOL_TO_01(MARBLEWIDGET_FOUND HAVE_MARBLEWIDGET) ++IF (NOT MARBLEWIDGET_FOUND) ++ MACRO_OPTIONAL_FIND_PACKAGE(Marble) ++ MACRO_BOOL_TO_01(MARBLE_FOUND HAVE_MARBLEWIDGET) ++ IF (MARBLE_FOUND) ++ SET(MARBLEWIDGET_FOUND TRUE) ++ SET(LIBMARBLEWIDGET_INCLUDE_DIR ${MARBLE_INCLUDE_DIR}) ++ SET(LIBMARBLEWIDGET_LIBRARY ${MARBLE_LIBRARIES}) ++ ENDIF (MARBLE_FOUND) ++ENDIF (NOT MARBLEWIDGET_FOUND) + IF (MARBLEWIDGET_FOUND) + INCLUDE(libs/imageproperties/markerclusterholderplugin/CheckPluginBuildable.cmake) + ENDIF (MARBLEWIDGET_FOUND) diff --git a/digikam.spec b/digikam.spec index be8d2a0..bfdd597 100644 --- a/digikam.spec +++ b/digikam.spec @@ -1,7 +1,7 @@ Name: digikam Version: 1.9.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A digital camera accessing & photo management application Group: Applications/Multimedia @@ -17,10 +17,12 @@ Source1: digikam-import.desktop ## upstreamable patches Patch50: digikam-1.4.0_marble_plugin_rpath.patch # fix for libjpeg-turbo, see https://bugs.kde.org/show_bug.cgi?id=265431 -# hardcode libjpeg-62 -Patch51: digikam-1.8.0-libjpeg_version.patch # use try-compile test Patch52: digikam-1.8.0-libjpeg_version-2.patch +# fix build with newer marble +Patch53: digikam-1.9.0-marble.patch +# in case patch53 doesn't work, here's FindMarbleWidget.cmake from kdeedu-4.6.3 +Source100: FindMarbleWidget.cmake ## upstream patches @@ -89,6 +91,8 @@ needed to develop applications using %{name}. %patch50 -p1 -b .marble_plugin_rpath %patch52 -p1 -b .libjpeg_version +%patch53 -p1 -b .marble +#install -p %{SOURCE100} cmake/modules/ %build @@ -172,6 +176,11 @@ rm -rf %{buildroot} %changelog +* Mon Aug 08 2011 Rex Dieter 1.9.0-2 +- digikam-1.9.0-1.fc15.i686 does not work with Qt-4.7.3 (#726873) +- fix FTBFS against kdeedu >= 4.6.4 (#715079) +- drop unused patches + * Thu Mar 17 2011 Rex Dieter 1.9.0-1 - 1.9.0