From 8aa141b5a1abf036b61261a62e9656524c888df1 Mon Sep 17 00:00:00 2001 From: Don Seiler Date: Tue, 4 May 2004 20:41:39 +0000 Subject: Corrected ExtUtils-MakeMaker dep in 0.77 and revision bumped 0.77-r1 which is patched for Yahoo 64-bit amongst many other bugs --- net-im/gaim/ChangeLog | 14 ++- net-im/gaim/Manifest | 11 +- net-im/gaim/files/digest-gaim-0.77-r1 | 1 + net-im/gaim/files/gaim-0.77-64bit_goodness.patch | 134 ++++++++++++++++++++++ net-im/gaim/files/gaim-0.77-irc-reconnect.patch | 15 +++ net-im/gaim/files/gaim-0.77-plugin-prefs.patch | 114 ++++++++++++++++++ net-im/gaim/files/gaim-0.77-smileys_dialogs.patch | 19 +++ net-im/gaim/files/gaim-0.77-ucs2-copypaste.patch | 39 +++++++ net-im/gaim/gaim-0.77-r1.ebuild | 130 +++++++++++++++++++++ net-im/gaim/gaim-0.77.ebuild | 5 +- 10 files changed, 477 insertions(+), 5 deletions(-) create mode 100644 net-im/gaim/files/digest-gaim-0.77-r1 create mode 100644 net-im/gaim/files/gaim-0.77-64bit_goodness.patch create mode 100644 net-im/gaim/files/gaim-0.77-irc-reconnect.patch create mode 100644 net-im/gaim/files/gaim-0.77-plugin-prefs.patch create mode 100644 net-im/gaim/files/gaim-0.77-smileys_dialogs.patch create mode 100644 net-im/gaim/files/gaim-0.77-ucs2-copypaste.patch create mode 100644 net-im/gaim/gaim-0.77-r1.ebuild (limited to 'net-im/gaim') diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog index 3b1df0a25934..44536ebf76b0 100644 --- a/net-im/gaim/ChangeLog +++ b/net-im/gaim/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for net-im/gaim # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.171 2004/05/04 16:01:20 rizzo Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.172 2004/05/04 20:41:39 rizzo Exp $ + +*gaim-0.77-r1 (04 May 2004) + + 04 May 2004; Don Seiler ; + +files/gaim-0.77-64bit_goodness.patch, +files/gaim-0.77-irc-reconnect.patch, + +files/gaim-0.77-plugin-prefs.patch, +files/gaim-0.77-smileys_dialogs.patch, + +files/gaim-0.77-ucs2-copypaste.patch, +gaim-0.77-r1.ebuild: + Patched for Yahoo 64-bit amongst many other bugs + + 04 May 2004; Don Seiler ; gaim-0.77.ebuild: + Need at least ExtUtils-MakeMaker-6.20 for perl plugin. Thanks to Anders + Hellgren for lighting the lightbulb. 04 May 2004; Don Seiler ; -files/gevolution.h, -gaim-0.75-r8.ebuild: diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest index 00963191ca36..154db151cd08 100644 --- a/net-im/gaim/Manifest +++ b/net-im/gaim/Manifest @@ -1,16 +1,23 @@ -MD5 b6dc815cab9aa0e76dee8c0db052aed5 gaim-0.77.ebuild 4003 +MD5 9e6b28588a1ca0728ba1a991390511d2 gaim-0.77-r1.ebuild 4302 +MD5 6785c62b56cfbfdb9b73fcce123bdfcb gaim-0.77.ebuild 4042 MD5 1b332d24ed4e517a3b587f840c551acc gaim-0.75-r10.ebuild 3678 -MD5 cfe75893d2e1b5a647efcb740345dd04 ChangeLog 27694 +MD5 b27b3d1692536f1a91219aabae69979f ChangeLog 28220 MD5 19b3cafbbe380403d46cccc45a984b80 metadata.xml 481 MD5 4989dc76d941288934c783f52931762d files/gaim-0.75-static-prpls.patch 3710 +MD5 76d3a02120c18747eb5c3335dc17b16d files/gaim-0.77-plugin-prefs.patch 3926 MD5 4bc83ad48d260db208fcae372c2bb291 files/digest-gaim-0.77 63 MD5 3a5e6167d13c4a44a8618c12629d777e files/gaim-0.77-c99.patch 4790 MD5 a714a5babbb4387f5a5516f75548528a files/gaim-0.76cvs-yahoo-misc-fixes-1.diff 3105 +MD5 6590ac50c358f619973c6226219a5422 files/gaim-0.77-64bit_goodness.patch 4544 MD5 68525b8389e356a5d05d531b84fb1ada files/gaim-0.74-gnome-url-handler.patch 1854 MD5 a8234ce30b90015d2798a6f576982857 files/gaim-0.78cvs-novelltweaks5.patch 715 +MD5 4bc83ad48d260db208fcae372c2bb291 files/digest-gaim-0.77-r1 63 MD5 a4f3b00a7aa80e7fbc1e315b8c9306c8 files/gaim-0.76cvs-signals-varargs.diff 1753 MD5 53302cc68bb7bef9803723e977010339 files/gaim-0.74_cjk_gtkconv.patch 1128 MD5 e58ee6f06747da85a60cb9c13b91f805 files/gaim-0.76cvs-yahoo-login-fix.diff 4618 +MD5 80bc3fac4370b3cddf46ab8002541481 files/gaim-0.77-ucs2-copypaste.patch 1501 +MD5 9e9a4483300e2e60e50e9f74655a5335 files/gaim-0.77-smileys_dialogs.patch 804 MD5 afc682711efed5d09a9229bd06a7a13b files/gaim-0.76-xinput.patch 644 +MD5 2658aec832adc8a4050b12ed17f5136f files/gaim-0.77-irc-reconnect.patch 718 MD5 e16439188287325963107a14ccddf668 files/gaim-0.75-yahoo-security.diff 3863 MD5 8b152d59a54ab95627c4c0cd52758d75 files/digest-gaim-0.75-r10 63 diff --git a/net-im/gaim/files/digest-gaim-0.77-r1 b/net-im/gaim/files/digest-gaim-0.77-r1 new file mode 100644 index 000000000000..9b4f6738da22 --- /dev/null +++ b/net-im/gaim/files/digest-gaim-0.77-r1 @@ -0,0 +1 @@ +MD5 d2ac2eb75e5e27f7fddf2a7dc19eb045 gaim-0.77.tar.bz2 3709914 diff --git a/net-im/gaim/files/gaim-0.77-64bit_goodness.patch b/net-im/gaim/files/gaim-0.77-64bit_goodness.patch new file mode 100644 index 000000000000..54f55d8397b3 --- /dev/null +++ b/net-im/gaim/files/gaim-0.77-64bit_goodness.patch @@ -0,0 +1,134 @@ +#gaim grim's 64bit fixing patch v2 +sha.h fixes yahoo on x86-64 +everything else is for compile warnings + +Index: src/gtkimhtml.c +=================================================================== +RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v +retrieving revision 1.322 +diff -u -p -r1.322 gtkimhtml.c +--- src/gtkimhtml.c 2 May 2004 18:12:07 -0000 1.322 ++++ src/gtkimhtml.c 4 May 2004 07:26:28 -0000 +@@ -553,7 +553,7 @@ static void gtk_imhtml_clipboard_get(Gtk + primary = gtk_widget_get_clipboard(GTK_WIDGET(imhtml), GDK_SELECTION_PRIMARY) == clipboard; + + if (info == TARGET_HTML) { +- int len; ++ gsize len; + char *selection; + GString *str = g_string_new(NULL); + if (primary) { +Index: src/sha.h +=================================================================== +RCS file: /cvsroot/gaim/gaim/src/sha.h,v +retrieving revision 1.3 +diff -u -p -r1.3 sha.h +--- src/sha.h 28 Sep 2003 01:10:06 -0000 1.3 ++++ src/sha.h 4 May 2004 07:26:28 -0000 +@@ -1,22 +1,41 @@ +-#if (SIZEOF_INT == 4) +-typedef unsigned int uint32; +-#elif (SIZEOF_SHORT == 4) +-typedef unsigned short uint32; +-#else +-typedef unsigned int uint32; +-#endif /* HAVEUINT32 */ +- +-int strprintsha(char *dest, int *hashval); +- ++/* ++ * The contents of this file are subject to the Mozilla Public ++ * License Version 1.1 (the "License"); you may not use this file ++ * except in compliance with the License. You may obtain a copy of ++ * the License at http://www.mozilla.org/MPL/ ++ * ++ * Software distributed under the License is distributed on an "AS ++ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or ++ * implied. See the License for the specific language governing ++ * rights and limitations under the License. ++ * ++ * The Original Code is SHA 180-1 Reference Implementation (Compact version) ++ * ++ * The Initial Developer of the Original Code is Paul Kocher of ++ * Cryptography Research. Portions created by Paul Kocher are ++ * Copyright (C) 1995-9 by Cryptography Research, Inc. All ++ * Rights Reserved. ++ * ++ * Contributor(s): ++ * ++ */ ++#ifndef _SHA_H_ ++#define _SHA_H_ ++ ++#include ++ + typedef struct { +- unsigned long H[5]; +- unsigned long W[80]; +- int lenW; +- unsigned long sizeHi,sizeLo; ++ guint32 H[5]; ++ guint32 W[80]; ++ int lenW; ++ guint32 sizeHi; ++ guint32 sizeLo; + } SHA_CTX; +- ++ ++int strprintsha(char *dest, int *hashval); + void shaInit(SHA_CTX *ctx); + void shaUpdate(SHA_CTX *ctx, unsigned char *dataIn, int len); + void shaFinal(SHA_CTX *ctx, unsigned char hashout[20]); + void shaBlock(unsigned char *dataIn, int len, unsigned char hashout[20]); +- ++ ++#endif +Index: src/util.c +=================================================================== +RCS file: /cvsroot/gaim/gaim/src/util.c,v +retrieving revision 1.283 +diff -u -p -r1.283 util.c +--- src/util.c 21 Apr 2004 01:34:23 -0000 1.283 ++++ src/util.c 4 May 2004 07:26:30 -0000 +@@ -302,7 +302,8 @@ gaim_mime_decode_field(const char *str) + + for (unencoded = cur = str; (encoded = cur = strstr(cur, "=?")); unencoded = cur) { + gboolean found_word = FALSE; +- int i, num, len, dec_len; ++ int i, num, dec_len; ++ gsize len; + char *decoded, *converted; + char *tokens[3]; + +Index: src/protocols/oscar/oscar.c +=================================================================== +RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v +retrieving revision 1.584 +diff -u -p -r1.584 oscar.c +--- src/protocols/oscar/oscar.c 1 May 2004 22:17:43 -0000 1.584 ++++ src/protocols/oscar/oscar.c 4 May 2004 07:26:35 -0000 +@@ -5625,7 +5625,7 @@ static int oscar_send_chat(GaimConnectio + char *buf, *buf2; + char *charset = NULL; + int encoding; +- int len; ++ gsize len; + + if (!(conv = gaim_find_chat(gc, id))) + return -EINVAL; +Index: src/protocols/zephyr/zephyr.c +=================================================================== +RCS file: /cvsroot/gaim/gaim/src/protocols/zephyr/zephyr.c,v +retrieving revision 1.90 +diff -u -p -r1.90 zephyr.c +--- src/protocols/zephyr/zephyr.c 22 Apr 2004 01:53:18 -0000 1.90 ++++ src/protocols/zephyr/zephyr.c 4 May 2004 07:26:36 -0000 +@@ -578,7 +578,7 @@ static void handle_message(ZNotice_t not + GaimConversation *gconv1; + GaimConvChat *gcc; + char *ptr = notice.z_message + strlen(notice.z_message) + 1; +- int len = notice.z_message_len - ((int)ptr - (int)notice.z_message); ++ int len = notice.z_message_len - (strlen(notice.z_message) +1); + char *sendertmp = g_strdup_printf("%s", gaim_zephyr_get_sender()); + GaimConvImFlags flags = 0; + diff --git a/net-im/gaim/files/gaim-0.77-irc-reconnect.patch b/net-im/gaim/files/gaim-0.77-irc-reconnect.patch new file mode 100644 index 000000000000..47f616736e00 --- /dev/null +++ b/net-im/gaim/files/gaim-0.77-irc-reconnect.patch @@ -0,0 +1,15 @@ +http://cvs.sourceforge.net/viewcvs.py/gaim/gaim/src/protocols/irc/msgs.c?r1=1.23&r2=1.24 + +diff -ur gaim-0.77.orig/src/protocols/irc/msgs.c gaim-0.77/src/protocols/irc/msgs.c +--- gaim-0.77.orig/src/protocols/irc/msgs.c 2004-03-30 18:44:40.000000000 +0100 ++++ gaim-0.77/src/protocols/irc/msgs.c 2004-05-04 16:50:24.388180040 +0100 +@@ -390,7 +390,8 @@ + gaim_connection_set_state(gc, GAIM_CONNECTED); + + irc_blist_timeout(irc); +- irc->timer = gaim_timeout_add(45000, (GSourceFunc)irc_blist_timeout, (gpointer)irc); ++ if (!irc->timer) ++ irc->timer = gaim_timeout_add(45000, (GSourceFunc)irc_blist_timeout, (gpointer)irc); + } + + void irc_msg_nochan(struct irc_conn *irc, const char *name, const char *from, char **args) diff --git a/net-im/gaim/files/gaim-0.77-plugin-prefs.patch b/net-im/gaim/files/gaim-0.77-plugin-prefs.patch new file mode 100644 index 000000000000..624df4ce9c15 --- /dev/null +++ b/net-im/gaim/files/gaim-0.77-plugin-prefs.patch @@ -0,0 +1,114 @@ +This patch fixes the non saving nature of plugins prefs. Found in the +preferences dialog under Protocols->msn/jabber. + +The original patch can be found here: +http://www.reaperworld.com/code/gaim/gaim-plugin_prefs_final.diff + +and the corresponding links in cvs are + +plugin.h: +http://cvs.sourceforge.net/viewcvs.py/gaim/gaim/src/plugin.h?r1=1.24&r2=1.25 + +gtkprefs.c: +http://cvs.sourceforge.net/viewcvs.py/gaim/gaim/src/gtkprefs.c?r1=1.141&r2=1.139 + +the viewcvs link contains code from a patch that was applied after the +release but before this patch. It's only 2 lines so it's easy to get +rid of. + +Gary + +Index: src/gtkprefs.c +=================================================================== +RCS file: /cvsroot/gaim/gaim/src/gtkprefs.c,v +retrieving revision 1.140 +diff -u -p -r1.140 gtkprefs.c +--- src/gtkprefs.c 26 Apr 2004 04:16:34 -0000 1.140 ++++ src/gtkprefs.c 26 Apr 2004 15:25:22 -0000 +@@ -363,6 +363,11 @@ delete_prefs(GtkWidget *asdf, void *gdsa + + prefs_info = GAIM_PLUGIN_UI_INFO(plug); + ++ if(prefs_info->frame != NULL) { ++ gaim_plugin_pref_frame_destroy(prefs_info->frame); ++ prefs_info->frame = NULL; ++ } ++ + if(prefs_info->iter != NULL) { + g_free(prefs_info->iter); + prefs_info->iter = NULL; +@@ -1856,7 +1861,8 @@ static void plugin_load (GtkCellRenderer + iter = plugin_iter; + + prefs_info = GAIM_PLUGIN_UI_INFO(plug); +- pref_frame = gaim_gtk_plugin_pref_create_frame(prefs_info->get_plugin_pref_frame(plug)); ++ prefs_info->frame = prefs_info->get_plugin_pref_frame(plug); ++ pref_frame = gaim_gtk_plugin_pref_create_frame(prefs_info->frame); + + if(pref_frame != NULL) { + prefs_info->iter = g_new0(GtkTreeIter, 1); +@@ -1894,6 +1900,11 @@ static void plugin_load (GtkCellRenderer + prefs_info = GAIM_PLUGIN_UI_INFO(plug); + + if(prefs_info != NULL) { ++ if(prefs_info->frame != NULL) { ++ gaim_plugin_pref_frame_destroy(prefs_info->frame); ++ prefs_info->frame = NULL; ++ } ++ + if(prefs_info->iter != NULL) { + gtk_tree_store_remove(GTK_TREE_STORE(prefstree), prefs_info->iter); + g_free(prefs_info->iter); +@@ -2544,13 +2555,11 @@ void prefs_notebook_init() { + + if(GAIM_PLUGIN_HAS_PREF_FRAME(plug)) { + GtkWidget *gtk_frame; +- GaimPluginPrefFrame *pp_frame; + GaimPluginUiInfo *prefs_info; + + prefs_info = GAIM_PLUGIN_UI_INFO(plug); +- pp_frame = prefs_info->get_plugin_pref_frame(plug); +- gtk_frame = gaim_gtk_plugin_pref_create_frame(pp_frame); +- gaim_plugin_pref_frame_destroy(pp_frame); ++ prefs_info->frame = prefs_info->get_plugin_pref_frame(plug); ++ gtk_frame = gaim_gtk_plugin_pref_create_frame(prefs_info->frame); + + if(GTK_IS_WIDGET(gtk_frame)) { + prefs_info->iter = g_new0(GtkTreeIter, 1); +@@ -2558,6 +2567,12 @@ void prefs_notebook_init() { + gtk_frame, prefs_info->iter, + (plug->info->type == GAIM_PLUGIN_PROTOCOL) ? &proto_iter : &plugin_iter, + notebook_page++); ++ } else if(prefs_info->frame) { ++ /* in the event that there is a pref frame and we can ++ * not make a widget out of it, we free the ++ * pluginpref frame --Gary ++ */ ++ gaim_plugin_pref_frame_destroy(prefs_info->frame); + } + } + } +Index: src/plugin.h +=================================================================== +RCS file: /cvsroot/gaim/gaim/src/plugin.h,v +retrieving revision 1.24 +diff -u -p -r1.24 plugin.h +--- src/plugin.h 22 Apr 2004 01:53:11 -0000 1.24 ++++ src/plugin.h 26 Apr 2004 15:25:22 -0000 +@@ -87,7 +87,7 @@ struct _GaimPluginInfo + + void *ui_info; + void *extra_info; +- void *prefs_info; ++ GaimPluginUiInfo *prefs_info; + }; + + /** +@@ -127,6 +127,7 @@ struct _GaimPluginUiInfo { + GaimPluginPrefFrame *(*get_plugin_pref_frame)(GaimPlugin *plugin); + + void *iter; /**< Reserved */ ++ GaimPluginPrefFrame *frame; /**< Reserved */ + }; + + #define GAIM_PLUGIN_HAS_PREF_FRAME(plugin) \ diff --git a/net-im/gaim/files/gaim-0.77-smileys_dialogs.patch b/net-im/gaim/files/gaim-0.77-smileys_dialogs.patch new file mode 100644 index 000000000000..fb93014450cf --- /dev/null +++ b/net-im/gaim/files/gaim-0.77-smileys_dialogs.patch @@ -0,0 +1,19 @@ +http://cvs.sourceforge.net/viewcvs.py/gaim/gaim/src/dialogs.c?r1=1.594&r2=1.595&diff_format=u +Fixes smileys in away message dialog + +=================================================================== +RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v +retrieving revision 1.594 +retrieving revision 1.595 +diff -u -r1.594 -r1.595 +--- gaim/gaim/src/dialogs.c 2004/04/24 01:43:11 1.594 ++++ gaim/gaim/src/dialogs.c 2004/04/24 20:44:41 1.595 +@@ -815,6 +815,8 @@ + if (gaim_prefs_get_bool("/gaim/gtk/conversations/spellcheck")) + gaim_gtk_setup_gtkspell(GTK_TEXT_VIEW(ca->text)); + gtk_imhtmltoolbar_attach(GTK_IMHTMLTOOLBAR(ca->toolbar), ca->text); ++ gtk_imhtmltoolbar_associate_smileys(GTK_IMHTMLTOOLBAR(ca->toolbar), "default"); ++ gaim_setup_imhtml(ca->text); + + gtk_container_add(GTK_CONTAINER(sw), ca->text); + diff --git a/net-im/gaim/files/gaim-0.77-ucs2-copypaste.patch b/net-im/gaim/files/gaim-0.77-ucs2-copypaste.patch new file mode 100644 index 000000000000..d2911afdbcc2 --- /dev/null +++ b/net-im/gaim/files/gaim-0.77-ucs2-copypaste.patch @@ -0,0 +1,39 @@ +http://cvs.sourceforge.net/viewcvs.py/gaim/gaim/src/gtkimhtml.c?r1=1.322&r2=1.323 +Copy/paste fixes for UCS-2 encoded selections + +Index: gtkimhtml.c +=================================================================== +RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v +retrieving revision 1.322 +retrieving revision 1.323 +diff -u -d -p -r1.322 -r1.323 +--- src/gtkimhtml.c 2 May 2004 18:12:07 -0000 1.322 ++++ src/gtkimhtml.c 4 May 2004 06:08:47 -0000 1.323 +@@ -689,7 +689,6 @@ static void cut_clipboard_cb(GtkIMHtml * + static void paste_received_cb (GtkClipboard *clipboard, GtkSelectionData *selection_data, gpointer data) + { + char *text; +- guint16 c; + GtkIMHtml *imhtml = data; + GtkTextIter iter; + GtkIMHtmlOptions flags = GTK_IMHTML_NO_NEWLINE; +@@ -761,14 +760,14 @@ static void paste_received_cb (GtkClipbo + memcpy(text, selection_data->data, selection_data->length); + } + +- memcpy (&c, text, 2); +- if (c == 0xfeff) { +- /* This is UCS2 */ +- char *utf8 = g_convert(text+2, selection_data->length - 2, "UTF-8", "UCS-2", NULL, NULL, NULL); ++ if (selection_data->length >= 2 && ++ (*(guint16 *)text == 0xfeff || *(guint16 *)text == 0xfffe)) { ++ /* This is UCS-2 */ ++ char *utf8 = g_convert(text, selection_data->length, "UTF-8", "UCS-2", NULL, NULL, NULL); + g_free(text); + text = utf8; + if (!text) { +- gaim_debug_warning("gtkimhtml", "g_convert failed in paste_received_cb\n"); ++ gaim_debug_warning("gtkimhtml", "g_convert from UCS-2 failed in paste_received_cb\n"); + return; + } + } diff --git a/net-im/gaim/gaim-0.77-r1.ebuild b/net-im/gaim/gaim-0.77-r1.ebuild new file mode 100644 index 000000000000..a06a07b2ece0 --- /dev/null +++ b/net-im/gaim/gaim-0.77-r1.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.77-r1.ebuild,v 1.1 2004/05/04 20:41:39 rizzo Exp $ + +inherit flag-o-matic eutils gcc +use debug && inherit debug + +IUSE="nls perl spell nas debug crypt cjk" + +DESCRIPTION="GTK Instant Messenger client" +HOMEPAGE="http://gaim.sourceforge.net/" +SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~x86 ~sparc ~amd64 ~ppc ~alpha ~ia64 ~mips ~hppa" + +DEPEND=">=x11-libs/gtk+-2.0 + >=dev-libs/glib-2.0 + nas? ( >=media-libs/nas-1.4.1-r1 ) + sys-devel/gettext + media-libs/libao + >=media-libs/audiofile-0.2.0 + perl? ( >=dev-lang/perl-5.8.2-r1 + >=dev-perl/ExtUtils-MakeMaker-6.20 ) + spell? ( >=app-text/gtkspell-2.0.2 ) + || ( dev-libs/nss net-www/mozilla )" +PDEPEND="crypt? ( >=net-im/gaim-encryption-2.25 )" + +pkg_setup() { + ewarn + ewarn "If you are merging ${P} from an earlier version, you will need" + ewarn "to re-merge any plugins like gaim-encryption or gaim-snpp." + ewarn + ewarn "If you experience problems with gaim, file them as bugs with" + ewarn "Gentoo's bugzilla, http://bugs.gentoo.org. DO NOT report them" + ewarn "as bugs with gaim's sourceforge tracker, and by all means DO NOT" + ewarn "seek help in #gaim." + ewarn + ewarn "Be sure to USE=\"debug\" and include a backtrace for any seg" + ewarn "faults, see http://gaim.sourceforge.net/gdb.php for details on" + ewarn "backtraces." + ewarn + ewarn "Please read the gaim FAQ at http://gaim.sourceforge.net/faq.php" + ewarn + for TICKER in 1 2 3 4 5; do + # Double beep here. + echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null + echo -ne "\a" ; sleep 1 + done + sleep 8 +} + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/gaim-0.77-c99.patch + epatch ${FILESDIR}/gaim-0.77-64bit_goodness.patch + epatch ${FILESDIR}/gaim-0.77-irc-reconnect.patch + epatch ${FILESDIR}/gaim-0.77-plugin-prefs.patch + epatch ${FILESDIR}/gaim-0.77-smileys_dialogs.patch + epatch ${FILESDIR}/gaim-0.77-ucs2-copypaste.patch + use cjk && epatch ${FILESDIR}/gaim-0.76-xinput.patch + cd src/protocols/novell + epatch ${FILESDIR}/gaim-0.78cvs-novelltweaks5.patch +} + +src_compile() { + einfo "Replacing -Os CFLAG with -O2" + replace-flags -Os -O2 + + # -msse2 doesn't play nice on gcc 3.2 + [ "`gcc-version`" == "3.2" ] && filter-flags -msse2 + + local myconf + use perl || myconf="${myconf} --disable-perl" + use spell || myconf="${myconf} --disable-gtkspell" + use nls || myconf="${myconf} --disable-nls" + use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas" + + NSS_LIB=/usr/lib + NSS_INC=/usr/include + has_version dev-libs/nss && { + # Only need to specify this if no pkgconfig from mozilla + myconf="${myconf} --with-nspr-includes=${NSS_INC}/nspr" + myconf="${myconf} --with-nss-includes=${NSS_INC}/nss" + myconf="${myconf} --with-nspr-libs=${NSS_LIB}" + myconf="${myconf} --with-nss-libs=${NSS_LIB}" + } + + econf ${myconf} || die "Configuration failed" + + emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed" +} + +src_install() { + make install DESTDIR=${D} || die "Install failed" + dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION + + # Copy header files for gaim plugin use + dodir /usr/include/gaim/src + cp config.h ${D}/usr/include/gaim/ + cd ${S}/src + tar cf - *.h | (cd ${D}/usr/include/gaim/src ; tar xvf -) + assert "Failed to install header files to /usr/include/gaim" +} + +pkg_postinst() { + ewarn + ewarn "If you are merging ${P} from an earlier version, you will need" + ewarn "to re-merge any plugins like gaim-encryption or gaim-snpp." + ewarn + ewarn "If you experience problems with gaim, file them as bugs with" + ewarn "Gentoo's bugzilla, http://bugs.gentoo.org. DO NOT report them" + ewarn "as bugs with gaim's sourceforge tracker, and by all means DO NOT" + ewarn "seek help in #gaim." + ewarn + ewarn "Be sure to USE=\"debug\" and include a backtrace for any seg" + ewarn "faults, see http://gaim.sourceforge.net/gdb.php for details on" + ewarn "backtraces." + ewarn + ewarn "Please read the gaim FAQ at http://gaim.sourceforge.net/faq.php" + ewarn + for TICKER in 1 2 3 4 5; do + # Double beep here. + echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null + echo -ne "\a" ; sleep 1 + done + sleep 8 +} diff --git a/net-im/gaim/gaim-0.77.ebuild b/net-im/gaim/gaim-0.77.ebuild index d580a60dfd4b..11ceaef87171 100644 --- a/net-im/gaim/gaim-0.77.ebuild +++ b/net-im/gaim/gaim-0.77.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.77.ebuild,v 1.9 2004/05/04 18:13:44 rizzo Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.77.ebuild,v 1.10 2004/05/04 20:41:39 rizzo Exp $ inherit flag-o-matic eutils gcc use debug && inherit debug @@ -21,7 +21,8 @@ DEPEND=">=x11-libs/gtk+-2.0 sys-devel/gettext media-libs/libao >=media-libs/audiofile-0.2.0 - perl? ( >=dev-lang/perl-5.8.2-r1 ) + perl? ( >=dev-lang/perl-5.8.2-r1 + >=dev-perl/ExtUtils-MakeMaker-6.20 ) spell? ( >=app-text/gtkspell-2.0.2 ) || ( dev-libs/nss net-www/mozilla )" PDEPEND="crypt? ( >=net-im/gaim-encryption-2.25 )" -- cgit v1.2.3-65-gdbad