rpm/scribus
SHA256
1
0
Fork 0
forked from pool/scribus
Code Pull Requests Activity

Accepting request 602857 from home:wolfi323:branches:KDE:Extra

Browse Source 
- Add back hunspell-1.6.patch, it's still needed as the current
  version still only supports hunspell up to 1.4 but Tumbleweed and
  Leap 15.0 have 1.6

Hunspell 1.6 is only supported in 1.5.x, where the hunspell detection has been reworked...

OBS-URL: https://build.opensuse.org/request/show/602857
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/scribus?expand=0&rev=36
This commit is contained in:
OBS User mrdocs 2018-05-01 23:17:05 +00:00 committed by Git OBS Bridge
parent f7fe413272
commit 9e589ec546
3 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hunspell-1.6.patch Normal file
View File

@ -0,0 +1,18 @@
From: Wolfgang Bauer <wbauer@tmo.at>
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.4 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

7
scribus.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue May 1 21:29:52 UTC 2018 - wbauer@tmo.at
- Add back hunspell-1.6.patch, it's still needed as the current
version still only supports hunspell up to 1.4 but Tumbleweed and
Leap 15.0 have 1.6
-------------------------------------------------------------------
Sun Apr 29 03:29:26 UTC 2018 - plinnell@opensuse.org

3
scribus.spec
View File

@ -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
@ -94,6 +96,7 @@ for developing scribus plugins.
%prep
%setup -q
%patch -p1
%build
# Delete non-free colour swatches (bnc#763586)