diff --git a/digikam-3.5.0.tar.bz2 b/digikam-3.5.0.tar.bz2 deleted file mode 100644 index 5c159c0..0000000 --- a/digikam-3.5.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:57bd2aa4fdde44333d1362b02b26ebf6c1a70675bf5cb40de5172df02857c42a -size 65698806 diff --git a/digikam-4.0.0-beta4.tar.bz2 b/digikam-4.0.0-beta4.tar.bz2 new file mode 100644 index 0000000..8fac17b --- /dev/null +++ b/digikam-4.0.0-beta4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:daa7e61eb35005281d0fee7086008319abb1e49810a814b1aa6dd51e7a71d6ae +size 68903713 diff --git a/digikam.changes b/digikam.changes index 51170ba..c753050 100644 --- a/digikam.changes +++ b/digikam.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Mon Apr 21 00:35:31 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 4.0.0~beta4 + digikam: + - General : New Tags Manager window for easy tags management. + - General : New images quality sorter tool, based on blur, + noise, and compression analysis. + - General : Multiple selection and multiple drag-n-drop + capabilities on Tags Manager and Tags View from sidebars. + - General : Drop of Qt3Support classes. Now digiKam is + pure Qt4 implementation. + - Metadata : Support for writing face rectangles in Windows + Live Photo format. + - Editor : Port of canvas to Qt Model/view. + - Showfoto : Port of Thumbbar to Qt Model/view. + kipi-plugins: + - General: New tool to export collection to Google Drive cloud service. + - General: New tool to export collection to DropBox cloud service. + - MediaWiki: allow removal of metadata/GPS coordinates before uploading. + - MediaWiki: graphical interface improvements. + * See NEWS file for more details +- Drop rajceexport-stop-crashing-when-uploaded-nothing.patch, merged + upstream +- Drop libsoprano-devel and shared-desktop-ontologies-devel BuildRequires +- Disable gstreamer-0_10-plugins-qt-devel Buildrequires for 13.2+, + until we get qgstreamer with gstreamer 1.0 API support +- Remove unused parts of the spec (UpdatedApps repo no longer exists) + ------------------------------------------------------------------- Sun Oct 27 23:15:14 UTC 2013 - hrvoje.senjan@gmail.com diff --git a/digikam.spec b/digikam.spec index 981ba3c..8118a7b 100644 --- a/digikam.spec +++ b/digikam.spec @@ -1,7 +1,7 @@ # # spec file for package digikam # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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,13 +17,14 @@ Name: digikam -Version: 3.5.0 +Version: 4.0.0~beta4 Release: 0 +%define rversion 4.0.0-beta4 Summary: A KDE Photo Manager License: GPL-2.0+ Group: Productivity/Graphics/Viewers Url: http://www.digikam.org/ -Source0: ftp://ftp.kde.org/pub/kde/stable/digikam/digikam-%{version}.tar.bz2 +Source0: http://download.kde.org/unstable/%{name}/%{name}-%{rversion}.tar.bz2 # PATCH-FIX-OPENSUSE digikam-buildtime.patch -- Remove build time references so build-compare can do its work Patch0: digikam-buildtime.patch # PATCH-FIX-OPENSUSE remove-gplv2-only.patch idoenmez@suse.de bnc#711963 -- Remove GPLv2 only files from the build system @@ -32,8 +33,6 @@ Patch3: remove-gplv2-only.patch Patch5: digikam_no_build_vkontakte.diff # PATCH-FIX-UPSTREAM digikam-3.0.0.no-kdcraw.version-check.patch -- version check for libkdcraw currently broken Patch6: digikam-3.0.0.no-kdcraw.version-check.patch -# PATCH-FIX-UPSTREAM rajceexport-stop-crashing-when-uploaded-nothing.patch -- rajceexport: stop crashing when uploaded nothing -Patch7: rajceexport-stop-crashing-when-uploaded-nothing.patch BuildRequires: ImageMagick-devel BuildRequires: bison BuildRequires: boost-devel @@ -41,7 +40,10 @@ BuildRequires: doxygen BuildRequires: fdupes BuildRequires: flex BuildRequires: gdk-pixbuf-devel +# TODO bring gstreamer-plugins-qt back for 13.2+ once we have them with gst1.0 +%if 0%{?suse_version} < 1320 BuildRequires: gstreamer-0_10-plugins-qt-devel +%endif BuildRequires: lensfun-devel %if 0%{?suse_version} > 1230 BuildRequires: libeigen3-devel @@ -63,17 +65,13 @@ BuildRequires: libksane-devel BuildRequires: libkvkontakte-devel BuildRequires: liblcms-devel BuildRequires: liblqr-devel -%if 0%{?suse_version} > 1220 BuildRequires: libpgf-devel -%endif BuildRequires: libqca2-devel BuildRequires: libqjson-devel -BuildRequires: libsoprano-devel BuildRequires: libusb-1_0-devel BuildRequires: libusb-compat-devel BuildRequires: marble-devel BuildRequires: opencv-devel >= 2.4.5 -BuildRequires: shared-desktop-ontologies-devel BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(glu) %if 0%{?suse_version} @@ -225,14 +223,11 @@ This package contains the development files for libmediawiki. %lang_package -n libkgeomap %prep -%setup -q +%setup -q -n %{name}-%{rversion} %patch0 %patch3 %patch5 %patch6 -p1 -pushd extra/kipi-plugins -%patch7 -p1 -popd # 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') @@ -246,14 +241,7 @@ rm gpssync/borrowed/modeltest.h popd %build -%if !0%{?kde_updatedapps} -%if 0%{?suse_version} >= 1310 - EXTRA_FLAGS="" -%endif -%cmake_kde4 -d build -- -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=FALSE -DENABLE_INTERNALMYSQL=FALSE $EXTRA_FLAGS -%else -%cmake_kde4 -d build -- -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=TRUE -DENABLE_INTERNALMYSQL=FALSE -%endif +%cmake_kde4 -d build -- -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=FALSE -DENABLE_INTERNALMYSQL=FALSE # there are files in there that are so heavy to the compiler, that one is enough %make_jobs VERBOSE=1 @@ -266,10 +254,7 @@ rm -f %{buildroot}%{_kde4_libdir}/libdigikamdatabase.so rm -f %{buildroot}%{_kde4_libdir}/libkipiplugins.so # Not needed -rm -f %{buildroot}%{_kde4_libdir}/libPropertyBrowser.a -rm -f %{buildroot}%{_kde4_libdir}/libHUpnp.a -rm -f %{buildroot}%{_kde4_libdir}/libHUpnpAv.a -rm -f %{buildroot}%{_kde4_libdir}/libQtSoap.a +rm -fv %{buildroot}%{_kde4_libdir}/*.a %if 0%{?suse_version} %suse_update_desktop_file -r %{name} Qt KDE Graphics Photography @@ -357,20 +342,13 @@ popd %{_kde4_modulesdir}/kio_digikammapimages.so %{_kde4_modulesdir}/kio_digikamsearch.so %{_kde4_modulesdir}/kio_digikamtags.so -%{_kde4_servicesdir}/digikamalbums.protocol -%{_kde4_servicesdir}/digikamdates.protocol -%{_kde4_servicesdir}/digikamimageplugin_*.desktop -%{_kde4_servicesdir}/digikammapimages.protocol -%{_kde4_servicesdir}/digikamsearch.protocol -%{_kde4_servicesdir}/digikamtags.protocol +%{_kde4_servicesdir}/digikam* %{_kde4_servicetypesdir}/digikamimageplugin.desktop %files doc %defattr(-,root,root,-) %doc COPYING.DOC -%doc %{_kde4_htmldir}/en/digikam/ -%doc %{_kde4_htmldir}/en/showfoto/ -%doc %{_kde4_htmldir}/en/kipi-plugins/ +%doc %{_kde4_htmldir}/*/ %doc %{_mandir}/man1/cleanup_digikamdb.1%{ext_man} %doc %{_mandir}/man1/digitaglinktree.1%{ext_man} @@ -398,31 +376,8 @@ popd %{_kde4_configkcfgdir}/photolayoutseditor.kcfg %dir %{_kde4_iconsdir}/hicolor/24x24/apps %{_kde4_iconsdir}/hicolor/*/actions/*.* +%{_kde4_iconsdir}/hicolor/*/apps/kipi-*.* %exclude %{_kde4_iconsdir}/hicolor/*/apps/kipi-gpsimagetag.png -%{_kde4_iconsdir}/hicolor/*/apps/kipi-debianscreenshots.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-dlna.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-dngconverter.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-expoblending.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-facebook.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-flash.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-flickr.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-gallery.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-hq.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-imageshack.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-imgur.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-jalbum.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-metadataedit.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-ogl.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-panorama.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-picasa.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-piwigo.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-rajce.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-shwup.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-slideshow.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-smugmug.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-timeadjust.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-wikimedia.* -%{_kde4_iconsdir}/hicolor/*/apps/kipi-zooomr.* %{_kde4_iconsdir}/hicolor/*/apps/photolayoutseditor.* %{_kde4_iconsdir}/hicolor/*/apps/rawconverter.* %{_kde4_iconsdir}/oxygen/*/apps/rawconverter.* @@ -497,183 +452,4 @@ popd %{_kde4_libdir}/pkgconfig/libmediawiki.pc %{_kde4_appsdir}/cmake/modules/FindMediawiki.cmake -%if 0%{?kde_updatedapps} - -%package -n libkdcraw20 -Version: 4.7.50 -Release: 0 -Summary: Shared library interface around dcraw -License: LGPL-2.1+ -Group: Development/Libraries/KDE -%requires_ge libqt4-x11 - -%description -n libkdcraw20 -Libkdcraw is a C++ interface around dcraw binary program used to decode -RAW picture files. The library documentation is available on header -files. - -This library is used by kipi-plugins, digiKam and others kipi host -programs. - -%files -n libkdcraw20 -%defattr(-,root,root) -%{_kde4_libdir}/libkdcraw.so.* -%{_kde4_appsdir}/libkdcraw/ -%{_kde4_iconsdir}/hicolor/*/apps/kdcraw.png - -%post -n libkdcraw20 -p /sbin/ldconfig - -%postun -n libkdcraw20 -p /sbin/ldconfig - -%package -n libkdcraw-devel -Version: 4.7.50 -Release: 0 -Summary: Shared library interface around dcraw -License: LGPL-2.1+ -Group: Development/Libraries/KDE -Requires: libkdcraw20 = %{version} - -%description -n libkdcraw-devel -Libkdcraw is a C++ interface around dcraw binary program used to decode -RAW picture files. The library documentation is available on header -files. - -This library is used by kipi-plugins, digiKam and others kipi host -programs. - -%files -n libkdcraw-devel -%defattr(-,root,root) -%{_kde4_libdir}/libkdcraw.so -%{_kde4_includedir}/libkdcraw/ -%{_kde4_libdir}/pkgconfig/libkdcraw.pc - -%package -n libkipi8 -Version: 4.7.50 -Release: 0 -Summary: KDE Image Plug-In Interface -License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT -Group: Development/Libraries/KDE -Recommends: libkipi8-lang = %{version} -%requires_ge libqt4-x11 - -%description -n libkipi8 -This package provides a generic KDE image plug-in interface used by -some KDE image applications. Plug-ins for this interface are in the -kipi-plugins package. - -%files -n libkipi8 -%defattr(-,root,root) -%{_kde4_libdir}/libkipi.so.* -%{_kde4_appsdir}/kipi/ -%{_kde4_iconsdir}/hicolor/*/apps/kipi.png -%{_kde4_servicetypesdir}/kipiplugin.desktop - -%post -n libkipi8 -p /sbin/ldconfig - -%postun -n libkipi8 -p /sbin/ldconfig - -%lang_package -n libkipi8 - -%files -n libkipi8-lang -f libkipi.lang -%defattr(-,root,root,-) - -%package -n libkipi-devel -Version: 4.7.50 -Release: 0 -Summary: KDE Image Plugin Interface -License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT -Group: Development/Libraries/KDE -Requires: libkipi8 = %{version} - -%description -n libkipi-devel -This package provides a generic KDE Image Plug-in Interface used by -some KDE image applications. Plug-ins for this interface are in the -kipi-plugins package. - -%files -n libkipi-devel -%defattr(-,root,root) -%{_kde4_libdir}/libkipi.so -%{_kde4_includedir}/libkipi/ -%{_kde4_libdir}/pkgconfig/libkipi.pc - -%package -n libkexiv2-10 -Version: 4.7.50 -Release: 0 -Summary: Library to manipulate picture meta data -License: GPL-2.0+ -Group: Development/Libraries/KDE - -%description -n libkexiv2-10 -Libkexiv2 is a wrapper around Exiv2 library to manipulate pictures -metadata. - -%files -n libkexiv2-10 -%defattr(-,root,root) -%{_kde4_appsdir}/libkexiv2/ -%{_kde4_libdir}/libkexiv2.so.* - -%package -n libkexiv2-devel -Version: 4.7.50 -Release: 0 -Summary: Library to manipulate picture meta data -License: GPL-2.0+ -Group: Development/Libraries/KDE -Requires: libkexiv2-10 = %{version} -%requires_ge libqt4-x11 - -%description -n libkexiv2-devel -Libkexiv2 is a wrapper around Exiv2 library to manipulate pictures -metadata. - -%files -n libkexiv2-devel -%defattr(-,root,root) -%{_kde4_libdir}/libkexiv2.so -%{_kde4_includedir}/libkexiv2/ -%{_kde4_libdir}/pkgconfig/libkexiv2.pc - -%post -n libkexiv2-10 -p /sbin/ldconfig - -%postun -n libkexiv2-10 -p /sbin/ldconfig - -%package -n libksane0 -Version: 4.7.50 -Release: 0 -Summary: KDE scan library -License: GPL-2.0+ -Group: Productivity/Graphics/Other - -%description -n libksane0 -This package contains a library to add scan support to KDE -applications. - -%post -n libksane0 -p /sbin/ldconfig - -%postun -n libksane0 -p /sbin/ldconfig - -%files -n libksane0 -%defattr(-,root,root) -%_kde4_libdir/libksane.so.* - -%package -n libksane-devel -Version: 4.7.50 -Release: 0 -Summary: KDE scan library - Development Files -License: GPL-2.0+ -Group: Development/Libraries/KDE -Requires: libksane0 = %{version} -Requires: sane-backends-devel - -%description -n libksane-devel -This package contains a library to add scan support to KDE -applications. - -%files -n libksane-devel -%defattr(-,root,root) -%{_kde4_includedir}/libksane/ -%{_kde4_libdir}/pkgconfig/libksane.pc -%{_kde4_libdir}/libksane.so -%{_kde4_libdir}/cmake/KSane/ - -%endif - %changelog diff --git a/digikam_no_build_vkontakte.diff b/digikam_no_build_vkontakte.diff index a92a3d7..cbeb3f0 100644 --- a/digikam_no_build_vkontakte.diff +++ b/digikam_no_build_vkontakte.diff @@ -1,6 +1,6 @@ --- CMakeLists.txt 2012-01-03 01:42:09.000000000 +0100 +++ CMakeLists.txt 2012-01-05 13:49:28.920827859 +0100 -@@ -70,7 +70,6 @@ +@@ -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 @@ -8,7 +8,7 @@ ${CMAKE_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH} ) -@@ -85,7 +84,6 @@ +@@ -149,7 +148,6 @@ ENDIF() SET(KFACE_LOCAL_DIR extra/libkface) SET(KGEOMAP_LOCAL_DIR extra/libkgeomap) SET(MEDIAWIKI_LOCAL_DIR extra/libmediawiki) @@ -18,7 +18,7 @@ ADD_SUBDIRECTORY(core) --- extra/CMakeLists.txt 2012-01-03 01:31:52.000000000 +0100 +++ extra/CMakeLists.txt 2012-01-05 13:49:38.665828606 +0100 -@@ -33,7 +33,6 @@ +@@ -33,7 +33,6 @@ IF(${ENABLE_PRIVATE_KDEGRAPHICS}) ENDIF() MACRO_OPTIONAL_ADD_SUBDIRECTORY(libmediawiki) diff --git a/rajceexport-stop-crashing-when-uploaded-nothing.patch b/rajceexport-stop-crashing-when-uploaded-nothing.patch deleted file mode 100644 index 7dcdd27..0000000 --- a/rajceexport-stop-crashing-when-uploaded-nothing.patch +++ /dev/null @@ -1,46 +0,0 @@ -From: Jiri Slaby -Date: Thu, 15 Aug 2013 13:43:25 +0200 -Subject: rajceexport: stop crashing when uploaded nothing -Patch-mainline: submitted on Aug 15 2013 -References: bnc#835021 - -When we only open the window and immediately close it, we see: -0 QDir::fromNativeSeparators (pathName=...) at io/qdir.cpp:854 -1 0x00007ffff6d7f077 in QUrl::fromLocalFile (localFile=...) - at io/qurl.cpp:6260 -2 0x00007fffce65f0f5 in KIPIRajceExportPlugin::RajceWidget::cancelUpload ( - this=0x197eb80) - at /usr/src/debug/digikam-3.3.0/extra/kipi-plugins/rajceexport/rajcewidget.cpp:540 -3 0x00007fffce66358d in KIPIRajceExportPlugin::RajceWindow::slotClose ( - this=0x1967e70) - at /usr/src/debug/digikam-3.3.0/extra/kipi-plugins/rajceexport/rajcewindow.cpp:104 -4 0x00007ffff6dd844f in QMetaObject::activate (sender=0x1967e70, - m=, local_signal_index=, argv=0x0) - at kernel/qobject.cpp:3556 - -It is because the iterator is not initialized yet. So check also -m_uploadingPhotos before checking the iterator to avoid that problem. - -References: https://bugs.kde.org/show_bug.cgi?id=307689 -Signed-off-by: Jiri Slaby ---- - rajceexport/rajcewidget.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/rajceexport/rajcewidget.cpp b/rajceexport/rajcewidget.cpp -index ff736af..1aca949 100644 ---- a/rajceexport/rajcewidget.cpp -+++ b/rajceexport/rajcewidget.cpp -@@ -535,7 +535,8 @@ void RajceWidget::uploadNext() - - void RajceWidget::cancelUpload() - { -- if (m_currentUploadImage != m_uploadQueue.begin() && m_currentUploadImage != m_uploadQueue.end()) -+ if (m_uploadingPhotos && m_currentUploadImage != m_uploadQueue.begin() && -+ m_currentUploadImage != m_uploadQueue.end()) - { - m_imgList->processed(KUrl::fromLocalFile(*m_currentUploadImage), false); - } --- -1.8.3.4 - diff --git a/remove-gplv2-only.patch b/remove-gplv2-only.patch index f47ca83..a9d7f2e 100644 --- a/remove-gplv2-only.patch +++ b/remove-gplv2-only.patch @@ -2,7 +2,7 @@ Index: extra/kipi-plugins/gpssync/CMakeLists.txt =================================================================== --- extra/kipi-plugins/gpssync/CMakeLists.txt.orig +++ extra/kipi-plugins/gpssync/CMakeLists.txt -@@ -33,10 +33,8 @@ SET(kipiplugin_gpssync_PART_SRCS +@@ -32,10 +32,8 @@ SET(kipiplugin_gpssync_PART_SRCS IF(KDE4_BUILD_TESTS) INCLUDE_DIRECTORIES(BEFORE "${CMAKE_CURRENT_SOURCE_DIR}/borrowed")