ports/opt
4
3
Fork 1
Code Issues 1 Pull Requests Activity

aterm: update to 1.0.1

Browse Source
This commit is contained in:
Juergen Daubert 2007-08-04 09:35:52 +02:00
parent d91e626363
commit acd8760cb7
5 changed files with 97 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
aterm/.md5sum
View File

@ -1,3 +1,3 @@
568777c65a723f6ba27464473c424a10 aterm-1.0.0.tar.gz b0975b4b46225544e2eac898d888c08a aterm-1.0.1.tar.gz
97d90349c7d7e633fb7ab3a2ae0bf5fb aterm-configure.patch 370ad2c16bc513fcc45b9ef07a0125f2 aterm-fake_root.patch
4e8daae7dea71b3c7956d96a7bd366e5 aterm-fake_root.patch 5b2e5f14acd18893837d8734b41d505a aterm-fkeys.patch

10
aterm/Pkgfile
View File

@ -4,19 +4,19 @@
# Depends on: xorg-libxext, xorg-libsm # Depends on: xorg-libxext, xorg-libsm
name=aterm name=aterm
version=1.0.0 version=1.0.1
release=2 release=1
source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz \ source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz \
$name-fake_root.patch $name-configure.patch) $name-fake_root.patch $name-fkeys.patch)
build () { build () {
cd aterm-$version cd aterm-$version
patch -p1 < $SRC/$name-configure.patch
patch -p1 < $SRC/$name-fake_root.patch patch -p1 < $SRC/$name-fake_root.patch
patch -p1 < $SRC/$name-fkeys.patch
cp autoconf/configure.in . cp autoconf/configure.in .
autoconf autoconf
autoheader autoheader
./configure --prefix=/usr --enable-fake-root --mandir=/usr/man ./configure --prefix=/usr --enable-fake-root --mandir=/usr/man
make make
make DESTDIR=$PKG install make DESTDIR=$PKG install
} }

12
aterm/aterm-configure.patch
View File

@ -1,12 +0,0 @@
diff -Nru aterm-1.0.0.orig/autoconf/configure.in aterm-1.0.0/autoconf/configure.in
--- aterm-1.0.0.orig/autoconf/configure.in 2006-07-12 07:11:18.000000000 +0200
+++ aterm-1.0.0/autoconf/configure.in 2006-07-12 07:12:39.000000000 +0200
@@ -352,7 +352,7 @@
AC_MSG_RESULT($AFTERSTEP_LIBS)
else
if test "$afterstep_config" != "NO" ; then
- ÿÿÿÿ AC_MSG_RESULT(afterstep-config not found in $afterstep_config)
+ AC_MSG_RESULT(afterstep-config not found in $afterstep_config)
else
AC_MSG_RESULT(afterstep-config not found)
fi

102
aterm/aterm-fake_root.patch
View File

