Hello community,
here is the log from the commit of package digikam for openSUSE:Factory checked
in at 2015-08-10 09:15:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2015-08-02
22:44:17.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.digikam.new/digikam.changes 2015-08-10
09:15:31.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Aug 7 06:23:24 UTC 2015 - wba...@tmo.at
+
+- Add fix-crash-with-tags-manager-add-tag-with-null-parent.patch:
+ fix crash with tag manager when adding tags with no parent tag
+ selected (boo#940857, kde#343548)
+
+-------------------------------------------------------------------
New:
----
fix-crash-with-tags-manager-add-tag-with-null-parent.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ digikam.spec ++++++
--- /var/tmp/diff_new_pack.lcEAVS/_old 2015-08-10 09:15:33.000000000 +0200
+++ /var/tmp/diff_new_pack.lcEAVS/_new 2015-08-10 09:15:33.000000000 +0200
@@ -35,6 +35,8 @@
Patch6: digikam-4.4.0.no-kdcraw.version-check.patch
# PATCH-FIX-OPENSUSE digikam-4.6.0.install-libs-dev.patch nkru...@gmail.com --
install cmake module files and pkgconfig files of internally-built libraries,
too
Patch7: digikam-4.6.0.install-libs-dev.patch
+# PATCH-FIX-UPSTREAM
fix-crash-with-tags-manager-add-tag-with-null-parent.patch wba...@tmo.at
boo#940857, kde#343548 -- fix crash with tag manager when adding tags with no
parent tag selected
+Patch8: fix-crash-with-tags-manager-add-tag-with-null-parent.patch
BuildRequires: ImageMagick-devel
BuildRequires: bison
BuildRequires: boost-devel
@@ -262,6 +264,7 @@
%patch3
%patch6 -p1
%patch7 -p1
+%patch8 -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')
++++++ fix-crash-with-tags-manager-add-tag-with-null-parent.patch ++++++
From: Veaceslav Munteanu <veaceslav.muntean...@gmail.com>
Date: Thu, 06 Aug 2015 18:50:00 +0000
Subject: fix crash with tags manager add tag with null parent BUG: 343548
X-Git-Url:
http://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=6eace137db05f0b5648bc34e0f690cf642c121db
---
fix crash with tags manager add tag with null parent BUG: 343548
---
--- a/core/app/tags/tagsmanager/tagsmanager.cpp
+++ b/core/app/tags/tagsmanager/tagsmanager.cpp
@@ -258,11 +258,16 @@
void TagsManager::slotAddAction()
{
- TAlbum* const parent = d->tagMngrView->currentAlbum();
+ TAlbum* parent = d->tagMngrView->currentAlbum();
QString title, icon;
QKeySequence ks;
- if (!TagEditDlg::tagCreate(kapp->activeWindow(), parent, title, icon, ks))
+ if(!parent)
+ {
+ parent =
static_cast<TAlbum*>(d->tagMngrView->albumForIndex(d->tagMngrView->model()->index(0,0)));
+ }
+
+ if (!TagEditDlg::tagCreate(kapp->activeWindow(), parent, title, icon, ks))
{
return;
}
