diff options
Diffstat (limited to 'source')
14 files changed, 86 insertions, 72 deletions
diff --git a/source/ap/amp/_amp/usr/bin/amp b/source/ap/amp/_amp/usr/bin/amp deleted file mode 100755 index e69de29b..00000000 --- a/source/ap/amp/_amp/usr/bin/amp +++ /dev/null diff --git a/source/ap/amp/amp.SlackBuild b/source/ap/amp/amp.SlackBuild index cc19533e..89dc135c 100755 --- a/source/ap/amp/amp.SlackBuild +++ b/source/ap/amp/amp.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2018, 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=amp VERSION=0.7.6 -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -50,20 +50,20 @@ PKG=$TMP/package-amp rm -rf $PKG mkdir -p $TMP $PKG -# Explode the package framework: -cd $PKG -explodepkg $CWD/_amp.tar.gz - cd $TMP rm -rf amp-$VERSION -tar xvf $CWD/amp-$VERSION.tar.gz || exit 1 +tar xvf $CWD/amp-$VERSION.tar.?z || exit 1 cd amp-$VERSION || exit 1 zcat $CWD/amp-gcc34.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 +# Avoid crashes caused by using agressive optimization with newer compilers: +zcat $CWD/amp.do.not.overoptimize.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 chown -R root:root . ./configure --prefix=/usr $ARCH-slackware-linux || exit 1 make || exit 1 +mkdir -p $PKG/usr/doc $PKG/usr/bin $PKG/usr/man/man1 strip amp cat amp > $PKG/usr/bin/amp +chmod 755 $PKG/usr/bin/amp cat amp.1 | gzip -9c > $PKG/usr/man/man1/amp.1.gz mkdir -p $PKG/usr/doc/amp-$VERSION cp -a \ diff --git a/source/ap/amp/amp.do.not.overoptimize.diff b/source/ap/amp/amp.do.not.overoptimize.diff new file mode 100644 index 00000000..918f9a1c --- /dev/null +++ b/source/ap/amp/amp.do.not.overoptimize.diff @@ -0,0 +1,70 @@ +--- ./configure.orig 1997-08-23 06:11:24.000000000 -0500 ++++ ./configure 2019-08-09 00:26:06.951488547 -0500 +@@ -1409,7 +1409,7 @@ + if test "$OS_TYPE" = "FreeBSD" ; then + OS_TYPE="BSD" + fi +- CFLAGS="-O6 -ffast-math -fomit-frame-pointer ${CFLAGS_ARCH}" ++ CFLAGS="-O0 ${CFLAGS_ARCH}" + DEFINES="-DNO_BYTE_SWAPPING -DOS_$OS_TYPE -DARCH_$ARCH_TYPE" + ;; + +--- ./audio.h.orig 1997-08-21 08:00:18.000000000 -0500 ++++ ./audio.h 2019-08-09 00:26:06.950488547 -0500 +@@ -7,6 +7,8 @@ + */ + + #include <stdio.h> ++#include <stdlib.h> ++#include <string.h> + + struct AUDIO_HEADER { + int ID; +--- ./misc2.h.orig 1997-08-16 13:19:29.000000000 -0500 ++++ ./misc2.h 2019-08-09 00:26:06.955488547 -0500 +@@ -9,6 +9,7 @@ + + extern void requantize_mono(int gr,int ch,struct SIDE_INFO *info,struct AUDIO_HEADER *header); + extern void requantize_ms(int gr,struct SIDE_INFO *info,struct AUDIO_HEADER *header); ++extern void requantize_downmix(int gr,struct SIDE_INFO *info,struct AUDIO_HEADER *header); + extern void alias_reduction(int ch); + extern void calculate_t43(void); + +--- ./audio.c.orig 1997-08-23 06:30:21.000000000 -0500 ++++ ./audio.c 2019-08-09 00:26:06.949488547 -0500 +@@ -31,11 +31,13 @@ + + #define AUDIO + #include "audio.h" ++#include "dump.h" + #include "formats.h" + #include "getbits.h" + #include "huffman.h" + #include "layer2.h" + #include "layer3.h" ++#include "misc2.h" + #include "position.h" + #include "rtbuf.h" + #include "transform.h" +--- ./configure.in.orig 1997-08-23 06:35:41.000000000 -0500 ++++ ./configure.in 2019-08-09 00:26:06.952488547 -0500 +@@ -69,7 +69,7 @@ + if test "$OS_TYPE" = "FreeBSD" ; then + OS_TYPE="BSD" + fi +- CFLAGS="-O6 -ffast-math -fomit-frame-pointer ${CFLAGS_ARCH}" ++ CFLAGS="-O0 ${CFLAGS_ARCH}" + DEFINES="-DNO_BYTE_SWAPPING -DOS_$OS_TYPE -DARCH_$ARCH_TYPE" + ;; + +--- ./guicontrol.c.orig 2019-08-09 00:25:48.432489684 -0500 ++++ ./guicontrol.c 2019-08-09 00:26:06.953488547 -0500 +@@ -276,6 +276,8 @@ + return cnt; + } + ++int decodeMPEG_2(int inFilefd); ++ + void gui_control(void) + { + int flags,dummy; diff --git a/source/d/doxygen/doxygen.9468ede.diff b/source/d/doxygen/doxygen.9468ede.diff deleted file mode 100644 index b189a85a..00000000 --- a/source/d/doxygen/doxygen.9468ede.diff +++ /dev/null @@ -1,52 +0,0 @@ -From 9468ede259153cf79eb8d61635389744e9a2ee7d Mon Sep 17 00:00:00 2001 -From: Dimitri van Heesch <dimitri@stack.nl> -Date: Sun, 29 Oct 2017 11:47:48 +0100 -Subject: [PATCH] Bug 789168 - Increasing access of inherited C++ members with - 'using...' is not recognized by Doxygen - ---- - src/doxygen.cpp | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/src/doxygen.cpp b/src/doxygen.cpp -index d3554cffd..ec97d4354 100644 ---- a/src/doxygen.cpp -+++ b/src/doxygen.cpp -@@ -2112,9 +2112,8 @@ static void findUsingDeclImports(EntryNav *rootNav) - (rootNav->parent()->section()&Entry::COMPOUND_MASK) // in a class/struct member - ) - { -- //printf("Found using declaration %s at line %d of %s inside section %x\n", -- // root->name.data(),root->startLine,root->fileName.data(), -- // root->parent->section); -+ //printf("Found using declaration %s inside section %x\n", -+ // rootNav->name().data(), rootNav->parent()->section()); - QCString fullName=removeRedundantWhiteSpace(rootNav->parent()->name()); - fullName=stripAnonymousNamespaceScope(fullName); - fullName=stripTemplateSpecifiersFromScope(fullName); -@@ -2130,7 +2129,7 @@ static void findUsingDeclImports(EntryNav *rootNav) - ClassDef *bcd = getResolvedClass(cd,0,scope); // todo: file in fileScope parameter - if (bcd) - { -- //printf("found class %s\n",bcd->name().data()); -+ //printf("found class %s memName=%s\n",bcd->name().data(),memName.data()); - MemberNameInfoSDict *mndict=bcd->memberNameInfoSDict(); - if (mndict) - { -@@ -11181,7 +11180,6 @@ void parseInput() - g_s.end(); - - g_s.begin("Searching for members imported via using declarations...\n"); -- findUsingDeclImports(rootNav); - // this should be after buildTypedefList in order to properly import - // used typedefs - findUsingDeclarations(rootNav); -@@ -11249,6 +11247,7 @@ void parseInput() - g_s.begin("Searching for member function documentation...\n"); - findObjCMethodDefinitions(rootNav); - findMemberDocumentation(rootNav); // may introduce new members ! -+ findUsingDeclImports(rootNav); // may introduce new members ! - - transferRelatedFunctionDocumentation(); - transferFunctionDocumentation(); - diff --git a/source/d/doxygen/doxygen.SlackBuild b/source/d/doxygen/doxygen.SlackBuild index a1350334..d01b8905 100755 --- a/source/d/doxygen/doxygen.SlackBuild +++ b/source/d/doxygen/doxygen.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=doxygen VERSION=${VERSION:-$(basename $(echo doxygen-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) .src)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -76,9 +76,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Revert patch that leads to segfaults: -zcat $CWD/doxygen.9468ede.diff.gz | patch -p1 -R --verbose || exit 1 - mkdir build cd build cmake \ diff --git a/source/d/doxygen/doxygen.url b/source/d/doxygen/doxygen.url new file mode 100644 index 00000000..1f74849e --- /dev/null +++ b/source/d/doxygen/doxygen.url @@ -0,0 +1 @@ +http://www.doxygen.org/download.html diff --git a/source/k/kernel-configs/config-generic-4.19.65 b/source/k/kernel-configs/config-generic-4.19.66 index dc5e3069..16681cc7 100644 --- a/source/k/kernel-configs/config-generic-4.19.65 +++ b/source/k/kernel-configs/config-generic-4.19.66 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.65 Kernel Configuration +# Linux/x86 4.19.66 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-4.19.65.x64 b/source/k/kernel-configs/config-generic-4.19.66.x64 index 5a543914..16616934 100644 --- a/source/k/kernel-configs/config-generic-4.19.65.x64 +++ b/source/k/kernel-configs/config-generic-4.19.66.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.65 Kernel Configuration +# Linux/x86 4.19.66 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-smp-4.19.65-smp b/source/k/kernel-configs/config-generic-smp-4.19.66-smp index dd3be316..db5c1780 100644 --- a/source/k/kernel-configs/config-generic-smp-4.19.65-smp +++ b/source/k/kernel-configs/config-generic-smp-4.19.66-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.65 Kernel Configuration +# Linux/x86 4.19.66 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-4.19.65 b/source/k/kernel-configs/config-huge-4.19.66 index 82f068b1..d80d661d 100644 --- a/source/k/kernel-configs/config-huge-4.19.65 +++ b/source/k/kernel-configs/config-huge-4.19.66 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.65 Kernel Configuration +# Linux/x86 4.19.66 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-4.19.65.x64 b/source/k/kernel-configs/config-huge-4.19.66.x64 index 9c867dad..92549c10 100644 --- a/source/k/kernel-configs/config-huge-4.19.65.x64 +++ b/source/k/kernel-configs/config-huge-4.19.66.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.65 Kernel Configuration +# Linux/x86 4.19.66 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-smp-4.19.65-smp b/source/k/kernel-configs/config-huge-smp-4.19.66-smp index 5242082b..77e3933f 100644 --- a/source/k/kernel-configs/config-huge-smp-4.19.65-smp +++ b/source/k/kernel-configs/config-huge-smp-4.19.66-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.65 Kernel Configuration +# Linux/x86 4.19.66 Kernel Configuration # # diff --git a/source/n/NetworkManager/NetworkManager.SlackBuild b/source/n/NetworkManager/NetworkManager.SlackBuild index 5db588b5..b92ec2b9 100755 --- a/source/n/NetworkManager/NetworkManager.SlackBuild +++ b/source/n/NetworkManager/NetworkManager.SlackBuild @@ -129,8 +129,6 @@ CXXFLAGS="$SLKCFLAGS" \ --with-dhclient=yes \ --with-modem-manager-1=yes \ --with-nmtui=yes \ - --with-libnm-glib \ - --disable-vala \ --enable-json-validation \ --enable-ovs \ --with-session-tracking=consolekit \ diff --git a/source/n/NetworkManager/conf.d/00-dhcp-client.conf b/source/n/NetworkManager/conf.d/00-dhcp-client.conf index 7b52815f..2fc42be4 100644 --- a/source/n/NetworkManager/conf.d/00-dhcp-client.conf +++ b/source/n/NetworkManager/conf.d/00-dhcp-client.conf @@ -1,5 +1,5 @@ [main] -# Choose a DHCP client below. Upstream recommends dhclient, but results may vary. +# Choose a DHCP client below. Upstream recommends internal, but results may vary. # dhcpcd is the DHCP client usually used by Slackware: dhcp=dhcpcd # dhclient is the ISC reference DHCP client, part of the dhcp package: |