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

Accepting request 651535 from home:Vogtinator:branches:KDE:Extra

Browse Source 
- Rewrite hunspell-1.6.patch into hunspell.patch to cover all hunspell
  versions

OBS-URL: https://build.opensuse.org/request/show/651535
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/scribus?expand=0&rev=41
This commit is contained in:
Luca Beltrame 2018-11-24 16:39:44 +00:00 committed by Git OBS Bridge
parent d4b82b9e29
commit 8be81f862e
3 changed files with 12 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> 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 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... 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 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 --- 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_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.4 hunspell-1.3 hunspell-1.2 PATHS /opt/local/lib /usr/local/lib /usr/lib )
+FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.7 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) INCLUDE(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE # handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE

6
scribus.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
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 Sat Nov 24 10:55:44 UTC 2018 - wbauer@tmo.at

4
scribus.spec
View File

@ -13,7 +13,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # 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 Source5: %{name}-icon256.png
Source6: %{name}.appdata.xml Source6: %{name}.appdata.xml
# PATCH-FIX-OPENSUSE # PATCH-FIX-OPENSUSE
Patch: hunspell-1.6.patch Patch: hunspell.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} > 1325 %if 0%{?suse_version} > 1325