diff --git a/digikam-4.5.0-reenable-libs.patch b/digikam-4.5.0-reenable-libs.patch deleted file mode 100644 index 72d3ec6..0000000 --- a/digikam-4.5.0-reenable-libs.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -U 3 -H -d -r -N -- digikam-4.5.0/CMakeLists.txt digikam-4.5.0.reenable-libs/CMakeLists.txt ---- digikam-4.5.0/CMakeLists.txt 2014-11-22 02:32:49.000000000 +0100 -+++ digikam-4.5.0.reenable-libs/CMakeLists.txt 2014-11-22 02:35:30.463073062 +0100 -@@ -137,13 +137,13 @@ - set(KIPI_LOCAL_DIR extra/libkipi) - set(KEXIV2_LOCAL_DIR extra/libkexiv2) - set(KDCRAW_LOCAL_DIR extra/libkdcraw) -- set(KFACE_LOCAL_DIR extra/libkface) - set(KSANE_LOCAL_DIR extra/libksane) - - #from extragear/libs -- set(KGEOMAP_LOCAL_DIR extra/libkgeomap) -- set(MEDIAWIKI_LOCAL_DIR extra/libmediawiki) - endif() -+set(MEDIAWIKI_LOCAL_DIR extra/libmediawiki) -+set(KGEOMAP_LOCAL_DIR extra/libkgeomap) -+set(KFACE_LOCAL_DIR extra/libkface) - - add_subdirectory(extra) - add_subdirectory(core) -diff -U 3 -H -d -r -N -- digikam-4.5.0/extra/CMakeLists.txt digikam-4.5.0.reenable-libs/extra/CMakeLists.txt ---- digikam-4.5.0/extra/CMakeLists.txt 2014-11-22 02:35:41.679078762 +0100 -+++ digikam-4.5.0.reenable-libs/extra/CMakeLists.txt 2014-11-22 02:36:00.840088484 +0100 -@@ -13,13 +13,14 @@ - add_subdirectory(libkipi) - add_subdirectory(libkexiv2) - add_subdirectory(libkdcraw) -- add_subdirectory(libkface) - MACRO_OPTIONAL_ADD_SUBDIRECTORY(libksane) - - # from extragear/libs -- add_subdirectory(libkgeomap) -- MACRO_OPTIONAL_ADD_SUBDIRECTORY(libmediawiki) - - endif() - -+MACRO_OPTIONAL_ADD_SUBDIRECTORY(libmediawiki) -+ -+add_subdirectory(libkgeomap) -+add_subdirectory(libkface) - add_subdirectory(kipi-plugins) diff --git a/digikam-4.5.0.tar.bz2 b/digikam-4.5.0.tar.bz2 deleted file mode 100644 index d6e8cdc..0000000 --- a/digikam-4.5.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f27645dc7d7d9f1e73284fbc46120a7ae182c05e58e7cbfa6e6b44a541209e28 -size 69330967 diff --git a/digikam-4.6.0.install-libs-dev.patch b/digikam-4.6.0.install-libs-dev.patch new file mode 100644 index 0000000..3c6dca8 --- /dev/null +++ b/digikam-4.6.0.install-libs-dev.patch @@ -0,0 +1,87 @@ +diff -U 3 -H -d -r -N -- digikam-4.6.0/extra/libkface/libkface/CMakeLists.txt digikam-4.6.0.install-libs-dev/extra/libkface/libkface/CMakeLists.txt +--- digikam-4.6.0/extra/libkface/libkface/CMakeLists.txt 2014-12-16 08:54:40.000000000 +0100 ++++ digikam-4.6.0.install-libs-dev/extra/libkface/libkface/CMakeLists.txt 2015-01-03 21:03:21.172580963 +0100 +@@ -63,9 +63,6 @@ + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/database/dbconfig.xml + DESTINATION ${DATA_INSTALL_DIR}/libkface/database ) + +-# Check if compilation is done through digiKam SC or not. If yes, do not install header files. +-if(NOT DIGIKAMSC_COMPILE_LIBKFACE) +- + install(FILES facedetector.h + recognitiondatabase.h + identity.h +@@ -76,9 +73,7 @@ + ) + + if(NOT WIN32) +- configure_file(${CMAKE_SOURCE_DIR}/cmake/templates/libkface.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkface.pc) +- configure_file(${CMAKE_SOURCE_DIR}/cmake/templates/libkface.lsm.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkface.lsm) ++ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/templates/libkface.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkface.pc) ++ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/templates/libkface.lsm.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkface.lsm) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libkface.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig ) + endif() +- +-endif() +diff -U 3 -H -d -r -N -- digikam-4.6.0/extra/libkgeomap/libkgeomap/CMakeLists.txt digikam-4.6.0.install-libs-dev/extra/libkgeomap/libkgeomap/CMakeLists.txt +--- digikam-4.6.0/extra/libkgeomap/libkgeomap/CMakeLists.txt 2014-12-16 08:54:40.000000000 +0100 ++++ digikam-4.6.0.install-libs-dev/extra/libkgeomap/libkgeomap/CMakeLists.txt 2015-01-03 21:03:38.204621741 +0100 +@@ -73,9 +73,6 @@ + + install(TARGETS kgeomap ${INSTALL_TARGETS_DEFAULT_ARGS}) + +-# Check if compilation is done through digiKam SC or not. If yes, do not install header files. +-if(NOT DIGIKAMSC_COMPILE_LIBKGEOMAP) +- + install(FILES libkgeomap_export.h + abstractmarkertiler.h + dragdrophandler.h +@@ -94,14 +91,12 @@ + ) + + if(NOT WIN32) +- configure_file(${CMAKE_SOURCE_DIR}/cmake/templates/libkgeomap.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkgeomap.pc) +- configure_file(${CMAKE_SOURCE_DIR}/cmake/templates/libkgeomap.lsm.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkgeomap.lsm) ++ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/templates/libkgeomap.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkgeomap.pc) ++ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/templates/libkgeomap.lsm.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libkgeomap.lsm) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libkgeomap.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig ) + endif() + + # Install find cmake script to the system for client applications. + +- install(FILES ${CMAKE_SOURCE_DIR}/cmake/modules/FindKGeoMap.cmake ++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules/FindKGeoMap.cmake + DESTINATION ${DATA_INSTALL_DIR}/cmake/modules) +- +-endif() +diff -U 3 -H -d -r -N -- digikam-4.6.0/extra/libmediawiki/libmediawiki/CMakeLists.txt digikam-4.6.0.install-libs-dev/extra/libmediawiki/libmediawiki/CMakeLists.txt +--- digikam-4.6.0/extra/libmediawiki/libmediawiki/CMakeLists.txt 2014-12-16 08:54:40.000000000 +0100 ++++ digikam-4.6.0.install-libs-dev/extra/libmediawiki/libmediawiki/CMakeLists.txt 2015-01-03 21:03:05.940544498 +0100 +@@ -40,9 +40,6 @@ + + install(TARGETS mediawiki ${INSTALL_TARGETS_DEFAULT_ARGS}) + +-# Check if compilation is done through digiKam SC or not. If yes, do not install header files. +-if(NOT DIGIKAMSC_COMPILE_LIBMEDIAWIKI) +- + install(FILES image.h + imageinfo.h + mediawiki.h +@@ -68,14 +65,12 @@ + DESTINATION ${INCLUDE_INSTALL_DIR}/libmediawiki COMPONENT Devel) + + if(NOT WIN32) +- configure_file(${CMAKE_SOURCE_DIR}/cmake/templates/libmediawiki.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libmediawiki.pc) +- configure_file(${CMAKE_SOURCE_DIR}/cmake/templates/libmediawiki.lsm.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libmediawiki.lsm) ++ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/templates/libmediawiki.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libmediawiki.pc) ++ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/templates/libmediawiki.lsm.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libmediawiki.lsm) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmediawiki.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig ) + endif() + + # Install find cmake script to the system for client applications. + +- install(FILES ${CMAKE_SOURCE_DIR}/cmake/modules/FindMediawiki.cmake ++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules/FindMediawiki.cmake + DESTINATION ${DATA_INSTALL_DIR}/cmake/modules) +- +-endif() diff --git a/digikam-4.6.0.tar.bz2 b/digikam-4.6.0.tar.bz2 new file mode 100644 index 0000000..e3f04d2 --- /dev/null +++ b/digikam-4.6.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b047a3172203e036c35f73dbb93cc7e71408c05bedaa8f7f1e0cc539a355a345 +size 70266430 diff --git a/digikam.changes b/digikam.changes index 7d6cf0a..00a5985 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,68 @@ +------------------------------------------------------------------- +Sat Jan 3 17:58:02 UTC 2015 - nico.kruber@gmail.com + +- update to 4.6.0 + digikam: + - Editor : Several fixes to complete image editor canvas port to Qt4 model/view. + - General: Better support of removable media and unvavailable items. + - Import : Allow sub-subfolders auto creation while importing. + - BQM : Allow to save/load Workflow from tools context menu. + - kde#340811 - Wrap album caption. + - kde#340278 - Please provide a windows build of 4.4. + - kde#341031 - LibLqr detected during build but shown as not supported in + components information. + - kde#340945 - libkgeomap, libmediawiki, libkvkontakte, libkface not found. + - kde#338532 - Sidecar files are neither created nor updated under Windows. + - kde#335661 - CANVAS : image is displayed with wrong magnification after + crop. + - kde#338996 - CANVAS : Selection coordinates/size do not show either + during selection or update when using selection + area adjust controls. + - kde#339053 - Allow the usage of arrows to move in the photo sequence + when in preview. + - kde#205776 - Option to load full image size in preview mode does not + only do what it says with RAW files. + - kde#341306 - CANVAS: no "Select All" for the second time and selection + fixes after crop and auto crop. + - kde#341298 - libkexiv2-4.14.3/libkexiv2/kexiv2exif.cpp:934: bad if test? + - kde#341470 - Better speed after downloading many pictures with + auto-rotation/flip option. + - kde#286611 - Tags are losts randomly when converting TIFF to PNG. + - kde#320564 - CANVAS : full image dimensions not shown when not viewing + at 100% zoom level. + - kde#341053 - Text Filter broken. + - kde#341566 - digiKam crashed after closing when BQM was used before. + - kde#294602 - Sub sub-folders separated with '/' in file path cannot be + created with album selection dialog. + - kde#339108 - Segfault trying to download photos. + - kde#338367 - CANVAS : unable to zoom out to less than fit to window. + - kde#341671 - IMPORT: Zoom Out and Zoom In button in preview mode working + not. + - kde#338224 - Inconsistent "Zoom to 100%" shortcut behavior between + Preview Mode and Image Editor. + - kde#263550 - CANVAS : image shifts position in mouse-over mode when + changing between Before and After. + - kde#333929 - Target ICC profile is common to all queues from BQM. + - kde#323112 - Preview fails when importing images because digiKam uses a + wrong path with Gphoto2 camera + - kde#331224 - Sync metadata eventually slow-down computer to unusable + state. + - kde#338276 - CANVAS : mouse-over preview mode does not work. + - kde#341825 - Rounding down zoom for fit to windows size and it will + never scroll bars be displayed. + - kde#326796 - When returning from edit mode to preview mode, next image + not always loaded. + - kde#341868 - View->Fit to Selection no centering the new selection. + - kde#191494 - Support search in offline collections (e.g. removable + medias). + kipi-plugins: + - kde#302306 HTML export crashes digiKam with floating cards theme. + - kde#341379 Advanced slideshow crashes if it runs manually backwards. +- drop digikam-4.5.0-reenable-libs.patch (use digikam 4.6.0 cmake options) +- drop digikam_no_build_vkontakte.diff (replaced by patch below) +- add digikam_no_local_vkontakte_cmake_modules.diff +- add digikam-4.6.0.install-libs-dev.patch + ------------------------------------------------------------------- Wed Nov 26 10:44:01 UTC 2014 - nico.kruber@gmail.com diff --git a/digikam.spec b/digikam.spec index a81b24a..21659f8 100644 --- a/digikam.spec +++ b/digikam.spec @@ -1,7 +1,7 @@ # # spec file for package digikam # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,9 +17,9 @@ Name: digikam -Version: 4.5.0 +Version: 4.6.0 Release: 0 -%define rversion 4.5.0 +%define rversion 4.6.0 Summary: A KDE Photo Manager License: GPL-2.0+ Group: Productivity/Graphics/Viewers @@ -29,12 +29,12 @@ Source0: http://download.kde.org/stable/%{name}/%{name}-%{rversion}.tar.b Patch0: digikam-buildtime.patch # PATCH-FIX-OPENSUSE remove-gplv2-only.patch idoenmez@suse.de bnc#711963 -- Remove GPLv2 only files from the build system Patch3: remove-gplv2-only.patch -# PATCH-FIX-OPENSUSE digikam_no_build_vkontakte.diff tittiatcoke@gmail.com -- Don't build libvkontakte (use external one) -Patch5: digikam_no_build_vkontakte.diff +# PATCH-FIX-OPENSUSE digikam_no_local_vkontakte_cmake_modules.diff nkruber@gmail.com -- Don't use internal CMAKE modules to find external libkvkontakte library +Patch5: digikam_no_local_vkontakte_cmake_modules.diff # PATCH-FIX-UPSTREAM digikam-4.4.0.no-kdcraw.version-check.patch -- version check for libkdcraw currently broken Patch6: digikam-4.4.0.no-kdcraw.version-check.patch -# PATCH-FIX-OPENSUSE digikam-4.5.0-reenable-libs.patch nkruber@gmail.com -- use some of the internal libraries (libkface, libkgeomap, libmediawiki) -Patch7: digikam-4.5.0-reenable-libs.patch +# PATCH-FIX-OPENSUSE digikam-4.6.0.install-libs-dev.patch nkruber@gmail.com -- install cmake module files and pkgconfig files of internally-built libraries, too +Patch7: digikam-4.6.0.install-libs-dev.patch BuildRequires: ImageMagick-devel BuildRequires: bison BuildRequires: boost-devel @@ -263,7 +263,7 @@ EXTRA_FLAGS="-DENABLE_LCMS2=OFF" %else EXTRA_FLAGS="-DENABLE_LCMS2=ON" %endif -%cmake_kde4 -d build -- -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=FALSE -DENABLE_INTERNALMYSQL=FALSE -DENABLE_KDEPIMLIBSSUPPORT=TRUE $EXTRA_FLAGS +%cmake_kde4 -d build -- -DENABLE_INTERNALMYSQL=FALSE -DENABLE_KDEPIMLIBSSUPPORT=TRUE -DDIGIKAMSC_COMPILE_LIBKFACE=TRUE -DDIGIKAMSC_COMPILE_LIBKGEOMAP=TRUE -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=TRUE $EXTRA_FLAGS # there are files in there that are so heavy to the compiler, that one is enough %make_jobs VERBOSE=1 diff --git a/digikam_no_build_vkontakte.diff b/digikam_no_build_vkontakte.diff deleted file mode 100644 index 761d898..0000000 --- a/digikam_no_build_vkontakte.diff +++ /dev/null @@ -1,32 +0,0 @@ -Index: CMakeLists.txt -=================================================================== ---- CMakeLists.txt.orig -+++ CMakeLists.txt -@@ -128,7 +128,6 @@ endif() - set(CMAKE_MODULE_PATH - ${CMAKE_SOURCE_DIR}/extra/libkgeomap/cmake/modules - ${CMAKE_SOURCE_DIR}/extra/libmediawiki/cmake/modules -- ${CMAKE_SOURCE_DIR}/extra/libkvkontakte/cmake/modules - ${CMAKE_SOURCE_DIR}/cmake/modules - ${CMAKE_MODULE_PATH} - ) -@@ -144,7 +143,6 @@ if(ENABLE_PRIVATE_SHAREDLIBS) - #from extragear/libs - set(KGEOMAP_LOCAL_DIR extra/libkgeomap) - set(MEDIAWIKI_LOCAL_DIR extra/libmediawiki) -- set(LIBKVKONTAKTE_LOCAL_DIR extra/libkvkontakte) - endif() - - add_subdirectory(extra) -Index: extra/CMakeLists.txt -=================================================================== ---- extra/CMakeLists.txt.orig -+++ extra/CMakeLists.txt -@@ -19,7 +19,6 @@ if(${ENABLE_PRIVATE_SHAREDLIBS}) - # from extragear/libs - add_subdirectory(libkgeomap) - MACRO_OPTIONAL_ADD_SUBDIRECTORY(libmediawiki) -- MACRO_OPTIONAL_ADD_SUBDIRECTORY(libkvkontakte) - - endif() - diff --git a/digikam_no_local_vkontakte_cmake_modules.diff b/digikam_no_local_vkontakte_cmake_modules.diff new file mode 100644 index 0000000..df037d0 --- /dev/null +++ b/digikam_no_local_vkontakte_cmake_modules.diff @@ -0,0 +1,12 @@ +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt.orig ++++ CMakeLists.txt +@@ -128,7 +128,6 @@ endif() + set(CMAKE_MODULE_PATH + ${CMAKE_SOURCE_DIR}/extra/libkgeomap/cmake/modules + ${CMAKE_SOURCE_DIR}/extra/libmediawiki/cmake/modules +- ${CMAKE_SOURCE_DIR}/extra/libkvkontakte/cmake/modules + ${CMAKE_SOURCE_DIR}/cmake/modules + ${CMAKE_MODULE_PATH} + )