diff options
Diffstat (limited to 'net-im/gaim/files')
| -rw-r--r-- | net-im/gaim/files/digest-gaim-2.0.0_beta4 | 3 | ||||
| -rw-r--r-- | net-im/gaim/files/digest-gaim-2.0.0_beta4-r1 | 3 | ||||
| -rw-r--r-- | net-im/gaim/files/digest-gaim-2.0.0_beta4-r2 | 3 | ||||
| -rw-r--r-- | net-im/gaim/files/gaim-2.0.0_beta3-as-needed.patch | 11 | ||||
| -rw-r--r-- | net-im/gaim/files/gaim-2.0.0_beta3-avahi-compat.patch | 30 | ||||
| -rw-r--r-- | net-im/gaim/files/gaim-2.0.0_beta3-dbus-1.patch | 73 | ||||
| -rw-r--r-- | net-im/gaim/files/gaim-2.0.0_beta4-configure.patch | 79 | ||||
| -rw-r--r-- | net-im/gaim/files/gaim-2.0.0_beta4-dbus.patch | 62 |
8 files changed, 0 insertions, 264 deletions
diff --git a/net-im/gaim/files/digest-gaim-2.0.0_beta4 b/net-im/gaim/files/digest-gaim-2.0.0_beta4 deleted file mode 100644 index db30a0a3dd8a..000000000000 --- a/net-im/gaim/files/digest-gaim-2.0.0_beta4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 ddf49cb3f95febdd26bf2214875446e6 gaim-2.0.0beta4.tar.bz2 6298151 -RMD160 c9c5931fc2b2bf1c5bc524e6dc2b68c28a6570f1 gaim-2.0.0beta4.tar.bz2 6298151 -SHA256 08436e3fcb4caa61b92551e5e2c092ea94caae6520d50c479a164b93caedb820 gaim-2.0.0beta4.tar.bz2 6298151 diff --git a/net-im/gaim/files/digest-gaim-2.0.0_beta4-r1 b/net-im/gaim/files/digest-gaim-2.0.0_beta4-r1 deleted file mode 100644 index db30a0a3dd8a..000000000000 --- a/net-im/gaim/files/digest-gaim-2.0.0_beta4-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 ddf49cb3f95febdd26bf2214875446e6 gaim-2.0.0beta4.tar.bz2 6298151 -RMD160 c9c5931fc2b2bf1c5bc524e6dc2b68c28a6570f1 gaim-2.0.0beta4.tar.bz2 6298151 -SHA256 08436e3fcb4caa61b92551e5e2c092ea94caae6520d50c479a164b93caedb820 gaim-2.0.0beta4.tar.bz2 6298151 diff --git a/net-im/gaim/files/digest-gaim-2.0.0_beta4-r2 b/net-im/gaim/files/digest-gaim-2.0.0_beta4-r2 deleted file mode 100644 index db30a0a3dd8a..000000000000 --- a/net-im/gaim/files/digest-gaim-2.0.0_beta4-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 ddf49cb3f95febdd26bf2214875446e6 gaim-2.0.0beta4.tar.bz2 6298151 -RMD160 c9c5931fc2b2bf1c5bc524e6dc2b68c28a6570f1 gaim-2.0.0beta4.tar.bz2 6298151 -SHA256 08436e3fcb4caa61b92551e5e2c092ea94caae6520d50c479a164b93caedb820 gaim-2.0.0beta4.tar.bz2 6298151 diff --git a/net-im/gaim/files/gaim-2.0.0_beta3-as-needed.patch b/net-im/gaim/files/gaim-2.0.0_beta3-as-needed.patch deleted file mode 100644 index 066e2c5e4ffe..000000000000 --- a/net-im/gaim/files/gaim-2.0.0_beta3-as-needed.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile.am.org 2006-05-05 19:09:26.785534520 -0500 -+++ src/Makefile.am 2006-05-05 19:09:38.371773144 -0500 -@@ -199,6 +199,8 @@ - - libgaim_client_la_SOURCES = gaim-client.c gaim-client.h - -+libgaim_client_la_LIBADD = $(DBUS_LIBS) -+ - gaim-client-bindings.c: dbus-analyze-functions.py $(dbus_exported) - cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client > $@ - diff --git a/net-im/gaim/files/gaim-2.0.0_beta3-avahi-compat.patch b/net-im/gaim/files/gaim-2.0.0_beta3-avahi-compat.patch deleted file mode 100644 index 2520e7233d7e..000000000000 --- a/net-im/gaim/files/gaim-2.0.0_beta3-avahi-compat.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ur gaim-2.0.0beta3/configure.ac gaim-2.0.0beta3-patched/configure.ac ---- gaim-2.0.0beta3/configure.ac 2006-03-26 07:45:35.000000000 +0000 -+++ gaim-2.0.0beta3-patched/configure.ac 2006-05-07 23:13:46.000000000 +0000 -@@ -183,15 +183,17 @@ - HOWL_CFLAGS="" - HOWL_LIBS="" - --dnl Attempt to autodetect Howl --PKG_CHECK_MODULES(HOWL, howl, [ -- howlincludes="yes" -- howllibs="yes" -- ], [ -- AC_MSG_RESULT(no) -- howlincludes="no" -- howllibs="no" -- ]) -+dnl First we attempt to use avahi-compat-howl -+PKG_CHECK_MODULES(HOWL, avahi-compat-howl, -+ [howlincludes="yes" howllibs="yes"], -+ [howlincludes="no" howllibs="no"]) -+ -+dnl If that fails, autodetect the "real" howl -+if test "$howlincludes" = "no" ; then -+ PKG_CHECK_MODULES(HOWL, howl, -+ [howlincludes="yes" howllibs="yes"], -+ [howlincludes="no" howllibs="no"]) -+fi - - dnl Override HOWL_CFLAGS if the user specified an include dir - if test "$ac_howl_includes" != "no"; then diff --git a/net-im/gaim/files/gaim-2.0.0_beta3-dbus-1.patch b/net-im/gaim/files/gaim-2.0.0_beta3-dbus-1.patch deleted file mode 100644 index c372eaebfcf2..000000000000 --- a/net-im/gaim/files/gaim-2.0.0_beta3-dbus-1.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -Nur gaim-2.0.0+beta3/configure.ac gaim-2.0.0+beta3.new/configure.ac ---- gaim-2.0.0+beta3/configure.ac 2006-08-18 16:10:38.000000000 +0200 -+++ gaim-2.0.0+beta3.new/configure.ac 2006-08-18 16:10:39.000000000 +0200 -@@ -587,7 +587,7 @@ - AM_PATH_GLIB_2_0(2.0.0,,AC_MSG_ERROR([ - *** GLib 2.0 is required to build Gaim; please make sure you have the GLib - *** development headers installed. The latest version of GLib is --*** always available at http://www.gtk.org/.])) -+*** always available at http://www.gtk.org/.]),gthread) - AM_PATH_GTK_2_0(2.0.0,,AC_MSG_ERROR([ - *** GTK+ 2.0 is required to build Gaim; please make sure you have the GTK+ - *** development headers installed. The latest version of GTK+ is -diff -Nur gaim-2.0.0+beta3/src/dbus-server.c gaim-2.0.0+beta3.new/src/dbus-server.c ---- gaim-2.0.0+beta3/src/dbus-server.c 2006-02-11 06:25:47.000000000 +0100 -+++ gaim-2.0.0+beta3.new/src/dbus-server.c 2006-08-18 16:10:39.000000000 +0200 -@@ -710,6 +710,8 @@ - - gboolean gaim_dbus_init(void) - { -+ if (g_thread_supported()) -+ dbus_g_thread_init(); - gaim_dbus_init_ids(); - return gaim_dbus_dispatch_init() ; - } -diff -Nur gaim-2.0.0+beta3/src/gtkmain.c gaim-2.0.0+beta3.new/src/gtkmain.c ---- gaim-2.0.0+beta3/src/gtkmain.c 2006-03-07 05:45:22.000000000 +0100 -+++ gaim-2.0.0+beta3.new/src/gtkmain.c 2006-08-18 16:10:39.000000000 +0200 -@@ -65,6 +65,7 @@ - #include "gtkstock.h" - #include "gtkwhiteboard.h" - -+#include <glib/gthread.h> - #ifdef HAVE_SIGNAL_H - # include <signal.h> - #endif -@@ -643,6 +644,15 @@ - gtk_rc_add_default_file(search_path); - g_free(search_path); - -+#if (defined(G_THREADS_ENABLED) && !defined(G_THREADS_IMPL_NONE)) -+ /* Since threads can be yanked in all unawares by other libraries, -+ * and some libraries aren't smart enough to initialize the thread -+ * subsystem when they need it, we need to do this here. We also -+ * threadify dbus when that gets initialized. Ugh. */ -+ if (!g_thread_supported()) -+ g_thread_init(NULL); -+ gdk_threads_init(); -+#endif /* Glib has threads */ - - gui_check = gtk_init_check(&argc, &argv); - if (!gui_check) { -diff -Nur gaim-2.0.0+beta3/src/Makefile.am gaim-2.0.0+beta3.new/src/Makefile.am ---- gaim-2.0.0+beta3/src/Makefile.am 2006-03-25 16:45:49.000000000 +0100 -+++ gaim-2.0.0+beta3.new/src/Makefile.am 2006-08-18 16:10:39.000000000 +0200 -@@ -334,6 +334,7 @@ - gaim_LDFLAGS = -export-dynamic - gaim_LDADD = \ - @LIBOBJS@ \ -+ $(GLIB_LIBS) \ - $(GTK_LIBS) \ - $(DBUS_LIBS) \ - $(SOUND_LIBS) \ -diff -Nur gaim-2.0.0+beta3/src/Makefile.in gaim-2.0.0+beta3.new/src/Makefile.in ---- gaim-2.0.0+beta3/src/Makefile.in 2006-03-29 00:39:14.000000000 +0200 -+++ gaim-2.0.0+beta3.new/src/Makefile.in 2006-08-18 16:11:20.000000000 +0200 -@@ -772,6 +772,7 @@ - gaim_LDFLAGS = -export-dynamic - gaim_LDADD = \ - @LIBOBJS@ \ -+ $(GLIB_LIBS) \ - $(GTK_LIBS) \ - $(DBUS_LIBS) \ - $(SOUND_LIBS) \ diff --git a/net-im/gaim/files/gaim-2.0.0_beta4-configure.patch b/net-im/gaim/files/gaim-2.0.0_beta4-configure.patch deleted file mode 100644 index 37b345ecbf03..000000000000 --- a/net-im/gaim/files/gaim-2.0.0_beta4-configure.patch +++ /dev/null @@ -1,79 +0,0 @@ -Index: configure.ac -=================================================================== ---- configure.ac (revision 17552) -+++ configure.ac (working copy) -@@ -186,27 +186,27 @@ - AC_ARG_ENABLE(screensaver, - [AC_HELP_STRING([--disable-screensaver], - [compile without X screensaver extension (used to detect idleness)])], -- enable_screensaver="no", enable_screensaver="yes") -+ enable_screensaver="$enableval", enable_screensaver="yes") - AC_ARG_ENABLE(sm, - [AC_HELP_STRING([--disable-sm], - [compile without X session management support])], -- enable_sm="no", enable_sm="yes") -+ enable_sm="$enableval", enable_sm="yes") - AC_ARG_ENABLE(startup-notification, - [AC_HELP_STRING([--disable-startup-notification], - [compile without startup notification support])], -- enable_startup_notification="no", enable_startup_notification="yes") -+ enable_startup_notification="$enableval", enable_startup_notification="yes") - AC_ARG_ENABLE(gtkspell, - [AC_HELP_STRING([--disable-gtkspell], - [compile without GtkSpell automatic spell checking])], -- enable_gtkspell="no", enable_gtkspell="yes") -+ enable_gtkspell="$enableval", enable_gtkspell="yes") - AC_ARG_ENABLE(gevolution, - [AC_HELP_STRING([--disable-gevolution], - [compile without the Gaim Evolution plugin])], -- enable_gevolution="no", enable_gevolution="yes") -+ enable_gevolution="$enableval", enable_gevolution="yes") - AC_ARG_ENABLE(cap, - [AC_HELP_STRING([--disable-cap], - [compile without Contact Availability Prediction plugin])], -- enable_cap="no", enable_cap="yes") -+ enable_cap="$enableval", enable_cap="yes") - - - AC_PATH_XTRA -@@ -455,7 +455,7 @@ - dnl ####################################################################### - AC_ARG_ENABLE(gstreamer, - [AC_HELP_STRING([--disable-gstreamer], [compile without GStreamer audio support])], -- enable_gst="no", enable_gst="yes") -+ enable_gst="$enableval", enable_gst="yes") - PKG_CHECK_MODULES(GSTREAMER, [gstreamer-0.10], , [ - AC_MSG_RESULT(no) - enable_gst="no" -@@ -1564,7 +1564,7 @@ - dnl # Check for Tcl - dnl ####################################################################### - AC_ARG_ENABLE(tcl, [AC_HELP_STRING([--disable-tcl], -- [compile without Tcl scripting])], enable_tcl="no", enable_tcl="yes") -+ [compile without Tcl scripting])], enable_tcl="$enableval", enable_tcl="yes") - AC_ARG_WITH(tclconfig, [AC_HELP_STRING([--with-tclconfig=DIR], - [directory containing tclConfig.sh])]) - -@@ -1633,7 +1633,7 @@ - dnl # Check for Tk - dnl ####################################################################### - AC_ARG_ENABLE(tk, [AC_HELP_STRING([--disable-tk], -- [compile without Tcl support for Tk])], enable_tk="no", enable_tk="yes") -+ [compile without Tcl support for Tk])], enable_tk="$enableval", enable_tk="yes") - AC_ARG_WITH(tkconfig, [AC_HELP_STRING([--with-tkconfig=DIR], - [directory containing tkConfig.sh])]) - -@@ -1812,11 +1812,11 @@ - AC_ARG_ENABLE(doxygen, - [AC_HELP_STRING([--disable-doxygen], - [enable documentation with doxygen])], -- enable_doxygen="no", enable_doxygen="yes") -+ enable_doxygen="$enableval", enable_doxygen="yes") - AC_ARG_ENABLE(dot, - [AC_HELP_STRING([--enable-dot], - [enable graphs in doxygen via 'dot'])], -- enable_dot="no", enable_dot="yes") -+ enable_dot="$enableval", enable_dot="yes") - - if test "x$enable_doxygen" = xyes; then - AC_CHECK_PROG(DOXYGEN, doxygen, true, false) diff --git a/net-im/gaim/files/gaim-2.0.0_beta4-dbus.patch b/net-im/gaim/files/gaim-2.0.0_beta4-dbus.patch deleted file mode 100644 index a77178a28f0c..000000000000 --- a/net-im/gaim/files/gaim-2.0.0_beta4-dbus.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -Nru gaim-2.0.0beta4-old/gtk/Makefile.am gaim-2.0.0beta4/gtk/Makefile.am ---- gaim-2.0.0beta4-old/gtk/Makefile.am 2006-10-18 12:37:48.000000000 -0500 -+++ gaim-2.0.0beta4/gtk/Makefile.am 2006-10-19 12:36:13.000000000 -0500 -@@ -161,6 +161,7 @@ - gaim_LDFLAGS = -export-dynamic - gaim_LDADD = \ - @LIBOBJS@ \ -+ $(GLIB_LIBS) \ - $(DBUS_LIBS) \ - $(GSTREAMER_LIBS) \ - $(STATIC_LINK_LIBS) \ -diff -Nru gaim-2.0.0beta4-old/gtk/Makefile.in gaim-2.0.0beta4/gtk/Makefile.in ---- gaim-2.0.0beta4-old/gtk/Makefile.in 2006-10-18 15:00:12.000000000 -0500 -+++ gaim-2.0.0beta4/gtk/Makefile.in 2006-10-19 12:37:26.000000000 -0500 -@@ -611,6 +611,7 @@ - @ENABLE_GTK_TRUE@gaim_LDFLAGS = -export-dynamic - @ENABLE_GTK_TRUE@gaim_LDADD = \ - @ENABLE_GTK_TRUE@ @LIBOBJS@ \ -+@ENABLE_GTK_TRUE@ $(GLIB_LIBS) \ - @ENABLE_GTK_TRUE@ $(DBUS_LIBS) \ - @ENABLE_GTK_TRUE@ $(GSTREAMER_LIBS) \ - @ENABLE_GTK_TRUE@ $(STATIC_LINK_LIBS) \ -diff -Nru gaim-2.0.0beta4-old/gtk/gtkmain.c gaim-2.0.0beta4/gtk/gtkmain.c ---- gaim-2.0.0beta4-old/gtk/gtkmain.c 2006-10-18 12:37:48.000000000 -0500 -+++ gaim-2.0.0beta4/gtk/gtkmain.c 2006-10-19 12:42:42.000000000 -0500 -@@ -65,6 +65,7 @@ - #include "gtkutils.h" - #include "gaimstock.h" - #include "gtkwhiteboard.h" -+#include <glib/gthread.h> - - #ifdef HAVE_SIGNAL_H - # include <signal.h> -@@ -675,6 +676,16 @@ - gtk_rc_add_default_file(search_path); - g_free(search_path); - -+#if (defined(G_THREADS_ENABLED) && !defined(G_THREADS_IMPL_NONE)) -+ /* Since threads can be yanked in all unawares by other libraries, -+ * and some libraries aren't smart enough to initialize the thread -+ * subsystem when they need it, we need to do this here. We also -+ * threadify dbus when that gets initialized. Ugh. */ -+ if (!g_thread_supported()) -+ g_thread_init(NULL); -+ gdk_threads_init(); -+#endif /* Glib has threads */ -+ - gui_check = gtk_init_check(&argc, &argv); - if (!gui_check) { - char *display = gdk_get_display(); -diff -Nru gaim-2.0.0beta4-old/libgaim/dbus-server.c gaim-2.0.0beta4/libgaim/dbus-server.c ---- gaim-2.0.0beta4-old/libgaim/dbus-server.c 2006-10-18 12:38:16.000000000 -0500 -+++ gaim-2.0.0beta4/libgaim/dbus-server.c 2006-10-19 12:34:57.000000000 -0500 -@@ -758,6 +758,8 @@ - void - gaim_dbus_init(void) - { -+ if(g_thread_supported()) -+ dbus_g_thread_init(); - gaim_dbus_init_ids(); - - g_free(init_error); |