diff options
Diffstat (limited to 'x11/kdelibs4')
| -rw-r--r-- | x11/kdelibs4/files/patch-cmake_modules_FindHUNSPELL.cmake (renamed from x11/kdelibs4/files/patch-git_2ab2745) | 10 | ||||
| -rw-r--r-- | x11/kdelibs4/files/patch-z-cmake_modules_FindHUNSPELL.cmake | 12 |
2 files changed, 9 insertions, 13 deletions
diff --git a/x11/kdelibs4/files/patch-git_2ab2745 b/x11/kdelibs4/files/patch-cmake_modules_FindHUNSPELL.cmake index 469935807af3..6853675ab016 100644 --- a/x11/kdelibs4/files/patch-git_2ab2745 +++ b/x11/kdelibs4/files/patch-cmake_modules_FindHUNSPELL.cmake @@ -1,3 +1,11 @@ +Includes the following two upstream commits: + +commit c828f8592fcfd6c2a66ebc18a826de38d6a2fef2 +Author: Pino Toscano <pino@kde.org> +Date: Sat Dec 31 12:08:59 2016 +0100 + + cmake: look for hunspell-1.6 as well + commit 2ab2745eb01f73355c490ac8d5d1837dec84fd6c Author: Wolfgang Bauer <wbauer@tmo.at> Date: Thu Oct 20 15:51:29 2016 +0200 @@ -13,7 +21,7 @@ Date: Thu Oct 20 15:51:29 2016 +0200 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-2.0 hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2) ++FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-2.0 hunspell-1.6 hunspell-1.5 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 diff --git a/x11/kdelibs4/files/patch-z-cmake_modules_FindHUNSPELL.cmake b/x11/kdelibs4/files/patch-z-cmake_modules_FindHUNSPELL.cmake deleted file mode 100644 index 2c25a58de6b4..000000000000 --- a/x11/kdelibs4/files/patch-z-cmake_modules_FindHUNSPELL.cmake +++ /dev/null @@ -1,12 +0,0 @@ ---- cmake/modules/FindHUNSPELL.cmake.orig 2015-06-26 03:14:18 UTC -+++ cmake/modules/FindHUNSPELL.cmake -@@ -14,7 +14,8 @@ ENDIF (HUNSPELL_INCLUDE_DIR AND HUNSPELL - - FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx ) - --FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-2.0 hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2) -+FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-2.0 hunspell-1.6 -+ hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2 hunspell) - - # handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE if - # all listed variables are TRUE |