@ -1,6 +1,6 @@
diff -Nru aterm-1.0.0.orig/README.configure aterm-1.0.0/README.configure diff -Nru aterm-1.0.1.orig/README.configure aterm-1.0.1/README.configure
--- aterm-1.0.0.orig/README.configure 2005-07-11 20:48:22.000000000 +0200 --- aterm-1.0.1.orig/README.configure 2007-08-02 14:35:31.000000000 +0200
+++ aterm-1.0.0/README.configure 2005-07-11 20:48:41.000000000 +0200 +++ aterm-1.0.1/README.configure 2007-08-02 14:23:19.000000000 +0200
@@ -56,6 +56,10 @@ @@ -56,6 +56,10 @@
the mouse button down on a scrollbar arrow the mouse button down on a scrollbar arrow
--disable-mousewheel --disable-mousewheel
@ -12,9 +12,9 @@ diff -Nru aterm-1.0.0.orig/README.configure aterm-1.0.0/README.configure
--enable-old-selection --enable-old-selection
revert mouse selection to something similar to v2.20 (and prior) - revert mouse selection to something similar to v2.20 (and prior) -
this implies word selection of those versions (i.e. next option) this implies word selection of those versions (i.e. next option)
diff -Nru aterm-1.0.0.orig/autoconf/configure.in aterm-1.0.0/autoconf/configure.in diff -Nru aterm-1.0.1.orig/autoconf/configure.in aterm-1.0.1/autoconf/configure.in
--- aterm-1.0.0.orig/autoconf/configure.in 2005-07-11 20:48:22.000000000 +0200 --- aterm-1.0.1.orig/autoconf/configure.in 2007-08-02 14:35:30.000000000 +0200
+++ aterm-1.0.0/autoconf/configure.in 2005-07-11 20:48:41.000000000 +0200 +++ aterm-1.0.1/autoconf/configure.in 2007-08-02 15:00:51.000000000 +0200
@@ -82,6 +82,9 @@ @@ -82,6 +82,9 @@
AC_ARG_ENABLE(mousewheel, [ --disable-mousewheel disable scrolling via mouse wheel or buttons 4 & 5], AC_ARG_ENABLE(mousewheel, [ --disable-mousewheel disable scrolling via mouse wheel or buttons 4 & 5],
[if test x$enableval = xno; then AC_DEFINE(NO_MOUSE_WHEEL,1,[Use wheel events (button4 and button5) to scroll]) fi]) [if test x$enableval = xno; then AC_DEFINE(NO_MOUSE_WHEEL,1,[Use wheel events (button4 and button5) to scroll]) fi])
@ -25,9 +25,18 @@ diff -Nru aterm-1.0.0.orig/autoconf/configure.in aterm-1.0.0/autoconf/configure.
AC_ARG_ENABLE(old-selection, [ --enable-old-selection enable v2.20 (and prior) mouse selection AC_ARG_ENABLE(old-selection, [ --enable-old-selection enable v2.20 (and prior) mouse selection
- this implies old word selection], - this implies old word selection],
[if test x$enableval = xyes; then AC_DEFINE(OLD_SELECTION,1,[Define to use old rxvt (ver 2.20 and before) style selection, not xterm style.]) fi]) [if test x$enableval = xyes; then AC_DEFINE(OLD_SELECTION,1,[Define to use old rxvt (ver 2.20 and before) style selection, not xterm style.]) fi])
diff -Nru aterm-1.0.0.orig/doc/aterm.1 aterm-1.0.0/doc/aterm.1 @@ -635,7 +638,7 @@
--- aterm-1.0.0.orig/doc/aterm.1 2005-07-11 20:48:22.000000000 +0200 [setlocale(LC_CTYPE, "");],
+++ aterm-1.0.0/doc/aterm.1 2005-07-11 20:48:41.000000000 +0200 rxvt_cv_func_xsetlocale=yes, rxvt_cv_func_xsetlocale=no)])
if test "${rxvt_cv_func_xsetlocale}" = no; then
- AC_DEFINE(NO_XSETLOCALE)
+ AC_DEFINE(NO_XSETLOCALE,1,[Define if xsetlocale doesn't work])
fi
AC_CACHE_CHECK(for working plain setlocale, rxvt_cv_func_setlocale,
diff -Nru aterm-1.0.1.orig/doc/aterm.1 aterm-1.0.1/doc/aterm.1
--- aterm-1.0.1.orig/doc/aterm.1 2007-08-02 14:35:30.000000000 +0200
+++ aterm-1.0.1/doc/aterm.1 2007-08-02 14:23:19.000000000 +0200
@@ -230,6 +230,16 @@ @@ -230,6 +230,16 @@
.IP "\fB-st\fP|\fB+st\fP" .IP "\fB-st\fP|\fB+st\fP"
Display scrollbar without/with a trough; Display scrollbar without/with a trough;
@ -45,10 +54,22 @@ diff -Nru aterm-1.0.0.orig/doc/aterm.1 aterm-1.0.0/doc/aterm.1
.IP "\fB-iconic\fP" .IP "\fB-iconic\fP"
Start iconified, if the window manager supports that option\&. Start iconified, if the window manager supports that option\&.
.IP "\fB-sl\fP \fInumber\fP" .IP "\fB-sl\fP \fInumber\fP"
diff -Nru aterm-1.0.0.orig/src/command.c aterm-1.0.0/src/command.c diff -Nru aterm-1.0.1.orig/src/command.c aterm-1.0.1/src/command.c
--- aterm-1.0.0.orig/src/command.c 2005-07-11 20:48:22.000000000 +0200 --- aterm-1.0.1.orig/src/command.c 2007-08-02 14:35:31.000000000 +0200
+++ aterm-1.0.0/src/command.c 2005-07-11 20:48:41.000000000 +0200 +++ aterm-1.0.1/src/command.c 2007-08-02 15:48:46.000000000 +0200
@@ -2365,6 +2365,13 @@ @@ -1886,9 +1886,9 @@
case XK_F2: /* "\033[12~" */
case XK_F3: /* "\033[13~" */
case XK_F4: /* "\033[14~" */
- FKEY(11, XK_F1);
+ FKEY(11, XK_F1);
break;
-#endif
+#endif
case XK_F5: /* "\033[15~" */
FKEY(15, XK_F5);
break;
@@ -2411,6 +2411,13 @@
} }
break; break;
@ -62,7 +83,7 @@ diff -Nru aterm-1.0.0.orig/src/command.c aterm-1.0.0/src/command.c
case FocusIn: case FocusIn:
if (!TermWin.focus) { if (!TermWin.focus) {
TermWin.focus = 1; TermWin.focus = 1;
@@ -2381,7 +2388,12 @@ @@ -2427,7 +2434,12 @@
#endif #endif
} }
break; break;
@ -76,9 +97,9 @@ diff -Nru aterm-1.0.0.orig/src/command.c aterm-1.0.0/src/command.c
case FocusOut: case FocusOut:
if (TermWin.focus) { if (TermWin.focus) {
TermWin.focus = 0; TermWin.focus = 0;
diff -Nru aterm-1.0.0.orig/src/main.c aterm-1.0.0/src/main.c diff -Nru aterm-1.0.1.orig/src/main.c aterm-1.0.1/src/main.c
--- aterm-1.0.0.orig/src/main.c 2005-07-11 20:48:22.000000000 +0200 --- aterm-1.0.1.orig/src/main.c 2007-08-02 14:35:30.000000000 +0200
+++ aterm-1.0.0/src/main.c 2005-07-11 20:50:18.000000000 +0200 +++ aterm-1.0.1/src/main.c 2007-08-02 14:23:19.000000000 +0200
@@ -705,7 +705,14 @@ @@ -705,7 +705,14 @@
&attributes); &attributes);
@ -141,22 +162,7 @@ diff -Nru aterm-1.0.0.orig/src/main.c aterm-1.0.0/src/main.c
attributes.cursor = TermWin_cursor ; attributes.cursor = TermWin_cursor ;
/* the vt window */ /* the vt window */
#ifdef HAVE_AFTERIMAGE #ifdef HAVE_AFTERIMAGE
@@ -1037,12 +1063,12 @@ @@ -2361,6 +2387,11 @@
XConfigureEvent *xconf = &(ev->xconfigure);
while( XCheckTypedWindowEvent( Xdisplay, TermWin.parent, ConfigureNotify, ev ) );
- fprintf( stderr, "config_geom = %dx%d\n", xconf->width, xconf->height );
+/* fprintf( stderr, "config_geom = %dx%d\n", xconf->width, xconf->height ); */
resize_window1(xconf->width, xconf->height);
#if 1
XTranslateCoordinates (Xdisplay, TermWin.parent, Xroot, 0, 0, &root_x, &root_y, &wdumm);
- fprintf( stderr, "root_geom = %dx%d%+d%+d, root_size = %dx%d\n", xconf->width, xconf->height, root_x, root_y, XdisplayWidth, XdisplayHeight );
+/* fprintf( stderr, "root_geom = %dx%d%+d%+d, root_size = %dx%d\n", xconf->width, xconf->height, root_x, root_y, XdisplayWidth, XdisplayHeight ); */
TermWin.root_x = root_x ;
TermWin.root_y = root_y ;
TermWin.root_width = xconf->width ;
@@ -2341,6 +2367,11 @@
/* do it now to avoid unneccessary redrawing */ /* do it now to avoid unneccessary redrawing */
XMapWindow(Xdisplay, TermWin.vt); XMapWindow(Xdisplay, TermWin.vt);
XMapWindow(Xdisplay, TermWin.parent); XMapWindow(Xdisplay, TermWin.parent);
@ -168,20 +174,20 @@ diff -Nru aterm-1.0.0.orig/src/main.c aterm-1.0.0/src/main.c
#if 0 #if 0
#if defined(BACKGROUND_IMAGE) || defined(TRANSPARENT) || defined(_MYSTYLE_) #if defined(BACKGROUND_IMAGE) || defined(TRANSPARENT) || defined(_MYSTYLE_)
diff -Nru aterm-1.0.0.orig/src/rxvt.h aterm-1.0.0/src/rxvt.h diff -Nru aterm-1.0.1.orig/src/rxvt.h aterm-1.0.1/src/rxvt.h
--- aterm-1.0.0.orig/src/rxvt.h 2005-07-11 20:48:22.000000000 +0200 --- aterm-1.0.1.orig/src/rxvt.h 2007-08-02 14:35:31.000000000 +0200
+++ aterm-1.0.0/src/rxvt.h 2005-07-11 20:48:41.000000000 +0200 +++ aterm-1.0.1/src/rxvt.h 2007-08-02 14:33:42.000000000 +0200
@@ -779,6 +779,7 @@ @@ -785,6 +785,7 @@
#define Opt_transparent (1LU<<13) #define Opt_transparent (1LU<<13)
#define Opt_transparent_sb (1LU<<14) #define Opt_transparent_sb (1LU<<14)
#define Opt_borderLess (1LU<<16) #define Opt_borderLess (1LU<<16)
+#define Opt_fake_root (1LU<<17) +#define Opt_fake_root (1LU<<17)
/* place holder used for parsing command-line options */ /* place holder used for parsing command-line options */
#define Opt_Reverse (1LU<<30) #define Opt_Reverse (1LU<<30)
diff -Nru aterm-1.0.0.orig/src/xdefaults.c aterm-1.0.0/src/xdefaults.c diff -Nru aterm-1.0.1.orig/src/xdefaults.c aterm-1.0.1/src/xdefaults.c
--- aterm-1.0.0.orig/src/xdefaults.c 2005-07-11 20:48:22.000000000 +0200 --- aterm-1.0.1.orig/src/xdefaults.c 2007-08-02 14:35:30.000000000 +0200
+++ aterm-1.0.0/src/xdefaults.c 2005-07-11 20:48:41.000000000 +0200 +++ aterm-1.0.1/src/xdefaults.c 2007-08-02 14:23:19.000000000 +0200
@@ -80,6 +80,9 @@ @@ -80,6 +80,9 @@
#ifdef GREEK_SUPPORT #ifdef GREEK_SUPPORT
static const char *rs_greek_keyboard = NULL; static const char *rs_greek_keyboard = NULL;
@ -192,7 +198,7 @@ diff -Nru aterm-1.0.0.orig/src/xdefaults.c aterm-1.0.0/src/xdefaults.c
/*}}} */ /*}}} */
/*{{{ monolithic option/resource structure: */ /*{{{ monolithic option/resource structure: */
@@ -311,6 +314,10 @@ @@ -316,6 +319,10 @@
"scroll-on-tty-output inhibit"), "scroll-on-tty-output inhibit"),
BOOL(rs_scrollKeypress, "scrollKey", "sk", BOOL(rs_scrollKeypress, "scrollKey", "sk",
Opt_scrollKeypress, "scroll-on-keypress"), Opt_scrollKeypress, "scroll-on-keypress"),

