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

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

Browse Source 
- 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
This commit is contained in:
Luca Beltrame 2018-03-27 19:23:46 +00:00 committed by Git OBS Bridge
parent d8b29b452f
commit ee50a4b849
3 changed files with 28 additions and 1 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.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

6
scribus.changes
View File

@ -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 Thu Jan 4 17:18:39 UTC 2018 - wbauer@tmo.at

3
scribus.spec
View File

@ -31,6 +31,8 @@ Source3: %{name}-icon64.png
Source4: %{name}-icon128.png Source4: %{name}-icon128.png
Source5: %{name}-icon256.png Source5: %{name}-icon256.png
Source6: %{name}.appdata.xml Source6: %{name}.appdata.xml
# PATCH-FIX-OPENSUSE
Patch: hunspell-1.6.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} > 1325 %if 0%{?suse_version} > 1325
BuildRequires: libboost_headers-devel BuildRequires: libboost_headers-devel
@ -96,6 +98,7 @@ for developing scribus plugins.
%prep %prep
%setup -q %setup -q
%patch -p1
%build %build
# Delete non-free colour swatches (bnc#763586) # Delete non-free colour swatches (bnc#763586)