pool/digikam
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 321246 from KDE:Extra

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/321246
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/digikam?expand=0&rev=139
This commit is contained in:
Dominique Leuenberger 2015-08-10 07:15:25 +00:00 committed by Git OBS Bridge
parent 2dce3e0695
commit a5a8a27e9a
3 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
digikam.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Aug 7 06:23:24 UTC 2015 - wbauer@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)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 24 13:03:02 UTC 2015 - wbauer@tmo.at Fri Jul 24 13:03:02 UTC 2015 - wbauer@tmo.at

3
digikam.spec
View File

@ -35,6 +35,8 @@ Patch3: remove-gplv2-only.patch
Patch6: digikam-4.4.0.no-kdcraw.version-check.patch Patch6: digikam-4.4.0.no-kdcraw.version-check.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 # 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 Patch7: digikam-4.6.0.install-libs-dev.patch
# PATCH-FIX-UPSTREAM fix-crash-with-tags-manager-add-tag-with-null-parent.patch wbauer@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: ImageMagick-devel
BuildRequires: bison BuildRequires: bison
BuildRequires: boost-devel BuildRequires: boost-devel
@ -262,6 +264,7 @@ tar -xjf %{SOURCE2}
%patch3 %patch3
%patch6 -p1 %patch6 -p1
%patch7 -p1 %patch7 -p1
%patch8 -p1
# Remove build time references so build-compare can do its work # 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') FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')

31
fix-crash-with-tags-manager-add-tag-with-null-parent.patch Normal file
View File

@ -0,0 +1,31 @@
From: Veaceslav Munteanu <veaceslav.munteanu90@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;
}