diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-05-28 19:12:29 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 23:39:35 +0200 |
commit | 646a5c1cbfd95873950a87b5f75d52073a967023 (patch) | |
tree | b8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/xap/windowmaker | |
parent | d31c50870d0bee042ce660e445c9294a59a3a65b (diff) | |
download | current-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz |
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt.
installpkg: default line length for --terselength is the number of columns.
removepkg: added --terse mode.
upgradepkg: default line length for --terselength is the number of columns.
upgradepkg: accept -option in addition to --option.
ap/vim-8.1.0026-x86_64-1.txz: Upgraded.
d/bison-3.0.5-x86_64-1.txz: Upgraded.
e/emacs-26.1-x86_64-1.txz: Upgraded.
kde/kopete-4.14.3-x86_64-8.txz: Rebuilt.
Recompiled against libidn-1.35.
n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded.
n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded.
n/libnftnl-1.1.0-x86_64-1.txz: Upgraded.
n/links-2.16-x86_64-2.txz: Rebuilt.
Rebuilt to enable X driver for -g mode.
n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded.
n/nftables-0.8.5-x86_64-1.txz: Upgraded.
n/p11-kit-0.23.11-x86_64-1.txz: Upgraded.
n/ulogd-2.0.7-x86_64-1.txz: Upgraded.
n/whois-5.3.1-x86_64-1.txz: Upgraded.
xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded.
xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/xap/windowmaker')
-rw-r--r-- | source/xap/windowmaker/slack-desc | 6 | ||||
-rwxr-xr-x | source/xap/windowmaker/windowmaker.SlackBuild | 30 | ||||
-rw-r--r-- | source/xap/windowmaker/wmmenugen.c.diff | 12 |
3 files changed, 27 insertions, 21 deletions
diff --git a/source/xap/windowmaker/slack-desc b/source/xap/windowmaker/slack-desc index ef3edbe7..35ffca90 100644 --- a/source/xap/windowmaker/slack-desc +++ b/source/xap/windowmaker/slack-desc @@ -1,8 +1,8 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| diff --git a/source/xap/windowmaker/windowmaker.SlackBuild b/source/xap/windowmaker/windowmaker.SlackBuild index 4a541b45..bf84807e 100755 --- a/source/xap/windowmaker/windowmaker.SlackBuild +++ b/source/xap/windowmaker/windowmaker.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2010, 2015 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2015, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,6 +20,9 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=windowmaker VERSION=${VERSION:-$(echo WindowMaker-0*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} @@ -35,6 +38,14 @@ 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 "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" @@ -49,7 +60,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-windowmaker @@ -68,9 +78,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Fix a segfault in wmmenugen.c: -zcat $CWD/wmmenugen.c.diff.gz | patch -p1 --verbose || exit 1 - # This should be non-interactive where possible. zcat $CWD/wmaker.inst.diff.gz | patch -p1 --verbose || exit 1 @@ -97,6 +104,14 @@ NLSDIR=/usr/share/locale \ # Disabling magick per this LQ thread: # http://www.linuxquestions.org/questions/showthread.php?p=5284319#post5284319 +# 20170223 bkw: WindowMaker has always been chatty, but starting with +# v0.95.6 or so, it also logs everything to syslog. In a typical week of +# running WindowMaker, I end up with 150KB of useless wmaker messages in +# /var/log/syslog (and 400 bytes of non-wmaker stuff there). Undefining +# HAVE_SYSLOG stops it from cluttering the log, and whatever it was +# going to log will still be printed to its stderr. +sed -i '/HAVE_SYSLOG/s,#define,#undef,' config.h + make $NUMJOBS || make || exit 1 # Change /usr/local/GNUstep to /usr/lib/GNUstep in the WMRootMenu: @@ -139,6 +154,9 @@ CFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/source/xap/windowmaker/wmmenugen.c.diff b/source/xap/windowmaker/wmmenugen.c.diff deleted file mode 100644 index 3c605c40..00000000 --- a/source/xap/windowmaker/wmmenugen.c.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur WindowMaker-0.95.7.orig/util/wmmenugen.c WindowMaker-0.95.7/util/wmmenugen.c ---- WindowMaker-0.95.7.orig/util/wmmenugen.c 2015-08-11 13:41:14.000000000 -0500 -+++ WindowMaker-0.95.7/util/wmmenugen.c 2015-11-22 18:23:32.773922263 -0600 -@@ -106,7 +106,7 @@ - parse_locale(NULL, &env_lang, &env_ctry, &env_enc, &env_mod); - terminal = find_terminal_emulator(); - -- for (i = 1; i <= argc; i++) -+ for (i = 1; i < argc; i++) - { - if (strncmp(argv[i], "-parser", 7) == 0 && - (argv[i][7] == '=' || |