[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#862163: lokalize: FTBFS with hunspell 1.6



Package: lokalize
Version: 16.08.3-2
Severity: important
Tags: patch

Dear Maintainer,

again a hunspell transition upcoming :)
hunspell 1.6.x is already in experimental

As said already in https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=821802 back then for
1.4 I don't see where hunspell-2.0 is supposed to be any effect but I kept it in the following
trivial patch again :):

diff -Nru lokalize-16.08.3/debian/changelog lokalize-16.08.3/debian/changelog
--- lokalize-16.08.3/debian/changelog   2017-02-10 15:51:19.000000000 +0000
+++ lokalize-16.08.3/debian/changelog   2017-05-09 09:01:52.000000000 +0000
@@ -1,3 +1,10 @@
+lokalize (4:16.08.3-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * fix build with hunspell 1.6 
+
+ -- Rene Engelhard <rene@debian.org>  Tue, 09 May 2017 11:01:52 +0200
+
 lokalize (4:16.08.3-2) unstable; urgency=medium
 
   * Add kinit runtime dependency.
diff -Nru lokalize-16.08.3/debian/patches/hunspell-1.6.diff lokalize-16.08.3/debian/patches/hunspell-1.6.diff
--- lokalize-16.08.3/debian/patches/hunspell-1.6.diff   1970-01-01 00:00:00.000000000 +0000
+++ lokalize-16.08.3/debian/patches/hunspell-1.6.diff   2017-05-09 09:01:00.000000000 +0000
@@ -0,0 +1,17 @@
+Description: fix build with hunspell-1.6
+Author: Rene Engelhard <rene@debian.org>
+Origin: vendor
+Forwarded: no
+Last-Update: 2017-05-09
+
+--- lokalize-16.08.3.orig/cmake/FindHUNSPELL.cmake
++++ lokalize-16.08.3/cmake/FindHUNSPELL.cmake
+@@ -14,7 +14,7 @@ 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)
+ 
+ # handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE if 
+ # all listed variables are TRUE
diff -Nru lokalize-16.08.3/debian/patches/series lokalize-16.08.3/debian/patches/series
--- lokalize-16.08.3/debian/patches/series      1970-01-01 00:00:00.000000000 +0000
+++ lokalize-16.08.3/debian/patches/series      2017-05-09 09:00:11.000000000 +0000
@@ -0,0 +1 @@
+hunspell-1.6.diff

Maybe it would even be better if you fixed this once for all with this:

+-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)

which also works fine and would remove the need for a adaption here every time...

Regards,

Rene


Reply to: