OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 04-Jul-2008 19:52:47
Branch: HEAD Handle: 2008070418524700
Modified files:
openpkg-src/asterisk asterisk.patch asterisk.spec
Log:
fix building against GMIME 2.3.x
Summary:
Revision Changes Path
1.41 +20 -1 openpkg-src/asterisk/asterisk.patch
1.74 +3 -0 openpkg-src/asterisk/asterisk.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.patch
============================================================================
$ cvs diff -u -r1.40 -r1.41 asterisk.patch
--- openpkg-src/asterisk/asterisk.patch 7 May 2008 07:06:56 -0000
1.40
+++ openpkg-src/asterisk/asterisk.patch 4 Jul 2008 17:52:47 -0000
1.41
@@ -78,7 +78,7 @@
+
+#include "asterisk.h"
+
-+ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.40 $")
++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.41 $")
+
+#include <stdio.h>
+#include <asterisk/file.h>
@@ -430,3 +430,22 @@
</member>
<member name="EXTRA-SOUNDS-EN-GSM" displayname="English, GSM
format" >
</member>
+Index: main/http.c
+--- main/http.c.orig 2008-04-24 00:54:41 +0200
++++ main/http.c 2008-07-04 19:41:01 +0200
+@@ -417,14 +417,8 @@
+ ast_log(LOG_WARNING, "Got unexpected
GMIME_IS_MESSAGE_PARTIAL\n");
+ return;
+ } else if (GMIME_IS_MULTIPART(part)) {
+- GList *l;
+-
+ ast_log(LOG_WARNING, "Got unexpected GMIME_IS_MULTIPART, trying
to process subparts\n");
+- l = GMIME_MULTIPART (part)->subparts;
+- while (l) {
+- process_message_callback(l->data, cbinfo);
+- l = l->next;
+- }
++ g_mime_multipart_foreach(GMIME_MULTIPART(part),
process_message_callback, cbinfo);
+ } else if (GMIME_IS_PART(part)) {
+ const char *filename;
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.spec
============================================================================
$ cvs diff -u -r1.73 -r1.74 asterisk.spec
--- openpkg-src/asterisk/asterisk.spec 4 Jul 2008 07:25:14 -0000
1.73
+++ openpkg-src/asterisk/asterisk.spec 4 Jul 2008 17:52:47 -0000
1.74
@@ -219,6 +219,8 @@
-e 's;lua5.1/lua.h;lua/lua.h;' \
-e 's;ffmpeg/avcodec.h;libavcodec/avcodec.h;' \
configure
+ ( echo "ac_cv_prog_CONFIG_GMIME='pkg-config gmime-2.4'"
+ ) >config.cache
cflags="%{l_cflags -O}"
cppflags="%{l_cppflags ncurses lua .}"
ldflags="%{l_ldflags}"
@@ -242,6 +244,7 @@
LDFLAGS="$ldflags" \
LIBS="$libs" \
./configure \
+ --cache-file=./config.cache \
--prefix=%{l_prefix} \
--mandir=%{l_prefix}/man \
--sysconfdir=%{l_prefix}/etc \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