35
aterm/aterm-fkeys.patch Normal file
View File

@ -0,0 +1,35 @@
diff -Nru aterm-1.0.1.orig/src/command.c aterm-1.0.1/src/command.c
--- aterm-1.0.1.orig/src/command.c 2007-08-03 11:20:28.000000000 +0200
+++ aterm-1.0.1/src/command.c 2007-08-03 11:21:53.000000000 +0200
@@ -1869,28 +1869,18 @@
}
break;
- case XK_F1: /* "\033OP" */
- case XK_F2: /* "\033OQ" */
- case XK_F3: /* "\033OR" */
- case XK_F4: /* "\033OS" */
- len = 3;
- STRCPY(kbuf, "\033OP");
- kbuf[2] += (keysym - XK_F1);
- break;
-
#define FKEY(n, fkey) \
len = 5; \
sprintf((char *) kbuf,"\033[%02d~", (int)((n) + (keysym - fkey)))
-#if 0 /* old style keymappings : */
case XK_F1: /* "\033[11~" */
case XK_F2: /* "\033[12~" */
case XK_F3: /* "\033[13~" */
case XK_F4: /* "\033[14~" */
- FKEY(11, XK_F1);
+ FKEY(11, XK_F1);
break;
-#endif
+
case XK_F5: /* "\033[15~" */
- FKEY(15, XK_F5);
+ FKEY(15, XK_F5);
break;
case XK_F6: /* "\033[17~" */