[arch-commits] Commit in lvm2/trunk (PKGBUILD lvm2-2.02.105-readline-6.3.patch)

[Eric Bélanger]

    Date: Wednesday, March 19, 2014 @ 07:09:47
  Author: eric
Revision: 208213

Add build patch (close FS#39324)

Added:
  lvm2/trunk/lvm2-2.02.105-readline-6.3.patch
Modified:
  lvm2/trunk/PKGBUILD

----------------------------------+
 PKGBUILD                         |    7 +++--
 lvm2-2.02.105-readline-6.3.patch |   48 +++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-19 03:53:19 UTC (rev 208212)
+++ PKGBUILD	2014-03-19 06:09:47 UTC (rev 208213)
@@ -23,7 +23,8 @@
         lvmetad.service
         lvmetad.socket
         0001-wiping-wipe-DM_snapshot_cow-signature-without-prompt.patch
-        0002-snapshot-zero-cow-header-for-read-only-snapshot.patch)
+        0002-snapshot-zero-cow-header-for-read-only-snapshot.patch
+        lvm2-2.02.105-readline-6.3.patch)
 sha1sums=('796163e766480cdc427cd443dc1336ae8e8e3bd7'
           'SKIP'
           '76e83966d1bc84f9a1e30bcaff84b8b8fefbca0f'
@@ -37,7 +38,8 @@
           'f857a4a63fcc604a981e56875edda91767d4f1bf'
           'fcfc265e3b10294cc4b10949a342e9db4310b186'
           '044d426c49919b5a86fd84228d1c7e1f3a86c59a'
-          '4f83555347e7c3596c53d9009f260c1d65639e6d')
+          '4f83555347e7c3596c53d9009f260c1d65639e6d'
+          '8a89e784dee91872afe87083f7dd56c2fbc93229')
 
 prepare() {
   cd LVM2.${pkgver}
@@ -46,6 +48,7 @@
 
   patch -p1 -i "${srcdir}"/0001-wiping-wipe-DM_snapshot_cow-signature-without-prompt.patch
   patch -p1 -i "${srcdir}"/0002-snapshot-zero-cow-header-for-read-only-snapshot.patch
+  patch -p1 -i "${srcdir}"/lvm2-2.02.105-readline-6.3.patch
 }
 
 build() {

Added: lvm2-2.02.105-readline-6.3.patch
===================================================================
--- lvm2-2.02.105-readline-6.3.patch	                        (rev 0)
+++ lvm2-2.02.105-readline-6.3.patch	2014-03-19 06:09:47 UTC (rev 208213)
@@ -0,0 +1,48 @@
+https://bugs.gentoo.org/503234
+
+From 216c57eed72fee52e99bb5d014c9de535e631f58 Mon Sep 17 00:00:00 2001
+From: Zdenek Kabelac <zkabelac at redhat.com>
+Date: Thu, 6 Mar 2014 16:04:19 +0100
+Subject: [PATCH] readline: switch to new-style readline typedef
+
+Based on patch:
+https://www.redhat.com/archives/lvm-devel/2014-March/msg00015.html
+
+The CPPFunction typedef (among others) have been deprecated in favour of
+specific prototyped typedefs since readline 4.2 (circa 2001).
+It's been working since because compatibility typedefs have been in
+place until they where removed in the recent readline 6.3 release.
+Switch to the new style to avoid build breakage.
+
+But also add full backward compatibility with define.
+
+Signed-off-by: Gustavo Zacarias <gustavo zacarias com ar>
+---
+ WHATS_NEW   | 1 +
+ tools/lvm.c | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tools/lvm.c b/tools/lvm.c
+index 51e9293..f9ab438 100644
+--- a/tools/lvm.c
++++ b/tools/lvm.c
+@@ -27,6 +27,7 @@ int main(int argc, char **argv)
+ #  include <readline/history.h>
+ #  ifndef HAVE_RL_COMPLETION_MATCHES
+ #    define rl_completion_matches(a, b) completion_matches((char *)a, b)
++#    define rl_completion_func_t CPPFunction
+ #  endif
+ 
+ static struct cmdline_context *_cmdline;
+@@ -185,7 +186,7 @@ int lvm_shell(struct cmd_context *cmd, struct cmdline_context *cmdline)
+ 	char *input = NULL, *args[MAX_ARGS], **argv;
+ 
+ 	rl_readline_name = "lvm";
+-	rl_attempted_completion_function = (CPPFunction *) _completion;
++	rl_attempted_completion_function = (rl_completion_func_t *) _completion;
+ 
+ 	_read_history(cmd);
+ 
+-- 
+1.9.0
+