- Add kde398136.patch to fix crash when editing element (kde#398136)

OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/kbibtex?expand=0&rev=41
This commit is contained in:
Cor Blom 2018-09-12 10:39:22 +00:00 committed by Git OBS Bridge
parent 825835e12f
commit 6f218831b9
3 changed files with 66 additions and 39 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Sep 12 10:38:21 UTC 2018 - Cor Blom <cornelis@solcon.nl>
- Add kde398136.patch to fix crash when editing element (kde#398136)
-------------------------------------------------------------------
Sat Sep 1 11:31:00 UTC 2018 - wbauer@tmo.at

View File

@ -1,7 +1,7 @@
#
# spec file for package kbibtex
#
# Copyright (c) 2018 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -15,53 +15,56 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: kbibtex
Version: 0.8.1
Release: 1
License: GPL-2.0
Summary: The BibTeX (Latex) bibliography manager by KDE
Url: https://userbase.kde.org/KBibTeX/
Group: Productivity/Publishing/TeX/Utilities
Source: http://download.kde.org/stable/KBibTeX/%{version}/%{name}-%{version}.tar.xz
Name: kbibtex
Version: 0.8.1
Release: 0
Summary: The BibTeX (Latex) bibliography manager by KDE
License: GPL-2.0-only
Group: Productivity/Publishing/TeX/Utilities
Url: https://userbase.kde.org/KBibTeX/
Source: http://download.kde.org/stable/KBibTeX/%{version}/%{name}-%{version}.tar.xz
# PATCH-FIX-OPENSUSE: revert upstream desktop file change to solve rpmlint error
Patch0: desktopfile.diff
BuildRequires: update-desktop-files
BuildRequires: extra-cmake-modules
BuildRequires: pkgconfig(Qt5Concurrent)
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5Network)
Patch0: desktopfile.diff
# PATCH-FIX-UPSTREAM: backported fix for kde#398136
Patch1: kde398136.patch
BuildRequires: extra-cmake-modules
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(Qt5Concurrent)
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5Widgets)
# Only include WebEngine for platforms that support it
%ifarch %{ix86} x86_64 %{arm} aarch64 mips mips64
BuildRequires: pkgconfig(Qt5WebEngineWidgets)
BuildRequires: pkgconfig(Qt5WebEngineWidgets)
%else
BuildRequires: pkgconfig(Qt5WebKitWidgets)
BuildRequires: pkgconfig(Qt5WebKitWidgets)
%endif
BuildRequires: pkgconfig(Qt5Test)
BuildRequires: pkgconfig(Qt5XmlPatterns)
BuildRequires: pkgconfig(Qt5Concurrent)
BuildRequires: ki18n-devel
BuildRequires: kxmlgui-devel
BuildRequires: kio-devel
BuildRequires: kiconthemes-devel
BuildRequires: kitemviews-devel
BuildRequires: kcompletion-devel
BuildRequires: kparts-devel
BuildRequires: kcoreaddons-devel
BuildRequires: kcrash-devel
BuildRequires: kdoctools-devel
BuildRequires: kservice-devel
BuildRequires: kwallet-devel
BuildRequires: libpoppler-qt5-devel
BuildRequires: libqca-qt5-devel
BuildRequires: libicu-devel
BuildRequires: qoauth-qt5-devel
Recommends: %{name}-lang
BuildRequires: kcompletion-devel
BuildRequires: kcoreaddons-devel
BuildRequires: kcrash-devel
BuildRequires: kdoctools-devel
BuildRequires: ki18n-devel
BuildRequires: kiconthemes-devel
BuildRequires: kio-devel
BuildRequires: kitemviews-devel
BuildRequires: kparts-devel
BuildRequires: kservice-devel
BuildRequires: kwallet-devel
BuildRequires: kxmlgui-devel
BuildRequires: libicu-devel
BuildRequires: libpoppler-qt5-devel
BuildRequires: libqca-qt5-devel
BuildRequires: qoauth-qt5-devel
BuildRequires: pkgconfig(Qt5Concurrent)
BuildRequires: pkgconfig(Qt5Test)
BuildRequires: pkgconfig(Qt5XmlPatterns)
Recommends: %{name}-lang
Requires(post): shared-mime-info
Requires(post): desktop-file-utils
Requires(postun): shared-mime-info
Requires(postun): desktop-file-utils
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
KBibTeX is a BibTeX editor by KDE to edit bibliographies used with
@ -83,6 +86,7 @@ This package contains the devel files for %{name}.
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1
%patch1 -p1
%build
%cmake_kf5 -d build

18
kde398136.patch Normal file
View File

@ -0,0 +1,18 @@
diff -ur a/src/data/entry.cpp b/src/data/entry.cpp
--- a/src/data/entry.cpp 2018-06-21 22:00:30.000000000 +0200
+++ b/src/data/entry.cpp 2018-09-12 00:17:36.471388501 +0200
@@ -169,9 +169,11 @@
int Entry::remove(const QString &key)
{
const QString lcKey = key.toLower();
- for (Entry::ConstIterator it = constBegin(); it != constEnd(); ++it)
- if (it.key().toLower() == lcKey)
- return QMap<QString, Value>::remove(it.key());
+ for (Entry::Iterator it = begin(); it != end(); ++it)
+ if (it.key().toLower() == lcKey) {
+ QMap<QString, Value>::erase(it);
+ return 1;
+ }
return QMap<QString, Value>::remove(key);
}