From cde08ecb61f5d54318926d39c8aa3dcba0b82dd609a60dcd83d0905be3727ef8 Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Mon, 11 Jun 2018 06:17:58 +0000 Subject: [PATCH] Accepting request 615908 from home:ecsos - insert sigil-fix_deprecated_macro.patch to fix build error OBS-URL: https://build.opensuse.org/request/show/615908 OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/sigil?expand=0&rev=20 --- sigil-fix_deprecated_macro.patch | 12 ++++++++++++ sigil.changes | 5 +++++ sigil.spec | 5 ++++- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 sigil-fix_deprecated_macro.patch diff --git a/sigil-fix_deprecated_macro.patch b/sigil-fix_deprecated_macro.patch new file mode 100644 index 0000000..b427c64 --- /dev/null +++ b/sigil-fix_deprecated_macro.patch @@ -0,0 +1,12 @@ +diff -Pdpru Sigil-0.9.9.orig/src/CMakeLists.txt Sigil-0.9.9/src/CMakeLists.txt +--- Sigil-0.9.9.orig/src/CMakeLists.txt 2017-12-21 17:59:01.000000000 +0100 ++++ Sigil-0.9.9/src/CMakeLists.txt 2018-06-11 08:04:01.700642771 +0200 +@@ -684,7 +684,7 @@ if (MSVC) + endif() + + target_link_libraries( ${PROJECT_NAME} ${QT_MAIN} ${HUNSPELL_LIBRARIES} ${PCRE_LIBRARIES} ${GUMBO_LIBRARIES} ${MINIZIP_LIBRARIES} ${PYTHON_LIBRARIES} ) +-qt5_use_modules(${PROJECT_NAME} Widgets Xml XmlPatterns PrintSupport Svg WebKit WebKitWidgets Network Concurrent) ++target_link_libraries(${PROJECT_NAME} Qt5::Widgets Qt5::Xml Qt5::XmlPatterns Qt5::PrintSupport Qt5::Svg Qt5::WebKit Qt5::WebKitWidgets Qt5::Network Qt5::Concurrent) + + ############################################################################# + diff --git a/sigil.changes b/sigil.changes index d6d8145..cfc2fa1 100644 --- a/sigil.changes +++ b/sigil.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 11 06:06:22 UTC 2018 - ecsos@opensuse.org + +- insert sigil-fix_deprecated_macro.patch to fix build error + ------------------------------------------------------------------- Sun Jan 7 11:42:03 UTC 2018 - ecsos@opensuse.org diff --git a/sigil.spec b/sigil.spec index 53f5678..886cc47 100644 --- a/sigil.spec +++ b/sigil.spec @@ -20,7 +20,7 @@ Name: sigil Version: 0.9.9 Release: 0 Summary: WYSIWYG Ebook Editor -License: GPL-3.0 +License: GPL-3.0-only Group: Productivity/Other Url: http://sigil-ebook.com/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -29,6 +29,8 @@ Source1: https://github.com/Sigil-Ebook/Sigil/raw/master/docs/Sigil_User_ 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-FIX-OPENSUSE Change deprecated qt5_use_modules to target_link_libraries +Patch1: %{name}-fix_deprecated_macro.patch BuildRequires: boost-devel BuildRequires: cmake >= 3.0 BuildRequires: dos2unix @@ -88,6 +90,7 @@ specification and create a hierarchical Table of Contents. %setup -q -n Sigil-%{version} sed -i 's/\r//' ChangeLog.txt README.md COPYING.txt %patch0 -p 1 +%patch1 -p 1 %{__cp} -v %{S:1} . %{__cp} -v %{S:2} . # rpmlint