From 54085c36e998e7fc7c3f9cbdbcd1a3d1752a7683 Mon Sep 17 00:00:00 2001 From: Raphael Kubo da Costa Date: Sun, 15 Jan 2017 14:16:31 +0000 Subject: Centralize all cmake/modules/FindHUNSPELL.cmake patches in one file. While here, note that the addition of hunspell-1.6 was done upstream too. --- .../files/patch-cmake_modules_FindHUNSPELL.cmake | 27 ++++++++++++++++++++++ x11/kdelibs4/files/patch-git_2ab2745 | 19 --------------- .../files/patch-z-cmake_modules_FindHUNSPELL.cmake | 12 ---------- 3 files changed, 27 insertions(+), 31 deletions(-) create mode 100644 x11/kdelibs4/files/patch-cmake_modules_FindHUNSPELL.cmake delete mode 100644 x11/kdelibs4/files/patch-git_2ab2745 delete mode 100644 x11/kdelibs4/files/patch-z-cmake_modules_FindHUNSPELL.cmake (limited to 'x11') diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindHUNSPELL.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindHUNSPELL.cmake new file mode 100644 index 000000000000..6853675ab016 --- /dev/null +++ b/x11/kdelibs4/files/patch-cmake_modules_FindHUNSPELL.cmake @@ -0,0 +1,27 @@ +Includes the following two upstream commits: + +commit c828f8592fcfd6c2a66ebc18a826de38d6a2fef2 +Author: Pino Toscano +Date: Sat Dec 31 12:08:59 2016 +0100 + + cmake: look for hunspell-1.6 as well + +commit 2ab2745eb01f73355c490ac8d5d1837dec84fd6c +Author: Wolfgang Bauer +Date: Thu Oct 20 15:51:29 2016 +0200 + + Support newer hunspell versions in FindHUNSPELL.cmake + + REVIEW: 128600 + +--- cmake/modules/FindHUNSPELL.cmake ++++ cmake/modules/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-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-git_2ab2745 b/x11/kdelibs4/files/patch-git_2ab2745 deleted file mode 100644 index 469935807af3..000000000000 --- a/x11/kdelibs4/files/patch-git_2ab2745 +++ /dev/null @@ -1,19 +0,0 @@ -commit 2ab2745eb01f73355c490ac8d5d1837dec84fd6c -Author: Wolfgang Bauer -Date: Thu Oct 20 15:51:29 2016 +0200 - - Support newer hunspell versions in FindHUNSPELL.cmake - - REVIEW: 128600 - ---- cmake/modules/FindHUNSPELL.cmake -+++ cmake/modules/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-2.0 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 -- cgit v1.2.3