aboutsummaryrefslogtreecommitdiff
path: root/net-im/gaim/files
diff options
context:
space:
mode:
authorcvs2svn <cvs2svn@FreeBSD.org>2003-01-16 05:08:57 +0000
committercvs2svn <cvs2svn@FreeBSD.org>2003-01-16 05:08:57 +0000
commitdf3e7e93b8317ece24fbe7d0c9e4aa1ebb0feca0 (patch)
tree1d9ecedb74d255866c8e1e5df9db0f2739a8ba66 /net-im/gaim/files
parentc31f9d6cf28e3aa831ff2390ee3ab6ea031dbc76 (diff)
Notes
Diffstat (limited to 'net-im/gaim/files')
-rw-r--r--net-im/gaim/files/patch-aa13
-rw-r--r--net-im/gaim/files/patch-ab32
-rw-r--r--net-im/gaim/files/patch-ac153
-rw-r--r--net-im/gaim/files/patch-configure10
-rw-r--r--net-im/gaim/files/patch-src_protocols_yahoo_yahoo.c49
5 files changed, 0 insertions, 257 deletions
diff --git a/net-im/gaim/files/patch-aa b/net-im/gaim/files/patch-aa
deleted file mode 100644
index 77386c4d30d5..000000000000
--- a/net-im/gaim/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.in.orig Fri Nov 2 05:31:32 2001
-+++ Makefile.in Fri Nov 2 05:33:10 2001
-@@ -171,8 +171,8 @@
- @DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdesktopdir = $(gnomedata)/applets/Network
- @DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdesktop_DATA = $(gaim_DESKTOP)
-
--pixmapdir = $(datadir)/apps/Internet
--pixmap_DATA = gaim.desktop
-+@GNOMEAPPLET_TRUE@pixmapdir = $(datadir)/apps/Internet
-+@GNOMEAPPLET_TRUE@pixmap_DATA = gaim.desktop
-
- SUBDIRS = m4 sounds plugins pixmaps doc po intl src
- ACLOCAL_AMFLAGS = -I m4
diff --git a/net-im/gaim/files/patch-ab b/net-im/gaim/files/patch-ab
deleted file mode 100644
index 04fdc2944d22..000000000000
--- a/net-im/gaim/files/patch-ab
+++ /dev/null
@@ -1,32 +0,0 @@
---- pixmaps/Makefile.in.orig Sat Oct 19 18:47:14 2002
-+++ pixmaps/Makefile.in Sat Oct 19 18:48:03 2002
-@@ -150,22 +150,15 @@
- EXTRA_DIST = ab.xpm about_small.xpm add.xpm add_small.xpm admin_icon.xpm aimicon.xpm angel.xpm arrow_down.xpm arrow_right.xpm aol_icon.xpm available-away.xpm available-chat.xpm available-dnd.xpm available-error.xpm available-xa.xpm available.xpm away.png away_big.xpm away_icon.xpm away_small.xpm bgcolor.xpm big.xpm bigsmile.xpm block.xpm bold.xpm broken.xpm burp.xpm cancel.xpm close.xpm close_small.xpm connect.png crazy4.xpm crossedlips.xpm cry.xpm dt_icon.xpm download.xpm embarrassed.xpm exit_small.xpm farted.xpm fgcolor.xpm fontface.xpm fontface2.xpm free_icon.xpm gaim.png gaim.xpm gg_suncloud.xpm gg_sunred.xpm gg_sunwhitered.xpm gg_sunyellow.xpm gnome_add.xpm gnome_preferences.xpm gnome_remove.xpm gnomeicu-away.xpm gnomeicu-dnd.xpm gnomeicu-ffc.xpm gnomeicu-na.xpm gnomeicu-occ.xpm gnomeicu-offline.xpm gnomeicu-online.xpm group.xpm image_icon.xpm import_small.xpm irc_icon.xpm italic.xpm join.xpm kiss.xpm link.xpm login_icon.xpm logo.xpm logout_icon.xpm logout_menu.xpm luke03.xpm moneymouth.xpm mrt.xpm msgpend.png msn_away.xpm msn_occ.xpm msn_online.xpm napster.xpm no_icon.xpm normal.xpm offline.png ok.xpm oneeye.xpm online.png panic.xpm plugins_small.xpm pounce_small.xpm prefs_small.xpm refresh.xpm sad.xpm save.xpm save_small.xpm scream.xpm search_small.xpm send_small.xpm small.xpm smile.xpm smile8.xpm smile_icon.xpm speaker.xpm speaker_mute.xpm status-away.xpm status-game.xpm status-here.xpm status-idle.xpm strike.xpm tb_forward.xpm tb_redo.xpm tb_refresh.xpm tb_search.xpm tb_undo.xpm think.xpm tmp_send.xpm tongue.xpm underline.xpm warn.xpm wink.xpm wireless_icon.xpm wood.xpm yell.xpm
-
-
--@DISTRIB_TRUE@gaimdistpixdir = $(datadir)/pixmaps/gaim
--@DISTRIB_TRUE@gaimdistpix_DATA = away.png connect.png msgpend.png offline.png online.png
-+@GNOMEAPPLET_TRUE@gnomedata = `@GNOME_CONFIG@ --datadir`
-+@GNOMEAPPLET_TRUE@gaimdistpmdir = $(gnomedata)/pixmaps/gaim
-+@GNOMEAPPLET_TRUE@gaimdistpm_DATA = away.png connect.png msgpend.png offline.png online.png
-+@GNOMEAPPLET_TRUE@gaimpixmapdir = $(gnomedata)/pixmaps
-+@GNOMEAPPLET_TRUE@gaimpixmap_DATA = gaim.png
-
--@DISTRIB_TRUE@distpixmapdir = $(datadir)/pixmaps
--@DISTRIB_TRUE@distpixmap_DATA = gaim.png
-+pixmapdir = $(datadir)/pixmaps
-+pixmap_DATA = gaim.png
-
--@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gnomedata = `@GNOME_CONFIG@ --datadir`
--
--@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdistpmdir = $(gnomedata)/pixmaps/gaim
--@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdistpm_DATA = away.png connect.png msgpend.png offline.png online.png
--
--@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimpixmapdir = $(gnomedata)/pixmaps
--@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimpixmap_DATA = gaim.png
--
--@DISTRIB_FALSE@@GNOMEAPPLET_FALSE@pixmapdir = $(datadir)/pixmaps
--@DISTRIB_FALSE@@GNOMEAPPLET_FALSE@pixmap_DATA = gaim.png
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES =
diff --git a/net-im/gaim/files/patch-ac b/net-im/gaim/files/patch-ac
deleted file mode 100644
index 271d7294bd83..000000000000
--- a/net-im/gaim/files/patch-ac
+++ /dev/null
@@ -1,153 +0,0 @@
---- src/Makefile.in.orig Fri Mar 15 06:13:34 2002
-+++ src/Makefile.in Fri Mar 15 06:22:03 2002
-@@ -146,16 +146,74 @@
- sedpath = @sedpath@
-
- SUBDIRS = protocols
--@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet
-+@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet gaim
- @GNOMEAPPLET_FALSE@bin_PROGRAMS = gaim
--@GNOMEAPPLET_TRUE@gaim_applet_SOURCES = about.c aim.c applet.c away.c browser.c buddy.c buddy_chat.c conversation.c core.c dialogs.c gaimrc.c gtkimhtml.c gtkspell.c gtkticker.c html.c idle.c list.c md5.c module.c multi.c perl.c plugins.c prefs.c proxy.c prpl.c server.c sound.c ticker.c util.c
--@GNOMEAPPLET_TRUE@gaim_applet_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS)
--@GNOMEAPPLET_TRUE@gaim_applet_LDFLAGS = -export-dynamic
--@GNOMEAPPLET_TRUE@gaim_applet_LDADD = @LDADD@ @LIBOBJS@
--@GNOMEAPPLET_FALSE@gaim_SOURCES = about.c aim.c applet.c away.c browser.c buddy.c buddy_chat.c conversation.c core.c dialogs.c gaimrc.c gtkimhtml.c gtkspell.c gtkticker.c html.c idle.c list.c md5.c module.c multi.c perl.c plugins.c prefs.c proxy.c prpl.c server.c sound.c ticker.c util.c
--@GNOMEAPPLET_FALSE@gaim_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS)
--@GNOMEAPPLET_FALSE@gaim_LDFLAGS = -export-dynamic
--@GNOMEAPPLET_FALSE@gaim_LDADD = @LDADD@ @LIBOBJS@
-+gaim_applet_SOURCES = about.c \
-+ aim.c \
-+ applet.c \
-+ away.c \
-+ browser.c \
-+ buddy.c \
-+ buddy_chat.c \
-+ conversation.c \
-+ core.c \
-+ dialogs.c \
-+ gaimrc.c \
-+ gtkimhtml.c \
-+ gtkspell.c \
-+ gtkticker.c \
-+ html.c \
-+ idle.c \
-+ list.c \
-+ md5.c \
-+ module.c \
-+ multi.c \
-+ perl.c \
-+ plugins.c \
-+ prefs.c \
-+ proxy.c \
-+ prpl.c \
-+ server.c \
-+ sound.c \
-+ ticker.c \
-+ util.c
-+
-+gaim_applet_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS)
-+gaim_applet_LDFLAGS = -export-dynamic
-+gaim_applet_LDADD = @LDADD@ @LIBOBJS@
-+gaim_SOURCES = about.c \
-+ aim.c \
-+ applet.c \
-+ away.c \
-+ browser.c \
-+ buddy.c \
-+ buddy_chat.c \
-+ conversation.c \
-+ core.c \
-+ dialogs.c \
-+ gaimrc.c \
-+ gtkimhtml.c \
-+ gtkspell.c \
-+ gtkticker.c \
-+ html.c \
-+ idle.c \
-+ list.c \
-+ md5.c \
-+ module.c \
-+ multi.c \
-+ perl.c \
-+ plugins.c \
-+ prefs.c \
-+ proxy.c \
-+ prpl.c \
-+ server.c \
-+ sound.c \
-+ ticker.c \
-+ util.c
-+
-+gaim_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS)
-+gaim_LDFLAGS = -export-dynamic
-+gaim_LDADD = @LDADD@ @LIBOBJS@
- CFLAGS = @CFLAGS@ $(PERL_CFLAGS) -DLOCALEDIR=\"$(prefix)/share/locale\" -DLIBDIR=\"$(libdir)/gaim/\" $(DEBUG_CFLAGS)
-
- LIBS = @LIBS@ $(UI_LIBS) $(SOUND_LIBS) $(STATIC_LINK_LIBS) $(PERL_LIBS) $(XSS_LIBS) $(INTLLIBS) $(DEBUG_LIBS)
-@@ -165,6 +223,7 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES =
-+@GNOMEAPPLET_TRUE@bin_PROGRAMS = gaim_applet$(EXEEXT) gaim$(EXEEXT)
- @GNOMEAPPLET_FALSE@bin_PROGRAMS = gaim$(EXEEXT)
- PROGRAMS = $(bin_PROGRAMS)
-
-@@ -172,30 +231,34 @@
- DEFS = @DEFS@ -I. -I$(srcdir) -I..
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
--@GNOMEAPPLET_TRUE@gaim_applet_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \
--@GNOMEAPPLET_TRUE@applet.$(OBJEXT) away.$(OBJEXT) browser.$(OBJEXT) \
--@GNOMEAPPLET_TRUE@buddy.$(OBJEXT) buddy_chat.$(OBJEXT) \
--@GNOMEAPPLET_TRUE@conversation.$(OBJEXT) core.$(OBJEXT) \
--@GNOMEAPPLET_TRUE@dialogs.$(OBJEXT) gaimrc.$(OBJEXT) \
--@GNOMEAPPLET_TRUE@gtkimhtml.$(OBJEXT) gtkspell.$(OBJEXT) \
--@GNOMEAPPLET_TRUE@gtkticker.$(OBJEXT) html.$(OBJEXT) idle.$(OBJEXT) \
--@GNOMEAPPLET_TRUE@list.$(OBJEXT) md5.$(OBJEXT) module.$(OBJEXT) \
--@GNOMEAPPLET_TRUE@multi.$(OBJEXT) perl.$(OBJEXT) plugins.$(OBJEXT) \
--@GNOMEAPPLET_TRUE@prefs.$(OBJEXT) proxy.$(OBJEXT) prpl.$(OBJEXT) \
--@GNOMEAPPLET_TRUE@server.$(OBJEXT) sound.$(OBJEXT) ticker.$(OBJEXT) \
--@GNOMEAPPLET_TRUE@util.$(OBJEXT)
--@GNOMEAPPLET_FALSE@gaim_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \
--@GNOMEAPPLET_FALSE@applet.$(OBJEXT) away.$(OBJEXT) browser.$(OBJEXT) \
--@GNOMEAPPLET_FALSE@buddy.$(OBJEXT) buddy_chat.$(OBJEXT) \
--@GNOMEAPPLET_FALSE@conversation.$(OBJEXT) core.$(OBJEXT) \
--@GNOMEAPPLET_FALSE@dialogs.$(OBJEXT) gaimrc.$(OBJEXT) \
--@GNOMEAPPLET_FALSE@gtkimhtml.$(OBJEXT) gtkspell.$(OBJEXT) \
--@GNOMEAPPLET_FALSE@gtkticker.$(OBJEXT) html.$(OBJEXT) idle.$(OBJEXT) \
--@GNOMEAPPLET_FALSE@list.$(OBJEXT) md5.$(OBJEXT) module.$(OBJEXT) \
--@GNOMEAPPLET_FALSE@multi.$(OBJEXT) perl.$(OBJEXT) plugins.$(OBJEXT) \
--@GNOMEAPPLET_FALSE@prefs.$(OBJEXT) proxy.$(OBJEXT) prpl.$(OBJEXT) \
--@GNOMEAPPLET_FALSE@server.$(OBJEXT) sound.$(OBJEXT) ticker.$(OBJEXT) \
--@GNOMEAPPLET_FALSE@util.$(OBJEXT)
-+gaim_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \
-+ applet.$(OBJEXT) away.$(OBJEXT) \
-+ browser.$(OBJEXT) buddy.$(OBJEXT) \
-+ buddy_chat.$(OBJEXT) conversation.$(OBJEXT) \
-+ core.$(OBJEXT) dialogs.$(OBJEXT) \
-+ gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \
-+ gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) \
-+ html.$(OBJEXT) idle.$(OBJEXT) list.$(OBJEXT) \
-+ md5.$(OBJEXT) module.$(OBJEXT) \
-+ multi.$(OBJEXT) perl.$(OBJEXT) \
-+ plugins.$(OBJEXT) prefs.$(OBJEXT) \
-+ proxy.$(OBJEXT) prpl.$(OBJEXT) \
-+ server.$(OBJEXT) sound.$(OBJEXT) \
-+ ticker.$(OBJEXT) util.$(OBJEXT)
-+gaim_applet_OBJECTS = about.$(OBJEXT) aim.$(OBJEXT) \
-+ applet.$(OBJEXT) away.$(OBJEXT) \
-+ browser.$(OBJEXT) buddy.$(OBJEXT) \
-+ buddy_chat.$(OBJEXT) conversation.$(OBJEXT) \
-+ core.$(OBJEXT) dialogs.$(OBJEXT) \
-+ gaimrc.$(OBJEXT) gtkimhtml.$(OBJEXT) \
-+ gtkspell.$(OBJEXT) gtkticker.$(OBJEXT) \
-+ html.$(OBJEXT) idle.$(OBJEXT) list.$(OBJEXT) \
-+ md5.$(OBJEXT) module.$(OBJEXT) \
-+ multi.$(OBJEXT) perl.$(OBJEXT) \
-+ plugins.$(OBJEXT) prefs.$(OBJEXT) \
-+ proxy.$(OBJEXT) prpl.$(OBJEXT) \
-+ server.$(OBJEXT) sound.$(OBJEXT) \
-+ ticker.$(OBJEXT) util.$(OBJEXT)
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
diff --git a/net-im/gaim/files/patch-configure b/net-im/gaim/files/patch-configure
deleted file mode 100644
index 61019f6818c5..000000000000
--- a/net-im/gaim/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Fri Apr 26 19:31:31 2002
-+++ configure Fri Apr 26 19:31:57 2002
-@@ -5165,6 +5165,7 @@
-
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/net-im/gaim/files/patch-src_protocols_yahoo_yahoo.c b/net-im/gaim/files/patch-src_protocols_yahoo_yahoo.c
deleted file mode 100644
index f538f5c4ba62..000000000000
--- a/net-im/gaim/files/patch-src_protocols_yahoo_yahoo.c
+++ /dev/null
@@ -1,49 +0,0 @@
-This patch fixes a segfault that can occur when a Yahoo user receives new
-mail. This patch is from gaim CVS, and will be integrated in the next
-release.
-
---- src/protocols/yahoo/yahoo.c 2002/11/12 00:50:21 1.43.2.7
-+++ src/protocols/yahoo/yahoo.c 2002/11/23 18:50:47 1.43.2.8
-@@ -259,19 +259,20 @@
- pair->key = strtol(key, NULL, 10);
- accept = x; /* if x is 0 there was no key, so don't accept it */
-
-- if (accept)
-+ if (len - pos + 1 <= 0) {
-+ /* Truncated. Garbage or something. */
-+ accept = 0;
-+ }
-+
-+ if (accept) {
- value = g_malloc(len - pos + 1);
-- x = 0;
-- while (pos + 1 < len) {
-- if (data[pos] == 0xc0 && data[pos + 1] == 0x80)
-- break;
-- if (accept)
-+ x = 0;
-+ while (pos + 1 < len) {
-+ if (data[pos] == 0xc0 && data[pos + 1] == 0x80)
-+ break;
- value[x++] = data[pos++];
-- }
-- if (accept)
-+ }
- value[x] = 0;
-- pos += 2;
-- if (accept) {
- pair->value = g_strdup(value);
- g_free(value);
- pkt->hash = g_slist_append(pkt->hash, pair);
-@@ -279,6 +280,11 @@
- } else {
- g_free(pair);
- }
-+ pos += 2;
-+
-+ /* Skip over garbage we've noticed in the mail notifications */
-+ if (data[0] == '9' && data[pos] == 0x01)
-+ pos++;
- }
- }
-