diff options
author | Don Seiler <rizzo@gentoo.org> | 2004-04-10 20:28:02 +0000 |
---|---|---|
committer | Don Seiler <rizzo@gentoo.org> | 2004-04-10 20:28:02 +0000 |
commit | b2b77498d2ee367154366ce946f0e3ae83cf95ce (patch) | |
tree | 6b8c1d3fea05e803b0aeebca0ba348812d668fba /net-im | |
parent | Changed gs-sources to gentoo-sources (diff) | |
download | historical-b2b77498d2ee367154366ce946f0e3ae83cf95ce.tar.gz historical-b2b77498d2ee367154366ce946f0e3ae83cf95ce.tar.bz2 historical-b2b77498d2ee367154366ce946f0e3ae83cf95ce.zip |
Revision bump for CJK patch
Diffstat (limited to 'net-im')
-rw-r--r-- | net-im/gaim/ChangeLog | 8 | ||||
-rw-r--r-- | net-im/gaim/Manifest | 5 | ||||
-rw-r--r-- | net-im/gaim/files/digest-gaim-0.76-r2 | 1 | ||||
-rw-r--r-- | net-im/gaim/files/gaim-0.76-xinput.patch | 15 | ||||
-rw-r--r-- | net-im/gaim/gaim-0.76-r2.ebuild | 117 |
5 files changed, 144 insertions, 2 deletions
diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog index a7340f11a35e..0b3faca4a239 100644 --- a/net-im/gaim/ChangeLog +++ b/net-im/gaim/ChangeLog @@ -1,6 +1,12 @@ # 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.161 2004/04/08 15:29:19 rizzo Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.162 2004/04/10 20:28:02 rizzo Exp $ + +*gaim-0.76-r2 (10 Apr 2004) + + 10 Apr 2004; Don Seiler <rizzo@gentoo.org>; gaim-0.76-r2.ebuild, + files/gaim-0.76-xinput.patch: + Revision bump for CJK patch. Thanks to Park Ji-in. Bug #47414 *gaim-0.76-r1 (08 Apr 2004) diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest index 730fb9a04e06..aa916915a6a0 100644 --- a/net-im/gaim/Manifest +++ b/net-im/gaim/Manifest @@ -1,7 +1,8 @@ MD5 397b78a6b462d0d0833042da04364981 gaim-0.76.ebuild 3563 +MD5 99c2313c15f2dab646f2cf8f955caf6d gaim-0.76-r2.ebuild 3671 MD5 272e0892309f0c55d48734bb891ffb71 gaim-0.76-r1.ebuild 3613 MD5 fe7d01f4a3b4a72b7b6cf57f286728ed gaim-0.75-r10.ebuild 3678 -MD5 862255f1de298d187b7cf8a735aad5b8 ChangeLog 26573 +MD5 5c7ac42fcb4f233e1121e12da69ad6f0 ChangeLog 26768 MD5 19b3cafbbe380403d46cccc45a984b80 metadata.xml 481 MD5 ff7da91fdc2d63cb9ade430cbedeac98 gaim-0.75-r8.ebuild 3498 MD5 4989dc76d941288934c783f52931762d files/gaim-0.75-static-prpls.patch 3710 @@ -12,9 +13,11 @@ MD5 68525b8389e356a5d05d531b84fb1ada files/gaim-0.74-gnome-url-handler.patch 185 MD5 8e59c66d91c79a3323e350a9c41d4ecb files/gevolution.h 2745 MD5 8b152d59a54ab95627c4c0cd52758d75 files/digest-gaim-0.75-r8 63 MD5 3f77b441979d00929ef77b64d4b4725c files/digest-gaim-0.76-r1 63 +MD5 3f77b441979d00929ef77b64d4b4725c files/digest-gaim-0.76-r2 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 de4038d9bda8257d951659533ea67976 files/gaim-0.76-yahoo-decode.diff 717 +MD5 afc682711efed5d09a9229bd06a7a13b files/gaim-0.76-xinput.patch 644 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.76-r2 b/net-im/gaim/files/digest-gaim-0.76-r2 new file mode 100644 index 000000000000..4bc316b65e50 --- /dev/null +++ b/net-im/gaim/files/digest-gaim-0.76-r2 @@ -0,0 +1 @@ +MD5 832126135930b4a13537d1270088c2dc gaim-0.76.tar.bz2 3543882 diff --git a/net-im/gaim/files/gaim-0.76-xinput.patch b/net-im/gaim/files/gaim-0.76-xinput.patch new file mode 100644 index 000000000000..a9fddf54010f --- /dev/null +++ b/net-im/gaim/files/gaim-0.76-xinput.patch @@ -0,0 +1,15 @@ +diff -urN gaim-0.75.99-20040318cvs.orig/src/gtkconv.c gaim-0.75.99-20040318cvs/src/gtkconv.c +--- gaim-0.75.99-20040318cvs.orig/src/gtkconv.c 2004-03-16 10:31:48.000000000 -1000 ++++ gaim-0.75.99-20040318cvs/src/gtkconv.c 2004-03-16 12:50:59.689509499 -1000 +@@ -1390,6 +1390,11 @@ + if (!(event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) && + gaim_prefs_get_bool("/gaim/gtk/conversations/enter_sends")) + { ++ if (gtk_im_context_filter_keypress (GTK_TEXT_VIEW (entry)->im_context, event)) ++ { ++ GTK_TEXT_VIEW (entry)->need_im_reset = TRUE; ++ return TRUE; ++ } + send_cb(NULL, conv); + return TRUE; + } diff --git a/net-im/gaim/gaim-0.76-r2.ebuild b/net-im/gaim/gaim-0.76-r2.ebuild new file mode 100644 index 000000000000..8754f003e0be --- /dev/null +++ b/net-im/gaim/gaim-0.76-r2.ebuild @@ -0,0 +1,117 @@ +# 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.76-r2.ebuild,v 1.1 2004/04/10 20:28:02 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 ) + spell? ( >=app-text/gtkspell-2.0.2 ) + || ( dev-libs/nss net-www/mozilla )" +PDEPEND="crypt? ( net-im/gaim-encryption )" + +pkg_setup() { + 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 include a backtrace for any seg faults, see" + ewarn "http://gaim.sourceforge.net/gdb.php for details on backtraces." + 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} + cp ${FILESDIR}/gevolution.h plugins/gevolution/ + epatch ${FILESDIR}/gaim-0.76-spellchk.diff + epatch ${FILESDIR}/gaim-0.76-yahoo-decode.diff + use cjk && epatch ${FILESDIR}/gaim-0.76-xinput.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 + 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 include a backtrace for any seg faults, see" + ewarn "http://gaim.sourceforge.net/gdb.php for details on backtraces." + 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 +} |