From: zandbelt <zandbelt@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 22 Aug 2011 11:26:02 +0000 (+0000)
Subject: [packages] asterisk-1.8.x: refresh patches
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=ebf7e69f6182fbfc173155e798921f06a8c3e667;p=packages.git

[packages] asterisk-1.8.x: refresh patches

git-svn-id: svn://svn.openwrt.org/openwrt/packages@28072 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/net/asterisk-1.8.x/patches/100-build_tools-iconv.patch b/net/asterisk-1.8.x/patches/100-build_tools-iconv.patch
index 1073bda9e..d3cad8252 100644
--- a/net/asterisk-1.8.x/patches/100-build_tools-iconv.patch
+++ b/net/asterisk-1.8.x/patches/100-build_tools-iconv.patch
@@ -1,6 +1,6 @@
 --- a/build_tools/menuselect-deps.in
 +++ b/build_tools/menuselect-deps.in
-@@ -14,7 +14,7 @@ GTK2=@PBX_GTK2@
+@@ -16,7 +16,7 @@ GTK2=@PBX_GTK2@
  H323=@PBX_H323@
  HOARD=@PBX_HOARD@
  ICAL=@PBX_ICAL@
diff --git a/net/asterisk-1.8.x/patches/300-word_alignment_arm.patch b/net/asterisk-1.8.x/patches/300-word_alignment_arm.patch
index 12d5551c1..0f865f916 100644
--- a/net/asterisk-1.8.x/patches/300-word_alignment_arm.patch
+++ b/net/asterisk-1.8.x/patches/300-word_alignment_arm.patch
@@ -1,6 +1,6 @@
 --- a/main/utils.c
 +++ b/main/utils.c
-@@ -1632,7 +1632,7 @@ ast_string_field __ast_string_field_allo
+@@ -1635,7 +1635,7 @@ ast_string_field __ast_string_field_allo
  	}
  
  	result = (*pool_head)->base + (*pool_head)->used;
@@ -9,7 +9,7 @@
  	/* SPARC requires that the allocation field be aligned. */
  	if ((long) result % sizeof(ast_string_field_allocation)) {
  		result++;
-@@ -1713,7 +1713,7 @@ void __ast_string_field_ptr_build_va(str
+@@ -1716,7 +1716,7 @@ void __ast_string_field_ptr_build_va(str
  		}
  	} else {
  		target = (*pool_head)->base + (*pool_head)->used + sizeof(ast_string_field_allocation);