[packages/asterisk/ASTERISK_12] drop broken histedit.h include
jajcus
jajcus at pld-linux.org
Tue Jan 7 16:36:36 CET 2014
commit a27da6da391e0d3b8f2aa4c17de1730663a59a09
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date: Tue Jan 7 15:23:45 2014 +0100
drop broken histedit.h include
The right file is included earlier
asterisk-histedit.patch | 11 +++++++++++
asterisk.spec | 2 ++
2 files changed, 13 insertions(+)
---
diff --git a/asterisk.spec b/asterisk.spec
index 929c396..e527c22 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -49,6 +49,7 @@ Patch3: %{name}-ppc.patch
Patch4: FHS-paths.patch
Patch5: pld-banner.patch
Patch6: lpc10-system.patch
+Patch7: %{name}-histedit.patch
URL: http://www.asterisk.org/
BuildRequires: OSPToolkit-devel >= 4.0.0
BuildRequires: SDL_image-devel
@@ -506,6 +507,7 @@ API documentation for Asterisk.
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
# Fixup makefile so sound archives aren't downloaded/installed
%{__sed} -i -e 's/^all:.*$/all:/' sounds/Makefile
diff --git a/asterisk-histedit.patch b/asterisk-histedit.patch
new file mode 100644
index 0000000..682d1be
--- /dev/null
+++ b/asterisk-histedit.patch
@@ -0,0 +1,11 @@
+diff -dur asterisk-12.0.0.orig/main/asterisk.c asterisk-12.0.0/main/asterisk.c
+--- asterisk-12.0.0.orig/main/asterisk.c 2014-01-07 15:18:43.000000000 +0100
++++ asterisk-12.0.0/main/asterisk.c 2014-01-07 15:18:21.000000000 +0100
+@@ -223,7 +223,6 @@
+ #include "asterisk/utils.h"
+ #include "asterisk/file.h"
+ #include "asterisk/io.h"
+-#include "editline/histedit.h"
+ #include "asterisk/config.h"
+ #include "asterisk/ast_version.h"
+ #include "asterisk/linkedlists.h"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/asterisk.git/commitdiff/ae59ee51a1d34f333d714ea6c75bea73657d6d5b
More information about the pld-cvs-commit
mailing list