summaryrefslogtreecommitdiff
path: root/net-im/gaim/files
diff options
context:
space:
mode:
authorcvs2svn <cvs2svn@FreeBSD.org>2003-12-12 19:19:02 +0000
committercvs2svn <cvs2svn@FreeBSD.org>2003-12-12 19:19:02 +0000
commita0848d727648aa70f6a89c013203f2b82a4e972e (patch)
tree37ec8e378ec2d731e9ba9c15cd58724325a5637c /net-im/gaim/files
parentb6deb36621300a80aab2d23031a1a259f9b0ce01 (diff)
Diffstat (limited to 'net-im/gaim/files')
-rw-r--r--net-im/gaim/files/patch-configure24
-rw-r--r--net-im/gaim/files/patch-ltmain.sh51
-rw-r--r--net-im/gaim/files/patch-src::gtkconv.c30
3 files changed, 0 insertions, 105 deletions
diff --git a/net-im/gaim/files/patch-configure b/net-im/gaim/files/patch-configure
deleted file mode 100644
index 7ae55f0c90bd..000000000000
--- a/net-im/gaim/files/patch-configure
+++ /dev/null
@@ -1,24 +0,0 @@
---- configure.orig Thu Oct 9 20:05:15 2003
-+++ configure Fri Oct 10 13:22:18 2003
-@@ -16164,7 +16164,7 @@
-
- if test "x$prefix" != "xNONE"; then
- prefix=`eval echo $prefix`
-- PERL_MM_PARAMS="INSTALLDIRS=vendor PREFIX=$prefix"
-+ PERL_MM_PARAMS="INSTALLDIRS=vendor PREFIX=%%LOCALBASE%%"
- fi
-
-
-@@ -16915,10 +16915,10 @@
-
- enable_nss="no"
- 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
-
- echo "$as_me:$LINENO: checking for Mozilla nspr libraries" >&5
diff --git a/net-im/gaim/files/patch-ltmain.sh b/net-im/gaim/files/patch-ltmain.sh
deleted file mode 100644
index bb660972a6d1..000000000000
--- a/net-im/gaim/files/patch-ltmain.sh
+++ /dev/null
@@ -1,51 +0,0 @@
---- ltmain.sh.orig Thu May 22 16:42:22 2003
-+++ ltmain.sh Tue May 27 12:12:52 2003
-@@ -1072,7 +1072,7 @@
- esac
- elif test "X$arg" = "X-lc_r"; then
- case $host in
-- *-*-openbsd* | *-*-freebsd*)
-+ *-*-openbsd* | *-*-freebsd4*)
- # Do not include libc_r directly, use -pthread flag.
- continue
- ;;
-@@ -1082,8 +1082,16 @@
- continue
- ;;
-
-+ -pthread)
-+ compile_command="$compile_command -pthread"
-+ finalize_command="$finalize_command -pthread"
-+ compiler_flags="$compiler_flags -pthread"
-+ continue
-+ ;;
-+
- -module)
- module=yes
-+ build_old_libs=no
- continue
- ;;
-
-@@ -2498,6 +2506,9 @@
- *-*-openbsd* | *-*-freebsd*)
- # Do not include libc due to us having libc/libc_r.
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- # Add libc to deplibs on all other systems if necessary.
- if test $build_libtool_need_lc = "yes"; then
-@@ -4325,10 +4336,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false; then
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/net-im/gaim/files/patch-src::gtkconv.c b/net-im/gaim/files/patch-src::gtkconv.c
deleted file mode 100644
index ab1c804d46e1..000000000000
--- a/net-im/gaim/files/patch-src::gtkconv.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/gtkconv.c.orig Thu Aug 14 07:40:41 2003
-+++ src/gtkconv.c Mon Aug 25 16:34:55 2003
-@@ -1138,11 +1138,27 @@
- GaimConversation *conv;
- GaimGtkConversation *gtkconv;
- GaimGtkWindow *gtkwin;
-+ gboolean im_context_retval = FALSE;
-+ static guint32 last_event_time;
-
- conv = (GaimConversation *)data;
- gtkconv = GAIM_GTK_CONVERSATION(conv);
- win = gaim_conversation_get_window(conv);
- gtkwin = GAIM_GTK_WINDOW(win);
-+
-+ /*
-+ * Check if the input method handles this keyevent or we can use it.
-+ * We need to check the event time, otherwise the gtk xim module gets into an event loop (bug?)
-+ * Maybe this is not the best solution, but it works.
-+ */
-+
-+ if (last_event_time != event->time) {
-+ im_context_retval = gtk_im_context_filter_keypress(GTK_TEXT_VIEW(gtkconv->entry)->im_context, event);
-+ }
-+ last_event_time = event->time;
-+ if (im_context_retval == TRUE) {
-+ return TRUE;
-+ }
-
- if (event->keyval == GDK_Page_Up) {
- g_signal_stop_emission_by_name(G_OBJECT(entry), "key_press_event");