diff --git a/equalx-adapt-headers-for-qt5_11.patch b/equalx-adapt-headers-for-qt5_11.patch new file mode 100644 index 0000000..db11f92 --- /dev/null +++ b/equalx-adapt-headers-for-qt5_11.patch @@ -0,0 +1,12 @@ +Index: equalx-0.7.1/src/DialogPreferences.cpp +=================================================================== +--- equalx-0.7.1.orig/src/DialogPreferences.cpp ++++ equalx-0.7.1/src/DialogPreferences.cpp +@@ -19,6 +19,7 @@ + + #include + #include ++#include + + #include "defines.h" + #include "DialogPreferences.h" diff --git a/equalx.changes b/equalx.changes index 738bf3e..822d8ff 100644 --- a/equalx.changes +++ b/equalx.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jun 12 11:35:40 UTC 2018 - badshah400@opensuse.org + +- Add equalx-adapt-headers-for-qt5_11.patch: Include additional + header files where needed for compilation against Qt 5.11 +- Only run post(un) scripts for openSUSE < 1500; rpm file triggers + take care of these for newer releases. + ------------------------------------------------------------------- Sun Oct 2 17:37:46 UTC 2016 - badshah400@gmail.com diff --git a/equalx.spec b/equalx.spec index 0ee5783..e383fbb 100644 --- a/equalx.spec +++ b/equalx.spec @@ -1,7 +1,7 @@ # # spec file for package equalx # -# Copyright (c) 2016 SUSE LINUX 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 @@ -20,13 +20,15 @@ Name: equalx Version: 0.7.1 Release: 0 Summary: Editor for writing and exporting TeX/LaTeX equations -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Productivity/Publishing/TeX/Frontends Url: http://equalx.sourceforge.net/ Source0: http://downloads.sourceforge.net/equalx/%{name}-%{version}.tar.gz Source1: %{name}.appdata.xml # PATCH-FIX-OPENSUSE equalx-fix-desktop-file.patch badshah400@gmail.com -- Fix icon tag in desktop file and categories for compatibility with openSUSE defined ones Patch0: equalx-fix-desktop-file.patch +# PATCH-FIX-UPSTREAM equalx-adapt-headers-for-qt5_11.patch badshah400@opensuse.org -- Include additional header files where needed for compilation against Qt 5.11 +Patch1: equalx-adapt-headers-for-qt5_11.patch BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: ghostscript @@ -62,6 +64,7 @@ Features included: %prep %setup -q %patch0 -p1 +%patch1 -p1 sed -i 's/\r$//' LICENSE README %build @@ -108,6 +111,7 @@ install -Dm0644 %{S:1} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %fdupes %{buildroot}%{_datadir}/%{name} +%if 0%{?suse_version} < 1500 %post %icon_theme_cache_post %desktop_database_post @@ -115,6 +119,7 @@ install -Dm0644 %{S:1} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %postun %icon_theme_cache_postun %desktop_database_postun +%endif %files %defattr(-,root,root)