From 25f9300acd65eaf3185e5bb431e8d94d76f285e4 Mon Sep 17 00:00:00 2001 From: Marinus Schraal Date: Sat, 2 Nov 2002 20:11:47 +0000 Subject: [PATCH] Bunch of fixes --- net-irc/xchat/ChangeLog | 9 +- net-irc/xchat/files/digest-xchat-1.9.3-r3 | 1 + .../files/gentoo-xchat-1.9.3-bgtint.patch | 74 +++++++++++ net-irc/xchat/xchat-1.9.3-r2.ebuild | 7 +- net-irc/xchat/xchat-1.9.3-r3.ebuild | 116 ++++++++++++++++++ 5 files changed, 204 insertions(+), 3 deletions(-) create mode 100644 net-irc/xchat/files/digest-xchat-1.9.3-r3 create mode 100644 net-irc/xchat/files/gentoo-xchat-1.9.3-bgtint.patch create mode 100644 net-irc/xchat/xchat-1.9.3-r3.ebuild diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog index dc5cb06aa345..6484d919c95a 100644 --- a/net-irc/xchat/ChangeLog +++ b/net-irc/xchat/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-irc/xchat # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.24 2002/10/20 22:51:56 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.25 2002/11/02 20:11:47 foser Exp $ + +*xchat-1.9.3-r3.ebuild (02 Nov 2002) + + 02 Nov 2002; foser xchat-1.9.3-r3.ebuild : + Fixed launcher + Added tint transparancy patch + Added option for disabling xft (bug #9973) *xchat-1.9.3-r2.ebuild (20 Oct 2002) diff --git a/net-irc/xchat/files/digest-xchat-1.9.3-r3 b/net-irc/xchat/files/digest-xchat-1.9.3-r3 new file mode 100644 index 000000000000..634374dec87b --- /dev/null +++ b/net-irc/xchat/files/digest-xchat-1.9.3-r3 @@ -0,0 +1 @@ +MD5 7fbb3d96ab4b288343a6d9cf9e597d25 xchat-1.9.3.tar.bz2 701422 diff --git a/net-irc/xchat/files/gentoo-xchat-1.9.3-bgtint.patch b/net-irc/xchat/files/gentoo-xchat-1.9.3-bgtint.patch new file mode 100644 index 000000000000..5724d181c64a --- /dev/null +++ b/net-irc/xchat/files/gentoo-xchat-1.9.3-bgtint.patch @@ -0,0 +1,74 @@ +diff -ur xchat-1.9.3/src/fe-gtk/setup.c xchat-1.9.3.new/src/fe-gtk/setup.c +--- xchat-1.9.3/src/fe-gtk/setup.c 2002-07-12 06:39:40.000000000 +0200 ++++ xchat-1.9.3.new/src/fe-gtk/setup.c 2002-10-21 19:33:57.000000000 +0200 +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + static int last_selected_page = 0; + static struct xchatprefs setup_prefs; +@@ -50,6 +51,7 @@ + ST_MENU, + ST_RADIO, + ST_NUMBER, ++ ST_HSCALE, + }; + + typedef struct +@@ -75,6 +77,9 @@ + {ST_TOGGLE, N_("Colored nicks"), P_OFFINT(colorednicks),0,0,0}, + {ST_TOGGLE, N_("Strip mIRC color"), P_OFFINT(stripcolor),0,0,0}, + {ST_NUMBER, N_("Scrollback lines:"), P_OFFINT(max_lines),0,0,100000}, ++ {ST_HSCALE, N_("Tint blue:"), P_OFFINT(tint_blue),0,0,0}, ++ {ST_HSCALE, N_("Tint red:"), P_OFFINT(tint_red),0,0,0}, ++ {ST_HSCALE, N_("Tint green:"), P_OFFINT(tint_green),0,0,0}, + {ST_END, 0, 0, 0, 0, 0} + }; + +@@ -255,6 +260,34 @@ + gtk_box_pack_start (GTK_BOX (rbox), wid, 0, 0, 0); + } + ++ ++static void ++setup_hscale_cb (GtkHScale *wid, const setting *set) ++{ ++ setup_set_int (&setup_prefs, set, gtk_range_get_value(GTK_RANGE(wid))); ++} ++ ++static void ++setup_create_hscale (GtkWidget *table, int row, const setting *set) ++{ ++ GtkWidget *wid; ++ ++ wid = gtk_hscale_new_with_range(0., 255., 1.); ++ gtk_range_set_value (GTK_RANGE (wid), setup_get_int (&setup_prefs, set)); ++ g_signal_connect (G_OBJECT(wid), "value_changed", ++ G_CALLBACK (setup_hscale_cb), (gpointer)set); ++ if (set->tooltip) ++ add_tip (wid, set->tooltip); ++ ++ gtk_table_attach (GTK_TABLE (table), wid, 1, 5, row, row + 1, ++ GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0); ++ ++ wid = gtk_label_new (set->label); ++ gtk_misc_set_alignment (GTK_MISC (wid), 1.0, 1.0); ++ gtk_table_attach (GTK_TABLE (table), wid, 0, 1, row, row + 1, ++ GTK_FILL, GTK_FILL, 0, 0); ++} ++ + #if 0 + static int + setup_create_radio (GtkWidget *table, int row, setting *set) +@@ -478,6 +511,9 @@ + case ST_NUMBER: + setup_create_spin (tab, row, &set[i]); + break; ++ case ST_HSCALE: ++ setup_create_hscale (tab, row, &set[i]); ++ break; + } + i++; + row++; diff --git a/net-irc/xchat/xchat-1.9.3-r2.ebuild b/net-irc/xchat/xchat-1.9.3-r2.ebuild index 5fbbcd94dfc4..4aa7803b4e2d 100644 --- a/net-irc/xchat/xchat-1.9.3-r2.ebuild +++ b/net-irc/xchat/xchat-1.9.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.9.3-r2.ebuild,v 1.1 2002/10/20 22:51:56 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.9.3-r2.ebuild,v 1.2 2002/11/02 20:11:47 foser Exp $ IUSE="perl gnome ssl gtk python mmx ipv6 nls" @@ -28,8 +28,11 @@ DEPEND="${RDEPEND} src_unpack() { unpack ${A} - patch -d ${S} -p1 < ${FILESDIR}/xchat-1.9.3-tolowertab.patch + #fixes a problem with gtk2.1 + patch -d ${S} -p1 < ${FILESDIR}/${P}-tolowertab.patch + #adds tint options to menu; patch by foser + patch -d ${S} -p1 < ${FILESDIR}/gentoo-${P}-bgtint.patch } diff --git a/net-irc/xchat/xchat-1.9.3-r3.ebuild b/net-irc/xchat/xchat-1.9.3-r3.ebuild new file mode 100644 index 000000000000..53735dbcaba0 --- /dev/null +++ b/net-irc/xchat/xchat-1.9.3-r3.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2002 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.9.3-r3.ebuild,v 1.1 2002/11/02 20:11:47 foser Exp $ + +IUSE="perl gnome ssl gtk python mmx ipv6 nls" + +S=${WORKDIR}/${P} +DESCRIPTION="X-Chat is a graphical IRC client for UNIX operating systems." +SRC_URI="http://www.xchat.org/files/source/1.9/${P}.tar.bz2" +HOMEPAGE="http://www.xchat.org/" + +LICENSE="GPL-2" +SLOT="1" +KEYWORDS="x86 ppc sparc sparc64" + +RDEPEND=">=dev-libs/glib-2.0.4 + >=x11-libs/gtk+-2.0.5 + perl? ( >=sys-devel/perl-5.6.1 ) + gnome? ( >=x11-libs/libzvt-2.0.1 + >=gnome-base/libgnome-2.0.1 + >=gnome-base/gnome-applets-2.0.0 + >=gnome-base/gnome-panel-2.0.1 ) + ssl? ( >=dev-libs/openssl-0.9.6d )" + +DEPEND="${RDEPEND} + nls? ( >=sys-devel/gettext-0.10.38 )" + + +src_unpack() { + unpack ${A} + + #fixes a problem with gtk2.1 + patch -d ${S} -p1 < ${FILESDIR}/${P}-tolowertab.patch + #adds tint options to menu; patch by foser + patch -d ${S} -p1 < ${FILESDIR}/gentoo-${P}-bgtint.patch +} + + +# From the xchat 1.9.3 README_FIRST file: +# (one of the) REMAINING PROBLEMS: +# * can't compile with gnome, panel and zvt support * +# stroke + +src_compile() { + + local myopts myflags + + if [ ! `use perl` ] ; then + use gnome \ + && myopts="${myopts} --enable-gnome --enable-panel" \ + || myopts="${myopts} --enable-gtkfe --disable-gnome --disable-zvt" + + use gnome \ + && CFLAGS="${CFLAGS} -I/usr/include/orbit-2.0" \ + || myopts="${myopts} --disable-gnome" + fi + + use gtk \ + || myopts="${myopts} --disable-gtkfe" + + use ssl \ + && myopts="${myopts} --enable-openssl" + + use perl \ + || myopts="${myopts} --disable-perl" + + use python \ + || myopts="${myopts} --disable-python" + + use nls \ + && myopts="${myopts} --enable-hebrew --enable-japanese-conv" \ + || myopts="${myopts} --disable-nls" + + use mmx \ + && myopts="${myopts} --enable-mmx" \ + || myopts="${myopts} --disable-mmx" + + use ipv6 \ + && myopts="${myopts} --enable-ipv6" + + + [ -n "${DISABLE_XFT}" ] && myopts="${myopts} --disable-xft" + + econf \ + --program-suffix=-2 \ + ${myopts} || die "Configure failed" + + MAKEOPTS="-j1" emake || die "Compile failed" +} + +src_install() { + # some magic to create a menu entry for xchat 2 + sed -e "s:Exec=xchat:Exec=xchat-2:" -e "s:Name=X-Chat:Name=X-Chat 2:" xchat.desktop > xchat-2.desktop + + use kde && insinto ${KDEDIR}/share/applnk/Internet \ + || insinto /usr/share/gnome/apps/Internet + doins xchat-2.desktop + + einstall install || die "Install failed" + + # we prefer our own launcher + rm ${D}/etc/X11/applnk/Internet/xchat.desktop + rmdir -p ${D}/etc/X11/applnk/Internet + + use python && + ( dosym /usr/lib/xchat/plugins/python.so-2 /usr/lib/xchat/plugins/python.so ) + use perl && + ( dosym /usr/lib/xchat/plugins/perl.so-2 /usr/lib/xchat/plugins/perl.so ) + + dodoc AUTHORS COPYING ChangeLog README +} + +pkg_postinst() { + einfo "If you want X-Chat to correctly display Hebrew (bidi) do " + einfo "'export DISABLE_XFT=1' and re-emerge xchat" +} -- 2.26.2