From 0f11559fba9cf8fa991afaade4f8f9df702f70b4bae7144ca77a77b430d7df17 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Sun, 18 Mar 2018 02:52:17 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/scribus?expand=0&rev=22 --- hunspell-1.4.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 hunspell-1.4.patch diff --git a/hunspell-1.4.patch b/hunspell-1.4.patch new file mode 100644 index 0000000..66caf29 --- /dev/null +++ b/hunspell-1.4.patch @@ -0,0 +1,12 @@ +diff -Nru a/cmake/modules/FindHUNSPELL.cmake b/cmake/modules/FindHUNSPELL.cmake +--- a/cmake/modules/FindHUNSPELL.cmake 2012-04-10 22:17:07.000000000 +0200 ++++ b/cmake/modules/FindHUNSPELL.cmake 2016-04-26 13:59:20.473641707 +0200 +@@ -9,7 +9,7 @@ + #Based on examples at http://www.vtk.org/Wiki/CMake:How_To_Find_Libraries + + FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx ) +-FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.3 hunspell-1.2 PATHS /opt/local/lib /usr/local/lib /usr/lib ) ++FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.4 hunspell-1.3 hunspell-1.2 PATHS /opt/local/lib /usr/local/lib /usr/lib ) + + INCLUDE(FindPackageHandleStandardArgs) + # handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE From d8b29b452ffe72503972e76041240aedb807cc4f2064524612d7e1b0643c3b37 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Sun, 18 Mar 2018 02:52:27 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/scribus?expand=0&rev=23 --- hunspell-1.4.patch | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 hunspell-1.4.patch diff --git a/hunspell-1.4.patch b/hunspell-1.4.patch deleted file mode 100644 index 66caf29..0000000 --- a/hunspell-1.4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru a/cmake/modules/FindHUNSPELL.cmake b/cmake/modules/FindHUNSPELL.cmake ---- a/cmake/modules/FindHUNSPELL.cmake 2012-04-10 22:17:07.000000000 +0200 -+++ b/cmake/modules/FindHUNSPELL.cmake 2016-04-26 13:59:20.473641707 +0200 -@@ -9,7 +9,7 @@ - #Based on examples at http://www.vtk.org/Wiki/CMake:How_To_Find_Libraries - - FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx ) --FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.3 hunspell-1.2 PATHS /opt/local/lib /usr/local/lib /usr/lib ) -+FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.4 hunspell-1.3 hunspell-1.2 PATHS /opt/local/lib /usr/local/lib /usr/lib ) - - INCLUDE(FindPackageHandleStandardArgs) - # handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE From ee50a4b849bb51f345ed6eb68f5362860ea2edd93be3397ec92549e864447b8d Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Tue, 27 Mar 2018 19:23:46 +0000 Subject: [PATCH 3/3] Accepting request 591683 from home:wolfi323:branches:KDE:Extra - Add hunspell-1.6.patch to fix spellchecking support in Tumbleweed and Leap 15.0 OBS-URL: https://build.opensuse.org/request/show/591683 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/scribus?expand=0&rev=24 --- hunspell-1.6.patch | 18 ++++++++++++++++++ scribus.changes | 6 ++++++ scribus.spec | 5 ++++- 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 hunspell-1.6.patch diff --git a/hunspell-1.6.patch b/hunspell-1.6.patch new file mode 100644 index 0000000..71d7297 --- /dev/null +++ b/hunspell-1.6.patch @@ -0,0 +1,18 @@ +From: Wolfgang Bauer +Subject: support hunspell up to 1.6 + +Necessary to have spellchecking support in Tumbleweed and Leap 15.0, which +have hunspell 1.6.2 that wasn't found and spellchecking got disabled... +--- +diff -Nru a/cmake/modules/FindHUNSPELL.cmake b/cmake/modules/FindHUNSPELL.cmake +--- a/cmake/modules/FindHUNSPELL.cmake 2012-04-10 22:17:07.000000000 +0200 ++++ b/cmake/modules/FindHUNSPELL.cmake 2016-04-26 13:59:20.473641707 +0200 +@@ -9,7 +9,7 @@ + #Based on examples at http://www.vtk.org/Wiki/CMake:How_To_Find_Libraries + + FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx ) +-FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.3 hunspell-1.2 PATHS /opt/local/lib /usr/local/lib /usr/lib ) ++FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.6 hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2 PATHS /opt/local/lib /usr/local/lib /usr/lib ) + + INCLUDE(FindPackageHandleStandardArgs) + # handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE diff --git a/scribus.changes b/scribus.changes index e30dae0..18f90fc 100644 --- a/scribus.changes +++ b/scribus.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 27 14:53:05 UTC 2018 - wbauer@tmo.at + +- Add hunspell-1.6.patch to fix spellchecking support in Tumbleweed + and Leap 15.0 + ------------------------------------------------------------------- Thu Jan 4 17:18:39 UTC 2018 - wbauer@tmo.at diff --git a/scribus.spec b/scribus.spec index c840122..c4c2ab0 100644 --- a/scribus.spec +++ b/scribus.spec @@ -31,6 +31,8 @@ Source3: %{name}-icon64.png Source4: %{name}-icon128.png Source5: %{name}-icon256.png Source6: %{name}.appdata.xml +# PATCH-FIX-OPENSUSE +Patch: hunspell-1.6.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1325 BuildRequires: libboost_headers-devel @@ -95,7 +97,8 @@ for developing scribus plugins. %prep -%setup -q +%setup -q +%patch -p1 %build # Delete non-free colour swatches (bnc#763586)