From 64f6422c6b198a25b51ab1b45a7bd1f3b5193e5553c903ef38649b61df7bc466 Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Wed, 15 Jun 2022 08:38:32 +0000 Subject: [PATCH] Accepting request 982736 from home:ecsos - Add sigil-lto.patch to fix boo#1199981 Hope so, because ca not test myself. OBS-URL: https://build.opensuse.org/request/show/982736 OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/sigil?expand=0&rev=70 --- sigil-lto.patch | 23 +++++++++++++++++++++++ sigil.changes | 9 +++++++++ sigil.spec | 5 ++++- 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 sigil-lto.patch diff --git a/sigil-lto.patch b/sigil-lto.patch new file mode 100644 index 0000000..2303b37 --- /dev/null +++ b/sigil-lto.patch @@ -0,0 +1,23 @@ +From 3fd17410c31aca2000134ee28af9d42779fc88ea Mon Sep 17 00:00:00 2001 +From: Doug Massay +Date: Tue, 7 Jun 2022 21:08:01 -0400 +Subject: [PATCH] Because GCC's lto is willfully chossing to suck + +--- + CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7c8fc81fbe..06a9eef7ae 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -82,6 +82,9 @@ if( UNIX AND NOT APPLE ) + # which point to directories outside the build tree to the install RPATH. + # This will ensure the Qt5 lib directory is always included after install. + SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) ++ ++ # Because GCC's link time optimization is willfully choosing to suck. ++ add_compile_options(-fno-lto) + endif() + + # Check if platform is 64 bit diff --git a/sigil.changes b/sigil.changes index 3d98591..a66a7ec 100644 --- a/sigil.changes +++ b/sigil.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Jun 15 05:53:23 UTC 2022 - ecsos + +- Add sigil-lto.patch to fix boo#1199981 + (Sigil EBUP editor terminates with SIGSEGV on startup.) + This can be removed again in version > 1.9.10 + + https://github.com/Sigil-Ebook/Sigil/commit/3fd17410c31aca2000134ee28af9d42779fc88ea + ------------------------------------------------------------------- Mon May 23 14:46:29 UTC 2022 - ecsos diff --git a/sigil.spec b/sigil.spec index d637765..09a88c4 100644 --- a/sigil.spec +++ b/sigil.spec @@ -30,6 +30,8 @@ Source1: https://github.com/Sigil-Ebook/sigil-user-guide/releases/downloa Source2: %{name}.desktop # PATCH-FIX-OPENSUSE Disabled __DATE__ and __TIME__ which is replaced later in pre section Patch0: %{name}-gt-0.9.0-Dialogs-About.cpp.patch +# PATCH-UPSTREAM - Fix Sigil EBUP editor terminates with SIGSEGV on startup +Patch1: %{name}-lto.patch BuildRequires: boost-devel BuildRequires: cmake >= 3.0 BuildRequires: dos2unix @@ -116,7 +118,8 @@ specification and create a hierarchical Table of Contents. %prep %setup -q -n Sigil-%{version} -%patch0 -p 1 +%patch0 -p1 +%patch1 -p1 cp -v %{SOURCE1} . cp -v %{SOURCE2} . # rpmlint