Accepting request 195376 from KDE:Distro:Factory

rajceexport-stop-crashing-when-uploaded-nothing.patch: rajceexport: stop crashing when uploaded nothing (bnc#835021) (forwarded request 195371 from jirislaby)

OBS-URL: https://build.opensuse.org/request/show/195376
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=114

digikam-3.2.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bd7204d42c4ef73f22e757ba5daa334073bd02ccc054c31780786d2b1a2a481a
-size 58449068

digikam-3.3.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3dfe0e78171c8d65b3a8e603345400bf83b90241b7a24a8ae2f7fd3443b7ac11
+size 67124485

digikam.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Thu Aug 15 12:12:30 UTC 2013 - jslaby@suse.com
+
+- rajceexport-stop-crashing-when-uploaded-nothing.patch: rajceexport:
+  stop crashing when uploaded nothing (bnc#835021)
+
+-------------------------------------------------------------------
+Tue Aug  6 11:20:50 UTC 2013 - nico.kruber@gmail.com
+
+- fix libkface package not named after .so name
+
+-------------------------------------------------------------------
+Tue Aug  6 08:47:20 UTC 2013 - nico.kruber@gmail.com
+
+- Update to 3.3.0:
+  digikam:
+    - Faces Managament: Better management of Picasa Face Tags
+                        import/export through metadata.
+    - Faces Management: New Face Recognition engine based on
+                        OpenTLD.
+    - 37 fixed bugs.
+  kipi-plugins:
+    - 5 fixed bugs.
+- Drop patch included upstream: non-executable-script.patch
+
 -------------------------------------------------------------------
 Mon Jun 10 19:37:07 UTC 2013 - asterios.dramis@gmail.com
 

digikam.spec

@@ -17,7 +17,7 @@
 
 
 Name:           digikam
-Version:        3.2.0
+Version:        3.3.0
 Release:        0
 Summary:        A KDE Photo Manager
 License:        GPL-2.0+
@@ -28,14 +28,14 @@ Source0:        ftp://ftp.kde.org/pub/kde/stable/digikam/digikam-%{version}.tar.
 Patch0:         digikam-buildtime.patch
 # PATCH-FIX-OPENSUSE desktop-files.diff -- Remove Icon= entry (the icon is missing)
 Patch1:         desktop-files.diff
-# PATCH-FIX-OPENSUSE non-executable-script.patch asterios.dramis@gmail.com -- Fix rpmlint warning "non-executable-script"
-Patch2:         non-executable-script.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-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
@@ -182,17 +182,17 @@ This library is used by kipi-plugins, digiKam and other kipi host programs.
 Summary:        Development files for libkface
 License:        BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          Development/Libraries/KDE
-Requires:       libkface1 = %{version}
+Requires:       libkface2 = %{version}
 
 %description -n libkface-devel
 This package contains development files for libkface.
 
-%package -n libkface1
+%package -n libkface2
 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
 
-%description -n libkface1
+%description -n libkface2
 Libkface is a Qt/C++ wrapper around LibFace to perform face recognition and
 detection over pictures.
 
@@ -232,10 +232,12 @@ This package contains the development files for libmediawiki.
 pushd extra/kipi-plugins
 %patch1
 popd
-%patch2
 %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')
@@ -328,9 +330,9 @@ popd
 
 %postun -n libkgeomap1 -p /sbin/ldconfig
 
-%post -n libkface1 -p /sbin/ldconfig
+%post -n libkface2 -p /sbin/ldconfig
 
-%postun -n libkface1 -p /sbin/ldconfig
+%postun -n libkface2 -p /sbin/ldconfig
 
 %post -n libmediawiki1 -p /sbin/ldconfig
 
@@ -399,11 +401,34 @@ popd
 %{_kde4_bindir}/expoblending
 %{_kde4_bindir}/panoramagui
 %{_kde4_bindir}/photolayoutseditor
-%{_kde4_configkcfgdir}/PLEConfigSkeleton.kcfgc
+%{_kde4_configkcfgdir}/photolayoutseditor.kcfg
-%dir %{_kde4_iconsdir}/hicolor/24x24/actions
+%dir %{_kde4_iconsdir}/hicolor/24x24/apps
 %{_kde4_iconsdir}/hicolor/*/actions/*.*
-%exclude %{_kde4_iconsdir}/hicolor/*/actions/gpsimagetag.png
+%exclude %{_kde4_iconsdir}/hicolor/*/apps/kipi-gpsimagetag.png
-%{_kde4_iconsdir}/hicolor/*/apps/dngconverter.*
+%{_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.*
@@ -433,7 +458,7 @@ popd
 %files -n kipi-plugins-geolocation
 %defattr(-,root,root)
 %{_kde4_appsdir}/gpssync
-%{_kde4_iconsdir}/hicolor/*/actions/gpsimagetag.png
+%{_kde4_iconsdir}/hicolor/*/apps/kipi-gpsimagetag.png
 %{_kde4_modulesdir}/kipiplugin_gpssync.so
 %{_kde4_servicesdir}/kipiplugin_gpssync.desktop
 
@@ -453,10 +478,10 @@ popd
 %{_kde4_appsdir}/libkgeomap/
 %{_kde4_libdir}/libkgeomap.so.1*
 
-%files -n libkface1
+%files -n libkface2
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/libkface
-%{_kde4_libdir}/libkface.so.1*
+%{_kde4_libdir}/libkface.so.2*
 
 %files -n libkface-devel
 %defattr(-,root,root,-)

non-executable-script.patch

@@ -1,14 +0,0 @@
---- extra/kipi-plugins/expoblending/plugin/expoblending.desktop.orig	2011-07-28 02:27:35.000000000 +0300
-+++ extra/kipi-plugins/expoblending/plugin/expoblending.desktop	2011-08-08 18:45:45.330000070 +0300
-@@ -1,4 +1,3 @@
--#!/usr/bin/env xdg-open
- [Desktop Entry]
- Categories=Qt;KDE;Graphics;
- Comment=A tool to blend bracketed images
---- extra/kipi-plugins/panorama/plugin/panoramagui.desktop.orig	2011-11-07 09:50:25.000000000 +0200
-+++ extra/kipi-plugins/panorama/plugin/panoramagui.desktop	2011-11-12 22:14:39.809000013 +0200
-@@ -1,4 +1,3 @@
--#!/usr/bin/env xdg-open
- [Desktop Entry]
- Categories=Qt;KDE;Graphics;
- Comment=A tool to assemble images as a panorama

rajceexport-stop-crashing-when-uploaded-nothing.patch

@@ -0,0 +1,46 @@
+From: Jiri Slaby <jslaby@suse.cz>
+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=<optimized out>, local_signal_index=<optimized out>, 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 <jslaby@suse.cz>
+---
+ 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
+