diff options
Diffstat (limited to 'source/xap')
139 files changed, 6201 insertions, 2147 deletions
diff --git a/source/xap/FTBFSlog b/source/xap/FTBFSlog new file mode 100644 index 000000000..29e283e62 --- /dev/null +++ b/source/xap/FTBFSlog @@ -0,0 +1,10 @@ +Sat Mar 10 21:02:18 UTC 2018 + mozilla-firefox: reduce Rust debug level to avoid memory issues during build. ++--------------------------+ +Mon Feb 12 21:31:24 UTC 2018 + All XAP packages tested and found to build properly. ++--------------------------+ +Sat Feb 3 04:34:13 UTC 2018 + Fix all packages that fail to build from source: + gv: merge patches from Fedora + seyon: change getline() function to seyon_getline() diff --git a/source/xap/MPlayer/MPlayer.SlackBuild b/source/xap/MPlayer/MPlayer.SlackBuild index 7a9cfbe1d..c317b40c1 100755 --- a/source/xap/MPlayer/MPlayer.SlackBuild +++ b/source/xap/MPlayer/MPlayer.SlackBuild @@ -1,7 +1,7 @@ -#!/bin/sh +#!/bin/bash # $Id: MPlayer.SlackBuild,v 1.27 2012/07/01 13:07:08 root Exp root $ # Copyright 2006, 2007, 2008, 2010, 2011, 2012 Eric Hameleers, Eindhoven, NL -# Copyright 2013 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2013, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -21,88 +21,14 @@ # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -# ----------------------------------------------------------------------------- -# -# Slackware SlackBuild script -# =========================== -# By: Eric Hameleers <alien@slackware.com> -# For: MPlayer -# Descr: a movie player for LINUX -# URL: http://www.mplayerhq.hu/ -# Needs: -# Changelog: -# 1.0rc1-1: 05/Nov/2006 by Eric Hameleers <alien@slackware.com> -# * Initial build. -# 1.0rc1-2: 07/Nov/2006 by Eric Hameleers <alien@slackware.com> -# * Removed MPlayer's internal libdvdcss code from the build, so -# that MPlayer no longer plays encrypted DVD's by default (and the -# package is now safe to upload to public repositories). -# If it is allowed in your country, you can either install -# libdvdcss (which is picked up automatically by MPlayer), or -# rebuild MPlayer yourself using this SlackBuild - and set the -# variable REMOVECSS="no" first (see further down). -# Use this commandline if you can't or won't modify the script: -# REMOVECSS="no" ./MPlayer.SlackBuild -# 1.0rc1-3: 08/Nov/2006 by Eric Hameleers <alien@slackware.com> -# * Install the mplayer.conf into correct location '/etc/mplayer/' -# 1.0rc1-4: 15/mar/2007 by Eric Hameleers <alien@slackware.com> -# * Differentiate between versions of X11 (modular X has another -# install-prefix); update default skin; enable mplayer menu; -# add security fix -# 1.0rc1-5: 07/jun/2007 by Eric Hameleers <alien@slackware.com> -# * Add security fix. -# 1.0rc2-1: 09/oct/2007 by Eric Hameleers <alien@slackware.com> -# * New version. -# 1.0rc2-2: 01/feb/2008 by Eric Hameleers <alien@slackware.com> -# * Apply 4 security fixes. -# 1.0rc2-3: 10/mar/2008 by Eric Hameleers <alien@slackware.com> -# * Apply a patch that allows compilation against the ivtv driver -# in the 2.6.24.x kernels. -# r28148-1: 14/dec/2008 by Eric Hameleers <alien@slackware.com> -# * Build SVN snapshot - remove support for *all* patented or -# questionable software if "USE_PATENTS" is set to "NO" - think -# of DECSS dvd decryption code, and mp3/aac/amr audio encoders. -# r28929-1: 10/mar/2009 by Eric Hameleers <alien@slackware.com> -# * Update. -# r29301-1: 12/may/2009 by Eric Hameleers <alien@slackware.com> -# * Update. -# r29301-1: 12/may/2009 by Eric Hameleers <alien@slackware.com> -# * Update. -# 20100926-1: 26/sep/2010 by Eric Hameleers <alien@slackware.com> -# * Slackware has MPlayer now of course, but it does not hurt -# to have a full-featured binary package available. The 1.0rc3 -# was released recently but I prefer to build a snapshot. -# 20110624-1: 24/jun/2011 by Eric Hameleers <alien@slackware.com> -# * Provide an up-to-date snapshot to be used in conjunction -# with UMPlayer (a MPlayer GUI). New MPlayer source requires -# a separate ffmpeg download. -# 20120514-1: 14/may/2012 by volkerdi@slackware.com -# * Update. -# 1.1_20120701-1: 28/jun/2012 by alien@slackware.com -# * Update to the 1.1 branch (essentially this is MPlayer-1.1 but -# I like to check it out of SVN). -# 1.1_20130819-1: 19/aug/2013 by volkerdi@slackware.com -# * Update to the latest 1.1 branch, and the same ffmpeg that was -# shipped with the 1.1.1 tarball. The official 1.1.1 release -# did not start a new repo branch, so this is the latest. -# 20150308-1: 09/mar/2015 by pprkut@slackware.com -# * Update to latest version from trunk, together with ffmpeg 2.6, -# which was released roughly around that date as well. -# 20140403-1: 03/apr/2015 by volkerdi@slackware.com -# * Update to latest version from trunk and ffmpeg-2.6.1. -# -# Run 'sh MPlayer.SlackBuild' to build a Slackware package. -# The package (.txz) plus descriptive .txt file are created in /tmp . -# Install using 'installpkg'. -# -# ----------------------------------------------------------------------------- # Set initial variables: -PRGNAM=MPlayer -VERSION=${VERSION:-20160125} -BRANCH=${BRANCH:-1.2} # leave empty if you want to build MPlayer trunk -FFMPEG=${FFMPEG:-2.8.6} +PKGNAM=MPlayer +VERSION=${VERSION:-20180208} +# Need to build trunk until there's a stable branch compatible with the +# latest ffmpeg stable release: +#BRANCH=${BRANCH:-1.3} # leave empty if you want to build MPlayer trunk BUILD=${BUILD:-3} TAG=${TAG:-} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -120,10 +46,8 @@ else MPBRANCH="trunk" fi -FFURI=git://git.videolan.org/ffmpeg.git - DEFSKIN=${DEFSKIN:-"Blue"} # Download more skins at the following url: -SKINVER=${SKINVER:-"1.11"} # http://www.mplayerhq.hu/design7/dload.html +SKINVER=${SKINVER:-"1.13"} # http://www.mplayerhq.hu/design7/dload.html # Available languages: all cs de en es fr hu it pl ru zh_CN LANGUAGES="en,de,es,fr" @@ -148,20 +72,36 @@ elif [ "$ARCH" = "i486" -o \ "$ARCH" = "i586" -o \ "$ARCH" = "i686" ]; then LIBDIRSUFFIX="" - EXTRACONFIGUREOPTIONS="--enable-runtime-cpudetection" + # --enable-runtime-cpudetection is failing on 32-bit, so we'll set -march=i586 + # manually after ./configure. + #EXTRACONFIGUREOPTIONS="--enable-runtime-cpudetection" + EXTRACONFIGUREOPTIONS="" else LIBDIRSUFFIX="" EXTRACONFIGUREOPTIONS="" fi +# If this package is being built for ALSA (no PulseAudio), use the _alsa $TAG: +if [ ! -r /usr/lib${LIBDIRSUFFIX}/pkgconfig/libpulse.pc ]; then + TAG="_alsa" +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}-${PKGVERSION}-${ARCH}-${BUILD}${TAG}.txz" + exit 0 +fi + # Where the WIN32 codecs are expectedfor instance CODECSDIR=/usr/lib${LIBDIRSUFFIX}/codecs # --------------------------------------------------------------------------- # -- PATENT ALERT! -- -# MPLayer can be built with MP3 (lame) and AMR audio encoders +# MPLayer can be built with AMR audio encoders # (needed for FLV and .3GP videos) but these libraries are 'contaminated' -# with patents from Fraunhofer and GGP. +# with patents from 3GPP. # Also, the AAC encoder has patent issues. # You can build these patended algorithms into ffmpeg, and if you are an # ordinary end user, no one will bother you for using them. @@ -169,7 +109,7 @@ CODECSDIR=/usr/lib${LIBDIRSUFFIX}/codecs # different story. I am not allowed to distribute binary packages that # incorporate patented code. So here you go. My Slackware package was # built with "USE_PATENTS=NO" i.e. without using -# the lame mp3, faac, AMR and dvdcss libraries. +# the faac, AMR and dvdcss libraries. # --------------------------------------------------------------------------- USE_PATENTS=${USE_PATENTS:-"NO"} @@ -186,19 +126,15 @@ OSDFONTS="LiberationSans-Regular.ttf \ DejaVuSans.ttf Vera.ttf" # Where do we look for sources? -SRCDIR=$(cd $(dirname $0); pwd) +cd $(dirname $0) ; SRCDIR=$(pwd) -SOURCE[0]="$SRCDIR/${PRGNAM}-${VERSION}.tar.xz" +SOURCE[0]="$SRCDIR/${PKGNAM}-${VERSION}.tar.xz" SRCURL[0]="" # The default skin to use (we need to add at least one) SOURCE[1]="$SRCDIR/${DEFSKIN}-${SKINVER}.tar.bz2" SRCURL[1]="http://www.mplayerhq.hu/MPlayer/skins/${DEFSKIN}-${SKINVER}.tar.bz2" -# Ffmpeg needs to be checked out separately now: -SOURCE[2]="$SRCDIR/ffmpeg-${FFMPEG}.tar.xz" -SRCURL[2]="" - # Use the src_checkout() function if no downloadable tarball exists. # This function checks out sources from SVN/CVS and creates a tarball of them. src_checkout() { @@ -229,19 +165,6 @@ src_checkout() { && tar --exclude-vcs -${TARCOMP}cf ${2} MPlayer-${VERSION} rm -rf MPlayer-${VERSION} ;; - 2) # ffmpeg-${FFMPEG} - mkdir ffmpeg_temp_checkout_$$ \ - && cd ffmpeg_temp_checkout_$$ - echo "Checking out tag n$FFMPEG from '$FFURI':" - git clone ${FFURI} ffmpeg \ - && cd ffmpeg \ - && git checkout n$FFMPEG \ - && cd .. - chown -R root:root . \ - && tar --exclude-vcs -${TARCOMP}cf ${2} ffmpeg - cd .. - rm -rf ffmpeg_temp_checkout_$$ - ;; *) # Do nothing ;; esac @@ -249,7 +172,7 @@ src_checkout() { # Place to build (TMP) package (PKG) and output (OUTPUT) the program: TMP=${TMP:-/tmp/build} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PKGNAM OUTPUT=${OUTPUT:-/tmp} ## @@ -258,14 +181,14 @@ OUTPUT=${OUTPUT:-/tmp} # Exit the script on errors: set -e -trap 'echo "$0 FAILED at line $LINENO!" | tee $OUTPUT/error-${PRGNAM}.log' ERR +trap 'echo "$0 FAILED at line $LINENO!" | tee $OUTPUT/error-${PKGNAM}.log' ERR # Catch unitialized variables: set -u P1=${1:-1} # Create working directories: -mkdir -p $TMP/tmp-$PRGNAM # location to build the source -rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build +mkdir -p $TMP/tmp-$PKGNAM # location to build the source +rm -rf $TMP/tmp-$PKGNAM/* # remove the remnants of previous build mkdir -p $PKG # place for the package to be built rm -rf $PKG/* # erase old package's contents mkdir -p $OUTPUT # place for the package to be saved @@ -304,30 +227,16 @@ fi # --- PACKAGE BUILDING --- echo "++" -echo "|| $PRGNAM-$VERSION" +echo "|| $PKGNAM-$VERSION" echo "++" -cd $TMP/tmp-$PRGNAM -echo "Extracting the source archive(s) for $PRGNAM..." +cd $TMP/tmp-$PKGNAM +echo "Extracting the source archive(s) for $PKGNAM..." tar -xvf ${SOURCE[0]} -cd ${PRGNAM}-${VERSION} - # remove MPlayer's copy of libswscale - rm -rf ffmpeg - - # Extract the ffmpeg source inside the MPlayer directory: - tar -xvf ${SOURCE[2]} - - # in case we build with an official tarball - if [ -e "ffmpeg-$FFMPEG" ]; then - mv "ffmpeg-$FFMPEG" ffmpeg - fi - -cd .. - chown -R root:root * chmod -R u+w,go+r-w,a+X-s * -cd ${PRGNAM}-${VERSION} +cd ${PKGNAM}-${VERSION} # Determine what X we're running (the modular X returns the prefix # in the next command, while older versions stay silent): @@ -336,8 +245,7 @@ XPREF=$(pkg-config --variable=prefix x11) || true # Remove support for patent encumbered and possibly illegal code: if [ "$USE_PATENTS" != "YES" ]; then - DO_PATENTED="--disable-mp3lame --disable-mp3lame-lavc \ - --disable-libopencore_amrnb \ + DO_PATENTED="--disable-libopencore_amrnb \ --disable-libopencore_amrwb" else DO_PATENTED="" @@ -346,12 +254,6 @@ fi # fix building against samba 4 zcat $SRCDIR/include-samba-4.0.patch.gz | patch -p1 --verbose || exit 1 -# fix building against openjpeg 2 -sed -i "s|lopenjpeg|lopenmj2|" ./configure - -# fix flac playback with embedded album art: -zcat $SRCDIR/MPlayer.demux_lavf.flac.diff.gz | patch -p1 --verbose || exit 1 - echo Building ... # MPlayer wants to automatically determine compiler flags, # so we don't provide CFLAGS. @@ -365,18 +267,27 @@ echo Building ... --disable-arts \ --disable-ossaudio \ --disable-bitmap-font \ + --disable-ffmpeg_a \ --codecsdir=${CODECSDIR} \ --language="${LANGUAGES}" \ - --extra-cflags="-I/usr/include/openmj2-2.1/" \ ${EXTRACONFIGUREOPTIONS} \ ${DO_PATENTED} \ - 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log + 2>&1 | tee $OUTPUT/configure-${PKGNAM}.log + # So that MPlayer does not report "UNKNOWN" as it's version: if [ ! -f VERSION ]; then echo $VERSION > VERSION fi -make $NUMJOBS 2>&1 | tee $OUTPUT/make-${PRGNAM}.log -make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log + +# Set -march/-mtune manually since runtime cpu detection causes a compile error +# on 32-bit x86: +if [ "$ARCH" = "i586" ]; then + sed -i "s/march=native/march=i586/g" config.mak + sed -i "s/mtune=native/mtune=generic/g" config.mak +fi + +make $NUMJOBS 2>&1 | tee $OUTPUT/make-${PKGNAM}.log +make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PKGNAM}.log # Build the html documentation (not all languages are available): if [ "$LANGUAGES" = "all" ]; then @@ -457,19 +368,19 @@ fi EOINS # Add documentation: -mkdir -p $PKG/usr/doc/$PRGNAM-$PKGVERSION -cp -a $DOCS $PKG/usr/doc/$PRGNAM-$PKGVERSION || true -cp -a $SRCDIR/$(basename $0) $PKG/usr/doc/$PRGNAM-$PKGVERSION/$PRGNAM.SlackBuild -mv $PKG/usr/doc/$PRGNAM-$PKGVERSION/HTML $PKG/usr/doc/$PRGNAM-$PKGVERSION/html +mkdir -p $PKG/usr/doc/$PKGNAM-$PKGVERSION +cp -a $DOCS $PKG/usr/doc/$PKGNAM-$PKGVERSION || true +cp -a $SRCDIR/$(basename $0) $PKG/usr/doc/$PKGNAM-$PKGVERSION/$PKGNAM.SlackBuild +mv $PKG/usr/doc/$PKGNAM-$PKGVERSION/HTML $PKG/usr/doc/$PKGNAM-$PKGVERSION/html # Save a sample of all configuration files: for i in etc/*.conf ; do - cp $i $PKG/usr/doc/$PRGNAM-$PKGVERSION/$(basename $i)-sample + cp $i $PKG/usr/doc/$PKGNAM-$PKGVERSION/$(basename $i)-sample done # Save a transcript of all configured options for this specific build: -if [ -n $OUTPUT/configure-${PRGNAM}.log ]; then - cat $OUTPUT/configure-${PRGNAM}.log \ +if [ -n $OUTPUT/configure-${PKGNAM}.log ]; then + cat $OUTPUT/configure-${PKGNAM}.log \ | sed -n "/^Config files successfully generated/,/^'config.h' and 'config.mak' contain your configuration options./p" \ - > $PKG/usr/doc/$PRGNAM-$PKGVERSION/${PRGNAM}.configuration + > $PKG/usr/doc/$PKGNAM-$PKGVERSION/${PKGNAM}.configuration fi find $PKG/usr/doc -type f -exec chmod 644 {} \; @@ -492,9 +403,9 @@ fi # Build the package: cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${PKGVERSION}-${ARCH}-${BUILD}${TAG}.txz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log +makepkg --linkadd y --chown n $OUTPUT/${PKGNAM}-${PKGVERSION}-${ARCH}-${BUILD}${TAG}.txz 2>&1 | tee $OUTPUT/makepkg-${PKGNAM}.log cd $OUTPUT -md5sum ${PRGNAM}-${PKGVERSION}-${ARCH}-${BUILD}${TAG}.txz > ${PRGNAM}-${PKGVERSION}-${ARCH}-${BUILD}${TAG}.txz.md5 +md5sum ${PKGNAM}-${PKGVERSION}-${ARCH}-${BUILD}${TAG}.txz > ${PKGNAM}-${PKGVERSION}-${ARCH}-${BUILD}${TAG}.txz.md5 cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${PKGVERSION}-${ARCH}-${BUILD}${TAG}.txt +cat $PKG/install/slack-desc | grep "^${PKGNAM}" > $OUTPUT/${PKGNAM}-${PKGVERSION}-${ARCH}-${BUILD}${TAG}.txt diff --git a/source/xap/MPlayer/MPlayer.demux_lavf.flac.diff b/source/xap/MPlayer/MPlayer.demux_lavf.flac.diff deleted file mode 100644 index 7077d630f..000000000 --- a/source/xap/MPlayer/MPlayer.demux_lavf.flac.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- ./libmpdemux/demux_lavf.c.orig 2016-01-24 19:46:50.000000000 -0600 -+++ ./libmpdemux/demux_lavf.c 2016-03-13 15:11:45.083055246 -0500 -@@ -222,6 +222,7 @@ - "cdxl", - "dxa", - "flv", -+ "flac", - "gxf", - "nut", - "nuv", diff --git a/source/xap/MPlayer/slack-desc b/source/xap/MPlayer/slack-desc index 033b41706..eb0597ea2 100644 --- a/source/xap/MPlayer/slack-desc +++ b/source/xap/MPlayer/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/audacious-plugins/audacious-plugins.SlackBuild b/source/xap/audacious-plugins/audacious-plugins.SlackBuild index 8a1e844f6..cc5d07296 100755 --- a/source/xap/audacious-plugins/audacious-plugins.SlackBuild +++ b/source/xap/audacious-plugins/audacious-plugins.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,10 +20,11 @@ # 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=audacious-plugins VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-4} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -37,7 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} @@ -59,6 +59,19 @@ else ARCHOPTS="" fi +# If this package is being built for ALSA (no PulseAudio), use the _alsa $TAG: +if [ ! -r /usr/lib${LIBDIRSUFFIX}/pkgconfig/libpulse.pc ]; then + TAG="_alsa" +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$TAG.txz" + exit 0 +fi + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP @@ -83,11 +96,10 @@ CXXFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --mandir=/usr/man \ --disable-aac \ - --with-ffmpeg=none \ --program-prefix= \ --program-suffix= \ ${ARCHOPTS} \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 # Build and install: make $NUMJOBS || make || exit 1 @@ -112,14 +124,6 @@ if [ -d $PKG/usr/man ]; then ) fi -# Compress info files, if any: -if [ -d $PKG/usr/info ]; then - ( cd $PKG/usr/info - rm -f dir - gzip -9 * - ) -fi - # Add a documentation directory: mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION cp -a \ @@ -138,5 +142,5 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD$TAG.txz diff --git a/source/xap/audacious-plugins/slack-desc b/source/xap/audacious-plugins/slack-desc index 8c8684247..db0c5e345 100644 --- a/source/xap/audacious-plugins/slack-desc +++ b/source/xap/audacious-plugins/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/audacious/audacious.SlackBuild b/source/xap/audacious/audacious.SlackBuild index d7c3d43c8..b99953f95 100755 --- a/source/xap/audacious/audacious.SlackBuild +++ b/source/xap/audacious/audacious.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2006-2012 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006-2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,10 +20,11 @@ # 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=audacious VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -37,7 +38,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 + TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} diff --git a/source/xap/audacious/slack-desc b/source/xap/audacious/slack-desc index c0f307f63..ae3bebb52 100644 --- a/source/xap/audacious/slack-desc +++ b/source/xap/audacious/slack-desc @@ -1,18 +1,18 @@ # 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------------------------------------------------------| audacious: audacious (A relatively powerful media player) audacious: audacious: Audacious is a media player, based on Beep Media Player, which is in -audacious: turn based on the X Multimedia System (XMMS). It is used to play -audacious: audio and other kinds of media files. By default Audacious can play +audacious: turn based on the X Multimedia System (XMMS). It is used to play +audacious: audio and other kinds of media files. By default Audacious can play audacious: MPEG audio, Ogg Vorbis, RIFF wav, most module formats, and a few -audacious: other formats. Audacious can be extended through plugins to play a +audacious: other formats. Audacious can be extended through plugins to play a audacious: number of other audio and video formats. audacious: audacious: The webpage for Audacious is: http://www.audacious-media-player.org diff --git a/source/xap/blackbox/blackbox.SlackBuild b/source/xap/blackbox/blackbox.SlackBuild index c7051217e..da0f2c30f 100755 --- a/source/xap/blackbox/blackbox.SlackBuild +++ b/source/xap/blackbox/blackbox.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,25 +23,35 @@ # http://downloads.sourceforge.net/project/blackboxwm/blackboxwm/Blackbox%200.70.1/blackbox-0.70.1.tar.bz2 # http://downloads.sourceforge.net/project/bbkeys/bbkeys/0.9.1/bbkeys-0.9.1.tar.gz +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=blackbox VERSION=${VERSION:-0.70.1} BBKEYSVER=${BBKEYSVER:-0.9.1} -BUILD=${BUILD:-7} +BUILD=${BUILD:-8} NUMJOBS=${NUMJOBS:-" -j7 "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; 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 + # Determine the CFLAGS for the known architectures: case $ARCH in - i486) export SLKCFLAGS="-O2 -march=i486 -mtune=i686" + i586) export SLKCFLAGS="-O2 -march=i586 -mtune=i686" export LIBDIRSUFFIX="" export ARCHQUADLET="" ;; i686) export SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -62,7 +72,6 @@ case $ARCH in esac -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} rm -rf $PKG @@ -171,6 +180,13 @@ fi make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# Don't ship .la files: +pushd $PKG + for lafile in usr/lib${LIBDIRSUFFIX}/*.la ; do + rm -f ${lafile} /${lafile} + done +popd + # Strip binaries: 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/blackbox/slack-desc b/source/xap/blackbox/slack-desc index a459e577d..0e4256980 100644 --- a/source/xap/blackbox/slack-desc +++ b/source/xap/blackbox/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 customary to +# 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/blueman/0001-Notification-Also-check-if-notification-daemon-suppo.patch b/source/xap/blueman/0001-Notification-Also-check-if-notification-daemon-suppo.patch deleted file mode 100644 index fd244f3f6..000000000 --- a/source/xap/blueman/0001-Notification-Also-check-if-notification-daemon-suppo.patch +++ /dev/null @@ -1,44 +0,0 @@ -From fe902c8827fccae8df93d9deff53e22917d69369 Mon Sep 17 00:00:00 2001 -From: Sander Sweers <infirit@gmail.com> -Date: Mon, 16 May 2016 16:22:14 +0200 -Subject: [PATCH 1/2] Notification: Also check if notification daemon supports - body - -This is the absolute minimum we require from the notification daemon. With -this we fix the when no daemon is available (not running or installed). -See [1] what prompted this change. - -[1] https://github.com/blueman-project/blueman/issues/519#issuecomment-218976647 ---- - blueman/gui/Notification.py | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) - -diff --git a/blueman/gui/Notification.py b/blueman/gui/Notification.py -index 41fdd69..6f3d3dc 100644 ---- a/blueman/gui/Notification.py -+++ b/blueman/gui/Notification.py -@@ -161,10 +161,18 @@ class Notification(object): - def actions_supported(): - return "actions" in Notify.get_server_caps() - -+ @staticmethod -+ def body_supported(): -+ return "body" in Notify.get_server_caps() -+ - def __new__(cls, summary, message, timeout=-1, actions=None, actions_cb=None, pixbuf=None, status_icon=None): -- if not Config('org.blueman.general')['notification-daemon'] or (actions and not cls.actions_supported()): -- # Use fallback as user does not want to use a notification daemon or we have to show actions and the -- # notification daemon does not provide them -+ forced_fallback = not Config('org.blueman.general')['notification-daemon'] -+ -+ if forced_fallback or not cls.body_supported() or (actions and not cls.actions_supported()): -+ # Use fallback in the case: -+ # * user does not want to use a notification daemon -+ # * the notification daemon is not available -+ # * we have to show actions and the notification daemon does not provide them - klass = _NotificationDialog - else: - klass = _NotificationBubble --- -2.8.3 - diff --git a/source/xap/blueman/0002-NetConf-Treat-UnicodeDecodeError-as-if-there-was-no-.patch b/source/xap/blueman/0002-NetConf-Treat-UnicodeDecodeError-as-if-there-was-no-.patch deleted file mode 100644 index 17820a106..000000000 --- a/source/xap/blueman/0002-NetConf-Treat-UnicodeDecodeError-as-if-there-was-no-.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2b4c3aecff94c1093de41285bba34b40bc69ddaf Mon Sep 17 00:00:00 2001 -From: Sander Sweers <infirit@gmail.com> -Date: Mon, 2 May 2016 14:49:13 +0200 -Subject: [PATCH 2/2] NetConf: Treat UnicodeDecodeError as if there was no file - -This is unfortunate but most people will not even notice we created a new -state file. ---- - blueman/main/NetConf.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/blueman/main/NetConf.py b/blueman/main/NetConf.py -index d62dc14..4d7efd8 100644 ---- a/blueman/main/NetConf.py -+++ b/blueman/main/NetConf.py -@@ -222,7 +222,7 @@ class NetConf(object): - NetConf.default_inst = obj - f.close() - return obj -- except IOError: -+ except (IOError, UnicodeDecodeError): - n = cls() - try: - n.store() --- -2.8.3 - diff --git a/source/xap/blueman/blueman.SlackBuild b/source/xap/blueman/blueman.SlackBuild index 810b8cc21..b98391b8a 100755 --- a/source/xap/blueman/blueman.SlackBuild +++ b/source/xap/blueman/blueman.SlackBuild @@ -1,9 +1,9 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for blueman -# Copyright 2009,2015 Robby Workman, Tuscaloosa, Alabama, USA -# Copyright 2010,2015 Patrick Volkerding, Sebeka, MN, USA +# Copyright 2009, 2015 Robby Workman, Tuscaloosa, Alabama, USA +# Copyright 2010, 2015, 2018 Patrick Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,9 +23,11 @@ # 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=blueman VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -37,9 +39,16 @@ 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 + NUMJOBS=${NUMJOBS:-" -j7 "} -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -57,7 +66,10 @@ else LIBDIRSUFFIX="" fi -rm -rf $PKG +PYTHON3VER=$(python3 -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.) +PYTHON3LIB=$( python3 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' ) + +rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION @@ -70,11 +82,13 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/0001-Notification-Also-check-if-notification-daemon-suppo.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/0002-NetConf-Treat-UnicodeDecodeError-as-if-there-was-no-.patch.gz | patch -p1 --verbose || exit 1 +# Don't autostart blueman applet in KDE; it has its own bluetooth application +zcat $CWD/dont-autostart-applet-in-kde.diff.gz | patch -p1 --verbose || exit 1 CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ +PYTHON=/usr/bin/python3 \ +CYTHONEXEC=/usr/bin/cython3 \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -96,14 +110,15 @@ CXXFLAGS="$SLKCFLAGS" \ sed -i "s,nautilus,thunar,g" blueman/Constants.py* # https://github.com/blueman-project/blueman/issues/435 -sed -i "s,#!/usr/bin/env python,#!/usr/bin/python2.7,g" module/_blueman.pyx apps/* +sed -i "s,#!/usr/bin/env python,#!/usr/bin/python${PYTHON3VER},g" module/_blueman.pyx apps/* make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 # Remove the AppIndicator.py plugin (we don't have libappindicator3 # nor will we be getting it in the foreseeable future) -rm $PKG/usr/lib${LIBDIRSUFFIX}/python*/site-packages/blueman/plugins/applet/AppIndicator.py* +rm ${PKG}$PYTHON3LIB/blueman/plugins/applet/AppIndicator.py +rm ${PKG}$PYTHON3LIB/blueman/plugins/applet/__pycache__/AppIndicator*.pyc find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/source/xap/blueman/dont-autostart-applet-in-kde.diff b/source/xap/blueman/dont-autostart-applet-in-kde.diff new file mode 100644 index 000000000..0334321fc --- /dev/null +++ b/source/xap/blueman/dont-autostart-applet-in-kde.diff @@ -0,0 +1,9 @@ +diff -Nur blueman-20170523_git_1500d60ebf3e.orig/data/blueman.desktop.in blueman-20170523_git_1500d60ebf3e/data/blueman.desktop.in +--- blueman-20170523_git_1500d60ebf3e.orig/data/blueman.desktop.in 2014-12-19 09:25:34.000000000 -0600 ++++ blueman-20170523_git_1500d60ebf3e/data/blueman.desktop.in 2017-06-27 16:59:28.121073690 -0500 +@@ -5,4 +5,5 @@ + Exec=blueman-applet + Terminal=false + Type=Application ++NotShowIn=KDE; + Categories= diff --git a/source/xap/blueman/slack-desc b/source/xap/blueman/slack-desc index a906f3ff3..93143ff90 100644 --- a/source/xap/blueman/slack-desc +++ b/source/xap/blueman/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------------------------------------------------------| @@ -10,10 +10,10 @@ blueman: Blueman (Graphical Bluetooth Manager) blueman: blueman: Blueman is a GTK+ Bluetooth Manager for tasks such as: blueman: -blueman: - Connecting to 3G/EDGE/GPRS via DUN profile. -blueman: - Connecting to/Creating bluetooth networks -blueman: - Connecting to input and audio devices -blueman: - Sending/Receiving/Browsing files via OBEX -blueman: - Pairing +blueman: - Connecting to 3G/EDGE/GPRS via DUN profile. +blueman: - Connecting to/Creating bluetooth networks +blueman: - Connecting to input and audio devices +blueman: - Sending/Receiving/Browsing files via OBEX +blueman: - Pairing blueman: -blueman: Homepage: https://github.com/blueman-project/blueman +blueman: Homepage: https://github.com/blueman-project/blueman diff --git a/source/xap/ddd/ddd.SlackBuild b/source/xap/ddd/ddd.SlackBuild index 5bd702099..b2df2b0a1 100755 --- a/source/xap/ddd/ddd.SlackBuild +++ b/source/xap/ddd/ddd.SlackBuild @@ -1,5 +1,5 @@ -#!/bin/sh -# Copyright 2013, 2014 Patrick J. Volkerding, Sebeka, Minnesota, USA +#!/bin/bash +# Copyright 2013, 2014, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,9 +25,11 @@ # Slight modifications by the SlackBuilds projects # Modified by Ken Milmore 2009 +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=ddd VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-6} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -39,18 +41,19 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i386" ]; then - SLKCFLAGS="-O2 -march=i386 -mcpu=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i586" ]; then +if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then @@ -94,7 +97,7 @@ CXXFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib$LIBDIRSUFFIX \ --mandir=/usr/man \ --infodir=/usr/info \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 make -j $NUMJOBS || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/xap/ddd/slack-desc b/source/xap/ddd/slack-desc index 913884c82..5064277b0 100644 --- a/source/xap/ddd/slack-desc +++ b/source/xap/ddd/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 customary +# 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/easytag/doinst.sh b/source/xap/easytag/doinst.sh new file mode 100644 index 000000000..2a6c62b4e --- /dev/null +++ b/source/xap/easytag/doinst.sh @@ -0,0 +1,8 @@ +# Try to run these. If they fail, no biggie. +chroot . /usr/bin/update-desktop-database -q usr/share/applications 1> /dev/null 2> /dev/null +chroot . /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/ 1> /dev/null 2> /dev/null +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi diff --git a/source/xap/easytag/easytag.SlackBuild b/source/xap/easytag/easytag.SlackBuild new file mode 100755 index 000000000..ef301825f --- /dev/null +++ b/source/xap/easytag/easytag.SlackBuild @@ -0,0 +1,147 @@ +#!/bin/bash + +# Copyright 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# 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=easytag +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +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 + +NUMJOBS=${NUMJOBS:-" -j7 "} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Configure: +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ + --infodir=/usr/info \ + --disable-static \ + --build=$ARCH-slackware-linux || exit 1 + +# Build and install: +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Don't ship .la files: +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la + +# Strip binaries: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +# Add a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS COPYING* HACKING NEWS README* THANKS TODO \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1 | grep -v '\.gz$') ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/xap/easytag/slack-desc b/source/xap/easytag/slack-desc new file mode 100644 index 000000000..487064a4d --- /dev/null +++ b/source/xap/easytag/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# 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 +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +easytag: easytag (Tag editor for audio files) +easytag: +easytag: EasyTAG is a utility for viewing and editing tags for MP3, MP2, FLAC, +easytag: Ogg Vorbis, Speex and Opus, MP4/AAC, MusePack, Monkey's Audio and +easytag: WavPack files. Its simple and nice GTK+ interface makes tagging easy. +easytag: +easytag: Homepage: http://easytag.sourceforge.net +easytag: +easytag: +easytag: +easytag: diff --git a/source/xap/electricsheep/electricsheep.SlackBuild b/source/xap/electricsheep/electricsheep.SlackBuild index 8ff65c768..21f7a47dd 100755 --- a/source/xap/electricsheep/electricsheep.SlackBuild +++ b/source/xap/electricsheep/electricsheep.SlackBuild @@ -1,7 +1,7 @@ -#!/bin/sh +#!/bin/bash # Copyright 2008, 2009 Eric Hameleers, Eindhoven, Netherlands -# Copyright 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -32,33 +32,41 @@ # Needs: MPlayer (to display the sheep) # ----------------------------------------------------------------------------- -PRGNAM=electricsheep +PKGNAM=electricsheep VERSION=${VERSION:-20090306} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; 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 + # Where do we look for sources? -SRCDIR=$(cd $(dirname $0); pwd) +cd $(dirname $0) ; SRCDIR=$(pwd) DOCS="COPYING README $SRCDIR/README.slackware" DOCS_FLAM3="COPYING* README*" DOCS_FFMPEG="COPYING* CREDITS Changelog MAINTAINERS README" -SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.xz" +SOURCE="$SRCDIR/${PKGNAM}-${VERSION}.tar.xz" SRCURL="" # Place to build (TMP) package (PKG) and output (OUTPUT) the program: TMP=${TMP:-/tmp/build} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PKGNAM OUTPUT=${OUTPUT:-/tmp} # Use the src_checkout() function if no downloadable tarball exists. @@ -98,13 +106,13 @@ src_checkout() { # Exit the script on errors: set -e -trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR +trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PKGNAM}.log' ERR # Catch unitialized variables: set -u P1=${1:-1} case "$ARCH" in - i486) SLKCFLAGS="-O2 -march=i486 -mtune=i686" + i586) SLKCFLAGS="-O2 -march=i586 -mtune=i686" SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; s390) SLKCFLAGS="-O2" @@ -132,11 +140,11 @@ esac # Create working directories: mkdir -p $OUTPUT # place for the package to be saved -mkdir -p $TMP/tmp-$PRGNAM # location to build the source +mkdir -p $TMP/tmp-$PKGNAM # location to build the source mkdir -p $PKG # place for the package to be built rm -rf $PKG/* # always erase old package's contents -rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build -rm -rf $OUTPUT/{configure,make,install,error,makepkg}-$PRGNAM.log +rm -rf $TMP/tmp-$PKGNAM/* # remove the remnants of previous build +rm -rf $OUTPUT/{configure,make,install,error,makepkg}-$PKGNAM.log # remove old log files # Source file availability: @@ -171,13 +179,13 @@ fi # --- PACKAGE BUILDING --- echo "++" -echo "|| $PRGNAM-$VERSION" +echo "|| $PKGNAM-$VERSION" echo "++" -cd $TMP/tmp-$PRGNAM -echo "Extracting the source archive(s) for $PRGNAM..." +cd $TMP/tmp-$PKGNAM +echo "Extracting the source archive(s) for $PKGNAM..." tar -xvf ${SOURCE} -cd ${PRGNAM}-${VERSION} +cd ${PKGNAM}-${VERSION} chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -194,7 +202,7 @@ cd client chmod +x ffmpeg/doc/texi2pod.pl # We do not use gnome: cat $SRCDIR/electricsheep_gnome-open.patch | patch -p1 --verbose \ - 2>&1 | tee $OUTPUT/patch-$PRGNAM.log + 2>&1 | tee $OUTPUT/patch-$PKGNAM.log # Prevent install errors due to missing gnome sed -i -e "/^install-data-local:/,/^$/d" Makefile.in LDFLAGS="$SLKLDFLAGS" \ @@ -205,9 +213,9 @@ cd client --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ --build=$ARCH-slackware-linux \ - 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log - make -j 7 2>&1 | tee $OUTPUT/make-${PRGNAM}.log - make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log + 2>&1 | tee $OUTPUT/configure-${PKGNAM}.log + make -j 7 2>&1 | tee $OUTPUT/make-${PKGNAM}.log + make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PKGNAM}.log cd .. # Then the flam3 (fractal flames) renderer: cd flam3 @@ -220,23 +228,26 @@ cd flam3 --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ --build=$ARCH-slackware-linux \ - 2>&1 | tee $OUTPUT/configure-${PRGNAM}.log - make -j 7 2>&1 | tee $OUTPUT/make-${PRGNAM}.log - make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log + 2>&1 | tee $OUTPUT/configure-${PKGNAM}.log + make -j 7 2>&1 | tee $OUTPUT/make-${PKGNAM}.log + make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PKGNAM}.log cd .. +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + # Add documentation: -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{flam3,ffmpeg} +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/{flam3,ffmpeg} ( cd client - cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION + cp -a $DOCS $PKG/usr/doc/$PKGNAM-$VERSION ) ( cd client/ffmpeg - cp -a $DOCS_FFMPEG $PKG/usr/doc/$PRGNAM-$VERSION/ffmpeg + cp -a $DOCS_FFMPEG $PKG/usr/doc/$PKGNAM-$VERSION/ffmpeg ) ( cd flam3 - cp -a $DOCS_FLAM3 $PKG/usr/doc/$PRGNAM-$VERSION/flam3 + cp -a $DOCS_FLAM3 $PKG/usr/doc/$PKGNAM-$VERSION/flam3 ) -chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION +chown -R root:root $PKG/usr/doc/$PKGNAM-$VERSION find $PKG/usr/doc -type f -exec chmod 644 {} \; cd client @@ -272,8 +283,8 @@ cat $SRCDIR/slack-desc > $PKG/install/slack-desc # Build the package: cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log +makepkg --linkadd y --chown n $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz 2>&1 | tee $OUTPUT/makepkg-${PKGNAM}.log cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz.md5 +md5sum ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz > ${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz.md5 cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txt +cat $PKG/install/slack-desc | grep "^${PKGNAM}" > $OUTPUT/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txt diff --git a/source/xap/electricsheep/slack-desc b/source/xap/electricsheep/slack-desc index d82ddf451..6bf2c9e79 100644 --- a/source/xap/electricsheep/slack-desc +++ b/source/xap/electricsheep/slack-desc @@ -1,16 +1,16 @@ # 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------------------------------------------------------| electricsheep: electricsheep (distributed screensaver) electricsheep: electricsheep: Electric Sheep is an xscreensaver module that displays mpeg video -electricsheep: of an animated fractal flame. In the background it contributes -electricsheep: render cycles to the next animation. Periodically it uploades +electricsheep: of an animated fractal flame. In the background it contributes +electricsheep: render cycles to the next animation. Periodically it uploades electricsheep: completed frames to the server, where they are compressed for electricsheep: distribution to all clients. electricsheep: This program is recommended only if you have a high bandwidth diff --git a/source/xap/fluxbox/fluxbox.SlackBuild b/source/xap/fluxbox/fluxbox.SlackBuild index 07b5e0cec..4ad687e93 100755 --- a/source/xap/fluxbox/fluxbox.SlackBuild +++ b/source/xap/fluxbox/fluxbox.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,25 +20,34 @@ # 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=fluxbox VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:-" -j7 "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; esac fi -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +# 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="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" @@ -51,7 +60,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-fluxbox @@ -72,6 +80,9 @@ find . \ # Make sure that dbus-launch is started for the session: zcat $CWD/fluxbox.startfluxbox.dbus.diff.gz | patch -p1 --verbose || exit 1 +# Fix multimedia volume keys: +zcat $CWD/fluxbox.keys.diff.gz | patch -p1 --verbose || exit 1 + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/xap/fluxbox/fluxbox.keys.diff b/source/xap/fluxbox/fluxbox.keys.diff new file mode 100644 index 000000000..62860adc6 --- /dev/null +++ b/source/xap/fluxbox/fluxbox.keys.diff @@ -0,0 +1,13 @@ +--- ./data/keys.orig 2015-02-08 04:44:45.333187008 -0600 ++++ ./data/keys 2017-06-09 13:25:14.558517846 -0500 +@@ -65,8 +65,8 @@ + + # volume settings, using common keycodes + # if these don't work, use xev to find out your real keycodes +-176 :Exec amixer sset Master,0 1+ +-174 :Exec amixer sset Master,0 1- ++176 :Exec amixer sset Master,0 5%+ ++174 :Exec amixer sset Master,0 5%- + 160 :Exec amixer sset Master,0 toggle + + # current window commands diff --git a/source/xap/fluxbox/slack-desc b/source/xap/fluxbox/slack-desc index e1bb595cb..6da8d87ee 100644 --- a/source/xap/fluxbox/slack-desc +++ b/source/xap/fluxbox/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 customary to +# 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/fvwm/fvwm-2.6.7-symlink-fix.patch b/source/xap/fvwm/fvwm-2.6.7-symlink-fix.patch new file mode 100644 index 000000000..89f02f344 --- /dev/null +++ b/source/xap/fvwm/fvwm-2.6.7-symlink-fix.patch @@ -0,0 +1,15 @@ +--- a/default-config/Makefile.am 2017-01-20 22:30:43.356970266 +0000 ++++ b/default-config/Makefile.am 2017-01-20 22:49:56.060484603 +0000 +@@ -17,9 +17,9 @@ + + install-data-hook: + cp -r $(srcdir)/images $(inst_location) +- ln -sf $(inst_location)/FvwmScript-DateTime $(inst_location)/.. +- ln -sf $(inst_location)/FvwmScript-ConfirmQuit $(inst_location)/.. +- ln -sf $(inst_location)/FvwmScript-ConfirmCopyConfig $(inst_location)/.. ++ ln -sf default-config/FvwmScript-DateTime $(inst_location)/.. ++ ln -sf default-config/FvwmScript-ConfirmQuit $(inst_location)/.. ++ ln -sf default-config/FvwmScript-ConfirmCopyConfig $(inst_location)/.. + + uninstall-hook: + rm -fr $(DESTDIR)/$(configdir) diff --git a/source/xap/fvwm/fvwm.SlackBuild b/source/xap/fvwm/fvwm.SlackBuild index ddd373d93..c2696016b 100755 --- a/source/xap/fvwm/fvwm.SlackBuild +++ b/source/xap/fvwm/fvwm.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2011, 2012, 2015, 2016 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2011, 2012, 2015, 2016, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,10 +20,11 @@ # 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=fvwm VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -35,6 +36,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 + NUMJOBS=${NUMJOBS:-" -j7 "} if [ "$ARCH" = "i586" ]; then @@ -51,7 +60,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -69,6 +77,11 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fix broken symlinks: +zcat $CWD/fvwm-2.6.7-symlink-fix.patch.gz | patch -p1 --verbose || exit 1 + +autoreconf -vif + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -76,8 +89,6 @@ CFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --mandir=/usr/man \ --docdir=/usr/doc/$PKGNAM-$VERSION \ - --disable-bidi \ - --disable-gtk \ --program-prefix= \ --program-suffix= \ --build=$ARCH-slackware-linux || exit 1 diff --git a/source/xap/fvwm/slack-desc b/source/xap/fvwm/slack-desc index d616afa4d..35dbb7964 100644 --- a/source/xap/fvwm/slack-desc +++ b/source/xap/fvwm/slack-desc @@ -1,19 +1,19 @@ # 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------------------------------------------------------| fvwm: fvwm (a small and fast virtual window manager for X) fvwm: fvwm: Fvwm is the classic highly-configurable virtual window manager for -fvwm: X11. It is a derivative of twm, redesigned to minimize memory +fvwm: X11. It is a derivative of twm, redesigned to minimize memory fvwm: consumption, provide a 3-D look to window frames, and provide a simple fvwm: virtual desktop. fvwm: -fvwm: Homepage: http://www.fvwm.org -fvwm: Development: https://github.com/fvwmorg/fvwm +fvwm: Homepage: http://www.fvwm.org +fvwm: Development: https://github.com/fvwmorg/fvwm fvwm: fvwm: diff --git a/source/xap/geeqie/fix-build-re-docs.diff b/source/xap/geeqie/fix-build-re-docs.diff new file mode 100644 index 000000000..279d8566e --- /dev/null +++ b/source/xap/geeqie/fix-build-re-docs.diff @@ -0,0 +1,26 @@ +diff -Nur geeqie-1.4.orig/Makefile.am geeqie-1.4/Makefile.am +--- geeqie-1.4.orig/Makefile.am 2017-12-31 06:31:21.000000000 -0600 ++++ geeqie-1.4/Makefile.am 2018-01-02 02:18:15.881141642 -0600 +@@ -9,11 +9,7 @@ + + readmedir = @readmedir@ + +-if HAVE_MARKDOWN +-readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS README.html ChangeLog.html +-else +-readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS ChangeLog.html +-endif ++readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS + + desktopdir = $(datadir)/applications + desktop_in_files = geeqie.desktop.in +@@ -37,9 +33,3 @@ + + DISTCLEANFILES = config.report + +-.PHONY: ChangeLog +-ChangeLog.html: +- ./gen_changelog.sh +- +-README.html: README.md +- ./gen_readme.sh diff --git a/source/xap/geeqie/geeqie.SlackBuild b/source/xap/geeqie/geeqie.SlackBuild index 6dffa6fe5..857e0d2e6 100755 --- a/source/xap/geeqie/geeqie.SlackBuild +++ b/source/xap/geeqie/geeqie.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2010, 2011, 2012, 2015, 2016 Patrick Volkerding, Sebeka, MN, USA +# Copyright 2010, 2011, 2012, 2015, 2016, 2018 Patrick Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +22,11 @@ # Modified by the SlackBuilds.org project +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=geeqie -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} -CWD=$(pwd) # Download the geeqie Git head if there's no tarball: if ! /bin/ls $CWD/geeqie*tar* 1> /dev/null 2> /dev/null ; then git clone git://www.geeqie.org/geeqie.git @@ -47,6 +48,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 + NUMJOBS=${NUMJOBS:-" -j7 "} if [ "$ARCH" = "i586" ]; then @@ -78,7 +87,10 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -autoreconf -f -i ; intltoolize +zcat $CWD/fix-build-re-docs.diff.gz | patch -p1 --verbose || exit 1 +mv ChangeLog.gqview ChangeLog + +./autogen.sh CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -87,16 +99,16 @@ CXXFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ + --with-readmedir=/usr/doc/geeqie-$VERSION \ + --with-htmldir=/usr/doc/geeqie-$VERSION/html \ --program-prefix="" \ --program-suffix="" \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 make install-strip DESTDIR=$PKG || exit 1 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -mv $PKG/usr/share/doc/$PKGNAM-$VERSION/* $PKG/usr/doc/$PKGNAM-$VERSION -rm -r $PKG/usr/share/doc cp -a \ AUTHORS COPYING* INSTALL NEWS README* TODO \ $PKG/usr/doc/$PKGNAM-$VERSION diff --git a/source/xap/geeqie/slack-desc b/source/xap/geeqie/slack-desc index 16a0d9923..b90231f73 100644 --- a/source/xap/geeqie/slack-desc +++ b/source/xap/geeqie/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------------------------------------------------------| @@ -12,7 +12,7 @@ geeqie: Geeqie is an interactive GTK based image viewer that supports multiple geeqie: image formats, zooming, panning, thumbnails, and sorting images into geeqie: collections. geeqie: -geeqie: Homepage: http://www.geeqie.org +geeqie: Homepage: http://www.geeqie.org geeqie: geeqie: geeqie: diff --git a/source/xap/gftp/gftp.SlackBuild b/source/xap/gftp/gftp.SlackBuild index c125b39fa..5955f8a04 100755 --- a/source/xap/gftp/gftp.SlackBuild +++ b/source/xap/gftp/gftp.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2012, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,14 +20,16 @@ # 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=gftp VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-7} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -35,17 +37,24 @@ if [ -z "$ARCH" ]; then export ARCH 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 + NUMJOBS=${NUMJOBS:-" -j7 "} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-gftp @@ -70,7 +79,7 @@ CFLAGS="$SLKCFLAGS" \ --localstatedir=/var/lib \ --mandir=/usr/man \ --docdir=/usr/doc/gftp-$VERSION \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/xap/gftp/slack-desc b/source/xap/gftp/slack-desc index 693fb4d28..9631210e5 100644 --- a/source/xap/gftp/slack-desc +++ b/source/xap/gftp/slack-desc @@ -1,14 +1,14 @@ # 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------------------------------------------------------| gftp: gftp (FTP client for X) gftp: -gftp: gFTP is a multithreaded FTP client for X written using GTK+. It +gftp: gFTP is a multithreaded FTP client for X written using GTK+. It gftp: features simultaneous downloads, resuming of interrupted file gftp: transfers, file transfer queues, downloading of entire directories, gftp: ftp proxy support, remote directory caching, passive and non-passive diff --git a/source/xap/gimp/gimp.SlackBuild b/source/xap/gimp/gimp.SlackBuild index 157a86e4b..7289500dc 100755 --- a/source/xap/gimp/gimp.SlackBuild +++ b/source/xap/gimp/gimp.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2015 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2015, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,9 +20,10 @@ # 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=gimp -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -35,9 +36,16 @@ 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 + NUMJOBS=${NUMJOBS:-" -j7 "} -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-gimp rm -rf $PKG @@ -59,7 +67,7 @@ fi cd $TMP rm -rf gimp-$VERSION -tar xvf $CWD/gimp-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/gimp-$VERSION.tar.?z || exit 1 cd gimp-$VERSION || exit 1 chown -R root:root . @@ -79,16 +87,19 @@ CFLAGS="$SLKCFLAGS" \ --infodir=/usr/info \ --docdir=/usr/doc/gimp-$VERSION \ --disable-static \ - --with-libcurl \ - --with-lcms=lcms2 \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 mkdir -p $PKG/usr/share/applications $PKG/usr/share/application-registry make install DESTDIR=$PKG || exit 1 +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + # Add a manpage symlink for POLA-compliance -( cd $PKG/usr/man/man1 ; ln -sf gimptool-2.?.1 gimptool.1 ) +if [ -r $PKG/usr/man/man1/gimptool-2.?.1 -a ! -r $PKG/usr/man/man1/gimptool.1 ]; then + ( cd $PKG/usr/man/man1 ; ln -sf gimptool-2.?.1 gimptool.1 ) +fi # Compress and link manpages, if any: if [ -d $PKG/usr/man ]; then diff --git a/source/xap/gimp/slack-desc b/source/xap/gimp/slack-desc index 9f9aca385..04a027cce 100644 --- a/source/xap/gimp/slack-desc +++ b/source/xap/gimp/slack-desc @@ -1,16 +1,16 @@ # 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------------------------------------------------------| gimp: gimp (The GNU Image Manipulation Program) gimp: gimp: The GIMP is a powerful tool for the preparation and manipulation of -gimp: digital images. The GIMP provides the user with a wide variety of -gimp: image manipulation, painting, processing, and rendering tools. The +gimp: digital images. The GIMP provides the user with a wide variety of +gimp: image manipulation, painting, processing, and rendering tools. The gimp: GIMP's open design and extensible architecture make for a very gimp: powerful end product for photo and image retouching, web graphics gimp: design, or digital illustration. diff --git a/source/xap/gkrellm/gkrellm.SlackBuild b/source/xap/gkrellm/gkrellm.SlackBuild index f01e4f349..391574ec9 100755 --- a/source/xap/gkrellm/gkrellm.SlackBuild +++ b/source/xap/gkrellm/gkrellm.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2016 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2016, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,9 +20,12 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=2.3.7 -PKGVER=2.3.7 -BUILD=${BUILD:-1} +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=gkrellm +VERSION=${VERSION:-$(echo $PKGNAM-2*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +PKGVER=$VERSION +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -34,13 +37,20 @@ 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" = "x86_64" ]; then LIBDIRSUFFIX="64" else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-gkrellm @@ -70,10 +80,16 @@ make \ INCLUDEDIR=/usr/include \ MANDIR=/usr/man/man1 \ LOCALEDIR=/usr/share/locale \ - PKGCONFIGDIR=/usr/lib${LIBDIRSUFFIX}/pkgconfig + PKGCONFIGDIR=/usr/lib${LIBDIRSUFFIX}/pkgconfig || exit 1 # We will need this installed to build plugins, so... -make install +make install \ + INSTALLROOT=/usr \ + INSTALLDIR=/usr/bin \ + INCLUDEDIR=/usr/include \ + MANDIR=/usr/man/man1 \ + LOCALEDIR=/usr/share/locale \ + PKGCONFIGDIR=/usr/lib${LIBDIRSUFFIX}/pkgconfig || exit 1 # Install to the $PKG dir: make install \ @@ -82,13 +98,13 @@ make install \ INCLUDEDIR=$PKG/usr/include \ MANDIR=$PKG/usr/man/man1 \ LOCALEDIR=$PKG/usr/share/locale \ - PKGCONFIGDIR=$PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig + PKGCONFIGDIR=$PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig || exit 1 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/gkrellm2/plugins mkdir -p $PKG/usr/doc/gkrellm-$VERSION cp -a \ - COPYRIGHT CREDITS INSTALL README Themes.html \ + COPYRIGHT CREDITS INSTALL README* Themes.html \ $PKG/usr/doc/gkrellm-$VERSION # If there's a ChangeLog, installing at least part of the recent history @@ -106,7 +122,7 @@ cat $CWD/slack-desc > $PKG/install/slack-desc # Add optional plugin(s): # The countdown plugin is needed to track X-Day. ;-) -COUNTDOWN=0.1.1 +COUNTDOWN=0.1.2 cd $TMP rm -rf gkrellm-countdown tar xf $CWD/gkrellm-countdown-$COUNTDOWN.tar.gz || exit 1 @@ -117,7 +133,7 @@ find . \ -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -make +make || exit 1 cp gkrellm-countdown.so $PKG/usr/lib${LIBDIRSUFFIX}/gkrellm2/plugins mkdir -p $PKG/usr/doc/gkrellm-countdown-$COUNTDOWN diff --git a/source/xap/gkrellm/slack-desc b/source/xap/gkrellm/slack-desc index 3540eb6a5..4a381575a 100644 --- a/source/xap/gkrellm/slack-desc +++ b/source/xap/gkrellm/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 customary to +# 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/gnuchess/gnuchess.SlackBuild b/source/xap/gnuchess/gnuchess.SlackBuild index 4e2fa415e..92932f30e 100755 --- a/source/xap/gnuchess/gnuchess.SlackBuild +++ b/source/xap/gnuchess/gnuchess.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2013, 2015 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2013, 2015, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,12 +20,14 @@ # 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) -VERGNUCHESS=6.2.2 +PKGNAM=gnuchess +VERGNUCHESS=6.2.5 VERSJENG=11.2 VEREBOARD=1.1.1 -VERXBOARD=4.8.0 -BUILD=${BUILD:-1} +VERXBOARD=4.9.1 +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -37,6 +39,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-$VERGNUCHESS-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:-" -j7 "} if [ "$ARCH" = "i586" ]; then @@ -49,7 +59,6 @@ else SLKCFLAGS="-O2" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=/tmp/package-gnuchess @@ -73,7 +82,8 @@ CFLAGS="$SLKCFLAGS" \ --prefix=/usr \ --mandir=/usr/man \ --infodir=/usr/info \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 + make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 @@ -97,7 +107,8 @@ find . \ CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 + make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 @@ -124,7 +135,8 @@ find . \ ./configure \ --prefix=/usr \ --extra-flags=$(echo $SLKCFLAGS | sed -e "y/ /:/") \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 + make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 @@ -154,7 +166,8 @@ CFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --with-gtk \ --enable-zippy \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 + make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 install -c cmail $PKG/usr/bin/cmail diff --git a/source/xap/gnuchess/slack-desc b/source/xap/gnuchess/slack-desc index 967766534..5bae56d0a 100644 --- a/source/xap/gnuchess/slack-desc +++ b/source/xap/gnuchess/slack-desc @@ -1,14 +1,14 @@ # 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------------------------------------------------------| gnuchess: gnuchess (GPL licensed chess engines and graphical frontends) gnuchess: -gnuchess: This is a package of programs for playing chess. It includes the +gnuchess: This is a package of programs for playing chess. It includes the gnuchess: gnuchess and Sjeng chess engines, and the eboard and XBoard gnuchess: graphical interfaces to these engines. gnuchess: diff --git a/source/xap/gnuplot/gnuplot.SlackBuild b/source/xap/gnuplot/gnuplot.SlackBuild index 862ae88bf..48c229969 100755 --- a/source/xap/gnuplot/gnuplot.SlackBuild +++ b/source/xap/gnuplot/gnuplot.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2010, 2016 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2016, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,9 +20,11 @@ # 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=gnuplot -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -34,6 +36,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 + NUMJOBS=${NUMJOBS:-" -j7 "} if [ "$ARCH" = "i586" ]; then @@ -50,7 +60,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-gnuplot @@ -58,7 +67,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf gnuplot-$VERSION -tar xvf $CWD/gnuplot-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/gnuplot-$VERSION.tar.?z || exit 1 cd gnuplot-$VERSION || exit 1 chown -R root:root . @@ -68,6 +77,16 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fix default source location; use the GDFONTPATH variable to modify at runtime. +# Thanks to the arch-folks. +sed -i 's|/usr/X11R6/lib/X11/fonts/truetype|/usr/share/fonts/TTF|' src/variable.c +sed -i -e 's|/usr/X11R6/lib/X11/fonts/Type1|/usr/share/fonts/Type1|' \ + -e 's|$(X11ROOT)/X11R6/lib/X11/fonts/Type1|$(X11ROOT)/usr/share/fonts/Type1|' \ + src/variable.c + +# Fix failure in building info file: +zcat $CWD/gnuplot.fix.info.generation.diff.gz | patch -p1 --verbose || exit 1 + # To distribute gnuplot binaries, you can not use GNU readline, as # gnuplot does not use a GPL compatible free license. CFLAGS="$SLKCFLAGS" \ @@ -78,13 +97,16 @@ CFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --with-gd \ --with-caca \ + --with-qt=no \ + --without-libcerf \ + --with-texdir=/usr/share/texmf-dist/tex/latex/gnuplot \ --datadir=/usr/share/gnuplot \ --with-readline=builtin \ --build=${ARCH}-slackware-linux || exit 1 # # I think most people would rather not have a Qt dependency here. -# --enable-qt +# --with-qt=yes # make $NUMJOBS || make || exit 1 @@ -119,7 +141,7 @@ fi mkdir -p $PKG/usr/doc/gnuplot-$VERSION cp -a \ - BUGS CodeStyle Copyright FAQ.bloat INSTALL NEWS PATCHLEVEL PGPKEYS PORTING \ + BUGS CodeStyle Copyright INSTALL NEWS PATCHLEVEL PGPKEYS PORTING \ README* TODO VERSION \ $PKG/usr/doc/gnuplot-$VERSION cp -a demo $PKG/usr/doc/gnuplot-$VERSION diff --git a/source/xap/gnuplot/gnuplot.fix.info.generation.diff b/source/xap/gnuplot/gnuplot.fix.info.generation.diff new file mode 100644 index 000000000..ff4bd86df --- /dev/null +++ b/source/xap/gnuplot/gnuplot.fix.info.generation.diff @@ -0,0 +1,11 @@ +--- ./docs/doc2texi.el.orig 2017-05-18 11:30:19.000000000 -0500 ++++ ./docs/doc2texi.el 2017-09-30 13:21:17.213250046 -0500 +@@ -760,7 +760,7 @@ + (while (re-search-forward "^#end" (point-max) "to_end") + (replace-match "@end itemize" t)) + (goto-char (point-min)) +- (while (re-search-forward "^#b" (point-max) "to_end") ++ (while (re-search-forward "^#b " (point-max) "to_end") + (replace-match "@item\n" t)) + (goto-char (point-min)) + (while (re-search-forward "^##" (point-max) "to_end") diff --git a/source/xap/gnuplot/slack-desc b/source/xap/gnuplot/slack-desc index f0007b4a9..00b65e41d 100644 --- a/source/xap/gnuplot/slack-desc +++ b/source/xap/gnuplot/slack-desc @@ -1,18 +1,18 @@ # 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 customary to +# 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------------------------------------------------------| gnuplot: gnuplot (plotting utility) gnuplot: gnuplot: Gnuplot is a command-line driven interactive function plotting utility -gnuplot: for UNIX, MSDOS, and VMS platforms. The software is copyrighted but -gnuplot: freely distributed (i.e., you don't have to pay for it). It was +gnuplot: for UNIX, MSDOS, and VMS platforms. The software is copyrighted but +gnuplot: freely distributed (i.e., you don't have to pay for it). It was gnuplot: originally intended as graphical program which would allow scientists -gnuplot: and students to visualize mathematical functions and data. Gnuplot +gnuplot: and students to visualize mathematical functions and data. Gnuplot gnuplot: supports many different types of terminals, plotters, and printers gnuplot: (including many color devices, and pseudo-devices like LaTeX) and is gnuplot: easily extensible to include new devices. diff --git a/source/xap/gparted/com.slackware.pkexec.gparted.policy b/source/xap/gparted/com.slackware.pkexec.gparted.policy deleted file mode 100644 index 2981762ef..000000000 --- a/source/xap/gparted/com.slackware.pkexec.gparted.policy +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE policyconfig PUBLIC - "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" - "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd"> -<policyconfig> - - <action id="com.slackware.pkexec.gparted"> - <message>Authentication is required to run the GParted Partition Editor</message> - <icon_name>gparted</icon_name> - <defaults> - <allow_any>auth_admin</allow_any> - <allow_inactive>auth_admin</allow_inactive> - <allow_active>auth_admin</allow_active> - </defaults> - <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/gparted</annotate> - <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate> - </action> - -</policyconfig> - diff --git a/source/xap/gparted/gparted.SlackBuild b/source/xap/gparted/gparted.SlackBuild index 7a78ab016..2840afd5e 100755 --- a/source/xap/gparted/gparted.SlackBuild +++ b/source/xap/gparted/gparted.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Slackware build script for GParted # @@ -22,9 +22,11 @@ # 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=gparted -VERSION=${VERSION:-$(echo $(basename $(echo $PRGNAM-*.tar.xz | cut -f 2 -d -) .tar.xz) | cut -f 2 -d -)} -BUILD=${BUILD:-1} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -38,7 +40,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -60,7 +69,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find -L . \ @@ -69,9 +78,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 {} \; -sed -i "s:@gksuprog@ @installdir@/gparted %f:@installdir@/gparted_polkit %f:g" \ - gparted.desktop.in.in - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -90,12 +96,6 @@ make install DESTDIR=$PKG || exit 1 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -mkdir -p $PKG/usr/share/polkit-1/actions -cat $CWD/com.slackware.pkexec.gparted.policy > $PKG/usr/share/polkit-1/actions/com.slackware.pkexec.gparted.policy - -cat $CWD/gparted_polkit > $PKG/usr/sbin/gparted_polkit -chmod 0755 $PKG/usr/sbin/gparted_polkit - # Compress and link manpages, if any: if [ -d $PKG/usr/man ]; then ( cd $PKG/usr/man diff --git a/source/xap/gparted/gparted_polkit b/source/xap/gparted/gparted_polkit deleted file mode 100644 index 76bd7b5e6..000000000 --- a/source/xap/gparted/gparted_polkit +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -if [ $(which pkexec) ]; then - pkexec --disable-internal-agent "/usr/sbin/gparted" "$@" -else - /usr/sbin/gparted "$@" -fi diff --git a/source/xap/gparted/slack-desc b/source/xap/gparted/slack-desc index 85f3617b8..aacf6050a 100644 --- a/source/xap/gparted/slack-desc +++ b/source/xap/gparted/slack-desc @@ -2,7 +2,7 @@ # 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 +# You must make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| @@ -11,9 +11,9 @@ gparted: gparted: With GParted you can resize, copy, and move partitions without data gparted: loss, enabling you to: gparted: -gparted: * Grow or shrink your C: drive -gparted: * Create space for new operating systems -gparted: * Attempt data rescue from lost partitions +gparted: * Grow or shrink your C: drive +gparted: * Create space for new operating systems +gparted: * Attempt data rescue from lost partitions gparted: gparted: http://gparted.sourceforge.net/ gparted: diff --git a/source/xap/gucharmap/gucharmap.SlackBuild b/source/xap/gucharmap/gucharmap.SlackBuild index 7d493cb6f..6060b5280 100755 --- a/source/xap/gucharmap/gucharmap.SlackBuild +++ b/source/xap/gucharmap/gucharmap.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2010, 2013 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2013, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,7 +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=gucharmap VERSION=${VERSION:-$(echo gucharmap-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} @@ -34,6 +36,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 + NUMJOBS=${NUMJOBS:-" -j7 "} if [ "$ARCH" = "i586" ]; then @@ -50,7 +60,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-gucharmap rm -rf $PKG @@ -75,10 +84,14 @@ CFLAGS="$SLKCFLAGS" \ --localstatedir=/var/lib \ --docdir=/usr/doc/gucharmap-$VERSION \ --enable-static=no \ - --build=$ARCH-slackware-linux + --with-unicode-data=download \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 -make -i $NUMJOBS || make || exit 1 -make -i install DESTDIR=$PKG || exit 1 +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la # We don't want the gconf stuff rm -rf $PKG/etc @@ -88,7 +101,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \ mkdir -p $PKG/usr/doc/gucharmap-$VERSION cp -a \ - COPYING* NEWS README TODO \ + COPYING* NEWS README* TODO \ $PKG/usr/doc/gucharmap-$VERSION # If there's a ChangeLog, installing at least part of the recent history diff --git a/source/xap/gucharmap/slack-desc b/source/xap/gucharmap/slack-desc index 798e123ba..83ba3e56d 100644 --- a/source/xap/gucharmap/slack-desc +++ b/source/xap/gucharmap/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/gv/gv-aarch64.patch b/source/xap/gv/gv-aarch64.patch new file mode 100644 index 000000000..4c1662234 --- /dev/null +++ b/source/xap/gv/gv-aarch64.patch @@ -0,0 +1,1144 @@ +diff -urN gv-3.7.3.90/config.guess gv-3.7.3.90-aarch64/config.guess +--- gv-3.7.3.90/config.guess 2012-02-29 10:30:43.000000000 -0600 ++++ gv-3.7.3.90-aarch64/config.guess 2013-03-08 00:16:02.908612483 -0600 +@@ -1,10 +1,10 @@ + #! /bin/sh + # Attempt to guess a canonical system name. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +-# Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012 Free Software Foundation, Inc. + +-timestamp='2009-11-20' ++timestamp='2012-09-25' + + # This file is free software; you can redistribute it and/or modify it + # under the terms of the GNU General Public License as published by +@@ -17,9 +17,7 @@ + # General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +-# 02110-1301, USA. ++# along with this program; if not, see <http://www.gnu.org/licenses/>. + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -56,8 +54,9 @@ + GNU config.guess ($timestamp) + + Originally written by Per Bothner. +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 ++Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -144,7 +143,7 @@ + case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or +- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, ++ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward +@@ -180,7 +179,7 @@ + fi + ;; + *) +- os=netbsd ++ os=netbsd + ;; + esac + # The OS release +@@ -201,6 +200,10 @@ + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit ;; ++ *:Bitrig:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} ++ exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} +@@ -223,7 +226,7 @@ + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) +- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on +@@ -269,7 +272,10 @@ + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- exit ;; ++ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. ++ exitcode=$? ++ trap '' 0 ++ exit $exitcode ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead +@@ -295,12 +301,12 @@ + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) +- echo powerpc-ibm-os400 ++ echo powerpc-ibm-os400 + exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; +- arm:riscos:*:*|arm:RISCOS:*:*) ++ arm*:riscos:*:*|arm*:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) +@@ -394,23 +400,23 @@ + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} ++ echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} +- exit ;; ++ exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) +- echo m68k-atari-mint${UNAME_RELEASE} ++ echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) +- echo m68k-milan-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-milan-mint${UNAME_RELEASE} ++ exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) +- echo m68k-hades-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-hades-mint${UNAME_RELEASE} ++ exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) +- echo m68k-unknown-mint${UNAME_RELEASE} +- exit ;; ++ echo m68k-unknown-mint${UNAME_RELEASE} ++ exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; +@@ -480,8 +486,8 @@ + echo m88k-motorola-sysv3 + exit ;; + AViiON:dgux:*:*) +- # DG/UX returns AViiON for all architectures +- UNAME_PROCESSOR=`/usr/bin/uname -p` ++ # DG/UX returns AViiON for all architectures ++ UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ +@@ -494,7 +500,7 @@ + else + echo i586-dg-dgux${UNAME_RELEASE} + fi +- exit ;; ++ exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; +@@ -551,7 +557,7 @@ + echo rs6000-ibm-aix3.2 + fi + exit ;; +- *:AIX:*:[456]) ++ *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 +@@ -594,52 +600,52 @@ + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` +- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` +- case "${sc_cpu_version}" in +- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 +- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 +- 532) # CPU_PA_RISC2_0 +- case "${sc_kernel_bits}" in +- 32) HP_ARCH="hppa2.0n" ;; +- 64) HP_ARCH="hppa2.0w" ;; ++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` ++ case "${sc_cpu_version}" in ++ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 ++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 ++ 532) # CPU_PA_RISC2_0 ++ case "${sc_kernel_bits}" in ++ 32) HP_ARCH="hppa2.0n" ;; ++ 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 +- esac ;; +- esac ++ esac ;; ++ esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build +- sed 's/^ //' << EOF >$dummy.c ++ sed 's/^ //' << EOF >$dummy.c ++ ++ #define _HPUX_SOURCE ++ #include <stdlib.h> ++ #include <unistd.h> + +- #define _HPUX_SOURCE +- #include <stdlib.h> +- #include <unistd.h> +- +- int main () +- { +- #if defined(_SC_KERNEL_BITS) +- long bits = sysconf(_SC_KERNEL_BITS); +- #endif +- long cpu = sysconf (_SC_CPU_VERSION); +- +- switch (cpu) +- { +- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; +- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; +- case CPU_PA_RISC2_0: +- #if defined(_SC_KERNEL_BITS) +- switch (bits) +- { +- case 64: puts ("hppa2.0w"); break; +- case 32: puts ("hppa2.0n"); break; +- default: puts ("hppa2.0"); break; +- } break; +- #else /* !defined(_SC_KERNEL_BITS) */ +- puts ("hppa2.0"); break; +- #endif +- default: puts ("hppa1.0"); break; +- } +- exit (0); +- } ++ int main () ++ { ++ #if defined(_SC_KERNEL_BITS) ++ long bits = sysconf(_SC_KERNEL_BITS); ++ #endif ++ long cpu = sysconf (_SC_CPU_VERSION); ++ ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ++ case CPU_PA_RISC2_0: ++ #if defined(_SC_KERNEL_BITS) ++ switch (bits) ++ { ++ case 64: puts ("hppa2.0w"); break; ++ case 32: puts ("hppa2.0n"); break; ++ default: puts ("hppa2.0"); break; ++ } break; ++ #else /* !defined(_SC_KERNEL_BITS) */ ++ puts ("hppa2.0"); break; ++ #endif ++ default: puts ("hppa1.0"); break; ++ } ++ exit (0); ++ } + EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa +@@ -730,22 +736,22 @@ + exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd +- exit ;; ++ exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi +- exit ;; ++ exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd +- exit ;; ++ exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd +- exit ;; ++ exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd +- exit ;; ++ exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; +@@ -769,14 +775,14 @@ + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` +- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" +- exit ;; ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` ++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; + 5000:UNIX_System_V:4.*:*) +- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` +- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` +- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` ++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} +@@ -788,30 +794,35 @@ + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) +- case ${UNAME_MACHINE} in +- pc98) +- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ UNAME_PROCESSOR=`/usr/bin/uname -p` ++ case ${UNAME_PROCESSOR} in + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) +- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; ++ *:MINGW64*:*) ++ echo ${UNAME_MACHINE}-pc-mingw64 ++ exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; ++ i*:MSYS*:*) ++ echo ${UNAME_MACHINE}-pc-msys ++ exit ;; + i*:windows32*:*) +- # uname -m includes "-pc" on this system. +- echo ${UNAME_MACHINE}-mingw32 ++ # uname -m includes "-pc" on this system. ++ echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; + *:Interix*:*) +- case ${UNAME_MACHINE} in ++ case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; +@@ -857,6 +868,13 @@ + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; ++ aarch64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ aarch64_be:Linux:*:*) ++ UNAME_MACHINE=aarch64_be ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; +@@ -866,7 +884,7 @@ + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; +- esac ++ esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} +@@ -878,20 +896,29 @@ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else +- echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_PCS_VFP ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf ++ fi + fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + cris:Linux:*:*) +- echo cris-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-gnu + exit ;; + crisv32:Linux:*:*) +- echo crisv32-axis-linux-gnu ++ echo ${UNAME_MACHINE}-axis-linux-gnu + exit ;; + frv:Linux:*:*) +- echo frv-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ hexagon:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + i*86:Linux:*:*) + LIBC=gnu +@@ -933,7 +960,7 @@ + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) +- echo or32-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu +@@ -959,7 +986,7 @@ + echo ${UNAME_MACHINE}-ibm-linux + exit ;; + sh64*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu +@@ -967,14 +994,17 @@ + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; ++ tile*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; + x86_64:Linux:*:*) +- echo x86_64-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + xtensa*:Linux:*:*) +- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. +@@ -983,11 +1013,11 @@ + echo i386-sequent-sysv4 + exit ;; + i*86:UNIX_SV:4.2MP:2.*) +- # Unixware is an offshoot of SVR4, but it has its own version +- # number series starting with 2... +- # I am not positive that other SVR4 systems won't match this, ++ # Unixware is an offshoot of SVR4, but it has its own version ++ # number series starting with 2... ++ # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. +- # Use sysv4.2uw... so that sysv4* matches it. ++ # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) +@@ -1019,7 +1049,7 @@ + fi + exit ;; + i*86:*:5:[678]*) +- # UnixWare 7.x, OpenUNIX and OpenServer 6. ++ # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; +@@ -1047,13 +1077,13 @@ + exit ;; + pc:*:*:*) + # Left here for compatibility: +- # uname -m prints for DJGPP always 'pc', but it prints nothing about +- # the processor, so we play safe by assuming i586. ++ # uname -m prints for DJGPP always 'pc', but it prints nothing about ++ # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configury will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp +- exit ;; ++ exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit ;; +@@ -1088,8 +1118,8 @@ + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) +- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ +- && { echo i486-ncr-sysv4; exit; } ;; ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ +@@ -1132,10 +1162,10 @@ + echo ns32k-sni-sysv + fi + exit ;; +- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort +- # says <Richard.M.Bartel@ccMail.Census.GOV> +- echo i586-unisys-sysv4 +- exit ;; ++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ++ # says <Richard.M.Bartel@ccMail.Census.GOV> ++ echo i586-unisys-sysv4 ++ exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes <hewes@openmarket.com>. + # How about differentiating between stratus architectures? -djm +@@ -1161,11 +1191,11 @@ + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then +- echo mips-nec-sysv${UNAME_RELEASE} ++ echo mips-nec-sysv${UNAME_RELEASE} + else +- echo mips-unknown-sysv${UNAME_RELEASE} ++ echo mips-unknown-sysv${UNAME_RELEASE} + fi +- exit ;; ++ exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; +@@ -1178,6 +1208,9 @@ + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; ++ x86_64:Haiku:*:*) ++ echo x86_64-unknown-haiku ++ exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; +@@ -1230,7 +1263,10 @@ + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; +- NSE-?:NONSTOP_KERNEL:*:*) ++ NEO-?:NONSTOP_KERNEL:*:*) ++ echo neo-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ NSE-*:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) +@@ -1275,13 +1311,13 @@ + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) +- echo mips-sei-seiux${UNAME_RELEASE} ++ echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) +- UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; +@@ -1299,11 +1335,11 @@ + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; ++ x86_64:VMkernel:*:*) ++ echo ${UNAME_MACHINE}-unknown-esx ++ exit ;; + esac + +-#echo '(No uname command or uname output not recognized.)' 1>&2 +-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 +- + eval $set_cc_for_build + cat >$dummy.c <<EOF + #ifdef _SEQUENT_ +@@ -1321,11 +1357,11 @@ + #include <sys/param.h> + printf ("m68k-sony-newsos%s\n", + #ifdef NEWSOS4 +- "4" ++ "4" + #else +- "" ++ "" + #endif +- ); exit (0); ++ ); exit (0); + #endif + #endif + +diff -urN gv-3.7.3.90/config.sub gv-3.7.3.90-aarch64/config.sub +--- gv-3.7.3.90/config.sub 2012-02-29 10:30:43.000000000 -0600 ++++ gv-3.7.3.90-aarch64/config.sub 2013-03-08 00:16:02.950607675 -0600 +@@ -1,10 +1,10 @@ + #! /bin/sh + # Configuration validation subroutine script. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +-# Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011, 2012 Free Software Foundation, Inc. + +-timestamp='2009-11-20' ++timestamp='2012-10-10' + + # This file is (in principle) common to ALL GNU software. + # The presence of a machine in this file suggests that SOME GNU software +@@ -21,9 +21,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program; if not, write to the Free Software +-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +-# 02110-1301, USA. ++# along with this program; if not, see <http://www.gnu.org/licenses/>. + # + # As a special exception to the GNU General Public License, if you + # distribute this file as part of a program that contains a +@@ -75,8 +73,9 @@ + version="\ + GNU config.sub ($timestamp) + +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 ++Free Software Foundation, Inc. + + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." +@@ -123,13 +122,18 @@ + # Here we must recognize all the valid KERNEL-OS combinations. + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` + case $maybe_os in +- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ +- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ ++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ ++ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ ++ knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; ++ android-linux) ++ os=-linux-android ++ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown ++ ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] +@@ -152,12 +156,12 @@ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ +- -apple | -axis | -knuth | -cray | -microblaze) ++ -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 + ;; +- -bluegene*) +- os=-cnk ++ -bluegene*) ++ os=-cnk + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= +@@ -173,10 +177,10 @@ + os=-chorusos + basic_machine=$1 + ;; +- -chorusrdb) +- os=-chorusrdb ++ -chorusrdb) ++ os=-chorusrdb + basic_machine=$1 +- ;; ++ ;; + -hiux*) + os=-hiuxwe2 + ;; +@@ -221,6 +225,12 @@ + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; ++ -lynx*178) ++ os=-lynxos178 ++ ;; ++ -lynx*5) ++ os=-lynxos5 ++ ;; + -lynx*) + os=-lynxos + ;; +@@ -245,20 +255,25 @@ + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ ++ | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ ++ | be32 | be64 \ + | bfin \ + | c4x | clipper \ + | d10v | d30v | dlx | dsp16xx \ ++ | epiphany \ + | fido | fr30 | frv \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ ++ | hexagon \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ ++ | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ +- | maxq | mb | microblaze | mcore | mep | metag \ ++ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ +@@ -281,29 +296,39 @@ + | moxie \ + | mt \ + | msp430 \ ++ | nds32 | nds32le | nds32be \ + | nios | nios2 \ + | ns16k | ns32k \ ++ | open8 \ + | or32 \ + | pdp10 | pdp11 | pj | pjl \ +- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ ++ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pyramid \ +- | rx \ ++ | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ +- | spu | strongarm \ +- | tahoe | thumb | tic4x | tic80 | tron \ ++ | spu \ ++ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ +- | v850 | v850e \ ++ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | we32k \ +- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ ++ | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) + basic_machine=$basic_machine-unknown + ;; +- m6811 | m68hc11 | m6812 | m68hc12 | picochip) +- # Motorola 68HC11/12. ++ c54x) ++ basic_machine=tic54x-unknown ++ ;; ++ c55x) ++ basic_machine=tic55x-unknown ++ ;; ++ c6x) ++ basic_machine=tic6x-unknown ++ ;; ++ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + basic_machine=$basic_machine-unknown + os=-none + ;; +@@ -313,6 +338,21 @@ + basic_machine=mt-unknown + ;; + ++ strongarm | thumb | xscale) ++ basic_machine=arm-unknown ++ ;; ++ xgate) ++ basic_machine=$basic_machine-unknown ++ os=-none ++ ;; ++ xscaleeb) ++ basic_machine=armeb-unknown ++ ;; ++ ++ xscaleel) ++ basic_machine=armel-unknown ++ ;; ++ + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. +@@ -327,25 +367,30 @@ + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ ++ | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ ++ | be32-* | be64-* \ + | bfin-* | bs2000-* \ +- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ ++ | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ ++ | hexagon-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ ++ | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ +- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ ++ | microblaze-* | microblazeel-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ +@@ -367,25 +412,29 @@ + | mmix-* \ + | mt-* \ + | msp430-* \ ++ | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ ++ | open8-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ +- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ ++ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pyramid-* \ +- | romp-* | rs6000-* | rx-* \ ++ | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ +- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ +- | tahoe-* | thumb-* \ +- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ ++ | tahoe-* \ ++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ ++ | tile*-* \ + | tron-* \ + | ubicom32-* \ +- | v850-* | v850e-* | vax-* \ ++ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ ++ | vax-* \ + | we32k-* \ +- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ ++ | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-* | z80-*) +@@ -410,7 +459,7 @@ + basic_machine=a29k-amd + os=-udi + ;; +- abacus) ++ abacus) + basic_machine=abacus-unknown + ;; + adobe68k) +@@ -480,11 +529,20 @@ + basic_machine=powerpc-ibm + os=-cnk + ;; ++ c54x-*) ++ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c55x-*) ++ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c6x-*) ++ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; +- cegcc) ++ cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; +@@ -516,7 +574,7 @@ + basic_machine=craynv-cray + os=-unicosmp + ;; +- cr16) ++ cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf + ;; +@@ -674,7 +732,6 @@ + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; +-# I'm not sure what "Sysv32" means. Should this be sysv3.2? + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 +@@ -732,9 +789,13 @@ + basic_machine=ns32k-utek + os=-sysv + ;; +- microblaze) ++ microblaze*) + basic_machine=microblaze-xilinx + ;; ++ mingw64) ++ basic_machine=x86_64-pc ++ os=-mingw64 ++ ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 +@@ -771,10 +832,18 @@ + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; ++ msys) ++ basic_machine=i386-pc ++ os=-msys ++ ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; ++ nacl) ++ basic_machine=le32-unknown ++ os=-nacl ++ ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 +@@ -839,6 +908,12 @@ + np1) + basic_machine=np1-gould + ;; ++ neo-tandem) ++ basic_machine=neo-tandem ++ ;; ++ nse-tandem) ++ basic_machine=nse-tandem ++ ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; +@@ -921,9 +996,10 @@ + ;; + power) basic_machine=power-ibm + ;; +- ppc) basic_machine=powerpc-unknown ++ ppc | ppcbe) basic_machine=powerpc-unknown + ;; +- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ppc-* | ppcbe-*) ++ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown +@@ -1017,6 +1093,9 @@ + basic_machine=i860-stratus + os=-sysv4 + ;; ++ strongarm-* | thumb-*) ++ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; + sun2) + basic_machine=m68000-sun + ;; +@@ -1073,20 +1152,8 @@ + basic_machine=t90-cray + os=-unicos + ;; +- tic54x | c54x*) +- basic_machine=tic54x-unknown +- os=-coff +- ;; +- tic55x | c55x*) +- basic_machine=tic55x-unknown +- os=-coff +- ;; +- tic6x | c6x*) +- basic_machine=tic6x-unknown +- os=-coff +- ;; + tile*) +- basic_machine=tile-unknown ++ basic_machine=$basic_machine-unknown + os=-linux-gnu + ;; + tx39) +@@ -1156,6 +1223,9 @@ + xps | xps100) + basic_machine=xps100-honeywell + ;; ++ xscale-* | xscalee[bl]-*) ++ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` ++ ;; + ymp) + basic_machine=ymp-cray + os=-unicos +@@ -1253,11 +1323,11 @@ + if [ x"$os" != x"" ] + then + case $os in +- # First match some system type aliases +- # that might get confused with valid system types. ++ # First match some system type aliases ++ # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. +- -auroraux) +- os=-auroraux ++ -auroraux) ++ os=-auroraux + ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` +@@ -1287,14 +1357,15 @@ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ +- | -openbsd* | -solidbsd* \ ++ | -bitrig* | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ +- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ +- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ ++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ ++ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ +@@ -1341,7 +1412,7 @@ + -opened*) + os=-openedition + ;; +- -os400*) ++ -os400*) + os=-os400 + ;; + -wince*) +@@ -1390,7 +1461,7 @@ + -sinix*) + os=-sysv4 + ;; +- -tpf*) ++ -tpf*) + os=-tpf + ;; + -triton*) +@@ -1435,6 +1506,8 @@ + -dicos*) + os=-dicos + ;; ++ -nacl*) ++ ;; + -none) + ;; + *) +@@ -1457,10 +1530,10 @@ + # system, and we'll never get to this point. + + case $basic_machine in +- score-*) ++ score-*) + os=-elf + ;; +- spu-*) ++ spu-*) + os=-elf + ;; + *-acorn) +@@ -1472,8 +1545,20 @@ + arm*-semi) + os=-aout + ;; +- c4x-* | tic4x-*) +- os=-coff ++ c4x-* | tic4x-*) ++ os=-coff ++ ;; ++ hexagon-*) ++ os=-elf ++ ;; ++ tic54x-*) ++ os=-coff ++ ;; ++ tic55x-*) ++ os=-coff ++ ;; ++ tic6x-*) ++ os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) +@@ -1493,14 +1578,11 @@ + ;; + m68000-sun) + os=-sunos3 +- # This also exists in the configure program, but was not the +- # default. +- # os=-sunos4 + ;; + m68*-cisco) + os=-aout + ;; +- mep-*) ++ mep-*) + os=-elf + ;; + mips*-cisco) +@@ -1527,7 +1609,7 @@ + *-ibm) + os=-aix + ;; +- *-knuth) ++ *-knuth) + os=-mmixware + ;; + *-wec) diff --git a/source/xap/gv/gv-bounding-box.patch b/source/xap/gv/gv-bounding-box.patch new file mode 100644 index 000000000..4cfcb7428 --- /dev/null +++ b/source/xap/gv/gv-bounding-box.patch @@ -0,0 +1,13 @@ +diff --git a/gv/src/ps.c b/gv/src/ps.c +index 2428bcc..822b65a 100644 +--- a/gv/src/ps.c ++++ b/gv/src/ps.c +@@ -357,7 +357,7 @@ static int parse_boundingbox(const char *l, int *boundingbox) { + while (*p == ' ' || *p == '\t') + p++; + fury = strtod(p, &pe); +- if (*pe != '\n' && *pe != '\0' && *pe != ' ' && *pe != '\t') { ++ if (*pe != '\n' && *pe != '\r'&& *pe != '\0' && *pe != ' ' && *pe != '\t') { + return 0; + } + diff --git a/source/xap/gv/gv-bug1071238.patch b/source/xap/gv/gv-bug1071238.patch new file mode 100644 index 000000000..9bce471d4 --- /dev/null +++ b/source/xap/gv/gv-bug1071238.patch @@ -0,0 +1,18 @@ +diff -up gv-3.7.4/src/zoom.c.bug1071238 gv-3.7.4/src/zoom.c +--- gv-3.7.4/src/zoom.c.bug1071238 2012-03-29 10:03:50.000000000 -0600 ++++ gv-3.7.4/src/zoom.c 2014-03-03 09:13:09.724941964 -0700 +@@ -104,12 +104,12 @@ zoom_createZoom(Widget w _GL_UNUSED, XtP + + BEGINMESSAGE(zoom_createZoom) + +- if (!(gv_psfile != NULL || (gv_gs_arguments && *gv_gs_arguments))) { ++ if (!gv_psfile) { + INFMESSAGE(no file) ENDMESSAGE(zoom_createZoom) + return; + } + +- if (strcmp(gv_filename, "-")) { ++ if (gv_filename != NULL && strcmp(gv_filename, "-")) { + stat(gv_filename, &sbuf); + if (mtime != sbuf.st_mtime) { + INFMESSAGE1(file has changed) ENDMESSAGE1(zoom_createZoom)return; diff --git a/source/xap/gv/gv-dat.patch b/source/xap/gv/gv-dat.patch new file mode 100644 index 000000000..c368d6938 --- /dev/null +++ b/source/xap/gv/gv-dat.patch @@ -0,0 +1,11 @@ +--- gv-3.7.4/src/gv_user_res.dat- 2012-04-01 10:43:24.000000000 -0400 ++++ gv-3.7.4/src/gv_user_res.dat 2013-04-05 17:22:03.619436586 -0400 +@@ -39,7 +39,7 @@ + save_marked + GV.scale: 0 + GV.scaleBase: 1 +-GV.scales: Natural size, 1.000, screen \n\ ++GV.scales: Natural size, 1.000, screen \n\ + Pixel based, 1.000, pixel \n\ + Arbitrary magnification, -2 \n\ + Fit height to window, -3 \n\ diff --git a/source/xap/gv/gv-resource.patch b/source/xap/gv/gv-resource.patch new file mode 100644 index 000000000..b1352e79f --- /dev/null +++ b/source/xap/gv/gv-resource.patch @@ -0,0 +1,29 @@ +--- gv-3.7.4/src/main.c- 2012-04-01 10:43:24.000000000 -0400 ++++ gv-3.7.4/src/main.c 2013-04-12 18:39:47.578033642 -0400 +@@ -1449,7 +1449,7 @@ + if (s) gv_gs_arguments = s; + + s = resource_getResource(db,gv_class,gv_name,"gsSafeDir",NULL); +- if (!strcasecmp(s,"true")) gv_gs_safeDir = 1; else gv_gs_safeDir = 0; ++ if (s && !strcasecmp(s,"true")) gv_gs_safeDir = 1; else gv_gs_safeDir = 0; + + s = resource_getResource(db,gv_class,gv_name,"gsSafer",NULL); + if (s && !strcasecmp(s,"true")) gv_gs_safer = 1; else gv_gs_safer = 0; +@@ -1468,13 +1468,13 @@ + } + + s = resource_getResource(db,gv_class,gv_name,"infoVerbose",NULL); +- if (!strcasecmp(s, "Silent")) gv_infoVerbose=0; +- else if (!strcasecmp(s, "Errors")) gv_infoVerbose=1; +- else if (!strcasecmp(s, "All")) gv_infoVerbose=2; ++ if (!s || !strcasecmp(s, "Errors")) gv_infoVerbose=1; ++ else if (!strcasecmp(s, "Silent")) gv_infoVerbose=0; ++ else if (!strcasecmp(s, "All")) gv_infoVerbose=2; + else gv_infoVerbose = 1; + + s = resource_getResource(db,gv_class,gv_name,"xinerama",NULL); +- if (!strcasecmp(s, "Off")) gv_xinerama=0; ++ if (!s || !strcasecmp(s, "Off")) gv_xinerama=0; + else if (!strcasecmp(s, "On")) gv_xinerama=1; + else if (!strcasecmp(s, "Auto")) gv_xinerama=-1; + else gv_xinerama = 0; diff --git a/source/xap/gv/gv-xft.patch b/source/xap/gv/gv-xft.patch deleted file mode 100644 index eb0520a55..000000000 --- a/source/xap/gv/gv-xft.patch +++ /dev/null @@ -1,404 +0,0 @@ -diff -rc gv-3.7.4/configure gv-xft-3.7.4/configure -*** gv-3.7.4/configure 2013-03-17 12:20:09.000000000 +0100 ---- gv-xft-3.7.4/configure 2014-05-02 14:22:59.879439785 +0200 -*************** -*** 13604,13616 **** - true - fi - -! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XawInitializeWidgetSet in -lXaw3d" >&5 -! $as_echo_n "checking for XawInitializeWidgetSet in -lXaw3d... " >&6; } - if test "${ac_cv_lib_Xaw3d_XawInitializeWidgetSet+set}" = set; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS -! LIBS="-lXaw3d $X_LIBS $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - ---- 13604,13616 ---- - true - fi - -! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XawInitializeWidgetSet in -l$XAW3DLIB" >&5 -! $as_echo_n "checking for XawInitializeWidgetSet in -l$XAW3DLIB ... " >&6; } - if test "${ac_cv_lib_Xaw3d_XawInitializeWidgetSet+set}" = set; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS -! LIBS="-l$XAW3DLIB $X_LIBS $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -*************** -*** 13645,13651 **** - #define HAVE_LIBXAW3D 1 - _ACEOF - -! LIBS="-lXaw3d $LIBS" - - else - as_fn_error "Unable to find a valid Xaw3d library. Please install it and rerun configure." "$LINENO" 5 ---- 13645,13651 ---- - #define HAVE_LIBXAW3D 1 - _ACEOF - -! LIBS="-l$XAW3DLIB $LIBS" - - else - as_fn_error "Unable to find a valid Xaw3d library. Please install it and rerun configure." "$LINENO" 5 -Seulement dans gv-xft-3.7.4: debian -diff -rc gv-3.7.4/src/FileSel.c gv-xft-3.7.4/src/FileSel.c -*** gv-3.7.4/src/FileSel.c 2012-04-01 16:43:24.000000000 +0200 ---- gv-xft-3.7.4/src/FileSel.c 2014-05-02 18:09:53.530875424 +0200 -*************** -*** 1853,1859 **** - SET_Arg(XtNallowMarks, False); - SET_Arg(XtNjustify, XtJustifyLeft); - *listP = ADD_Widget_Arg("list",vlistWidgetClass,*aaaP); -- - ENDMESSAGE(CreateList) - } - ---- 1853,1858 ---- -diff -rc gv-3.7.4/src/main.c gv-xft-3.7.4/src/main.c -*** gv-3.7.4/src/main.c 2012-04-01 16:43:24.000000000 +0200 ---- gv-xft-3.7.4/src/main.c 2014-05-02 20:26:04.052136882 +0200 -*************** -*** 62,67 **** ---- 62,70 ---- - #include INC_XAW(Scrollbar.h) - #include INC_XAW(XawInit.h) - #include INC_XMU(Editres.h) -+ #ifdef HAVE_XAW3DXFT -+ #include <X11/Xaw3dxft/Xaw3dXft.h> -+ #endif - #ifdef HAVE_LIBXINERAMA - #include INC_EXT(Xinerama.h) - #endif -*************** -*** 323,328 **** ---- 326,348 ---- - - int main(int argc, char *argv[]) - { -+ #ifdef HAVE_XAW3DXFT -+ XftInitFtLibrary(); -+ Xaw3dXftSetDefaultFontName("Liberation-10"); -+ Xaw3dXftSetHilitColor("#332211"); -+ Xaw3dXftSetInsensitiveTwist("#a00000"); -+ Xaw3dXftMenuSpacing = 0; -+ Xaw3dXftEncoding = -1; -+ Xaw3dXftStringHilight = 0; -+ Xaw3dXftStringUsePixmap = 0; -+ Xaw3dXftNoHilitReverse = 1; -+ Xaw3dXftButtonInverse = 0; -+ Xaw3dXftButtonDashed = 1; -+ Xaw3dXftShowTips = 1; -+ Xaw3dXftTextBgHilight = 1; -+ Xaw3dXftTextBgHilightColor = 0x332211; -+ #endif -+ - MAINBEGINMESSAGE(main) - gv_safe_gs_workdir = GV_LIBDIR "/safe-gs-workdir"; - gv_safe_gs_tempdir = 0; -Seulement dans gv-xft-3.7.4/src: main.c~ -diff -rc gv-3.7.4/src/misc_private.c gv-xft-3.7.4/src/misc_private.c -*** gv-3.7.4/src/misc_private.c 2012-03-29 18:03:49.000000000 +0200 ---- gv-xft-3.7.4/src/misc_private.c 2014-05-02 15:52:46.514612158 +0200 -*************** -*** 44,49 **** ---- 44,52 ---- - #include INC_XAW(Cardinals.h) - #include INC_X11(IntrinsicP.h) - #include INC_XAW(LabelP.h) -+ #ifdef HAVE_XAW3DXFT -+ #include <X11/Xaw3dxft/Xaw3dXft.h> -+ #endif - #include "GhostviewP.h" - - #include "types.h" -*************** -*** 111,119 **** ---- 114,127 ---- - - #ifdef HAVE_XAW3D_INTERNATIONAL - if( vw->simple.international == True ) { -+ #ifdef HAVE_XAW3DXFT -+ Xaw3dXftDrawString(widget, Xaw3dXftDefaultFont, -+ x, y, text, (int)(strlen(text))); -+ #else - XmbDrawString(XtDisplay(widget), XtWindow(widget), - w->label.fontset, w->label.normal_GC, - x, y, text, (int)(strlen(text))); -+ #endif - } else { - #endif - if (w->label.encoding) { -*************** -*** 121,129 **** ---- 129,142 ---- - w->label.normal_GC, - x, y,(XChar2b*)text, (int)(strlen(text))); - } else { -+ #ifdef HAVE_XAW3DXFT -+ Xaw3dXftDrawString(widget, Xaw3dXftDefaultFont, -+ x, y, text, (int)(strlen(text))); -+ #else - XDrawString(XtDisplay(widget), XtWindow(widget), - w->label.normal_GC, - x, y, text, (int)(strlen(text))); -+ #endif - } - #ifdef HAVE_XAW3D_INTERNATIONAL - } -diff -rc gv-3.7.4/src/paths.h gv-xft-3.7.4/src/paths.h -*** gv-3.7.4/src/paths.h 2012-04-01 16:43:24.000000000 +0200 ---- gv-xft-3.7.4/src/paths.h 2014-05-02 12:19:02.351201784 +0200 -*************** -*** 37,48 **** ---- 37,56 ---- - #if HAVE_GCC_VERSION(2,95) - #define INC_X11(aaa) <X11/aaa> - #define INC_XMU(aaa) <X11/Xmu/aaa> -+ #ifdef HAVE_XAW3DXFT -+ #define INC_XAW(aaa) <X11/Xaw3dxft/aaa> -+ #else - #define INC_XAW(aaa) <X11/Xaw3d/aaa> -+ #endif - #define INC_EXT(aaa) <X11/extensions/aaa> - #else - #define INC_X11(aaa) <X11/##aaa##> - #define INC_XMU(aaa) <X11/Xmu/##aaa##> -+ #ifdef HAVE_XAW3DXFT -+ #define INC_XAW(aaa) <X11/Xaw3dxft/##aaa##> -+ #else - #define INC_XAW(aaa) <X11/Xaw3d/##aaa##> -+ #endif - #define INC_EXT(aaa) <X11/extensions/##aaa##> - #endif - -diff -rc gv-3.7.4/src/Vlist.c gv-xft-3.7.4/src/Vlist.c -*** gv-3.7.4/src/Vlist.c 2012-04-01 16:43:24.000000000 +0200 ---- gv-xft-3.7.4/src/Vlist.c 2014-05-02 18:31:38.121917171 +0200 -*************** -*** 49,55 **** - #include "VlistP.h" - #include "Frame.h" - #include INC_XMU(Converters.h) -! - #define VLIST_MARK_LEFT_INDENT 4 - #define VLIST_MARK_LABEL_INTERNAL_WIDTH 11 - #define VLIST_MARK_LABEL_INDENT 4 ---- 49,57 ---- - #include "VlistP.h" - #include "Frame.h" - #include INC_XMU(Converters.h) -! #ifdef HAVE_XAW3DXFT -! #include <X11/Xaw3dxft/Xaw3dXft.h> -! #endif - #define VLIST_MARK_LEFT_INDENT 4 - #define VLIST_MARK_LABEL_INTERNAL_WIDTH 11 - #define VLIST_MARK_LABEL_INDENT 4 -*************** -*** 214,230 **** ---- 216,243 ---- - values.graphics_exposures = False; - vw->vlist.background_GC = XtGetGC((Widget)vw,(unsigned) GCForeground | GCGraphicsExposures,&values); - -+ Dimension merde; - /* TODO: check if this works here in international mode, or if it has - * to be moved to Realize... */ - #ifdef HAVE_XAW3D_INTERNATIONAL - if( vw->simple.international == True ) { -+ #ifdef HAVE_XAW3DXFT -+ vw->vlist.yofs = Xaw3dXftDefaultFont->ascent + 1; -+ vw->vlist.ydelta = Xaw3dXftDefaultFont->ascent + Xaw3dXftDefaultFont->descent; -+ #else - XFontSetExtents *ext = XExtentsOfFontSet(vw->label.fontset); - vw->vlist.yofs = (ext->max_ink_extent.y<0)?-ext->max_ink_extent.y:ext->max_ink_extent.y; - vw->vlist.ydelta = ext->max_ink_extent.height; -+ #endif - } else { - #endif -+ #ifdef HAVE_XAW3DXFT -+ vw->vlist.yofs = Xaw3dXftDefaultFont->ascent + 1; -+ vw->vlist.ydelta = Xaw3dXftDefaultFont->ascent + Xaw3dXftDefaultFont->descent; -+ #else - vw->vlist.yofs = vw->label.font->max_bounds.ascent; - vw->vlist.ydelta = vw->label.font->max_bounds.ascent + vw->label.font->max_bounds.descent; -+ #endif - #ifdef HAVE_XAW3D_INTERNATIONAL - } - #endif -*************** -*** 339,353 **** ---- 352,380 ---- - len = strlen(s); - #ifdef HAVE_XAW3D_INTERNATIONAL - if( vw->simple.international == True ) -+ #ifdef HAVE_XAW3DXFT -+ Xaw3dXftDrawString(w, Xaw3dXftDefaultFont, -+ vw->label.label_x, -+ vw->label.label_y + yofs + entry*ydelta, -+ s, len); -+ #else - XmbDrawString(XtDisplay(w), XtWindow(w), vw->label.fontset, - vw->label.normal_GC, - vw->label.label_x, vw->label.label_y + yofs + entry*ydelta, - s, len); -+ #endif - else - #endif -+ #ifdef HAVE_XAW3DXFT -+ Xaw3dXftDrawString(w, Xaw3dXftDefaultFont, -+ vw->label.label_x, -+ vw->label.label_y + yofs + entry*ydelta, -+ s, len); -+ #else - XDrawString(XtDisplay(w), XtWindow(w), vw->label.normal_GC, - vw->label.label_x, vw->label.label_y + yofs + entry*ydelta, - s, len); -+ #endif - } - ENDMESSAGE1(PaintEntryString) - } -*************** -*** 404,416 **** - if (region == NULL || XRectInRegion(region,x,y,width,height) != RectangleOut) { - if (erase) { - INFMESSAGE(clearing entry) -! XFillRectangle(XtDisplayOfObject(w), XtWindowOfObject(w),vw->vlist.background_GC,x,y,width,height); - } else { - INFMESSAGE(drawing entry) - XFillRectangle(XtDisplayOfObject(w), XtWindowOfObject(w),gc,x,y,width,height); - FrameDrawFrame(w,x,y,width,height,ss,sw, - vw->threeD.top_shadow_GC, - vw->threeD.bot_shadow_GC); - } - ret=1; - } ---- 431,453 ---- - if (region == NULL || XRectInRegion(region,x,y,width,height) != RectangleOut) { - if (erase) { - INFMESSAGE(clearing entry) -! #ifndef HAVE_XAW3DXFT -! XFillRectangle(XtDisplayOfObject(w), XtWindowOfObject(w),vw->vlist.background_GC,x,y,width,height); -! #else -! XFillRectangle(XtDisplayOfObject(w), XtWindowOfObject(w),vw->vlist.background_GC,x,y-1,width,height+2); -! #endif - } else { - INFMESSAGE(drawing entry) -+ #ifndef HAVE_XAW3DXFT - XFillRectangle(XtDisplayOfObject(w), XtWindowOfObject(w),gc,x,y,width,height); - FrameDrawFrame(w,x,y,width,height,ss,sw, - vw->threeD.top_shadow_GC, - vw->threeD.bot_shadow_GC); -+ #else -+ FrameDrawFrame(w,x,y-1,width,height+2,ss,sw, -+ vw->threeD.top_shadow_GC, -+ vw->threeD.bot_shadow_GC); -+ #endif - } - ret=1; - } -*************** -*** 491,505 **** - if (region == NULL || XRectInRegion(region,x,y,width,height) != RectangleOut) { - if (paint) { - INFMESSAGE(drawing mark) - XFillRectangle(XtDisplayOfObject(w), XtWindowOfObject(w),vw->vlist.mark_background_GC,x,y,width,height); - FrameDrawFrame(w,x,y,width,height,ss,vw->vlist.mark_shadow_width, - vw->threeD.top_shadow_GC, - vw->threeD.bot_shadow_GC); - } else { - INFMESSAGE(clearing mark) - XFillRectangle(XtDisplayOfObject(w), XtWindowOfObject(w), - (entry == vw->vlist.highlighted) ? vw->vlist.highlighted_background_GC : vw->vlist.background_GC, -! x,y,width,height); - } - } - } ---- 528,552 ---- - if (region == NULL || XRectInRegion(region,x,y,width,height) != RectangleOut) { - if (paint) { - INFMESSAGE(drawing mark) -+ #ifndef HAVE_XAW3DXFT - XFillRectangle(XtDisplayOfObject(w), XtWindowOfObject(w),vw->vlist.mark_background_GC,x,y,width,height); - FrameDrawFrame(w,x,y,width,height,ss,vw->vlist.mark_shadow_width, - vw->threeD.top_shadow_GC, - vw->threeD.bot_shadow_GC); -+ #else -+ FrameDrawFrame(w,x,y-1,width,height+2,ss,vw->vlist.mark_shadow_width, -+ vw->threeD.top_shadow_GC, -+ vw->threeD.bot_shadow_GC); -+ #endif - } else { - INFMESSAGE(clearing mark) - XFillRectangle(XtDisplayOfObject(w), XtWindowOfObject(w), - (entry == vw->vlist.highlighted) ? vw->vlist.highlighted_background_GC : vw->vlist.background_GC, -! #ifndef HAVE_XAW3DXFT -! x,y,width,height); -! #else -! x,y-1,width,height+2); -! #endif - } - } - } -*************** -*** 589,600 **** ---- 636,657 ---- - if (y + (vw->vlist.ydelta - vw->vlist.yofs) >= rectangle.y) { - #ifdef HAVE_XAW3D_INTERNATIONAL - if( vw->simple.international == True ) -+ #ifdef HAVE_XAW3DXFT -+ Xaw3dXftDrawString(w, Xaw3dXftDefaultFont, -+ vw->label.label_x, y, s, len); -+ #else - XmbDrawString(XtDisplay(w), XtWindow(w), vw->label.fontset, - vw->label.normal_GC, vw->label.label_x, y, s, len); -+ #endif - else - #endif -+ #ifdef HAVE_XAW3DXFT -+ Xaw3dXftDrawString(w, Xaw3dXftDefaultFont, -+ vw->label.label_x, y, s, len); -+ #else - XDrawString(XtDisplay(w), XtWindow(w), vw->label.normal_GC, - vw->label.label_x, y, s, len); -+ #endif - } - if (nl) - s = nl + 1; -*************** -*** 955,961 **** - int entriesvisible = -1; - - if (vw->vlist.ydelta > 0) { -! entriesvisible = height/vw->vlist.ydelta; - } - #if 0 - printf("fitting %d entries of height %d in %d", ---- 1012,1018 ---- - int entriesvisible = -1; - - if (vw->vlist.ydelta > 0) { -! entriesvisible = height/(vw->vlist.ydelta); - } - #if 0 - printf("fitting %d entries of height %d in %d", -*************** -*** 968,974 **** ---- 1025,1036 ---- - entriesvisible,(int)(vw->vlist.entries), - entriesvisible/(float)(vw->vlist.entries)); - #endif -+ #ifdef HAVE_XAW3DXFT -+ percent = 0.8 * entriesvisible/(float)(vw->vlist.entries); -+ #else - percent = entriesvisible/(float)(vw->vlist.entries); -+ #endif -+ if (percent>1.0) percent = 1.0; - INFMESSAGE(VlistVisibleLength) - IIMESSAGE(entriesvisible,vw->vlist.entries) - FMESSAGE(percent) diff --git a/source/xap/gv/gv.SlackBuild b/source/xap/gv/gv.SlackBuild index 084699627..46f76aa99 100755 --- a/source/xap/gv/gv.SlackBuild +++ b/source/xap/gv/gv.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 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,7 @@ # 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=gv VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} @@ -28,23 +29,30 @@ BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; 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 + NUMJOBS=${NUMJOBS:-" -j7 "} -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} rm -rf $PKG mkdir -p $TMP $PKG -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then @@ -58,8 +66,6 @@ rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 cd ${PKGNAM}-$VERSION || exit 1 -zcat $CWD/gv-xft.patch.gz | patch -p1 --verbose || exit 1 - # Make sure ownerships and permissions are sane: chown -R root:root . find . \ @@ -68,6 +74,12 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +zcat $CWD/gv-resource.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/gv-dat.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/gv-aarch64.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/gv-bounding-box.patch.gz | patch -p2 --verbose || exit 1 +zcat $CWD/gv-bug1071238.patch.gz | patch -p1 --verbose || exit 1 + # Configure: CFLAGS="$SLKCFLAGS $(pkg-config --cflags xaw3d)" \ ./configure \ diff --git a/source/xap/gv/slack-desc b/source/xap/gv/slack-desc index 006267776..a83c246a2 100644 --- a/source/xap/gv/slack-desc +++ b/source/xap/gv/slack-desc @@ -1,14 +1,14 @@ # 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------------------------------------------------------| gv: gv (PS/PDF file viewer) gv: -gv: gv is a PostScript and PDF previewer. It allows users to view and +gv: gv is a PostScript and PDF previewer. It allows users to view and gv: navigate through PostScript and PDF documents on an X display by gv: providing a user interface for the ghostscript interpreter. gv: diff --git a/source/xap/hexchat/hexchat.SlackBuild b/source/xap/hexchat/hexchat.SlackBuild index e6e25afcc..7678a6d70 100755 --- a/source/xap/hexchat/hexchat.SlackBuild +++ b/source/xap/hexchat/hexchat.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2016 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2016, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,11 +20,11 @@ # 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=hexchat VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} - -NUMJOBS=${NUMJOBS:-" -j7 "} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -36,7 +36,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -69,22 +76,29 @@ 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 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir build +cd build +meson setup \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --includedir=/usr/include \ + --datadir=/usr/share \ + --mandir=/usr/man \ --sysconfdir=/etc \ --localstatedir=/var \ - --mandir=/usr/man \ - --enable-textfe \ - --enable-openssl \ - --disable-lua \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --build=$ARCH-slackware-linux || exit 1 - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 + -Dwith-text=true \ + -Dwith-ssl=true \ + -Dwith-lua=false \ + -Dwith-python=python3 \ + .. || exit 1 + ninja || exit 1 + DESTDIR=$PKG ninja install || exit 1 +cd .. find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/source/xap/hexchat/hexchat.url b/source/xap/hexchat/hexchat.url new file mode 100644 index 000000000..2c71b9d5a --- /dev/null +++ b/source/xap/hexchat/hexchat.url @@ -0,0 +1 @@ +https://dl.hexchat.net/hexchat/hexchat-2.12.4-repack.tar.xz diff --git a/source/xap/hexchat/slack-desc b/source/xap/hexchat/slack-desc index eb15d816c..d15c1abc9 100644 --- a/source/xap/hexchat/slack-desc +++ b/source/xap/hexchat/slack-desc @@ -2,7 +2,7 @@ # 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 +# You must make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| @@ -10,7 +10,7 @@ hexchat: hexchat (GTK+ IRC client) hexchat: hexchat: HexChat is an IRC client for Windows and UNIX-like operating systems. hexchat: -hexchat: Website: https://hexchat.github.io/ +hexchat: Website: https://hexchat.github.io/ hexchat: hexchat: hexchat: diff --git a/source/xap/imagemagick/doinst.sh b/source/xap/imagemagick/doinst.sh deleted file mode 100644 index a78c00608..000000000 --- a/source/xap/imagemagick/doinst.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -config() { - NEW="$1" - OLD="`dirname $NEW`/`basename $NEW .new`" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -# Process all .new config files: -for file in etc/ImageMagick*/*.new ; do - config $file -done diff --git a/source/xap/imagemagick/imagemagick.SlackBuild b/source/xap/imagemagick/imagemagick.SlackBuild deleted file mode 100755 index 49797da04..000000000 --- a/source/xap/imagemagick/imagemagick.SlackBuild +++ /dev/null @@ -1,203 +0,0 @@ -#!/bin/sh - -# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2016 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -BUILD=${BUILD:-1} - -# NOTE: This is to cope with ImageMagick version numbers such as 5.4.7-4, -# which occur fairly often (but not always). If these numbers are all the same, -# then this is not one of those versions. - -# This is a bit messy, so we'll explain it well. :-) - -# This is the version number used in the source tarball filename -FILEVER=6.9.4-9 - -# This is the base version number, which is needed to cd into the source tree. -# Normally this is the same as $FILEVER, but allow setting it here if needed. -BASEVER=$FILEVER - -# This is the version number used in the package, where a version number cannot -# contain a '-'. We'll try to autogenerate this one. -PKGVER=$(echo $FILEVER | tr - _) - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i586 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; - esac -fi - -NUMJOBS=${NUMJOBS:-" -j7 "} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-imagemagick -rm -rf $PKG -mkdir -p $TMP $PKG - -# --with-x or not --with-x, that is the question. It seems many other -# distributions don't compile with X support, but it's been traditional -# here. I am moving the prefix to /usr (instead of /usr/X11R6) though, -# because many X-linked things are put into /usr now (like GNOME), and -# I've heard a few reports of compile failures when this isn't in /usr. -# Everyone else does it -- time to follow the path of least resistance. - -cd $TMP -rm -rf ImageMagick-$BASEVER -tar xvf $CWD/ImageMagick-$FILEVER.tar.xz || exit 1 -cd ImageMagick-$BASEVER || exit 1 - -# Harden the default settings in policy.xml to prevent security issues: -zcat $CWD/policy.xml.diff.gz | patch -p1 --verbose || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# --without-modules seems to avoid a segfault when identifying -# or converting ps or eps files... - -# --disable-openmp seems to keep the perl Image::Magick from -# eating up all RAM, and may help other script bindings. - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --sysconfdir=/etc \ - --program-prefix= \ - --with-x \ - --with-frozenpaths=no \ - --without-modules \ - --disable-openmp \ - --enable-static=no \ - --enable-shared \ - --with-gcc-arch=$ARCH \ - --with-perl \ - --with-rsvg \ - --build=$ARCH-slackware-linux || exit 1 - -make $NUMJOBS INSTALLDIRS=vendor || make INSTALLDIRS=vendor || exit 1 -# First, spam the running development system, as ImageMagick is unable to -# properly link the utilities against a new shared library major version -# otherwise which has led to several broken packages over the years: -make install INSTALLDIRS=vendor || exit 1 -/sbin/ldconfig - -# Now build again against the new libraries and headers: -make clean -make $NUMJOBS INSTALLDIRS=vendor || make INSTALLDIRS=vendor || exit 1 -make install INSTALLDIRS=vendor DESTDIR=$PKG || exit 1 - -# This should certainly not be included. -# It stomps on the libtool package. -rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libltdl.* - -# .la files in /usr/lib${LIBDIRSUFFIX}/ should be removed. -# Other .la files should be left alone, as ImageMagick uses them internally -# to locate modules. -rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la - -( cd $PKG - # Nothing but a perl upgrade should replace this (and maybe not even that) - find . -name perllocal.pod | xargs rm -f -) - -# DESTDIR is still broken about this, but works well enough otherwise: -chmod 644 $PKG/usr/share/man/man3/* -mv $PKG/usr/share/man/man3 $PKG/usr/man -rmdir $PKG/usr/share/man - -( cd $PKG/usr/lib${LIBDIRSUFFIX}/perl5 - # Ditch empty dirs: - rmdir */* 2> /dev/null - rmdir * 2> /dev/null -) - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -# Compress and link manpages, if any: -if [ -d $PKG/usr/man ]; then - ( cd $PKG/usr/man - for manpagedir in $(find . -type d -name "man*") ; do - ( cd $manpagedir - for eachpage in $( find . -type l -maxdepth 1 | grep -v '\.gz$') ; do - ln -s $( readlink $eachpage ).gz $eachpage.gz - rm $eachpage - done - gzip -9 *.? - ) - done - ) -fi - -# Move config files to .new: -( cd $PKG/etc/ImageMagick* - for file in * ; do - mv ${file} ${file}.new - done -) - -mkdir -p $PKG/usr -mv $PKG/usr/share/doc $PKG/usr -cp -a \ - AUTHORS LICENSE NEWS NOTICE Platforms.txt QuickStart.txt README.txt \ - $PKG/usr/doc/Imag* - -# If there's a ChangeLog, installing at least part of the recent history -# is useful, but don't let it get totally out of control: -if [ -r ChangeLog ]; then - DOCSDIR=$(echo $PKG/usr/doc/ImageMagick-*) - cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog - touch -r ChangeLog $DOCSDIR/ChangeLog -fi - -mkdir -p $PKG/install -zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/imagemagick-$PKGVER-$ARCH-$BUILD.txz - diff --git a/source/xap/imagemagick/policy.xml.diff b/source/xap/imagemagick/policy.xml.diff deleted file mode 100644 index dc033c1cb..000000000 --- a/source/xap/imagemagick/policy.xml.diff +++ /dev/null @@ -1,33 +0,0 @@ ---- ./config/policy.xml.orig 2016-06-10 07:19:41.000000000 -0500 -+++ ./config/policy.xml 2016-06-17 17:30:47.311584022 -0500 -@@ -49,6 +49,21 @@ - exceeds policy maximum so memory limit is 1GB). - --> - <policymap> -+ <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/> -+ <!-- SECURITY: disable potentially insecure coders: --> -+ <policy domain="coder" rights="none" pattern="EPHEMERAL" /> -+ <policy domain="coder" rights="none" pattern="HTTPS" /> -+ <policy domain="coder" rights="none" pattern="MVG" /> -+ <policy domain="coder" rights="none" pattern="MSL" /> -+ <policy domain="coder" rights="none" pattern="TEXT" /> -+ <policy domain="coder" rights="none" pattern="SHOW" /> -+ <policy domain="coder" rights="none" pattern="WIN" /> -+ <policy domain="coder" rights="none" pattern="PLT" /> -+ <!-- SECURITY: prevent indirect reads: --> -+ <policy domain="path" rights="none" pattern="@*" /> -+ <!-- SECURITY: prevent pipe to shell: --> -+ <policy domain="path" rights="none" pattern="|*" /> -+ <!-- Some examples: --> - <!-- <policy domain="resource" name="temporary-path" value="/tmp"/> --> - <!-- <policy domain="resource" name="memory" value="2GiB"/> --> - <!-- <policy domain="resource" name="map" value="4GiB"/> --> -@@ -61,8 +76,4 @@ - <!-- <policy domain="resource" name="throttle" value="0"/> --> - <!-- <policy domain="resource" name="time" value="3600"/> --> - <!-- <policy domain="system" name="precision" value="6"/> --> -- <!-- <policy domain="coder" rights="none" pattern="MVG" /> --> -- <!-- <policy domain="delegate" rights="none" pattern="HTTPS" /> --> -- <!-- <policy domain="path" rights="none" pattern="@*"/> --> -- <policy domain="cache" name="shared-secret" value="passphrase" stealth="true"/> - </policymap> diff --git a/source/xap/imagemagick/slack-desc b/source/xap/imagemagick/slack-desc deleted file mode 100644 index 80ac9a678..000000000 --- a/source/xap/imagemagick/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# 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 -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -imagemagick: imagemagick (a robust collection of image processing tools) -imagemagick: -imagemagick: ImageMagick is a collection of tools for manipulating and displaying -imagemagick: digital images. It can merge images, transform image dimensions, -imagemagick: do screen captures, create animation sequences, and convert between -imagemagick: many different image formats. -imagemagick: -imagemagick: ImageMagick was written by John Cristy of ImageMagick Studio. -imagemagick: -imagemagick: Home page: http://www.imagemagick.org/ -imagemagick: diff --git a/source/xap/mozilla-firefox/autoconf/autoconf-2.13-consolidated_fixes-1.patch b/source/xap/mozilla-firefox/autoconf/autoconf-2.13-consolidated_fixes-1.patch new file mode 100644 index 000000000..5e7b23113 --- /dev/null +++ b/source/xap/mozilla-firefox/autoconf/autoconf-2.13-consolidated_fixes-1.patch @@ -0,0 +1,504 @@ +Submitted By: Ken Moffat <ken at linuxfromscratch dot org> +Date: 2016-06-11 +Initial Package Version: 2.13 +Upstream Status: Version is historic and unmaintained. +Origin: Found at fedora, plus fixes for LFS. +Description: All of the patches currently used by fedora, except for +the patch which ensures gawk is used in preference to mawk (we do not +install mawk). For LFS: we put mktemp in /usr/bin not /bin, remove +the install-info target because that will overwrite standards.info +with an old version (fedora always use a DESTDIR), and change the +man and info dirs to ${datadir}/ i.e. /usr/share (an empty /usr/info +will otherwise be created). + +diff -Naur a/acgeneral.m4 b/acgeneral.m4 +--- a/acgeneral.m4 1999-01-05 13:27:37.000000000 +0000 ++++ b/acgeneral.m4 2016-06-11 00:18:24.429043947 +0100 +@@ -1817,10 +1817,6 @@ + [cat > conftest.$ac_ext <<EOF + [#]line __oline__ "configure" + #include "confdefs.h" +-ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus +-extern "C" void exit(int); +-#endif +-])dnl + [$1] + EOF + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +@@ -1988,12 +1984,12 @@ + AC_MSG_CHECKING(size of $1) + AC_CACHE_VAL(AC_CV_NAME, + [AC_TRY_RUN([#include <stdio.h> +-main() ++int main() + { + FILE *f=fopen("conftestval", "w"); +- if (!f) exit(1); ++ if (!f) return(1); + fprintf(f, "%d\n", sizeof($1)); +- exit(0); ++ return(0); + }], AC_CV_NAME=`cat conftestval`, AC_CV_NAME=0, ifelse([$2], , , AC_CV_NAME=$2))])dnl + AC_MSG_RESULT($AC_CV_NAME) + AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME) +@@ -2160,20 +2156,38 @@ + dnl AC_OUTPUT_MAKE_DEFS() + define(AC_OUTPUT_MAKE_DEFS, + [# Transform confdefs.h into DEFS. +-dnl Using a here document instead of a string reduces the quoting nightmare. + # Protect against shell expansion while executing Makefile rules. + # Protect against Makefile macro expansion. +-cat > conftest.defs <<\EOF ++# ++# If the first sed substitution is executed (which looks for macros that ++# take arguments), then we branch to the quote section. Otherwise, ++# look for a macro that doesn't take arguments. ++cat >confdef2opt.sed <<\_ACEOF + changequote(<<, >>)dnl +-s%<<#define>> \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g +-s%[ `~<<#>>$^&*(){}\\|;'"<>?]%\\&%g +-s%\[%\\&%g +-s%\]%\\&%g +-s%\$%$$%g ++t clear ++: clear ++s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g ++t quote ++s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g ++t quote ++d ++: quote ++s,[ `~#$^&*(){}\\|;'"<>?],\\&,g ++s,\[,\\&,g ++s,\],\\&,g ++s,\$,$$,g ++p + changequote([, ])dnl +-EOF +-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` +-rm -f conftest.defs ++_ACEOF ++# We use echo to avoid assuming a particular line-breaking character. ++# The extra dot is to prevent the shell from consuming trailing ++# line-breaks from the sub-command output. A line-break within ++# single-quotes doesn't work because, if this script is created in a ++# platform that uses two characters for line-breaks (e.g., DOS), tr ++# would break. ++ac_LF_and_DOT=`echo; echo .` ++DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` ++rm -f confdef2opt.sed + ]) + + dnl Do the variable substitutions to create the Makefiles or whatever. +diff -Naur a/acspecific.m4 b/acspecific.m4 +--- a/acspecific.m4 1999-01-05 13:27:52.000000000 +0000 ++++ b/acspecific.m4 2016-06-11 00:18:17.533078644 +0100 +@@ -152,8 +152,41 @@ + CXXFLAGS= + fi + fi ++ ++AC_PROG_CXX_EXIT_DECLARATION + ]) + ++ ++# AC_PROG_CXX_EXIT_DECLARATION ++# ----------------------------- ++# Find a valid prototype for exit and declare it in confdefs.h. ++AC_DEFUN(AC_PROG_CXX_EXIT_DECLARATION, ++[for ac_declaration in \ ++ ''\ ++ '#include <stdlib.h>' \ ++ 'extern "C" void std::exit (int) throw (); using std::exit;' \ ++ 'extern "C" void std::exit (int); using std::exit;' \ ++ 'extern "C" void exit (int) throw ();' \ ++ 'extern "C" void exit (int);' \ ++ 'void exit (int);' ++do ++ AC_TRY_COMPILE([#include <stdlib.h> ++$ac_declaration], ++ [exit (42);], ++ [], ++ [continue]) ++ AC_TRY_COMPILE([$ac_declaration], ++ [exit (42);], ++ [break]) ++done ++if test -n "$ac_declaration"; then ++ echo '#ifdef __cplusplus' >>confdefs.h ++ echo $ac_declaration >>confdefs.h ++ echo '#endif' >>confdefs.h ++fi ++])# AC_PROG_CXX_EXIT_DECLARATION ++ ++ + dnl Determine a Fortran 77 compiler to use. If `F77' is not already set + dnl in the environment, check for `g77', `f77' and `f2c', in that order. + dnl Set the output variable `F77' to the name of the compiler found. +@@ -1010,7 +1043,7 @@ + ]) + + AC_DEFUN(AC_FUNC_MMAP, +-[AC_CHECK_HEADERS(unistd.h) ++[AC_CHECK_HEADERS(stdlib.h unistd.h sys/stat.h sys/types.h) + AC_CHECK_FUNCS(getpagesize) + AC_CACHE_CHECK(for working mmap, ac_cv_func_mmap_fixed_mapped, + [AC_TRY_RUN([ +@@ -1039,11 +1072,24 @@ + #include <fcntl.h> + #include <sys/mman.h> + ++#if HAVE_SYS_TYPES_H ++# include <sys/types.h> ++#endif ++ ++#if HAVE_STDLIB_H ++# include <stdlib.h> ++#endif ++ ++#if HAVE_SYS_STAT_H ++# include <sys/stat.h> ++#endif ++ ++#if HAVE_UNISTD_H ++# include <unistd.h> ++#endif ++ + /* This mess was copied from the GNU getpagesize.h. */ + #ifndef HAVE_GETPAGESIZE +-# ifdef HAVE_UNISTD_H +-# include <unistd.h> +-# endif + + /* Assume that all systems that can run configure have sys/param.h. */ + # ifndef HAVE_SYS_PARAM_H +@@ -1373,6 +1419,8 @@ + r.ru_majflt = r.ru_minflt = 0; + switch (fork()) { + case 0: /* Child. */ ++ /* Unless we actually _do_ something, the kernel sometimes doesn't chalk up any system time to this process. */ ++ if(fork()) { i = 123; wait(NULL); } else { i = 234; exit(0); } + sleep(1); /* Give up the CPU. */ + _exit(0); + case -1: _exit(0); /* What can we do? */ +diff -Naur a/autoconf.sh b/autoconf.sh +--- a/autoconf.sh 1999-01-05 13:27:53.000000000 +0000 ++++ b/autoconf.sh 2016-06-11 00:22:17.351872133 +0100 +@@ -45,20 +45,20 @@ + esac + + : ${TMPDIR=/tmp} +-tmpout=${TMPDIR}/acout.$$ ++tmpout=`/usr/bin/mktemp ${TMPDIR}/acout.XXXXXX` + localdir= + show_version=no + + while test $# -gt 0 ; do + case "${1}" in + -h | --help | --h* ) +- echo "${usage}" 1>&2; exit 0 ;; ++ echo "${usage}" 1>&2; rm -f $tmpout ; exit 0 ;; + --localdir=* | --l*=* ) + localdir="`echo \"${1}\" | sed -e 's/^[^=]*=//'`" + shift ;; + -l | --localdir | --l*) + shift +- test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } ++ test $# -eq 0 && { echo "${usage}" 1>&2; rm -f $tmpout; exit 1; } + localdir="${1}" + shift ;; + --macrodir=* | --m*=* ) +@@ -66,7 +66,7 @@ + shift ;; + -m | --macrodir | --m* ) + shift +- test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } ++ test $# -eq 0 && { echo "${usage}" 1>&2; rm -f $tmpout; exit 1; } + AC_MACRODIR="${1}" + shift ;; + --version | --v* ) +@@ -76,7 +76,7 @@ + - ) # Use stdin as input. + break ;; + -* ) +- echo "${usage}" 1>&2; exit 1 ;; ++ echo "${usage}" 1>&2; rm -f $tmpout; exit 1 ;; + * ) + break ;; + esac +@@ -86,23 +86,25 @@ + version=`sed -n 's/define.AC_ACVERSION.[ ]*\([0-9.]*\).*/\1/p' \ + $AC_MACRODIR/acgeneral.m4` + echo "Autoconf version $version" ++ rm -f $tmpout + exit 0 + fi + + case $# in + 0) infile=configure.in ;; + 1) infile="$1" ;; +- *) echo "$usage" >&2; exit 1 ;; ++ *) echo "$usage" >&2; rm -f $tmpout; exit 1 ;; + esac + + trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15 + +-tmpin=${TMPDIR}/acin.$$ # Always set this, to avoid bogus errors from some rm's. ++tmpin=`/usr/bin/mktemp ${TMPDIR}/acin.XXXXXX` ++# Always set this, to avoid bogus errors from some rm's. + if test z$infile = z-; then + infile=$tmpin +- cat > $infile + elif test ! -r "$infile"; then + echo "autoconf: ${infile}: No such file or directory" >&2 ++ rm -f $tmpin $tmpout + exit 1 + fi + +@@ -111,6 +113,8 @@ + else + use_localdir= + fi ++# Make sure we don't leave those around - they are annoying ++trap 'rm -f $tmpin $tmpout' 0 + + # Use the frozen version of Autoconf if available. + r= f= +@@ -118,7 +122,7 @@ + case `$M4 --help < /dev/null 2>&1` in + *reload-state*) test -r $AC_MACRODIR/autoconf.m4f && { r=--reload f=f; } ;; + *traditional*) ;; +-*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin; exit 1 ;; ++*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin $tmpout; exit 1 ;; + esac + + $M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout || +@@ -154,6 +158,6 @@ + /__oline__/s/^\([0-9][0-9]*\):\(.*\)__oline__/\2\1/ + ' >&4 + +-rm -f $tmpout ++rm -f $tmpout $tmpin + + exit $status +diff -Naur a/autoconf.texi b/autoconf.texi +--- a/autoconf.texi 1999-01-05 13:28:37.000000000 +0000 ++++ b/autoconf.texi 2016-06-11 00:18:46.360933604 +0100 +@@ -1,7 +1,7 @@ + \input texinfo @c -*-texinfo-*- + @c %**start of header +-@setfilename autoconf.info +-@settitle Autoconf ++@setfilename autoconf.info ++@settitle Autoconf + @c For double-sided printing, uncomment: + @c @setchapternewpage odd + @c %**end of header +@@ -17,7 +17,8 @@ + @ifinfo + @format + START-INFO-DIR-ENTRY +-* Autoconf: (autoconf). Create source code configuration scripts. ++* Autoconf: (autoconf). Create source code configuration scripts. ++ This is a legacy version of autoconf. + END-INFO-DIR-ENTRY + @end format + +diff -Naur a/autoheader.sh b/autoheader.sh +--- a/autoheader.sh 1999-01-05 13:28:39.000000000 +0000 ++++ b/autoheader.sh 2016-06-11 00:22:17.351872133 +0100 +@@ -194,9 +194,9 @@ + # Some fgrep's have limits on the number of lines that can be in the + # pattern on the command line, so use a temporary file containing the + # pattern. +- (fgrep_tmp=${TMPDIR-/tmp}/autoh$$ ++ (fgrep_tmp=`/usr/bin/mktemp ${TMPDIR-/tmp}/autoh$$.XXXXXX` + trap "rm -f $fgrep_tmp; exit 1" 1 2 15 +- cat > $fgrep_tmp <<EOF ++ cat >> $fgrep_tmp <<EOF + $syms + EOF + fgrep -f $fgrep_tmp +diff -Naur a/autoupdate.sh b/autoupdate.sh +--- a/autoupdate.sh 1999-01-05 13:28:42.000000000 +0000 ++++ b/autoupdate.sh 2016-06-11 00:23:19.151561252 +0100 +@@ -26,7 +26,7 @@ + Usage: autoupdate [-h] [--help] [-m dir] [--macrodir=dir] + [--version] [template-file]" + +-sedtmp=/tmp/acups.$$ ++sedtmp=`/usr/bin/mktemp /tmp/acups.XXXXXX` + # For debugging. + #sedtmp=/tmp/acups + show_version=no +@@ -35,13 +35,13 @@ + while test $# -gt 0 ; do + case "${1}" in + -h | --help | --h* ) +- echo "${usage}" 1>&2; exit 0 ;; ++ echo "${usage}" 1>&2; rm -f $sedtmp; exit 0 ;; + --macrodir=* | --m*=* ) + AC_MACRODIR="`echo \"${1}\" | sed -e 's/^[^=]*=//'`" + shift ;; + -m | --macrodir | --m* ) + shift +- test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } ++ test $# -eq 0 && { echo "${usage}" 1>&2; rm -f $sedtmp; exit 1; } + AC_MACRODIR="${1}" + shift ;; + --version | --versio | --versi | --vers) +@@ -51,7 +51,7 @@ + - ) # Use stdin as input. + break ;; + -* ) +- echo "${usage}" 1>&2; exit 1 ;; ++ echo "${usage}" 1>&2; rm -f $sedtmp; exit 1 ;; + * ) + break ;; + esac +@@ -61,6 +61,7 @@ + version=`sed -n 's/define.AC_ACVERSION.[ ]*\([0-9.]*\).*/\1/p' \ + $AC_MACRODIR/acgeneral.m4` + echo "Autoconf version $version" ++ rm -f $sedtmp + exit 0 + fi + +@@ -68,6 +69,7 @@ + + tmpout=acupo.$$ + trap 'rm -f $sedtmp $tmpout; exit 1' 1 2 15 ++trap 'rm -f $sedtmp' 0 + case $# in + 0) infile=configure.in; out="> $tmpout" + # Make sure $infile can be read, and $tmpout has the same permissions. +diff -Naur a/configure b/configure +--- a/configure 1999-01-05 13:28:57.000000000 +0000 ++++ b/configure 2016-06-11 00:50:57.771231914 +0100 +@@ -43,8 +43,8 @@ + libdir='${exec_prefix}/lib' + includedir='${prefix}/include' + oldincludedir='/usr/include' +-infodir='${prefix}/info' +-mandir='${prefix}/man' ++infodir='${datadir}/info' ++mandir='${datadir}/man' + + # Initialize some other variables. + subdirs= +diff -Naur a/Makefile.in b/Makefile.in +--- a/Makefile.in 1999-01-05 13:27:16.000000000 +0000 ++++ b/Makefile.in 2016-06-11 00:29:34.005678107 +0100 +@@ -49,7 +49,7 @@ + + # Directory in which to install library files. + datadir = @datadir@ +-acdatadir = $(datadir)/autoconf ++acdatadir = $(datadir)/autoconf-2.13 + + # Directory in which to install documentation info files. + infodir = @infodir@ +@@ -68,8 +68,8 @@ + DISTFILES = AUTHORS COPYING ChangeLog ChangeLog.1 INSTALL \ + Makefile.in NEWS README TODO $(M4FILES) \ + acconfig.h acfunctions acheaders acidentifiers \ +- acmakevars acprograms autoconf.info* \ +- autoconf.sh autoconf.texi install.texi \ ++ acmakevars acprograms autoconf.info* \ ++ autoconf.sh autoconf.texi install.texi \ + autoheader.sh autoscan.pl autoreconf.sh autoupdate.sh ifnames.sh \ + config.guess config.sub configure configure.in \ + install-sh mkinstalldirs texinfo.tex \ +@@ -106,11 +106,11 @@ + autoconf.m4f: autoconf.m4 acgeneral.m4 acspecific.m4 acoldnames.m4 + autoheader.m4f: autoheader.m4 acgeneral.m4 acspecific.m4 acoldnames.m4 + +-info: autoconf.info @standards_info@ INSTALL ++info: autoconf.info @standards_info@ INSTALL + + # Use --no-split to avoid creating filenames > 14 chars. +-autoconf.info: autoconf.texi install.texi +- $(MAKEINFO) -I$(srcdir) $(srcdir)/autoconf.texi --no-split --output=$@ ++autoconf.info: autoconf.texi install.texi ++ $(MAKEINFO) -I$(srcdir) $(srcdir)/autoconf.texi --no-split --output=$@ + + INSTALL: install.texi + $(MAKEINFO) -I$(srcdir) $(srcdir)/install.texi --output=$@ \ +@@ -121,8 +121,8 @@ + + dvi: autoconf.dvi @standards_dvi@ + +-autoconf.dvi: autoconf.texi +- $(TEXI2DVI) $(srcdir)/autoconf.texi ++autoconf.dvi: autoconf.texi ++ $(TEXI2DVI) $(srcdir)/autoconf.texi + + standards.dvi: standards.texi make-stds.texi + $(TEXI2DVI) $(srcdir)/standards.texi +@@ -137,35 +137,35 @@ + cd testsuite && ${MAKE} AUTOCONF=${bindir}/autoconf $@ + + installdirs: +- $(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir) $(acdatadir) ++ $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)/$(bindir) $(DESTDIR)/$(infodir) $(DESTDIR)/$(acdatadir) + +-install: all $(M4FILES) acconfig.h installdirs install-info ++install: all $(M4FILES) acconfig.h installdirs + for p in $(ASCRIPTS); do \ +- $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ ++ $(INSTALL_PROGRAM) $$p $(DESTDIR)/$(bindir)/`echo $$p|sed '$(transform)'`; \ + done + for i in $(M4FROZEN); do \ +- $(INSTALL_DATA) $$i $(acdatadir)/$$i; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)/$(acdatadir)/$$i; \ + done + for i in $(M4FILES) acconfig.h; do \ +- $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \ ++ $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/$(acdatadir)/$$i; \ + done + -if test -f autoscan; then \ +- $(INSTALL_PROGRAM) autoscan $(bindir)/`echo autoscan|sed '$(transform)'`; \ ++ $(INSTALL_PROGRAM) autoscan $(DESTDIR)/$(bindir)/`echo autoscan|sed '$(transform)'`; \ + for i in acfunctions acheaders acidentifiers acprograms \ + acmakevars; do \ +- $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \ ++ $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/$(acdatadir)/$$i; \ + done; \ + else :; fi + + # Don't cd, to avoid breaking install-sh references. + install-info: info installdirs +- if test -f autoconf.info; then \ ++ if test -f autoconf.info; then \ + for i in *.info*; do \ +- $(INSTALL_DATA) $$i $(infodir)/$$i; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)/$(infodir)/$$i; \ + done; \ + else \ + for i in $(srcdir)/*.info*; do \ +- $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)/$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \ + done; \ + fi + +@@ -174,7 +174,7 @@ + rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \ + done + rm -fr $(acdatadir) +- cd $(infodir) && rm -f autoconf.info* ++ cd $(infodir) && rm -f autoconf.info* + if test -f standards.info || test -f $(srcdir)/standards.info; \ + then cd $(infodir) && rm -f standards.info*; fi + +diff -Naur a/testsuite/autoconf.s/syntax.exp b/testsuite/autoconf.s/syntax.exp +--- a/testsuite/autoconf.s/syntax.exp 1999-01-05 13:29:54.000000000 +0000 ++++ b/testsuite/autoconf.s/syntax.exp 2016-06-11 00:18:51.996905247 +0100 +@@ -2,7 +2,7 @@ + + send_user "Checking for syntax errors in the specific tests...\n" + set script {s/^AC_DEFUN(\([^,]*\).*/\1/p} +-set macros [exec sed -n $script $srcdir/../acspecific.m4] ++set macros [exec sed -n $script $srcdir/../acspecific.m4 | grep -v -e AC_FUNC_GETLOADAVG -e F77] + + foreach mac $macros { + send_user "$mac\n" diff --git a/source/xap/mozilla-firefox/autoconf/autoconf.build b/source/xap/mozilla-firefox/autoconf/autoconf.build new file mode 100755 index 000000000..7dae1bad1 --- /dev/null +++ b/source/xap/mozilla-firefox/autoconf/autoconf.build @@ -0,0 +1,81 @@ +#!/bin/sh + +# Copyright 2005-2016 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +PKGNAM=autoconf +VERSION=2.13 +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:-" -j7 "} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-autoconf + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf autoconf-$VERSION +tar xvf $CWD/autoconf-$VERSION.tar.xz || exit 1 +cd autoconf-$VERSION + +zcat $CWD/autoconf-2.13-consolidated_fixes-1.patch.gz | patch -p1 --verbose || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Build a temporary copy of autoconf-2.13 only to be used to compile +# Firefox, since it somewhat inexplicably requires this ancient version: + +rm -rf $TMP/autoconf-tmp +mkdir -p $TMP/autoconf-tmp +# This will be at the beginning of the $PATH, so protect against nonsense +# happening in /tmp: +chmod 700 $TMP/autoconf-tmp +rm -rf $TMP/autoconf-tmp/* +mkdir -p $TMP/autoconf-tmp/usr + +./configure \ + --prefix=$TMP/autoconf-tmp/usr \ + --program-suffix=-2.13 \ + --infodir=$TMP/autoconf-tmp/usr/info \ + --mandir=$TMP/autoconf-tmp/usr/man \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make install || exit 1 + diff --git a/source/xap/mozilla-firefox/fetch-and-repack.sh b/source/xap/mozilla-firefox/fetch-and-repack.sh new file mode 100755 index 000000000..f52f45de7 --- /dev/null +++ b/source/xap/mozilla-firefox/fetch-and-repack.sh @@ -0,0 +1,27 @@ +# This script uses the SOURCE file downloaded from: +# archive.mozilla.org:/pub/firefox/releases/{VERSION} + +CWD=$(pwd) + +if [ ! -r SOURCE ]; then + echo "Error: no SOURCE file present." + echo " download one from archive.mozilla.org:/pub/firefox/releases/{VERSION} and run this script again." + exit 1 +fi + +REPO_URL=$(grep tar.bz2 SOURCE | rev | cut -f 1 -d ' ' | rev) +REPO_TARBALL=$(basename ${REPO_URL}) +rm -f ${REPO_TARBALL} +rm -f firefox-*.source.tar.lz +lftpget ${REPO_URL} || exit 1 +TMPDIR=$(mktemp -d) +cd ${TMPDIR} +tar xf ${CWD}/${REPO_TARBALL} +FF_VER=$(cat mozilla-release-*/browser/config/version.txt) +mv mozilla-release-* firefox-${FF_VER} +tar cf firefox-${FF_VER}.source.tar firefox-${FF_VER} +plzip -9 -n 6 firefox-${FF_VER}.source.tar +cd ${CWD} +mv ${TMPDIR}/firefox-${FF_VER}.source.tar.lz . +rm -f ${REPO_TARBALL} +rm -rf ${TMPDIR} diff --git a/source/xap/mozilla-firefox/ff.ui.scrollToClick.diff b/source/xap/mozilla-firefox/ff.ui.scrollToClick.diff new file mode 100644 index 000000000..6bb7ea67a --- /dev/null +++ b/source/xap/mozilla-firefox/ff.ui.scrollToClick.diff @@ -0,0 +1,12 @@ +--- ./modules/libpref/init/all.js.orig 2017-04-10 21:13:21.000000000 -0500 ++++ ./modules/libpref/init/all.js 2017-05-21 15:29:42.803757223 -0500 +@@ -235,6 +235,9 @@ + // If true, all popups won't hide automatically on blur + pref("ui.popup.disable_autohide", false); + ++// Default to GTK+ v2 type scrolling: ++pref("ui.scrollToClick", 0); ++ + pref("browser.display.use_document_fonts", 1); // 0 = never, 1 = quick, 2 = always + // 0 = default: always, except in high contrast mode + // 1 = always diff --git a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild index a09c1bb7f..ce18567fe 100755 --- a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild +++ b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,10 @@ # Thanks to the folks at the Mozilla Foundation for permission to # distribute this, and for all the great work! :-) -VERSION=$(basename $(ls firefox-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source) +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=mozilla-firefox +VERSION=$(basename $(ls firefox-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source) RELEASEVER=$(echo $VERSION | cut -f 1 -d r | cut -f 1 -d b | cut -f 1 -d e) BUILD=${BUILD:-1} @@ -35,16 +38,62 @@ BUILD=${BUILD:-1} # MOZLOCALIZE=${MOZLOCALIZE:-} +# Without LANG=C, building the Python environment may fail with: +# "UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 36: ordinal not in range(128)" +LANG=C + # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i586 ;; + i?86) export ARCH=i686 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; 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 + if [ -z $MOZLOCALIZE ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + else + echo "$PKGNAM-$VERSION-$ARCH-${BUILD}_$MOZLOCALIZE.txz" + fi + exit 0 +fi + +# Firefox has been requiring more and more memory, especially while linking +# libxul. If it fails to build natively on x86 32-bit, it can be useful to +# attempt the build using an x86_64 kernel and a 32-bit userspace. Detect this +# situation and set the ARCH to i686. Later in the script we'll add some +# options to the .mozconfig so that the compile will do the riight thing. +if [ "$(uname -m)" = "x86_64" -a "$(file -L /usr/bin/gcc | grep 80386 | grep 32-bit)" != "" ]; then + COMPILE_X86_UNDER_X86_64=true + ARCH=i686 + # Also use the gold linker for this: + PATH="$(pwd)/gold:$PATH" + export CC=${CC:-"gcc -B$(pwd)/gold"} + export CXX=${CXX:-"g++ -B$(pwd)/gold"} +elif [ "$ARCH" = "i686" ]; then + # This might also help with the linker memory situation on some $ARCH. Feel free + # to match any other $ARCH that could benefit from this. + SLKLDFLAGS=" -Wl,--as-needed -Wl,--reduce-memory-overheads -Wl,--no-keep-memory -Wl,--stats" + export LDFLAGS="$SLKLDFLAGS" + export MOZ_LINK_FLAGS="$SLKLDFLAGS" +else + # Link using gold. This also helps prevent running out of memory on 32-bit + # systems, and avoids a recurring build failure with GNU ld on other systems. + PATH="$(pwd)/gold:$PATH" + export CC=${CC:-"gcc -B$(pwd)/gold"} + export CXX=${CXX:-"g++ -B$(pwd)/gold"} +fi + +# Put Rust objects on a diet to keep the linker from running into memory +# issues (especially on 32-bit): +export RUSTFLAGS="-Cdebuginfo=0" + # Use PGO? Doubles the time and drive space requirements for the build, # but should provide a performance increase. How much depends on which # benchmarks you believe, but I've typically seen around 2.5%. I've also @@ -75,49 +124,47 @@ PGO=${PGO:-no} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="" LIBDIRSUFFIX="" - OPTIMIZE=" --enable-optimize=-O2 " - # On IA32, use gold since GNU ld runs out of memory linking libxul.so: - PATH="$(pwd)/gold:$PATH" - export CC="gcc -B$(pwd)/gold" - export CXX="g++ -B$(pwd)/gold" + OPTIMIZE=${OPTIMIZE:-"-O1"} +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="" + LIBDIRSUFFIX="" + OPTIMIZE=${OPTIMIZE:-"-O1"} elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" + SLKCFLAGS="" LIBDIRSUFFIX="" - OPTIMIZE=" --enable-optimize=-O2 " + OPTIMIZE=${OPTIMIZE:-"-O1"} elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-fPIC" LIBDIRSUFFIX="64" - OPTIMIZE=" --enable-optimize=-O2 " + OPTIMIZE=${OPTIMIZE:-"-O1"} elif [ "$ARCH" = "arm" ]; then - SLKCFLAGS="-O2 -march=armv4 -mtune=xscale" + SLKCFLAGS="-march=armv4 -mtune=xscale" LIBDIRSUFFIX="" - OPTIMIZE=" --enable-optimize=-O2 " + OPTIMIZE=${OPTIMIZE:-"-O1"} elif [ "$ARCH" = "armel" ]; then - SLKCFLAGS="-O2 -march=armv4t" + SLKCFLAGS="-march=armv4t" LIBDIRSUFFIX="" - OPTIMIZE=" --enable-optimize=-O2 " + OPTIMIZE=${OPTIMIZE:-"-O1"} else - SLKCFLAGS="-O2" + SLKCFLAGS="" LIBDIRSUFFIX="" - OPTIMIZE=" --enable-optimize=-O2 " -fi - -# Workaround to prevent unidentified crashes. Since this seems to be -# fixed in recent betas, only use the fix for known crashing versions: -if [ $VERSION = 43.0 \ - -o $VERSION = 43.0.1 \ - -o $VERSION = 43.0.2 \ - -o $VERSION = 43.0.3 \ - -o $VERSION = 43.0.4 ]; then - OPTIMIZE="$(echo "$OPTIMIZE" | sed 's/O2/Os/g')" - echo "Detected Firefox $VERSION... enabling crash workaround O2 -> Os." - sleep 1 + OPTIMIZE=${OPTIMIZE:-"-O1"} fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-mozilla-firefox +# If there is a private Google API key available at compile time, use +# it to enable support for Google Safe Browsing. For Slackware builds, +# we use a private key issued for the Slackware project. If you are +# rebuilding and need this support, or you are producing your own +# distribution, you may obtain your own Google API key at no charge by +# following these instructions: +# https://bugzilla.mozilla.org/show_bug.cgi?id=1377987#c0 +if [ -r /root/google-api-key ]; then + GOOGLE_API_KEY="--with-google-api-keyfile=/root/google-api-key" +fi + # If not specified, figure out if this is a beta or a release MOZVERS=${MOZVERS:-release} if echo $VERSION | grep -q b ; then MOZVERS=beta ; fi @@ -127,25 +174,35 @@ NUMJOBS=${NUMJOBS:-" -j7 "} rm -rf $PKG mkdir -p $TMP $PKG/usr/lib${LIBDIRSUFFIX} +# We need to use the incredibly ancient autoconf-2.13 for this :/ +( cd $CWD/autoconf ; ./autoconf.build ) +PATH=$TMP/autoconf-tmp/usr/bin:$PATH + cd $TMP rm -rf firefox-$VERSION # Unpack this in a subdirectory to prevent changing permissions on /tmp: rm -rf firefox-unpack mkdir firefox-unpack cd firefox-unpack -tar xvf $CWD/firefox-$VERSION.source.tar.?z* || exit 1 +tar xvf $CWD/firefox-$VERSION.source.tar.?z || exit 1 mv * .. cd .. rm -rf firefox-unpack cd firefox-$VERSION || exit 1 -# Fetch localization, if requested: +# Prevent failures building gkrust by suppressing useless warnings: +sed -i.allow-warnings -e '/#!\[deny(warnings)\]/a #![allow(unused_imports)]' \ + servo/components/style/lib.rs + +# Retain GTK+ v2 scrolling behavior: +zcat $CWD/ff.ui.scrollToClick.diff.gz | patch -p1 --verbose || exit 1 + +# Fetch localization, if requested +# https://bugzilla.mozilla.org/show_bug.cgi?id=1256955 if [ ! -z $MOZLOCALIZE ]; then - LOC_TAG="FIREFOX_$( echo $VERSION | tr \. _ )_RELEASE" - rm -f $LOC_TAG.tar.bz2 - wget https://hg.mozilla.org/releases/l10n/mozilla-$MOZVERS/$MOZLOCALIZE/archive/$LOC_TAG.tar.bz2 - tar xvf $LOC_TAG.tar.bz2 - mv $MOZLOCALIZE-$LOC_TAG $MOZLOCALIZE + LOC_URL="http://ftp.mozilla.org/pub/firefox/candidates/$VERSION-candidates/build1/l10n_changesets.txt" + LOC_COMMIT=$(wget -q -O - $LOC_URL | grep ^$MOZLOCALIZE | cut -d\ -f2) + hg clone https://hg.mozilla.org/l10n-central/$MOZLOCALIZE -r $LOC_COMMIT fi # Patch mimeTypes.rdf @@ -165,28 +222,17 @@ OPTIONS="\ --enable-official-branding \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --with-default-mozilla-five-home=/usr/lib${LIBDIRSUFFIX}/firefox-$RELEASEVER \ --with-system-zlib \ + --enable-alsa \ --enable-application=browser \ - --enable-default-toolkit=cairo-gtk2 \ + --enable-default-toolkit=cairo-gtk3 \ --enable-startup-notification \ - --enable-crypto \ - --enable-gstreamer=1.0 \ - --enable-svg \ - --enable-canvas \ - --enable-logging \ - --enable-xft \ - --enable-webm \ - $OPTIMIZE \ - --enable-reorder \ + $GOOGLE_API_KEY \ --enable-strip \ --enable-cpp-rtti \ - --disable-gnomevfs \ - --disable-accessibility \ + --enable-accessibility \ --disable-crashreporter \ - --disable-debug \ - --disable-pedantic \ - --disable-installer" + --disable-debug" # Complains about missing APNG support in Slackware's libpng: # --with-system-png \ # This option breaks mozilla-12.0: @@ -231,7 +277,20 @@ if [ "$MOZLOCALIZE" ]; then echo "mk_add_options MOZ_CO_LOCALES=\"$MOZLOCALIZE\"" >> .mozconfig fi -# Write in it the options above +# Tell .mozconfig about the selected compiler: +echo "export CC=\"${CC}\"" >> .mozconfig +echo "export CXX=\"${CXX}\"" >> .mozconfig + +# Set options for $OPTIMIZE: +echo "ac_add_options --enable-optimize=\"${OPTIMIZE}\"" >> .mozconfig + +if [ "$COMPILE_X86_UNDER_X86_64" = "true" ]; then + # Compile for i686 under an x86_64 kernel: + echo "ac_add_options --host=i686-pc-linux-gnu" >> .mozconfig + echo "ac_add_options --target=i686-pc-linux-gnu" >> .mozconfig +fi + +# Add the $OPTIONS above to .mozconfig: for option in $OPTIONS; do echo "ac_add_options $option" >> .mozconfig; done # https://developer.mozilla.org/en-US/docs/Building_with_Profile-Guided_Optimization @@ -244,15 +303,16 @@ if [ "$PGO" = "yes" ]; then # Launch Xvfb to let the profile scripts run in a X session. # Ugly note: if the build breaks you may want to do a "killall Xvfb". Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & - dbus-launch --exit-with-session make -f client.mk build || exit 1 + dbus-launch --exit-with-session ./mach build || exit 1 kill $! || true else # Do a normal build echo "ac_add_options --disable-tests" >> .mozconfig - make -f client.mk build || exit 1 + ./mach build || exit 1 fi -make -f client.mk install DESTDIR=$PKG || exit 1 +./mach buildsymbols || exit 1 +DESTDIR=$PKG ./mach install || exit 1 # We don't need these (just symlinks anyway): rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/firefox-devel-$RELEASEVER diff --git a/source/xap/mozilla-firefox/mozilla-firefox.desktop b/source/xap/mozilla-firefox/mozilla-firefox.desktop index e099dcade..9c7478b05 100644 --- a/source/xap/mozilla-firefox/mozilla-firefox.desktop +++ b/source/xap/mozilla-firefox/mozilla-firefox.desktop @@ -2,7 +2,7 @@ Exec=firefox %u Icon=firefox Type=Application -Categories=Network; +Categories=Network;WebBrowser; Name=Firefox Name[bn]=ফায়ারফকà§à¦¸ Name[eo]=Mozilo Fajrovulpo diff --git a/source/xap/mozilla-firefox/slack-desc b/source/xap/mozilla-firefox/slack-desc index a54bac8f0..d38dc91d1 100644 --- a/source/xap/mozilla-firefox/slack-desc +++ b/source/xap/mozilla-firefox/slack-desc @@ -1,19 +1,19 @@ # 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 customary to +# 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------------------------------------------------------| mozilla-firefox: mozilla-firefox (Mozilla Firefox Web browser) mozilla-firefox: mozilla-firefox: This project is a redesign of the Mozilla browser component written -mozilla-firefox: using the XUL user interface language. Firefox empowers you to +mozilla-firefox: using the XUL user interface language. Firefox empowers you to mozilla-firefox: browse faster, more safely and more efficiently than with any other mozilla-firefox: browser. mozilla-firefox: -mozilla-firefox: Visit the Mozilla Firefox project online: -mozilla-firefox: http://www.mozilla.org/projects/firefox/ +mozilla-firefox: Homepage: http://www.mozilla.org/projects/firefox/ +mozilla-firefox: mozilla-firefox: mozilla-firefox: diff --git a/source/xap/mozilla-thunderbird/autoconf/autoconf-2.13-consolidated_fixes-1.patch b/source/xap/mozilla-thunderbird/autoconf/autoconf-2.13-consolidated_fixes-1.patch new file mode 100644 index 000000000..5e7b23113 --- /dev/null +++ b/source/xap/mozilla-thunderbird/autoconf/autoconf-2.13-consolidated_fixes-1.patch @@ -0,0 +1,504 @@ +Submitted By: Ken Moffat <ken at linuxfromscratch dot org> +Date: 2016-06-11 +Initial Package Version: 2.13 +Upstream Status: Version is historic and unmaintained. +Origin: Found at fedora, plus fixes for LFS. +Description: All of the patches currently used by fedora, except for +the patch which ensures gawk is used in preference to mawk (we do not +install mawk). For LFS: we put mktemp in /usr/bin not /bin, remove +the install-info target because that will overwrite standards.info +with an old version (fedora always use a DESTDIR), and change the +man and info dirs to ${datadir}/ i.e. /usr/share (an empty /usr/info +will otherwise be created). + +diff -Naur a/acgeneral.m4 b/acgeneral.m4 +--- a/acgeneral.m4 1999-01-05 13:27:37.000000000 +0000 ++++ b/acgeneral.m4 2016-06-11 00:18:24.429043947 +0100 +@@ -1817,10 +1817,6 @@ + [cat > conftest.$ac_ext <<EOF + [#]line __oline__ "configure" + #include "confdefs.h" +-ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus +-extern "C" void exit(int); +-#endif +-])dnl + [$1] + EOF + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +@@ -1988,12 +1984,12 @@ + AC_MSG_CHECKING(size of $1) + AC_CACHE_VAL(AC_CV_NAME, + [AC_TRY_RUN([#include <stdio.h> +-main() ++int main() + { + FILE *f=fopen("conftestval", "w"); +- if (!f) exit(1); ++ if (!f) return(1); + fprintf(f, "%d\n", sizeof($1)); +- exit(0); ++ return(0); + }], AC_CV_NAME=`cat conftestval`, AC_CV_NAME=0, ifelse([$2], , , AC_CV_NAME=$2))])dnl + AC_MSG_RESULT($AC_CV_NAME) + AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME) +@@ -2160,20 +2156,38 @@ + dnl AC_OUTPUT_MAKE_DEFS() + define(AC_OUTPUT_MAKE_DEFS, + [# Transform confdefs.h into DEFS. +-dnl Using a here document instead of a string reduces the quoting nightmare. + # Protect against shell expansion while executing Makefile rules. + # Protect against Makefile macro expansion. +-cat > conftest.defs <<\EOF ++# ++# If the first sed substitution is executed (which looks for macros that ++# take arguments), then we branch to the quote section. Otherwise, ++# look for a macro that doesn't take arguments. ++cat >confdef2opt.sed <<\_ACEOF + changequote(<<, >>)dnl +-s%<<#define>> \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g +-s%[ `~<<#>>$^&*(){}\\|;'"<>?]%\\&%g +-s%\[%\\&%g +-s%\]%\\&%g +-s%\$%$$%g ++t clear ++: clear ++s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g ++t quote ++s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g ++t quote ++d ++: quote ++s,[ `~#$^&*(){}\\|;'"<>?],\\&,g ++s,\[,\\&,g ++s,\],\\&,g ++s,\$,$$,g ++p + changequote([, ])dnl +-EOF +-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` +-rm -f conftest.defs ++_ACEOF ++# We use echo to avoid assuming a particular line-breaking character. ++# The extra dot is to prevent the shell from consuming trailing ++# line-breaks from the sub-command output. A line-break within ++# single-quotes doesn't work because, if this script is created in a ++# platform that uses two characters for line-breaks (e.g., DOS), tr ++# would break. ++ac_LF_and_DOT=`echo; echo .` ++DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` ++rm -f confdef2opt.sed + ]) + + dnl Do the variable substitutions to create the Makefiles or whatever. +diff -Naur a/acspecific.m4 b/acspecific.m4 +--- a/acspecific.m4 1999-01-05 13:27:52.000000000 +0000 ++++ b/acspecific.m4 2016-06-11 00:18:17.533078644 +0100 +@@ -152,8 +152,41 @@ + CXXFLAGS= + fi + fi ++ ++AC_PROG_CXX_EXIT_DECLARATION + ]) + ++ ++# AC_PROG_CXX_EXIT_DECLARATION ++# ----------------------------- ++# Find a valid prototype for exit and declare it in confdefs.h. ++AC_DEFUN(AC_PROG_CXX_EXIT_DECLARATION, ++[for ac_declaration in \ ++ ''\ ++ '#include <stdlib.h>' \ ++ 'extern "C" void std::exit (int) throw (); using std::exit;' \ ++ 'extern "C" void std::exit (int); using std::exit;' \ ++ 'extern "C" void exit (int) throw ();' \ ++ 'extern "C" void exit (int);' \ ++ 'void exit (int);' ++do ++ AC_TRY_COMPILE([#include <stdlib.h> ++$ac_declaration], ++ [exit (42);], ++ [], ++ [continue]) ++ AC_TRY_COMPILE([$ac_declaration], ++ [exit (42);], ++ [break]) ++done ++if test -n "$ac_declaration"; then ++ echo '#ifdef __cplusplus' >>confdefs.h ++ echo $ac_declaration >>confdefs.h ++ echo '#endif' >>confdefs.h ++fi ++])# AC_PROG_CXX_EXIT_DECLARATION ++ ++ + dnl Determine a Fortran 77 compiler to use. If `F77' is not already set + dnl in the environment, check for `g77', `f77' and `f2c', in that order. + dnl Set the output variable `F77' to the name of the compiler found. +@@ -1010,7 +1043,7 @@ + ]) + + AC_DEFUN(AC_FUNC_MMAP, +-[AC_CHECK_HEADERS(unistd.h) ++[AC_CHECK_HEADERS(stdlib.h unistd.h sys/stat.h sys/types.h) + AC_CHECK_FUNCS(getpagesize) + AC_CACHE_CHECK(for working mmap, ac_cv_func_mmap_fixed_mapped, + [AC_TRY_RUN([ +@@ -1039,11 +1072,24 @@ + #include <fcntl.h> + #include <sys/mman.h> + ++#if HAVE_SYS_TYPES_H ++# include <sys/types.h> ++#endif ++ ++#if HAVE_STDLIB_H ++# include <stdlib.h> ++#endif ++ ++#if HAVE_SYS_STAT_H ++# include <sys/stat.h> ++#endif ++ ++#if HAVE_UNISTD_H ++# include <unistd.h> ++#endif ++ + /* This mess was copied from the GNU getpagesize.h. */ + #ifndef HAVE_GETPAGESIZE +-# ifdef HAVE_UNISTD_H +-# include <unistd.h> +-# endif + + /* Assume that all systems that can run configure have sys/param.h. */ + # ifndef HAVE_SYS_PARAM_H +@@ -1373,6 +1419,8 @@ + r.ru_majflt = r.ru_minflt = 0; + switch (fork()) { + case 0: /* Child. */ ++ /* Unless we actually _do_ something, the kernel sometimes doesn't chalk up any system time to this process. */ ++ if(fork()) { i = 123; wait(NULL); } else { i = 234; exit(0); } + sleep(1); /* Give up the CPU. */ + _exit(0); + case -1: _exit(0); /* What can we do? */ +diff -Naur a/autoconf.sh b/autoconf.sh +--- a/autoconf.sh 1999-01-05 13:27:53.000000000 +0000 ++++ b/autoconf.sh 2016-06-11 00:22:17.351872133 +0100 +@@ -45,20 +45,20 @@ + esac + + : ${TMPDIR=/tmp} +-tmpout=${TMPDIR}/acout.$$ ++tmpout=`/usr/bin/mktemp ${TMPDIR}/acout.XXXXXX` + localdir= + show_version=no + + while test $# -gt 0 ; do + case "${1}" in + -h | --help | --h* ) +- echo "${usage}" 1>&2; exit 0 ;; ++ echo "${usage}" 1>&2; rm -f $tmpout ; exit 0 ;; + --localdir=* | --l*=* ) + localdir="`echo \"${1}\" | sed -e 's/^[^=]*=//'`" + shift ;; + -l | --localdir | --l*) + shift +- test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } ++ test $# -eq 0 && { echo "${usage}" 1>&2; rm -f $tmpout; exit 1; } + localdir="${1}" + shift ;; + --macrodir=* | --m*=* ) +@@ -66,7 +66,7 @@ + shift ;; + -m | --macrodir | --m* ) + shift +- test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } ++ test $# -eq 0 && { echo "${usage}" 1>&2; rm -f $tmpout; exit 1; } + AC_MACRODIR="${1}" + shift ;; + --version | --v* ) +@@ -76,7 +76,7 @@ + - ) # Use stdin as input. + break ;; + -* ) +- echo "${usage}" 1>&2; exit 1 ;; ++ echo "${usage}" 1>&2; rm -f $tmpout; exit 1 ;; + * ) + break ;; + esac +@@ -86,23 +86,25 @@ + version=`sed -n 's/define.AC_ACVERSION.[ ]*\([0-9.]*\).*/\1/p' \ + $AC_MACRODIR/acgeneral.m4` + echo "Autoconf version $version" ++ rm -f $tmpout + exit 0 + fi + + case $# in + 0) infile=configure.in ;; + 1) infile="$1" ;; +- *) echo "$usage" >&2; exit 1 ;; ++ *) echo "$usage" >&2; rm -f $tmpout; exit 1 ;; + esac + + trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15 + +-tmpin=${TMPDIR}/acin.$$ # Always set this, to avoid bogus errors from some rm's. ++tmpin=`/usr/bin/mktemp ${TMPDIR}/acin.XXXXXX` ++# Always set this, to avoid bogus errors from some rm's. + if test z$infile = z-; then + infile=$tmpin +- cat > $infile + elif test ! -r "$infile"; then + echo "autoconf: ${infile}: No such file or directory" >&2 ++ rm -f $tmpin $tmpout + exit 1 + fi + +@@ -111,6 +113,8 @@ + else + use_localdir= + fi ++# Make sure we don't leave those around - they are annoying ++trap 'rm -f $tmpin $tmpout' 0 + + # Use the frozen version of Autoconf if available. + r= f= +@@ -118,7 +122,7 @@ + case `$M4 --help < /dev/null 2>&1` in + *reload-state*) test -r $AC_MACRODIR/autoconf.m4f && { r=--reload f=f; } ;; + *traditional*) ;; +-*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin; exit 1 ;; ++*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin $tmpout; exit 1 ;; + esac + + $M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout || +@@ -154,6 +158,6 @@ + /__oline__/s/^\([0-9][0-9]*\):\(.*\)__oline__/\2\1/ + ' >&4 + +-rm -f $tmpout ++rm -f $tmpout $tmpin + + exit $status +diff -Naur a/autoconf.texi b/autoconf.texi +--- a/autoconf.texi 1999-01-05 13:28:37.000000000 +0000 ++++ b/autoconf.texi 2016-06-11 00:18:46.360933604 +0100 +@@ -1,7 +1,7 @@ + \input texinfo @c -*-texinfo-*- + @c %**start of header +-@setfilename autoconf.info +-@settitle Autoconf ++@setfilename autoconf.info ++@settitle Autoconf + @c For double-sided printing, uncomment: + @c @setchapternewpage odd + @c %**end of header +@@ -17,7 +17,8 @@ + @ifinfo + @format + START-INFO-DIR-ENTRY +-* Autoconf: (autoconf). Create source code configuration scripts. ++* Autoconf: (autoconf). Create source code configuration scripts. ++ This is a legacy version of autoconf. + END-INFO-DIR-ENTRY + @end format + +diff -Naur a/autoheader.sh b/autoheader.sh +--- a/autoheader.sh 1999-01-05 13:28:39.000000000 +0000 ++++ b/autoheader.sh 2016-06-11 00:22:17.351872133 +0100 +@@ -194,9 +194,9 @@ + # Some fgrep's have limits on the number of lines that can be in the + # pattern on the command line, so use a temporary file containing the + # pattern. +- (fgrep_tmp=${TMPDIR-/tmp}/autoh$$ ++ (fgrep_tmp=`/usr/bin/mktemp ${TMPDIR-/tmp}/autoh$$.XXXXXX` + trap "rm -f $fgrep_tmp; exit 1" 1 2 15 +- cat > $fgrep_tmp <<EOF ++ cat >> $fgrep_tmp <<EOF + $syms + EOF + fgrep -f $fgrep_tmp +diff -Naur a/autoupdate.sh b/autoupdate.sh +--- a/autoupdate.sh 1999-01-05 13:28:42.000000000 +0000 ++++ b/autoupdate.sh 2016-06-11 00:23:19.151561252 +0100 +@@ -26,7 +26,7 @@ + Usage: autoupdate [-h] [--help] [-m dir] [--macrodir=dir] + [--version] [template-file]" + +-sedtmp=/tmp/acups.$$ ++sedtmp=`/usr/bin/mktemp /tmp/acups.XXXXXX` + # For debugging. + #sedtmp=/tmp/acups + show_version=no +@@ -35,13 +35,13 @@ + while test $# -gt 0 ; do + case "${1}" in + -h | --help | --h* ) +- echo "${usage}" 1>&2; exit 0 ;; ++ echo "${usage}" 1>&2; rm -f $sedtmp; exit 0 ;; + --macrodir=* | --m*=* ) + AC_MACRODIR="`echo \"${1}\" | sed -e 's/^[^=]*=//'`" + shift ;; + -m | --macrodir | --m* ) + shift +- test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } ++ test $# -eq 0 && { echo "${usage}" 1>&2; rm -f $sedtmp; exit 1; } + AC_MACRODIR="${1}" + shift ;; + --version | --versio | --versi | --vers) +@@ -51,7 +51,7 @@ + - ) # Use stdin as input. + break ;; + -* ) +- echo "${usage}" 1>&2; exit 1 ;; ++ echo "${usage}" 1>&2; rm -f $sedtmp; exit 1 ;; + * ) + break ;; + esac +@@ -61,6 +61,7 @@ + version=`sed -n 's/define.AC_ACVERSION.[ ]*\([0-9.]*\).*/\1/p' \ + $AC_MACRODIR/acgeneral.m4` + echo "Autoconf version $version" ++ rm -f $sedtmp + exit 0 + fi + +@@ -68,6 +69,7 @@ + + tmpout=acupo.$$ + trap 'rm -f $sedtmp $tmpout; exit 1' 1 2 15 ++trap 'rm -f $sedtmp' 0 + case $# in + 0) infile=configure.in; out="> $tmpout" + # Make sure $infile can be read, and $tmpout has the same permissions. +diff -Naur a/configure b/configure +--- a/configure 1999-01-05 13:28:57.000000000 +0000 ++++ b/configure 2016-06-11 00:50:57.771231914 +0100 +@@ -43,8 +43,8 @@ + libdir='${exec_prefix}/lib' + includedir='${prefix}/include' + oldincludedir='/usr/include' +-infodir='${prefix}/info' +-mandir='${prefix}/man' ++infodir='${datadir}/info' ++mandir='${datadir}/man' + + # Initialize some other variables. + subdirs= +diff -Naur a/Makefile.in b/Makefile.in +--- a/Makefile.in 1999-01-05 13:27:16.000000000 +0000 ++++ b/Makefile.in 2016-06-11 00:29:34.005678107 +0100 +@@ -49,7 +49,7 @@ + + # Directory in which to install library files. + datadir = @datadir@ +-acdatadir = $(datadir)/autoconf ++acdatadir = $(datadir)/autoconf-2.13 + + # Directory in which to install documentation info files. + infodir = @infodir@ +@@ -68,8 +68,8 @@ + DISTFILES = AUTHORS COPYING ChangeLog ChangeLog.1 INSTALL \ + Makefile.in NEWS README TODO $(M4FILES) \ + acconfig.h acfunctions acheaders acidentifiers \ +- acmakevars acprograms autoconf.info* \ +- autoconf.sh autoconf.texi install.texi \ ++ acmakevars acprograms autoconf.info* \ ++ autoconf.sh autoconf.texi install.texi \ + autoheader.sh autoscan.pl autoreconf.sh autoupdate.sh ifnames.sh \ + config.guess config.sub configure configure.in \ + install-sh mkinstalldirs texinfo.tex \ +@@ -106,11 +106,11 @@ + autoconf.m4f: autoconf.m4 acgeneral.m4 acspecific.m4 acoldnames.m4 + autoheader.m4f: autoheader.m4 acgeneral.m4 acspecific.m4 acoldnames.m4 + +-info: autoconf.info @standards_info@ INSTALL ++info: autoconf.info @standards_info@ INSTALL + + # Use --no-split to avoid creating filenames > 14 chars. +-autoconf.info: autoconf.texi install.texi +- $(MAKEINFO) -I$(srcdir) $(srcdir)/autoconf.texi --no-split --output=$@ ++autoconf.info: autoconf.texi install.texi ++ $(MAKEINFO) -I$(srcdir) $(srcdir)/autoconf.texi --no-split --output=$@ + + INSTALL: install.texi + $(MAKEINFO) -I$(srcdir) $(srcdir)/install.texi --output=$@ \ +@@ -121,8 +121,8 @@ + + dvi: autoconf.dvi @standards_dvi@ + +-autoconf.dvi: autoconf.texi +- $(TEXI2DVI) $(srcdir)/autoconf.texi ++autoconf.dvi: autoconf.texi ++ $(TEXI2DVI) $(srcdir)/autoconf.texi + + standards.dvi: standards.texi make-stds.texi + $(TEXI2DVI) $(srcdir)/standards.texi +@@ -137,35 +137,35 @@ + cd testsuite && ${MAKE} AUTOCONF=${bindir}/autoconf $@ + + installdirs: +- $(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir) $(acdatadir) ++ $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)/$(bindir) $(DESTDIR)/$(infodir) $(DESTDIR)/$(acdatadir) + +-install: all $(M4FILES) acconfig.h installdirs install-info ++install: all $(M4FILES) acconfig.h installdirs + for p in $(ASCRIPTS); do \ +- $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ ++ $(INSTALL_PROGRAM) $$p $(DESTDIR)/$(bindir)/`echo $$p|sed '$(transform)'`; \ + done + for i in $(M4FROZEN); do \ +- $(INSTALL_DATA) $$i $(acdatadir)/$$i; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)/$(acdatadir)/$$i; \ + done + for i in $(M4FILES) acconfig.h; do \ +- $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \ ++ $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/$(acdatadir)/$$i; \ + done + -if test -f autoscan; then \ +- $(INSTALL_PROGRAM) autoscan $(bindir)/`echo autoscan|sed '$(transform)'`; \ ++ $(INSTALL_PROGRAM) autoscan $(DESTDIR)/$(bindir)/`echo autoscan|sed '$(transform)'`; \ + for i in acfunctions acheaders acidentifiers acprograms \ + acmakevars; do \ +- $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \ ++ $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/$(acdatadir)/$$i; \ + done; \ + else :; fi + + # Don't cd, to avoid breaking install-sh references. + install-info: info installdirs +- if test -f autoconf.info; then \ ++ if test -f autoconf.info; then \ + for i in *.info*; do \ +- $(INSTALL_DATA) $$i $(infodir)/$$i; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)/$(infodir)/$$i; \ + done; \ + else \ + for i in $(srcdir)/*.info*; do \ +- $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)/$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \ + done; \ + fi + +@@ -174,7 +174,7 @@ + rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \ + done + rm -fr $(acdatadir) +- cd $(infodir) && rm -f autoconf.info* ++ cd $(infodir) && rm -f autoconf.info* + if test -f standards.info || test -f $(srcdir)/standards.info; \ + then cd $(infodir) && rm -f standards.info*; fi + +diff -Naur a/testsuite/autoconf.s/syntax.exp b/testsuite/autoconf.s/syntax.exp +--- a/testsuite/autoconf.s/syntax.exp 1999-01-05 13:29:54.000000000 +0000 ++++ b/testsuite/autoconf.s/syntax.exp 2016-06-11 00:18:51.996905247 +0100 +@@ -2,7 +2,7 @@ + + send_user "Checking for syntax errors in the specific tests...\n" + set script {s/^AC_DEFUN(\([^,]*\).*/\1/p} +-set macros [exec sed -n $script $srcdir/../acspecific.m4] ++set macros [exec sed -n $script $srcdir/../acspecific.m4 | grep -v -e AC_FUNC_GETLOADAVG -e F77] + + foreach mac $macros { + send_user "$mac\n" diff --git a/source/xap/mozilla-thunderbird/autoconf/autoconf.build b/source/xap/mozilla-thunderbird/autoconf/autoconf.build new file mode 100755 index 000000000..7dae1bad1 --- /dev/null +++ b/source/xap/mozilla-thunderbird/autoconf/autoconf.build @@ -0,0 +1,81 @@ +#!/bin/sh + +# Copyright 2005-2016 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +PKGNAM=autoconf +VERSION=2.13 +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:-" -j7 "} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-autoconf + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf autoconf-$VERSION +tar xvf $CWD/autoconf-$VERSION.tar.xz || exit 1 +cd autoconf-$VERSION + +zcat $CWD/autoconf-2.13-consolidated_fixes-1.patch.gz | patch -p1 --verbose || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Build a temporary copy of autoconf-2.13 only to be used to compile +# Firefox, since it somewhat inexplicably requires this ancient version: + +rm -rf $TMP/autoconf-tmp +mkdir -p $TMP/autoconf-tmp +# This will be at the beginning of the $PATH, so protect against nonsense +# happening in /tmp: +chmod 700 $TMP/autoconf-tmp +rm -rf $TMP/autoconf-tmp/* +mkdir -p $TMP/autoconf-tmp/usr + +./configure \ + --prefix=$TMP/autoconf-tmp/usr \ + --program-suffix=-2.13 \ + --infodir=$TMP/autoconf-tmp/usr/info \ + --mandir=$TMP/autoconf-tmp/usr/man \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make install || exit 1 + diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild index d26fefedc..494744216 100755 --- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild +++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2012, 2014, 2016 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2012, 2014, 2016, 2017, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,6 +25,9 @@ # Thanks to the folks at the Mozilla Foundation for permission to # distribute this, and for all the great work! :-) +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=mozilla-thunderbird VERSION=$(basename $(ls thunderbird-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source) RELEASEVER=$(echo $VERSION | cut -f 1 -d e | cut -f 1 -d b) BUILD=${BUILD:-1} @@ -37,6 +40,14 @@ BUILD=${BUILD:-1} # MOZLOCALIZE=${MOZLOCALIZE:-} +# This can be set to YES or NO: +ENABLE_CALENDAR=${ENABLE_CALENDAR:-YES} +if [ "$ENABLE_CALENDAR" = "NO" ]; then + ENABLE_CALENDAR="--disable-calendar" +else + ENABLE_CALENDAR="--enable-calendar" +fi + # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -48,30 +59,69 @@ 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 + if [ -z $MOZLOCALIZE ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + else + echo "$PKGNAM-$VERSION-$ARCH-${BUILD}_$MOZLOCALIZE.txz" + fi + exit 0 +fi + if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="" + LIBDIRSUFFIX="" + OPTIMIZE=${OPTIMIZE:-"-O1"} +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="" LIBDIRSUFFIX="" - OPTIMIZE=" --enable-optimize=-O2 " - # On IA32, use gold since GNU ld runs out of memory linking libxul.so: - PATH="$(pwd)/gold:$PATH" - export CC="gcc -B$(pwd)/gold" - export CXX="g++ -B$(pwd)/gold" + OPTIMIZE=${OPTIMIZE:-"-O1"} elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-fPIC" LIBDIRSUFFIX="64" - OPTIMIZE=" --enable-optimize=-O2 " + OPTIMIZE=${OPTIMIZE:-"-O1"} +elif [ "$ARCH" = "arm" ]; then + SLKCFLAGS="-march=armv4 -mtune=xscale" + LIBDIRSUFFIX="" + OPTIMIZE=${OPTIMIZE:-"-O1"} else + SLKCFLAGS="" LIBDIRSUFFIX="" - OPTIMIZE=" --enable-optimize=-O2 " + OPTIMIZE=${OPTIMIZE:-"-O1"} fi -CWD=$(pwd) +# Link using gold. This avoids running out of memory on 32-bit systems, and +# avoids a recurring build failure with GNU ld on other systems. +PATH="$(pwd)/gold:$PATH" +export CC=${CC:-"gcc -B$(pwd)/gold"} +export CXX=${CXX:-"g++ -B$(pwd)/gold"} + TMP=${TMP:-/tmp} PKG=$TMP/package-mozilla-thunderbird +# If there is a private Google API key available at compile time, use +# it to enable support for Google Safe Browsing. For Slackware builds, +# we use a private key issued for the Slackware project. If you are +# rebuilding and need this support, or you are producing your own +# distribution, you may obtain your own Google API key at no charge by +# following these instructions: +# https://bugzilla.mozilla.org/show_bug.cgi?id=1377987#c0 +if [ -r /root/google-api-key ]; then + GOOGLE_API_KEY="--with-google-api-keyfile=/root/google-api-key" +fi + NUMJOBS=${NUMJOBS:-" -j7 "} rm -rf $PKG mkdir -p $TMP $PKG/usr/lib${LIBDIRSUFFIX} +# We need to use the incredibly ancient autoconf-2.13 for this :/ +( cd $CWD/autoconf ; ./autoconf.build ) +PATH=$TMP/autoconf-tmp/usr/bin:$PATH + cd $TMP rm -rf thunderbird-$VERSION # Unpack this in a subdirectory to prevent changing permissions on /tmp: @@ -84,6 +134,9 @@ cd .. rm -rf thunderbird-unpack cd thunderbird-$VERSION || exit 1 +# Retain GTK+ v2 scrolling behavior: +zcat $CWD/tb.ui.scrollToClick.diff.gz | patch -p1 --verbose || exit 1 + # Fetch localization, if requested: if [ ! -z $MOZLOCALIZE ]; then LOC_TAG="THUNDERBIRD_$( echo $VERSION | tr \. _ )_RELEASE" @@ -115,30 +168,23 @@ OPTIONS="\ --enable-official-branding \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --with-default-mozilla-five-home=/usr/lib${LIBDIRSUFFIX}/thunderbird-$VERSION \ + --with-default-mozilla-five-home=/usr/lib${LIBDIRSUFFIX}/thunderbird-$RELEASEVER \ --with-system-zlib \ + --enable-alsa \ --enable-application=mail \ - --enable-calendar \ - --enable-default-toolkit=cairo-gtk2 \ + $ENABLE_CALENDAR \ + --enable-default-toolkit=cairo-gtk3 \ --enable-startup-notification \ - --enable-crypto \ --enable-ldap \ - --enable-libxul \ - --enable-svg \ - --enable-canvas \ - --enable-xft \ - $OPTIMIZE \ - --enable-reorder \ --enable-strip \ --enable-cpp-rtti \ - --disable-accessibility \ + --enable-accessibility \ + $GOOGLE_API_KEY \ --disable-crashreporter \ --disable-debug \ --disable-tests \ - --disable-pedantic \ --host=$ARCH-slackware-linux \ - --target=$ARCH-slackware-linux \ - --build=$ARCH-slackware-linux" + --target=$ARCH-slackware-linux" # Complains about missing APNG support in Slackware's libpng: #--with-system-png \ # Broken with 12.0: @@ -157,6 +203,8 @@ fi export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 export MOZ_PHOENIX=1 +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" export MOZ_MAKE_FLAGS="$NUMJOBS" # Clear some variables that could break the build @@ -166,6 +214,10 @@ unset DBUS_SESSION_BUS_ADDRESS ORBIT_SOCKETDIR SESSION_MANAGER \ # Assemble our .mozconfig: echo > .mozconfig +# Tell .mozconfig about the selected compiler: +echo "export CC=\"${CC}\"" >> .mozconfig +echo "export CXX=\"${CXX}\"" >> .mozconfig + # Mozilla devs enforce using an objdir for building # https://developer.mozilla.org/en/Configuring_Build_Options#Building_with_an_objdir mkdir obj @@ -173,7 +225,10 @@ echo "mk_add_options MOZ_OBJDIR=$(pwd)/obj" >> .mozconfig # This directory is also needed or the build will fail: mkdir -p mozilla/obj -# Write in it the options above +# Set options for $OPTIMIZE: +echo "ac_add_options --enable-optimize=\"${OPTIMIZE}\"" >> .mozconfig + +# Add the $OPTIONS above to .mozconfig: for option in $OPTIONS; do echo "ac_add_options $option" >> .mozconfig; done make -f client.mk build || exit 1 @@ -196,7 +251,8 @@ mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins mkdir -p $PKG/usr/share/applications cat $CWD/mozilla-thunderbird.desktop > $PKG/usr/share/applications/mozilla-thunderbird.desktop mkdir -p $PKG/usr/share/pixmaps -cat $CWD/thunderbird.png > $PKG/usr/share/pixmaps/thunderbird.png +# Symlinked below. +#cat $CWD/thunderbird.png > $PKG/usr/share/pixmaps/thunderbird.png # These files/directories are usually created if Thunderbird is run as root, # which on many systems might (and possibly should) be never. Therefore, if we @@ -218,7 +274,7 @@ for i in 16 22 24 32 48 256; do $PKG/usr/share/icons/hicolor/${i}x${i}/apps/thunderbird.png done mkdir -p $PKG/usr/share/pixmaps -( cd $PKG/usr/share/pixmaps ; ln -sf /usr/share/icons/hicolor/256x256/apps/thunderbird . ) +( cd $PKG/usr/share/pixmaps ; ln -sf /usr/share/icons/hicolor/256x256/apps/thunderbird.png . ) mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/thunderbird-$RELEASEVER/chrome/icons/default install -m 644 other-licenses/branding/thunderbird/mailicon16.png \ $PKG/usr/lib$LIBDIRSUFFIX/thunderbird-$RELEASEVER/icons/ diff --git a/source/xap/mozilla-thunderbird/slack-desc b/source/xap/mozilla-thunderbird/slack-desc index 353b22253..4c8b4f063 100644 --- a/source/xap/mozilla-thunderbird/slack-desc +++ b/source/xap/mozilla-thunderbird/slack-desc @@ -1,19 +1,19 @@ # 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 customary to +# 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------------------------------------------------------| mozilla-thunderbird: mozilla-thunderbird (Mozilla Thunderbird mail application) mozilla-thunderbird: mozilla-thunderbird: Mozilla Thunderbird is a redesign of the Mozilla mail component -mozilla-thunderbird: written using the XUL user interface language. Thunderbird makes +mozilla-thunderbird: written using the XUL user interface language. Thunderbird makes mozilla-thunderbird: emailing safer, faster, and easier than ever before with the mozilla-thunderbird: industry's best implementations of features such as intelligent spam mozilla-thunderbird: filters, built-in RSS reader, quick search, and much more. mozilla-thunderbird: -mozilla-thunderbird: Visit the Mozilla Thunderbird project online: -mozilla-thunderbird: http://www.mozilla.org/projects/thunderbird/ +mozilla-thunderbird: Homepage: http://www.mozilla.org/projects/thunderbird/ +mozilla-thunderbird: mozilla-thunderbird: diff --git a/source/xap/mozilla-thunderbird/tb.ui.scrollToClick.diff b/source/xap/mozilla-thunderbird/tb.ui.scrollToClick.diff new file mode 100644 index 000000000..d3eb0e1e1 --- /dev/null +++ b/source/xap/mozilla-thunderbird/tb.ui.scrollToClick.diff @@ -0,0 +1,12 @@ +--- ./mozilla/modules/libpref/init/all.js.orig 2017-06-12 15:12:08.000000000 -0500 ++++ ./mozilla/modules/libpref/init/all.js 2017-06-14 18:42:42.342920194 -0500 +@@ -235,6 +235,9 @@ + // If true, all popups won't hide automatically on blur + pref("ui.popup.disable_autohide", false); + ++// Default to GTK+ v2 type scrolling: ++pref("ui.scrollToClick", 0); ++ + pref("browser.display.use_document_fonts", 1); // 0 = never, 1 = quick, 2 = always + // 0 = default: always, except in high contrast mode + // 1 = always diff --git a/source/xap/mozilla-thunderbird/thunderbird.png b/source/xap/mozilla-thunderbird/thunderbird.png Binary files differdeleted file mode 100644 index 61a37d70e..000000000 --- a/source/xap/mozilla-thunderbird/thunderbird.png +++ /dev/null diff --git a/source/xap/network-manager-applet/network-manager-applet.SlackBuild b/source/xap/network-manager-applet/network-manager-applet.SlackBuild index 8257aadaa..d987223be 100755 --- a/source/xap/network-manager-applet/network-manager-applet.SlackBuild +++ b/source/xap/network-manager-applet/network-manager-applet.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for network-manager-applet @@ -22,6 +22,8 @@ # 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=network-manager-applet VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} @@ -34,9 +36,16 @@ 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 + NUMJOBS=${NUMJOBS:-" -j7 "} -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -78,12 +87,16 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PKGNAM-$VERSION \ --disable-static \ --enable-more-warnings=no \ - --with-modem-manager-1 \ + --without-team \ + --without-selinux \ --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + # Compress and if needed symlink the man pages: if [ -d $PKG/usr/man ]; then ( cd $PKG/usr/man diff --git a/source/xap/network-manager-applet/slack-desc b/source/xap/network-manager-applet/slack-desc index ad8c8f7d6..af134d0a6 100644 --- a/source/xap/network-manager-applet/slack-desc +++ b/source/xap/network-manager-applet/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/pan/pan.SlackBuild b/source/xap/pan/pan.SlackBuild index 540bdb7e3..0bc5a9036 100755 --- a/source/xap/pan/pan.SlackBuild +++ b/source/xap/pan/pan.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,10 +20,11 @@ # 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=pan VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -35,6 +36,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 + NUMJOBS=${NUMJOBS:-" -j7 "} @@ -48,7 +57,6 @@ else SLKCFLAGS="-O2" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} rm -rf $PKG @@ -59,8 +67,6 @@ rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 cd ${PKGNAM}-$VERSION || exit 1 -zcat $CWD/pan.gcc47.diff.gz | patch -p1 --verbose || exit 1 - # Make sure ownerships and permissions are sane: chown -R root:root . find . \ @@ -76,10 +82,15 @@ CFLAGS="$SLKCFLAGS" \ --localstatedir=/var/lib \ --sysconfdir=/etc \ --mandir=/usr/man \ + --without-gtk3 \ --with-gnutls \ + --with-gmime-crypto \ + --with-gtkspell \ + --enable-libnotify \ + --enable-gkr \ --program-prefix= \ --program-suffix= \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 # Build and install: make $NUMJOBS || make || exit 1 diff --git a/source/xap/pan/pan.gcc47.diff b/source/xap/pan/pan.gcc47.diff deleted file mode 100644 index 5c57a3815..000000000 --- a/source/xap/pan/pan.gcc47.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- ./pan/data/cert-store.cc.orig 2012-06-29 17:24:54.000000000 -0500 -+++ ./pan/data/cert-store.cc 2012-07-10 12:43:12.768183671 -0500 -@@ -20,6 +20,7 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -+#include <unistd.h> - #include <string> - - //#include <glib/giochannel.h> diff --git a/source/xap/pan/slack-desc b/source/xap/pan/slack-desc index 77372ab97..e09b52e5b 100644 --- a/source/xap/pan/slack-desc +++ b/source/xap/pan/slack-desc @@ -1,19 +1,19 @@ # 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------------------------------------------------------| pan: pan (USENET newsreader) pan: pan: This is PAN, a powerful and user-friendly USENET newsreader based on -pan: GTK+2. Pan is the only Unix newsreader to score 100% on the Good +pan: GTK+2. Pan is the only Unix newsreader to score 100% on the Good pan: Net-Keeping Seal of Approval newsreader evaluations. pan: +pan: Homepage: http://pan.rebelbase.com pan: pan: pan: -pan: Homepage: http://pan.rebelbase.com pan: diff --git a/source/xap/pavucontrol/pavucontrol.SlackBuild b/source/xap/pavucontrol/pavucontrol.SlackBuild index 59a49d8c2..94ccb9bea 100755 --- a/source/xap/pavucontrol/pavucontrol.SlackBuild +++ b/source/xap/pavucontrol/pavucontrol.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2015 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2015, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,9 +20,11 @@ # 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=pavucontrol VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -34,7 +36,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/xap/pavucontrol/slack-desc b/source/xap/pavucontrol/slack-desc index 86f8f5d77..2b33b87e3 100644 --- a/source/xap/pavucontrol/slack-desc +++ b/source/xap/pavucontrol/slack-desc @@ -2,18 +2,18 @@ # 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 +# You must make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| pavucontrol: pavucontrol (PulseAudio Volume Controller) pavucontrol: pavucontrol: It is a simple GTK based volume control tool("mixer") for -pavucontrol: PulseAudio sound server. In contrast to classic mixer tools, this one +pavucontrol: PulseAudio sound server. In contrast to classic mixer tools, this one pavucontrol: allows you to control both the volume of hardware devices and of pavucontrol: each playback stream separately. pavucontrol: -pavucontrol: Website: http://0pointer.de/lennart/projects/pavucontrol/ +pavucontrol: Website: http://0pointer.de/lennart/projects/pavucontrol/ pavucontrol: pavucontrol: pavucontrol: diff --git a/source/xap/pidgin/pidgin.SlackBuild b/source/xap/pidgin/pidgin.SlackBuild index 106bfc734..4798c8df2 100755 --- a/source/xap/pidgin/pidgin.SlackBuild +++ b/source/xap/pidgin/pidgin.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014, 2015, 2016 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014, 2015, 2016, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,11 +20,12 @@ # 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=pidgin -VERSION=${VERSION:-$(echo $PKGNAM-2.*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=${VERSION:-$(echo $PKGNAM-2.*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} PIDGINENC=${PIDGINENC:-3.1} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -36,9 +37,16 @@ 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 + NUMJOBS=${NUMJOBS:-" -j6 "} -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} rm -rf $PKG @@ -68,7 +76,7 @@ fi cd $TMP rm -rf ${PKGNAM}-${VERSION} -tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1 cd ${PKGNAM}-$VERSION || exit 1 # Make sure ownerships and permissions are sane: @@ -190,6 +198,9 @@ done find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + # Compress and link manpages, if any: if [ -d $PKG/usr/man ]; then ( cd $PKG/usr/man diff --git a/source/xap/pidgin/slack-desc b/source/xap/pidgin/slack-desc index a9aabca14..d42bf9020 100644 --- a/source/xap/pidgin/slack-desc +++ b/source/xap/pidgin/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------------------------------------------------------| @@ -10,10 +10,10 @@ pidgin: pidgin (GTK+ instant messaging program) pidgin: pidgin: Pidgin allows you to talk to anyone using a variety of messaging pidgin: protocols, including AIM (Oscar and TOC), ICQ, IRC, Yahoo!, MSN -pidgin: Messenger, Jabber, Gadu-Gadu, Napster, and Zephyr. These protocols -pidgin: are implemented using a modular, easy to use design. To use a +pidgin: Messenger, Jabber, Gadu-Gadu, Napster, and Zephyr. These protocols +pidgin: are implemented using a modular, easy to use design. To use a pidgin: protocol, just load the plugin for it. pidgin: -pidgin: For more info, see: http://www.pidgin.im +pidgin: For more info, see: http://www.pidgin.im pidgin: pidgin: diff --git a/source/xap/rdesktop/02-Fix-OpenSSL-1.1-compability-issues.patch b/source/xap/rdesktop/02-Fix-OpenSSL-1.1-compability-issues.patch new file mode 100644 index 000000000..17c41eefe --- /dev/null +++ b/source/xap/rdesktop/02-Fix-OpenSSL-1.1-compability-issues.patch @@ -0,0 +1,125 @@ +From bd6aa6acddf0ba640a49834807872f4cc0d0a773 Mon Sep 17 00:00:00 2001 +From: Jani Hakala <jjhakala@gmail.com> +Date: Thu, 16 Jun 2016 14:28:15 +0300 +Subject: [PATCH] Fix OpenSSL 1.1 compability issues + +Some data types have been made opaque in OpenSSL version 1.1 so +stack allocation and accessing struct fields directly does not work. +--- + ssl.c | 65 ++++++++++++++++++++++++++++++++++++++++------------------------- + 1 file changed, 40 insertions(+), 25 deletions(-) + +diff --git a/ssl.c b/ssl.c +index 4875125..032e9b9 100644 +--- a/ssl.c ++++ b/ssl.c +@@ -88,7 +88,7 @@ rdssl_rsa_encrypt(uint8 * out, uint8 * in, int len, uint32 modulus_size, uint8 * + uint8 * exponent) + { + BN_CTX *ctx; +- BIGNUM mod, exp, x, y; ++ BIGNUM *mod, *exp, *x, *y; + uint8 inr[SEC_MAX_MODULUS_SIZE]; + int outlen; + +@@ -98,24 +98,24 @@ rdssl_rsa_encrypt(uint8 * out, uint8 * in, int len, uint32 modulus_size, uint8 * + reverse(inr, len); + + ctx = BN_CTX_new(); +- BN_init(&mod); +- BN_init(&exp); +- BN_init(&x); +- BN_init(&y); +- +- BN_bin2bn(modulus, modulus_size, &mod); +- BN_bin2bn(exponent, SEC_EXPONENT_SIZE, &exp); +- BN_bin2bn(inr, len, &x); +- BN_mod_exp(&y, &x, &exp, &mod, ctx); +- outlen = BN_bn2bin(&y, out); ++ mod = BN_new(); ++ exp = BN_new(); ++ x = BN_new(); ++ y = BN_new(); ++ ++ BN_bin2bn(modulus, modulus_size, mod); ++ BN_bin2bn(exponent, SEC_EXPONENT_SIZE, exp); ++ BN_bin2bn(inr, len, x); ++ BN_mod_exp(y, x, exp, mod, ctx); ++ outlen = BN_bn2bin(y, out); + reverse(out, outlen); + if (outlen < (int) modulus_size) + memset(out + outlen, 0, modulus_size - outlen); + +- BN_free(&y); +- BN_clear_free(&x); +- BN_free(&exp); +- BN_free(&mod); ++ BN_free(y); ++ BN_clear_free(x); ++ BN_free(exp); ++ BN_free(mod); + BN_CTX_free(ctx); + } + +@@ -146,12 +146,20 @@ rdssl_cert_to_rkey(RDSSL_CERT * cert, uint32 * key_len) + + Kudos to Richard Levitte for the following (. intiutive .) + lines of code that resets the OID and let's us extract the key. */ +- nid = OBJ_obj2nid(cert->cert_info->key->algor->algorithm); ++ ++ X509_PUBKEY *key = NULL; ++ X509_ALGOR *algor = NULL; ++ ++ key = X509_get_X509_PUBKEY(cert); ++ algor = X509_PUBKEY_get0_param(NULL, NULL, 0, &algor, key); ++ ++ nid = OBJ_obj2nid(algor->algorithm); ++ + if ((nid == NID_md5WithRSAEncryption) || (nid == NID_shaWithRSAEncryption)) + { + DEBUG_RDP5(("Re-setting algorithm type to RSA in server certificate\n")); +- ASN1_OBJECT_free(cert->cert_info->key->algor->algorithm); +- cert->cert_info->key->algor->algorithm = OBJ_nid2obj(NID_rsaEncryption); ++ X509_PUBKEY_set0_param(key, OBJ_nid2obj(NID_rsaEncryption), ++ 0, NULL, NULL, 0); + } + epk = X509_get_pubkey(cert); + if (NULL == epk) +@@ -201,14 +209,24 @@ rdssl_rkey_get_exp_mod(RDSSL_RKEY * rkey, uint8 * exponent, uint32 max_exp_len, + { + int len; + +- if ((BN_num_bytes(rkey->e) > (int) max_exp_len) || +- (BN_num_bytes(rkey->n) > (int) max_mod_len)) ++ BIGNUM *e = NULL; ++ BIGNUM *n = NULL; ++ ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++ e = rkey->e; ++ n = rkey->n; ++#else ++ RSA_get0_key(rkey, &e, &n, NULL); ++#endif ++ ++ if ((BN_num_bytes(e) > (int) max_exp_len) || ++ (BN_num_bytes(n) > (int) max_mod_len)) + { + return 1; + } +- len = BN_bn2bin(rkey->e, exponent); ++ len = BN_bn2bin(e, exponent); + reverse(exponent, len); +- len = BN_bn2bin(rkey->n, modulus); ++ len = BN_bn2bin(n, modulus); + reverse(modulus, len); + return 0; + } +@@ -229,8 +247,5 @@ void + rdssl_hmac_md5(const void *key, int key_len, const unsigned char *msg, int msg_len, + unsigned char *md) + { +- HMAC_CTX ctx; +- HMAC_CTX_init(&ctx); + HMAC(EVP_md5(), key, key_len, msg, msg_len, md, NULL); +- HMAC_CTX_cleanup(&ctx); + } diff --git a/source/xap/rdesktop/rdesktop.SlackBuild b/source/xap/rdesktop/rdesktop.SlackBuild index 068573ddf..1b3fed841 100755 --- a/source/xap/rdesktop/rdesktop.SlackBuild +++ b/source/xap/rdesktop/rdesktop.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2006, 2008, 2009, 2011, 2012, 2013, 2014 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2008, 2009, 2011, 2012, 2013, 2014, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,23 +20,32 @@ # 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=rdesktop VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; esac fi -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +# 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="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" @@ -48,7 +57,6 @@ fi NUMJOBS=${NUMJOBS:-" -j7 "} -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} rm -rf $PKG @@ -59,6 +67,8 @@ rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 cd ${PKGNAM}-$VERSION || exit 1 +zcat $CWD/02-Fix-OpenSSL-1.1-compability-issues.patch.gz | patch -p1 --verbose || exit 1 + # Make sure ownerships and permissions are sane: chown -R root:root . find . \ @@ -77,7 +87,7 @@ CFLAGS="$SLKCFLAGS" \ --disable-credssp \ --with-ipv6 \ --mandir=/usr/man \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 # Build and install: make $NUMJOBS || make || exit 1 diff --git a/source/xap/rdesktop/slack-desc b/source/xap/rdesktop/slack-desc index 283da1cdd..aa2660c4b 100644 --- a/source/xap/rdesktop/slack-desc +++ b/source/xap/rdesktop/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------------------------------------------------------| @@ -12,7 +12,7 @@ rdesktop: rdesktop is a client for Remote Desktop Protocol (RDP), used in a rdesktop: number of Microsoft products including Windows NT Terminal Server, rdesktop: Windows 2000 Server, Windows XP, and Windows 2003 Server. rdesktop: -rdesktop: For more information, see: http://www.rdesktop.org +rdesktop: For more information, see: http://www.rdesktop.org rdesktop: rdesktop: rdesktop: diff --git a/source/xap/rxvt-unicode/rxvt-unicode-256color.desktop b/source/xap/rxvt-unicode/rxvt-unicode-256color.desktop new file mode 100644 index 000000000..2dcc832de --- /dev/null +++ b/source/xap/rxvt-unicode/rxvt-unicode-256color.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=rxvt-unicode (256color) +Comment=A VT102 emulator for the X window system +Exec=urxvt256c +Terminal=false +Type=Application +Icon=utilities-terminal +Categories=System;TerminalEmulator; +StartupWMClass=URxvt diff --git a/source/xap/rxvt-unicode/rxvt-unicode.SlackBuild b/source/xap/rxvt-unicode/rxvt-unicode.SlackBuild new file mode 100755 index 000000000..dcca86a80 --- /dev/null +++ b/source/xap/rxvt-unicode/rxvt-unicode.SlackBuild @@ -0,0 +1,188 @@ +#!/bin/bash + +# Copyright 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# 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=rxvt-unicode +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-4} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +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 + +NUMJOBS=${NUMJOBS:-" -j7 "} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Add support for utempter: +zcat $CWD/rxvt-unicode.utempter.diff.gz | patch -p1 --verbose || exit 1 + +# Regenerate configure from configure.ac after patching in utempter support: +autoreconf -vif + +# Obsolete options (due to utempter patch): +# --enable-utmp \ +# --enable-wtmp \ +# --enable-lastlog \ +# + +run_configure() { +# Configure: +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --mandir=/usr/man \ + --enable-keepscrolling \ + --enable-selectionscrolling \ + --enable-pointer-blank \ + --enable-unicode3 \ + --enable-combining \ + --enable-xft \ + --enable-font-styles \ + --enable-pixbuf \ + --enable-transparency \ + --enable-fading \ + --enable-rxvt-scroll \ + --enable-next-scroll \ + --enable-xterm-scroll \ + --enable-perl \ + --enable-xim \ + --enable-iso14755 \ + --with-codesets=all \ + --enable-frills \ + --enable-mousewheel \ + --enable-slipwheeling \ + --enable-smart-resize \ + $COLOR_OPTS \ + --build=$ARCH-slackware-linux || exit 1 +} + +# Make sure the terminfo definitions go to the correct location: +mkdir -p $PKG/usr/share/terminfo +export TERMINFO=$PKG/usr/share/terminfo + +# Build and install standard version: +export COLOR_OPTS="--with-term=rxvt-unicode" +run_configure +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Build and install 256color version: +export COLOR_OPTS="--with-term=rxvt-unicode-256color --with-name=urxvt256c --enable-256-color" +run_configure +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +mkdir -p $PKG/usr/share/applications +cp -a $CWD/*.desktop $PKG/usr/share/applications +chown root:root $PKG/usr/share/applications/* +chmod 644 $PKG/usr/share/applications/* + +# Strip binaries: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +# Compress manual pages: +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do + ln -s $( readlink $i ).gz $i.gz + rm $i +done + +# Add a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + Changes COPYING* NEWS* README* THANKS* TODO* \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a Changes file, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r Changes ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat Changes | head -n 1000 > $DOCSDIR/Changes + touch -r Changes $DOCSDIR/Changes +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/xap/rxvt-unicode/rxvt-unicode.desktop b/source/xap/rxvt-unicode/rxvt-unicode.desktop new file mode 100644 index 000000000..0bc798927 --- /dev/null +++ b/source/xap/rxvt-unicode/rxvt-unicode.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=rxvt-unicode +Comment=A VT102 emulator for the X window system +Exec=urxvt +Terminal=false +Type=Application +Icon=utilities-terminal +Categories=System;TerminalEmulator; +StartupWMClass=URxvt diff --git a/source/xap/rxvt-unicode/rxvt-unicode.utempter.diff b/source/xap/rxvt-unicode/rxvt-unicode.utempter.diff new file mode 100644 index 000000000..d56c13522 --- /dev/null +++ b/source/xap/rxvt-unicode/rxvt-unicode.utempter.diff @@ -0,0 +1,1183 @@ +--- ./configure.ac.orig 2015-06-17 06:57:42.000000000 -0500 ++++ ./configure.ac 2018-03-31 11:21:43.971399093 -0500 +@@ -113,7 +113,6 @@ + support_fading=no + support_keepscrolling=no + support_selectionscrolling=no +- support_lastlog=no + support_mousewheel=no + support_mouseslipwheel=no + support_text_blink=no +@@ -121,8 +120,6 @@ + support_scroll_rxvt=no + support_scroll_next=no + support_scroll_xterm=no +- support_utmp=no +- support_wtmp=no + support_xim=no + support_pixbuf=no + support_startup_notification=no +@@ -141,7 +138,6 @@ + support_fading=yes + support_keepscrolling=yes + support_selectionscrolling=yes +- support_lastlog=yes + support_mousewheel=yes + support_mouseslipwheel=yes + support_text_blink=yes +@@ -149,8 +145,6 @@ + support_scroll_rxvt=yes + support_scroll_next=yes + support_scroll_xterm=yes +- support_utmp=yes +- support_wtmp=yes + support_xim=yes + support_pixbuf=yes + support_startup_notification=yes +@@ -513,8 +507,6 @@ + dnl# -------------------------------------------------------------------------- + AC_CHECK_FUNCS(unsetenv) + +-UTMP_CHECK +- + dnl# -------------------------------------------------------------------------- + + dnl# -------------------------------------------------------------------------- +--- ./config.h.in.orig 2015-06-17 06:57:42.000000000 -0500 ++++ ./config.h.in 2018-03-31 11:21:43.970399093 -0500 +@@ -75,9 +75,6 @@ + /* Define to 1 if you have the `kqueue' function. */ + #undef HAVE_KQUEUE + +-/* Define to 1 if you have the <lastlog.h> header file. */ +-#undef HAVE_LASTLOG_H +- + /* Define to 1 if you have the `rt' library (-lrt). */ + #undef HAVE_LIBRT + +@@ -156,18 +153,6 @@ + /* Define to 1 if you have the <stropts.h> header file. */ + #undef HAVE_STROPTS_H + +-/* Define to 1 if the system has the type `struct lastlog'. */ +-#undef HAVE_STRUCT_LASTLOG +- +-/* Define to 1 if the system has the type `struct lastlogx'. */ +-#undef HAVE_STRUCT_LASTLOGX +- +-/* Define to 1 if the system has the type `struct utmp'. */ +-#undef HAVE_STRUCT_UTMP +- +-/* Define to 1 if the system has the type `struct utmpx'. */ +-#undef HAVE_STRUCT_UTMPX +- + /* Define to 1 if you have the <sys/byteorder.h> header file. */ + #undef HAVE_SYS_BYTEORDER_H + +@@ -214,33 +199,9 @@ + /* Define to 1 if you have the `unsetenv' function. */ + #undef HAVE_UNSETENV + +-/* Define to 1 if you have the `updlastlogx' function. */ +-#undef HAVE_UPDLASTLOGX +- +-/* Define to 1 if you have the `updwtmp' function. */ +-#undef HAVE_UPDWTMP +- +-/* Define to 1 if you have the `updwtmpx' function. */ +-#undef HAVE_UPDWTMPX +- + /* Define to 1 if you have the <util.h> header file. */ + #undef HAVE_UTIL_H + +-/* Define to 1 if you have the <utmpx.h> header file. */ +-#undef HAVE_UTMPX_H +- +-/* Define if struct utmpx contains ut_host */ +-#undef HAVE_UTMPX_HOST +- +-/* Define to 1 if you have the <utmp.h> header file. */ +-#undef HAVE_UTMP_H +- +-/* Define if struct utmp contains ut_host */ +-#undef HAVE_UTMP_HOST +- +-/* Define if struct utmp contains ut_pid */ +-#undef HAVE_UTMP_PID +- + /* Define to 1 if you have the <wchar.h> header file. */ + #undef HAVE_WCHAR_H + +@@ -262,9 +223,6 @@ + /* Define if you want ISO 14755 extended support */ + #undef ISO_14755 + +-/* Define if you want to have lastlog support when utmp/utmpx is enabled */ +-#undef LASTLOG_SUPPORT +- + /* Define to have CTRL cause wheel events to accelerate scrolling. Release + CTRL to halt scrolling */ + #undef MOUSE_SLIP_WHEELING +@@ -322,21 +280,6 @@ + /* Define if you want to hide the pointer while typing */ + #undef POINTER_BLANK + +-/* Define to a fallback location of lastlogx */ +-#undef PT_LASTLOGX_FILE +- +-/* Define to a fallback location of lastlog */ +-#undef PT_LASTLOG_FILE +- +-/* Define to a fallback location of utmp */ +-#undef PT_UTMP_FILE +- +-/* Define to a fallback location of wtmpx */ +-#undef PT_WTMPX_FILE +- +-/* Define to a fallback location of wtmp */ +-#undef PT_WTMP_FILE +- + /* Resource class */ + #undef RESCLASS + +@@ -409,12 +352,6 @@ + for multibyte characters input */ + #undef USE_XIM + +-/* Define if you want to have utmp/utmpx support */ +-#undef UTMP_SUPPORT +- +-/* Define if you want to have wtmp support when utmp/utmpx is enabled */ +-#undef WTMP_SUPPORT +- + /* Define to enable xft support */ + #undef XFT + +@@ -451,10 +388,6 @@ + /* Enable declarations of msg_control and msg_controllen on Solaris */ + #undef _XOPEN_SOURCE + +-/* Enable declarations in utmp.h on Solaris when the XPG4v2 namespace is +- active */ +-#undef __EXTENSIONS__ +- + /* Define to `int' if <sys/types.h> doesn't define. */ + #undef gid_t + +--- ./libptytty/ptytty.m4.orig 2015-05-11 17:24:03.000000000 -0500 ++++ ./libptytty/ptytty.m4 2018-03-31 11:24:41.669415706 -0500 +@@ -51,143 +51,6 @@ + fi + ]) + +-AC_DEFUN([UTMP_CHECK], +-[ +-support_utmp=yes +-support_wtmp=yes +-support_lastlog=yes +- +-AC_ARG_ENABLE(utmp, +- [AS_HELP_STRING([--enable-utmp],[enable utmp (utmpx) support])], +- [if test x$enableval = xyes -o x$enableval = xno; then +- support_utmp=$enableval +- fi]) +- +-AC_ARG_ENABLE(wtmp, +- [AS_HELP_STRING([--enable-wtmp],[enable wtmp (wtmpx) support (requires --enable-utmp)])], +- [if test x$enableval = xyes -o x$enableval = xno; then +- support_wtmp=$enableval +- fi]) +- +-AC_ARG_ENABLE(lastlog, +- [AS_HELP_STRING([--enable-lastlog],[enable lastlog support (requires --enable-utmp)])], +- [if test x$enableval = xyes -o x$enableval = xno; then +- support_lastlog=$enableval +- fi]) +- +-if test x$support_utmp = xyes; then +- AC_DEFINE(UTMP_SUPPORT, 1, Define if you want to have utmp/utmpx support) +-fi +-if test x$support_wtmp = xyes; then +- AC_DEFINE(WTMP_SUPPORT, 1, Define if you want to have wtmp support when utmp/utmpx is enabled) +-fi +-if test x$support_lastlog = xyes; then +- AC_DEFINE(LASTLOG_SUPPORT, 1, Define if you want to have lastlog support when utmp/utmpx is enabled) +-fi +- +-AC_CHECK_FUNCS( \ +- updwtmp \ +- updwtmpx \ +- updlastlogx \ +-) +- +-AC_CHECK_HEADERS(lastlog.h) +- +-case $host in +- *-*-solaris*) +- AC_DEFINE(__EXTENSIONS__, 1, Enable declarations in utmp.h on Solaris when the XPG4v2 namespace is active) +- ;; +-esac +- +-dnl# -------------------------------------------------------------------------- +-dnl# DO ALL UTMP AND WTMP CHECKING +-dnl# -------------------------------------------------------------------------- +-dnl# check for host field in utmp structure +- +-dnl# -------------------------------------------- +-AC_CHECK_HEADERS(utmp.h, [ +-AC_CHECK_TYPES([struct utmp], [], [], [ +-#include <sys/types.h> +-#include <utmp.h> +-]) +- +-AC_CHECK_MEMBER([struct utmp.ut_host], +-[AC_DEFINE(HAVE_UTMP_HOST, 1, Define if struct utmp contains ut_host)], [], [ +-#include <sys/types.h> +-#include <utmp.h> +-]) +- +-AC_CHECK_MEMBER([struct utmp.ut_pid], +-[AC_DEFINE(HAVE_UTMP_PID, 1, Define if struct utmp contains ut_pid)], [], [ +-#include <sys/types.h> +-#include <utmp.h> +-]) +-]) dnl# AC_CHECK_HEADERS(utmp.h +- +-dnl# -------------------------------------------- +- +-AC_CHECK_HEADERS(utmpx.h, [ +-AC_CHECK_TYPES([struct utmpx], [], [], [ +-#include <sys/types.h> +-#include <utmpx.h> +-]) +- +-AC_CHECK_MEMBER([struct utmpx.ut_host], +-[AC_DEFINE(HAVE_UTMPX_HOST, 1, Define if struct utmpx contains ut_host)], [], [ +-#include <sys/types.h> +-#include <utmpx.h> +-]) +-]) dnl# AC_CHECK_HEADERS(utmpx.h +- +-dnl# -------------------------------------------------------------------------- +-dnl# check for struct lastlog +-AC_CHECK_TYPES([struct lastlog], [], [], [ +-#include <sys/types.h> +-#include <utmp.h> +-#ifdef HAVE_LASTLOG_H +-#include <lastlog.h> +-#endif +-]) +- +-dnl# check for struct lastlogx +-AC_CHECK_TYPES([struct lastlogx], [], [], [ +-#include <sys/types.h> +-#include <utmpx.h> +-#ifdef HAVE_LASTLOG_H +-#include <lastlog.h> +-#endif +-]) +- +-dnl# -------------------------------------------------------------------------- +-dnl# FIND FILES +-dnl# -------------------------------------------------------------------------- +- +-dnl# find utmp +-PT_FIND_FILE([utmp], [PT_UTMP_FILE], +-["/var/run/utmp" "/var/adm/utmp" "/etc/utmp" "/usr/etc/utmp" "/usr/adm/utmp"]) +- +-dnl# -------------------------------------------------------------------------- +- +-dnl# find wtmp +-PT_FIND_FILE([wtmp], [PT_WTMP_FILE], +-["/var/log/wtmp" "/var/adm/wtmp" "/etc/wtmp" "/usr/etc/wtmp" "/usr/adm/wtmp"]) +-dnl# -------------------------------------------------------------------------- +- +-dnl# find wtmpx +-PT_FIND_FILE([wtmpx], [PT_WTMPX_FILE], +-["/var/log/wtmpx" "/var/adm/wtmpx"]) +-dnl# -------------------------------------------------------------------------- +- +-dnl# find lastlog +-PT_FIND_FILE([lastlog], [PT_LASTLOG_FILE], +-["/var/log/lastlog" "/var/adm/lastlog"]) +-dnl# -------------------------------------------------------------------------- +- +-dnl# find lastlogx +-PT_FIND_FILE([lastlogx], [PT_LASTLOGX_FILE], +-["/var/log/lastlogx" "/var/adm/lastlogx"]) +-]) +- + AC_DEFUN([SCM_RIGHTS_CHECK], + [ + AH_TEMPLATE([_XOPEN_SOURCE], [Enable declarations of msg_control and msg_controllen on Solaris]) +--- ./libptytty/src/proxy.C.orig 2015-04-11 13:27:01.000000000 -0500 ++++ ./libptytty/src/proxy.C 2018-03-31 11:25:17.787419082 -0500 +@@ -1,351 +0,0 @@ +-/*----------------------------------------------------------------------* +- * File: proxy.C +- *----------------------------------------------------------------------* +- * +- * All portions of code are copyright by their respective author/s. +- * Copyright (c) 2006 Marc Lehmann <schmorp@schmorp.de> +- * +- * This program is free software; you can redistribute it and/or modify +- * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation; either version 2 of the License, or +- * (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +- *---------------------------------------------------------------------*/ +- +-#include "config.h" +- +-#include "ptytty.h" +- +-#include "estl.h" +- +-#include <stdio.h> +-#include <string.h> +-#include <signal.h> +- +-#include <sys/types.h> +-#include <sys/socket.h> +-#include <unistd.h> +-#include <fcntl.h> +-#include <errno.h> +- +-// helper/proxy support +- +-#if PTYTTY_HELPER +- +-static int sock_fd = -1, lock_fd = -1; +-static int helper_pid; +- +-struct command +-{ +- enum { get, login, destroy } type; +- +- ptytty *id; +- +- bool login_shell; +- int cmd_pid; +- char hostname[512]; // arbitrary, but should be plenty +-}; +- +-struct ptytty_proxy : ptytty +-{ +- ptytty *id; +- +- ptytty_proxy () +- : id(0) +- { +- } +- +- ~ptytty_proxy (); +- +- bool get (); +- void login (int cmd_pid, bool login_shell, const char *hostname); +-}; +- +-#if PTYTTY_REENTRANT +-# define NEED_TOKEN do { char ch; read (lock_fd, &ch , 1); } while (0) +-# define GIVE_TOKEN write (lock_fd, &lock_fd, 1) +-#else +-# define NEED_TOKEN (void)0 +-# define GIVE_TOKEN (void)0 +-#endif +- +-bool +-ptytty_proxy::get () +-{ +- NEED_TOKEN; +- +- command cmd; +- +- cmd.type = command::get; +- +- write (sock_fd, &cmd, sizeof (cmd)); +- +- if (read (sock_fd, &id, sizeof (id)) != sizeof (id)) +- PTYTTY_FATAL ("protocol error while creating pty using helper process, aborting.\n"); +- +- if (!id) +- { +- GIVE_TOKEN; +- return false; +- } +- +- if ((pty = recv_fd (sock_fd)) < 0 +- || (tty = recv_fd (sock_fd)) < 0) +- PTYTTY_FATAL ("protocol error while reading pty/tty fds from helper process, aborting.\n"); +- +- GIVE_TOKEN; +- return true; +-} +- +-void +-ptytty_proxy::login (int cmd_pid, bool login_shell, const char *hostname) +-{ +- NEED_TOKEN; +- +- command cmd; +- +- cmd.type = command::login; +- cmd.id = id; +- cmd.cmd_pid = cmd_pid; +- cmd.login_shell = login_shell; +- strncpy (cmd.hostname, hostname, sizeof (cmd.hostname)); +- +- write (sock_fd, &cmd, sizeof (cmd)); +- +- GIVE_TOKEN; +-} +- +-ptytty_proxy::~ptytty_proxy () +-{ +- if (id) +- { +- close_tty (); +- +- if (pty >= 0) +- close (pty); +- +- NEED_TOKEN; +- +- command cmd; +- +- cmd.type = command::destroy; +- cmd.id = id; +- +- write (sock_fd, &cmd, sizeof (cmd)); +- +- GIVE_TOKEN; +- } +-} +- +-static +-void serve () +-{ +- command cmd; +- vector<ptytty *> ptys; +- +- for (;;) +- { +- GIVE_TOKEN; +- +- if (read (sock_fd, &cmd, sizeof (command)) != sizeof (command)) +- break; +- +- if (cmd.type == command::get) +- { +- // -> id ptyfd ttyfd +- cmd.id = new ptytty_unix; +- +- if (cmd.id->get ()) +- { +- write (sock_fd, &cmd.id, sizeof (cmd.id)); +- ptys.push_back (cmd.id); +- +- ptytty::send_fd (sock_fd, cmd.id->pty); +- ptytty::send_fd (sock_fd, cmd.id->tty); +- +- cmd.id->close_tty (); +- } +- else +- { +- delete cmd.id; +- cmd.id = 0; +- write (sock_fd, &cmd.id, sizeof (cmd.id)); +- } +- } +- else if (cmd.type == command::login) +- { +-#if UTMP_SUPPORT +- if (find (ptys.begin (), ptys.end (), cmd.id) != ptys.end ()) +- { +- cmd.hostname[sizeof (cmd.hostname) - 1] = 0; +- cmd.id->login (cmd.cmd_pid, cmd.login_shell, cmd.hostname); +- } +-#endif +- } +- else if (cmd.type == command::destroy) +- { +- vector<ptytty *>::iterator pty = find (ptys.begin (), ptys.end (), cmd.id); +- +- if (pty != ptys.end ()) +- { +- delete *pty; +- ptys.erase (pty); +- } +- } +- else +- break; +- +- NEED_TOKEN; +- } +- +- // destroy all ptys +- for (vector<ptytty *>::iterator i = ptys.end (); i-- > ptys.begin (); ) +- delete *i; +-} +- +-void +-ptytty::use_helper () +-{ +- if (sock_fd >= 0) +- return; +- +- int sv[2]; +- +- if (socketpair (AF_UNIX, SOCK_STREAM, 0, sv)) +- PTYTTY_FATAL ("could not create socket to communicate with pty/sessiondb helper, aborting.\n"); +- +-#if PTYTTY_REENTRANT +- int lv[2]; +- +- if (socketpair (AF_UNIX, SOCK_STREAM, 0, lv)) +- PTYTTY_FATAL ("could not create socket to communicate with pty/sessiondb helper, aborting.\n"); +-#endif +- +- helper_pid = fork (); +- +- if (helper_pid < 0) +- PTYTTY_FATAL ("could not create pty/sessiondb helper process, aborting.\n"); +- +- if (helper_pid) +- { +- // client, process +- sock_fd = sv[0]; +- close (sv[1]); +- fcntl (sock_fd, F_SETFD, FD_CLOEXEC); +-#if PTYTTY_REENTRANT +- lock_fd = lv[0]; +- close (lv[1]); +- fcntl (lock_fd, F_SETFD, FD_CLOEXEC); +-#endif +- } +- else +- { +- // server, pty-helper +- sock_fd = sv[1]; +-#if PTYTTY_REENTRANT +- lock_fd = lv[1]; +-#endif +- +- chdir ("/"); +- +- signal (SIGHUP, SIG_IGN); +- signal (SIGTERM, SIG_IGN); +- signal (SIGINT, SIG_IGN); +- signal (SIGPIPE, SIG_IGN); +- +- for (int fd = 0; fd < 1023; fd++) +- if (fd != sock_fd && fd != lock_fd) +- close (fd); +- +- serve (); +- _exit (EXIT_SUCCESS); +- } +-} +- +-#endif +- +-ptytty * +-ptytty::create () +-{ +-#if PTYTTY_HELPER +- if (helper_pid) +- // use helper process +- return new ptytty_proxy; +- else +-#endif +- return new ptytty_unix; +-} +- +-void +-ptytty::sanitise_stdfd () +-{ +- // sanitise stdin/stdout/stderr to point to *something*. +- for (int fd = 0; fd <= 2; ++fd) +- if (fcntl (fd, F_GETFL) < 0 && errno == EBADF) +- { +- int fd2 = open ("/dev/tty", fd ? O_WRONLY : O_RDONLY); +- +- if (fd2 < 0) +- fd2 = open ("/dev/null", fd ? O_WRONLY : O_RDONLY); +- +- if (fd2 != fd) +- PTYTTY_FATAL ("unable to sanitise fds, aborting.\n"); +- } +-} +- +-void +-ptytty::init () +-{ +- sanitise_stdfd (); +- +- uid_t uid = getuid (); +- gid_t gid = getgid (); +- +- // before doing anything else, check for setuid/setgid operation, +- // start the helper process and drop privileges +- if (uid != geteuid () +- || gid != getegid ()) +- { +-#if PTYTTY_HELPER +- use_helper (); +-#else +- PTYTTY_WARN ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n"); +-#endif +- +- drop_privileges (); +- } +-} +- +-void +-ptytty::drop_privileges () +-{ +- uid_t uid = getuid (); +- gid_t gid = getgid (); +- +- // drop privileges +-#if HAVE_SETRESUID +- setresgid (gid, gid, gid); +- setresuid (uid, uid, uid); +-#elif HAVE_SETREUID +- setregid (gid, gid); +- setreuid (uid, uid); +-#elif HAVE_SETUID +- setgid (gid); +- setuid (uid); +-#else +-# error no way to drop privileges, configure failed? +-#endif +- +- if (uid != geteuid () +- || gid != getegid ()) +- PTYTTY_FATAL ("unable to drop privileges, aborting.\n"); +-} +- +--- ./libptytty/src/ptytty.h.orig 2014-11-16 06:22:34.000000000 -0600 ++++ ./libptytty/src/ptytty.h 2018-03-31 11:21:57.530400360 -0500 +@@ -8,23 +8,10 @@ + # define NO_SETOWNER_TTYDEV 1 + #endif + +-#if UTMP_SUPPORT +-# if defined(__GLIBC__) +-# undef HAVE_STRUCT_UTMPX +-# endif +- +-# if ! defined(HAVE_STRUCT_UTMPX) && ! defined(HAVE_STRUCT_UTMP) +-# error cannot build with utmp support - no utmp or utmpx struct found +-# endif +- +-#endif +- + struct ptytty_unix : ptytty + { + char *name; + +- void log_session (bool login, const char *hostname); +- + public: + + ptytty_unix (); +@@ -35,13 +22,10 @@ + + void login (int cmd_pid, bool login_shell, const char *hostname); + +-#if UTMP_SUPPORT +- int utmp_pos; + int cmd_pid; + bool login_shell; + + void logout (); +-#endif + }; + + #endif +--- ./libptytty/src/ptytty.C.orig 2015-05-11 17:24:03.000000000 -0500 ++++ ./libptytty/src/ptytty.C 2018-03-31 11:21:57.529400360 -0500 +@@ -217,6 +217,29 @@ + return 0; + } + ++ptytty * ++ptytty::create () ++{ ++ return new ptytty_unix; ++} ++ ++void ++ptytty::sanitise_stdfd () ++{ ++ // sanitise stdin/stdout/stderr to point to *something*. ++ for (int fd = 0; fd <= 2; ++fd) ++ if (fcntl (fd, F_GETFL) < 0 && errno == EBADF) ++ { ++ int fd2 = open ("/dev/tty", fd ? O_WRONLY : O_RDONLY); ++ ++ if (fd2 < 0) ++ fd2 = open ("/dev/null", fd ? O_WRONLY : O_RDONLY); ++ ++ if (fd2 != fd) ++ abort (); ++ } ++} ++ + void + ptytty::close_tty () + { +@@ -287,16 +310,12 @@ + ptytty_unix::ptytty_unix () + { + name = 0; +-#if UTMP_SUPPORT + cmd_pid = 0; +-#endif + } + + ptytty_unix::~ptytty_unix () + { +-#if UTMP_SUPPORT + logout (); +-#endif + put (); + } + +@@ -390,18 +409,6 @@ + } + #endif + +-#if UTMP_SUPPORT +-# if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) +- int fd_stdin = dup (STDIN_FILENO); +- dup2 (tty, STDIN_FILENO); +- +- utmp_pos = ttyslot (); +- +- dup2 (fd_stdin, STDIN_FILENO); +- close (fd_stdin); +-# endif +-#endif +- + return true; + } + +--- ./libptytty/src/logging.C.orig 2014-11-16 06:22:34.000000000 -0600 ++++ ./libptytty/src/logging.C 2018-03-31 11:21:57.527400360 -0500 +@@ -36,251 +36,8 @@ + + #include "ptytty.h" + +-#include <sys/types.h> ++#include "utempter.h" + +-#if UTMP_SUPPORT +- +-#ifdef HAVE_UTMPX_H +-# include <utmpx.h> +-#endif +-#ifdef HAVE_UTMP_H +-# include <utmp.h> +-#endif +-#ifdef HAVE_LASTLOG_H +-# include <lastlog.h> +-#endif +- +-#if !defined(UTMP_FILE) +-# if defined(_PATH_UTMP) +-# define UTMP_FILE _PATH_UTMP +-# elif defined(PT_UTMP_FILE) +-# define UTMP_FILE PT_UTMP_FILE +-# endif +-#endif +-#if !defined(WTMP_FILE) +-# if defined(_PATH_WTMP) +-# define WTMP_FILE _PATH_WTMP +-# elif defined(PT_WTMP_FILE) +-# define WTMP_FILE PT_WTMP_FILE +-# endif +-#endif +-#if !defined(WTMPX_FILE) +-# if defined(_PATH_WTMPX) +-# define WTMPX_FILE _PATH_WTMPX +-# elif defined(PT_WTMPX_FILE) +-# define WTMPX_FILE PT_WTMPX_FILE +-# endif +-#endif +-#if !defined(LASTLOG_FILE) +-# if defined(_PATH_LASTLOG) +-# define LASTLOG_FILE _PATH_LASTLOG +-# elif defined(PT_LASTLOG_FILE) +-# define LASTLOG_FILE PT_LASTLOG_FILE +-# endif +-#endif +-#if !defined(LASTLOGX_FILE) +-# if defined(_PATH_LASTLOGX) +-# define LASTLOGX_FILE _PATH_LASTLOGX +-# elif defined(PT_LASTLOGX_FILE) +-# define LASTLOGX_FILE PT_LASTLOGX_FILE +-# endif +-#endif +- +-#include <pwd.h> +- +-#include <stdio.h> +-#include <string.h> +- +-#include <sys/stat.h> +-#include <fcntl.h> +-#include <unistd.h> +-#include <time.h> +-#include <errno.h> +- +-/* +- * BSD style utmp entry +- * ut_line, ut_name, ut_host, ut_time +- * SYSV style utmp (and utmpx) entry +- * ut_user, ut_id, ut_line, ut_pid, ut_type, ut_exit, ut_time +- */ +- +-/* ------------------------------------------------------------------------- */ +-/* +- * Write a BSD style utmp entry +- */ +-#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) +-static void +-write_bsd_utmp (int utmp_pos, struct utmp *ut) +-{ +- int fd; +- +- if (utmp_pos <= 0 || (fd = open (UTMP_FILE, O_WRONLY)) == -1) +- return; +- +- if (lseek (fd, (off_t) (utmp_pos * sizeof (struct utmp)), SEEK_SET) != -1) +- write (fd, ut, sizeof (struct utmp)); +- close (fd); +-} +-#endif +- +-/* ------------------------------------------------------------------------- */ +-/* +- * Update a BSD style wtmp entry +- */ +-#if defined(WTMP_SUPPORT) && !defined(HAVE_UPDWTMP) && defined(HAVE_STRUCT_UTMP) +-static void +-update_wtmp (const char *fname, const struct utmp *ut) +-{ +- int fd, gotlock, retry; +- struct flock lck; /* fcntl locking scheme */ +- struct stat sbuf; +- +- if ((fd = open (fname, O_WRONLY | O_APPEND, 0)) < 0) +- return; +- +- lck.l_whence = SEEK_END; /* start lock at current eof */ +- lck.l_len = 0; /* end at ``largest possible eof'' */ +- lck.l_start = 0; +- lck.l_type = F_WRLCK; /* we want a write lock */ +- +- /* attempt lock with F_SETLK; F_SETLKW would cause a deadlock! */ +- for (retry = 10, gotlock = 0; retry--;) +- if (fcntl (fd, F_SETLK, &lck) != -1) +- { +- gotlock = 1; +- break; +- } +- else if (errno != EAGAIN && errno != EACCES) +- break; +- +- if (gotlock) +- { +- if (fstat (fd, &sbuf) == 0) +- if (write (fd, ut, sizeof (struct utmp)) != sizeof (struct utmp)) +- ftruncate (fd, sbuf.st_size); /* remove bad writes */ +- +- lck.l_type = F_UNLCK; /* unlocking the file */ +- fcntl (fd, F_SETLK, &lck); +- } +- +- close (fd); +-} +-#endif +- +-/* ------------------------------------------------------------------------- */ +-#ifdef LASTLOG_SUPPORT +-static void +-update_lastlog (const char *pty, const char *host) +-{ +-# if defined(HAVE_STRUCT_LASTLOGX) && defined(HAVE_UPDLASTLOGX) +- struct lastlogx llx; +-# endif +-# ifdef HAVE_STRUCT_LASTLOG +- int fd; +- struct lastlog ll; +-# endif +- +-# if defined(HAVE_STRUCT_LASTLOGX) && defined(HAVE_UPDLASTLOGX) +- memset (&llx, 0, sizeof (llx)); +- llx.ll_tv.tv_sec = time (NULL); +- llx.ll_tv.tv_usec = 0; +- strncpy (llx.ll_line, pty, sizeof (llx.ll_line)); +- strncpy (llx.ll_host, host, sizeof (llx.ll_host)); +- updlastlogx (LASTLOGX_FILE, getuid (), &llx); +-# endif +- +-# ifdef HAVE_STRUCT_LASTLOG +- memset (&ll, 0, sizeof (ll)); +- ll.ll_time = time (NULL); +- strncpy (ll.ll_line, pty, sizeof (ll.ll_line)); +- strncpy (ll.ll_host, host, sizeof (ll.ll_host)); +- if ((fd = open (LASTLOG_FILE, O_RDWR)) != -1) +- { +- if (lseek (fd, (off_t) (getuid () * sizeof (ll)), +- SEEK_SET) != -1) +- write (fd, &ll, sizeof (ll)); +- close (fd); +- } +-# endif /* HAVE_STRUCT_LASTLOG */ +-} +-#endif /* LASTLOG_SUPPORT */ +- +-#if defined(HAVE_UTMP_PID) || defined(HAVE_STRUCT_UTMPX) +-static void +-fill_id (char *id, const char *line, size_t id_size) +-{ +- size_t len = strlen (line); +- +- if (len > id_size) +- line += len - id_size; +- strncpy (id, line, id_size); +-} +-#endif +- +-#ifdef HAVE_STRUCT_UTMP +-static void +-fill_utmp (struct utmp *ut, bool login, int pid, const char *line, const char *user, const char *host) +-{ +- memset (ut, 0, sizeof (struct utmp)); +- +- strncpy (ut->ut_line, line, sizeof (ut->ut_line)); +-# ifdef HAVE_UTMP_PID +- fill_id (ut->ut_id, line, sizeof (ut->ut_id)); +- ut->ut_pid = pid; +- ut->ut_type = login ? USER_PROCESS : DEAD_PROCESS; +-# endif +- ut->ut_time = time (NULL); +- +- if (login) +- { +-# ifdef HAVE_UTMP_PID +- strncpy (ut->ut_user, user, sizeof (ut->ut_user)); +-# else +- strncpy (ut->ut_name, user, sizeof (ut->ut_name)); +-# endif +-# ifdef HAVE_UTMP_HOST +- strncpy (ut->ut_host, host, sizeof (ut->ut_host)); +-# endif +- } +-} +-#endif +- +-#ifdef HAVE_STRUCT_UTMPX +-static void +-fill_utmpx (struct utmpx *utx, bool login, int pid, const char *line, const char *user, const char *host) +-{ +- memset (utx, 0, sizeof (struct utmpx)); +- +- // posix says that ut_line is not meaningful for DEAD_PROCESS +- // records, but most implementations of last use ut_line to +- // associate records in wtmp file +- strncpy (utx->ut_line, line, sizeof (utx->ut_line)); +- fill_id (utx->ut_id, line, sizeof (utx->ut_id)); +- utx->ut_pid = pid; +- utx->ut_type = login ? USER_PROCESS : DEAD_PROCESS; +- utx->ut_tv.tv_sec = time (NULL); +- utx->ut_tv.tv_usec = 0; +- +- // posix says that ut_user is not meaningful for DEAD_PROCESS +- // records, but solaris utmp_update helper requires that the ut_user +- // field of a DEAD_PROCESS entry matches the one of an existing +- // USER_PROCESS entry for the same line, if any +- strncpy (utx->ut_user, user, sizeof (utx->ut_user)); +- +- if (login) +- { +-# ifdef HAVE_UTMPX_HOST +- strncpy (utx->ut_host, host, sizeof (utx->ut_host)); +-# endif +- } +-} +-#endif +- +-/* ------------------------------------------------------------------------- */ +- +-/* +- * make and write utmp and wtmp entries +- */ + void + ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname) + { +@@ -290,97 +47,17 @@ + this->cmd_pid = cmd_pid; + this->login_shell = login_shell; + +- log_session (true, hostname); +-} +- +-void +-ptytty_unix::log_session (bool login, const char *hostname) +-{ +- struct passwd *pwent = getpwuid (getuid ()); +- const char *user = (pwent && pwent->pw_name) ? pwent->pw_name : "?"; +- +- const char *pty = name; +- +- if (!strncmp (pty, "/dev/", 5)) +- pty += 5; /* skip /dev/ prefix */ +- +-#ifdef HAVE_STRUCT_UTMP +- struct utmp *tmput; +- struct utmp ut; +- fill_utmp (&ut, login, cmd_pid, pty, user, hostname); +-#endif +- +-#ifdef HAVE_STRUCT_UTMPX +- struct utmpx *tmputx; +- struct utmpx utx; +- fill_utmpx (&utx, login, cmd_pid, pty, user, hostname); +-#endif +- +-#ifdef HAVE_STRUCT_UTMP +-# ifdef HAVE_UTMP_PID +- setutent (); +- if (login || ((tmput = getutid (&ut)) && tmput->ut_pid == cmd_pid)) +- pututline (&ut); +- endutent (); +-# else +- write_bsd_utmp (utmp_pos, &ut); +-# endif +-#endif +- +-#ifdef HAVE_STRUCT_UTMPX +- setutxent (); +- if (login || ((tmputx = getutxid (&utx)) && tmputx->ut_pid == cmd_pid)) +- pututxline (&utx); +- endutxent (); +-#endif +- +-#ifdef WTMP_SUPPORT +- if (login_shell) +- { +-# ifdef HAVE_STRUCT_UTMP +-# ifdef HAVE_UPDWTMP +- updwtmp (WTMP_FILE, &ut); +-# else +- update_wtmp (WTMP_FILE, &ut); +-# endif +-# endif +-# if defined(HAVE_STRUCT_UTMPX) && defined(HAVE_UPDWTMPX) +- updwtmpx (WTMPX_FILE, &utx); +-# endif +- } +-#endif +- +-#ifdef LASTLOG_SUPPORT +- if (login_shell) +- if (login) +- { +- if (pwent) +- update_lastlog (pty, hostname); +- else +- PTYTTY_WARN ("no entry in password file, not updating lastlog.\n"); +- } +-#endif ++ utempter_add_record(pty, hostname); + } + +-/* ------------------------------------------------------------------------- */ +-/* +- * remove utmp and wtmp entries +- */ + void + ptytty_unix::logout () + { + if (!cmd_pid) + return; + +- log_session (false, 0); ++ utempter_remove_record(pty); + + cmd_pid = 0; + } + +-#else +-void +-ptytty_unix::login (int cmd_pid, bool login_shell, const char *hostname) +-{ +-} +-#endif +- +--- ./src/Makefile.in.orig 2016-01-23 14:09:22.000000000 -0600 ++++ ./src/Makefile.in 2018-03-31 11:21:43.963399092 -0500 +@@ -64,10 +64,10 @@ + all: allbin + + rxvt: rxvt.o $(COMMON) +- $(LINK) -o $@ rxvt.o $(COMMON) $(LIBS) $(XLIB) $(PERLLIB) ++ $(LINK) -o $@ rxvt.o $(COMMON) $(LIBS) $(XLIB) $(PERLLIB) -lutempter + + rxvtd: rxvtd.o $(COMMON) $(COMMON_DAEMON) +- $(LINK) -o $@ rxvtd.o $(COMMON) $(COMMON_DAEMON) $(LIBS) $(XLIB) $(PERLLIB) ++ $(LINK) -o $@ rxvtd.o $(COMMON) $(COMMON_DAEMON) $(LIBS) $(XLIB) $(PERLLIB) -lutempter + + rxvtc: rxvtc.o $(COMMON_DAEMON) fdpass_wrapper.o + $(LINK) -o $@ rxvtc.o $(COMMON_DAEMON) fdpass_wrapper.o $(LIBS) +@@ -205,7 +205,7 @@ + ptytty_wrapper.o: ../libptytty/src/libptytty.h rxvtperl.h hookinc.h rsinc.h + ptytty_wrapper.o: optinc.h ../libptytty/src/logging.C + ptytty_wrapper.o: ../libptytty/src/ptytty.h ../libptytty/src/ptytty_conf.h +-ptytty_wrapper.o: ../libptytty/src/proxy.C ../libptytty/src/ptytty.C ++ptytty_wrapper.o: ../libptytty/src/ptytty.C + rxvt.o: ../config.h rxvt.h feature.h ../libptytty/src/ecb.h encoding.h + rxvt.o: rxvtutil.h ../libptytty/src/estl.h emman.h rxvtfont.h rxvttoolkit.h + rxvt.o: ev_cpp.h ../config.h ../libev/ev++.h ../libev/ev.h callback.h +--- ./src/rxvt.C.orig 2014-12-12 19:00:23.000000000 -0600 ++++ ./src/rxvt.C 2018-03-31 11:21:43.965399092 -0500 +@@ -30,7 +30,7 @@ + main (int argc, char *argv[]) + try + { +- ptytty::init (); ++ ptytty::sanitise_stdfd (); + rxvt_init (); + + rxvt_term *t = new rxvt_term; +--- ./src/ptytty_wrapper.C.orig 2014-12-12 19:00:23.000000000 -0600 ++++ ./src/ptytty_wrapper.C 2018-03-31 11:21:43.961399092 -0500 +@@ -7,5 +7,4 @@ + #define PTYTTY_WARN rxvt_warn + + #include "logging.C" +-#include "proxy.C" + #include "ptytty.C" +--- ./src/rxvtd.C.orig 2014-12-26 16:34:13.000000000 -0600 ++++ ./src/rxvtd.C 2018-03-31 11:21:43.960399092 -0500 +@@ -227,7 +227,7 @@ + int + main (int argc, char *argv[]) + { +- ptytty::init (); ++ ptytty::sanitise_stdfd (); + + static char opt_fork, opt_opendisplay, opt_quiet; + #if ENABLE_PERL diff --git a/source/xap/rxvt-unicode/slack-desc b/source/xap/rxvt-unicode/slack-desc new file mode 100644 index 000000000..d6388cadf --- /dev/null +++ b/source/xap/rxvt-unicode/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# 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 +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +rxvt-unicode: rxvt-unicode (terminal emulator) +rxvt-unicode: +rxvt-unicode: rxvt-unicode is a color vt102 terminal emulator based on rxvt. +rxvt-unicode: Features of rxvt-unicode include international language support +rxvt-unicode: through Unicode, transparency, the ability to display multiple font +rxvt-unicode: types and support for Perl extensions. +rxvt-unicode: +rxvt-unicode: Homepage: http://software.schmorp.de/pkg/rxvt-unicode.html +rxvt-unicode: +rxvt-unicode: +rxvt-unicode: diff --git a/source/xap/rxvt/rxvt.SlackBuild b/source/xap/rxvt/rxvt.SlackBuild deleted file mode 100755 index 6f72fd69b..000000000 --- a/source/xap/rxvt/rxvt.SlackBuild +++ /dev/null @@ -1,122 +0,0 @@ -#!/bin/sh - -# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -PKGNAM=rxvt -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i486 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -NUMJOBS=${NUMJOBS:-" -j7 "} - -if [ "$ARCH" = "i386" ]; then - SLKCFLAGS="-O2 -march=i386 -mcpu=i686" -elif [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" -elif [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" -else - SLKCFLAGS="-O2" -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-rxvt -rm -rf $PKG -mkdir -p $TMP $PKG - -cd $TMP -rm -rf rxvt-$VERSION -tar xvf $CWD/rxvt-$VERSION.tar.bz2 || exit 1 -cd rxvt-$VERSION || exit 1 -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; -zcat $CWD/rxvt.utempter.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 - -CFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --enable-languages \ - --enable-utmp \ - --enable-wtmp \ - --enable-xpm-background \ - --enable-transparency \ - --enable-menubar \ - --enable-graphics \ - --enable-rxvt-scroll \ - --enable-next-scroll \ - --enable-xterm-scroll \ - --enable-xim \ - --enable-frills \ - --enable-linespace \ - --enable-24bit \ - --enable-keepscrolling \ - --enable-mousewheel \ - --enable-slipwheeling \ - --enable-xgetdefault \ - --enable-old-selection \ - $ARCH-slackware-linux - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -rmdir $PKG/usr/lib $PKG/usr/include -rm $PKG/usr/bin/rxvt-$VERSION -mkdir -p $PKG/usr/doc/rxvt-$VERSION -cp -a \ - rxvt-$VERSION.lsm doc rclock/rclock.html \ - $PKG/usr/doc/rxvt-$VERSION -rm -r $PKG/usr/doc/rxvt-$VERSION/doc/yodl - -gzip -9 $PKG/usr/man/man1/* - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/rxvt-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/xap/rxvt/rxvt.utempter.diff b/source/xap/rxvt/rxvt.utempter.diff deleted file mode 100644 index 54e06f7af..000000000 --- a/source/xap/rxvt/rxvt.utempter.diff +++ /dev/null @@ -1,277 +0,0 @@ ---- ./src/logging.c.orig 2002-12-15 16:33:04.000000000 -0800 -+++ ./src/logging.c 2003-06-07 21:08:52.000000000 -0700 -@@ -60,157 +60,7 @@ - void - rxvt_makeutent(rxvt_t *r, const char *pty, const char *hostname) - { --#ifdef HAVE_STRUCT_UTMP -- struct utmp *ut = &(r->h->ut); --#endif --#ifdef HAVE_STRUCT_UTMPX -- struct utmpx *utx = &(r->h->utx); --#endif --#ifdef HAVE_UTMP_PID -- int i; --#endif -- char ut_id[5]; -- struct passwd *pwent = getpwuid(getuid()); -- -- if (!STRNCMP(pty, "/dev/", 5)) -- pty += 5; /* skip /dev/ prefix */ -- -- if (!STRNCMP(pty, "pty", 3) || !STRNCMP(pty, "tty", 3)) { -- STRNCPY(ut_id, (pty + 3), sizeof(ut_id)); -- } --#ifdef HAVE_UTMP_PID -- else if (sscanf(pty, "pts/%d", &i) == 1) -- sprintf(ut_id, "vt%02x", (i & 0xff)); /* sysv naming */ --#endif -- else if (STRNCMP(pty, "pty", 3) && STRNCMP(pty, "tty", 3)) { -- rxvt_print_error("can't parse tty name \"%s\"", pty); -- return; -- } -- --#ifdef HAVE_STRUCT_UTMP -- MEMSET(ut, 0, sizeof(struct utmp)); --# ifdef HAVE_UTMP_PID -- setutent(); -- STRNCPY(ut->ut_id, ut_id, sizeof(ut->ut_id)); -- ut->ut_type = DEAD_PROCESS; -- getutid(ut); /* position to entry in utmp file */ -- STRNCPY(r->h->ut_id, ut_id, sizeof(r->h->ut_id)); --# endif --#endif -- --#ifdef HAVE_STRUCT_UTMPX -- MEMSET(utx, 0, sizeof(struct utmpx)); -- setutxent(); -- STRNCPY(utx->ut_id, ut_id, sizeof(utx->ut_id)); -- utx->ut_type = DEAD_PROCESS; -- getutxid(utx); /* position to entry in utmp file */ -- STRNCPY(r->h->ut_id, ut_id, sizeof(r->h->ut_id)); --#endif -- --#ifdef HAVE_STRUCT_UTMP -- STRNCPY(ut->ut_line, pty, sizeof(ut->ut_line)); -- ut->ut_time = time(NULL); --# ifdef HAVE_UTMP_PID -- STRNCPY(ut->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?", -- sizeof(ut->ut_user)); -- STRNCPY(ut->ut_id, ut_id, sizeof(ut->ut_id)); -- ut->ut_time = time(NULL); -- ut->ut_pid = r->h->cmd_pid; --# ifdef HAVE_UTMP_HOST -- STRNCPY(ut->ut_host, hostname, sizeof(ut->ut_host)); --# endif -- ut->ut_type = USER_PROCESS; -- pututline(ut); -- endutent(); /* close the file */ -- r->h->utmp_pos = -1; --# else -- STRNCPY(ut->ut_name, (pwent && pwent->pw_name) ? pwent->pw_name : "?", -- sizeof(ut->ut_name)); --# ifdef HAVE_UTMP_HOST -- STRNCPY(ut->ut_host, hostname, sizeof(ut->ut_host)); --# endif --# endif --#endif -- --#ifdef HAVE_STRUCT_UTMPX -- STRNCPY(utx->ut_line, pty, sizeof(utx->ut_line)); -- STRNCPY(utx->ut_user, (pwent && pwent->pw_name) ? pwent->pw_name : "?", -- sizeof(utx->ut_user)); -- STRNCPY(utx->ut_id, ut_id, sizeof(utx->ut_id)); -- utx->ut_session = getsid(0); -- utx->ut_tv.tv_sec = time(NULL); -- utx->ut_tv.tv_usec = 0; -- utx->ut_pid = r->h->cmd_pid; --# ifdef HAVE_UTMPX_HOST -- STRNCPY(utx->ut_host, hostname, sizeof(utx->ut_host)); --# if 0 -- { -- char *colon; -- -- if ((colon = STRRCHR(ut->ut_host, ':')) != NULL) -- *colon = '\0'; -- } --# endif --# endif -- utx->ut_type = USER_PROCESS; -- pututxline(utx); -- endutxent(); /* close the file */ -- r->h->utmp_pos = -1; --#endif -- --#if defined(HAVE_STRUCT_UTMP) && !defined(HAVE_UTMP_PID) -- { -- int i; --# ifdef HAVE_TTYSLOT -- i = ttyslot(); -- if (rxvt_write_bsd_utmp(i, ut)) -- r->h->utmp_pos = i; --# else -- FILE *fd0; -- -- if ((fd0 = fopen(TTYTAB_FILENAME, "r")) != NULL) { -- char buf[256], name[256]; -- -- buf[sizeof(buf) - 1] = '\0'; -- for (i = 1; (fgets(buf, sizeof(buf) - 1, fd0) != NULL);) { -- if (*buf == '#' || sscanf(buf, "%s", name) != 1) -- continue; -- if (!STRCMP(ut->ut_line, name)) { -- if (!rxvt_write_bsd_utmp(i, ut)) -- i = 0; -- r->h->utmp_pos = i; -- fclose(fd0); -- break; -- } -- i++; -- } -- fclose(fd0); -- } --# endif -- } --#endif -- --#ifdef WTMP_SUPPORT --# ifdef WTMP_ONLY_ON_LOGIN -- if (r->Options & Opt_loginShell) --# endif -- { --# ifdef HAVE_STRUCT_UTMP --# ifdef HAVE_UPDWTMP -- updwtmp(RXVT_WTMP_FILE, ut); --# else -- rxvt_update_wtmp(RXVT_WTMP_FILE, ut); --# endif --# endif --# ifdef HAVE_STRUCT_UTMPX -- updwtmpx(RXVT_WTMPX_FILE, utx); --# endif -- } --#endif --#if defined(LASTLOG_SUPPORT) && defined(RXVT_LASTLOG_FILE) -- if (r->Options & Opt_loginShell) -- rxvt_update_lastlog(RXVT_LASTLOG_FILE, pty, hostname); --#endif -+ addToUtmp(pty, NULL, r->cmd_fd); - } - - /* ------------------------------------------------------------------------- */ -@@ -221,85 +71,7 @@ - void - rxvt_cleanutent(rxvt_t *r) - { --#ifdef HAVE_STRUCT_UTMP -- struct utmp *tmput, *ut = &(r->h->ut); --#endif --#ifdef HAVE_STRUCT_UTMPX -- struct utmpx *tmputx, *utx = &(r->h->utx); --#endif -- --#ifdef HAVE_STRUCT_UTMP --# ifdef HAVE_UTMP_PID -- MEMSET(ut, 0, sizeof(struct utmp)); -- setutent(); -- STRNCPY(ut->ut_id, r->h->ut_id, sizeof(ut->ut_id)); -- ut->ut_type = USER_PROCESS; -- if ((tmput = getutid(ut))) /* position to entry in utmp file */ -- ut = tmput; -- ut->ut_type = DEAD_PROCESS; --# else -- MEMSET(ut->ut_name, 0, sizeof(ut->ut_name)); --# ifdef HAVE_UTMP_HOST -- MEMSET(ut->ut_host, 0, sizeof(ut->ut_host)); --# endif --# endif -- ut->ut_time = time(NULL); --#endif -- --#ifdef HAVE_STRUCT_UTMPX -- MEMSET(utx, 0, sizeof(struct utmpx)); -- setutxent(); -- STRNCPY(utx->ut_id, r->h->ut_id, sizeof(utx->ut_id)); -- utx->ut_type = USER_PROCESS; -- if ((tmputx = getutxid(utx))) /* position to entry in utmp file */ -- utx = tmputx; -- utx->ut_type = DEAD_PROCESS; -- utx->ut_session = getsid(0); -- utx->ut_tv.tv_sec = time(NULL); -- utx->ut_tv.tv_usec = 0; --#endif -- -- /* -- * Write ending wtmp entry -- */ --#ifdef WTMP_SUPPORT --# ifdef WTMP_ONLY_ON_LOGIN -- if (r->Options & Opt_loginShell) --# endif -- { --# ifdef HAVE_STRUCT_UTMP --# ifdef HAVE_UPDWTMP -- updwtmp(RXVT_WTMP_FILE, ut); --# else -- rxvt_update_wtmp(RXVT_WTMP_FILE, ut); --# endif --# endif --# ifdef HAVE_STRUCT_UTMPX -- updwtmpx(RXVT_WTMPX_FILE, utx); --# endif -- } --#endif -- -- /* -- * Write utmp entry -- */ --#ifdef HAVE_STRUCT_UTMP --# ifdef HAVE_UTMP_PID -- if (ut->ut_pid == r->h->cmd_pid) -- pututline(ut); -- endutent(); --# else -- if (r->h->utmp_pos > 0) { -- MEMSET(ut, 0, sizeof(struct utmp)); -- rxvt_write_bsd_utmp(r->h->utmp_pos, ut); -- } --# endif --#endif --#ifdef HAVE_STRUCT_UTMPX -- if (utx->ut_pid == r->h->cmd_pid) -- pututxline(utx); -- endutxent(); --#endif -+ removeFromUtmp(); - } - - /* ------------------------------------------------------------------------- */ ---- ./src/init.c.orig 2002-12-03 21:21:39.000000000 -0800 -+++ ./src/init.c 2003-06-07 21:09:26.000000000 -0700 -@@ -858,6 +858,7 @@ - rxvt_print_error("aborting"); - exit(EXIT_FAILURE); - } -+ rxvt_privileged_utmp(r, SAVE); - } - - /*----------------------------------------------------------------------*/ -@@ -1364,7 +1365,6 @@ - #endif - r->num_fds++; /* counts from 0 */ - -- rxvt_privileged_utmp(r, SAVE); - return cfd; - } - ---- ./autoconf/Make.common.in.orig 2001-11-29 19:22:56.000000000 -0800 -+++ ./autoconf/Make.common.in 2003-06-07 21:08:52.000000000 -0700 -@@ -68,7 +68,7 @@ - - LIBTOOL = @LIBTOOL@ - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(DEBUG) $(DINCLUDE) $(XINC) -I$(basedir) -I$(srcdir) -I. --LINK = $(CC) $(CFLAGS) $(LDFLAGS) -+LINK = $(CC) $(CFLAGS) $(LDFLAGS) -lutempter -lutil - - # End of common section of the Makefile - #------------------------------------------------------------------------- diff --git a/source/xap/rxvt/slack-desc b/source/xap/rxvt/slack-desc deleted file mode 100644 index 5f278d61c..000000000 --- a/source/xap/rxvt/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# 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 -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -rxvt: rxvt (terminal emulator) -rxvt: -rxvt: rxvt is a color vt102 terminal emulator intended as an xterm -rxvt: replacement for users who do not require features such as Tektronix -rxvt: 4014 emulation and toolkit-style configurability. As a result, rxvt -rxvt: uses much less memory -- a significant advantage on a machine serving -rxvt: many X sessions. Also included is rclock, an analog clock for X. -rxvt: -rxvt: -rxvt: -rxvt: diff --git a/source/xap/sane/sane.SlackBuild b/source/xap/sane/sane.SlackBuild index 7a43a1a5c..e14b943b1 100755 --- a/source/xap/sane/sane.SlackBuild +++ b/source/xap/sane/sane.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2012, 2013 Patrick Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2018 Patrick Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,10 +20,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=1.0.25 -BACKVER=1.0.25 +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=sane +VERSION=1.0.27 +BACKVER=1.0.27 FRONTVER=1.0.14 -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -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 + NUMJOBS=${NUMJOBS:-" -j7 "} if [ "$ARCH" = "i586" ]; then @@ -51,7 +62,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-sane @@ -62,7 +72,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf sane-backends-$BACKVER tar xvf $CWD/sane-backends-$BACKVER.tar.xz || exit 1 -cd sane-backends-$BACKVER +cd sane-backends-$BACKVER || exit 1 chown -R root:root . # Put the SANE_CAP_ALWAYS_SETTABLE definition back until @@ -75,13 +85,14 @@ CFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --mandir=/usr/man \ - --with-docdir=/usr/doc/sane-$VERSION \ + --docdir=/usr/doc/sane-$VERSION \ --localstatedir=/var/lib \ --enable-locking \ --with-lockdir=/var/lock/sane \ --with-group=scanner \ - --enable-libusb_1_0 \ - --build=$ARCH-slackware-linux + --with-usb \ + --without-api-spec \ + --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 make install || exit 1 @@ -113,7 +124,7 @@ install -D -m644 tools/sane-backends.pc \ cd $TMP rm -rf sane-frontends-$FRONTVER tar xvf $CWD/sane-frontends-$FRONTVER.tar.xz || exit 1 -cd sane-frontends-$FRONTVER +cd sane-frontends-$FRONTVER || exit 1 chown -R root:root . CFLAGS="$SLKCFLAGS" \ @@ -123,7 +134,7 @@ CFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --mandir=/usr/man \ --with-docdir=/usr/doc/sane-$VERSION \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 make install || exit 1 @@ -139,6 +150,9 @@ chmod 775 $PKG/var/lock/sane find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + # List additional backends in /etc/sane.d/dll.conf. # I don't think it will hurt anything to do this, even # if these backends turn out not to be available: diff --git a/source/xap/sane/slack-desc b/source/xap/sane/slack-desc index 787dbd6f2..44ef6348e 100644 --- a/source/xap/sane/slack-desc +++ b/source/xap/sane/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 customary to +# 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/seamonkey/autoconf/autoconf-2.13-consolidated_fixes-1.patch b/source/xap/seamonkey/autoconf/autoconf-2.13-consolidated_fixes-1.patch new file mode 100644 index 000000000..5e7b23113 --- /dev/null +++ b/source/xap/seamonkey/autoconf/autoconf-2.13-consolidated_fixes-1.patch @@ -0,0 +1,504 @@ +Submitted By: Ken Moffat <ken at linuxfromscratch dot org> +Date: 2016-06-11 +Initial Package Version: 2.13 +Upstream Status: Version is historic and unmaintained. +Origin: Found at fedora, plus fixes for LFS. +Description: All of the patches currently used by fedora, except for +the patch which ensures gawk is used in preference to mawk (we do not +install mawk). For LFS: we put mktemp in /usr/bin not /bin, remove +the install-info target because that will overwrite standards.info +with an old version (fedora always use a DESTDIR), and change the +man and info dirs to ${datadir}/ i.e. /usr/share (an empty /usr/info +will otherwise be created). + +diff -Naur a/acgeneral.m4 b/acgeneral.m4 +--- a/acgeneral.m4 1999-01-05 13:27:37.000000000 +0000 ++++ b/acgeneral.m4 2016-06-11 00:18:24.429043947 +0100 +@@ -1817,10 +1817,6 @@ + [cat > conftest.$ac_ext <<EOF + [#]line __oline__ "configure" + #include "confdefs.h" +-ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus +-extern "C" void exit(int); +-#endif +-])dnl + [$1] + EOF + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +@@ -1988,12 +1984,12 @@ + AC_MSG_CHECKING(size of $1) + AC_CACHE_VAL(AC_CV_NAME, + [AC_TRY_RUN([#include <stdio.h> +-main() ++int main() + { + FILE *f=fopen("conftestval", "w"); +- if (!f) exit(1); ++ if (!f) return(1); + fprintf(f, "%d\n", sizeof($1)); +- exit(0); ++ return(0); + }], AC_CV_NAME=`cat conftestval`, AC_CV_NAME=0, ifelse([$2], , , AC_CV_NAME=$2))])dnl + AC_MSG_RESULT($AC_CV_NAME) + AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME) +@@ -2160,20 +2156,38 @@ + dnl AC_OUTPUT_MAKE_DEFS() + define(AC_OUTPUT_MAKE_DEFS, + [# Transform confdefs.h into DEFS. +-dnl Using a here document instead of a string reduces the quoting nightmare. + # Protect against shell expansion while executing Makefile rules. + # Protect against Makefile macro expansion. +-cat > conftest.defs <<\EOF ++# ++# If the first sed substitution is executed (which looks for macros that ++# take arguments), then we branch to the quote section. Otherwise, ++# look for a macro that doesn't take arguments. ++cat >confdef2opt.sed <<\_ACEOF + changequote(<<, >>)dnl +-s%<<#define>> \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g +-s%[ `~<<#>>$^&*(){}\\|;'"<>?]%\\&%g +-s%\[%\\&%g +-s%\]%\\&%g +-s%\$%$$%g ++t clear ++: clear ++s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g ++t quote ++s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g ++t quote ++d ++: quote ++s,[ `~#$^&*(){}\\|;'"<>?],\\&,g ++s,\[,\\&,g ++s,\],\\&,g ++s,\$,$$,g ++p + changequote([, ])dnl +-EOF +-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` +-rm -f conftest.defs ++_ACEOF ++# We use echo to avoid assuming a particular line-breaking character. ++# The extra dot is to prevent the shell from consuming trailing ++# line-breaks from the sub-command output. A line-break within ++# single-quotes doesn't work because, if this script is created in a ++# platform that uses two characters for line-breaks (e.g., DOS), tr ++# would break. ++ac_LF_and_DOT=`echo; echo .` ++DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` ++rm -f confdef2opt.sed + ]) + + dnl Do the variable substitutions to create the Makefiles or whatever. +diff -Naur a/acspecific.m4 b/acspecific.m4 +--- a/acspecific.m4 1999-01-05 13:27:52.000000000 +0000 ++++ b/acspecific.m4 2016-06-11 00:18:17.533078644 +0100 +@@ -152,8 +152,41 @@ + CXXFLAGS= + fi + fi ++ ++AC_PROG_CXX_EXIT_DECLARATION + ]) + ++ ++# AC_PROG_CXX_EXIT_DECLARATION ++# ----------------------------- ++# Find a valid prototype for exit and declare it in confdefs.h. ++AC_DEFUN(AC_PROG_CXX_EXIT_DECLARATION, ++[for ac_declaration in \ ++ ''\ ++ '#include <stdlib.h>' \ ++ 'extern "C" void std::exit (int) throw (); using std::exit;' \ ++ 'extern "C" void std::exit (int); using std::exit;' \ ++ 'extern "C" void exit (int) throw ();' \ ++ 'extern "C" void exit (int);' \ ++ 'void exit (int);' ++do ++ AC_TRY_COMPILE([#include <stdlib.h> ++$ac_declaration], ++ [exit (42);], ++ [], ++ [continue]) ++ AC_TRY_COMPILE([$ac_declaration], ++ [exit (42);], ++ [break]) ++done ++if test -n "$ac_declaration"; then ++ echo '#ifdef __cplusplus' >>confdefs.h ++ echo $ac_declaration >>confdefs.h ++ echo '#endif' >>confdefs.h ++fi ++])# AC_PROG_CXX_EXIT_DECLARATION ++ ++ + dnl Determine a Fortran 77 compiler to use. If `F77' is not already set + dnl in the environment, check for `g77', `f77' and `f2c', in that order. + dnl Set the output variable `F77' to the name of the compiler found. +@@ -1010,7 +1043,7 @@ + ]) + + AC_DEFUN(AC_FUNC_MMAP, +-[AC_CHECK_HEADERS(unistd.h) ++[AC_CHECK_HEADERS(stdlib.h unistd.h sys/stat.h sys/types.h) + AC_CHECK_FUNCS(getpagesize) + AC_CACHE_CHECK(for working mmap, ac_cv_func_mmap_fixed_mapped, + [AC_TRY_RUN([ +@@ -1039,11 +1072,24 @@ + #include <fcntl.h> + #include <sys/mman.h> + ++#if HAVE_SYS_TYPES_H ++# include <sys/types.h> ++#endif ++ ++#if HAVE_STDLIB_H ++# include <stdlib.h> ++#endif ++ ++#if HAVE_SYS_STAT_H ++# include <sys/stat.h> ++#endif ++ ++#if HAVE_UNISTD_H ++# include <unistd.h> ++#endif ++ + /* This mess was copied from the GNU getpagesize.h. */ + #ifndef HAVE_GETPAGESIZE +-# ifdef HAVE_UNISTD_H +-# include <unistd.h> +-# endif + + /* Assume that all systems that can run configure have sys/param.h. */ + # ifndef HAVE_SYS_PARAM_H +@@ -1373,6 +1419,8 @@ + r.ru_majflt = r.ru_minflt = 0; + switch (fork()) { + case 0: /* Child. */ ++ /* Unless we actually _do_ something, the kernel sometimes doesn't chalk up any system time to this process. */ ++ if(fork()) { i = 123; wait(NULL); } else { i = 234; exit(0); } + sleep(1); /* Give up the CPU. */ + _exit(0); + case -1: _exit(0); /* What can we do? */ +diff -Naur a/autoconf.sh b/autoconf.sh +--- a/autoconf.sh 1999-01-05 13:27:53.000000000 +0000 ++++ b/autoconf.sh 2016-06-11 00:22:17.351872133 +0100 +@@ -45,20 +45,20 @@ + esac + + : ${TMPDIR=/tmp} +-tmpout=${TMPDIR}/acout.$$ ++tmpout=`/usr/bin/mktemp ${TMPDIR}/acout.XXXXXX` + localdir= + show_version=no + + while test $# -gt 0 ; do + case "${1}" in + -h | --help | --h* ) +- echo "${usage}" 1>&2; exit 0 ;; ++ echo "${usage}" 1>&2; rm -f $tmpout ; exit 0 ;; + --localdir=* | --l*=* ) + localdir="`echo \"${1}\" | sed -e 's/^[^=]*=//'`" + shift ;; + -l | --localdir | --l*) + shift +- test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } ++ test $# -eq 0 && { echo "${usage}" 1>&2; rm -f $tmpout; exit 1; } + localdir="${1}" + shift ;; + --macrodir=* | --m*=* ) +@@ -66,7 +66,7 @@ + shift ;; + -m | --macrodir | --m* ) + shift +- test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } ++ test $# -eq 0 && { echo "${usage}" 1>&2; rm -f $tmpout; exit 1; } + AC_MACRODIR="${1}" + shift ;; + --version | --v* ) +@@ -76,7 +76,7 @@ + - ) # Use stdin as input. + break ;; + -* ) +- echo "${usage}" 1>&2; exit 1 ;; ++ echo "${usage}" 1>&2; rm -f $tmpout; exit 1 ;; + * ) + break ;; + esac +@@ -86,23 +86,25 @@ + version=`sed -n 's/define.AC_ACVERSION.[ ]*\([0-9.]*\).*/\1/p' \ + $AC_MACRODIR/acgeneral.m4` + echo "Autoconf version $version" ++ rm -f $tmpout + exit 0 + fi + + case $# in + 0) infile=configure.in ;; + 1) infile="$1" ;; +- *) echo "$usage" >&2; exit 1 ;; ++ *) echo "$usage" >&2; rm -f $tmpout; exit 1 ;; + esac + + trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15 + +-tmpin=${TMPDIR}/acin.$$ # Always set this, to avoid bogus errors from some rm's. ++tmpin=`/usr/bin/mktemp ${TMPDIR}/acin.XXXXXX` ++# Always set this, to avoid bogus errors from some rm's. + if test z$infile = z-; then + infile=$tmpin +- cat > $infile + elif test ! -r "$infile"; then + echo "autoconf: ${infile}: No such file or directory" >&2 ++ rm -f $tmpin $tmpout + exit 1 + fi + +@@ -111,6 +113,8 @@ + else + use_localdir= + fi ++# Make sure we don't leave those around - they are annoying ++trap 'rm -f $tmpin $tmpout' 0 + + # Use the frozen version of Autoconf if available. + r= f= +@@ -118,7 +122,7 @@ + case `$M4 --help < /dev/null 2>&1` in + *reload-state*) test -r $AC_MACRODIR/autoconf.m4f && { r=--reload f=f; } ;; + *traditional*) ;; +-*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin; exit 1 ;; ++*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin $tmpout; exit 1 ;; + esac + + $M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout || +@@ -154,6 +158,6 @@ + /__oline__/s/^\([0-9][0-9]*\):\(.*\)__oline__/\2\1/ + ' >&4 + +-rm -f $tmpout ++rm -f $tmpout $tmpin + + exit $status +diff -Naur a/autoconf.texi b/autoconf.texi +--- a/autoconf.texi 1999-01-05 13:28:37.000000000 +0000 ++++ b/autoconf.texi 2016-06-11 00:18:46.360933604 +0100 +@@ -1,7 +1,7 @@ + \input texinfo @c -*-texinfo-*- + @c %**start of header +-@setfilename autoconf.info +-@settitle Autoconf ++@setfilename autoconf.info ++@settitle Autoconf + @c For double-sided printing, uncomment: + @c @setchapternewpage odd + @c %**end of header +@@ -17,7 +17,8 @@ + @ifinfo + @format + START-INFO-DIR-ENTRY +-* Autoconf: (autoconf). Create source code configuration scripts. ++* Autoconf: (autoconf). Create source code configuration scripts. ++ This is a legacy version of autoconf. + END-INFO-DIR-ENTRY + @end format + +diff -Naur a/autoheader.sh b/autoheader.sh +--- a/autoheader.sh 1999-01-05 13:28:39.000000000 +0000 ++++ b/autoheader.sh 2016-06-11 00:22:17.351872133 +0100 +@@ -194,9 +194,9 @@ + # Some fgrep's have limits on the number of lines that can be in the + # pattern on the command line, so use a temporary file containing the + # pattern. +- (fgrep_tmp=${TMPDIR-/tmp}/autoh$$ ++ (fgrep_tmp=`/usr/bin/mktemp ${TMPDIR-/tmp}/autoh$$.XXXXXX` + trap "rm -f $fgrep_tmp; exit 1" 1 2 15 +- cat > $fgrep_tmp <<EOF ++ cat >> $fgrep_tmp <<EOF + $syms + EOF + fgrep -f $fgrep_tmp +diff -Naur a/autoupdate.sh b/autoupdate.sh +--- a/autoupdate.sh 1999-01-05 13:28:42.000000000 +0000 ++++ b/autoupdate.sh 2016-06-11 00:23:19.151561252 +0100 +@@ -26,7 +26,7 @@ + Usage: autoupdate [-h] [--help] [-m dir] [--macrodir=dir] + [--version] [template-file]" + +-sedtmp=/tmp/acups.$$ ++sedtmp=`/usr/bin/mktemp /tmp/acups.XXXXXX` + # For debugging. + #sedtmp=/tmp/acups + show_version=no +@@ -35,13 +35,13 @@ + while test $# -gt 0 ; do + case "${1}" in + -h | --help | --h* ) +- echo "${usage}" 1>&2; exit 0 ;; ++ echo "${usage}" 1>&2; rm -f $sedtmp; exit 0 ;; + --macrodir=* | --m*=* ) + AC_MACRODIR="`echo \"${1}\" | sed -e 's/^[^=]*=//'`" + shift ;; + -m | --macrodir | --m* ) + shift +- test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } ++ test $# -eq 0 && { echo "${usage}" 1>&2; rm -f $sedtmp; exit 1; } + AC_MACRODIR="${1}" + shift ;; + --version | --versio | --versi | --vers) +@@ -51,7 +51,7 @@ + - ) # Use stdin as input. + break ;; + -* ) +- echo "${usage}" 1>&2; exit 1 ;; ++ echo "${usage}" 1>&2; rm -f $sedtmp; exit 1 ;; + * ) + break ;; + esac +@@ -61,6 +61,7 @@ + version=`sed -n 's/define.AC_ACVERSION.[ ]*\([0-9.]*\).*/\1/p' \ + $AC_MACRODIR/acgeneral.m4` + echo "Autoconf version $version" ++ rm -f $sedtmp + exit 0 + fi + +@@ -68,6 +69,7 @@ + + tmpout=acupo.$$ + trap 'rm -f $sedtmp $tmpout; exit 1' 1 2 15 ++trap 'rm -f $sedtmp' 0 + case $# in + 0) infile=configure.in; out="> $tmpout" + # Make sure $infile can be read, and $tmpout has the same permissions. +diff -Naur a/configure b/configure +--- a/configure 1999-01-05 13:28:57.000000000 +0000 ++++ b/configure 2016-06-11 00:50:57.771231914 +0100 +@@ -43,8 +43,8 @@ + libdir='${exec_prefix}/lib' + includedir='${prefix}/include' + oldincludedir='/usr/include' +-infodir='${prefix}/info' +-mandir='${prefix}/man' ++infodir='${datadir}/info' ++mandir='${datadir}/man' + + # Initialize some other variables. + subdirs= +diff -Naur a/Makefile.in b/Makefile.in +--- a/Makefile.in 1999-01-05 13:27:16.000000000 +0000 ++++ b/Makefile.in 2016-06-11 00:29:34.005678107 +0100 +@@ -49,7 +49,7 @@ + + # Directory in which to install library files. + datadir = @datadir@ +-acdatadir = $(datadir)/autoconf ++acdatadir = $(datadir)/autoconf-2.13 + + # Directory in which to install documentation info files. + infodir = @infodir@ +@@ -68,8 +68,8 @@ + DISTFILES = AUTHORS COPYING ChangeLog ChangeLog.1 INSTALL \ + Makefile.in NEWS README TODO $(M4FILES) \ + acconfig.h acfunctions acheaders acidentifiers \ +- acmakevars acprograms autoconf.info* \ +- autoconf.sh autoconf.texi install.texi \ ++ acmakevars acprograms autoconf.info* \ ++ autoconf.sh autoconf.texi install.texi \ + autoheader.sh autoscan.pl autoreconf.sh autoupdate.sh ifnames.sh \ + config.guess config.sub configure configure.in \ + install-sh mkinstalldirs texinfo.tex \ +@@ -106,11 +106,11 @@ + autoconf.m4f: autoconf.m4 acgeneral.m4 acspecific.m4 acoldnames.m4 + autoheader.m4f: autoheader.m4 acgeneral.m4 acspecific.m4 acoldnames.m4 + +-info: autoconf.info @standards_info@ INSTALL ++info: autoconf.info @standards_info@ INSTALL + + # Use --no-split to avoid creating filenames > 14 chars. +-autoconf.info: autoconf.texi install.texi +- $(MAKEINFO) -I$(srcdir) $(srcdir)/autoconf.texi --no-split --output=$@ ++autoconf.info: autoconf.texi install.texi ++ $(MAKEINFO) -I$(srcdir) $(srcdir)/autoconf.texi --no-split --output=$@ + + INSTALL: install.texi + $(MAKEINFO) -I$(srcdir) $(srcdir)/install.texi --output=$@ \ +@@ -121,8 +121,8 @@ + + dvi: autoconf.dvi @standards_dvi@ + +-autoconf.dvi: autoconf.texi +- $(TEXI2DVI) $(srcdir)/autoconf.texi ++autoconf.dvi: autoconf.texi ++ $(TEXI2DVI) $(srcdir)/autoconf.texi + + standards.dvi: standards.texi make-stds.texi + $(TEXI2DVI) $(srcdir)/standards.texi +@@ -137,35 +137,35 @@ + cd testsuite && ${MAKE} AUTOCONF=${bindir}/autoconf $@ + + installdirs: +- $(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir) $(acdatadir) ++ $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)/$(bindir) $(DESTDIR)/$(infodir) $(DESTDIR)/$(acdatadir) + +-install: all $(M4FILES) acconfig.h installdirs install-info ++install: all $(M4FILES) acconfig.h installdirs + for p in $(ASCRIPTS); do \ +- $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ ++ $(INSTALL_PROGRAM) $$p $(DESTDIR)/$(bindir)/`echo $$p|sed '$(transform)'`; \ + done + for i in $(M4FROZEN); do \ +- $(INSTALL_DATA) $$i $(acdatadir)/$$i; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)/$(acdatadir)/$$i; \ + done + for i in $(M4FILES) acconfig.h; do \ +- $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \ ++ $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/$(acdatadir)/$$i; \ + done + -if test -f autoscan; then \ +- $(INSTALL_PROGRAM) autoscan $(bindir)/`echo autoscan|sed '$(transform)'`; \ ++ $(INSTALL_PROGRAM) autoscan $(DESTDIR)/$(bindir)/`echo autoscan|sed '$(transform)'`; \ + for i in acfunctions acheaders acidentifiers acprograms \ + acmakevars; do \ +- $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \ ++ $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/$(acdatadir)/$$i; \ + done; \ + else :; fi + + # Don't cd, to avoid breaking install-sh references. + install-info: info installdirs +- if test -f autoconf.info; then \ ++ if test -f autoconf.info; then \ + for i in *.info*; do \ +- $(INSTALL_DATA) $$i $(infodir)/$$i; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)/$(infodir)/$$i; \ + done; \ + else \ + for i in $(srcdir)/*.info*; do \ +- $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)/$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \ + done; \ + fi + +@@ -174,7 +174,7 @@ + rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \ + done + rm -fr $(acdatadir) +- cd $(infodir) && rm -f autoconf.info* ++ cd $(infodir) && rm -f autoconf.info* + if test -f standards.info || test -f $(srcdir)/standards.info; \ + then cd $(infodir) && rm -f standards.info*; fi + +diff -Naur a/testsuite/autoconf.s/syntax.exp b/testsuite/autoconf.s/syntax.exp +--- a/testsuite/autoconf.s/syntax.exp 1999-01-05 13:29:54.000000000 +0000 ++++ b/testsuite/autoconf.s/syntax.exp 2016-06-11 00:18:51.996905247 +0100 +@@ -2,7 +2,7 @@ + + send_user "Checking for syntax errors in the specific tests...\n" + set script {s/^AC_DEFUN(\([^,]*\).*/\1/p} +-set macros [exec sed -n $script $srcdir/../acspecific.m4] ++set macros [exec sed -n $script $srcdir/../acspecific.m4 | grep -v -e AC_FUNC_GETLOADAVG -e F77] + + foreach mac $macros { + send_user "$mac\n" diff --git a/source/xap/seamonkey/autoconf/autoconf.build b/source/xap/seamonkey/autoconf/autoconf.build new file mode 100755 index 000000000..7dae1bad1 --- /dev/null +++ b/source/xap/seamonkey/autoconf/autoconf.build @@ -0,0 +1,81 @@ +#!/bin/sh + +# Copyright 2005-2016 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +PKGNAM=autoconf +VERSION=2.13 +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:-" -j7 "} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-autoconf + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf autoconf-$VERSION +tar xvf $CWD/autoconf-$VERSION.tar.xz || exit 1 +cd autoconf-$VERSION + +zcat $CWD/autoconf-2.13-consolidated_fixes-1.patch.gz | patch -p1 --verbose || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Build a temporary copy of autoconf-2.13 only to be used to compile +# Firefox, since it somewhat inexplicably requires this ancient version: + +rm -rf $TMP/autoconf-tmp +mkdir -p $TMP/autoconf-tmp +# This will be at the beginning of the $PATH, so protect against nonsense +# happening in /tmp: +chmod 700 $TMP/autoconf-tmp +rm -rf $TMP/autoconf-tmp/* +mkdir -p $TMP/autoconf-tmp/usr + +./configure \ + --prefix=$TMP/autoconf-tmp/usr \ + --program-suffix=-2.13 \ + --infodir=$TMP/autoconf-tmp/usr/info \ + --mandir=$TMP/autoconf-tmp/usr/man \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make install || exit 1 + diff --git a/source/xap/seamonkey/seamonkey.SlackBuild b/source/xap/seamonkey/seamonkey.SlackBuild index 454122020..c26a13249 100755 --- a/source/xap/seamonkey/seamonkey.SlackBuild +++ b/source/xap/seamonkey/seamonkey.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 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=seamonkey TARBALLVER=${VERSION:-$(basename $(ls seamonkey-*.tar.* | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source)} # Strip the end from beta versions: VERSION=$(echo $TARBALLVER | cut -f 1 -d b) @@ -35,45 +38,73 @@ 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-$TARBALLVER-$ARCH-$BUILD.txz" + echo "$PKGNAM-solibs-$TARBALLVER-$ARCH-$BUILD.txz" + exit 0 +fi + if [ "$ARCH" = "i586" ]; then LIBDIRSUFFIX="" - OPTIMIZE_FLAG="-O2" - # On IA32, use gold since GNU ld runs out of memory linking libxul.so: - PATH="$(pwd)/gold:$PATH" - export CC="gcc -B$(pwd)/gold" - export CXX="g++ -B$(pwd)/gold" + OPTIMIZE_FLAG=${OPTIMIZE_FLAG:-"-O1"} +elif [ "$ARCH" = "i686" ]; then + LIBDIRSUFFIX="" + OPTIMIZE_FLAG=${OPTIMIZE_FLAG:-"-O1"} elif [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" - OPTIMIZE_FLAG="-O2" + OPTIMIZE_FLAG=${OPTIMIZE_FLAG:-"-O1"} else LIBDIRSUFFIX="" - OPTIMIZE_FLAG="-O2" + OPTIMIZE_FLAG=${OPTIMIZE_FLAG:-"-O1"} fi -NUMJOBS=${NUMJOBS:-" -j7 "} +# Link using gold. This avoids running out of memory on 32-bit systems, and +# avoids a recurring build failure with GNU ld on other systems. +PATH="$(pwd)/gold:$PATH" +export CC=${CC:-"gcc -B$(pwd)/gold"} +export CXX=${CXX:-"g++ -B$(pwd)/gold -fno-delete-null-pointer-checks"} -# Workaround to prevent unidentified crashes when compiling with recent gcc. -# Presumably a newer version will fix this (as it did with Firefox), so only -# enable the workaround for known crashing versions. -# Test page to check for crash: http://onet.pl -if [ $VERSION = 2.39 -o \ - $VERSION = 2.40 ]; then - OPTIMIZE_FLAG="$(echo "$OPTIMIZE_FLAG" | sed 's/O2/Os/g')" - echo "Detected Seamonkey $VERSION... enabling crash workaround O2 -> Os." - sleep 1 -fi +NUMJOBS=${NUMJOBS:-" -j7 "} -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-seamonkey + +# If there is a private Google API key available at compile time, use +# it to enable support for Google Safe Browsing. For Slackware builds, +# we use a private key issued for the Slackware project. If you are +# rebuilding and need this support, or you are producing your own +# distribution, you may obtain your own Google API key at no charge by +# following these instructions: +# https://bugzilla.mozilla.org/show_bug.cgi?id=1377987#c0 +if [ -r /root/google-api-key ]; then + GOOGLE_API_KEY="--with-google-api-keyfile=/root/google-api-key" +fi + rm -rf $PKG mkdir -p $TMP $PKG/usr +# We need to use the incredibly ancient autoconf-2.13 for this :/ +( cd $CWD/autoconf ; ./autoconf.build ) +PATH=$TMP/autoconf-tmp/usr/bin:$PATH + cd $TMP rm -rf seamonkey-${TARBALLVER} +# Unpack this in a subdirectory to prevent changing permissions on /tmp: +rm -rf seamonkey-unpack +mkdir seamonkey-unpack +cd seamonkey-unpack tar xvf $CWD/seamonkey-${TARBALLVER}.source.tar.?z* || exit 1 +mv * .. +cd .. +rm -rf seamonkey-unpack cd seamonkey-${TARBALLVER} || exit 1 +# Retain GTK+ v2 scrolling behavior: +zcat $CWD/sm.ui.scrollToClick.diff.gz | patch -p1 --verbose || exit 1 + # Make sure the perms/ownerships are sane: chown -R root:root . find . \ @@ -88,35 +119,28 @@ chown -R root:root . OPTIONS="\ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --enable-optimize=$OPTIMIZE_FLAG \ --enable-cpp-rtti \ - --enable-default-toolkit=cairo-gtk2 \ + --enable-default-toolkit=cairo-gtk3 \ --enable-startup-notification \ + --enable-alsa \ --disable-debug \ --with-default-mozilla-five-home=/usr/lib${LIBDIRSUFFIX}/seamonkey-${VERSION} \ --enable-strip \ --disable-tests \ --disable-crashreporter \ - --enable-svg \ - --enable-canvas \ - --enable-gstreamer=1.0 \ - --disable-short-wchar \ - --enable-nspr-autoconf \ + --enable-accessibility \ + $GOOGLE_API_KEY \ + --enable-safe-browsing \ + --disable-updater \ + --enable-chrome-format=omni \ + --disable-necko-wifi \ --enable-extensions=default,irc \ - --enable-crypto \ - --enable-libxul \ - --disable-xprint \ --without-system-nspr \ --with-system-zlib \ - --with-system-mng \ --enable-application=suite \ - --enable-xft \ + --with-pthreads \ --host=$ARCH-slackware-linux \ - --target=$ARCH-slackware-linux \ - --build=$ARCH-slackware-linux" - - # --enable-system-cairo \ - # --with-system-png + --target=$ARCH-slackware-linux" export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 @@ -129,6 +153,10 @@ unset DBUS_SESSION_BUS_ADDRESS ORBIT_SOCKETDIR SESSION_MANAGER \ # Assemble our .mozconfig: echo > .mozconfig +# Tell .mozconfig about the selected compiler: +echo "export CC=\"${CC}\"" >> .mozconfig +echo "export CXX=\"${CXX}\"" >> .mozconfig + # Mozilla devs enforce using an objdir for building # https://developer.mozilla.org/en/Configuring_Build_Options#Building_with_an_objdir mkdir obj @@ -136,13 +164,22 @@ echo "mk_add_options MOZ_OBJDIR=$(pwd)/obj" >> .mozconfig # This directory is also needed or the build will fail: mkdir -p mozilla/obj -# Write in it the options above +# Set options for $OPTIMIZE_FLAG: +echo "ac_add_options --enable-optimize=\"${OPTIMIZE_FLAG}\"" >> .mozconfig + +# Add the $OPTIONS above to .mozconfig: for option in $OPTIONS; do echo "ac_add_options $option" >> .mozconfig; done echo "ac_add_options --disable-tests" >> .mozconfig make -f client.mk build || exit 1 make -f client.mk install DESTDIR=$PKG || exit 1 +# Keep the "obsolete" nspr headers: +if [ ! -d mozilla/dist/include/nspr/obsolete ]; then + mkdir -p mozilla/dist/include/nspr/obsolete + cp -a mozilla/nsprpub/pr/include/obsolete/*.h mozilla/dist/include/nspr/obsolete +fi + # Install nspr/nss headers. for includedir in nspr nspr/obsolete nspr/private ; do mkdir -p $PKG/usr/include/seamonkey-${VERSION}/$includedir diff --git a/source/xap/seamonkey/slack-desc b/source/xap/seamonkey/slack-desc index af6ee2408..c30ab5ff6 100644 --- a/source/xap/seamonkey/slack-desc +++ b/source/xap/seamonkey/slack-desc @@ -1,19 +1,19 @@ # 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------------------------------------------------------| seamonkey: SeaMonkey (an open-source web browser suite) seamonkey: -seamonkey: The SeaMonkey browser suite. SeaMonkey features a state-of-the-art +seamonkey: The SeaMonkey browser suite. SeaMonkey features a state-of-the-art seamonkey: web browser and powerful email client, as well as a WYSIWYG web page seamonkey: composer and a feature-rich IRC chat client. seamonkey: +seamonkey: Homepage: http://www.mozilla.org/projects/seamonkey/ +seamonkey: seamonkey: seamonkey: -seamonkey: Visit the SeaMonkey project at this URL: -seamonkey: http://www.mozilla.org/projects/seamonkey/ seamonkey: diff --git a/source/xap/seamonkey/sm.ui.scrollToClick.diff b/source/xap/seamonkey/sm.ui.scrollToClick.diff new file mode 100644 index 000000000..d8d4fb7a7 --- /dev/null +++ b/source/xap/seamonkey/sm.ui.scrollToClick.diff @@ -0,0 +1,12 @@ +--- ./mozilla/modules/libpref/init/all.js.orig 2017-07-07 00:37:54.000000000 -0500 ++++ ./mozilla/modules/libpref/init/all.js 2017-07-21 11:21:29.152341810 -0500 +@@ -227,6 +227,9 @@ + // If true, all popups won't hide automatically on blur + pref("ui.popup.disable_autohide", false); + ++// Default to GTK+ v2 type scrolling: ++pref("ui.scrollToClick", 0); ++ + pref("browser.display.use_document_fonts", 1); // 0 = never, 1 = quick, 2 = always + // 0 = default: always, except in high contrast mode + // 1 = always diff --git a/source/xap/seyon/seyon.SlackBuild b/source/xap/seyon/seyon.SlackBuild index b040a3601..f2a0160bb 100755 --- a/source/xap/seyon/seyon.SlackBuild +++ b/source/xap/seyon/seyon.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2002-2012 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2002-2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,15 +20,16 @@ # 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=seyon VERSION=2.20c -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -36,6 +37,14 @@ if [ -z "$ARCH" ]; then export ARCH 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" = "i386" ]; then SLKCFLAGS="-O2 -march=i386 -mcpu=i686" LIBDIRSUFFIX="" @@ -62,7 +71,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-seyon @@ -80,6 +88,7 @@ find . \ -exec chmod 644 {} \; zcat $CWD/seyon_2.20c-16.diff.gz | patch -p1 --verbose || exit 1 +sed -i "s/getline/seyon_getline/g" * chmod 755 makever.sh xmkmf @@ -112,7 +121,7 @@ cat seyon.man | gzip -9c > $PKG/usr/man/man1/seyon.1.gz mkdir -p $PKG/install cat << EOF > $PKG/install/doinst.sh -#!/bin/sh +#!/bin/bash config() { NEW="\$1" OLD="\$(dirname \$NEW)/\$(basename \$NEW .new)" diff --git a/source/xap/seyon/slack-desc b/source/xap/seyon/slack-desc index 70c0d0899..ceee5db5e 100644 --- a/source/xap/seyon/slack-desc +++ b/source/xap/seyon/slack-desc @@ -1,19 +1,19 @@ # 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------------------------------------------------------| seyon: seyon (telecommunications package) seyon: seyon: Seyon is a complete full-featured telecommunications package for the -seyon: X Window System. Some of its features are: Dialing directory that -seyon: supports an unlimited number of entries. Terminal emulation window -seyon: supporting DEC VT02, Tektronix 4014, and ANSI. Script language to -seyon: automate tedious tasks such as logging into remote hosts. Unlimited -seyon: number of slots for external file transfer protocols. Support for -seyon: zmodem auto-download. Seyon is intended to be both simple and +seyon: X Window System. Some of its features are: Dialing directory that +seyon: supports an unlimited number of entries. Terminal emulation window +seyon: supporting DEC VT02, Tektronix 4014, and ANSI. Script language to +seyon: automate tedious tasks such as logging into remote hosts. Unlimited +seyon: number of slots for external file transfer protocols. Support for +seyon: zmodem auto-download. Seyon is intended to be both simple and seyon: extensively configurable. seyon: diff --git a/source/xap/windowmaker/slack-desc b/source/xap/windowmaker/slack-desc index ef3edbe72..35ffca906 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 4a541b456..bf84807e1 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 3c605c405..000000000 --- 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] == '=' || diff --git a/source/xap/x11-ssh-askpass/slack-desc b/source/xap/x11-ssh-askpass/slack-desc index 49faabba8..689668bc4 100644 --- a/source/xap/x11-ssh-askpass/slack-desc +++ b/source/xap/x11-ssh-askpass/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/x11-ssh-askpass/x11-ssh-askpass.SlackBuild b/source/xap/x11-ssh-askpass/x11-ssh-askpass.SlackBuild index 015c489f5..3f2df5c8a 100755 --- a/source/xap/x11-ssh-askpass/x11-ssh-askpass.SlackBuild +++ b/source/xap/x11-ssh-askpass/x11-ssh-askpass.SlackBuild @@ -1,28 +1,38 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for x11-ssh-askpass # Written by "Vincent Batts <vbatts@batts.mine.nu>" +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=x11-ssh-askpass VERSION=1.2.4.1 -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; esac fi -CWD=$(pwd) +# 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 + TMP=${TMP:-/tmp} PKG=$TMP/package-x11-ssh-askpass -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" diff --git a/source/xap/x3270/slack-desc b/source/xap/x3270/slack-desc index 15eff71d7..d322eecdb 100644 --- a/source/xap/x3270/slack-desc +++ b/source/xap/x3270/slack-desc @@ -1,14 +1,14 @@ # 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------------------------------------------------------| x3270: x3270 (IBM host access tool for X) x3270: -x3270: x3270 opens a telnet connection to an IBM host in an X window. Since +x3270: x3270 opens a telnet connection to an IBM host in an X window. Since x3270: the window created by x3270 can use its own font for displaying x3270: characters, is a fairly accurate representation of an IBM 3278. x3270: diff --git a/source/xap/x3270/x3270.SlackBuild b/source/xap/x3270/x3270.SlackBuild index c2937379f..eba6f7158 100755 --- a/source/xap/x3270/x3270.SlackBuild +++ b/source/xap/x3270/x3270.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2012, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,16 +20,18 @@ # 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=x3270 VERSION=3.3 TARBVER=${TARBVER:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} VERSION=$(echo $TARBVER | cut -f 1,2 -d .) -BUILD=${BUILD:-2} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -37,11 +39,19 @@ if [ -z "$ARCH" ]; then export ARCH 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-$TARBVER-$ARCH-$BUILD.txz" + exit 0 +fi + if [ "$ARCH" = "i386" ]; then SLKCFLAGS="-O2 -march=i386 -mcpu=i686" LIBDIRSUFFIX="" -elif [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +elif [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" @@ -65,7 +75,6 @@ fi NUMJOBS=${NUMJOBS:-" -j7 "} -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-x3270 @@ -87,10 +96,10 @@ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --sysconfdir=/etc/X11 \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG +make install DESTDIR=$PKG || exit 1 mv $PKG/etc/X11/x3270/ibm_hosts $PKG/etc/X11/x3270/ibm_hosts.new find $PKG -name fonts.dir -exec rm {} \; diff --git a/source/xap/xaos/slack-desc b/source/xap/xaos/slack-desc index a35a1fdf2..a370dddd9 100644 --- a/source/xap/xaos/slack-desc +++ b/source/xap/xaos/slack-desc @@ -1,19 +1,19 @@ # 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------------------------------------------------------| xaos: xaos (an interactive fractal zoomer) xaos: -xaos: XaoS is a fast portable real-time interactive fractal zoomer. It +xaos: XaoS is a fast portable real-time interactive fractal zoomer. It xaos: displays the Mandelbrot set (and other popular fractals), and allows -xaos: the user to smoothly zoom in or out of a fractal. Other features +xaos: the user to smoothly zoom in or out of a fractal. Other features xaos: include autopilot mode, palette changing, PNG saving, and fractal xaos: inversion. xaos: -xaos: Visit XaoS online: http://xaos.sf.net +xaos: Visit XaoS online: http://xaos.sf.net xaos: xaos: diff --git a/source/xap/xaos/xaos.SlackBuild b/source/xap/xaos/xaos.SlackBuild index 0b9789495..627d45412 100755 --- a/source/xap/xaos/xaos.SlackBuild +++ b/source/xap/xaos/xaos.SlackBuild @@ -1,7 +1,7 @@ -#!/bin/sh +#!/bin/bash # Copyright 2010 B. Watson (yalhcru@gmail.com) -# Copyright 2010, 2015 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2010, 2015, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -58,9 +58,11 @@ # - If you're not on x86, but you want the formula evaluator, install GSL # and then run this script with USE_GSL=yes in the environment. +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=xaos VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -73,7 +75,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# 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 + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM OUTPUT=${OUTPUT:-/tmp} diff --git a/source/xap/xfractint/slack-desc b/source/xap/xfractint/slack-desc index 0b8614fa4..876eca71e 100644 --- a/source/xap/xfractint/slack-desc +++ b/source/xap/xfractint/slack-desc @@ -1,18 +1,18 @@ # 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------------------------------------------------------| xfractint: xfractint (fractal generation program) xfractint: xfractint: Xfractint draws a wide variety of fractals. Xfractint is a port of the -xfractint: DOS program Fractint. +xfractint: DOS program Fractint. xfractint: xfractint: The primary original authors of Fractint are Bert Tyler, Timothy -xfractint: Wegner, Mark Peterson, and Pieter Branderhorst. Fractint was ported +xfractint: Wegner, Mark Peterson, and Pieter Branderhorst. Fractint was ported xfractint: to X by Ken Shirriff. xfractint: xfractint: diff --git a/source/xap/xfractint/xfractint.SlackBuild b/source/xap/xfractint/xfractint.SlackBuild index a10db9cf4..5f11c62ed 100755 --- a/source/xap/xfractint/xfractint.SlackBuild +++ b/source/xap/xfractint/xfractint.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2007, 2008, 2009, 2012 Patrick Volkerding, Sebeka, MN, USA +# Copyright 2007, 2008, 2009, 2012, 2018 Patrick Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,15 +20,16 @@ # 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=xfractint VERSION=${VERSION:-20.04p13} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -36,6 +37,14 @@ if [ -z "$ARCH" ]; then export ARCH 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 + NUMJOBS=${NUMJOBS:-" -j7 "} if [ "$ARCH" = "i386" ]; then @@ -64,7 +73,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} rm -rf $PKG diff --git a/source/xap/xgames/slack-desc b/source/xap/xgames/slack-desc index a81a038c7..209f5b94d 100644 --- a/source/xap/xgames/slack-desc +++ b/source/xap/xgames/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/xgames/xgames.SlackBuild b/source/xap/xgames/xgames.SlackBuild index e313d4682..6135bc36c 100755 --- a/source/xap/xgames/xgames.SlackBuild +++ b/source/xap/xgames/xgames.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2011, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,22 +20,32 @@ # 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=xgames VERSION=0.3 -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; 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 + NUMJOBS=${NUMJOBS:-" -j7 "} -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-xgames rm -rf $PKG diff --git a/source/xap/xine-lib/slack-desc b/source/xap/xine-lib/slack-desc index 276736680..69d68e33a 100644 --- a/source/xap/xine-lib/slack-desc +++ b/source/xap/xine-lib/slack-desc @@ -1,19 +1,19 @@ # 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------------------------------------------------------| xine-lib: xine-lib (xine multimedia playback engine libraries) xine-lib: xine-lib: xine-lib is a free (GPL licensed) high-performance multimedia -xine-lib: playback engine. The xine shared libraries are used by xine-ui (and +xine-lib: playback engine. The xine shared libraries are used by xine-ui (and xine-lib: other media players and multimedia applications) for smooth video xine-lib: processing and playback of multimedia streams such as movies, radio xine-lib: and TV network streams, DVDs, and VCDs. xine-lib: -xine-lib: +xine-lib: Homepage: https://www.xine-project.org/home xine-lib: xine-lib: diff --git a/source/xap/xine-lib/xine-lib.SlackBuild b/source/xap/xine-lib/xine-lib.SlackBuild index bc3e5eb7d..03caf741a 100755 --- a/source/xap/xine-lib/xine-lib.SlackBuild +++ b/source/xap/xine-lib/xine-lib.SlackBuild @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2012, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA # Copyright 2011, 2012 Eric Hameleers, Eindhoven, NL -# Copyright 2015 Heinz Wiesinger, Amsterdam, NL +# Copyright 2017 Heinz Wiesinger, Amsterdam, NL # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,18 +22,17 @@ # 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=xine-lib # Version on the tarball -VERSION=1.2.6 +VERSION=1.2.9 # Version used in the source directory to cd into -DIRVER=1.2.6 +DIRVER=1.2.9 # Version used for the Slackware package -PKGVER=1.2.6 +PKGVER=1.2.9 -# Version used for statically linked ffmpeg -FFMPEG_VERSION=${FFMPEG_VERSION:-$(echo ../MPlayer/ffmpeg-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} - -BUILD=${BUILD:-8} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -61,66 +60,41 @@ else FFARCHOPTS="" fi -CWD=$(pwd) +# If this package is being built for ALSA (no PulseAudio), use the _alsa $TAG: +if [ ! -r /usr/lib${LIBDIRSUFFIX}/pkgconfig/libpulse.pc ]; then + TAG="_alsa" +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-$PKGVER-$ARCH-$BUILD$TAG.txz" + exit 0 +fi + TMP=${TMP:-/tmp} PKG=$TMP/package-xine-lib -FFMPEG_PKG=$TMP/package-ffmpeg -rm -rf $PKG $FFMPEG_PKG -mkdir -p $TMP $PKG/usr $FFMPEG_PKG +rm -rf $PKG +mkdir -p $TMP $PKG/usr cd $TMP -rm -rf ffmpeg* -tar xvf $CWD/../MPlayer/ffmpeg-$FFMPEG_VERSION.tar.xz || exit 1 -cd ffmpeg* || exit 1 - - chown -R root:root . - find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - - echo Building static ffmpeg libs ... - - FFMPEGDIR=/tmp/ff-$(mcookie) - - CFLAGS="$SLKCFLAGS -fvisibility=hidden -I/usr/include/openmj2-2.1" \ - CXXFLAGS="$SLKCFLAGS -fvisibility=hidden -I/usr/include/openmj2-2.1" \ - ./configure \ - --prefix=$FFMPEGDIR/usr \ - --libdir=$FFMPEGDIR/usr/lib${LIBDIRSUFFIX} \ - --shlibdir=$FFMPEGDIR/usr/lib${LIBDIRSUFFIX} \ - --enable-gpl \ - --enable-version3 \ - --enable-libtheora \ - --enable-postproc \ - --disable-doc \ - --disable-avfilter \ - --disable-avdevice \ - --disable-swresample \ - --disable-ffserver \ - --disable-ffplay \ - --disable-ffmpeg \ - --disable-ffprobe \ - --enable-pthreads \ - --disable-debug \ - --disable-shared \ - --enable-static \ - --enable-hardcoded-tables \ - --enable-memalign-hack \ - --enable-bzlib \ - --enable-zlib \ - --enable-libopenjpeg \ - ${FFARCHOPTS} - - make $NUMJOBS V=1 || exit 1 - make install # Note: no DESTDIR !! -cd - - rm -rf xine-lib-$VERSION tar xvf $CWD/xine-lib-$VERSION.tar.xz || exit 1 cd xine-lib-$DIRVER || exit 1 +# # Fix source for ffmpeg-3.2.x: +# sed -e 's/avcodec_alloc_frame/av_frame_alloc/' \ +# -e 's/avcodec_free_frame/av_frame_free/' \ +# -i src/combined/ffmpeg/ff_{audio,video}_decoder.c \ +# src/dxr3/ffmpeg_encoder.c && +# #sed -e 's|wand/magick_wand.h|MagickWand/MagickWand.h|' \ +# # -i src/video_dec/image.c && +# sed -e '/xineplug_vo_out_xcbxv_la_LIBADD/s/$(XCB_LIBS)/$(XCBSHM_LIBS) $(XCB_LIBS)/' \ +# -i src/video_out/Makefile.in && +# sed -e 's/\(xcb-shape >= 1.0\)/xcb \1/' \ +# -i m4/video_out.m4 && + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -128,11 +102,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -export PKG_CONFIG_PATH="${FFMPEGDIR}/usr/lib${LIBDIRSUFFIX}/pkgconfig" -export CFLAGS="-I${FFMPEGDIR}/usr/include $SLKCFLAGS" -export CXXFLAGS="-I${FFMPEGDIR}/usr/include $SLKCFLAGS" -export LDFLAGS="-L${FFMPEGDIR}/usr/lib${LIBDIRSUFFIX} $SLKLDFLAGS" - XINE_BUILD=$TARGET \ ./configure \ --prefix=/usr \ @@ -144,7 +113,8 @@ XINE_BUILD=$TARGET \ --disable-nosefart \ --disable-vcd \ --without-speex \ - --with-external-dvdnav + --without-xcb \ + --with-external-dvdnav || exit 1 make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 @@ -172,5 +142,5 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/xine-lib-$PKGVER-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/xine-lib-$PKGVER-$ARCH-$BUILD$TAG.txz diff --git a/source/xap/xine-ui/slack-desc b/source/xap/xine-ui/slack-desc index f4e39279e..29410ab9b 100644 --- a/source/xap/xine-ui/slack-desc +++ b/source/xap/xine-ui/slack-desc @@ -1,14 +1,14 @@ # 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------------------------------------------------------| xine-ui: xine-ui (xine multimedia playback engine user interface) xine-ui: -xine-ui: Xine is a free multimedia player. It plays back CDs, DVDs, and VCDs, +xine-ui: Xine is a free multimedia player. It plays back CDs, DVDs, and VCDs, xine-ui: multimedia files, and multimedia streamed over a network. xine-ui: xine-ui: The xine-ui package contains the graphical user interface for the diff --git a/source/xap/xine-ui/xine-ui.SlackBuild b/source/xap/xine-ui/xine-ui.SlackBuild index 2cef59a52..6169c2f54 100755 --- a/source/xap/xine-ui/xine-ui.SlackBuild +++ b/source/xap/xine-ui/xine-ui.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2010, 2012, 2013 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2012, 2013, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,11 +20,13 @@ # 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) -VERSION=${VERSION:-$(echo xine-ui-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -# I would use "-march=i486 -mcpu=i686" here as usual, but with XINE it's all or nothing. +PKGNAM=xine-ui +VERSION=${VERSION:-$(echo xine-ui-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +# I would use "-march=i586 -mcpu=i686" here as usual, but with XINE it's all or nothing. # I'd rather have it work well for the i686/Athlon crowd than suck for everyone. -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -35,11 +37,19 @@ if [ -z "$ARCH" ]; then *) export ARCH=$( uname -m ) ;; 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 + TARGET=${TARGET:-$ARCH-pc-linux-gnu} NUMJOBS=${NUMJOBS:-" -j7 "} -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-xine-ui rm -rf $PKG @@ -47,7 +57,7 @@ mkdir -p $TMP $PKG/usr cd $TMP rm -rf xine-ui-$VERSION -tar xvf $CWD/xine-ui-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/xine-ui-$VERSION.tar.?z || exit 1 cd xine-ui-$VERSION || exit 1 chown -R root:root . diff --git a/source/xap/xlockmore/slack-desc b/source/xap/xlockmore/slack-desc index 92ee2c419..a18d57a20 100644 --- a/source/xap/xlockmore/slack-desc +++ b/source/xap/xlockmore/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------------------------------------------------------| @@ -12,8 +12,8 @@ xlockmore: Patrick J. Naughton's xlock screensaver/locker for X, with many xlockmore: more modes added by David A. Bagley. xlockmore: xlockmore: The 'Bob' bitmap has been included especially for Slackware, as well -xlockmore: as a Linux penguin logo. (NOTE: the image of J. R. "Bob" Dobbs is a +xlockmore: as a Linux penguin logo. (NOTE: the image of J. R. "Bob" Dobbs is a xlockmore: registered trademark of The Subgenius Foundation, used by permission) xlockmore: -xlockmore: +xlockmore: Homepage: http://sillycycle.com/xlockmore.html xlockmore: diff --git a/source/xap/xlockmore/xlockmore.SlackBuild b/source/xap/xlockmore/xlockmore.SlackBuild index 3516c567e..e2fb8638e 100755 --- a/source/xap/xlockmore/xlockmore.SlackBuild +++ b/source/xap/xlockmore/xlockmore.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2011, 2012, 2013, 2015 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2011, 2012, 2013, 2015, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,6 +20,7 @@ # 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=xlockmore VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} @@ -28,15 +29,23 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; esac fi -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +# 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="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" @@ -51,7 +60,6 @@ fi NUMJOBS=${NUMJOBS:-" -j7 "} -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-xlockmore rm -rf $PKG @@ -93,7 +101,8 @@ CXXFLAGS="$SLKCFLAGS" \ --without-motif \ --without-esound \ --without-gtk \ - --build=$ARCH-slackware-linux + --enable-appdefaultdir=/etc/X11/app-defaults \ + --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 cd xlock diff --git a/source/xap/xmms/slack-desc b/source/xap/xmms/slack-desc index 6ea4362d2..83ebb73fd 100644 --- a/source/xap/xmms/slack-desc +++ b/source/xap/xmms/slack-desc @@ -1,16 +1,16 @@ # 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------------------------------------------------------| xmms: xmms (X Multimedia System) xmms: -xmms: XMMS is the X Multimedia System. It is used to play audio and other -xmms: kinds of media files. By default XMMS can play MPEG audio, Ogg -xmms: Vorbis, RIFF wav, most module formats, and a few other formats. XMMS +xmms: XMMS is the X Multimedia System. It is used to play audio and other +xmms: kinds of media files. By default XMMS can play MPEG audio, Ogg +xmms: Vorbis, RIFF wav, most module formats, and a few other formats. XMMS xmms: can be extended through plugins to play a number of other audio and xmms: video formats. xmms: diff --git a/source/xap/xmms/xmms.SlackBuild b/source/xap/xmms/xmms.SlackBuild index e66739532..035f605a1 100755 --- a/source/xap/xmms/xmms.SlackBuild +++ b/source/xap/xmms/xmms.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,22 +20,32 @@ # 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=xmms VERSION=1.2.11 -BUILD=${BUILD:-5} +BUILD=${BUILD:-6} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; esac fi -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +# 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="" ARCHOPTS="--enable-simd" elif [ "$ARCH" = "s390" ]; then @@ -54,7 +64,6 @@ fi NUMJOBS=${NUMJOBS:-" -j7 "} -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-xmms rm -rf $PKG @@ -78,6 +87,7 @@ find . \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ +LIBS="-ldl" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -85,11 +95,14 @@ CXXFLAGS="$SLKCFLAGS" \ --disable-static \ --enable-ipv6 \ $ARCHOPTS \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + # Add a .desktop file for the menus: mkdir -p $PKG/usr/share/applications cat $CWD/xmms.desktop > $PKG/usr/share/applications/xmms.desktop diff --git a/source/xap/xpaint/slack-desc b/source/xap/xpaint/slack-desc index 93027a60a..d37f648b3 100644 --- a/source/xap/xpaint/slack-desc +++ b/source/xap/xpaint/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------------------------------------------------------| @@ -12,8 +12,8 @@ xpaint: XPaint is a versatile bitmap/pixmap editing tool with a feature set xpaint: similar to MacPaint. xpaint: xpaint: The short features list: -xpaint: Brushes, Spray paint, Pencil, Lines, Arcs, Pattern Fill, Text, -xpaint: Boxes, Circles, Polygons. +xpaint: Brushes, Spray paint, Pencil, Lines, Arcs, Pattern Fill, Text, +xpaint: Boxes, Circles, Polygons. xpaint: Works on multiple images simultaneously. Cut/Copy/Paste between all xpaint: active images. Fatbits/Zoom on the image windows. xpaint: diff --git a/source/xap/xpaint/xpaint.SlackBuild b/source/xap/xpaint/xpaint.SlackBuild index e174ca62a..fcc06c972 100755 --- a/source/xap/xpaint/xpaint.SlackBuild +++ b/source/xap/xpaint/xpaint.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, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,31 +20,39 @@ # 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=xpaint VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; 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 + NUMJOBS=${NUMJOBS:-" -j7 "} -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} rm -rf $PKG mkdir -p $TMP $PKG -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" @@ -82,17 +90,21 @@ CFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ --infodir=/usr/info \ - --enable-static=no \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG +make install DESTDIR=$PKG || exit 1 # Since this won't listen: mv $PKG/usr/share/man/man1/* $PKG/usr/man/man1 rmdir $PKG/usr/share/man/man1 $PKG/usr/share/man + +# Don't ship static libraries: rm $PKG/usr/lib${LIBDIRSUFFIX}/*.a +# Don't ship .la files: +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la + ( cd bitmaps mkdir -p ${PKG}/usr/include/X11/bitmaps find . -name "*.xbm" -exec cp {} ${PKG}/usr/include/X11/bitmaps \; diff --git a/source/xap/xpdf/patches/xpdfrc.diff b/source/xap/xpdf/patches/xpdfrc.diff index c136f9970..4760a4f44 100644 --- a/source/xap/xpdf/patches/xpdfrc.diff +++ b/source/xap/xpdf/patches/xpdfrc.diff @@ -1,5 +1,6 @@ ---- ./doc/sample-xpdfrc.orig 2013-03-28 15:29:16.957444255 -0500 -+++ ./doc/sample-xpdfrc 2013-03-28 15:32:11.413438678 -0500 +diff -Nur xpdf-4.00.orig/doc/sample-xpdfrc xpdf-4.00/doc/sample-xpdfrc +--- xpdf-4.00.orig/doc/sample-xpdfrc 2017-08-08 18:22:50.000000000 -0500 ++++ xpdf-4.00/doc/sample-xpdfrc 2017-09-25 23:39:20.010485577 -0500 @@ -29,20 +29,20 @@ # installed in a "standard" location, xpdf will find them # automatically.) @@ -35,9 +36,3 @@ # If you need to display PDF files that refer to non-embedded fonts, # you should add one or more fontDir options to point to the -@@ -89,4 +89,4 @@ - # clicked. - - #launchCommand viewer-script --#urlCommand "netscape -remote 'openURL(%s)'" -+#urlCommand "firefox -remote 'openURL(%s)'" diff --git a/source/xap/xpdf/slack-desc b/source/xap/xpdf/slack-desc index 58072776f..6866654f3 100644 --- a/source/xap/xpdf/slack-desc +++ b/source/xap/xpdf/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/xpdf/xpdf.SlackBuild b/source/xap/xpdf/xpdf.SlackBuild index aa3af9604..d00c30a08 100755 --- a/source/xap/xpdf/xpdf.SlackBuild +++ b/source/xap/xpdf/xpdf.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,10 +20,12 @@ # 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) -VERSION=3.04 +PKGNAM=xpdf +VERSION=4.00 PATCHLEVEL= -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -37,6 +39,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}${PATCHLEVEL}-$ARCH-$BUILD.txz" + exit 0 +fi + if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" @@ -51,7 +61,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-xpdf @@ -72,30 +81,29 @@ find . \ zcat $CWD/patches/xpdfrc.diff.gz | patch -p1 --verbose || exit 1 -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --sysconfdir=/etc \ - --with-freetype2-includes=/usr/include/freetype2 \ - --build=$ARCH-slackware-linux || exit 1 - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 +mkdir build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DMAN_INSTALL_DIR=/usr/man \ + -DCMAKE_BUILD_TYPE=Release \ + -DXPDFWIDGET_PRINTING=1 \ + .. || exit 1 + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG || exit 1 +cd .. chmod 0755 $PKG/usr/bin/* gzip -9 $PKG/usr/man/man?/* # We'll use the versions of these from the poppler derived work (if they exist here): -( cd $PKG/usr/bin - rm -f pdfinfo pdftops pdftoppm pdftohtml pdftotext pdfimages pdffonts - cd $PKG/usr/man/man1 - for file in pdfinfo pdftops pdftoppm pdftohtml pdftotext pdfimages pdffonts ; do - rm -f ${file}.1.gz - done -) +for file in pdfinfo pdftops pdftoppm pdftohtml pdftotext pdfimages pdffonts ; do + rm -f $PKG/usr/bin/${file} + rm -f $PKG/usr/man/man1/${file}.1.gz +done # Don't clobber /etc/xpdfrc mkdir -p $PKG/etc @@ -110,7 +118,7 @@ cat xpdf/xpdfIcon.xpm > $PKG/usr/share/pixmaps/xpdfIcon.xpm # Add additional language support: for language in xpdf-arabic xpdf-chinese-simplified xpdf-chinese-traditional xpdf-cyrillic xpdf-greek xpdf-hebrew xpdf-japanese xpdf-korean xpdf-latin2 xpdf-thai xpdf-turkish ; do rm -rf ${language} - tar xf $CWD/lang/${language}*.tar.gz + tar xf $CWD/lang/${language}*.tar.?z ( cd ${language} echo "Patching for ${language}:" zcat $CWD/lang/${language}.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 @@ -127,7 +135,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \ mkdir -p $PKG/usr/doc/xpdf-$VERSION cp -a \ - ANNOUNCE CHANGES COPYING INSTALL README \ + ANNOUNCE CHANGES COPYING* INSTALL README \ $PKG/usr/doc/xpdf-$VERSION chmod 0644 $PKG/usr/doc/xpdf-$VERSION/* @@ -135,7 +143,7 @@ chmod 0644 $PKG/usr/doc/xpdf-$VERSION/* # is useful, but don't let it get totally out of control: if [ -r CHANGES ]; then DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) - cat CHANGES | head -n 1000 > $DOCSDIR/CHANGES + cat CHANGES | tail -n 1000 > $DOCSDIR/CHANGES touch -r CHANGES $DOCSDIR/CHANGES fi diff --git a/source/xap/xsane/slack-desc b/source/xap/xsane/slack-desc index 330a2e566..6e766dff8 100644 --- a/source/xap/xsane/slack-desc +++ b/source/xap/xsane/slack-desc @@ -1,15 +1,15 @@ # 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 customary to +# 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------------------------------------------------------| xsane: xsane (Graphical frontend to SANE, Scanner Access Now Easy) xsane: xsane: xsane provides a graphical user-interface to control an image -xsane: acquisition device such as a flatbed scanner. It allows previewing +xsane: acquisition device such as a flatbed scanner. It allows previewing xsane: and scanning individual images and can be invoked either directly xsane: from the command-line or through the GIMP image manipulation program. xsane: diff --git a/source/xap/xsane/xsane.SlackBuild b/source/xap/xsane/xsane.SlackBuild index a7617a32b..7e5db118a 100755 --- a/source/xap/xsane/xsane.SlackBuild +++ b/source/xap/xsane/xsane.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2011, 2015 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2011, 2015, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,28 +20,37 @@ # 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=xsane VERSION=0.999 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; 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 + NUMJOBS=${NUMJOBS:-" -j7 "} -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-xsane -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then @@ -88,10 +97,10 @@ CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --mandir=/usr/man \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG +make install DESTDIR=$PKG || exit 1 rmdir $PKG/usr/sbin diff --git a/source/xap/xscreensaver/dump.android.osx.sources.sh b/source/xap/xscreensaver/dump.android.osx.sources.sh index 3993f510b..4626090f4 100755 --- a/source/xap/xscreensaver/dump.android.osx.sources.sh +++ b/source/xap/xscreensaver/dump.android.osx.sources.sh @@ -1,14 +1,14 @@ #!/bin/sh # Repacks the xscreensaver tarball to remove the unneeded OSX sources. -VERSION=${VERSION:-$(echo xscreensaver-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=${VERSION:-$(echo xscreensaver-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -tar xf xscreensaver-${VERSION}.tar.xz || exit 1 -mv xscreensaver-${VERSION}.tar.xz xscreensaver-${VERSION}.tar.xz.orig +tar xf xscreensaver-${VERSION}.tar.?z || exit 1 +mv xscreensaver-${VERSION}.tar.?z xscreensaver-${VERSION}.tarball.orig rm -r xscreensaver-${VERSION}/OSX/* rm -r xscreensaver-${VERSION}/android/* tar cf xscreensaver-${VERSION}.tar xscreensaver-${VERSION} rm -r xscreensaver-${VERSION} -xz -9 xscreensaver-${VERSION}.tar -touch -r xscreensaver-${VERSION}.tar.xz.orig xscreensaver-${VERSION}.tar.xz -rm xscreensaver-${VERSION}.tar.xz.orig +plzip -9 xscreensaver-${VERSION}.tar +touch -r xscreensaver-${VERSION}.tarball.orig xscreensaver-${VERSION}.tar.lz +rm xscreensaver-${VERSION}.tarball.orig diff --git a/source/xap/xscreensaver/slack-desc b/source/xap/xscreensaver/slack-desc index ea0efe024..6394a1458 100644 --- a/source/xap/xscreensaver/slack-desc +++ b/source/xap/xscreensaver/slack-desc @@ -1,19 +1,19 @@ # 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------------------------------------------------------| xscreensaver: xscreensaver (a screen saver and locker for X) xscreensaver: -xscreensaver: A modular screen saver and locker for the X Window System. Highly -xscreensaver: customizable: allows the use of any program that can draw on the -xscreensaver: root window as a display mode. More than 100 display modes are +xscreensaver: A modular screen saver and locker for the X Window System. Highly +xscreensaver: customizable: allows the use of any program that can draw on the +xscreensaver: root window as a display mode. More than 100 display modes are xscreensaver: included in this package. xscreensaver: -xscreensaver: Homepage: http://www.jwz.org/xscreensaver +xscreensaver: Homepage: http://www.jwz.org/xscreensaver xscreensaver: xscreensaver: xscreensaver: diff --git a/source/xap/xscreensaver/xscreensaver.SlackBuild b/source/xap/xscreensaver/xscreensaver.SlackBuild index 43d7995a1..f66209fe6 100755 --- a/source/xap/xscreensaver/xscreensaver.SlackBuild +++ b/source/xap/xscreensaver/xscreensaver.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2016 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2016, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,9 +20,11 @@ # 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) -VERSION=${VERSION:-$(echo xscreensaver-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +PKGNAM=xscreensaver +VERSION=${VERSION:-$(echo xscreensaver-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -34,6 +36,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 + NUMJOBS=${NUMJOBS:-" -j7 "} if [ "$ARCH" = "i586" ]; then @@ -50,7 +60,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-xscreensaver @@ -59,7 +68,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf xscreensaver-$VERSION -tar xvf $CWD/xscreensaver-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/xscreensaver-$VERSION.tar.?z || exit 1 cd xscreensaver-$VERSION # Allow xscreensaver to work setgid shadow. I'd rather avoid requiring diff --git a/source/xap/xscreensaver/xscreensaver.no.expiration.date.diff b/source/xap/xscreensaver/xscreensaver.no.expiration.date.diff index bdbcbe1d1..ed20ff6ce 100644 --- a/source/xap/xscreensaver/xscreensaver.no.expiration.date.diff +++ b/source/xap/xscreensaver/xscreensaver.no.expiration.date.diff @@ -1,5 +1,5 @@ ---- ./driver/prefs.c.orig 2016-05-23 22:08:27.000000000 -0500 -+++ ./driver/prefs.c 2016-05-30 15:29:36.446721679 -0500 +--- ./driver/prefs.c.orig 2018-04-09 20:21:20.000000000 -0500 ++++ ./driver/prefs.c 2018-04-13 13:38:47.859002138 -0500 @@ -1734,6 +1734,17 @@ shipping the last version with the old license and then never upgrading it again -- which would be the worst possible outcome for @@ -17,13 +17,14 @@ + */ - time_t now = time ((time_t *) 0); /* */ -@@ -1766,5 +1777,7 @@ - months = ((((tm->tm_year + 1900) * 12) + tm->tm_mon) - /* h */ - (y * 12 + m)); /* p */ - /* . */ -- return (months >= 17); /* */ -+ /* Disable date checking for Slackware: */ /* \ö/ */ -+ /* return (months >= 17); */ /* */ + time_t now = time ((time_t *) 0); /* d */ +@@ -1766,5 +1777,8 @@ + mrnths = ((((tm->tm_year + 1900) * 12) + tm->tm_mon) - /* h */ + (y * 12 + m)); /* h */ + /* p */ +- return (mrnths >= 17); /* . */ ++ /* Disable date checking for Slackware: */ /* \â– / */ ++ /* return (mrnths >= 17); */ /* . */ + return ( 0 ); ++ } diff --git a/source/xap/xv/slack-desc b/source/xap/xv/slack-desc index 2fc481666..5fce75a4f 100644 --- a/source/xap/xv/slack-desc +++ b/source/xap/xv/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------------------------------------------------------| @@ -10,7 +10,7 @@ xv: xv (John Bradley's interactive image viewer) xv: xv: xv is an interactive image manipulation program. xv: -xv: NOTICE: This program is unregistered shareware. Please read the +xv: NOTICE: This program is unregistered shareware. Please read the xv: license information included. xv: xv: diff --git a/source/xap/xv/xv.SlackBuild b/source/xap/xv/xv.SlackBuild index 9b5b4cd31..526cf1104 100755 --- a/source/xap/xv/xv.SlackBuild +++ b/source/xap/xv/xv.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2008, 2009, 2015 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2015, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,20 +20,30 @@ # 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=xv VERSION=3.10a -BUILD=${BUILD:-7} +BUILD=${BUILD:-9} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; esac fi -CWD=$(pwd) +# 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 + TMP=${TMP:-/tmp} PKG=$TMP/package-xv |
