From 673032bfdbe00f75372d559a0cc59bf64da46574 Mon Sep 17 00:00:00 2001 From: Richard Narron Date: Sat, 16 Apr 2022 02:32:31 +0100 Subject: development/THE: Updated for version 3.3RC8. Upstream swear that this is rc8 apparently. Signed-off-by: Dave Woodfall Signed-off-by: Willy Sudiarto Raharjo --- development/THE/THE-configure.patch | 11 ------- development/THE/THE-file-c.patch | 11 ------- development/THE/THE-xcurses.patch | 11 ------- development/THE/THE.SlackBuild | 61 ++++++++++++++++++++++--------------- development/THE/THE.info | 6 ++-- development/THE/libpdcurses-x11.pc | 14 +++++++++ 6 files changed, 54 insertions(+), 60 deletions(-) delete mode 100644 development/THE/THE-configure.patch delete mode 100644 development/THE/THE-file-c.patch delete mode 100644 development/THE/THE-xcurses.patch create mode 100644 development/THE/libpdcurses-x11.pc (limited to 'development') diff --git a/development/THE/THE-configure.patch b/development/THE/THE-configure.patch deleted file mode 100644 index 3d64346038..0000000000 --- a/development/THE/THE-configure.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig Thu Oct 30 15:13:56 2014 -+++ configure Sun Dec 28 17:25:25 2014 -@@ -3381,7 +3381,7 @@ - osis64bit=yes - fi - ;; -- *-freebsd*) -+ *-freebsd* | *-openbsd* | *-bitrig*) - mach="`uname -m`" - if test "$mach" = "amd64"; then - bitflag="64" diff --git a/development/THE/THE-file-c.patch b/development/THE/THE-file-c.patch deleted file mode 100644 index e9a8bbba42..0000000000 --- a/development/THE/THE-file-c.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- file.c.orig 2013-07-09 17:06:21.000000000 -0700 -+++ file.c 2018-06-14 22:20:32.667616957 -0700 -@@ -759,7 +759,7 @@ bool called_from_get_command; - if (feof(fp)) - { - eof_reached = TRUE; -- for (;*(trec+read_start+chars_read-1)==DOSEOF;chars_read--) -+ for (;chars_read>0 && *(trec+read_start+chars_read-1)==DOSEOF;chars_read--) - ; - } - /* diff --git a/development/THE/THE-xcurses.patch b/development/THE/THE-xcurses.patch deleted file mode 100644 index 8e79ae6c27..0000000000 --- a/development/THE/THE-xcurses.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a//the.c.orig 2013-12-28 20:08:15.000000000 -0800 -+++ b/the.c 2018-06-14 14:49:04.152326981 -0700 -@@ -1113,7 +1113,7 @@ - #endif - curses_started = TRUE; - --#if defined(USE_WINGUICURSES) || defined(USE_XCURSES) -+#if defined(USE_WINGUICURSES) - /* - * Tell PDCurses which key should be returned when the window close button is clicked - */ diff --git a/development/THE/THE.SlackBuild b/development/THE/THE.SlackBuild index ffb9277b64..2e9b9ec35f 100644 --- a/development/THE/THE.SlackBuild +++ b/development/THE/THE.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for The Hessling Editor -# Copyright 2012-2018 Richard Narron, California, USA +# Copyright 2012-2022 Richard Narron, California, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,11 +25,13 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=THE -VERSION=${VERSION:-3.3RC4} -BUILD=${BUILD:-5} +VERSION=${VERSION:-3.3RC8} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} +TARFILE=the-3.3 + if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i586 ;; @@ -38,9 +40,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -70,8 +69,9 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +rm -rf $PRGNAM-$VERSION $TARFILE +tar xvf $CWD/$TARFILE.tar.gz +mv $TARFILE $PRGNAM-$VERSION cd $PRGNAM-$VERSION chown -R root:root . @@ -81,9 +81,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -cat $CWD/THE-file-c.patch | patch -p0 -cat $CWD/THE-xcurses.patch | patch -p1 - # make the ncurses version of THE and the documentation mkdir ncurses cd ncurses @@ -91,7 +88,7 @@ cd ncurses CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ../configure \ - --with-ncurses \ + --with-curses=ncurses \ --with-rexx=regina \ --build=$ARCH-slackware-linux \ --docdir=/usr/doc/$PRGNAM-$VERSION \ @@ -103,27 +100,42 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG + +rm -rf doc/html make html -rm -f $PKG/usr/bin/the ; ln -fs nthe $PKG/usr/bin/the +rm -f $PKG/usr/bin/the +ln -fs the-con $PKG/usr/bin/the +ln -fs the-con $PKG/usr/bin/nthe -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html -install -m0644 *.html $PKG/usr/doc/$PRGNAM-$VERSION/html -install -m0644 the64.png the64.gif $PKG/usr/doc/$PRGNAM-$VERSION/html +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html +install -m0644 the64.gif the64.png doc/html/*.html \ + $PKG/usr/doc/$PRGNAM-$VERSION/html cd $TMP/$PRGNAM-$VERSION -install -m0644 COPYING FAQ HISTORY INSTALL README* THE*spec TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION +install -m0644 COPYING FAQ HISTORY README* TODO \ + $PKG/usr/doc/$PRGNAM-$VERSION -# if PDCurses (XCurses) then make the X11 version -if ldconfig -p | grep -q libXCurses.so ; then +# Try to make the X11 version of THE by using PDCurses (XCurses) + +if ldconfig -p | grep -q libXCurses.so; then mkdir xcurses cd xcurses + # for XCurses, create pdcurses-x11.pc pkg-config + XLIBDIR=lib${LIBDIRSUFFIX} + XVERSION=$(xcurses-config --version) + mkdir -p pkgconfig + sed -e "s/XLIBDIR/${XLIBDIR}/" \ + -e "s/XVERSION/${XVERSION}/" \ + < $CWD/libpdcurses-x11.pc \ + > pkgconfig/libpdcurses-x11.pc + + PKG_CONFIG_PATH=pkgconfig \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ../configure \ - --with-xcurses \ + --with-curses=pdcurses-x11 \ --with-rexx=regina \ --build=$ARCH-slackware-linux \ --docdir=/usr/doc/$PRGNAM-$VERSION \ @@ -132,9 +144,10 @@ if ldconfig -p | grep -q libXCurses.so ; then --mandir=/usr/man \ --prefix=/usr \ --sysconfdir=/etc - - make xthe - install -m0755 xthe $PKG/usr/bin + + make the-x11 + install -m0755 the-x11 $PKG/usr/bin + ln -fs the-x11 $PKG/usr/bin/xthe fi find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/development/THE/THE.info b/development/THE/THE.info index b9edf9291a..aa66ea7807 100644 --- a/development/THE/THE.info +++ b/development/THE/THE.info @@ -1,8 +1,8 @@ PRGNAM="THE" -VERSION="3.3RC4" +VERSION="3.3RC8" HOMEPAGE="http://hessling-editor.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/hessling-editor/THE-3.3RC4.tar.gz" -MD5SUM="34e6b45a023edaf4f2de112528e156e1" +DOWNLOAD="http://downloads.sourceforge.net/hessling-editor/the-3.3.tar.gz" +MD5SUM="27cea01b790a1a57a80f578f69602411" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="regina-rexx" diff --git a/development/THE/libpdcurses-x11.pc b/development/THE/libpdcurses-x11.pc new file mode 100644 index 0000000000..5da4083b6c --- /dev/null +++ b/development/THE/libpdcurses-x11.pc @@ -0,0 +1,14 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${prefix}/XLIBDIR +includedir=${prefix}/include/xcurses +version=XVERSION + +Name: PDCurses +Description: PDCurses ${version} X11 library +Version: ${version} +URL: https://pdcurses.org +Requires.private: +Libs: -lXCurses +Libs.private: -l:libXCurses.a -lXaw -lXmu -lXt -lX11 -lXpm -lSM -lICE -lXext +Cflags: -DXCURSES -I${includedir} -I/usr/include/X11 -- cgit v1.2.3