From b1b4fb7f7ac838ae19de0b936785d2fcf72ec88c11dc7a59f7acf62f5797a83b Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Mon, 2 May 2016 15:06:55 +0000 Subject: [PATCH] Accepting request 393311 from home:dimstar:Factory - Add sonnet-hunspell-1.4.patch: detect hunspell 1.4.x. The patch has NOT been submitted upstream yet. Please assist on that. OBS-URL: https://build.opensuse.org/request/show/393311 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/sonnet?expand=0&rev=90 --- sonnet-hunspell-1.4.patch | 25 +++++++++++++++++++++++++ sonnet.changes | 5 +++++ sonnet.spec | 2 ++ 3 files changed, 32 insertions(+) create mode 100644 sonnet-hunspell-1.4.patch diff --git a/sonnet-hunspell-1.4.patch b/sonnet-hunspell-1.4.patch new file mode 100644 index 0000000..e15d737 --- /dev/null +++ b/sonnet-hunspell-1.4.patch @@ -0,0 +1,25 @@ +From 19fe077169fc0aa3b43c4d61ed642541d1b12d58 Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger +Date: Mon, 2 May 2016 16:09:32 +0200 +Subject: [PATCH] build: detect Hunspell 1.4 branch + +--- + cmake/FindHUNSPELL.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/FindHUNSPELL.cmake b/cmake/FindHUNSPELL.cmake +index 26942b5..f028abe 100644 +--- a/cmake/FindHUNSPELL.cmake ++++ b/cmake/FindHUNSPELL.cmake +@@ -14,7 +14,7 @@ ENDIF (HUNSPELL_INCLUDE_DIR AND HUNSPELL_LIBRARIES) + + FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx ) + +-FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.3 hunspell-1.2) ++FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.4 hunspell-1.3 hunspell-1.2) + + # handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE if + # all listed variables are TRUE +-- +2.8.1 + diff --git a/sonnet.changes b/sonnet.changes index 17e97e0..056c5c3 100644 --- a/sonnet.changes +++ b/sonnet.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 2 14:04:16 UTC 2016 - dimstar@opensuse.org + +- Add sonnet-hunspell-1.4.patch: detect hunspell 1.4.x. + ------------------------------------------------------------------- Mon Apr 4 14:31:48 UTC 2016 - hrvoje.senjan@gmail.com diff --git a/sonnet.spec b/sonnet.spec index f669e5c..a56486d 100644 --- a/sonnet.spec +++ b/sonnet.spec @@ -43,6 +43,7 @@ Group: System/GUI/KDE Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf +Patch0: sonnet-hunspell-1.4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -92,6 +93,7 @@ HSpell, Enchant, ASpell and HUNSPELL. Development files. %lang_package -n libKF5SonnetCore%sonum %prep %setup -q +%patch0 -p1 %build %cmake_kf5 -d build -- -Dlconvert_executable=%{_kf5_libdir}/qt5/bin/lconvert