diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-09-10 10:52:33 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-09-10 10:53:34 +0200 |
| commit | 80927381105b7e9b92f69be100f8bacab36c5760 (patch) | |
| tree | 8c18f3b7ed07cd7b11aa376deeaf3164cab432bb | |
| parent | b9240e6bf1ccc11feb8b5abe0c40f694f6ecdefc (diff) | |
xterm: optimize some configure options
| -rw-r--r-- | package/xterm/Makefile | 3 | ||||
| -rw-r--r-- | package/xterm/patches/patch-main_c | 12 | ||||
| -rw-r--r-- | package/xterm/patches/patch-ptyx_h | 6 | ||||
| -rw-r--r-- | package/xterm/patches/patch-xterm_io_h | 6 |
4 files changed, 15 insertions, 12 deletions
diff --git a/package/xterm/Makefile b/package/xterm/Makefile index fa750d4a2..d6cfcd674 100644 --- a/package/xterm/Makefile +++ b/package/xterm/Makefile @@ -22,6 +22,9 @@ $(eval $(call PKG_template,XTERM,xterm,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPEN TARGET_LDFLAGS+= -ltinfo CONFIGURE_ARGS+= --with-app-defaults=/usr/lib/X11/app-defaults \ + --x-includes="$(STAGING_TARGET_DIR)/usr/include" \ + --x-libraries="$(STAGING_TARGET_DIR)/usr/lib" \ + --with-freetype-cflags="-I$(STAGING_TARGET_DIR)/usr/include/freetype2" \ --disable-regex \ --disable-pty-handshake diff --git a/package/xterm/patches/patch-main_c b/package/xterm/patches/patch-main_c index dbe55d4ed..96d2398c8 100644 --- a/package/xterm/patches/patch-main_c +++ b/package/xterm/patches/patch-main_c @@ -1,6 +1,6 @@ ---- xterm-297.orig/main.c 2013-05-28 00:11:11.000000000 +0200 -+++ xterm-297/main.c 2013-10-31 12:24:52.000000000 +0100 -@@ -2583,7 +2583,7 @@ main(int argc, char *argv[]ENVP_ARG) +--- xterm-325.orig/main.c 2016-06-01 11:13:46.000000000 +0200 ++++ xterm-325/main.c 2016-09-09 22:25:42.000000000 +0200 +@@ -2637,7 +2637,7 @@ main(int argc, char *argv[]ENVP_ARG) } } @@ -9,7 +9,7 @@ #define USE_OPENPTY 1 static int opened_tty = -1; #endif -@@ -3134,7 +3134,7 @@ find_utmp(struct UTMP_STR *tofind) +@@ -3204,7 +3204,7 @@ find_utmp(struct UTMP_STR *tofind) #define close_fd(fd) close(fd), fd = -1 @@ -18,7 +18,7 @@ #define USE_NO_DEV_TTY 1 #else #define USE_NO_DEV_TTY 0 -@@ -3378,7 +3378,8 @@ spawnXTerm(XtermWidget xw) +@@ -3537,7 +3537,8 @@ spawnXTerm(XtermWidget xw) } #endif /* __MVS__ */ @@ -28,7 +28,7 @@ } if (get_pty(&screen->respond, XDisplayString(screen->display))) { -@@ -3807,8 +3808,9 @@ spawnXTerm(XtermWidget xw) +@@ -3966,8 +3967,9 @@ spawnXTerm(XtermWidget xw) eg. by lineedit in the shell, or emacs, etc. then tio will have bad values. Let's just get termio from the new tty and tailor it. */ diff --git a/package/xterm/patches/patch-ptyx_h b/package/xterm/patches/patch-ptyx_h index cd2fa7cad..6fa2d72d2 100644 --- a/package/xterm/patches/patch-ptyx_h +++ b/package/xterm/patches/patch-ptyx_h @@ -1,6 +1,6 @@ ---- xterm-297.orig/ptyx.h 2013-09-10 20:10:00.000000000 +0200 -+++ xterm-297/ptyx.h 2013-10-30 10:30:07.000000000 +0100 -@@ -169,7 +169,7 @@ +--- xterm-325.orig/ptyx.h 2016-05-29 22:32:48.000000000 +0200 ++++ xterm-325/ptyx.h 2016-09-09 22:25:42.000000000 +0200 +@@ -176,7 +176,7 @@ #define USE_PTY_DEVICE 1 #define USE_PTY_SEARCH 1 diff --git a/package/xterm/patches/patch-xterm_io_h b/package/xterm/patches/patch-xterm_io_h index 3ca39b3f6..286388b66 100644 --- a/package/xterm/patches/patch-xterm_io_h +++ b/package/xterm/patches/patch-xterm_io_h @@ -1,6 +1,6 @@ ---- xterm-297.orig/xterm_io.h 2013-01-06 16:20:45.000000000 +0100 -+++ xterm-297/xterm_io.h 2013-10-30 17:21:10.000000000 +0100 -@@ -66,7 +66,7 @@ +--- xterm-325.orig/xterm_io.h 2014-07-25 10:26:56.000000000 +0200 ++++ xterm-325/xterm_io.h 2016-09-09 22:25:42.000000000 +0200 +@@ -71,7 +71,7 @@ #endif #ifdef linux |