Package: grok
Followup-For: Bug #869594
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu artful ubuntu-patch

Hello,

Here is an additional patch required to let grok build against the new gperf.

-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
slanga...@ubuntu.com                                     vor...@debian.org
diff -Nru grok-1.20110708.1/debian/patches/gperf-function-declaration.patch 
grok-1.20110708.1/debian/patches/gperf-function-declaration.patch
--- grok-1.20110708.1/debian/patches/gperf-function-declaration.patch   
1969-12-31 16:00:00.000000000 -0800
+++ grok-1.20110708.1/debian/patches/gperf-function-declaration.patch   
2017-08-08 15:14:18.000000000 -0700
@@ -0,0 +1,16 @@
+Description: update patname2macro() declaration for new gperf
+Author: Steve Langasek <steve.langa...@ubuntu.com>
+
+Index: grok-1.20110708.1/grok_matchconf_macro.h
+===================================================================
+--- grok-1.20110708.1.orig/grok_matchconf_macro.h
++++ grok-1.20110708.1/grok_matchconf_macro.h
+@@ -19,6 +19,7 @@
+ #endif
+ 
+ /* this function is generated by gperf */
+-const struct strmacro *patname2macro(const char *str, unsigned int len);
++const struct strmacro *patname2macro (register const char *str, register 
size_t len);
++
+ 
+ #endif /* _GROK_MATCHCONF_MACRO_ */
diff -Nru grok-1.20110708.1/debian/patches/series 
grok-1.20110708.1/debian/patches/series
--- grok-1.20110708.1/debian/patches/series     2017-08-08 14:49:20.000000000 
-0700
+++ grok-1.20110708.1/debian/patches/series     2017-08-08 15:13:08.000000000 
-0700
@@ -5,3 +5,4 @@
 ld-as-needed.diff
 fix_wrong_pointer_alias.patch
 gperf-version-comparison.patch
+gperf-function-declaration.patch

Reply via email to