Notification time stamped 2018-07-31 22:29:09 UTC
From f01c577f9d1185d7afd2719acb745d1df22e634b Mon Sep 17 00:00:00 2001
From: Alexander Ploumistos <alexpl(a)fedoraproject.org>
Date: Jul 31 2018 22:28:13 +0000
Subject: Fix an interface crash - patch by Miquel Garriga
---
diff --git a/scidavis-fix-gh-issue-90.patch b/scidavis-fix-gh-issue-90.patch
new file mode 100644
index 0000000..3a74bf2
--- /dev/null
+++ b/scidavis-fix-gh-issue-90.patch
@@ -0,0 +1,18 @@
+diff --git a/libscidavis/src/ApplicationWindow.cpp
b/libscidavis/src/ApplicationWindow.cpp
+index 90d282a4..167debee 100644
+--- a/libscidavis/src/ApplicationWindow.cpp
++++ b/libscidavis/src/ApplicationWindow.cpp
+@@ -12530,8 +12530,11 @@ void ApplicationWindow::saveFolderAsProject(Folder *f)
+
+ void ApplicationWindow::showFolderPopupMenu(const QPoint &p, bool fromFolders)
+ {
+- if (fromFolders)
+- showFolderPopupMenuImpl(folders->itemAt(p),
fromFolders)->exec(folders->mapToGlobal(p));
++ if (fromFolders) {
++ QMenu* cm = showFolderPopupMenuImpl(folders->itemAt(p), fromFolders);
++ if (cm)
++ cm->exec(folders->mapToGlobal(p));
++ }
+ else
+ showFolderPopupMenuImpl(lv->itemAt(p),
fromFolders)->exec(lv->mapToGlobal(p));
+ }
diff --git a/scidavis.spec b/scidavis.spec
index 26a3d07..528caa7 100644
--- a/scidavis.spec
+++ b/scidavis.spec
@@ -3,6 +3,8 @@
%global gittag 0ca8811753c7a2ca2604c96e996dc3c4253eeb20
%global shorttag %(cut -b -7 <<< %{gittag})
%global gitdate 20180705
+# Remove once annobin's fixed
+%undefine _annotated_build
Name: scidavis
Version: 1.23
@@ -18,6 +20,7 @@ Source0:
https://github.com/%{owner}/%{name}/archive/%{gittag}/%{name}-%{
# enable after liborigin-3.0.0 release
#Patch0: fedora-rpm-with-system-liborigin3.patch
Patch1: scidavis-reorder_libqwt5_implementations.patch
+Patch2: scidavis-fix-gh-issue-90.patch
BuildRequires: gcc-c++
BuildRequires: python3
@@ -79,6 +82,7 @@ This module provides SciDAVis bindings to the Python3 programming
language.
#%%patch0 -p1
#rm -rf 3rdparty/liborigin
%patch1 -p1
+%patch2 -p1
# Set the correct python paths
sed -i 's+pythonconfig.path = "$$INSTALLBASE/../etc"+pythonconfig.path =
"$$INSTALLBASE/..%{python3_sitearch}/scidavis"+g' config.pri
sed -i 's+pythonutils.path =
"$$INSTALLBASE/share/scidavis"+pythonutils.path =
"$$INSTALLBASE/..%{python3_sitearch}/scidavis"+g' config.pri
@@ -146,8 +150,8 @@ appstream-util validate-relax --nonet
%{buildroot}%{_datadir}/appdata/*.appdata.
%changelog
-* Sat Jul 14 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
1.23-6.20180705git0ca8811
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+* Wed Aug 01 2018 Alexander Ploumistos <alexpl(a)fedoraproject.org> -
1.23-6.20180705git0ca8811
+- Fix an interface crash - patch by Miquel Garriga
* Sun Jul 08 2018 Alexander Ploumistos <alexpl(a)fedoraproject.org> -
1.23-5.20180705git0ca8811
- Switch to git snapshot 0ca8811 (multiple fixes)
https://src.fedoraproject.org/rpms/scidavis/c/f01c577f9d1185d7afd2719acb7...