Update to st-0.6

Upsteam's changelog entry:

	* direct tty line support
		* "st -l /dev/ttyS0 115200" works
		* replace your screen(1) with st
	* backspace and delete now work like the Linux standard
		* you only need to change the defaults if you are using a real
		  hardware terminal
	* much code refactoring
	* the -g(eometry) flag now behaves like in xterm
	* the main loop now uses a monotonic clock to prevent bugs tickling
	  down from a flawed time scale reality
	* invisible attribute is now supported
	* struck-out attribute is now supported
	* many wide-character bugs are fixed
	* fix XIM in st
	* new sequences:
		* CAN, ESC, LS2, LS3, DECSCUSR
		* 8bit: DECID, NEL, HTS, DCS, APC, PM, OSC
	* children now show an error message
	* VT102ID can be configured in config.h
	* fix shell selection by grasping the value from the passwd file
	* don't allow shells run by users not in passwd
	* st supports utmp[2]
	* the bell in st now calls XkbBell so it's possible to catch the
	  XkbBellNotifyEvent for your own pleasure
	* many changes in the font drawing code
		* speed optimisations!
	* clipboard handling has been fixed
		* default is primary
		* clipboard needs shortcuts
	* MANY small fixes to make st more stable

Also, use DejaVu Sans Mono (from xenocara) and don't force CFLAGS that are not
critical to build.

OK gsoares@, jung@ and sthen@
This commit is contained in:
czarkoff 2015-07-09 22:07:23 +00:00
parent 9e43fbe201
commit c3b17a520e
5 changed files with 26 additions and 25 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.10 2014/06/10 07:14:50 bcallah Exp $
# $OpenBSD: Makefile,v 1.11 2015/07/09 22:07:23 czarkoff Exp $
COMMENT= simple X terminal
DISTNAME= st-0.5
DISTNAME= st-0.6
CATEGORIES= x11
@ -13,12 +13,10 @@ MAINTAINER= Joerg Jung <jung@openbsd.org>
# MIT/X Consortium License
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= c util X11 Xext Xft fontconfig freetype z
WANTLIB= c m util X11 Xext Xft fontconfig freetype z
MASTER_SITES= http://dl.suckless.org/st/
RUN_DEPENDS= fonts/liberation-fonts
MAKE_ENV= LDFLAGS="${LDFLAGS}"
FAKE_FLAGS= DESTDIR=""

View File

@ -1,2 +1,2 @@
SHA256 (st-0.5.tar.gz) = roDd+vgUb3Zldy78m4XgXgi+UIdoKmiezfcapNS/3U4=
SIZE (st-0.5.tar.gz) = 36710
SHA256 (st-0.6.tar.gz) = hTEMCMOBTgmbXkWIj4rHVIZA5p6Zc+k01PujiwNzeis=
SIZE (st-0.6.tar.gz) = 40271

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.3 2013/04/19 19:54:34 bentley Exp $
--- Makefile.orig Fri Mar 29 12:54:53 2013
+++ Makefile Fri Mar 29 12:58:38 2013
$OpenBSD: patch-Makefile,v 1.4 2015/07/09 22:07:23 czarkoff Exp $
--- Makefile.orig Tue Jul 7 22:26:44 2015
+++ Makefile Thu Jul 9 00:05:58 2015
@@ -18,14 +18,12 @@ config.h:
cp config.def.h config.h

View File

@ -1,16 +1,16 @@
$OpenBSD: patch-config_def_h,v 1.6 2014/06/10 07:14:50 bcallah Exp $
--- config.def.h.orig Sat Apr 5 14:40:11 2014
+++ config.def.h Mon Jun 9 20:01:29 2014
$OpenBSD: patch-config_def_h,v 1.7 2015/07/09 22:07:23 czarkoff Exp $
--- config.def.h.orig Thu Jul 9 00:02:12 2015
+++ config.def.h Thu Jul 9 00:05:19 2015
@@ -5,7 +5,7 @@
*
* font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
*/
-static char font[] = "Liberation Mono:pixelsize=12:antialias=false:autohint=false";
+static char font[] = "Liberation Mono:pixelsize=12:antialias=true:autohint=false";
+static char font[] = "DejaVu Sans Mono:pixelsize=12:antialias=true:autohint=false";
static int borderpx = 2;
static char shell[] = "/bin/sh";
@@ -59,7 +59,7 @@ static const char *colorname[] = {
static char *utmp = NULL;
@@ -69,7 +69,7 @@ static const char *colorname[] = {
"blue2",
"magenta3",
"cyan3",

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-config_mk,v 1.6 2014/06/10 07:14:50 bcallah Exp $
--- config.mk.orig Sat Apr 5 14:40:11 2014
+++ config.mk Mon Jun 9 20:01:29 2014
@@ -4,11 +4,11 @@ VERSION = 0.5
$OpenBSD: patch-config_mk,v 1.7 2015/07/09 22:07:23 czarkoff Exp $
--- config.mk.orig Wed Jul 8 23:58:38 2015
+++ config.mk Thu Jul 9 00:01:41 2015
@@ -4,24 +4,24 @@ VERSION = 0.6
# Customize below to fit your system
# paths
@ -17,16 +17,19 @@ $OpenBSD: patch-config_mk,v 1.6 2014/06/10 07:14:50 bcallah Exp $
# includes and libs
INCS = -I. -I/usr/include -I${X11INC} \
@@ -19,9 +19,9 @@ LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil -lXext
`pkg-config --cflags fontconfig` \
`pkg-config --cflags freetype2`
-LIBS = -L/usr/lib -lc -L${X11LIB} -lm -lrt -lX11 -lutil -lXext -lXft \
+LIBS = -L/usr/lib -lc -L${X11LIB} -lm -lX11 -lutil -lXext -lXft \
`pkg-config --libs fontconfig` \
`pkg-config --libs freetype2`
# flags
-CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE -D_XOPEN_SOURCE=600
CPPFLAGS = -DVERSION=\"${VERSION}\" -D_XOPEN_SOURCE=600
-CFLAGS += -g -std=c99 -pedantic -Wall -Wvariadic-macros -Os ${INCS} ${CPPFLAGS}
-LDFLAGS += -g ${LIBS}
+CPPFLAGS += -DVERSION=\"${VERSION}\" -D_BSD_SOURCE -D_XOPEN_SOURCE=600
+CFLAGS += -std=c99 -pedantic -Wall -Wvariadic-macros ${INCS} ${CPPFLAGS}
+CFLAGS += -std=c99 ${INCS} ${CPPFLAGS}
+LDFLAGS += ${LIBS}
# compiler and linker
CC ?= cc
# CC = cc