From 0b762b3f16368637ca6a7576f3d34605d5498484 Mon Sep 17 00:00:00 2001 From: Michael Januszewski Date: Sat, 17 Jan 2004 18:09:33 +0000 Subject: Added metadata.xml, fixed headers in old ebuilds, bumped to -r7 (added patches from bugs #30958 and #30298). --- x11-terms/aterm/ChangeLog | 10 +- x11-terms/aterm/aterm-0.4.2-r4.ebuild | 4 +- x11-terms/aterm/aterm-0.4.2-r5.ebuild | 4 +- x11-terms/aterm/aterm-0.4.2-r7.ebuild | 75 ++++++++++++ x11-terms/aterm/files/aterm-0.4.2-copynpaste.patch | 120 ++++++++++++++++++ x11-terms/aterm/files/aterm-0.4.2-paste.patch | 59 +++++++++ .../files/aterm-0.4.2-paste_mouse_outside.patch | 135 +++++++++++++++++++++ x11-terms/aterm/files/digest-aterm-0.4.2-r7 | 2 + x11-terms/aterm/metadata.xml | 9 ++ 9 files changed, 413 insertions(+), 5 deletions(-) create mode 100644 x11-terms/aterm/aterm-0.4.2-r7.ebuild create mode 100644 x11-terms/aterm/files/aterm-0.4.2-copynpaste.patch create mode 100644 x11-terms/aterm/files/aterm-0.4.2-paste.patch create mode 100644 x11-terms/aterm/files/aterm-0.4.2-paste_mouse_outside.patch create mode 100644 x11-terms/aterm/files/digest-aterm-0.4.2-r7 create mode 100644 x11-terms/aterm/metadata.xml (limited to 'x11-terms') diff --git a/x11-terms/aterm/ChangeLog b/x11-terms/aterm/ChangeLog index fba51b8d13e7..ccfea3102409 100644 --- a/x11-terms/aterm/ChangeLog +++ b/x11-terms/aterm/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-terms/aterm # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/ChangeLog,v 1.16 2004/01/15 15:41:59 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/ChangeLog,v 1.17 2004/01/17 18:09:33 spock Exp $ + +*aterm-0.4.2-r7 (17 Jan 2004) + + 17 Jan 2004; Michal 'Spock' Januszewski + aterm-0.4.2-r4.ebuild, aterm-0.4.2-r5.ebuild, aterm-0.4.2-r7.ebuild, + metadata.xml, files/aterm-0.4.2-copynpaste.patch, + files/aterm-0.4.2-paste.patch, files/aterm-0.4.2-paste_mouse_outside.patch: + Added metadata.xml, bumped to -r7 (added patches from bugs #30958 and #30298). *aterm-0.4.2-r6 (15 Jan 2004) diff --git a/x11-terms/aterm/aterm-0.4.2-r4.ebuild b/x11-terms/aterm/aterm-0.4.2-r4.ebuild index 868d1ea1a730..2dedc086a59e 100644 --- a/x11-terms/aterm/aterm-0.4.2-r4.ebuild +++ b/x11-terms/aterm/aterm-0.4.2-r4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. +# Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/aterm-0.4.2-r4.ebuild,v 1.6 2003/10/02 14:59:11 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/aterm-0.4.2-r4.ebuild,v 1.7 2004/01/17 18:09:33 spock Exp $ IUSE="cjk" S=${WORKDIR}/${P} diff --git a/x11-terms/aterm/aterm-0.4.2-r5.ebuild b/x11-terms/aterm/aterm-0.4.2-r5.ebuild index e8a095dc9ba6..34a820d724f4 100644 --- a/x11-terms/aterm/aterm-0.4.2-r5.ebuild +++ b/x11-terms/aterm/aterm-0.4.2-r5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. +# Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/aterm-0.4.2-r5.ebuild,v 1.2 2003/12/03 12:02:53 zul Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/aterm-0.4.2-r5.ebuild,v 1.3 2004/01/17 18:09:33 spock Exp $ IUSE="cjk" S=${WORKDIR}/${P} diff --git a/x11-terms/aterm/aterm-0.4.2-r7.ebuild b/x11-terms/aterm/aterm-0.4.2-r7.ebuild new file mode 100644 index 000000000000..065b40882ca9 --- /dev/null +++ b/x11-terms/aterm/aterm-0.4.2-r7.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/aterm-0.4.2-r7.ebuild,v 1.1 2004/01/17 18:09:33 spock Exp $ + +IUSE="cjk" +S=${WORKDIR}/${P} +DESCRIPTION="A terminal emulator with transparency support as well as rxvt backwards compatibility" +SRC_URI="mirror://sourceforge/aterm/${P}.tar.bz2 + cjk? (http://wakaba.com/~tsann/aterm/aterm-0.4.2-ja.patch)" +HOMEPAGE="http://aterm.sourceforge.net" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64" + +DEPEND="media-libs/jpeg + media-libs/libpng + virtual/x11" + +src_unpack() { + unpack ${P}.tar.bz2 + cd ${S}/src + cp feature.h feature.h.orig + sed "s:\(#define LINUX_KEYS\):/\*\1\*/:" \ + feature.h.orig > feature.h + + cd ${S} + epatch ${FILESDIR}/aterm-0.4.2-borderless.patch + epatch ${FILESDIR}/aterm-0.4.2-paste.patch + epatch ${FILESDIR}/aterm-0.4.2-paste_mouse_outside.patch + + if [ `use cjk` ] ; then + epatch ${DISTDIR}/aterm-0.4.2-ja.patch + else + epatch ${FILESDIR}/aterm-0.4.2-copynpaste.patch + fi +} + +src_compile() { + local myconf + + # You can't --enable-big5 with aterm-0.4.2-ja.patch + # I think it's very bad thing but as nobody complains it + # and we don't have per-language flag atm, I stick to + # use --enable-kanji/--enable-thai (and leave --enable-big5) + use cjk && myconf="$myconf + --enable-kanji + --enable-thai + --enable-xim + --enable-linespace" + + econf \ + --enable-transparency \ + --enable-fading \ + --enable-background-image \ + --enable-menubar \ + --enable-graphics \ + --enable-utmp \ + --with-x \ + ${myconf} || die + + emake || die +} + +src_install () { + make DESTDIR=${D} install || die + + fperms g+s /usr/bin/aterm + fowners root:utmp /usr/bin/aterm + + doman doc/aterm.1 + dodoc ChangeLog INSTALL doc/BUGS doc/FAQ doc/README.* + docinto menu + dodoc doc/menu/* + dohtml -r . +} diff --git a/x11-terms/aterm/files/aterm-0.4.2-copynpaste.patch b/x11-terms/aterm/files/aterm-0.4.2-copynpaste.patch new file mode 100644 index 000000000000..f655a241fac0 --- /dev/null +++ b/x11-terms/aterm/files/aterm-0.4.2-copynpaste.patch @@ -0,0 +1,120 @@ +diff -Naur aterm-0.4.2-orig/configure aterm-0.4.2/configure +--- aterm-0.4.2-orig/configure 2001-09-06 18:38:07.000000000 +0200 ++++ aterm-0.4.2/configure 2004-01-17 01:59:10.457046704 +0100 +@@ -2609,7 +2609,7 @@ + ; \ + do + ac_save_LIBS=$LIBS +- LIBS="-L$ac_dir -lXpm $LIBS -lX11" ++ LIBS="-L$ac_dir -lXpm $LIBS -lX11 -lXmu" + cat > conftest.$ac_ext <xbutton.button) { + case Button1: + case Button3: +- selection_make(ev->xbutton.time); ++ selection_make(ev->xbutton.time, ev->xbutton.state); + break; + + case Button2: +diff -Naur aterm-0.4.2-orig/src/screen.c aterm-0.4.2/src/screen.c +--- aterm-0.4.2-orig/src/screen.c 2001-09-06 18:38:07.000000000 +0200 ++++ aterm-0.4.2/src/screen.c 2004-01-17 01:59:36.316115528 +0100 +@@ -44,7 +44,7 @@ + + #include + #include /* get the typedef for CARD32 */ +- ++#include + + static screen_t screen; + +@@ -2759,21 +2759,34 @@ + long nread; + unsigned long bytes_after, nitems; + unsigned char *data; ++ XTextProperty ct; + Atom actual_type; + int actual_fmt; ++ int dummy_count; ++ char **cl; + + if (prop == None) + return; ++ + for (nread = 0, bytes_after = 1; bytes_after > 0; nread += nitems) { + if ((XGetWindowProperty(Xdisplay, win, prop, (nread / 4), PROP_SIZE, +- Delete, AnyPropertyType, &actual_type, +- &actual_fmt, &nitems, &bytes_after, +- &data) != Success)) { +- XFree(data); ++ Delete, AnyPropertyType, &ct.encoding, &ct.format, ++ &ct.nitems, &bytes_after, &ct.value) != Success)) { ++ XFree(ct.value); + return; + } +- PasteIt(data, nitems); +- XFree(data); ++ ++ if (XmbTextPropertyToTextList(Xdisplay, &ct, &cl, &dummy_count) == Success && cl) { ++ PasteIt(cl[0], strlen(cl[0])); ++ XFreeStringList(cl); ++ } else { ++ PasteIt(ct.value, (unsigned int)ct.nitems); ++ } ++ ++ nread += ct.nitems; ++ ++ if (ct.value) ++ XFree(ct.value); + } + } + +@@ -2787,6 +2800,9 @@ + selection_request(Time tm, int x, int y) + { + Atom prop; ++ Atom xa; ++ ++ xa = XInternAtom(Xdisplay, "COMPOUND_TEXT", False); + + if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) + return; /* outside window */ +@@ -2797,7 +2813,7 @@ + selection_paste(Xroot, XA_CUT_BUFFER0, False); + } else { + prop = XInternAtom(Xdisplay, "VT_SELECTION", False); +- XConvertSelection(Xdisplay, XA_PRIMARY, XA_STRING, prop, TermWin.vt, ++ XConvertSelection(Xdisplay, XA_PRIMARY, xa, prop, TermWin.vt, + tm); + } + } +@@ -2827,7 +2843,7 @@ + */ + /* PROTO */ + void +-selection_make(Time tm) ++selection_make(Time tm, unsigned int key_state) + { + int i, col, end_col, row, end_row; + unsigned char *new_selection_text; +@@ -2894,7 +2910,13 @@ + FREE(selection.text); + selection.text = new_selection_text; + +- XSetSelectionOwner(Xdisplay, XA_PRIMARY, TermWin.vt, tm); ++ // selecting with ALT will put the text to clipboard ++ if (key_state & Mod1Mask) { ++ XSetSelectionOwner(Xdisplay, XA_CLIPBOARD(Xdisplay), TermWin.vt, tm); ++ } else { ++ XSetSelectionOwner(Xdisplay, XA_PRIMARY, TermWin.vt, tm); ++ } ++ + if (XGetSelectionOwner(Xdisplay, XA_PRIMARY) != TermWin.vt) + print_error("can't get primary selection"); + XChangeProperty(Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8, diff --git a/x11-terms/aterm/files/aterm-0.4.2-paste.patch b/x11-terms/aterm/files/aterm-0.4.2-paste.patch new file mode 100644 index 000000000000..8d887b9acc59 --- /dev/null +++ b/x11-terms/aterm/files/aterm-0.4.2-paste.patch @@ -0,0 +1,59 @@ +--- aterm-0.4.2-orig/src/screen.c 2001-09-06 12:38:07.000000000 -0400 ++++ aterm-0.4.2/src/screen.c 2003-09-11 02:45:54.000000000 -0400 +@@ -3328,10 +3330,21 @@ + void + selection_send(XSelectionRequestEvent * rq) + { ++ /* Changes are from rxvt. This fixes #205040. */ + XEvent ev; +- Atom32 target_list[2]; ++ Atom32 target_list[4]; ++ Atom target; + static Atom xa_targets = None; +- ++ static Atom xa_compound_text = None; ++ static Atom xa_text = None; ++ XTextProperty ct; ++ XICCEncodingStyle style; ++ char *cl[4]; ++ ++ if (xa_text == None) ++ xa_text = XInternAtom(Xdisplay, "TEXT", False); ++ if (xa_compound_text == None) ++ xa_compound_text = XInternAtom(Xdisplay, "COMPOUND_TEXT", False); + if (xa_targets == None) + xa_targets = XInternAtom(Xdisplay, "TARGETS", False); + +@@ -3346,14 +3359,29 @@ + if (rq->target == xa_targets) { + target_list[0] = (Atom32) xa_targets; + target_list[1] = (Atom32) XA_STRING; ++ target_list[2] = (Atom32) xa_text; ++ target_list[3] = (Atom32) xa_compound_text; + XChangeProperty(Xdisplay, rq->requestor, rq->property, rq->target, + (8 * sizeof(target_list[0])), PropModeReplace, + (unsigned char *)target_list, + (sizeof(target_list) / sizeof(target_list[0]))); + ev.xselection.property = rq->property; +- } else if (rq->target == XA_STRING) { +- XChangeProperty(Xdisplay, rq->requestor, rq->property, rq->target, +- 8, PropModeReplace, selection.text, selection.len); ++ } else if (rq->target == XA_STRING ++ || rq->target == xa_compound_text ++ || rq->target == xa_text) { ++ if (rq->target == XA_STRING) { ++ style = XStringStyle; ++ target = XA_STRING; ++ } else { ++ target = xa_compound_text; ++ style = (rq->target == xa_compound_text) ? XCompoundTextStyle ++ : XStdICCTextStyle; ++ } ++ cl[0] = selection.text; ++ XmbTextListToTextProperty(Xdisplay, cl, 1, style, &ct); ++ XChangeProperty(Xdisplay, rq->requestor, rq->property, ++ target, 8, PropModeReplace, ++ ct.value, ct.nitems); + ev.xselection.property = rq->property; + } + XSendEvent(Xdisplay, rq->requestor, False, 0, &ev); diff --git a/x11-terms/aterm/files/aterm-0.4.2-paste_mouse_outside.patch b/x11-terms/aterm/files/aterm-0.4.2-paste_mouse_outside.patch new file mode 100644 index 000000000000..ae31a0e8730a --- /dev/null +++ b/x11-terms/aterm/files/aterm-0.4.2-paste_mouse_outside.patch @@ -0,0 +1,135 @@ +diff -Naur aterm-0.4.2-orig/doc/aterm.1 aterm-0.4.2/doc/aterm.1 +--- aterm-0.4.2-orig/doc/aterm.1 2001-09-06 18:38:07.000000000 +0200 ++++ aterm-0.4.2/doc/aterm.1 2004-01-17 01:52:18.792629208 +0100 +@@ -227,6 +227,9 @@ + .IP "\fB-st\fP|\fB+st\fP" + Display scrollbar without/with a trough; + resource \fBscrollBar_floating\fP\&. ++.IP "\fB-pmo\fP|\fB+pmo\fP" ++Enable pasting when mouse pointer is outside the aterm window; ++resource \fBpasteMouseOutside\fP\&. + .IP "\fB-iconic\fP" + Start iconified, if the window manager supports that option\&. + .IP "\fB-sl\fP \fInumber\fP" +@@ -708,6 +711,8 @@ + option \fB-vb\fP\&. + \fBFalse\fP: no visual bell [default]; + option \fB+vb\fP\&. ++.IP "\fBpasteMouseOutside:\fP \fIboolean\fP" ++\fBTrue\fP: enable text pasting when mouse pointer is outside the window; + .IP "\fBloginShell:\fP \fIboolean\fP" + \fBTrue\fP: start as a login shell by prepending a `-\' to \fBargv[0]\fP + of the shell; +diff -Naur aterm-0.4.2-orig/doc/aterm.html aterm-0.4.2/doc/aterm.html +--- aterm-0.4.2-orig/doc/aterm.html 2001-09-06 18:38:07.000000000 +0200 ++++ aterm-0.4.2/doc/aterm.html 2004-01-17 01:52:18.828623736 +0100 +@@ -284,6 +284,9 @@ +
  • -st|+st + Display scrollbar without/with a trough; + resource scrollBar_floating. ++
  • -pmo|+pmo ++ Enable pasting when mouse pointer is outside the aterm window; ++ resource pasteMouseOutside. +
  • -iconic + Start iconified, if the window manager supports that option. +
  • -sl number +@@ -544,6 +547,8 @@ + option -vb. + False: no visual bell [default]; + option +vb. ++
  • pasteMouseOutside: boolean ++ True: enable text pasting when mouse pointer is outside the window. +
  • loginShell: boolean + True: start as a login shell by prepending a `-' to argv[0] + of the shell; +diff -Naur aterm-0.4.2-orig/doc/aterm.html.in aterm-0.4.2/doc/aterm.html.in +--- aterm-0.4.2-orig/doc/aterm.html.in 2001-09-06 18:38:07.000000000 +0200 ++++ aterm-0.4.2/doc/aterm.html.in 2004-01-17 01:52:18.831623280 +0100 +@@ -284,6 +284,9 @@ +
  • -st|+st + Display scrollbar without/with a trough; + resource scrollBar_floating. ++
  • -pmo|+pmo ++ Enable pasting when mouse pointer is outside the aterm window; ++ resource pasteMouseOutside. +
  • -iconic + Start iconified, if the window manager supports that option. +
  • -sl number +@@ -544,6 +547,8 @@ + option -vb. + False: no visual bell [default]; + option +vb. ++
  • pasteMouseOutside: boolean ++ True: enable text pasting when mouse pointer is outside the window. +
  • loginShell: boolean + True: start as a login shell by prepending a `-' to argv[0] + of the shell; +diff -Naur aterm-0.4.2-orig/doc/aterm.pretbl aterm-0.4.2/doc/aterm.pretbl +--- aterm-0.4.2-orig/doc/aterm.pretbl 2001-09-06 18:38:07.000000000 +0200 ++++ aterm-0.4.2/doc/aterm.pretbl 2004-01-17 01:52:18.846621000 +0100 +@@ -223,6 +223,9 @@ + .IP "\fB-st\fP|\fB+st\fP" + Display scrollbar without/with a trough; + resource \fBscrollBar_floating\fP\&. ++.IP "\fB-pmo\fP|\fB+pmo\fP" ++Enable pasting when mouse pointer is outside the aterm window; ++resource \fBpasteMouseOutside\fP\&. + .IP "\fB-iconic\fP" + Start iconified, if the window manager supports that option\&. + .IP "\fB-sl\fP \fInumber\fP" +@@ -472,6 +475,8 @@ + option \fB-vb\fP\&. + \fBFalse\fP: no visual bell [default]; + option \fB+vb\fP\&. ++.IP "\fBpasteMouseOutside:\fP \fIboolean\fP" ++\fBTrue\fP: enable text pasting when mouse pointer is outside the window; + .IP "\fBloginShell:\fP \fIboolean\fP" + \fBTrue\fP: start as a login shell by prepending a `-\' to \fBargv[0]\fP + of the shell; +diff -Naur aterm-0.4.2-orig/src/rxvt.h aterm-0.4.2/src/rxvt.h +--- aterm-0.4.2-orig/src/rxvt.h 2001-09-06 18:38:07.000000000 +0200 ++++ aterm-0.4.2/src/rxvt.h 2004-01-17 01:52:28.755114680 +0100 +@@ -689,6 +689,7 @@ + #define Opt_scrollTtyOutputInh (1LU<<11) + #define Opt_scrollKeypress (1LU<<12) + #define Opt_transparent (1LU<<13) ++#define Opt_pasteMouseOutside (1LU<<15) + #define Opt_transparent_sb (1LU<<14) + + /* place holder used for parsing command-line options */ +diff -Naur aterm-0.4.2-orig/src/screen.c aterm-0.4.2/src/screen.c +--- aterm-0.4.2-orig/src/screen.c 2001-09-06 18:38:07.000000000 +0200 ++++ aterm-0.4.2/src/screen.c 2004-01-17 01:52:18.866617960 +0100 +@@ -2788,8 +2788,9 @@ + { + Atom prop; + +- if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) +- return; /* outside window */ ++ if (!(Options & Opt_pasteMouseOutside)) ++ if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) ++ return; /* outside window */ + + if (selection.text != NULL) { + PasteIt(selection.text, selection.len); /* internal selection */ +diff -Naur aterm-0.4.2-orig/src/xdefaults.c aterm-0.4.2/src/xdefaults.c +--- aterm-0.4.2-orig/src/xdefaults.c 2001-09-06 18:38:07.000000000 +0200 ++++ aterm-0.4.2/src/xdefaults.c 2004-01-17 01:52:18.868617656 +0100 +@@ -57,6 +57,8 @@ + static const char *rs_transparent_sb = NULL; + #endif + ++static const char *rs_paste_mouse_outside = NULL; ++ + #ifdef DONT_TILE_PIXMAP_OPTION + static const char *rs_dontTilePixmap = NULL; + static const char *rs_dontTilePixmapH = NULL; +@@ -215,6 +217,8 @@ + BOOL(rs_transparent_sb, "transpscrollbar", "trsb", Opt_transparent_sb, + "transparent scrollbar"), + #endif ++ BOOL(rs_paste_mouse_outside, "pasteMouseOutside", "pmo", Opt_pasteMouseOutside, ++ "paste with mouse when pointer is outside the window"), + #endif + #if (MENUBAR_MAX) + RSTRG(rs_menu, "menu", "name[;tag]"), diff --git a/x11-terms/aterm/files/digest-aterm-0.4.2-r7 b/x11-terms/aterm/files/digest-aterm-0.4.2-r7 new file mode 100644 index 000000000000..a1aafd5e085e --- /dev/null +++ b/x11-terms/aterm/files/digest-aterm-0.4.2-r7 @@ -0,0 +1,2 @@ +MD5 5c29d0cde4225bdbd63ccb6a4dd94c56 aterm-0.4.2.tar.bz2 243419 +MD5 2bd8629ea2a1926bca13841b0aca6604 aterm-0.4.2-ja.patch 84282 diff --git a/x11-terms/aterm/metadata.xml b/x11-terms/aterm/metadata.xml new file mode 100644 index 000000000000..13021607759c --- /dev/null +++ b/x11-terms/aterm/metadata.xml @@ -0,0 +1,9 @@ + + + +no-herd + + spock@gentoo.org + Michal 'Spock' Januszewski + + -- cgit v1.2.3-65-gdbad