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

Accepting request 651536 from KDE:Extra

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/651536
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/scribus?expand=0&rev=64
This commit is contained in:
Dominique Leuenberger 2018-11-26 09:31:45 +00:00 committed by Git OBS Bridge
commit 31316071a1
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hunspell-1.6.patch → hunspell.patch
View File

@ -1,8 +1,10 @@
From: Wolfgang Bauer <wbauer@tmo.at>
Subject: support hunspell up to 1.6
Subject: Try to build against any hunspell version
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...
Edited-by: Fabian Vogt <fabian@ritter-vogt.de>
---
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
@ -12,7 +14,7 @@ diff -Nru a/cmake/modules/FindHUNSPELL.cmake b/cmake/modules/FindHUNSPELL.cmake
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 )
+FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell PATHS /opt/local/lib /usr/local/lib /usr/lib )
INCLUDE(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE

12
scribus.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Sat Nov 24 16:26:56 UTC 2018 - Fabian Vogt <fabian@ritter-vogt.de>
- Rewrite hunspell-1.6.patch into hunspell.patch to cover all hunspell
versions
-------------------------------------------------------------------
Sat Nov 24 10:55:44 UTC 2018 - wbauer@tmo.at
- Update hunspell-1.6.patch to also accept hunspell 1.7 that's in
Factory now
-------------------------------------------------------------------
Wed May 30 08:03:23 UTC 2018 - jengelh@inai.de

4
scribus.spec
View File

@ -13,7 +13,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@ -32,7 +32,7 @@ Source4: %{name}-icon128.png
Source5: %{name}-icon256.png
Source6: %{name}.appdata.xml
# PATCH-FIX-OPENSUSE
Patch: hunspell-1.6.patch
Patch: hunspell.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} > 1325