diff options
Diffstat (limited to 'source/ap')
-rw-r--r-- | source/ap/FTBFSlog | 26 | ||||
-rwxr-xr-x | source/ap/cups/cups.SlackBuild | 23 | ||||
-rw-r--r-- | source/ap/man-db/dont_write_in_usr.diff | 50 | ||||
-rwxr-xr-x | source/ap/man-db/man-db.SlackBuild | 13 | ||||
-rwxr-xr-x | source/ap/mariadb/mariadb.SlackBuild | 2 |
5 files changed, 14 insertions, 100 deletions
diff --git a/source/ap/FTBFSlog b/source/ap/FTBFSlog index 13a5bbcfc..859555ed5 100644 --- a/source/ap/FTBFSlog +++ b/source/ap/FTBFSlog @@ -1,25 +1,3 @@ -Sat Apr 3 17:43:44 UTC 2021 - mariadb: Fix a CMake syntax error. Thanks to nobodino. +Mon Feb 7 20:57:55 UTC 2022 + All packages tested and found to compile properly. +--------------------------+ -Sun Jan 17 20:00:47 UTC 2021 - bpe: port from sys_errlist to strerror. -+--------------------------+ -Sat Jan 16 18:33:06 UTC 2021 - squashfs-tools: add -fcommon to CFLAGS. Thanks to nobodino. -+--------------------------+ -Fri Jan 15 20:03:16 UTC 2021 - ghostscript: fix build against freetype-2.10.4. Thanks to nobodino. -+--------------------------+ -Mon Dec 9 21:33:37 UTC 2019 - Patched for texinfo-6.7. Thanks to Matteo Bernardini. -+--------------------------+ -Tue Sep 10 17:52:32 UTC 2019 - jove: patch to fix breakage from removal of stropts.h in glibc-2.30. -+--------------------------+ -Mon Feb 12 23:18:35 UTC 2018 - All AP packages tested and found to build properly. -+--------------------------+ -Sat Feb 3 19:07:00 UTC 2018 - Fix all packages that fail to build from source: - cdrdao: fix build with lame present - ksh93: ksh hates gcc, switch to clang diff --git a/source/ap/cups/cups.SlackBuild b/source/ap/cups/cups.SlackBuild index 540af43b3..172af643d 100755 --- a/source/ap/cups/cups.SlackBuild +++ b/source/ap/cups/cups.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2012, 2015, 2017, 2018, 2019, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2012, 2015, 2017, 2018, 2019, 2021, 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -94,14 +94,11 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --enable-ssl \ - --enable-gnutls=yes \ --enable-cdsassl=no \ --docdir=/usr/doc \ + --mandir=/usr/man \ $PAM_OPTIONS \ $SHADOW_OPTIONS \ - --disable-avahi \ - --disable-dnssd \ --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || exit 1 @@ -160,13 +157,6 @@ rmdir --parents $PKG/etc/dbus-1/system.d/ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -# Remove preformatted manpages and move the manpages to /usr/man: -( cd $PKG/usr/share/man - find . -type d -name "cat*" | xargs rm -rf - cd .. - mv man .. -) - # Compress manual pages: find $PKG/usr/man -type f -exec gzip -9 {} \+ for i in $( find $PKG/usr/man -type l ) ; do @@ -180,13 +170,16 @@ done rmdir $PKG/usr/share/doc cd $PKG/usr/doc ln -sf cups-$VERSION cups ) + cp -a \ + CHANGES* CONTRIBUTING* CREDITS* DEVELOPING* INSTALL* LICENSE* NOTICE* README* SECURITY* \ + $PKG/usr/doc/${PKGNAM}-$VERSION # 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 CHANGES.txt ]; then +if [ -r CHANGES.md ]; then DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) - cat CHANGES.txt | head -n 1000 > $DOCSDIR/CHANGES.txt - touch -r CHANGES.txt $DOCSDIR/CHANGES.txt + cat CHANGES.md | head -n 1000 > $DOCSDIR/CHANGES.md + touch -r CHANGES.md $DOCSDIR/CHANGES.md fi # I'm sorry, but PDF files are almost as bloated and annoying as diff --git a/source/ap/man-db/dont_write_in_usr.diff b/source/ap/man-db/dont_write_in_usr.diff deleted file mode 100644 index 8f7158598..000000000 --- a/source/ap/man-db/dont_write_in_usr.diff +++ /dev/null @@ -1,50 +0,0 @@ -diff -Naur man-db-2.7.6.1/configure man-db-2.7.6.1.patched/configure ---- man-db-2.7.6.1/configure 2016-12-12 07:43:48.000000000 -0500 -+++ man-db-2.7.6.1.patched/configure 2017-03-04 16:49:57.389893574 -0500 -@@ -25809,46 +25809,8 @@ - - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for long file names" >&5 --$as_echo_n "checking for long file names... " >&6; } --if ${ac_cv_sys_long_file_names+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_cv_sys_long_file_names=yes --# Test for long file names in all the places we know might matter: --# . the current directory, where building will happen --# $prefix/lib where we will be installing things --# $exec_prefix/lib likewise --# $TMPDIR if set, where it might want to write temporary files --# /tmp where it might want to write temporary files --# /var/tmp likewise --# /usr/tmp likewise --for ac_dir in . "$TMPDIR" /tmp /var/tmp /usr/tmp "$prefix/lib" "$exec_prefix/lib"; do -- # Skip $TMPDIR if it is empty or bogus, and skip $exec_prefix/lib -- # in the usual case where exec_prefix is '${prefix}'. -- case $ac_dir in #( -- . | /* | ?:[\\/]*) ;; #( -- *) continue;; -- esac -- test -w "$ac_dir/." || continue # It is less confusing to not echo anything here. -- ac_xdir=$ac_dir/cf$$ -- (umask 077 && mkdir "$ac_xdir" 2>/dev/null) || continue -- ac_tf1=$ac_xdir/conftest9012345 -- ac_tf2=$ac_xdir/conftest9012346 -- touch "$ac_tf1" 2>/dev/null && test -f "$ac_tf1" && test ! -f "$ac_tf2" || -- ac_cv_sys_long_file_names=no -- rm -f -r "$ac_xdir" 2>/dev/null -- test $ac_cv_sys_long_file_names = no && break --done --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_long_file_names" >&5 --$as_echo "$ac_cv_sys_long_file_names" >&6; } --if test $ac_cv_sys_long_file_names = yes; then -- - $as_echo "#define HAVE_LONG_FILE_NAMES 1" >>confdefs.h - --fi -- - - - diff --git a/source/ap/man-db/man-db.SlackBuild b/source/ap/man-db/man-db.SlackBuild index d68b5fa3d..f589a7664 100755 --- a/source/ap/man-db/man-db.SlackBuild +++ b/source/ap/man-db/man-db.SlackBuild @@ -8,7 +8,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=man-db VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} MAN2HTML=${MAN2HTML:-20180101} @@ -174,13 +174,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 {} \+ -# The 'checking for long filenames' test in the configure script writes to -# /usr/lib, which is bad behaviour for a configure script. Not to mention -# wrong (it assumes configure is always being run as root). We already -# know we have long filename support, because we live in the 21st century -# now, so this patch gets rid of the test and force-enables it. -zcat $CWD/dont_write_in_usr.diff.gz | patch -p1 --verbose || exit 1 - # The circumlocutions below are needed because doing it the sane way: # libpipeline_LIBS="-L$PKG/usr/lib$LIBDIRSUFFIX -lpipeline" # gets broken by libtool (it *insists* on replacing -lpipeline with @@ -250,8 +243,8 @@ rm -rf $PKG/etc/man_db.conf mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - ChangeLog FAQ* NEWS* README* docs/COPYING* docs/HACKING docs/INSTALL.quick \ - docs/TODO docs/*lsm docs/*example* \ + ChangeLog FAQ* NEWS* README* COPYING* docs/HACKING* docs/INSTALL.quick \ + docs/TODO* docs/*lsm docs/*example* \ $PKG/usr/doc/$PKGNAM-$VERSION mkdir -p $PKG/install diff --git a/source/ap/mariadb/mariadb.SlackBuild b/source/ap/mariadb/mariadb.SlackBuild index a35a90384..6437eadc9 100755 --- a/source/ap/mariadb/mariadb.SlackBuild +++ b/source/ap/mariadb/mariadb.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mariadb VERSION=${VERSION:-$(echo ${PKGNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # To reduce the package size, the embedded server may be omitted. Currently # only amarok uses this. To build without embedded support, set this to NO. |