Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at 2014-11-28 08:47:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/digikam (Old) and /work/SRC/openSUSE:Factory/.digikam.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "digikam" Changes: -------- --- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2014-11-14 09:18:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.digikam.new/digikam.changes 2014-11-28 08:47:16.000000000 +0100 @@ -1,0 +2,44 @@ +Wed Nov 26 10:44:01 UTC 2014 - nico.kru...@gmail.com + +- add obsoletes for libkface2 and libkgeomap1 + +------------------------------------------------------------------- +Sat Nov 22 01:41:03 UTC 2014 - nico.kru...@gmail.com + +- add digikam-4.5.0-reenable-libs.patch to use some internal + libraries not yet available as extra packages + (libkface, libkgeomap, libmediawiki) + +------------------------------------------------------------------- +Wed Nov 19 19:38:13 UTC 2014 - adr...@suse.de + +- update to 4.5.0 + kde#172295 digiKam has a hard dependency on Jasper library + kde#267789 Make face detection (kface) and geo tagging (kmap) optional features + kde#306767 ICONVIEW : thumb focus is lost after renaming + kde#315574 CORE : bad performance when Tag-related Sidebars (Tag management / Filter) are open + kde#326718 Clear text button on file rename does nothing + kde#326945 When build digikam from git and package libpgf is installed, no way to use internal digikam libpgf + kde#337422 EXIF thumbnail date information not updated when writing metadata to image + kde#337737 MYSQL : settings and installation windows freeze when valid mariadb/mysql db connection is available + kde#338407 Import not showing image thumbnails for certain Canon cameras + kde#339154 digiKam goes into infinite loop when working with tags/captions information tab templates + kde#339180 cmake and/or compiler pick up libkgeomap header files from previous version + kde#339524 Identity class miss d private container to improve binary compatibility + kde#339806 Compiler error: ambiguous reference to ratio variable + kde#339903 Select 'recent' albums containing MOV or .xcf(Gimp) files. Immediate crash occurs. + kde#340030 KIPI-plugins can not be deactivated on non-English locales + kde#340141 White Balance: Unable to specify exposure compensation > x.5 + kde#340186 GROUP : Wallet icon for grouped photos is conceptually confusing + kde#340295 make fails on imagedescedittab.cpp has no member named 'textEdit' + kde#340439 No auto-rotation/flip Images after download + kde#340443 Advanced slideshow shows not all pictures under certain conditions + kde#340487 Add Album Category as a search criteria + kde#340581 Ratings with rating == 0 cannot be selected on the left sidebar + kde#340476 Floating Cards brings digiKam with non-English locales to crash and missing parameter text + kde#340811 Wrap album caption +- remove upstream patches: + - kde#89156.patch + - digikam-4.4.0-fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch + +------------------------------------------------------------------- Old: ---- digikam-4.4.0-fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch digikam-4.4.0.tar.bz2 kde#89156.patch New: ---- digikam-4.5.0-reenable-libs.patch digikam-4.5.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.LgqWGW/_old 2014-11-28 08:47:18.000000000 +0100 +++ /var/tmp/diff_new_pack.LgqWGW/_new 2014-11-28 08:47:18.000000000 +0100 @@ -17,9 +17,9 @@ Name: digikam -Version: 4.4.0 +Version: 4.5.0 Release: 0 -%define rversion 4.4.0 +%define rversion 4.5.0 Summary: A KDE Photo Manager License: GPL-2.0+ Group: Productivity/Graphics/Viewers @@ -33,10 +33,8 @@ Patch5: digikam_no_build_vkontakte.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-UPSTREAM digikam-4.4.0-fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch -- fix libkexiv2 version for AltLangStrEdit::textEdit() -Patch7: digikam-4.4.0-fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch -# PATCH-FIX-UPSTREAM kde#89156.patch -- avoid deadlocks with external MySQL/MariaDB, kde#89156 -Patch8: kde#89156.patch +# PATCH-FIX-OPENSUSE digikam-4.5.0-reenable-libs.patch nkru...@gmail.com -- use some of the internal libraries (libkface, libkgeomap, libmediawiki) +Patch7: digikam-4.5.0-reenable-libs.patch BuildRequires: ImageMagick-devel BuildRequires: bison BuildRequires: boost-devel @@ -164,12 +162,12 @@ Summary: Development files for libkgeomap License: GPL-2.0+ Group: Development/Libraries/KDE -Requires: libkgeomap1 = %{version} +Requires: libkgeomap2 = %{version} %description -n libkgeomap-devel This package contains development files for libkgeomap. -%package -n libkgeomap1 +%package -n libkgeomap2 Summary: World-Map Library interface for KDE License: GPL-2.0+ Group: System/Libraries @@ -178,8 +176,10 @@ # libkgeomap was last used at openSUSE 12.1 (version 2.2.0) Provides: libkgeomap = %{version} Obsoletes: libkgeomap < %{version} +# libkgeomap1 was last used at openSUSE 13.2 (version 4.4.0) +Obsoletes: libkgeomap1 -%description -n libkgeomap1 +%description -n libkgeomap2 Libkgeomap is a wrapper around different world-map components, to browse and arrange photos over a map. Currently supported map engine are: @@ -192,17 +192,19 @@ Summary: Development files for libkface License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT Group: Development/Libraries/KDE -Requires: libkface2 = %{version} +Requires: libkface3 = %{version} %description -n libkface-devel This package contains development files for libkface. -%package -n libkface2 +%package -n libkface3 Summary: Wrapper around LibFace to perform face recognition and detection over pictures License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT Group: System/Libraries +# libkface2 was last used at openSUSE 13.2 (version 4.4.0) +Obsoletes: libkface2 -%description -n libkface2 +%description -n libkface3 Libkface is a Qt/C++ wrapper around LibFace to perform face recognition and detection over pictures. @@ -242,8 +244,7 @@ %patch3 %patch5 %patch6 -p1 -%patch7 -d core -p1 -%patch8 -p1 +%patch7 -p1 # Remove build time references so build-compare can do its work FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') @@ -326,13 +327,13 @@ %postun -n kipi-plugins -p /sbin/ldconfig -%post -n libkgeomap1 -p /sbin/ldconfig +%post -n libkgeomap2 -p /sbin/ldconfig -%postun -n libkgeomap1 -p /sbin/ldconfig +%postun -n libkgeomap2 -p /sbin/ldconfig -%post -n libkface2 -p /sbin/ldconfig +%post -n libkface3 -p /sbin/ldconfig -%postun -n libkface2 -p /sbin/ldconfig +%postun -n libkface3 -p /sbin/ldconfig %post -n libmediawiki1 -p /sbin/ldconfig @@ -340,7 +341,7 @@ %files %defattr(-,root,root,-) -%doc core/{AUTHORS,COPYING,COPYING-CMAKE-SCRIPTS,COPYING.LIB,ChangeLog,NEWS,README,TODO,TODO.FACE,TODO.MYSQLPORT,TODO.TABLEVIEW} +%doc core/{AUTHORS,COPYING,COPYING-CMAKE-SCRIPTS,COPYING.LIB,ChangeLog,NEWS,README} %{_kde4_applicationsdir}/digikam.desktop %{_kde4_applicationsdir}/showfoto.desktop %{_kde4_appsdir}/digikam/ @@ -438,7 +439,7 @@ %files -n libkgeomap-devel %defattr(-,root,root,-) -%doc extra/libkgeomap/{AUTHORS,COPYING,COPYING-CMAKE-SCRIPTS,COPYING.LIB,README,TODO,kmap2kgeomap-TODO.txt} +%doc extra/libkgeomap/{AUTHORS,COPYING,COPYING-CMAKE-SCRIPTS,COPYING.LIB,README,TODO} %{_kde4_appsdir}/cmake/modules/FindKGeoMap.cmake %{_kde4_includedir}/libkgeomap/ %{_kde4_libdir}/pkgconfig/libkgeomap.pc @@ -447,15 +448,15 @@ %files -n libkgeomap-lang -f libkgeomap.lang %defattr(-,root,root,-) -%files -n libkgeomap1 +%files -n libkgeomap2 %defattr(-,root,root,-) %{_kde4_appsdir}/libkgeomap/ -%{_kde4_libdir}/libkgeomap.so.1* +%{_kde4_libdir}/libkgeomap.so.2* -%files -n libkface2 +%files -n libkface3 %defattr(-,root,root,-) %{_kde4_appsdir}/libkface -%{_kde4_libdir}/libkface.so.2* +%{_kde4_libdir}/libkface.so.3* %files -n libkface-devel %defattr(-,root,root,-) @@ -463,7 +464,8 @@ %{_kde4_libdir}/libkface.so %{_kde4_includedir}/libkface/ %{_kde4_libdir}/pkgconfig/libkface.pc -%{_kde4_appsdir}/cmake/modules/FindKface.cmake +%dir %{_kde4_libdir}/cmake/Kface-3.5.0/ +%{_kde4_libdir}/cmake/Kface-3.5.0/*.cmake %files -n libmediawiki1 %defattr(-,root,root,-) ++++++ digikam-4.4.0.no-kdcraw.version-check.patch ++++++ --- /var/tmp/diff_new_pack.LgqWGW/_old 2014-11-28 08:47:18.000000000 +0100 +++ /var/tmp/diff_new_pack.LgqWGW/_new 2014-11-28 08:47:18.000000000 +0100 @@ -1,80 +1,50 @@ -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) +Index: digikam-4.5.0/core/CMakeLists.txt +=================================================================== +--- digikam-4.5.0.orig/core/CMakeLists.txt ++++ digikam-4.5.0/core/CMakeLists.txt +@@ -125,20 +125,6 @@ DETECT_OPENCV(${OPENCV_MIN_VERSION} cor - # Optional dependencies detection required by some plugins - MACRO_OPTIONAL_FIND_PACKAGE(EXPAT) # For DNGConverter: XMP SDK need Expat library to compile. + 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() +- +-else() +- +- message(WARNING "libkdcraw: Version information not found, your version is probably too old.") +- set(KDCRAW_FOUND FALSE) +- +-endif() +- + # -- check the libkgeomap version ----------------------------------------------------------------- + + set(KGEOMAP_MIN_VERSION "3.0.0") +Index: digikam-4.5.0/extra/kipi-plugins/CMakeLists.txt +=================================================================== +--- digikam-4.5.0.orig/extra/kipi-plugins/CMakeLists.txt ++++ digikam-4.5.0/extra/kipi-plugins/CMakeLists.txt +@@ -75,20 +75,6 @@ if(KIPI_FOUND) + + 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() +- +- else() +- +- message(WARNING "libkdcraw: Version information not found, your version is probably too old.") +- set(KDCRAW_FOUND FALSE) +- +- endif() +- + # -- Optional dependencies detection required by some plugins ------------------------------------- + + MACRO_OPTIONAL_FIND_PACKAGE(EXPAT) # For DNGConverter: XMP SDK need Expat library to compile. ++++++ digikam-4.5.0-reenable-libs.patch ++++++ 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) ++++++ digikam-4.4.0.tar.bz2 -> digikam-4.5.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/digikam/digikam-4.4.0.tar.bz2 /work/SRC/openSUSE:Factory/.digikam.new/digikam-4.5.0.tar.bz2 differ: char 11, line 1 ++++++ digikam_no_build_vkontakte.diff ++++++ --- /var/tmp/diff_new_pack.LgqWGW/_old 2014-11-28 08:47:18.000000000 +0100 +++ /var/tmp/diff_new_pack.LgqWGW/_new 2014-11-28 08:47:18.000000000 +0100 @@ -2,31 +2,31 @@ =================================================================== --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -134,7 +134,6 @@ SET(CMAKE_MODULE_PATH - ${CMAKE_SOURCE_DIR}/extra/libkgeomap/cmake/modules - ${CMAKE_SOURCE_DIR}/extra/libmediawiki/cmake/modules - ${CMAKE_SOURCE_DIR}/extra/libkface/cmake/modules -- ${CMAKE_SOURCE_DIR}/extra/libkvkontakte/cmake/modules - ${CMAKE_SOURCE_DIR}/cmake/modules - ${CMAKE_MODULE_PATH} - ) -@@ -149,7 +148,6 @@ ENDIF() - SET(KFACE_LOCAL_DIR extra/libkface) - SET(KGEOMAP_LOCAL_DIR extra/libkgeomap) - SET(MEDIAWIKI_LOCAL_DIR extra/libmediawiki) --SET(LIBKVKONTAKTE_LOCAL_DIR extra/libkvkontakte) +@@ -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) - ADD_SUBDIRECTORY(core) + add_subdirectory(extra) Index: extra/CMakeLists.txt =================================================================== --- extra/CMakeLists.txt.orig +++ extra/CMakeLists.txt -@@ -33,7 +33,6 @@ IF(${ENABLE_PRIVATE_KDEGRAPHICS}) - ENDIF() +@@ -19,7 +19,6 @@ if(${ENABLE_PRIVATE_SHAREDLIBS}) + # from extragear/libs + add_subdirectory(libkgeomap) + MACRO_OPTIONAL_ADD_SUBDIRECTORY(libmediawiki) +- MACRO_OPTIONAL_ADD_SUBDIRECTORY(libkvkontakte) - MACRO_OPTIONAL_ADD_SUBDIRECTORY(libmediawiki) --MACRO_OPTIONAL_ADD_SUBDIRECTORY(libkvkontakte) + endif() - ADD_SUBDIRECTORY(libkgeomap) - ADD_SUBDIRECTORY(libkface) ++++++ remove-gplv2-only.patch ++++++ --- /var/tmp/diff_new_pack.LgqWGW/_old 2014-11-28 08:47:18.000000000 +0100 +++ /var/tmp/diff_new_pack.LgqWGW/_new 2014-11-28 08:47:18.000000000 +0100 @@ -1,10 +1,12 @@ ---- extra/kipi-plugins/gpssync/CMakeLists.txt.orig 2014-08-05 16:19:57.369791501 +0200 -+++ extra/kipi-plugins/gpssync/CMakeLists.txt 2014-08-05 16:20:37.535336329 +0200 -@@ -37,7 +37,6 @@ - #ADD_DEFINITIONS(-DGPSSYNC_MODELTEST) - SET(kipiplugin_gpssync_PART_SRCS +Index: extra/kipi-plugins/gpssync/CMakeLists.txt +=================================================================== +--- extra/kipi-plugins/gpssync/CMakeLists.txt.orig ++++ extra/kipi-plugins/gpssync/CMakeLists.txt +@@ -43,7 +43,6 @@ if(KDE4_BUILD_TESTS) + #add_definitions(-DGPSSYNC_MODELTEST) + set(kipiplugin_gpssync_PART_SRCS ${kipiplugin_gpssync_PART_SRCS} - ${CMAKE_CURRENT_SOURCE_DIR}/borrowed/modeltest.cpp ) - ENDIF(KDE4_BUILD_TESTS) + endif() -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org