diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-12-28 03:19:07 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-12-28 03:19:07 +0800 |
| commit | 023cce30a4f634bd1a436a6480094992a83a804b (patch) | |
| tree | 482c33de4aa40204a5b8fa039e7a502ad34a92bf /net/gaim/files | |
| parent | 1af369e1e8ab89cbd812e181a34c22f1be847441 (diff) | |
| download | marcuscom-ports-023cce30a4f634bd1a436a6480094992a83a804b.tar marcuscom-ports-023cce30a4f634bd1a436a6480094992a83a804b.tar.gz marcuscom-ports-023cce30a4f634bd1a436a6480094992a83a804b.tar.bz2 marcuscom-ports-023cce30a4f634bd1a436a6480094992a83a804b.tar.lz marcuscom-ports-023cce30a4f634bd1a436a6480094992a83a804b.tar.xz marcuscom-ports-023cce30a4f634bd1a436a6480094992a83a804b.tar.zst marcuscom-ports-023cce30a4f634bd1a436a6480094992a83a804b.zip | |
Add gaim, and fix the build with e-d-s 1.1.
Submitted by: ade
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3334 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'net/gaim/files')
| -rw-r--r-- | net/gaim/files/patch-configure | 26 | ||||
| -rw-r--r-- | net/gaim/files/patch-src_gtkimhtml.c | 22 | ||||
| -rw-r--r-- | net/gaim/files/patch-src_protocols_oscar_ft.c | 10 | ||||
| -rw-r--r-- | net/gaim/files/patch-src_protocols_oscar_oscar.c | 11 |
4 files changed, 69 insertions, 0 deletions
diff --git a/net/gaim/files/patch-configure b/net/gaim/files/patch-configure new file mode 100644 index 000000000..a21e2b844 --- /dev/null +++ b/net/gaim/files/patch-configure @@ -0,0 +1,26 @@ +--- configure.orig Thu Dec 2 20:24:48 2004 ++++ configure Sun Dec 26 10:49:39 2004 +@@ -30860,3 +30860,3 @@ + if test "x$enable_gevolution" = "xyes"; then +- evo_deps="libxml-2.0 libebook-1.0 libedata-book-1.0" ++ evo_deps="libxml-2.0 libebook-1.2 libedata-book-1.2" + +@@ -30963,3 +30963,3 @@ + echo $ECHO_N "checking libebook version... $ECHO_C" >&6 +- LIBEBOOK_VERSION=`$PKG_CONFIG --modversion libebook-1.0` ++ LIBEBOOK_VERSION=`$PKG_CONFIG --modversion libebook-1.2` + LIBEBOOK_MAJOR_VER=`echo $LIBEBOOK_VERSION | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` +@@ -31908,3 +31908,3 @@ + prefix=`eval echo $prefix` +- PERL_MM_PARAMS="INSTALLDIRS=vendor PREFIX=$prefix" ++ PERL_MM_PARAMS="INSTALLDIRS=vendor PREFIX=%%LOCALBASE%%" + fi +@@ -32685,6 +32685,6 @@ + else +- nsprlibs="-ldl $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB" ++ nsprlibs="$with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB" + fi + else +- nsprlibs="-ldl -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB" ++ nsprlibs="-lplc4 -lplds4 -lnspr4 $PTHREAD_LIB" + fi diff --git a/net/gaim/files/patch-src_gtkimhtml.c b/net/gaim/files/patch-src_gtkimhtml.c new file mode 100644 index 000000000..9430baae1 --- /dev/null +++ b/net/gaim/files/patch-src_gtkimhtml.c @@ -0,0 +1,22 @@ +--- src/gtkimhtml.c.orig Sun May 30 18:17:14 2004 ++++ src/gtkimhtml.c Sun May 30 18:19:47 2004 +@@ -782,7 +782,7 @@ + if (selection_data->length >= 2 && + (*(guint16 *)text == 0xfeff || *(guint16 *)text == 0xfffe)) { + /* This is UCS-2 */ +- char *tmp; ++ /*char *tmp;*/ + char *utf8 = g_convert(text, selection_data->length, "UTF-8", "UCS-2", NULL, NULL, NULL); + g_free(text); + text = utf8; +@@ -790,8 +790,8 @@ + gaim_debug_warning("gtkimhtml", "g_convert from UCS-2 failed in paste_received_cb\n"); + return; + } +- tmp = g_utf8_next_char(text); +- memmove(text, tmp, strlen(tmp) + 1); ++ /*tmp = g_utf8_next_char(text);*/ ++ /*memmove(text, tmp, strlen(tmp) + 1);*/ + } + + if (!(*text) || !g_utf8_validate(text, -1, NULL)) { diff --git a/net/gaim/files/patch-src_protocols_oscar_ft.c b/net/gaim/files/patch-src_protocols_oscar_ft.c new file mode 100644 index 000000000..926db5f44 --- /dev/null +++ b/net/gaim/files/patch-src_protocols_oscar_ft.c @@ -0,0 +1,10 @@ +--- src/protocols/oscar/ft.c.orig Sat Jan 10 14:05:46 2004 ++++ src/protocols/oscar/ft.c Sat Jan 10 14:07:58 2004 +@@ -49,6 +49,7 @@ + #ifndef _WIN32 + #include <stdio.h> + #include <netdb.h> ++#include <limits.h> + #include <sys/socket.h> + #include <netinet/in.h> + #include <sys/utsname.h> /* for aim_odc_initiate */ diff --git a/net/gaim/files/patch-src_protocols_oscar_oscar.c b/net/gaim/files/patch-src_protocols_oscar_oscar.c new file mode 100644 index 000000000..43a291b29 --- /dev/null +++ b/net/gaim/files/patch-src_protocols_oscar_oscar.c @@ -0,0 +1,11 @@ +--- src/protocols/oscar/oscar.c.orig Wed Aug 25 21:29:00 2004 ++++ src/protocols/oscar/oscar.c Thu Aug 26 21:55:32 2004 +@@ -3247,7 +3247,7 @@ + * Note: There *may* be some clients which send messages as HTML formatted - + * they need to be special-cased somehow. + */ +- if (isdigit(gaim_account_get_username(account)[0]) && isdigit(userinfo->sn[0])) { ++ if (isdigit(gaim_account_get_username(account)[0]) && isdigit(userinfo->sn[0]) && g_strncasecmp(tmp, "<HTML>", 6)) { + /* being recevied by ICQ from ICQ - escape HTML so it is displayed as sent */ + gchar *tmp2 = gaim_escape_html(tmp); + g_free(tmp); |