diff options
| author |   Matteo Bernardini | 2019-11-17 09:41:16 +0100 |
|---|---|---|
| committer | Matteo Bernardini | 2019-11-17 09:41:16 +0100 |
| commit | b1037bdb13cfab1a866971d09462ace5cad56259 (patch) | |
| tree | 2ede4cb69452c1eff3dbf47b08cf60be0cabeaed | |
| parent | ed263eba8d75390f0e7789cc9e924e1be2584f69 (diff) | |
| download | slackbuilds-current-20191117.1.tar.gz | |
20191117.1 global branch merge.current-20191117.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
1395 files changed, 28826 insertions, 28537 deletions
@@ -1,3 +1,19 @@ +SBo-git - slackbuilds repository for slackware-current +- - - + +this is an unofficial fork of master branch from slackbuilds.org's +git repository (http://slackbuilds.org/cgit/slackbuilds/). + +here I put my unofficial mods to their slackbuilds to run on +slackware-current with sbopkg (http://www.sbopkg.org). + +Check https://github.com/Ponce/slackbuilds/wiki for additional informations. + +See https://github.com/Ponce/slackbuilds/wiki/configuring-the-current-repository-with-sbopkg +for instructions on how to use this repository with sbopkg. + +original README from slackbuilds.org follows: +--------------------------------------------- See https://slackbuilds.org/howto/ for instructions on how to use the contents of this directory. diff --git a/academic/antiprism/antiprism.SlackBuild b/academic/antiprism/antiprism.SlackBuild index 271184a166..f3c6c291e6 100644 --- a/academic/antiprism/antiprism.SlackBuild +++ b/academic/antiprism/antiprism.SlackBuild @@ -55,7 +55,7 @@ find -L . \ sed "/^docdir/s|= .*|= @docdir@|" -i Makefile.in CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -fpermissive" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib$LIBDIRSUFFIX \ diff --git a/academic/geda-gaf/geda-gaf.info b/academic/geda-gaf/geda-gaf.info index 3664fa7fb5..1362c53982 100644 --- a/academic/geda-gaf/geda-gaf.info +++ b/academic/geda-gaf/geda-gaf.info @@ -5,6 +5,6 @@ DOWNLOAD="http://ftp.geda-project.org/geda-gaf/stable/v1.8/1.8.2/geda-gaf-1.8.2. MD5SUM="fa8a807615decf47027e22a217dd0ded" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="guile1.8" MAINTAINER="Stephen Van Berg" EMAIL="stephen_van_berg@earlicker.com" diff --git a/academic/gelemental/gcc.patch b/academic/gelemental/gcc.patch new file mode 100644 index 0000000000..eeb16293d9 --- /dev/null +++ b/academic/gelemental/gcc.patch @@ -0,0 +1,12 @@ +diff -Naur gelemental-1.2.0.orig/src/dialogs.cc gelemental-1.2.0/src/dialogs.cc +--- gelemental-1.2.0.orig/src/dialogs.cc 2007-09-25 06:49:33.000000000 +0200 ++++ gelemental-1.2.0/src/dialogs.cc 2017-07-27 21:45:34.356776770 +0200 +@@ -247,7 +247,7 @@ + const Gtk::TreePath& tpath, bool) + { + Gtk::TreeIter iter = store->get_iter (tpath); +- return iter ? iter->get_value (cols.property) : false; ++ return iter ? static_cast<bool>(iter->get_value (cols.property)) : false; + } + + diff --git a/academic/gelemental/gelemental.SlackBuild b/academic/gelemental/gelemental.SlackBuild index e4b332e18a..d2ae765eb6 100644 --- a/academic/gelemental/gelemental.SlackBuild +++ b/academic/gelemental/gelemental.SlackBuild @@ -70,6 +70,9 @@ 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 {} \; +# Fix for the newer gcc +patch -p1 -i $CWD/gcc.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ diff --git a/academic/genius/README b/academic/genius/README index d4a270574c..fa2fa4b67b 100644 --- a/academic/genius/README +++ b/academic/genius/README @@ -7,5 +7,5 @@ or educational tool. The syntax is very intuitive and is designed to mimic how mathematics is usually written. If you would like the GUI interface as well, it requires -libgnomeui and gtksourceview. If you have these dependencies, +libgnomeui, gtksourceview and vte2. If you have these dependencies, pass the variable of GNOME=YES (or anything that isn't NO ;) diff --git a/academic/genometools/genometools.SlackBuild b/academic/genometools/genometools.SlackBuild index f4af4db0f9..117e1bb420 100644 --- a/academic/genometools/genometools.SlackBuild +++ b/academic/genometools/genometools.SlackBuild @@ -76,7 +76,7 @@ find -L . \ sed -i "s:lib/libgenometools:lib${LIBDIRSUFFIX}/libgenometools:g" Makefile sed -i "s:\$(prefix)/lib:\$(prefix)/lib${LIBDIRSUFFIX}:g" Makefile -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -Wno-error=format-truncation=" \ CXXFLAGS="$SLKCFLAGS" \ make $BUILDARCH \ prefix=/usr diff --git a/academic/primer3/primer3.SlackBuild b/academic/primer3/primer3.SlackBuild index d3ae1b399c..514f65fd23 100644 --- a/academic/primer3/primer3.SlackBuild +++ b/academic/primer3/primer3.SlackBuild @@ -75,13 +75,11 @@ patch -p1 -i $CWD/gcc-7.patch cd ./src # Use our CFLAGS -sed -i "/^CFLAGS/s/=/+=/" Makefile +sed -i -e "s|-O2|$SLKCFLAGS|" -e "s|-g -Wall|-fpermissive|" Makefile # Look for configuration files in /usr/share instead of /opt sed -i "s:/opt/primer3_config:/usr/share/$PRGNAM/primer3_config:g" thal_main.c primer3_boulder_main.c -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ make # This is recommended, but the tests take a really long time. Be patient diff --git a/academic/root/root.SlackBuild b/academic/root/root.SlackBuild index bb507f0536..e0ec409dca 100644 --- a/academic/root/root.SlackBuild +++ b/academic/root/root.SlackBuild @@ -18,7 +18,7 @@ # Modified by the slackbuilds.org project PRGNAM=root -VERSION=${VERSION:-5.34.36} +VERSION=${VERSION:-6.10.02} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -79,9 +79,9 @@ fi rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM +rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM\_v$VERSION.source.tar.gz -cd $PRGNAM +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -134,9 +134,8 @@ mkdir -p $PKG$PYTHONDIR mv \ $PKG$PREFIX/lib$LIBDIRSUFFIX/*.py \ $PKG$PREFIX/lib$LIBDIRSUFFIX/*.pyc \ - $PKG$PREFIX/lib$LIBDIRSUFFIX/python/genreflex \ + $PKG$PREFIX/lib$LIBDIRSUFFIX/*.pyo \ $PKG$PYTHONDIR -rm -fr $PKG$PREFIX/lib$LIBDIRSUFFIX/python find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneded 2> /dev/null || true diff --git a/academic/root/root.info b/academic/root/root.info index 450e1bde00..7df5c81738 100644 --- a/academic/root/root.info +++ b/academic/root/root.info @@ -1,10 +1,10 @@ PRGNAM="root" -VERSION="5.34.36" +VERSION="6.10.02" HOMEPAGE="http://root.cern.ch/drupal/" -DOWNLOAD="https://root.cern.ch/download/root_v5.34.36.source.tar.gz" -MD5SUM="6a1ad549b3b79b10bbb1f116b49067ee" +DOWNLOAD="https://root.cern.ch/download/root_v6.10.02.source.tar.gz" +MD5SUM="19f2285c845a48355db779938fb4db99" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="ftgl" +REQUIRES="ftgl unixODBC" MAINTAINER="Jože Zobec" EMAIL="jozze.zepl@gmail.com" diff --git a/academic/tophat/make_pair.patch b/academic/tophat/make_pair.patch new file mode 100644 index 0000000000..44b71d1059 --- /dev/null +++ b/academic/tophat/make_pair.patch @@ -0,0 +1,24 @@ +diff -uBw -aur tophat-2.1.1/src/juncs_db.cpp tophat-2.1.1-patched/src/juncs_db.cpp +--- tophat-2.1.1/src/juncs_db.cpp 2016-02-14 19:21:17.354079000 +0100 ++++ tophat-2.1.1-patched/src/juncs_db.cpp 2016-06-02 11:26:34.097425159 +0200 +@@ -338,7 +338,7 @@ + uint32_t left_coord = atoi(scan_left_coord); + uint32_t right_coord = atoi(scan_right_coord); + bool antisense = *orientation == '-'; +- junctions.insert(make_pair<Junction, JunctionStats>(Junction(ref_id, left_coord, right_coord, antisense), JunctionStats())); ++ junctions.insert(make_pair(Junction(ref_id, left_coord, right_coord, antisense), JunctionStats())); + } + } + +diff -uBw -aur tophat-2.1.1/src/tophat_reports.cpp tophat-2.1.1-patched/src/tophat_reports.cpp +--- tophat-2.1.1/src/tophat_reports.cpp 2016-02-23 22:20:44.320710000 +0100 ++++ tophat-2.1.1-patched/src/tophat_reports.cpp 2016-06-02 11:26:22.057239478 +0200 +@@ -2705,7 +2705,7 @@ + junction_stat.gtf_match = true; + junction_stat.accepted = true; + +- gtf_junctions.insert(make_pair<Junction, JunctionStats>(Junction(ref_id, left_coord, right_coord, antisense), junction_stat)); ++ gtf_junctions.insert(make_pair(Junction(ref_id, left_coord, right_coord, antisense), junction_stat)); + } + } + fprintf(stderr, "Loaded %d GFF junctions from %s.\n", (int)(gtf_junctions.size()), gtf_juncs.c_str()); diff --git a/academic/tophat/tophat.SlackBuild b/academic/tophat/tophat.SlackBuild index f32fb590f5..e3e97fcc85 100644 --- a/academic/tophat/tophat.SlackBuild +++ b/academic/tophat/tophat.SlackBuild @@ -69,6 +69,9 @@ 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 {} \; +# Thanks archlinux +patch -p1 < $CWD/make_pair.patch + ./autogen.sh CFLAGS="$SLKCFLAGS" \ diff --git a/academic/ugene/ugene-1.22.0-dont_hardcode_includes.patch b/academic/ugene/ugene-1.22.0-dont_hardcode_includes.patch new file mode 100644 index 0000000000..6bc26e1f19 --- /dev/null +++ b/academic/ugene/ugene-1.22.0-dont_hardcode_includes.patch @@ -0,0 +1,24 @@ +diff -up ugene-1.22.0/src/libs_3rdparty/samtools/samtools.pri.dont_hardcode_includes ugene-1.22.0/src/libs_3rdparty/samtools/samtools.pri +--- ugene-1.22.0/src/libs_3rdparty/samtools/samtools.pri.dont_hardcode_includes 2016-03-31 07:21:56.000000000 -0500 ++++ ugene-1.22.0/src/libs_3rdparty/samtools/samtools.pri 2016-06-02 17:49:02.383069490 -0500 +@@ -3,7 +3,7 @@ UGENE_RELATIVE_DESTDIR = '' + + TEMPLATE = lib + CONFIG +=thread debug_and_release staticlib warn_off +-INCLUDEPATH += src src/samtools ../../include /usr/include ++INCLUDEPATH += src src/samtools ../../include + win32 : INCLUDEPATH += src/samtools/win32 + DEFINES+="_FILE_OFFSET_BITS=64" _LARGEFILE64_SOURCE _USE_KNETFILE + win32 : DEFINES += _USE_MATH_DEFINES "inline=__inline" "__func__=__FUNCTION__" "R_OK=4" "atoll=_atoi64" "alloca=_alloca" +diff -up ugene-1.22.0/src/plugins_3rdparty/variants/variants.pri.dont_hardcode_includes ugene-1.22.0/src/plugins_3rdparty/variants/variants.pri +--- ugene-1.22.0/src/plugins_3rdparty/variants/variants.pri.dont_hardcode_includes 2016-03-31 07:22:09.000000000 -0500 ++++ ugene-1.22.0/src/plugins_3rdparty/variants/variants.pri 2016-06-02 20:26:35.265356432 -0500 +@@ -20,7 +20,7 @@ use_bundled_zlib() { + win32 : LIBS += -lwsock32 + + +-INCLUDEPATH += src ../../include /usr/include ++INCLUDEPATH += src ../../include + INCLUDEPATH += ../../libs_3rdparty/samtools/src/samtools + INCLUDEPATH += ../../libs_3rdparty/samtools/src + INCLUDEPATH += ../../libs_3rdparty/samtools/src/samtools/bcftools diff --git a/academic/ugene/ugene.SlackBuild b/academic/ugene/ugene.SlackBuild index ac95c63b17..1b68d3e510 100644 --- a/academic/ugene/ugene.SlackBuild +++ b/academic/ugene/ugene.SlackBuild @@ -73,6 +73,9 @@ 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 {} \; +# Thanks fedora +patch -p1 < $CWD/ugene-1.22.0-dont_hardcode_includes.patch + # Fix libraries and man pages paths sed -i "s:/lib:/lib${LIBDIRSUFFIX}:g" src/ugene_globals.pri sed -i "s:/share/man:/man:g" src/ugene_globals.pri diff --git a/academic/veusz/veusz.SlackBuild b/academic/veusz/veusz.SlackBuild index f3e607ab95..39d3b8fe80 100644 --- a/academic/veusz/veusz.SlackBuild +++ b/academic/veusz/veusz.SlackBuild @@ -69,10 +69,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 {} \; -PYTHONVER=$(python -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.) -export SIP_EXE=/usr/bin/python2-sip -export SIP_INCLUDE_DIR="/usr/include/python$PYTHONVER/python2-sip" - python setup.py install --root $PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/accessibility/easystroke/easystroke.SlackBuild b/accessibility/easystroke/easystroke.SlackBuild index 29b04e812b..3e2f2fedcc 100644 --- a/accessibility/easystroke/easystroke.SlackBuild +++ b/accessibility/easystroke/easystroke.SlackBuild @@ -59,6 +59,7 @@ sed -i 's|-lboost_serialization-mt|-lboost_serialization|' Makefile # Thanks to ARCH Linux patch -p1 < $CWD/lambda.patch +patch -p1 < $CWD/gcc7-build-fix.patch make CXX="g++ $SLKCFLAGS" CC="gcc -std=c99 $SLKCFLAGS" PREFIX=/usr diff --git a/accessibility/easystroke/gcc7-build-fix.patch b/accessibility/easystroke/gcc7-build-fix.patch new file mode 100644 index 0000000000..b66bcb4edf --- /dev/null +++ b/accessibility/easystroke/gcc7-build-fix.patch @@ -0,0 +1,40 @@ +From 9e2c32390c5c253aade3bb703e51841748d2c37e Mon Sep 17 00:00:00 2001 +From: Jonathan Wakely <jwakely@redhat.com> +Date: Sat, 28 Jan 2017 01:26:00 +0000 +Subject: [PATCH] Remove abs(float) function that clashes with std::abs(float) + +Depending on which C++ standard library headers have been included there +might an abs(float) function already declared in the global namespace, +so the definition in this file conflicts with it. This cause a build +failure with GCC 7, which conforms more closely to the C++ standard with +respect to overloads of abs. + +Including <cmath> and adding a using-declaration for std::abs ensures +that the standard std::abs(float) function is available. This solution +should be portable to all compilers. +--- + handler.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/handler.cc b/handler.cc +index 8830ea2..685b1ff 100644 +--- a/handler.cc ++++ b/handler.cc +@@ -23,6 +23,8 @@ + #include <X11/extensions/XTest.h> + #include <X11/XKBlib.h> + #include <X11/Xproto.h> ++#include <cmath> // std::abs(float) ++using std::abs; + + XState *xstate = nullptr; + +@@ -533,8 +535,6 @@ class WaitForPongHandler : public Handler, protected Timeout { + virtual Grabber::State grab_mode() { return parent->grab_mode(); } + }; + +-static inline float abs(float x) { return x > 0 ? x : -x; } +- + class AbstractScrollHandler : public Handler { + bool have_x, have_y; + float last_x, last_y; diff --git a/accessibility/flite/flite.info b/accessibility/flite/flite.info index 4b6c62b261..05d4e52227 100644 --- a/accessibility/flite/flite.info +++ b/accessibility/flite/flite.info @@ -5,6 +5,6 @@ DOWNLOAD="http://festvox.org/flite/packed/flite-2.1/flite-2.1-release.tar.bz2" MD5SUM="915ac91068fc962f4a0e8aa26164cc8a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="texi2html" MAINTAINER="B. Watson" EMAIL="yalhcru@gmail.com" diff --git a/accessibility/jpilot/jpilot.SlackBuild b/accessibility/jpilot/jpilot.SlackBuild index 78eeb3f868..e2dd848145 100644 --- a/accessibility/jpilot/jpilot.SlackBuild +++ b/accessibility/jpilot/jpilot.SlackBuild @@ -25,13 +25,13 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=jpilot -VERSION=${VERSION:-1.8.1} +VERSION=${VERSION:-1.8.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -60,15 +60,16 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP rm -rf $PRGNAM-$VERSION +cd $TMP +rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS -std=gnu89" \ CXXFLAGS="$SLKCFLAGS -std=gnu89" \ @@ -84,10 +85,8 @@ CXXFLAGS="$SLKCFLAGS -std=gnu89" \ make make install-strip DESTDIR=$PKG -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -) +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 mv $PKG/usr/share/doc $PKG/usr mv $PKG/usr/doc/jpilot $PKG/usr/doc/jpilot-$VERSION diff --git a/accessibility/jpilot/jpilot.info b/accessibility/jpilot/jpilot.info index 4030813d5e..9d14b884f0 100644 --- a/accessibility/jpilot/jpilot.info +++ b/accessibility/jpilot/jpilot.info @@ -1,8 +1,8 @@ PRGNAM="jpilot" -VERSION="1.8.1" +VERSION="1.8.2" HOMEPAGE="http://www.jpilot.org" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/jpilot-1.8.1.tar.gz" -MD5SUM="ac59a5708f37e30d39e85b1fcedd266f" +DOWNLOAD="http://jpilot.org/tarballs/jpilot-1.8.2.tar.gz" +MD5SUM="8b539d8943ac75c7890fc5c071e89adb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/accessibility/xsel/xsel.SlackBuild b/accessibility/xsel/xsel.SlackBuild index 67a373675a..2ff4a0386f 100644 --- a/accessibility/xsel/xsel.SlackBuild +++ b/accessibility/xsel/xsel.SlackBuild @@ -54,7 +54,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -Wno-error=stringop-truncation" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/audio/aacgain/aacgain.SlackBuild b/audio/aacgain/aacgain.SlackBuild index 2a138e95c9..cabdf16c33 100644 --- a/audio/aacgain/aacgain.SlackBuild +++ b/audio/aacgain/aacgain.SlackBuild @@ -120,7 +120,7 @@ cd ../mp4v2 patch -p2 -i ../$PRGNAM/mp4v2.patch CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -fpermissive" \ ./configure \ --build=$ARCH-slackware-linux diff --git a/audio/alsamodularsynth/alsamodularsynth.SlackBuild b/audio/alsamodularsynth/alsamodularsynth.SlackBuild index 60c79fccb5..088d4c44dd 100644 --- a/audio/alsamodularsynth/alsamodularsynth.SlackBuild +++ b/audio/alsamodularsynth/alsamodularsynth.SlackBuild @@ -31,7 +31,7 @@ TARNAM=ams if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -72,6 +72,9 @@ 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 {} \; +export CC=clang +export CXX=clang++ + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ LIBS="-ldl" \ diff --git a/audio/audacious-aac/audacious-aac.SlackBuild b/audio/audacious-aac/audacious-aac.SlackBuild index fa61144a3d..686aee386c 100644 --- a/audio/audacious-aac/audacious-aac.SlackBuild +++ b/audio/audacious-aac/audacious-aac.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=audacious-aac -VERSION=${VERSION:-3.7.2} +VERSION=${VERSION:-3.8.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -31,7 +31,7 @@ SRCNAM=audacious-plugins if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" ARCHOPTS="--disable-sse2" elif [ "$ARCH" = "i686" ]; then diff --git a/audio/audacious-aac/audacious-aac.info b/audio/audacious-aac/audacious-aac.info index 6b6130fe82..a55c639a2d 100644 --- a/audio/audacious-aac/audacious-aac.info +++ b/audio/audacious-aac/audacious-aac.info @@ -1,8 +1,8 @@ PRGNAM="audacious-aac" -VERSION="3.7.2" +VERSION="3.8.2" HOMEPAGE="https://audacious-media-player.org/" -DOWNLOAD="https://distfiles.audacious-media-player.org/audacious-plugins-3.7.2.tar.bz2" -MD5SUM="6ae2f17885897e717b8bbafc32858e2f" +DOWNLOAD="https://distfiles.audacious-media-player.org/audacious-plugins-3.8.2.tar.bz2" +MD5SUM="20710cd19fa08c4bffb6cb33002872df" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="faad2" diff --git a/audio/audacious-cue/audacious-cue.SlackBuild b/audio/audacious-cue/audacious-cue.SlackBuild index a3a796cd74..8d018fdadb 100644 --- a/audio/audacious-cue/audacious-cue.SlackBuild +++ b/audio/audacious-cue/audacious-cue.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=audacious-cue -VERSION=${VERSION:-3.7.2} +VERSION=${VERSION:-3.8.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -31,7 +31,7 @@ SRCNAM=audacious-plugins if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" ARCHOPTS="--disable-sse2" elif [ "$ARCH" = "i686" ]; then diff --git a/audio/audacious-cue/audacious-cue.info b/audio/audacious-cue/audacious-cue.info index 3ae7eef3e3..31b7a1a12c 100644 --- a/audio/audacious-cue/audacious-cue.info +++ b/audio/audacious-cue/audacious-cue.info @@ -1,8 +1,8 @@ PRGNAM="audacious-cue" -VERSION="3.7.2" +VERSION="3.8.2" HOMEPAGE="https://audacious-media-player.org/" -DOWNLOAD="https://distfiles.audacious-media-player.org/audacious-plugins-3.7.2.tar.bz2" -MD5SUM="6ae2f17885897e717b8bbafc32858e2f" +DOWNLOAD="https://distfiles.audacious-media-player.org/audacious-plugins-3.8.2.tar.bz2" +MD5SUM="20710cd19fa08c4bffb6cb33002872df" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libcue" diff --git a/audio/audacious-ffmpeg/README b/audio/audacious-ffmpeg/README deleted file mode 100644 index 04da987f9f..0000000000 --- a/audio/audacious-ffmpeg/README +++ /dev/null @@ -1,4 +0,0 @@ -audacious-ffmpeg (ffmpeg Decoder Plugin used by the Audacious player) - -This plugin adds all audio ffmpeg decoders to the Audacious media -player that comes with Slackware stock packages diff --git a/audio/audacious-ffmpeg/audacious-ffmpeg.SlackBuild b/audio/audacious-ffmpeg/audacious-ffmpeg.SlackBuild deleted file mode 100644 index f45b5c764f..0000000000 --- a/audio/audacious-ffmpeg/audacious-ffmpeg.SlackBuild +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/sh - -# Slackware build script for audacious-ffmpeg - -# Copyright 2016 Johannes Schoepfer, Herrenberg, BW; Germany -# 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. - -PRGNAM=audacious-ffmpeg -VERSION=${VERSION:-3.7.2} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -SRCNAM=audacious-plugins - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" - ARCHOPTS="--disable-sse2" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" - ARCHOPTS="--disable-sse2" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" - ARCHOPTS="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" - ARCHOPTS="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2 -cd $SRCNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -# Patch Makefile to build only aac plugin -patch -p1 <$CWD/patches/enable_only_ffmpeg_plugin.diff || exit 1 - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --disable-aac \ - --program-prefix= \ - --program-suffix= \ - ${ARCHOPTS} \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -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 - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING INSTALL $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/audio/audacious-ffmpeg/audacious-ffmpeg.info b/audio/audacious-ffmpeg/audacious-ffmpeg.info deleted file mode 100644 index 4d49914a64..0000000000 --- a/audio/audacious-ffmpeg/audacious-ffmpeg.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="audacious-ffmpeg" -VERSION="3.7.2" -HOMEPAGE="https://audacious-media-player.org/" -DOWNLOAD="https://distfiles.audacious-media-player.org/audacious-plugins-3.7.2.tar.bz2" -MD5SUM="6ae2f17885897e717b8bbafc32858e2f" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="ffmpeg" -MAINTAINER="Johannes Schoepfer" -EMAIL="slackbuilds[at]schoepfer[dot]info" diff --git a/audio/audacious-ffmpeg/patches/enable_only_ffmpeg_plugin.diff b/audio/audacious-ffmpeg/patches/enable_only_ffmpeg_plugin.diff deleted file mode 100644 index feb3fab813..0000000000 --- a/audio/audacious-ffmpeg/patches/enable_only_ffmpeg_plugin.diff +++ /dev/null @@ -1,8 +0,0 @@ ---- audacious-plugins-3.6.1/Makefile.ORIG 2015-04-04 02:02:06.000000000 +0200 -+++ audacious-plugins-3.6.1/Makefile 2015-04-23 19:59:48.072721987 +0200 -@@ -1,4 +1,4 @@ --SUBDIRS = src po -+SUBDIRS = src/ffaudio - - DISTCLEAN = buildsys.mk config.h config.log config.status extra.mk - diff --git a/audio/audacious-ffmpeg/slack-desc b/audio/audacious-ffmpeg/slack-desc deleted file mode 100644 index e14234a198..0000000000 --- a/audio/audacious-ffmpeg/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 ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -audacious-ffmpeg: audacious-ffmpeg (ffmpeg Decoder Plugin) -audacious-ffmpeg: -audacious-ffmpeg: This plugin adds all audio ffmpeg decoders to the Audacious media -audacious-ffmpeg: player that comes with Slackware stock packages -audacious-ffmpeg: -audacious-ffmpeg: Homepage: https://audacious-media-player.org/ -audacious-ffmpeg: -audacious-ffmpeg: -audacious-ffmpeg: -audacious-ffmpeg: -audacious-ffmpeg: diff --git a/audio/butt/butt.SlackBuild b/audio/butt/butt.SlackBuild index 8cfe05ed28..5a9e116b18 100644 --- a/audio/butt/butt.SlackBuild +++ b/audio/butt/butt.SlackBuild @@ -55,7 +55,7 @@ find . \ -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -fpermissive" \ ./configure \ --prefix $PREFIX \ --docdir $DOCDIR diff --git a/audio/calf-ladspa/calf-ladspa.SlackBuild b/audio/calf-ladspa/calf-ladspa.SlackBuild index f78f393bc7..2d85f57020 100644 --- a/audio/calf-ladspa/calf-ladspa.SlackBuild +++ b/audio/calf-ladspa/calf-ladspa.SlackBuild @@ -98,7 +98,7 @@ patch -p1 < $CWD/disable-jack-and-fluidsynth.diff # This patch replaces them with C-style MIN and MAX macros. Not actually # needed on Slack 14.2, so it's commented out, but I'm checking the actual # patch into git so I won't lose track of it. -#patch -p1 < $CWD/minmax.diff +patch -p1 < $CWD/minmax.diff autoreconf -if diff --git a/audio/darkice/darkice.SlackBuild b/audio/darkice/darkice.SlackBuild index b9829076da..887e4fa8d4 100644 --- a/audio/darkice/darkice.SlackBuild +++ b/audio/darkice/darkice.SlackBuild @@ -71,7 +71,7 @@ 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 {} \; -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -fpermissive" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/audio/easytag/README b/audio/easytag/README deleted file mode 100644 index b03cc1adc5..0000000000 --- a/audio/easytag/README +++ /dev/null @@ -1,7 +0,0 @@ -EasyTAG - Tag editor for MP3, ogg vorbis and various other files. - -EasyTAG is a utility for viewing and editing tags for MP3, MP2, FLAC -Ogg Vorbis, MP4/AAC, MusePack and Monkey's Audio files. Its simple -and nice GTK2 interface makes tagging easier under GNU/Linux. - -libmp4v2 is an optional dependency. diff --git a/audio/easytag/easytag.SlackBuild b/audio/easytag/easytag.SlackBuild deleted file mode 100644 index 7ad594517c..0000000000 --- a/audio/easytag/easytag.SlackBuild +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/sh - -# Slackware build script for easytag - -# Copyright 2006 Halim Issa <yallaone@gmail.com> -# Copyright 2013-2014 LEVAI Daniel <leva@ecentrum.hu> -# 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. - -PRGNAM=easytag -VERSION=${VERSION:-2.1.10} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -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 \ - --prefix=/usr \ - --mandir=/usr/man \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG - -DOCS="AUTHORS ChangeLog COPYING HACKING INSTALL README NEWS THANKS TODO" - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -cat $CWD/$PRGNAM.info > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.info - -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 - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/audio/easytag/easytag.info b/audio/easytag/easytag.info deleted file mode 100644 index b35369e4a5..0000000000 --- a/audio/easytag/easytag.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="easytag" -VERSION="2.1.10" -HOMEPAGE="http://projects.gnome.org/easytag/" -DOWNLOAD="http://download.gnome.org/sources/easytag/2.1/easytag-2.1.10.tar.xz" -MD5SUM="feafcd13508c26171f1376aa4b0629c4" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="id3lib" -MAINTAINER="LEVAI Daniel" -EMAIL="leva@ecentrum.hu" diff --git a/audio/easytag/slack-desc b/audio/easytag/slack-desc deleted file mode 100644 index 07c27c80ce..0000000000 --- a/audio/easytag/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 ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -easytag: easytag (Tag editor for MP3 and Ogg Vorbis files) -easytag: -easytag: EasyTAG is a utility for viewing and editing tags for MP3, MP2, FLAC -easytag: Ogg Vorbis, MP4/AAC, MusePack and Monkey's Audio files. Its simple -easytag: and nice GTK2 interface makes tagging easier under GNU/Linux. -easytag: -easytag: Website : http://easytag.sourceforge.net -easytag: -easytag: -easytag: -easytag: diff --git a/audio/fluidsynth/README b/audio/fluidsynth/README deleted file mode 100644 index a309ca2db2..0000000000 --- a/audio/fluidsynth/README +++ /dev/null @@ -1,9 +0,0 @@ -FluidSynth is a software real-time synthesizer based on the Soundfont 2 -specifications. FluidSynth reads and handles MIDI events from the MIDI -input device. It is the software analogue of a MIDI synthesizer. -FluidSynth can also play midifiles using a Soundfont. - -If you want to build support for ladspa plugins, you can pass -LADSPA=yes to the script. That requires ladspa_sdk. - -Optional deps are lash, portaudio, and jack-audio-connection-kit. diff --git a/audio/fluidsynth/fluidsynth.SlackBuild b/audio/fluidsynth/fluidsynth.SlackBuild deleted file mode 100644 index 7cf814a89d..0000000000 --- a/audio/fluidsynth/fluidsynth.SlackBuild +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/sh - -# Slackware build script for fluidsynth - -# Copyright 2008-2013 Heinz Wiesinger, Amsterdam, The Netherlands -# 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. - -PRGNAM=fluidsynth -VERSION=${VERSION:-1.1.6} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir build -cd build - cmake \ - -DCMAKE_C_FLAGS="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ - -DCMAKE_EXE_LINKER_FLAGS="-ltermcap" \ - -DCMAKE_SHARED_LINKER_FLAGS="-ltermcap" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX="$LIBDIRSUFFIX" \ - -DDOC_INSTALL_DIR="doc" \ - -DMAN_INSTALL_DIR="man/man1" \ - -Denable-ladspa="${LADSPA:-no}" \ - .. - - make - make install DESTDIR=$PKG -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 - -find $PKG/usr/man -type f -exec gzip -9 {} \; - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README THANKS TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/audio/fluidsynth/fluidsynth.info b/audio/fluidsynth/fluidsynth.info deleted file mode 100644 index d3b454c60f..0000000000 --- a/audio/fluidsynth/fluidsynth.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fluidsynth" -VERSION="1.1.6" -HOMEPAGE="http://www.fluidsynth.org/" -DOWNLOAD="http://downloads.sourceforge.net/fluidsynth/fluidsynth-1.1.6.tar.gz" -MD5SUM="ae5aca6de824b4173667cbd3a310b263" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Heinz Wiesinger" -EMAIL="pprkut@liwjatan.at" diff --git a/audio/fluidsynth/slack-desc b/audio/fluidsynth/slack-desc deleted file mode 100644 index 46df5825cd..0000000000 --- a/audio/fluidsynth/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 ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -fluidsynth: fluidsynth (Software Synthesizer) -fluidsynth: -fluidsynth: FluidSynth is a software real-time synthesizer based on the -fluidsynth: Soundfont 2 specifications. FluidSynth reads and handles MIDI -fluidsynth: events from the MIDI input device. It is the software analogue -fluidsynth: of a MIDI synthesizer. FluidSynth can also play midifiles -fluidsynth: using a Soundfont. -fluidsynth: -fluidsynth: Homepage: http://www.fluidsynth.org/ -fluidsynth: -fluidsynth: diff --git a/audio/lash/lash.SlackBuild b/audio/lash/lash.SlackBuild index 0918bdd95d..7b197365b9 100644 --- a/audio/lash/lash.SlackBuild +++ b/audio/lash/lash.SlackBuild @@ -76,6 +76,8 @@ if [ "$(/usr/share/texmf/bin/texi2html --version)" != "1.76" ]; then patch -p1 --verbose < $CWD/texlive.patch fi +export LDFLAGS="-ldl -lm" + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/audio/lmms/gcc6.patch b/audio/lmms/gcc6.patch new file mode 100644 index 0000000000..ef7fbe75c9 --- /dev/null +++ b/audio/lmms/gcc6.patch @@ -0,0 +1,112 @@ +From a06cb0126ccb025993efb2d81c7cbfd8edd60609 Mon Sep 17 00:00:00 2001 +From: Javier Serrano Polo <javier@jasp.net> +Date: Sat, 30 Apr 2016 00:00:09 +0200 +Subject: [PATCH] Fixed build problems with GCC 6 + +--- + plugins/LadspaEffect/calf/src/modules_limit.cpp | 3 ++- + plugins/opl2/fmopl.c | 29 +++++++++++----------- + .../zynaddsubfx/zynaddsubfx/src/UI/EnvelopeUI.fl | 6 +++-- + .../zynaddsubfx/zynaddsubfx/src/UI/ResonanceUI.fl | 6 +++-- + 5 files changed, 29 insertions(+), 22 deletions(-) + +diff --git a/plugins/LadspaEffect/calf/src/modules_limit.cpp b/plugins/LadspaEffect/calf/src/modules_limit.cpp +index 3930078..cd3d6fa 100644 +--- a/plugins/LadspaEffect/calf/src/modules_limit.cpp ++++ b/plugins/LadspaEffect/calf/src/modules_limit.cpp +@@ -540,7 +540,8 @@ uint32_t multibandlimiter_audio_module::process(uint32_t offset, uint32_t numsam + } // process single strip with filter + + // write multiband coefficient to buffer +- buffer[pos] = std::min(*params[param_limit] / std::max(fabs(sum_left), fabs(sum_right)), 1.0); ++ float pre_buffer = *params[param_limit] / std::max(fabs(sum_left), fabs(sum_right)); ++ buffer[pos] = std::min(pre_buffer, 1.0f); + + for (int i = 0; i < strips; i++) { + // process gain reduction +diff --git a/plugins/opl2/fmopl.c b/plugins/opl2/fmopl.c +index 9b411a2..3dd4a51 100644 +--- a/plugins/opl2/fmopl.c ++++ b/plugins/opl2/fmopl.c +@@ -653,21 +653,21 @@ static void init_timetables( FM_OPL *OPL , int ARRATE , int DRRATE ) { + double rate; + + /* make attack rate & decay rate tables */ +- for ( i = 0; i < 4; i++ ) OPL->AR_TABLE[i] = OPL->DR_TABLE[i] = 0; { +- for (i = 4; i <= 60; i++) { +- rate = OPL->freqbase; /* frequency rate */ +- if( i < 60 ) { +- rate *= 1.0+(i&3)*0.25; /* b0-1 : x1 , x1.25 , x1.5 , x1.75 */ +- } +- rate *= 1<<((i>>2)-1); /* b2-5 : shift bit */ +- rate *= (double)(EG_ENT<<ENV_BITS); +- OPL->AR_TABLE[i] = rate / ARRATE; +- OPL->DR_TABLE[i] = rate / DRRATE; +- } +- for ( i = 60; i < 75; i++ ) { +- OPL->AR_TABLE[i] = EG_AED-1; +- OPL->DR_TABLE[i] = OPL->DR_TABLE[60]; ++ for ( i = 0; i < 4; i++ ) OPL->AR_TABLE[i] = OPL->DR_TABLE[i] = 0; ++ for (i = 4; i <= 60; i++) { ++ rate = OPL->freqbase; /* frequency rate */ ++ if( i < 60 ) { ++ rate *= 1.0+(i&3)*0.25; /* b0-1 : x1 , x1.25 , x1.5 , x1.75 */ + } ++ rate *= 1<<((i>>2)-1); /* b2-5 : shift bit */ ++ rate *= (double)(EG_ENT<<ENV_BITS); ++ OPL->AR_TABLE[i] = rate / ARRATE; ++ OPL->DR_TABLE[i] = rate / DRRATE; ++ } ++ for ( i = 60; i < 75; i++ ) { ++ OPL->AR_TABLE[i] = EG_AED-1; ++ OPL->DR_TABLE[i] = OPL->DR_TABLE[60]; ++ } + #if 0 + for ( i = 0; i < 64 ; i++ ) { /* make for overflow area */ + LOG(LOG_WAR,("rate %2d , ar %f ms , dr %f ms \n",i, +@@ -675,7 +675,6 @@ static void init_timetables( FM_OPL *OPL , int ARRATE , int DRRATE ) { + ((double)(EG_ENT<<ENV_BITS) / OPL->DR_TABLE[i]) * (1000.0 / OPL->rate) )); + } + #endif +- } + } + + /* ---------- generic table initialize ---------- */ +diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/UI/EnvelopeUI.fl b/plugins/zynaddsubfx/zynaddsubfx/src/UI/EnvelopeUI.fl +index 359f64c..db70677 100644 +--- a/plugins/zynaddsubfx/zynaddsubfx/src/UI/EnvelopeUI.fl ++++ b/plugins/zynaddsubfx/zynaddsubfx/src/UI/EnvelopeUI.fl +@@ -204,12 +204,14 @@ if (event==FL_RELEASE){ + + if ((event==FL_DRAG)&&(currentpoint>=0)){ + int ny=127-(int) (y_*127.0/h()); +- if (ny<0) ny=0;if (ny>127) ny=127; ++ if (ny<0) ny=0; ++ if (ny>127) ny=127; + env->Penvval[currentpoint]=ny; + + int dx=(int)((x_-cpx)*0.1); + int newdt=cpdt+dx; +- if (newdt<0) newdt=0;if (newdt>127) newdt=127; ++ if (newdt<0) newdt=0; ++ if (newdt>127) newdt=127; + if (currentpoint!=0) env->Penvdt[currentpoint]=newdt; + else env->Penvdt[currentpoint]=0; + +diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/UI/ResonanceUI.fl b/plugins/zynaddsubfx/zynaddsubfx/src/UI/ResonanceUI.fl +index f1b887c..5ab7290 100644 +--- a/plugins/zynaddsubfx/zynaddsubfx/src/UI/ResonanceUI.fl ++++ b/plugins/zynaddsubfx/zynaddsubfx/src/UI/ResonanceUI.fl +@@ -133,8 +133,10 @@ if ( (x_>=0)&&(x_<w()) && (y_>=0)&&(y_<h())){ + if ((event==FL_PUSH)||(event==FL_DRAG)){ + int leftbutton=1; + if (Fl::event_button()==FL_RIGHT_MOUSE) leftbutton=0; +- if (x_<0) x_=0;if (y_<0) y_=0; +- if (x_>=w()) x_=w();if (y_>=h()-1) y_=h()-1; ++ if (x_<0) x_=0; ++ if (y_<0) y_=0; ++ if (x_>=w()) x_=w(); ++ if (y_>=h()-1) y_=h()-1; + + if ((oldx<0)||(oldx==x_)){ + int sn=(int)(x_*1.0/w()*N_RES_POINTS); diff --git a/audio/lmms/lmms.SlackBuild b/audio/lmms/lmms.SlackBuild index 521fc88259..2d2981d37b 100644 --- a/audio/lmms/lmms.SlackBuild +++ b/audio/lmms/lmms.SlackBuild @@ -51,6 +51,9 @@ 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 {} \; +# Thanks archlinux +patch -p1 < $CWD/gcc6.patch + mkdir build cd build cmake \ diff --git a/audio/mac/gcc6.patch b/audio/mac/gcc6.patch new file mode 100644 index 0000000000..e22d1c1f53 --- /dev/null +++ b/audio/mac/gcc6.patch @@ -0,0 +1,181 @@ +From: Peter Levine <plevine457@gmail.com> +--- mac-3.99-u4-b5-s7/src/Shared/NoWindows.h.old 2016-09-18 21:37:56.049105791 -0400 ++++ mac-3.99-u4-b5-s7/src/Shared/NoWindows.h 2016-09-18 21:55:29.666295506 -0400 +@@ -39,8 +39,8 @@ + typedef const wchar_t * LPCWSTR; + + #define ZeroMemory(POINTER, BYTES) memset(POINTER, 0, BYTES); +-#define max(a,b) (((a) > (b)) ? (a) : (b)) +-#define min(a,b) (((a) < (b)) ? (a) : (b)) ++#define max_macro(a,b) (((a) > (b)) ? (a) : (b)) ++#define min_macro(a,b) (((a) < (b)) ? (a) : (b)) + + #define __stdcall + #define CALLBACK +--- mac-3.99-u4-b5-s7/src/Shared/CircleBuffer.cpp.old 2016-09-18 21:43:44.270495095 -0400 ++++ mac-3.99-u4-b5-s7/src/Shared/CircleBuffer.cpp 2016-09-18 21:44:47.960148731 -0400 +@@ -45,7 +45,7 @@ + + if (pBuffer != NULL && nBytes > 0) + { +- int nHeadBytes = min(m_nEndCap - m_nHead, nBytes); ++ int nHeadBytes = min_macro(m_nEndCap - m_nHead, nBytes); + int nFrontBytes = nBytes - nHeadBytes; + + memcpy(&pBuffer[0], &m_pBuffer[m_nHead], nHeadBytes); +@@ -72,7 +72,7 @@ + + int CCircleBuffer::RemoveHead(int nBytes) + { +- nBytes = min(MaxGet(), nBytes); ++ nBytes = min_macro(MaxGet(), nBytes); + m_nHead += nBytes; + if (m_nHead >= m_nEndCap) + m_nHead -= m_nEndCap; +@@ -81,7 +81,7 @@ + + int CCircleBuffer::RemoveTail(int nBytes) + { +- nBytes = min(MaxGet(), nBytes); ++ nBytes = min_macro(MaxGet(), nBytes); + m_nTail -= nBytes; + if (m_nTail < 0) + m_nTail += m_nEndCap; +--- mac-3.99-u4-b5-s7/src/MACLib/APECompress.cpp.old 2016-09-18 21:48:40.916547811 -0400 ++++ mac-3.99-u4-b5-s7/src/MACLib/APECompress.cpp 2016-09-18 21:51:43.670733601 -0400 +@@ -117,7 +117,7 @@ + return ERROR_UNDEFINED; + + // calculate how many bytes to copy and add that much to the buffer +- int nBytesToProcess = min(nBytesAvailable, nBytes - nBytesDone); ++ int nBytesToProcess = min_macro(nBytesAvailable, nBytes - nBytesDone); + memcpy(pBuffer, &pData[nBytesDone], nBytesToProcess); + + // unlock the buffer (fail if not successful) +@@ -162,7 +162,7 @@ + + while ((m_nBufferTail - m_nBufferHead) >= nThreshold) + { +- int nFrameBytes = min(m_spAPECompressCreate->GetFullFrameBytes(), m_nBufferTail - m_nBufferHead); ++ int nFrameBytes = min_macro(m_spAPECompressCreate->GetFullFrameBytes(), m_nBufferTail - m_nBufferHead); + + if (nFrameBytes == 0) + break; +--- mac-3.99-u4-b5-s7/src/MACLib/APEDecompress.cpp.old 2016-09-18 21:46:56.962072960 -0400 ++++ mac-3.99-u4-b5-s7/src/MACLib/APEDecompress.cpp 2016-09-18 22:01:14.402044817 -0400 +@@ -35,8 +35,8 @@ + m_bErrorDecodingCurrentFrame = FALSE; + + // set the "real" start and finish blocks +- m_nStartBlock = (nStartBlock < 0) ? 0 : min(nStartBlock, GetInfo(APE_INFO_TOTAL_BLOCKS)); +- m_nFinishBlock = (nFinishBlock < 0) ? GetInfo(APE_INFO_TOTAL_BLOCKS) : min(nFinishBlock, GetInfo(APE_INFO_TOTAL_BLOCKS)); ++ m_nStartBlock = (nStartBlock < 0) ? 0 : min_macro(nStartBlock, GetInfo(APE_INFO_TOTAL_BLOCKS)); ++ m_nFinishBlock = (nFinishBlock < 0) ? GetInfo(APE_INFO_TOTAL_BLOCKS) : min_macro(nFinishBlock, GetInfo(APE_INFO_TOTAL_BLOCKS)); + m_bIsRanged = (m_nStartBlock != 0) || (m_nFinishBlock != GetInfo(APE_INFO_TOTAL_BLOCKS)); + } + +@@ -85,7 +85,7 @@ + + // cap + int nBlocksUntilFinish = m_nFinishBlock - m_nCurrentBlock; +- const int nBlocksToRetrieve = min(nBlocks, nBlocksUntilFinish); ++ const int nBlocksToRetrieve = min_macro(nBlocks, nBlocksUntilFinish); + + // get the data + unsigned char * pOutputBuffer = (unsigned char *) pBuffer; +@@ -99,7 +99,7 @@ + + // analyze how much to remove from the buffer + const int nFrameBufferBlocks = m_nFrameBufferFinishedBlocks; +- nBlocksThisPass = min(nBlocksLeft, nFrameBufferBlocks); ++ nBlocksThisPass = min_macro(nBlocksLeft, nFrameBufferBlocks); + + // remove as much as possible + if (nBlocksThisPass > 0) +@@ -182,7 +182,7 @@ + + int nFrameOffsetBlocks = m_nCurrentFrameBufferBlock % GetInfo(APE_INFO_BLOCKS_PER_FRAME); + int nFrameBlocksLeft = nFrameBlocks - nFrameOffsetBlocks; +- int nBlocksThisPass = min(nFrameBlocksLeft, nBlocksLeft); ++ int nBlocksThisPass = min_macro(nFrameBlocksLeft, nBlocksLeft); + + // start the frame if we need to + if (nFrameOffsetBlocks == 0) +--- mac-3.99-u4-b5-s7/src/MACLib/APESimple.cpp.old 2016-09-18 21:47:16.972925909 -0400 ++++ mac-3.99-u4-b5-s7/src/MACLib/APESimple.cpp 2016-09-18 21:52:39.022779503 -0400 +@@ -193,7 +193,7 @@ + nBytesRead = 1; + while ((nBytesLeft > 0) && (nBytesRead > 0)) + { +- int nBytesToRead = min(16384, nBytesLeft); ++ int nBytesToRead = min_macro(16384, nBytesLeft); + if (pIO->Read(spBuffer, nBytesToRead, &nBytesRead) != ERROR_SUCCESS) + return ERROR_IO_READ; + +--- mac-3.99-u4-b5-s7/src/MACLib/APETag.cpp.old 2016-09-18 21:55:53.331533348 -0400 ++++ mac-3.99-u4-b5-s7/src/MACLib/APETag.cpp 2016-09-18 21:58:21.508345586 -0400 +@@ -16,7 +16,7 @@ + memcpy(m_spFieldNameUTF16, pFieldName, (wcslen(pFieldName) + 1) * sizeof(str_utf16)); + + // data (we'll always allocate two extra bytes and memset to 0 so we're safely NULL terminated) +- m_nFieldValueBytes = max(nFieldBytes, 0); ++ m_nFieldValueBytes = max_macro(nFieldBytes, 0); + m_spFieldValue.Assign(new char [m_nFieldValueBytes + 2], TRUE); + memset(m_spFieldValue, 0, m_nFieldValueBytes + 2); + if (m_nFieldValueBytes > 0) +--- mac-3.99-u4-b5-s7/src/MACLib/BitArray.cpp.old 2016-09-18 21:53:24.090030009 -0400 ++++ mac-3.99-u4-b5-s7/src/MACLib/BitArray.cpp 2016-09-18 22:00:13.500083252 -0400 +@@ -113,7 +113,7 @@ + m_nCurrentBitIndex = (m_nCurrentBitIndex & 31); + + // zero the rest of the memory (may not need the +1 because of frame byte alignment) +- memset(&m_pBitArray[1], 0, min(nBytesToWrite + 1, BIT_ARRAY_BYTES - 1)); ++ memset(&m_pBitArray[1], 0, min_macro(nBytesToWrite + 1, BIT_ARRAY_BYTES - 1)); + } + + // return a success +@@ -247,7 +247,7 @@ + BitArrayState.k++; + + // figure the pivot value +- int nPivotValue = max(nOriginalKSum / 32, 1); ++ int nPivotValue = max_macro(nOriginalKSum / 32, 1); + int nOverflow = nEncode / nPivotValue; + int nBase = nEncode - (nOverflow * nPivotValue); + +--- mac-3.99-u4-b5-s7/src/MACLib/MACProgressHelper.cpp.old 2016-09-18 21:56:44.606337012 -0400 ++++ mac-3.99-u4-b5-s7/src/MACLib/MACProgressHelper.cpp 2016-09-18 21:59:55.854310134 -0400 +@@ -35,7 +35,7 @@ + m_nCurrentStep = nCurrentStep; + + // figure the percentage done +- float fPercentageDone = float(m_nCurrentStep) / float(max(m_nTotalSteps, 1)); ++ float fPercentageDone = float(m_nCurrentStep) / float(max_macro(m_nTotalSteps, 1)); + int nPercentageDone = (int) (fPercentageDone * 1000 * 100); + if (nPercentageDone > 100000) nPercentageDone = 100000; + +--- mac-3.99-u4-b5-s7/src/MACLib/Prepare.cpp.old 2016-09-18 21:56:29.974394222 -0400 ++++ mac-3.99-u4-b5-s7/src/MACLib/Prepare.cpp 2016-09-18 21:59:28.214726465 -0400 +@@ -177,9 +177,9 @@ + + if (LPeak == 0) { *pSpecialCodes |= SPECIAL_FRAME_LEFT_SILENCE; } + if (RPeak == 0) { *pSpecialCodes |= SPECIAL_FRAME_RIGHT_SILENCE; } +- if (max(LPeak, RPeak) > *pPeakLevel) ++ if (max_macro(LPeak, RPeak) > *pPeakLevel) + { +- *pPeakLevel = max(LPeak, RPeak); ++ *pPeakLevel = max_macro(LPeak, RPeak); + } + + // check for pseudo-stereo files +--- mac-3.99-u4-b5-s7/src/MACLib/UnBitArray.cpp.old 2016-09-18 21:56:16.548445898 -0400 ++++ mac-3.99-u4-b5-s7/src/MACLib/UnBitArray.cpp 2016-09-18 21:58:56.148161050 -0400 +@@ -110,7 +110,7 @@ + if (m_nVersion >= 3990) + { + // figure the pivot value +- int nPivotValue = max(BitArrayState.nKSum / 32, 1); ++ int nPivotValue = max_macro(BitArrayState.nKSum / 32, 1); + + // get the overflow + int nOverflow = 0; diff --git a/audio/mac/mac.SlackBuild b/audio/mac/mac.SlackBuild index eb2e3ada5b..c2bcab4668 100644 --- a/audio/mac/mac.SlackBuild +++ b/audio/mac/mac.SlackBuild @@ -78,6 +78,8 @@ if [ "${FORCE_SLACK_CFLAGS:-no}" = "yes" ]; then sed -i 's,-O3\>,,' configure fi +patch -p1 < $CWD/gcc6.patch + LDFLAGS="-Wl,-s" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/audio/milkytracker/README b/audio/milkytracker/README index f16c7e8551..b940d275bb 100644 --- a/audio/milkytracker/README +++ b/audio/milkytracker/README @@ -1,5 +1,4 @@ This is MilkyTracker 0.90.80. MilkyTracker is an audio tracker, and can create standard .MOD and .XM module files. -JACK support is optional and can be added by doing: - JACK=yes ./milkytracker.SlackBuild +lhasa is an optional dependency. diff --git a/audio/milkytracker/milkytracker.SlackBuild b/audio/milkytracker/milkytracker.SlackBuild index 7f6841c8f1..fc2a020d71 100644 --- a/audio/milkytracker/milkytracker.SlackBuild +++ b/audio/milkytracker/milkytracker.SlackBuild @@ -24,13 +24,14 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=milkytracker -VERSION=${VERSION:-0.90.86} +SRCNAM=MilkyTracker +VERSION=${VERSION:-1.02.00} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -41,8 +42,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -60,34 +61,37 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -cd $PRGNAM-$VERSION +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* +cd $SRCNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -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 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -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 -lasound" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --with-jack=${JACK:-no} +# Thanks fedora +patch -p1 < $CWD/sdlmain.patch -make -make install DESTDIR=$PKG +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PRGNAM-$VERSION \ + -DCMAKE_BUILD_TYPE=Release \ + .. + make + make install DESTDIR=$PKG +cd .. mkdir -p $PKG/usr/share/{applications,pixmaps} cp $CWD/milkytracker.desktop $PKG/usr/share/applications cp resources/pictures/carton.png $PKG/usr/share/pixmaps/milkytracker-icon-128.png -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +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 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/audio/milkytracker/milkytracker.info b/audio/milkytracker/milkytracker.info index cdab01e8f0..d1ff04930b 100644 --- a/audio/milkytracker/milkytracker.info +++ b/audio/milkytracker/milkytracker.info @@ -1,10 +1,10 @@ PRGNAM="milkytracker" -VERSION="0.90.86" +VERSION="1.02.00" HOMEPAGE="http://www.milkytracker.org/" -DOWNLOAD="http://www.milkytracker.org/files/milkytracker-0.90.86.tar.bz2" -MD5SUM="1ef462969cf54ba61748d4d878b5747e" +DOWNLOAD="https://github.com/milkytracker/MilkyTracker/archive/v1.02.00/milkytracker-1.02.00.tar.gz" +MD5SUM="ab4c881b8bbd41fde60823c191c7c6ce" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="zziplib" +REQUIRES="jack-audio-connection-kit zziplib" MAINTAINER="Erik Hanson" EMAIL="erik@slackbuilds.org" diff --git a/audio/milkytracker/sdlmain.patch b/audio/milkytracker/sdlmain.patch new file mode 100644 index 0000000000..3917a062d6 --- /dev/null +++ b/audio/milkytracker/sdlmain.patch @@ -0,0 +1,12 @@ +diff -ru MilkyTracker-1.0.0/cmake/FindSDL2.cmake MilkyTracker-sdlmain/cmake/FindSDL2.cmake +--- MilkyTracker-1.0.0/cmake/FindSDL2.cmake 2017-03-12 21:30:25.000000000 +0200 ++++ MilkyTracker-sdlmain/cmake/FindSDL2.cmake 2017-03-19 20:23:15.773398294 +0200 +@@ -93,7 +93,7 @@ + endif() + + set(SDL2_INCLUDE_DIRS ${SDL2_INCLUDE_DIR}) +-set(SDL2_LIBRARIES ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY}) ++set(SDL2_LIBRARIES ${SDL2_LIBRARY}) + + include(FindPackageHandleStandardArgs) + diff --git a/audio/mp3blaster/mp3blaster.SlackBuild b/audio/mp3blaster/mp3blaster.SlackBuild index 7f1e3c8e0e..6aa96b6017 100644 --- a/audio/mp3blaster/mp3blaster.SlackBuild +++ b/audio/mp3blaster/mp3blaster.SlackBuild @@ -71,6 +71,9 @@ 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 {} \; +# https://www.linuxquestions.org/questions/slackware-14/ncurses-6-1_20190420-slackware64-current-and-mp3blaster-4175654414/#post5998040 +sed -i "s|lncurses|lncursesw|" configure + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS -std=c++11 -Wno-narrowing" \ ./configure \ diff --git a/audio/ocp/ocp.SlackBuild b/audio/ocp/ocp.SlackBuild index 523d4638c8..4351552662 100644 --- a/audio/ocp/ocp.SlackBuild +++ b/audio/ocp/ocp.SlackBuild @@ -70,7 +70,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; sed -i "s/0.1.20/0.1.21/g" configure -sed -i "4592c2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|3.[0-9]|3.[0-9].[0-9]-*|4.*|5.*)" configure +sed -i "4592c2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|3.[0-9]|3.[0-9].[0-9]-*|4.*|5.*|6.*|7.*)" configure CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/audio/opus-tools/README b/audio/opus-tools/README deleted file mode 100644 index 4f031bf99a..0000000000 --- a/audio/opus-tools/README +++ /dev/null @@ -1,2 +0,0 @@ -opus-tools provides command-line utilities to encode, inspect and -decode .opus files. diff --git a/audio/opus-tools/opus-tools.info b/audio/opus-tools/opus-tools.info deleted file mode 100644 index 5e0ce3365d..0000000000 --- a/audio/opus-tools/opus-tools.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="opus-tools" -VERSION="0.2" -HOMEPAGE="http://www.opus-codec.org" -DOWNLOAD="https://ftp.mozilla.org/pub/mozilla.org/opus/opus-tools-0.2.tar.gz" -MD5SUM="ff2d0536e960cabbfb8ca7c8c1759b6c" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="libopusenc" -MAINTAINER="Matteo Bernardini" -EMAIL="ponce@slackbuilds.org" diff --git a/audio/opus-tools/slack-desc b/audio/opus-tools/slack-desc deleted file mode 100644 index 39aaf10819..0000000000 --- a/audio/opus-tools/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 ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -opus-tools: opus-tools (utilities for opus) -opus-tools: -opus-tools: opus-tools provides command-line utilities to encode, inspect and -opus-tools: decode .opus files. -opus-tools: -opus-tools: homepage: http://www.opus-codec.org -opus-tools: -opus-tools: -opus-tools: -opus-tools: -opus-tools: diff --git a/audio/opus/README b/audio/opus/README deleted file mode 100644 index df5dd26216..0000000000 --- a/audio/opus/README +++ /dev/null @@ -1,4 +0,0 @@ -Opus is a totally open, royalty-free, highly versatile audio codec. -It is standardized by the Internet Engineering Task Force (IETF) -as RFC 6716 which incorporated technology from Skype's SILK codec -and Xiph.Org's CELT codec. diff --git a/audio/opus/opus.SlackBuild b/audio/opus/opus.SlackBuild deleted file mode 100644 index 08e3446287..0000000000 --- a/audio/opus/opus.SlackBuild +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/sh - -# Slackware build script for opus - -# Copyright 2012-2019 Willy Sudiarto Raharjo <willysr@slackbuilds.org> -# 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. - -PRGNAM=opus -VERSION=${VERSION:-1.3.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -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 \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --disable-static \ - --enable-intrinsics \ - --enable-ambisonics \ - --enable-rtcd \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -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 - -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 - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/audio/opus/opus.info b/audio/opus/opus.info deleted file mode 100644 index 55e1ce1c0d..0000000000 --- a/audio/opus/opus.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="opus" -VERSION="1.3.1" -HOMEPAGE="https://opus-codec.org/" -DOWNLOAD="https://archive.mozilla.org/pub/opus/opus-1.3.1.tar.gz" -MD5SUM="d7c07db796d21c9cf1861e0c2b0c0617" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Willy Sudiarto Raharjo" -EMAIL="willysr@slackbuilds.org" diff --git a/audio/opus/slack-desc b/audio/opus/slack-desc deleted file mode 100644 index fb36dc8f15..0000000000 --- a/audio/opus/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 ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -opus: opus (Audio Codec) -opus: -opus: Opus is a totally open, royalty-free, highly versatile audio codec. -opus: It is standardized by the Internet Engineering Task Force (IETF) -opus: as RFC 6716 which incorporated technology from Skype's SILK codec -opus: and Xiph.Org's CELT codec. -opus: -opus: Project site: https://opus-codec.org/ -opus: -opus: -opus: diff --git a/audio/opusfile/README b/audio/opusfile/README deleted file mode 100644 index 4c32609f79..0000000000 --- a/audio/opusfile/README +++ /dev/null @@ -1,2 +0,0 @@ -opusfile provides application developers with a high-level API for -decoding and seeking in .opus files. diff --git a/audio/opusfile/opusfile.info b/audio/opusfile/opusfile.info deleted file mode 100644 index 5a1d075dc5..0000000000 --- a/audio/opusfile/opusfile.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="opusfile" -VERSION="0.11" -HOMEPAGE="http://www.opus-codec.org" -DOWNLOAD="https://ftp.mozilla.org/pub/mozilla.org/opus/opusfile-0.11.tar.gz" -MD5SUM="e1e94a9a663b4ca7a388f367baf1a7e3" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="opus" -MAINTAINER="Matteo Bernardini" -EMAIL="ponce@slackbuilds.org" diff --git a/audio/pithos/doinst.sh b/audio/pithos/doinst.sh index 4a25de5e6f..e924bab47c 100644 --- a/audio/pithos/doinst.sh +++ b/audio/pithos/doinst.sh @@ -8,3 +8,9 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then fi fi +if [ -e usr/share/glib-2.0/schemas ]; then + if [ -x /usr/bin/glib-compile-schemas ]; then + /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1 + fi +fi + diff --git a/audio/pithos/pithos.SlackBuild b/audio/pithos/pithos.SlackBuild index 32579cffe5..0d7c1f9b1e 100644 --- a/audio/pithos/pithos.SlackBuild +++ b/audio/pithos/pithos.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for pithos -# Copyright 2013 Robby Workman, Northport, Alabama, USA +# Copyright 2013,2017 Robby Workman, Tuscaloosa, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=pithos -VERSION=${VERSION:-git_ed501485} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.4.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -61,15 +61,25 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ +chown -R root:root $PRGNAM-$VERSION +find -L $PRGNAM-$VERSION \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python setup.py install --root=$PKG +mkdir -p $PRGNAM-$VERSION/build +meson \ + --prefix=/usr \ + --libdir=/usr/lib64 \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --infodir=/usr/info \ + $PRGNAM-$VERSION \ + $PRGNAM-$VERSION/build + +DESTDIR=$PKG ninja -C $PRGNAM-$VERSION/build install cat $CWD/contrib/pithosctl > $PKG/usr/bin/pithosctl chmod 0755 $PKG/usr/bin/pithosctl @@ -78,7 +88,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CHANGELOG README.md $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $PRGNAM-$VERSION/README.md $PRGNAM-$VERSION/license $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/audio/pithos/pithos.info b/audio/pithos/pithos.info index c276852bd2..198bec9218 100644 --- a/audio/pithos/pithos.info +++ b/audio/pithos/pithos.info @@ -1,10 +1,10 @@ PRGNAM="pithos" -VERSION="git_ed501485" -HOMEPAGE="http://kevinmehall.net/p/pithos/" -DOWNLOAD="http://harrier.slackbuilds.org/misc/pithos-git_ed501485.tar.xz" -MD5SUM="fb7f45ff93b5aab7b60e5b943d7bb024" +VERSION="1.4.0" +HOMEPAGE="https://github.com/pithos/pithos" +DOWNLOAD="https://github.com/pithos/pithos/releases/download/1.4.0/pithos-1.4.0.tar.xz" +MD5SUM="2324a9ed104682fb2417f662a82cc8bb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="gst0-python gst0-ffmpeg" +REQUIRES="meson gst-python gst-libav" MAINTAINER="Robby Workman" EMAIL="rworkman@slackbuilds.org" diff --git a/audio/pithos/slack-desc b/audio/pithos/slack-desc index 3ac97f0f7d..c55001e893 100644 --- a/audio/pithos/slack-desc +++ b/audio/pithos/slack-desc @@ -13,7 +13,7 @@ pithos: lightweight than the Pandora.com web client and integrates with pithos: desktop features such as media keys, notifications, and the sound pithos: menu. pithos: -pithos: Homepage: http://kevinmehall.net/p/pithos/ +pithos: Homepage: https://github.com/pithos/pithos pithos: pithos: pithos: diff --git a/audio/rumor/gcc7.diff b/audio/rumor/gcc7.diff new file mode 100644 index 0000000000..a8c54f20c0 --- /dev/null +++ b/audio/rumor/gcc7.diff @@ -0,0 +1,12 @@ +diff -Naur rumor-1.0.5.orig/src/notator.cc rumor-1.0.5.new/src/notator.cc +--- rumor-1.0.5.orig/src/notator.cc 2010-11-15 18:40:22.000000000 +0100 ++++ rumor-1.0.5.new/src/notator.cc 2017-05-31 15:51:42.014855383 +0200 +@@ -334,7 +334,7 @@ + } + } else { + OctaveTic=(RefPitch_wt>AbsPitch_wt?',':'\''); +- NumTics=(abs(RefPitch_wt-AbsPitch_wt)+3)/7; ++ NumTics=(RefPitch_wt-AbsPitch_wt+3)/7; + RefPitch_wt=AbsPitch_wt; + } + for (int i=0; i<NumTics; i++){ diff --git a/audio/rumor/rumor.SlackBuild b/audio/rumor/rumor.SlackBuild index daeebef2b9..d3ee309487 100644 --- a/audio/rumor/rumor.SlackBuild +++ b/audio/rumor/rumor.SlackBuild @@ -49,6 +49,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Thanks to archlinux +patch -p1 < $CWD/gcc7.diff + ./autogen.sh CFLAGS="$SLKCFLAGS" \ diff --git a/audio/shell-fm/README b/audio/shell-fm/README deleted file mode 100644 index fdf6eca651..0000000000 --- a/audio/shell-fm/README +++ /dev/null @@ -1,12 +0,0 @@ -shell-fm is a lightweight, console-based player for Last.FM radio streams. -It's pretty small (the binary is currently a little smaller than 60K, or -50K when stripped) and it has most features the "official" player has, if -not even a few more. Additional features are, for example: - -network interface (control shell-fm remotely) -autoban (automatically ban all tracks of an artist you don't like) -bookmark stations (quickly jump to bookmarked stations with a single key) -... probably more - -*NOTE: Last-FM have changed their API so that only PAID subscribers -can listen to streams in shell-fm. diff --git a/audio/shell-fm/shell-fm.SlackBuild b/audio/shell-fm/shell-fm.SlackBuild deleted file mode 100644 index 94028cc20f..0000000000 --- a/audio/shell-fm/shell-fm.SlackBuild +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/sh - -# Slackware build script for shell-fm - -# Copyright 2009-2013 David Woodfall <dave@dawoodfall.net> -# 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. - -PRGNAM=shell-fm -VERSION=${VERSION:-0.8} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -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" \ -make -make install DESTDIR=$PKG - -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 - -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 - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a INSTALL AUTHORS RELEASE \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/audio/shell-fm/shell-fm.info b/audio/shell-fm/shell-fm.info deleted file mode 100644 index 28956094c1..0000000000 --- a/audio/shell-fm/shell-fm.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="shell-fm" -VERSION="0.8" -HOMEPAGE="https://github.com/jkramer/shell-fm" -DOWNLOAD="https://github.com/jkramer/shell-fm/archive/v0.8/shell-fm-0.8.tar.gz" -MD5SUM="6d6aca71fb8a33562ecf614a10a45255" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="David Woodfall" -EMAIL="dave@dawoodfall.net" diff --git a/audio/shell-fm/slack-desc b/audio/shell-fm/slack-desc deleted file mode 100644 index 3bf0b1a989..0000000000 --- a/audio/shell-fm/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 ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -shell-fm: shell-fm (a command line last.fm player) -shell-fm: -shell-fm: shell-fm is a lightweight, console-based player for Last.FM radio -shell-fm: streams. It's pretty small (the binary is currently a little smaller -shell-fm: than 60K, or 50K when stripped) and it has most features the -shell-fm: "official" player has, if not even a few more. -shell-fm: -shell-fm: Homepage: https://github.com/jkramer/shell-fm -shell-fm: -shell-fm: -shell-fm: diff --git a/audio/sidplayfp/sidplayfp.SlackBuild b/audio/sidplayfp/sidplayfp.SlackBuild index ae706d48f7..dd201aac7e 100644 --- a/audio/sidplayfp/sidplayfp.SlackBuild +++ b/audio/sidplayfp/sidplayfp.SlackBuild @@ -25,13 +25,13 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=sidplayfp -VERSION=${VERSION:-1.3.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.4.3} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" diff --git a/audio/sidplayfp/sidplayfp.info b/audio/sidplayfp/sidplayfp.info index 8c8d1ac6dd..1c16a8fcd7 100644 --- a/audio/sidplayfp/sidplayfp.info +++ b/audio/sidplayfp/sidplayfp.info @@ -1,8 +1,8 @@ PRGNAM="sidplayfp" -VERSION="1.3.0" +VERSION="1.4.3" HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/" -DOWNLOAD="https://sourceforge.net/projects/sidplay-residfp/files/sidplayfp/1.3/sidplayfp-1.3.0.tar.gz" -MD5SUM="65ae736d372860223bee9bceb00a3b91" +DOWNLOAD="https://downloads.sourceforge.net/sidplay-residfp/sidplayfp-1.4.3.tar.gz" +MD5SUM="be020b5927c80c4269273895400a8120" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libsidplayfp" diff --git a/audio/speex/README b/audio/speex/README deleted file mode 100644 index 339c23c818..0000000000 --- a/audio/speex/README +++ /dev/null @@ -1,7 +0,0 @@ -Speex is an Open Source/Free Software patent-free audio compression -format designed for speech. The Speex Project aims to lower the barrier -of entry for voice applications by providing a free alternative to -expensive proprietary speech codecs. Moreover, Speex is well-adapted -to Internet applications and provides useful features that are not -present in most other codecs. Finally, Speex is part of the GNU -Project and is available under the revised BSD license. diff --git a/audio/speex/slack-desc b/audio/speex/slack-desc deleted file mode 100644 index a675982e71..0000000000 --- a/audio/speex/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 ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -speex: speex (an audio compression format designed for speech) -speex: -speex: Speex is an Open Source/Free Software patent-free audio compression -speex: format designed for speech. The Speex Project aims to lower the -speex: barrier of entry for voice applications by providing a free -speex: alternative to expensive proprietary speech codecs. Moreover, Speex -speex: is well-adapted to Internet applications and provides useful features -speex: that are not present in most other codecs. Finally, Speex is part of -speex: the GNU Project and is available under the revised BSD license. -speex: -speex: homepage: https://speex.org/ diff --git a/audio/speex/speex.SlackBuild b/audio/speex/speex.SlackBuild deleted file mode 100644 index dba755fb36..0000000000 --- a/audio/speex/speex.SlackBuild +++ /dev/null @@ -1,116 +0,0 @@ -#!/bin/sh - -# Slackware build script for speex - -# Copyright (c) 2007 Alex Lysenka <me@alkos333.net> -# Copyright (c) 2012 Vliegendehuiskat -# Copyright (c) 2014-2016 Matteo Bernardini <ponce@slackbuilds.org> -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "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 COPYRIGHT -# OWNER OR CONTRIBUTORS 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. - -# Modified by SlackBuilds.org - -PRGNAM=speex -VERSION=${VERSION:-1.2.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -# Fix end-of-line encoding. -sed -i 's/\r//' README.TI-DSP - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -SPEEXDSP_CFLAGS="-I$PKG/usr/include" \ -SPEEXDSP_LIBS="-L$PKG/usr/lib${LIBDIRSUFFIX} -lspeexdsp" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --enable-static=no \ - --enable-binaries \ - --build=$ARCH-slackware-linux - -# Hack to also make it look in the right directory on multilib systems -make LDFLAGS="-L/usr/lib${LIBDIRSUFFIX} -L$PKG/usr/lib${LIBDIRSUFFIX} -lspeexdsp" -make install DESTDIR=$PKG - -find $PKG/usr/man -type f -exec gzip -9 '{}' \; - -# Fix libspeex.la (if present) -sed -i "s|-L$PKG.*/lib${LIBDIRSUFFIX} ||" $PKG/usr/lib${LIBDIRSUFFIX}/libspeex.la || true - -cp -a \ - AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -find $PKG/usr/doc -type f -exec chown root:root {} \; -exec chmod 644 {} \; - -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 - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/audio/speex/speex.info b/audio/speex/speex.info deleted file mode 100644 index 0fb235e318..0000000000 --- a/audio/speex/speex.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="speex" -VERSION="1.2.0" -HOMEPAGE="https://speex.org" -DOWNLOAD="https://ftp.osuosl.org/pub/xiph/releases/speex/speex-1.2.0.tar.gz" -MD5SUM="8ab7bb2589110dfaf0ed7fa7757dc49c" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Matteo Bernardini" -EMAIL="ponce@slackbuilds.org" diff --git a/audio/xmms2/xmms2.SlackBuild b/audio/xmms2/xmms2.SlackBuild index fcd1ede0a8..21a5a5e300 100644 --- a/audio/xmms2/xmms2.SlackBuild +++ b/audio/xmms2/xmms2.SlackBuild @@ -7,7 +7,7 @@ # Updated by Andrew Brouwers, abrouwers at gmail d0t com (13.0, 64-bit) PRGNAM=xmms2 -VERSION=${VERSION:-"20150712_942b17f"} +VERSION=${VERSION:-"20170827_dedc33d"} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/audio/xmms2/xmms2.info b/audio/xmms2/xmms2.info index 61f3ec488c..e4ba4787bd 100644 --- a/audio/xmms2/xmms2.info +++ b/audio/xmms2/xmms2.info @@ -1,8 +1,8 @@ PRGNAM="xmms2" -VERSION="20150712_942b17f" +VERSION="20170827_dedc33d" HOMEPAGE="http://wiki.xmms2.xmms.se/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/xmms2-20150712_942b17f.tar.xz" -MD5SUM="8a5c43ef18fdaf24f6853ced83ce1620" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/xmms2-20170827_dedc33d.tar.xz" +MD5SUM="082e47f3ca4f40b5c0029e8a3f0a7d55" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/business/ledger/ledger.SlackBuild b/business/ledger/ledger.SlackBuild index 18c0690efc..5d15c7e400 100644 --- a/business/ledger/ledger.SlackBuild +++ b/business/ledger/ledger.SlackBuild @@ -3,7 +3,7 @@ # Written by Lionel Young (redtricycle at gmail dot com) PRGNAM=ledger -VERSION=${VERSION:-3.1.1} +VERSION=${VERSION:-3.1.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -35,7 +35,9 @@ 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 {} \; -./acprep --prefix=/usr update +cmake \ + -DCMAKE_INSTALL_PREFIX:PATH=/usr \ + . make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ @@ -47,7 +49,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -cp -a README.md doc/NEWS $PKG/usr/doc/$PRGNAM-$VERSION/ +cp -a README.md doc/NEWS.md $PKG/usr/doc/$PRGNAM-$VERSION/ cp -ra contrib $PKG/usr/doc/$PRGNAM-$VERSION cp -ra test/input/* $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/business/ledger/ledger.info b/business/ledger/ledger.info index c89a7d4873..cf83d5a190 100644 --- a/business/ledger/ledger.info +++ b/business/ledger/ledger.info @@ -1,8 +1,8 @@ PRGNAM="ledger" -VERSION="3.1.1" +VERSION="3.1.3" HOMEPAGE="https://ledger-cli.org" -DOWNLOAD="https://github.com/ledger/ledger/archive/v3.1.1/ledger-3.1.1.tar.gz" -MD5SUM="eae070cbbc1a40a277f1394d72ef0fe6" +DOWNLOAD="https://github.com/ledger/ledger/archive/v3.1.3/ledger-3.1.3.tar.gz" +MD5SUM="6d9b8293f5f909aab4b95cffa2b3c120" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="utfcpp" diff --git a/desktop/arc-theme/README b/desktop/arc-theme/README index a9fc04447a..9b44fa96a7 100644 --- a/desktop/arc-theme/README +++ b/desktop/arc-theme/README @@ -1,3 +1,5 @@ Arc is a flat theme with transparent elements for GTK 3, GTK 2 and Gnome-Shell which supports GTK 3 and GTK 2 based desktop environments like Gnome, Unity, Budgie, Pantheon, XFCE, Mate, etc. + +inkscape is a build-time dependency. diff --git a/desktop/arc-theme/arc-theme.SlackBuild b/desktop/arc-theme/arc-theme.SlackBuild index d3a596f6b3..0e3ce271dc 100644 --- a/desktop/arc-theme/arc-theme.SlackBuild +++ b/desktop/arc-theme/arc-theme.SlackBuild @@ -25,7 +25,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=arc-theme -VERSION=${VERSION:-20170302} +VERSION=${VERSION:-20181022} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -56,13 +56,15 @@ else LIBDIRSUFFIX="" fi +gnome_shell="--disable-gnome-shell" ; [[ $(which gnome-shell) ]] && gnome_shell="" + set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -71,16 +73,16 @@ 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 {} \; -sh autogen.sh CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -./configure \ +./autogen.sh \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ + $gnome_shell \ --build=$ARCH-slackware-linux make diff --git a/desktop/arc-theme/arc-theme.info b/desktop/arc-theme/arc-theme.info index e653a09f81..3f7b6a1e22 100644 --- a/desktop/arc-theme/arc-theme.info +++ b/desktop/arc-theme/arc-theme.info @@ -1,10 +1,10 @@ PRGNAM="arc-theme" -VERSION="20170302" -HOMEPAGE="https://github.com/horst3180/arc-theme/" -DOWNLOAD="https://github.com/horst3180/arc-theme/archive/20170302/arc-theme-20170302.tar.gz" -MD5SUM="fe3e397ffc3633c1b5ba3b1d6e2456a7" +VERSION="20181022" +HOMEPAGE="https://github.com/NicoHood/arc-theme/" +DOWNLOAD="https://github.com/NicoHood/arc-theme/releases/download/20181022/arc-theme-20181022.tar.xz" +MD5SUM="4819afac384c9c63dabf4969026ad098" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="inkscape murrine optipng sassc" MAINTAINER="Marcel Saegebarth" EMAIL="marc@mos6581.de" diff --git a/desktop/arc-theme/slack-desc b/desktop/arc-theme/slack-desc index a4387212a0..5baedd24ef 100644 --- a/desktop/arc-theme/slack-desc +++ b/desktop/arc-theme/slack-desc @@ -12,7 +12,7 @@ arc-theme: Arc is a flat theme with transparent elements for GTK 3, GTK 2 and arc-theme: Gnome-Shell which supports GTK 3 and GTK 2 based desktop arc-theme: environments like Gnome, Unity, Budgie, Pantheon, XFCE, Mate, etc. arc-theme: -arc-theme: Homepage: https://github.com/horst3180/arc-theme/ +arc-theme: Homepage: https://github.com/NicoHood/arc-theme/ arc-theme: arc-theme: arc-theme: diff --git a/desktop/cairo-dock-plugins/README b/desktop/cairo-dock-plugins/README index d758f4c722..496a240ad9 100644 --- a/desktop/cairo-dock-plugins/README +++ b/desktop/cairo-dock-plugins/README @@ -3,4 +3,4 @@ plug-ins for Cairo-Dock It provides some new functionnalities like controling music players or note-taking, a clock or a desktop switcher but also some views, dialogs and desklets skins, etc. -vala, python3 and mono are optional dependencies. +libetpan, vala, python3 and mono are optional dependencies. diff --git a/desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild b/desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild index 1ef6650ec5..11c932e67e 100644 --- a/desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild +++ b/desktop/cairo-dock-plugins/cairo-dock-plugins.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=cairo-dock-plugins -VERSION=${VERSION:-3.3.2} +VERSION=${VERSION:-3.4.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -59,9 +59,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION +rm -rf cairo-dock-plug-ins-$VERSION tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +cd cairo-dock-plug-ins-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -69,25 +69,31 @@ 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 {} \; +# Thanks to fedora and archlinux +for i in $CWD/patches/* ; do patch -p1 < $i ; done +sed -i -e 's|-Wno-all||' Dbus/interfaces/vala/src/CMakeLists.txt + +mkdir build +cd build cmake \ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release . + -DCMAKE_BUILD_TYPE=Release .. make VERBOSE=1 make install DESTDIR=$PKG +cd .. # Sheesh. Donchaloveruby? -mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/ruby/1.9.1 +RUBY_SITELIBDIR=$(ruby -e 'print RbConfig::CONFIG["sitelibdir"]') +mkdir -p $PKG$RUBY_SITELIBDIR if [ -d $PKG/usr/usr ]; then - mv $PKG/usr/usr/lib${LIBDIRSUFFIX}/ruby/1.9.1/CDApplet.rb \ - $PKG/usr/lib${LIBDIRSUFFIX}/ruby/1.9.1 + mv $PKG/usr$RUBY_SITELIBDIR/CDApplet.rb $PKG$RUBY_SITELIBDIR/ rm -rf $PKG/usr/usr elif [ -e $PKG/usr/CDApplet.rb ]; then - mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/ruby/1.9.1 - mv $PKG/usr/CDApplet.rb $PKG/usr/lib${LIBDIRSUFFIX}/ruby/1.9.1 + mv $PKG/usr/CDApplet.rb $PKG$RUBY_SITELIBDIR/ fi find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/desktop/cairo-dock-plugins/cairo-dock-plugins.info b/desktop/cairo-dock-plugins/cairo-dock-plugins.info index b28117ab5d..3fb0f52e51 100644 --- a/desktop/cairo-dock-plugins/cairo-dock-plugins.info +++ b/desktop/cairo-dock-plugins/cairo-dock-plugins.info @@ -1,8 +1,8 @@ PRGNAM="cairo-dock-plugins" -VERSION="3.3.2" +VERSION="3.4.1" HOMEPAGE="http://www.glx-dock.org" -DOWNLOAD="https://launchpad.net/cairo-dock-plug-ins/3.3/3.3.2/+download/cairo-dock-plugins-3.3.2.tar.gz" -MD5SUM="3c40afe91cba65da68a70e5e78b76c24" +DOWNLOAD="https://github.com/Cairo-Dock/cairo-dock-plug-ins/archive/3.4.1/cairo-dock-plugins-3.4.1.tar.gz" +MD5SUM="434941926f9205fd8562a15b6ac5f243" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="cairo-dock" diff --git a/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-0001-demo_ruby-fix-traceback-when-changing-themes.patch b/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-0001-demo_ruby-fix-traceback-when-changing-themes.patch new file mode 100644 index 0000000000..846b4176fd --- /dev/null +++ b/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-0001-demo_ruby-fix-traceback-when-changing-themes.patch @@ -0,0 +1,40 @@ +From 9043010e2cdd384ff5de5f5f116229557d15721c Mon Sep 17 00:00:00 2001 +From: Mamoru TASAKA <mtasaka@fedorapeople.org> +Date: Fri, 6 Mar 2015 19:06:34 +0900 +Subject: [PATCH] demo_ruby: fix traceback when changing themes + +Fix the "crash" when changing like: +./demo_ruby:108:in `reload': undefined local variable or method `myApplet' for #<Applet:0x00000002e6c060> (NameError) + from /usr/share/ruby/vendor_ruby/CDApplet.rb:203:in `_on_reload' + from /usr/share/ruby/vendor_ruby/CDApplet.rb:274:in `block in _connect_to_dock' + from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/introspect.rb:325:in `call' + from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/introspect.rb:325:in `block in on_signal' + from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/bus.rb:665:in `call' + from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/bus.rb:665:in `block in process' + from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/bus.rb:663:in `each' + from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/bus.rb:663:in `process' + from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/bus.rb:855:in `block in run' + from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/bus.rb:846:in `each' + from /usr/share/gems/gems/ruby-dbus-0.9.0/lib/dbus/bus.rb:846:in `run' + from /usr/share/ruby/vendor_ruby/CDApplet.rb:83:in `run' + from ./demo_ruby:127:in `<main>' +--- + Dbus/demos/demo_ruby/demo_ruby | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Dbus/demos/demo_ruby/demo_ruby b/Dbus/demos/demo_ruby/demo_ruby +index 2df5cda..a9374bd 100755 +--- a/Dbus/demos/demo_ruby/demo_ruby ++++ b/Dbus/demos/demo_ruby/demo_ruby +@@ -105,7 +105,7 @@ class Applet < CDApplet + end + def reload + p "[+] our module was reloaded, welcome back!" +- self.icon.AddDataRenderer("gauge", 1, myApplet.config['theme']) ++ self.icon.AddDataRenderer("gauge", 1, self.configuration['theme']) + self.icon.RenderValues([Float(self.counter)/self.configuration['max_value']]) + self.sub_icons.RemoveSubIcon("any") + self.sub_icons.AddSubIcons(["icon 1", "firefox-3.0", "id1", "icon 2", "natilus", "id2", "icon 3", "thunderbird", "id3"]) +-- +2.1.0 + diff --git a/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-0004-weather-update-URL.patch b/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-0004-weather-update-URL.patch new file mode 100644 index 0000000000..035143fd3d --- /dev/null +++ b/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-0004-weather-update-URL.patch @@ -0,0 +1,52 @@ +From 402a2d7bb657be4ad4072f07612e008e846d5e97 Mon Sep 17 00:00:00 2001 +From: Fabounet <fabounet03@gmail.com> +Date: Sun, 22 May 2016 21:13:21 +0200 +Subject: [PATCH] [1581725] Updated the weather URL we retrieve data from + +--- + weather/src/applet-config.c | 2 +- + weather/src/applet-read-data.c | 3 --- + weather/src/applet-struct.h | 3 +++ + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/weather/src/applet-config.c b/weather/src/applet-config.c +index c9a33c2..0a27a8a 100755 +--- a/weather/src/applet-config.c ++++ b/weather/src/applet-config.c +@@ -174,7 +174,7 @@ static void _on_got_location_data (const gchar *cLocationData, GldiModuleInstanc + gldi_task_discard (myData.pGetLocationTask); + myData.pGetLocationTask = NULL; + } +-#define CD_WEATHER_BASE_URL "http://xml.weather.com" ++ + static void _cd_weather_search_for_location (GtkEntry *pEntry, GldiModuleInstance *myApplet) + { + const gchar *cLocationName = gtk_entry_get_text (pEntry); +diff --git a/weather/src/applet-read-data.c b/weather/src/applet-read-data.c +index 0bbdce7..8ca8d21 100755 +--- a/weather/src/applet-read-data.c ++++ b/weather/src/applet-read-data.c +@@ -30,9 +30,6 @@ + #include "applet-load-icons.h" + #include "applet-read-data.h" + +-#define CD_WEATHER_BASE_URL "http://xml.weather.com" +- +- + static xmlDocPtr _cd_weather_open_xml_buffer (const gchar *cData, xmlNodePtr *root_node, const gchar *cRootNodeName, GError **erreur) + { + if (cData == NULL || *cData == '\0') +diff --git a/weather/src/applet-struct.h b/weather/src/applet-struct.h +index e96191e..02ba3d0 100755 +--- a/weather/src/applet-struct.h ++++ b/weather/src/applet-struct.h +@@ -29,6 +29,9 @@ + + #define WEATHER_DEFAULT_NAME "weather" + ++#define CD_WEATHER_BASE_URL "http://wxdata.weather.com/wxdata" ++ ++ + #define _display(cValue) ((cValue) == NULL || *((gchar*)cValue) == 'N' ? "?" : (const gchar*)(cValue)) + + struct _AppletConfig { diff --git a/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-mono.patch b/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-mono.patch new file mode 100644 index 0000000000..637c1ca494 --- /dev/null +++ b/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-mono.patch @@ -0,0 +1,106 @@ +diff -rupN cairo-dock-plug-ins-3.4.1.orig/CMakeLists.txt cairo-dock-plug-ins-3.4.1/CMakeLists.txt +--- cairo-dock-plug-ins-3.4.1.orig/CMakeLists.txt 2015-03-12 09:43:57.171067365 +0100 ++++ cairo-dock-plug-ins-3.4.1/CMakeLists.txt 2015-03-12 09:46:20.717120675 +0100 +@@ -573,11 +573,11 @@ if (enable-mono-interface) + if (NOT GMCS_EXECUTABLE OR NOT EXISTS ${GMCS_EXECUTABLE}) + message (STATUS "Could not find Mono compiler gmcs, won't build Mono interface.") + else() +- pkg_check_modules (MONO_PACKAGE glib-sharp-2.0 ndesk-dbus-1.0 ndesk-dbus-glib-1.0) ++ pkg_check_modules (MONO_PACKAGE dbus-sharp-2.0 dbus-sharp-glib-2.0 glib-sharp-3.0) + if (NOT MONO_PACKAGE_FOUND) +- message (STATUS "Could not find glib-sharp-2.0, ndesk-dbus-1.0 or ndesk-dbus-glib-1.0; won't be built Mono interface.") +- message (WARNING "These modules are required to compile DBus applet with Mono interface: glib-sharp-2.0, ndesk-dbus-1.0 and ndesk-dbus-glib-1.0") +- set (MODULES_MISSING "${MODULES_MISSING} glib-sharp-2.0 ndesk-dbus-1.0 ndesk-dbus-glib-1.0") ++ message (STATUS "Could not find dbus-sharp-2.0, dbus-sharp-glib-2.0 or glib-sharp-3.0; won't be built Mono interface.") ++ message (WARNING "These modules are required to compile DBus applet with Mono interface: dbus-sharp-2.0, dbus-sharp-glib-2.0 and glib-sharp-3.0") ++ set (MODULES_MISSING "${MODULES_MISSING} dbus-sharp-2.0 dbus-sharp-glib-2.0 glib-sharp-3.0") + else() + set (MONO_FOUND TRUE) + set (with_mono yes) +diff -rupN cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/CDApplet.cs cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/CDApplet.cs +--- cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/CDApplet.cs 2015-03-12 09:52:56.491934965 +0100 ++++ cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/CDApplet.cs 2015-03-12 09:56:50.191652099 +0100 +@@ -21,7 +21,7 @@ + // Make your own class derive from a CDApplet, and override the functions you need (the ones which don't start with an underscore). + + // Compile it with the following command, then rename 'demo_mono.exe' to 'demo_mono'. +-// gmcs /target:library CDApplet.cs ISubApplet.cs IApplet.cs -pkg:glib-sharp-2.0 -pkg:ndesk-dbus-1.0 -pkg:ndesk-dbus-glib-1.0 ++// gmcs /target:library CDApplet.cs ISubApplet.cs IApplet.cs -pkg:dbus-sharp-2.0 -pkg:dbus-sharp-glib-2.0 -pkg:glib-sharp-3.0 + ////////////////////////// + ////// dependancies ////// + ////////////////////////// +@@ -29,7 +29,7 @@ using System; // Environment + using System.IO; // Path, Directory + using System.Reflection; + using GLib; +-using NDesk.DBus; ++using DBus; + using CairoDock.Applet; + + //namespace CairoDock.Applet +@@ -258,8 +258,8 @@ public class CDApplet + + private void _connect_to_dock () + { +- NDesk.DBus.BusG.Init(); +- NDesk.DBus.Bus bus = NDesk.DBus.Bus.Session; ++ DBus.BusG.Init(); ++ DBus.Bus bus = DBus.Bus.Session; + this.icon = bus.GetObject<IApplet> ("org.cairodock.CairoDock", new ObjectPath (this.cBusPath)); + this.icon.on_click += new OnClickEvent (on_click); + this.icon.on_middle_click += new OnMiddleClickEvent (on_middle_click); +diff -rupN cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/CMakeLists.txt cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/CMakeLists.txt +--- cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/CMakeLists.txt 2015-03-12 09:52:56.491934965 +0100 ++++ cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/CMakeLists.txt 2015-03-12 09:54:07.418777441 +0100 +@@ -3,7 +3,7 @@ + + execute_process(COMMAND ${GMCS_EXECUTABLE} + -target:library +- -pkg:glib-sharp-2.0 -pkg:ndesk-dbus-1.0 -pkg:ndesk-dbus-glib-1.0 ++ -pkg:dbus-sharp-2.0 -pkg:dbus-sharp-glib-2.0 -pkg:glib-sharp-3.0 + -out:${CMAKE_CURRENT_BINARY_DIR}/CDApplet.dll + ${CMAKE_CURRENT_SOURCE_DIR}/CDApplet.cs ${CMAKE_CURRENT_SOURCE_DIR}/ISubApplet.cs ${CMAKE_CURRENT_SOURCE_DIR}/IApplet.cs) + ### find how to register to GAC ... +diff -rupN cairo-dock-plug-ins-3.4.1.orig/Dbus/demos/demo_mono/demo_mono.cs cairo-dock-plug-ins-3.4.1/Dbus/demos/demo_mono/demo_mono.cs +--- cairo-dock-plug-ins-3.4.1.orig/Dbus/demos/demo_mono/demo_mono.cs 2015-03-12 09:59:41.064312097 +0100 ++++ cairo-dock-plug-ins-3.4.1/Dbus/demos/demo_mono/demo_mono.cs 2015-03-12 10:02:39.473424651 +0100 +@@ -138,7 +138,7 @@ public class Applet : CDApplet + public override void on_build_menu () + { + Console.WriteLine("*** build menu"); +- /// Warning : teh AddMenuItems fails with NDesk-DBus 0.6.0; until this is fixed, use the PopulateMenu method. ++ /// Warning : the AddMenuItems fails with DBus Sharp 0.6.0; until this is fixed, use the PopulateMenu method. + /**Dictionary<string, object>[] pItems = new Dictionary<string, object>[] { + new Dictionary<string, object>() + { +diff -rupN cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/IApplet.cs cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/IApplet.cs +--- cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/IApplet.cs 2015-03-12 09:59:41.067645289 +0100 ++++ cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/IApplet.cs 2015-03-12 10:00:35.395334804 +0100 +@@ -1,6 +1,6 @@ + using System;
+ using System.Collections.Generic; // Dictionnary
+-using NDesk.DBus;
++using DBus;
+
+ namespace CairoDock.Applet
+ {
+@@ -27,7 +27,7 @@ namespace CairoDock.Applet + Left
+ }
+
+- [NDesk.DBus.Interface("org.cairodock.CairoDock.applet")]
++ [DBus.Interface("org.cairodock.CairoDock.applet")]
+ public interface IApplet
+ {
+ object Get(string cProperty);
+diff -rupN cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/ISubApplet.cs cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/ISubApplet.cs +--- cairo-dock-plug-ins-3.4.1.orig/Dbus/interfaces/mono/ISubApplet.cs 2015-03-12 09:59:41.067645289 +0100 ++++ cairo-dock-plug-ins-3.4.1/Dbus/interfaces/mono/ISubApplet.cs 2015-03-12 10:00:16.522802989 +0100 +@@ -1,6 +1,6 @@ + using System;
+ using System.Collections.Generic; // Dictionnary
+-using NDesk.DBus;
++using DBus;
+
+ namespace CairoDock.Applet
+ {
diff --git a/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-port-WebKit2.patch b/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-port-WebKit2.patch new file mode 100644 index 0000000000..bec6e5fcac --- /dev/null +++ b/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-port-WebKit2.patch @@ -0,0 +1,77 @@ +--- cairo-dock-plugins-3.4.1/CMakeLists.txt.wk2 2017-04-01 03:09:09.171381809 +0900 ++++ cairo-dock-plugins-3.4.1/CMakeLists.txt 2017-04-01 03:09:09.172381805 +0900 +@@ -1391,7 +1391,7 @@ + set (with_weblets no) + enable_if_not_defined (enable-weblets) + if (enable-weblets) +- set (WEBKIT_MODULE webkitgtk-3.0) ++ set (WEBKIT_MODULE webkit2gtk-4.0) + pkg_check_modules (WEBKIT ${WEBKIT_MODULE}) + if (NOT WEBKIT_FOUND) + message (STATUS "Could not find ${WEBKIT_MODULE}; Cairo-Dock won't be built with Weblets applet.") +--- cairo-dock-plugins-3.4.1/weblets/src/applet-struct.h.wk2 2015-02-20 01:13:47.000000000 +0900 ++++ cairo-dock-plugins-3.4.1/weblets/src/applet-struct.h 2017-04-01 03:09:09.172381805 +0900 +@@ -28,7 +28,7 @@ + #include "config.h" + #endif + +-#include <webkit/webkit.h> ++#include <webkit2/webkit2.h> + + //\___________ structure containing the applet's configuration parameters. + struct _AppletConfig { +--- cairo-dock-plugins-3.4.1/weblets/src/applet-widget.c.wk2 2015-02-20 01:13:47.000000000 +0900 ++++ cairo-dock-plugins-3.4.1/weblets/src/applet-widget.c 2017-04-01 03:14:59.380001735 +0900 +@@ -62,13 +62,19 @@ + return gldi_dialog_new (&attr); + } + +-/* Will be called when loading of the page is finished*/ +-void load_finished_cb(WebKitWebView *pWebKitView, WebKitWebFrame* widget ++/* Will be called when loading of the page is changed*/ ++void load_changed_cb(WebKitWebView *pWebKitView, WebKitLoadEvent load_event + , GldiModuleInstance *myApplet) + { +- cd_debug ("weblets : (re)load finished\n"); +- // update scrollbars status +- show_hide_scrollbars(myApplet); ++ switch (load_event) { ++ case WEBKIT_LOAD_FINISHED: ++ cd_debug ("weblets : (re)load finished\n"); ++ // update scrollbars status ++ show_hide_scrollbars(myApplet); ++ break; ++ default: ++ break; ++ } + } + + /* Build the embedded widget */ +@@ -80,8 +86,8 @@ + myData.pWebKitView = WEBKIT_WEB_VIEW (webkit_web_view_new ()); + gtk_container_add (GTK_CONTAINER (myData.pGtkMozEmbed), GTK_WIDGET (myData.pWebKitView)); + g_signal_connect(G_OBJECT(myData.pWebKitView), +- "load_finished", +- G_CALLBACK (load_finished_cb), ++ "load-changed", ++ G_CALLBACK (load_changed_cb), + myApplet); + gtk_widget_show_all (myData.pGtkMozEmbed); + +@@ -120,10 +126,14 @@ + } + } + +- webkit_web_view_open(WEBKIT_WEB_VIEW(myData.pWebKitView), myConfig.cURI_to_load?myConfig.cURI_to_load:"http://www.google.com"); ++ webkit_web_view_load_uri(WEBKIT_WEB_VIEW(myData.pWebKitView), myConfig.cURI_to_load?myConfig.cURI_to_load:"http://www.google.com"); + } + /* available since rev. 30985, from fev. 2008 */ +- webkit_web_view_set_transparent(myData.pWebKitView, myConfig.bIsTransparent); ++ { ++ GdkRGBA rgba = {0}; ++ if (myConfig.bIsTransparent) rgba.alpha = 0.5; ++ webkit_web_view_set_background_color(myData.pWebKitView, &rgba); ++ } + + return TRUE; + } diff --git a/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-time_h-confict.patch b/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-time_h-confict.patch new file mode 100644 index 0000000000..0a2ea720d1 --- /dev/null +++ b/desktop/cairo-dock-plugins/patches/cairo-dock-plugins-3.4.1-time_h-confict.patch @@ -0,0 +1,137 @@ +--- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-config.c.glibc 2016-12-11 16:10:41.656840262 +0900 ++++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-config.c 2016-12-11 16:23:31.875117800 +0900 +@@ -17,6 +17,7 @@ + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "applet-time_h-struct.h" + #include <string.h> + + #include "applet-struct.h" +--- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-init.c.glibc 2016-12-11 16:10:41.657840257 +0900 ++++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-init.c 2016-12-11 16:22:24.465443591 +0900 +@@ -17,6 +17,7 @@ + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "applet-time_h-struct.h" + #include "stdlib.h" + + #include "applet-struct.h" +--- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-notifications.c.glibc 2015-02-20 01:13:47.000000000 +0900 ++++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-notifications.c 2016-12-11 16:24:08.991938415 +0900 +@@ -17,6 +17,7 @@ + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "applet-time_h-struct.h" + #include <stdlib.h> + #include <string.h> + +@@ -66,4 +67,4 @@ + + + return GLDI_NOTIFICATION_LET_PASS; +-} +\ ファイル末尾に改行がありません ++} +--- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-sound.c.glibc 2015-02-20 01:13:47.000000000 +0900 ++++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-sound.c 2016-12-11 16:23:55.137005376 +0900 +@@ -19,6 +19,7 @@ + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "applet-time_h-struct.h" + #include <stdlib.h> + #ifndef __FreeBSD__ + #include <endian.h> +--- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-struct.h.glibc 2016-12-11 16:10:41.657840257 +0900 ++++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-struct.h 2016-12-11 16:22:59.589273837 +0900 +@@ -21,6 +21,7 @@ + #ifndef __CD_APPLET_STRUCT__ + #define __CD_APPLET_STRUCT__ + ++#include "applet-time_h-struct.h" + #include <sys/types.h> + #include <alsa/asoundlib.h> + #define _STRUCT_TIMEVAL +--- cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-time_h-struct.h.glibc 2016-12-11 16:11:55.464483550 +0900 ++++ cairo-dock-plugins-3.4.1/Sound-Effects/src/applet-time_h-struct.h 2016-12-11 16:19:52.003180440 +0900 +@@ -0,0 +1,27 @@ ++/** ++* This file is a part of the Cairo-Dock project ++* ++* Copyright : (C) see the 'copyright' file. ++* E-mail : see the 'copyright' file. ++* ++* 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 3 ++* 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, see <http://www.gnu.org/licenses/>. ++*/ ++ ++#ifndef __CD_APPLET_TIME_H_STRUCT__ ++#define __CD_APPLET_TIME_H_STRUCT__ ++ ++#define _POSIX_C_SOURCE 200809L ++#include <time.h> ++ ++#endif ++ +--- cairo-dock-plugins-3.4.1/alsaMixer/src/applet-generic.c.glibc 2015-02-20 01:13:47.000000000 +0900 ++++ cairo-dock-plugins-3.4.1/alsaMixer/src/applet-generic.c 2016-12-11 16:20:44.168928323 +0900 +@@ -20,6 +20,7 @@ + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include "applet-time_h-struct.h" + #include <stdlib.h> + + #include "applet-struct.h" +--- cairo-dock-plugins-3.4.1/alsaMixer/src/applet-struct.h.glibc 2015-02-20 01:13:47.000000000 +0900 ++++ cairo-dock-plugins-3.4.1/alsaMixer/src/applet-struct.h 2016-12-11 16:19:47.713201174 +0900 +@@ -20,6 +20,7 @@ + #ifndef __CD_APPLET_STRUCT__ + #define __CD_APPLET_STRUCT__ + ++#include "applet-time_h-struct.h" + #include <sys/types.h> + #include <alsa/asoundlib.h> + #define _STRUCT_TIMEVAL +--- cairo-dock-plugins-3.4.1/alsaMixer/src/applet-time_h-struct.h.glibc 2016-12-11 16:11:55.464483550 +0900 ++++ cairo-dock-plugins-3.4.1/alsaMixer/src/applet-time_h-struct.h 2016-12-11 16:19:52.003180440 +0900 +@@ -0,0 +1,27 @@ ++/** ++* This file is a part of the Cairo-Dock project ++* ++* Copyright : (C) see the 'copyright' file. ++* E-mail : see the 'copyright' file. ++* ++* 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 3 ++* 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, see <http://www.gnu.org/licenses/>. ++*/ ++ ++#ifndef __CD_APPLET_TIME_H_STRUCT__ ++#define __CD_APPLET_TIME_H_STRUCT__ ++ ++#define _POSIX_C_SOURCE 200809L ++#include <time.h> ++ ++#endif ++ diff --git a/desktop/cairo-dock/cairo-dock.SlackBuild b/desktop/cairo-dock/cairo-dock.SlackBuild index f12d52fb2d..9935833256 100644 --- a/desktop/cairo-dock/cairo-dock.SlackBuild +++ b/desktop/cairo-dock/cairo-dock.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=cairo-dock -VERSION=${VERSION:-3.3.2} +VERSION=${VERSION:-3.4.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -59,9 +59,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION +rm -rf $PRGNAM-core-$VERSION tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +cd $PRGNAM-core-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -69,16 +69,19 @@ 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 {} \; +mkdir build +cd build cmake \ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DMAN_INSTALL_DIR=/usr/man \ - -DCMAKE_BUILD_TYPE=Release . + -DCMAKE_BUILD_TYPE=Release .. make VERBOSE=1 make install DESTDIR=$PKG +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/desktop/cairo-dock/cairo-dock.info b/desktop/cairo-dock/cairo-dock.info index d439b98f7a..1c6f1ba104 100644 --- a/desktop/cairo-dock/cairo-dock.info +++ b/desktop/cairo-dock/cairo-dock.info @@ -1,8 +1,8 @@ PRGNAM="cairo-dock" -VERSION="3.3.2" +VERSION="3.4.1" HOMEPAGE="http://www.glx-dock.org" -DOWNLOAD="https://launchpad.net/cairo-dock-core/3.3/3.3.2/+download/cairo-dock-3.3.2.tar.gz" -MD5SUM="aae077803322049e2488ca7c2980cd0d" +DOWNLOAD="https://github.com/Cairo-Dock/cairo-dock-core/archive/3.4.1/cairo-dock-3.4.1.tar.gz" +MD5SUM="63285f2744a76354cea9cc4c012b3c11" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gtkglext" diff --git a/desktop/ceti-2-theme/README b/desktop/ceti-2-theme/README deleted file mode 100644 index 81caf7d90f..0000000000 --- a/desktop/ceti-2-theme/README +++ /dev/null @@ -1,10 +0,0 @@ -ceti-2-theme (GTK2|GTK3 themes) - -ceti-2 is a theme for GTK 3, GTK 2 and Gnome-Shell. It supports GTK 3 -and GTK 2 based desktop environments like Gnome, Unity, Budgie, -Pantheon, etc. - -It is the Official continuation of ceti for Gnome 3.14, 3.16 and 3.18. -It has been completely revamped and is now based on Vertex. - -Optional dependencies: gtk-engines, gtk-engines-unico. diff --git a/desktop/ceti-2-theme/ceti-2-theme.SlackBuild b/desktop/ceti-2-theme/ceti-2-theme.SlackBuild deleted file mode 100644 index f5ed3c662c..0000000000 --- a/desktop/ceti-2-theme/ceti-2-theme.SlackBuild +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/sh -# -# Slackware build script for ceti-2-theme. -# -# Copyright 2016 Edinaldo P. Silva, Rio de Janeiro, Brazil. -# 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. - -PRGNAM="ceti-2-theme" -VERSION=${VERSION:-20150923} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -ARCH=noarch - -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} -CWD=$(pwd) - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -./autogen.sh \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --enable-silent-rules \ - --disable-gnome-shell \ - --disable-unity \ - --build=$ARCH-slackware-linux - -make install DESTDIR=$PKG - -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 - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING README.md $PKG/usr/doc/$PRGNAM-$VERSION/ -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/desktop/ceti-2-theme/ceti-2-theme.info b/desktop/ceti-2-theme/ceti-2-theme.info deleted file mode 100644 index 28f1dffa11..0000000000 --- a/desktop/ceti-2-theme/ceti-2-theme.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="ceti-2-theme" -VERSION="20150923" -HOMEPAGE="https://github.com/horst3180/Ceti-2-theme" -DOWNLOAD="https://github.com/horst3180/ceti-2-theme/archive/20150923/ceti-2-theme-20150923.tar.gz" -MD5SUM="5da8e4e6c2260113b12fafc0a682b389" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="murrine" -MAINTAINER="Edinaldo P. Silva" -EMAIL="edps.mundognu@gmail.com" diff --git a/desktop/ceti-2-theme/doinst.sh b/desktop/ceti-2-theme/doinst.sh deleted file mode 100644 index aea0f894eb..0000000000 --- a/desktop/ceti-2-theme/doinst.sh +++ /dev/null @@ -1,13 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 -fi - -if [ -x /usr/bin/update-mime-database ]; then - /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 -fi - -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/desktop/ceti-2-theme/slack-desc b/desktop/ceti-2-theme/slack-desc deleted file mode 100644 index efcdc3ee26..0000000000 --- a/desktop/ceti-2-theme/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 ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -ceti-2-theme: ceti-2-theme (GTK2|GTK3 themes) -ceti-2-theme: -ceti-2-theme: ceti-2 is a theme for GTK 3, GTK 2 and Gnome-Shell. It supports GTK 3 -ceti-2-theme: and GTK 2 based desktop environments like Gnome, Unity, Budgie, -ceti-2-theme: Pantheon, etc. -ceti-2-theme: -ceti-2-theme: It is the Official continuation of Ceti for Gnome 3.14, 3.16 and 3.18. -ceti-2-theme: It has been completely revamped and is now based on Vertex. -ceti-2-theme: -ceti-2-theme: Home page: https://github.com/horst3180/Ceti-2-theme -ceti-2-theme: diff --git a/desktop/compton/compton.SlackBuild b/desktop/compton/compton.SlackBuild index a72d5cb66e..f9133cac40 100644 --- a/desktop/compton/compton.SlackBuild +++ b/desktop/compton/compton.SlackBuild @@ -22,7 +22,7 @@ # not, see <http://www.gnu.org/licenses/>. PRGNAM="compton" -VERSION=${VERSION:-316eac0613bf342ff91cc645a6c3c80e6b9083fb} +VERSION=${VERSION:-7.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -58,9 +58,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-${VERSION} -tar xvf $CWD/$PRGNAM-${VERSION}.tar.gz || exit 1 -cd ${PRGNAM}-${VERSION} +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -68,19 +68,25 @@ 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 {} \; -make || exit 1 -make install DESTDIR=$PKG +sed -i "s|'no-unknown-warning-option',\ ||" meson.build +cp $CWD/meson.build $CWD/test.h subprojects/test.h/ + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +meson build . -D build_docs=true -D b_ndebug=true --prefix=/usr +DESTDIR=$PKG ninja -C build install + +mv $PKG/usr/share/man $PKG/usr/man 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 -mv $PKG/usr/share/man $PKG/usr/man -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 +install -D -m 0644 $PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop +install -D -m 0644 $PRGNAM.sample.conf $PKG/etc/$PRGNAM.conf mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -ar \ - desc.txt dbus-examples compton.sample.conf LICENSE \ + desc.txt dbus-examples compton.sample.conf COPYING LICENSES \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/desktop/compton/compton.info b/desktop/compton/compton.info index dd49ce713e..334932e1ce 100644 --- a/desktop/compton/compton.info +++ b/desktop/compton/compton.info @@ -1,10 +1,10 @@ PRGNAM="compton" -VERSION="316eac0613bf342ff91cc645a6c3c80e6b9083fb" -HOMEPAGE="https://github.com/chjj/compton" -DOWNLOAD="https://github.com/chjj/compton/archive/316eac0/compton-316eac0613bf342ff91cc645a6c3c80e6b9083fb.tar.gz" -MD5SUM="eb3fddcd691af8239b3ab56bf89e038c" +VERSION="7.2" +HOMEPAGE="https://github.com/yshui/compton/" +DOWNLOAD="https://github.com/yshui/compton/archive/v7.2/compton-7.2.tar.gz" +MD5SUM="91e9aa659dfaa17ccd5653a2c0c5707f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="libconfig" +REQUIRES="libconfig libev libxdg-basedir setconf uthash" MAINTAINER="melikamp" EMAIL="melikamp@melikamp.net" diff --git a/desktop/compton/meson.build b/desktop/compton/meson.build new file mode 100644 index 0000000000..042e5d5dd2 --- /dev/null +++ b/desktop/compton/meson.build @@ -0,0 +1,2 @@ +project('test.h', 'c') +test_h_dep = declare_dependency(include_directories: include_directories('.')) diff --git a/desktop/compton/test.h b/desktop/compton/test.h new file mode 100644 index 0000000000..46ceda4ee5 --- /dev/null +++ b/desktop/compton/test.h @@ -0,0 +1,158 @@ +// SPDX-License-Identifier: MIT +#pragma once + +#ifdef UNIT_TEST + +#include <stdbool.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +struct test_file_metadata; + +struct test_failure { + bool present; + const char *message; + const char *file; + int line; +}; + +struct test_case_metadata { + void (*fn)(struct test_case_metadata *, struct test_file_metadata *); + struct test_failure failure; + const char *name; + struct test_case_metadata *next; +}; + +struct test_file_metadata { + bool registered; + const char *name; + struct test_file_metadata *next; + struct test_case_metadata *tests; +}; + +struct test_file_metadata __attribute__((weak)) * test_file_head; + +#define SET_FAILURE(_message) \ + metadata->failure = (struct test_failure) { \ + .message = _message, .file = __FILE__, .line = __LINE__, \ + .present = true, \ + } + +#define TEST_EQUAL(a, b) \ + do { \ + if ((a) != (b)) { \ + SET_FAILURE(#a " != " #b); \ + return; \ + } \ + } while (0) + +#define TEST_TRUE(a) \ + do { \ + if (!(a)) { \ + SET_FAILURE(#a " is not true"); \ + return; \ + } \ + } while (0) + +#define TEST_STREQUAL(a, b) \ + do { \ + if (strcmp(a, b) != 0) { \ + SET_FAILURE(#a " != " #b); \ + return; \ + } \ + } while (0) + +#define TEST_CASE(_name) \ + static void __test_h_##_name(struct test_case_metadata *, \ + struct test_file_metadata *); \ + static struct test_file_metadata __test_h_file; \ + static struct test_case_metadata __test_h_meta_##_name = { \ + .name = #_name, \ + .fn = __test_h_##_name, \ + }; \ + static void __attribute__((constructor(101))) \ + __test_h_##_name##_register(void) { \ + __test_h_meta_##_name.next = __test_h_file.tests; \ + __test_h_file.tests = &__test_h_meta_##_name; \ + if (!__test_h_file.registered) { \ + __test_h_file.name = __FILE__; \ + __test_h_file.next = test_file_head; \ + test_file_head = &__test_h_file; \ + __test_h_file.registered = true; \ + } \ + } \ + static void __test_h_##_name( \ + struct test_case_metadata *metadata __attribute__((unused)), \ + struct test_file_metadata *file_metadata __attribute__((unused))) + +extern void __attribute__((weak)) (*test_h_unittest_setup)(void); +/// Run defined tests, return true if all tests succeeds +/// @param[out] tests_run if not NULL, set to whether tests were run +static inline void __attribute__((constructor(102))) run_tests(void) { + bool should_run = false; + FILE *cmdlinef = fopen("/proc/self/cmdline", "r"); + char *arg = NULL; + int arglen; + fscanf(cmdlinef, "%ms%n", &arg, &arglen); + fclose(cmdlinef); + for (char *pos = arg; pos < arg + arglen; pos += strlen(pos) + 1) { + if (strcmp(pos, "--unittest") == 0) { + should_run = true; + break; + } + } + free(arg); + + if (!should_run) { + return; + } + + if (&test_h_unittest_setup) { + test_h_unittest_setup(); + } + + struct test_file_metadata *i = test_file_head; + int failed = 0, success = 0; + while (i) { + fprintf(stderr, "Running tests from %s:\n", i->name); + struct test_case_metadata *j = i->tests; + while (j) { + fprintf(stderr, "\t%s ... ", j->name); + j->failure.present = false; + j->fn(j, i); + if (j->failure.present) { + fprintf(stderr, "failed (%s at %s:%d)\n", + j->failure.message, j->failure.file, + j->failure.line); + failed++; + } else { + fprintf(stderr, "passed\n"); + success++; + } + j = j->next; + } + fprintf(stderr, "\n"); + i = i->next; + } + int total = failed + success; + fprintf(stderr, "Test results: passed %d/%d, failed %d/%d\n", success, total, + failed, total); + exit(failed == 0 ? EXIT_SUCCESS : EXIT_FAILURE); +} + +#else + +#include <stdbool.h> + +#define TEST_CASE(name) static void __attribute__((unused)) __test_h_##name(void) + +#define TEST_EQUAL(a, b) \ + (void)(a); \ + (void)(b) +#define TEST_TRUE(a) (void)(a) +#define TEST_STREQUAL(a, b) \ + (void)(a); \ + (void)(b) + +#endif diff --git a/desktop/devilspie/devilspie.SlackBuild b/desktop/devilspie/devilspie.SlackBuild index 471bd18014..5334d2b91d 100644 --- a/desktop/devilspie/devilspie.SlackBuild +++ b/desktop/devilspie/devilspie.SlackBuild @@ -55,7 +55,7 @@ sed -i -e '/-DG.*_DISABLE_DEPRECATED/d' src/Makefile.am autoreconf -i LDFLAGS="-lX11" \ -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -Wno-error=format-y2k" \ CPPFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/desktop/lumina/lumina.SlackBuild b/desktop/lumina/lumina.SlackBuild index 73a9f16d48..6754e909df 100644 --- a/desktop/lumina/lumina.SlackBuild +++ b/desktop/lumina/lumina.SlackBuild @@ -81,6 +81,7 @@ qmake-qt5 \ QMAKE_CFLAGS_ISYSTEM= \ QMAKE_CFLAGS="$SLKCFLAGS" \ QMAKE_CXXFLAGS="$SLKCFLAGS" \ + QMAKE_CFLAGS_ISYSTEM= \ QT5LIBDIR=/usr/lib${LIBDIRSUFFIX}/qt5 \ CONFIG+=WITH_I18N \ L_ETCDIR=/etc diff --git a/desktop/polybar/00165e1a6d5dd61bc153e1352b21ec07fc81245d.patch b/desktop/polybar/00165e1a6d5dd61bc153e1352b21ec07fc81245d.patch new file mode 100644 index 0000000000..81783617b9 --- /dev/null +++ b/desktop/polybar/00165e1a6d5dd61bc153e1352b21ec07fc81245d.patch @@ -0,0 +1,44 @@ +From 00165e1a6d5dd61bc153e1352b21ec07fc81245d Mon Sep 17 00:00:00 2001 +From: patrick96 <p.ziegler96@gmail.com> +Date: Sun, 11 Feb 2018 21:27:52 +0100 +Subject: [PATCH] fix(generators): Add support for eventstruct + +Newer xcb-proto commits after the 1.12 release require the 'eventstruct' +key in the output dictionary, otherwise the generator crashes. + +I don't see a need for xpp to actually support the eventstruct key and +thus it uses a NOP lambda function +--- + generators/cpp_client.py | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) + +diff --git a/generators/cpp_client.py b/generators/cpp_client.py +index 20d116f..709e8d8 100644 +--- a/generators/cpp_client.py ++++ b/generators/cpp_client.py +@@ -3130,15 +3130,16 @@ def cpp_type_classes(): + # } + + # Must create an "output" dictionary before any xcbgen imports. +-output = {'open' : c_open, +- 'close' : c_close, +- 'simple' : c_simple, # lambda x, y: None, +- 'enum' : lambda x, y: None, +- 'struct' : lambda x, y: None, +- 'union' : lambda x, y: None, +- 'request' : c_request, +- 'event' : cpp_event, +- 'error' : cpp_error, ++output = {'open' : c_open, ++ 'close' : c_close, ++ 'simple' : c_simple, # lambda x, y: None, ++ 'enum' : lambda x, y: None, ++ 'struct' : lambda x, y: None, ++ 'union' : lambda x, y: None, ++ 'request' : c_request, ++ 'event' : cpp_event, ++ 'error' : cpp_error, ++ 'eventstruct' : lambda x, y: None, + } + + # Boilerplate below this point diff --git a/desktop/polybar/polybar.SlackBuild b/desktop/polybar/polybar.SlackBuild index b86a3cabea..9856cb3da0 100644 --- a/desktop/polybar/polybar.SlackBuild +++ b/desktop/polybar/polybar.SlackBuild @@ -75,6 +75,9 @@ 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 {} \; +( cd lib/xpp + patch -p1 < $CWD/00165e1a6d5dd61bc153e1352b21ec07fc81245d.patch ) + # Fixes install location sed -i -e '/share\/doc\/polybar/s/share\///' doc/CMakeLists.txt sed -i -e "/DESTINATION doc\/polybar/s/polybar/$PRGNAM-$VERSION/" doc/CMakeLists.txt @@ -87,7 +90,7 @@ mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error=implicit-fallthrough -Wno-error=stringop-truncation -Wno-error=deprecated-copy" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release .. make -j1 diff --git a/desktop/rss-guard/01_min_qt_required_is_5.9.patch b/desktop/rss-guard/01_min_qt_required_is_5.9.patch new file mode 100644 index 0000000000..e54b533774 --- /dev/null +++ b/desktop/rss-guard/01_min_qt_required_is_5.9.patch @@ -0,0 +1,56 @@ +diff --git a/rssguard.pro b/rssguard.pro +index 21a897c7..f8eb8d28 100755 +--- a/rssguard.pro ++++ b/rssguard.pro +@@ -41,8 +41,8 @@ TARGET = rssguard +
+ message(rssguard: Welcome RSS Guard qmake script.)
+
+-lessThan(QT_MAJOR_VERSION, 5)|lessThan(QT_MINOR_VERSION, 7) {
+- warning(rssguard: At least Qt \"5.7.0\" is required!!!)
++lessThan(QT_MAJOR_VERSION, 5)|lessThan(QT_MINOR_VERSION, 9) {
++ warning(rssguard: At least Qt \"5.9.0\" is required!!!)
+ }
+
+ APP_NAME = "RSS Guard"
+diff --git a/src/miscellaneous/textfactory.cpp b/src/miscellaneous/textfactory.cpp +index 53451d63..f371d02d 100755 +--- a/src/miscellaneous/textfactory.cpp ++++ b/src/miscellaneous/textfactory.cpp +@@ -10,10 +10,11 @@ + + #include <QDir> + #include <QLocale> +-#include <QRandomGenerator> + #include <QString> + #include <QStringList> + ++#include <random> ++ + quint64 TextFactory::s_encryptionKey = 0x0; + + TextFactory::TextFactory() = default; +@@ -128,7 +129,10 @@ quint64 TextFactory::initializeSecretEncryptionKey() { + QString encryption_file_path = qApp->settings()->pathName() + QDir::separator() + ENCRYPTION_FILE_NAME; + + try { +- s_encryptionKey = quint64(QString(IOFactory::readFile(encryption_file_path)).toLongLong()); ++ s_encryptionKey = quint64(QString(IOFactory::readFile(encryption_file_path)).toULongLong()); ++ ++ auto aa = s_encryptionKey; ++ auto bb = false; + } + catch (ApplicationException&) { + // Well, key does not exist or is invalid, generate and save one. +@@ -148,5 +152,10 @@ quint64 TextFactory::initializeSecretEncryptionKey() { + } + + quint64 TextFactory::generateSecretEncryptionKey() { +- return QRandomGenerator().generate64(); ++ std::random_device rd; ++ std::mt19937 mt(rd()); ++ std::uniform_int<quint64> dist(std::numeric_limits<quint64>().min() + 1000000UL, ++ std::numeric_limits<quint64>().max()); ++ ++ return dist(mt); + } diff --git a/desktop/rss-guard/02_fix_random_class_name.patch b/desktop/rss-guard/02_fix_random_class_name.patch new file mode 100644 index 0000000000..06c49f7aba --- /dev/null +++ b/desktop/rss-guard/02_fix_random_class_name.patch @@ -0,0 +1,24 @@ +From d347ba63072ab13c0dbc1792d1a2b837af997a46 Mon Sep 17 00:00:00 2001 +From: Martin Rotter <rotter@praktik.cz> +Date: Thu, 6 Jun 2019 11:35:25 +0200 +Subject: [PATCH] Fix random class name + +--- + src/miscellaneous/textfactory.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/miscellaneous/textfactory.cpp b/src/miscellaneous/textfactory.cpp +index 48597235..1ac6f049 100755 +--- a/src/miscellaneous/textfactory.cpp ++++ b/src/miscellaneous/textfactory.cpp +@@ -151,8 +151,8 @@ quint64 TextFactory::initializeSecretEncryptionKey() { + quint64 TextFactory::generateSecretEncryptionKey() { + std::random_device rd; + std::mt19937 mt(rd()); +- std::uniform_int<quint64> dist(std::numeric_limits<quint64>().min() + 1000000UL, +- std::numeric_limits<quint64>().max()); ++ std::uniform_int_distribution<quint64> dist(std::numeric_limits<quint64>().min() + 1000000UL, ++ std::numeric_limits<quint64>().max()); + + return dist(mt); + } diff --git a/desktop/rss-guard/rss-guard.SlackBuild b/desktop/rss-guard/rss-guard.SlackBuild index 470d4565c4..6dee54d811 100644 --- a/desktop/rss-guard/rss-guard.SlackBuild +++ b/desktop/rss-guard/rss-guard.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for rss-guard # -# Copyright 2012-2016 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2012-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=rss-guard SRCNAM=rssguard -VERSION=${VERSION:-3.3.5} +VERSION=${VERSION:-3.5.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -70,18 +70,21 @@ 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 {} \; +patch -p1 < $CWD/01_min_qt_required_is_5.9.patch +patch -p1 < $CWD/02_fix_random_class_name.patch + mkdir -p build cd build qmake-qt5 PREFIX=/usr .. make - make release-install INSTALL_ROOT=$PKG + make install INSTALL_ROOT=$PKG 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 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $PKG/usr/share/$SRCNAM/information/* $PKG/usr/doc/$PRGNAM-$VERSION/ +cp -a *.md $PKG/usr/doc/$PRGNAM-$VERSION/ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/desktop/rss-guard/rss-guard.info b/desktop/rss-guard/rss-guard.info index 4589139345..24591de685 100644 --- a/desktop/rss-guard/rss-guard.info +++ b/desktop/rss-guard/rss-guard.info @@ -1,8 +1,8 @@ PRGNAM="rss-guard" -VERSION="3.3.5" +VERSION="3.5.9" HOMEPAGE="https://github.com/martinrotter/rssguard" -DOWNLOAD="https://github.com/martinrotter/rssguard/archive/3.3.5.tar.gz" -MD5SUM="9ac44a786afe7b9c5a94e1a81120ada8" +DOWNLOAD="https://github.com/martinrotter/rssguard/archive/3.5.9/rssguard-3.5.9.tar.gz" +MD5SUM="fb9b713a18a2bb85e7a4f7ce40a054b0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="qt5" diff --git a/desktop/seafile-gui/README b/desktop/seafile-client/README index 94ced6564e..94ced6564e 100644 --- a/desktop/seafile-gui/README +++ b/desktop/seafile-client/README diff --git a/desktop/seafile-gui/doinst.sh b/desktop/seafile-client/doinst.sh index 65c7e2eeb9..65c7e2eeb9 100644 --- a/desktop/seafile-gui/doinst.sh +++ b/desktop/seafile-client/doinst.sh diff --git a/desktop/seafile-gui/seafile-gui.SlackBuild b/desktop/seafile-client/seafile-client.SlackBuild index 9b7e62a867..a50bcb3248 100644 --- a/desktop/seafile-gui/seafile-gui.SlackBuild +++ b/desktop/seafile-client/seafile-client.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Slackware build script for "seafile-client". +# Slackware build script for seafile-client. # Copyright 2015 Marcel Saegebarth <marc@mos6581.de> # All rights reserved. @@ -24,15 +24,14 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=seafile-gui -SRCNAM=seafile-client -VERSION=${VERSION:-4.4.2} +PRGNAM=seafile-client +VERSION=${VERSION:-6.2.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -43,8 +42,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -62,9 +61,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/v$VERSION.tar.gz || tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$VERSION +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/desktop/seafile-client/seafile-client.info b/desktop/seafile-client/seafile-client.info new file mode 100644 index 0000000000..92933b6c01 --- /dev/null +++ b/desktop/seafile-client/seafile-client.info @@ -0,0 +1,10 @@ +PRGNAM="seafile-client" +VERSION="6.2.5" +HOMEPAGE="http://seafile.com/" +DOWNLOAD="https://github.com/haiwen/seafile-client/archive/v6.2.5/seafile-client-6.2.5.tar.gz" +MD5SUM="3f3cd465109e1d49888fbca310033a3b" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="qt5 seafile" +MAINTAINER="Marcel Saegebarth" +EMAIL="marc@mos6581.de" diff --git a/network/seafile-client/slack-desc b/desktop/seafile-client/slack-desc index e41d278faa..2f39a14e33 100644 --- a/network/seafile-client/slack-desc +++ b/desktop/seafile-client/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -seafile-client: seafile-client (Cloud Storage System) +seafile-client: seafile-client (Seafile Desktop Client) seafile-client: -seafile-client: Seafile is a next-generation open source cloud storage system with -seafile-client: advanced support for file syncing, privacy protection and teamwork. +seafile-client: Graphical desktop client for the Seafile next-generation open +seafile-client: source cloud storage system with advanced support for file syncing, +seafile-client: privacy protection and teamwork. seafile-client: seafile-client: Homepage: http://seafile.com/ seafile-client: seafile-client: seafile-client: seafile-client: -seafile-client: diff --git a/desktop/seafile-gui/seafile-gui.info b/desktop/seafile-gui/seafile-gui.info deleted file mode 100644 index a878209924..0000000000 --- a/desktop/seafile-gui/seafile-gui.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="seafile-gui" -VERSION="4.4.2" -HOMEPAGE="http://seafile.com/" -DOWNLOAD="https://github.com/haiwen/seafile-client/archive/v4.4.2.tar.gz" -MD5SUM="8749f059e9209df31e662c9325c735e5" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="seafile-client" -MAINTAINER="Marcel Saegebarth" -EMAIL="marc@mos6581.de" diff --git a/desktop/searchmonkey/patch.txt b/desktop/searchmonkey/patch.txt new file mode 100644 index 0000000000..08d9959efd --- /dev/null +++ b/desktop/searchmonkey/patch.txt @@ -0,0 +1,11 @@ +--- ./mainwindow.cpp 2010-05-16 11:42:14.000000000 -0400 ++++ ./mainwindow.cpp.new 2016-09-06 21:07:18.462298114 -0400 +@@ -781,7 +781,7 @@ + ******************************************************************************/ + void MainWindow::find () throw() { + +- auto autoSettingsReset asr(sui); // dtor calls sui->reset() ++ + + bool modeAdvanced = ui->actionAdvanced->isChecked(); + qDebug() << "modeAdvanced-" << modeAdvanced; diff --git a/desktop/searchmonkey/searchmonkey.SlackBuild b/desktop/searchmonkey/searchmonkey.SlackBuild index b1c2ef0824..f807c46128 100644 --- a/desktop/searchmonkey/searchmonkey.SlackBuild +++ b/desktop/searchmonkey/searchmonkey.SlackBuild @@ -69,6 +69,7 @@ find -L . \ -exec chmod 644 {} \; patch -p1 --verbose <$CWD/searchmonkey-2.0.0-gcc4.7.patch +patch -p1 --verbose <$CWD/patch.txt qmake \ QMAKE_CFLAGS="$SLKCFLAGS" \ diff --git a/desktop/suru-plus-icon-theme/README b/desktop/suru-plus-icon-theme/README new file mode 100644 index 0000000000..bc31a6a5bb --- /dev/null +++ b/desktop/suru-plus-icon-theme/README @@ -0,0 +1,3 @@ +Suru++ is a cyberpunkish, elegant, futuristic, macOS-like, +Papirus-like and modern Suru icons based on Suru Icons +by Sam Hewitt. diff --git a/desktop/thunar-dropbox/doinst.sh b/desktop/suru-plus-icon-theme/doinst.sh index 19400050fd..4110f5514d 100644 --- a/desktop/thunar-dropbox/doinst.sh +++ b/desktop/suru-plus-icon-theme/doinst.sh @@ -3,4 +3,3 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 fi fi - diff --git a/desktop/suru-plus-icon-theme/slack-desc b/desktop/suru-plus-icon-theme/slack-desc new file mode 100644 index 0000000000..97b1322469 --- /dev/null +++ b/desktop/suru-plus-icon-theme/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------------------------------------------------------| +suru-plus-icon-theme: suru-plus-icon-theme (Extensive SVG icons set) +suru-plus-icon-theme: +suru-plus-icon-theme: Suru++ is a cyberpunkish, elegant, futuristic, macOS-like, +suru-plus-icon-theme: Papirus-like and modern Suru icons based on Suru Icons +suru-plus-icon-theme: by Sam Hewitt. +suru-plus-icon-theme: +suru-plus-icon-theme: homepage: https://github.com/gusbemacbe/suru-plus +suru-plus-icon-theme: +suru-plus-icon-theme: +suru-plus-icon-theme: +suru-plus-icon-theme: diff --git a/python/pip/pip.SlackBuild b/desktop/suru-plus-icon-theme/suru-plus-icon-theme.SlackBuild index 0f28914773..665e22dc69 100644 --- a/python/pip/pip.SlackBuild +++ b/desktop/suru-plus-icon-theme/suru-plus-icon-theme.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for pip +# Slackware build script for suru-plus-icon-theme -# Copyright 2012-2018 Audrius Kažukauskas <audrius@neutrino.lt> +# Copyright 2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,18 +22,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=pip -VERSION=${VERSION:-9.0.3} +PRGNAM=suru-plus-icon-theme +SRCNAM=suru-plus +VERSION=${VERSION:-30.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi +ARCH=noarch CWD=$(pwd) TMP=${TMP:-/tmp/SBo} @@ -42,30 +37,27 @@ OUTPUT=${OUTPUT:-/tmp} set -e -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT +rm -rf $PKG $SRCNAM-$VERSION +mkdir -p $PKG/usr/share/icons $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* +cd $SRCNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python setup.py install --root=$PKG - -# Add bash completion file. -install -D -m 644 $CWD/pip.sh $PKG/usr/share/bash-completion/completions/pip +cp -a eSuru++ Suru++ Suru++-Light $PKG/usr/share/icons/ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING CREDITS LICENSE *.md tools $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/desktop/suru-plus-icon-theme/suru-plus-icon-theme.info b/desktop/suru-plus-icon-theme/suru-plus-icon-theme.info new file mode 100644 index 0000000000..045be3da36 --- /dev/null +++ b/desktop/suru-plus-icon-theme/suru-plus-icon-theme.info @@ -0,0 +1,10 @@ +PRGNAM="suru-plus-icon-theme" +VERSION="30.0" +HOMEPAGE="https://github.com/gusbemacbe/suru-plus" +DOWNLOAD="https://github.com/gusbemacbe/suru-plus/archive/v30.0/suru-plus-30.0.tar.gz" +MD5SUM="aba1a105215425e843b60b8edae38241" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/desktop/thunar-archive-plugin/thunar-archive-plugin.SlackBuild b/desktop/thunar-archive-plugin/thunar-archive-plugin.SlackBuild index fd27c5b191..4b3135bcda 100644 --- a/desktop/thunar-archive-plugin/thunar-archive-plugin.SlackBuild +++ b/desktop/thunar-archive-plugin/thunar-archive-plugin.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=thunar-archive-plugin -VERSION=${VERSION:-0.3.1} +VERSION=${VERSION:-0.4.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" diff --git a/desktop/thunar-archive-plugin/thunar-archive-plugin.info b/desktop/thunar-archive-plugin/thunar-archive-plugin.info index 7181974b68..88e6670e73 100644 --- a/desktop/thunar-archive-plugin/thunar-archive-plugin.info +++ b/desktop/thunar-archive-plugin/thunar-archive-plugin.info @@ -1,8 +1,8 @@ PRGNAM="thunar-archive-plugin" -VERSION="0.3.1" +VERSION="0.4.0" HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin" -DOWNLOAD="https://archive.xfce.org/src/thunar-plugins/thunar-archive-plugin/0.3/thunar-archive-plugin-0.3.1.tar.bz2" -MD5SUM="425f4faaace6dc7a4716a35b7795463a" +DOWNLOAD="http://archive.xfce.org/src/thunar-plugins/thunar-archive-plugin/0.4/thunar-archive-plugin-0.4.0.tar.bz2" +MD5SUM="0a7738a3a5f84bf218ece3ffb5241c63" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="xarchiver" diff --git a/desktop/thunar-dropbox/README b/desktop/thunar-dropbox/README deleted file mode 100644 index 23795731f9..0000000000 --- a/desktop/thunar-dropbox/README +++ /dev/null @@ -1 +0,0 @@ -Thunar-dropbox is a Thunar plugin that adds context-menu items from dropbox. diff --git a/desktop/thunar-dropbox/slack-desc b/desktop/thunar-dropbox/slack-desc deleted file mode 100644 index 2f60412719..0000000000 --- a/desktop/thunar-dropbox/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 ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -thunar-dropbox: thunar-dropbox (dropbox plugin for thunar) -thunar-dropbox: -thunar-dropbox: Thunar Dropbox is a plugin for thunar that adds context-menu -thunar-dropbox: items from dropbox. -thunar-dropbox: -thunar-dropbox: http://www.softwarebakery.com/maato/thunar-dropbox.html -thunar-dropbox: -thunar-dropbox: -thunar-dropbox: -thunar-dropbox: -thunar-dropbox: diff --git a/desktop/thunar-dropbox/thunar-dropbox.info b/desktop/thunar-dropbox/thunar-dropbox.info deleted file mode 100644 index 1d8bd2a7f3..0000000000 --- a/desktop/thunar-dropbox/thunar-dropbox.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="thunar-dropbox" -VERSION="0.2.1" -HOMEPAGE="http://www.softwarebakery.com/maato/thunar-dropbox.html" -DOWNLOAD="http://www.softwarebakery.com/maato/files/thunar-dropbox/thunar-dropbox-0.2.1.tar.bz2" -MD5SUM="52bb2caa26afaf80835a56b9ad3d2155" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Murat D. Kadirov" -EMAIL="banderols@gmail.com" diff --git a/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1.patch b/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin-0.3.0.patch index 78db9be2b6..2d626e0ddd 100644 --- a/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1.patch +++ b/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin-0.3.0.patch @@ -1,7 +1,7 @@ -diff -Nur thunar-media-tags-plugin-0.2.1.orig/configure thunar-media-tags-plugin-0.2.1/configure ---- thunar-media-tags-plugin-0.2.1.orig/configure 2013-05-11 04:57:03.000000000 -0500 -+++ thunar-media-tags-plugin-0.2.1/configure 2013-06-17 01:40:43.467622887 -0500 -@@ -14529,45 +14529,7 @@ +diff -Naur thunar-media-tags-plugin-0.3.0.orig/configure thunar-media-tags-plugin-0.3.0/configure +--- thunar-media-tags-plugin-0.3.0.orig/configure 2018-02-14 21:50:48.000000000 +0100 ++++ thunar-media-tags-plugin-0.3.0/configure 2019-08-29 09:11:23.390608000 +0200 +@@ -15292,45 +15292,8 @@ TAGLIBC_LIBS="" TAGLIBC_CFLAGS="" @@ -42,13 +42,13 @@ diff -Nur thunar-media-tags-plugin-0.2.1.orig/configure thunar-media-tags-plugin -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tag_c_taglib_file_new" >&5 -$as_echo "$ac_cv_lib_tag_c_taglib_file_new" >&6; } -if test "x$ac_cv_lib_tag_c_taglib_file_new" = xyes; then : -- + - ac_fn_c_check_header_mongrel "$LINENO" "taglib/tag_c.h" "ac_cv_header_taglib_tag_c_h" "$ac_includes_default" +ac_fn_c_check_header_mongrel "$LINENO" "taglib/tag_c.h" "ac_cv_header_taglib_tag_c_h" "$ac_includes_default" if test "x$ac_cv_header_taglib_tag_c_h" = xyes; then : TAGLIBC_LIBS="-ltag_c" -@@ -14579,10 +14541,6 @@ +@@ -15342,10 +15305,6 @@ diff --git a/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin.SlackBuild b/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin.SlackBuild index d2837715b7..6ca665ed24 100644 --- a/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin.SlackBuild +++ b/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=thunar-media-tags-plugin -VERSION=${VERSION:-0.2.1} +VERSION=${VERSION:-0.3.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -70,7 +70,7 @@ find -L . \ -exec chmod 644 {} \; # Fix taglib linking - thanks, Roberto Neri! :) -patch -p1 < $CWD/thunar-media-tags-plugin-0.2.1.patch +patch -p1 < $CWD/thunar-media-tags-plugin-0.3.0.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin.info b/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin.info index 4c2c75bd65..9c9c226e6d 100644 --- a/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin.info +++ b/desktop/thunar-media-tags-plugin/thunar-media-tags-plugin.info @@ -1,8 +1,8 @@ PRGNAM="thunar-media-tags-plugin" -VERSION="0.2.1" +VERSION="0.3.0" HOMEPAGE="https://goodies.xfce.org/projects/thunar-plugins/thunar-media-tags-plugin" -DOWNLOAD="https://archive.xfce.org/src/thunar-plugins/thunar-media-tags-plugin/0.2/thunar-media-tags-plugin-0.2.1.tar.bz2" -MD5SUM="0106e900714f86ccbafdc72238d3cf8d" +DOWNLOAD="https://archive.xfce.org/src/thunar-plugins/thunar-media-tags-plugin/0.3/thunar-media-tags-plugin-0.3.0.tar.bz2" +MD5SUM="5e332113e4b0e548ee7abd87629667f7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/wbar/wbar.SlackBuild b/desktop/wbar/wbar.SlackBuild index 09fd3d2bc5..d16ff8a236 100644 --- a/desktop/wbar/wbar.SlackBuild +++ b/desktop/wbar/wbar.SlackBuild @@ -74,7 +74,7 @@ find -L . \ sed -i 's|pidof|/sbin/pidof|g' src/config/Run.cc CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -Wno-error=literal-suffix" \ ./configure \ --prefix=/usr \ --exec-prefix=/usr \ diff --git a/desktop/wmakerconf/README b/desktop/wmakerconf/README deleted file mode 100644 index 4853bb11a7..0000000000 --- a/desktop/wmakerconf/README +++ /dev/null @@ -1,4 +0,0 @@ -WMakerConf (short for Window Maker Configurator) is a configuration -utility for the Window Maker window manager. - -WMakerConf requires WindowMaker to be installed (it's part of Slackware). diff --git a/desktop/wmakerconf/doinst.sh b/desktop/wmakerconf/doinst.sh deleted file mode 100644 index 2e82bb7622..0000000000 --- a/desktop/wmakerconf/doinst.sh +++ /dev/null @@ -1,3 +0,0 @@ -if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1 -fi diff --git a/desktop/wmakerconf/slack-desc b/desktop/wmakerconf/slack-desc deleted file mode 100644 index 60fed0e4d6..0000000000 --- a/desktop/wmakerconf/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 ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -wmakerconf: wmakerconf (GTK+ based configuration tool for Window Maker) -wmakerconf: -wmakerconf: WMakerConf (short for Window Maker Configurator) is a configuration -wmakerconf: utility for the Window Maker window manager. -wmakerconf: -wmakerconf: homepage: http://wmakerconf.sourceforge.net -wmakerconf: -wmakerconf: -wmakerconf: -wmakerconf: -wmakerconf: diff --git a/desktop/wmakerconf/wmakerconf-2.12-wmaker-0.95_support.patch b/desktop/wmakerconf/wmakerconf-2.12-wmaker-0.95_support.patch deleted file mode 100644 index 5b598c3c15..0000000000 --- a/desktop/wmakerconf/wmakerconf-2.12-wmaker-0.95_support.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff -Naur wmakerconf-2.12.orig/src/menu.c wmakerconf-2.12/src/menu.c ---- wmakerconf-2.12.orig/src/menu.c 2012-02-10 17:34:57.601475631 +0100 -+++ wmakerconf-2.12/src/menu.c 2012-02-10 17:35:03.917287748 +0100 -@@ -500,10 +500,10 @@ - * No return value. - */ - { -- if (!WMWritePropListToFile (orig_wmaker, orig_wmaker_fname, YES)) -+ if (!WMWritePropListToFile(orig_wmaker, orig_wmaker_fname)) - warning (_("Can't revert to backupfile of `WindowMaker'. " - "Please manually revert from file WindowMaker.bak.")); -- if (orig_rootmenu && !WMWritePropListToFile (orig_rootmenu, orig_rootmenu_fname, YES)) -+ if (orig_rootmenu && !WMWritePropListToFile(orig_rootmenu, orig_rootmenu_fname)) - warning (_("Can't revert to backupfile of `WMRootMenu'. " - "Please manually revert from file WMRootMenu.bak.")); - gtk_main_quit (); -diff -Naur wmakerconf-2.12.orig/src/rootmenu.c wmakerconf-2.12/src/rootmenu.c ---- wmakerconf-2.12.orig/src/rootmenu.c 2012-02-10 17:34:57.601475631 +0100 -+++ wmakerconf-2.12/src/rootmenu.c 2012-02-10 17:35:03.929287391 +0100 -@@ -365,7 +365,7 @@ - node_freeitem, NULL); - g_node_destroy (node); - -- if (WMWritePropListToFile (menu, filename, YES)) -+ if (WMWritePropListToFile(menu, filename)) - { - menu_changed = NO; - message (_("Window Maker root menu file '%s' saved."), filename); -diff -Naur wmakerconf-2.12.orig/src/themebrowser.c wmakerconf-2.12/src/themebrowser.c ---- wmakerconf-2.12.orig/src/themebrowser.c 2012-02-10 17:34:57.601475631 +0100 -+++ wmakerconf-2.12/src/themebrowser.c 2012-02-10 17:35:56.515722786 +0100 -@@ -2705,7 +2705,7 @@ - oldfiles = g_list_remove (oldfiles, tmp); - Free (tmp); - } -- if (!WMWritePropListToFile (theme, stylename, YES)) -+ if (!WMWritePropListToFile(theme, stylename)) - { - dialog_popup (DIALOG_ERROR, NULL, NULL, - _("Can't save theme file\n`%s'\n" -diff -Naur wmakerconf-2.12.orig/src/window.c wmakerconf-2.12/src/window.c ---- wmakerconf-2.12.orig/src/window.c 2012-02-10 17:34:57.601475631 +0100 -+++ wmakerconf-2.12/src/window.c 2012-02-10 17:35:03.953286677 +0100 -@@ -1069,7 +1069,7 @@ - WMReleasePropList (all_keys); - } - -- if (WMWritePropListToFile (newwm, orig_wmaker_fname, YES)) -+ if (WMWritePropListToFile(newwm, orig_wmaker_fname)) - { - changed = NO; - message (_("Window Maker config file '%s' saved."), -diff -Naur wmakerconf-2.12.orig/src/wmconfig.c wmakerconf-2.12/src/wmconfig.c ---- wmakerconf-2.12.orig/src/wmconfig.c 2012-02-10 17:34:57.601475631 +0100 -+++ wmakerconf-2.12/src/wmconfig.c 2012-02-10 17:35:03.957286559 +0100 -@@ -216,7 +216,7 @@ - /* - * Generate backup file "'path'.bak" - */ -- if (WMWritePropListToFile (orig_rootmenu, new, YES)) -+ if (WMWritePropListToFile(orig_rootmenu, new)) - message (_("Backupfile `%s' generated."), new); - else - error (_("Can't write backupfile `%s'."), new); -@@ -280,7 +280,7 @@ - if (!windowmaker) - { - windowmaker = global_windowmaker; -- if (WMWritePropListToFile (windowmaker, orig_wmaker_fname, YES)) -+ if (WMWritePropListToFile(windowmaker, orig_wmaker_fname)) - warning (_("New WindowMaker configuration file `%s' created."), - orig_wmaker_fname); - else -@@ -294,7 +294,7 @@ - /* - * Generate backup file "'path'.bak" - */ -- if (WMWritePropListToFile (windowmaker, new, YES)) -+ if (WMWritePropListToFile(windowmaker, new)) - message (_("Backupfile `%s' generated."), new); - else - error (_("Can't write backupfile `%s'."), new); diff --git a/desktop/wmakerconf/wmakerconf.SlackBuild b/desktop/wmakerconf/wmakerconf.SlackBuild deleted file mode 100644 index a971aba9b7..0000000000 --- a/desktop/wmakerconf/wmakerconf.SlackBuild +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/sh - -# Slackware build script for wmakerconf -# Written by Cezary M. Kruk (c.kruk@bigfoot.com) -# -# Modified by the SlackBuilds.org project. - -PRGNAM=wmakerconf -VERSION=${VERSION:-2.12} -BUILD=${BUILD:-3} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT - -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/${PRGNAM}_$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -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 {} \; - -# Fix for building over windowmaer >= 0.95.2 -# http://sourceforge.net/tracker/?func=detail&aid=3522083&group_id=196469&atid=957581 -patch -p1 < $CWD/wmakerconf-2.12-wmaker-0.95_support.patch - -# Fix linking to X11 libs -sed -e "/^LIBS =/s/$/ -lX11/" -i src/Makefile.in - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --with-wmakeretcprefix=/etc/X11 \ - --localstatedir=/var \ - --mandir=/usr/man \ - --disable-debug \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -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 - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS COPYING ChangeLog INSTALL MANUAL NEWS NLS-TEAM1 README TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/desktop/wmakerconf/wmakerconf.info b/desktop/wmakerconf/wmakerconf.info deleted file mode 100644 index 4052e2da2e..0000000000 --- a/desktop/wmakerconf/wmakerconf.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="wmakerconf" -VERSION="2.12" -HOMEPAGE="http://wmakerconf.sourceforge.net" -DOWNLOAD="http://downloads.sourceforge.net/wmakerconf/wmakerconf_2.12.tar.gz" -MD5SUM="252114b5ee5fc5bec99477497ee045cc" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Cezary M. Kruk" -EMAIL="c.kruk@bigfoot.com" diff --git a/desktop/workrave/README b/desktop/workrave/README new file mode 100644 index 0000000000..446e900f7e --- /dev/null +++ b/desktop/workrave/README @@ -0,0 +1,4 @@ +Workrave is a program that assists in the recovery and prevention of +Repetitive Strain Injury (RSI). +The program frequently alerts you to take micro-pauses, rest breaks +and restricts you to your daily limit. diff --git a/desktop/workrave/doinst.sh b/desktop/workrave/doinst.sh new file mode 100644 index 0000000000..b34040d04c --- /dev/null +++ b/desktop/workrave/doinst.sh @@ -0,0 +1,19 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +# If other icon themes are installed, then add to/modify this as needed +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 + +if [ -e usr/share/glib-2.0/schemas ]; then + if [ -x /usr/bin/glib-compile-schemas ]; then + /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1 + fi +fi + +# If needed -- be sure to sed @LIBDIR@ inside the build script +chroot . /usr/bin/gio-querymodules @LIBDIR@/gio/modules/ 1> /dev/null 2> /dev/null diff --git a/audio/opusfile/slack-desc b/desktop/workrave/slack-desc index e77532d058..a6374fc7cf 100644 --- a/audio/opusfile/slack-desc +++ b/desktop/workrave/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -opusfile: opusfile (opus decoding API) -opusfile: -opusfile: opusfile provides application developers with a high-level API for -opusfile: decoding and seeking in .opus files. -opusfile: -opusfile: homepage: http://www.opus-codec.org -opusfile: -opusfile: -opusfile: -opusfile: -opusfile: +workrave: workrave (work breaks alerts) +workrave: +workrave: Workrave is a program that assists in the recovery and prevention of +workrave: Repetitive Strain Injury (RSI). +workrave: The program frequently alerts you to take micro-pauses, rest breaks +workrave: and restricts you to your daily limit. +workrave: +workrave: homepage: http://workrave.org +workrave: +workrave: +workrave: diff --git a/development/SDL2_gfx/SDL2_gfx.SlackBuild b/desktop/workrave/workrave.SlackBuild index cdf7a8fb56..ec4764038a 100644 --- a/development/SDL2_gfx/SDL2_gfx.SlackBuild +++ b/desktop/workrave/workrave.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for SDL2_gfx +# Slackware build script for workrave -# Copyright 2014-2018 Dimitris Zlatanidis Orestiada, Greece +# Copyright 2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,8 +22,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=SDL2_gfx -VERSION=${VERSION:-1.0.4} +PRGNAM=workrave +VERSION=${VERSION:-1.10.34} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,7 +69,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 {} \; -./autogen.sh CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -79,7 +78,6 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ - --disable-static \ --build=$ARCH-slackware-linux make @@ -89,11 +87,12 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog NEWS README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +sed "s|@LIBDIR@|/usr/lib$LIBDIRSUFFIX|" $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/desktop/workrave/workrave.info b/desktop/workrave/workrave.info new file mode 100644 index 0000000000..23ba6ded00 --- /dev/null +++ b/desktop/workrave/workrave.info @@ -0,0 +1,10 @@ +PRGNAM="workrave" +VERSION="1.10.34" +HOMEPAGE="http://workrave.org" +DOWNLOAD="https://github.com/rcaelers/workrave/releases/download/v1_10_34/workrave-1.10.34.tar.gz" +MD5SUM="25914f54ea1e6395da7b88be2f189093" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/desktop/yad/yad.SlackBuild b/desktop/yad/yad.SlackBuild index 0b08f08e7a..d96ebb91ee 100644 --- a/desktop/yad/yad.SlackBuild +++ b/desktop/yad/yad.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for yad # Copyright 2010-2014 Charles <SlackBuilds@catcons.co.uk> -# Copyright 2015-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2015-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=yad -VERSION=${VERSION:-0.40.0} +VERSION=${VERSION:-4.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -55,8 +55,8 @@ else LIBDIRSUFFIX="" fi -GTK=${GTK:-2} -if pkg-config --exists webkit-1.0 ; then HTML="--enable-html" ; else HTML="" ; fi +if pkg-config --exists webkit2gtk-4.0 ; then HTML="--enable-html" ; else HTML="" ; fi +if pkg-config --exists gtksourceview-3.0 ; then SOURCEVIEW="--enable-sourceview" ; else SOURCEVIEW="" ; fi set -e @@ -73,6 +73,9 @@ 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 {} \; +autoreconf -vif +intltoolize + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -84,8 +87,11 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --with-rgb=/usr/share/X11/rgb.txt \ --enable-icon-browser \ - --with-gtk=gtk$GTK \ + --enable-pfd \ + --enable-tray \ + --enable-spell \ $HTML \ + $SOURCEVIEW \ --build=$ARCH-slackware-linux make @@ -95,7 +101,7 @@ 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 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING NEWS README* THANKS TODO $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/desktop/yad/yad.info b/desktop/yad/yad.info index a5a5b9d17e..2498c778cb 100644 --- a/desktop/yad/yad.info +++ b/desktop/yad/yad.info @@ -1,8 +1,8 @@ PRGNAM="yad" -VERSION="0.40.0" -HOMEPAGE="https://sourceforge.net/projects/yad-dialog/" -DOWNLOAD="https://downloads.sf.net/yad-dialog/yad-0.40.0.tar.xz" -MD5SUM="82d458a2e1695dd0709f71ad26109812" +VERSION="4.1" +HOMEPAGE="https://github.com/v1cont/yad/" +DOWNLOAD="https://github.com/v1cont/yad/archive/4.1/yad-4.1.tar.gz" +MD5SUM="8b16119570fb03e3804bb6b33108eb9c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/ChezScheme/ChezScheme.SlackBuild b/development/ChezScheme/ChezScheme.SlackBuild index 604a2dfd75..a30137c407 100644 --- a/development/ChezScheme/ChezScheme.SlackBuild +++ b/development/ChezScheme/ChezScheme.SlackBuild @@ -86,6 +86,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; ./configure \ + CFLAGS="-Wno-error=implicit-fallthrough=" \ $WSIZE \ $THREADS \ --installprefix=/usr \ diff --git a/development/Coin/Coin.SlackBuild b/development/Coin/Coin.SlackBuild index 96953fa909..eb99408893 100644 --- a/development/Coin/Coin.SlackBuild +++ b/development/Coin/Coin.SlackBuild @@ -61,6 +61,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Thanks Fedora +patch -p1 < $CWD/memhandler-initialization.patch + # Thanks Debian patch -p1 < $CWD/coin-include_and_js.patch diff --git a/development/Coin/memhandler-initialization.patch b/development/Coin/memhandler-initialization.patch new file mode 100644 index 0000000000..4c346487ed --- /dev/null +++ b/development/Coin/memhandler-initialization.patch @@ -0,0 +1,20 @@ +--- Coin-3.1.3/src/misc/SbHash.h.init 2010-03-02 22:20:09.000000000 +0900 ++++ Coin-3.1.3/src/misc/SbHash.h 2016-04-22 16:52:39.888883757 +0900 +@@ -89,6 +89,8 @@ + cc_memalloc_deallocate(entry->memhandler, ptr); + } + SbHashEntry(const Key & key, const Type & obj) : key(key), obj(obj) {} ++ SbHashEntry(const Key & key, const Type & obj, cc_memalloc *memhandler) ++ : key(key), obj(obj), memhandler(memhandler) {} + + Key key; + Type obj; +@@ -218,7 +220,7 @@ + /* Key not already in the hash table; insert a new + * entry as the first element in the bucket + */ +- entry = new (this->memhandler) SbHashEntry<Type, Key>(key, obj); ++ entry = new (this->memhandler) SbHashEntry<Type, Key>(key, obj, this->memhandler); + entry->next = this->buckets[i]; + this->buckets[i] = entry; + diff --git a/development/FreeBASIC/FreeBASIC.SlackBuild b/development/FreeBASIC/FreeBASIC.SlackBuild index b851e000e0..97ffce4878 100644 --- a/development/FreeBASIC/FreeBASIC.SlackBuild +++ b/development/FreeBASIC/FreeBASIC.SlackBuild @@ -89,13 +89,10 @@ if [ "$ARCH" = "x86_64" ]; then $PKG/usr/lib/${PRGNAM,,} fi -# fix linking with libtinfo over libncurses +# fix linking libtinfo over the newer version - WARNING, UGLY SHIT! -ponce ln -sf \ - /usr/lib${LIBDIRSUFFIX}/libncurses.so.5 \ + /usr/lib${LIBDIRSUFFIX}/libtinfo.so.6 \ $PKG/usr/lib${LIBDIRSUFFIX}/libtinfo.so.5 -ln -sf \ - /usr/lib${LIBDIRSUFFIX}/libtinfo.so.5 \ - $PKG/usr/lib${LIBDIRSUFFIX}/libtinfo.so # gzip man page gzip -c doc/fbc.1 > $PKG/usr/man/man1/fbc.1.gz diff --git a/development/MySQL-python/MySQL-python.SlackBuild b/development/MySQL-python/MySQL-python.SlackBuild index c367b99dc9..cc212f17be 100644 --- a/development/MySQL-python/MySQL-python.SlackBuild +++ b/development/MySQL-python/MySQL-python.SlackBuild @@ -57,7 +57,7 @@ patch -p1 < $CWD/patches/no_distribute_download.patch # Include my_config.h first patch -p1 < $CWD/patches/MySQL-python-1.2.4-include-my_config-first.patch -python setup.py install --root=$PKG +CPPFLAGS="-I/usr/include/mysql/server" python setup.py install --root=$PKG 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/development/SDL2_gfx/README b/development/SDL2_gfx/README deleted file mode 100644 index 6be21f40d1..0000000000 --- a/development/SDL2_gfx/README +++ /dev/null @@ -1,3 +0,0 @@ -SDL graphics drawing primitives and other support functions -wrapped up in an addon library for the Simple Direct Media -(SDL) cross-platform API layer. diff --git a/development/SDL2_gfx/SDL2_gfx.info b/development/SDL2_gfx/SDL2_gfx.info deleted file mode 100644 index 2f64868bd2..0000000000 --- a/development/SDL2_gfx/SDL2_gfx.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="SDL2_gfx" -VERSION="1.0.4" -HOMEPAGE="http://www.ferzkopp.net/wordpress/2016/01/02/sdl_gfx-sdl2_gfx/" -DOWNLOAD="http://www.ferzkopp.net/Software/SDL2_gfx/SDL2_gfx-1.0.4.tar.gz" -MD5SUM="15f9866c6464ca298f28f62fe5b36d9f" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="SDL2" -MAINTAINER="Dimitris Zlatanidis" -EMAIL="d.zlatanidis@gmail.com" diff --git a/development/SDL2_gfx/slack-desc b/development/SDL2_gfx/slack-desc deleted file mode 100644 index 72864f2da7..0000000000 --- a/development/SDL2_gfx/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 ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -SDL2_gfx: SDL2_gfx (addon library for the SDL2) -SDL2_gfx: -SDL2_gfx: SDL graphics drawing primitives and other support functions -SDL2_gfx: wrapped up in an addon library for the Simple Direct Media (SDL) -SDL2_gfx: cross-platform API layer. -SDL2_gfx: -SDL2_gfx: Homepage: -SDL2_gfx: http://www.ferzkopp.net/wordpress/2016/01/02/sdl_gfx-sdl2_gfx/ -SDL2_gfx: -SDL2_gfx: -SDL2_gfx: diff --git a/development/acpica/acpica.SlackBuild b/development/acpica/acpica.SlackBuild index f3ffc6d06f..6e097577c4 100644 --- a/development/acpica/acpica.SlackBuild +++ b/development/acpica/acpica.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for acpica -# Copyright 2008-2017 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2008-2018 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=acpica -VERSION=${VERSION:-20170531} +VERSION=${VERSION:-20180105} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -74,7 +74,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; cd generate/unix - CFLAGS="$SLKCFLAGS" \ + CFLAGS="$SLKCFLAGS -Wno-error=format-overflow -Wno-error=stringop-truncation" \ CXXFLAGS="$SLKCFLAGS" \ make BITS=$BITS diff --git a/development/acpica/acpica.info b/development/acpica/acpica.info index dea5cd5d50..3ac0a61986 100644 --- a/development/acpica/acpica.info +++ b/development/acpica/acpica.info @@ -1,8 +1,8 @@ PRGNAM="acpica" -VERSION="20170531" +VERSION="20180105" HOMEPAGE="http://www.acpica.org" -DOWNLOAD="https://acpica.org/sites/acpica/files/acpica-unix2-20170531.tar.gz" -MD5SUM="46c4c93435ad1d8c4eb5bacde17503b8" +DOWNLOAD="https://acpica.org/sites/acpica/files/acpica-unix2-20180105.tar.gz" +MD5SUM="5aa086f71f4b5273c0932a1e04419a37" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/android-tools/README b/development/android-tools/README index e7d793fe84..f8f0f70641 100644 --- a/development/android-tools/README +++ b/development/android-tools/README @@ -1,2 +1,2 @@ -These are the adb, fastboot, mkbootimg and make_ext4fs tools from the -android sdk. +These are the adb, fastboot, mkbootimg, mke2fs.android, e2fsdroid +and ext2simg tools from the android sdk. diff --git a/development/android-tools/android-tools.SlackBuild b/development/android-tools/android-tools.SlackBuild index 8e141f5fbd..d967c127d6 100644 --- a/development/android-tools/android-tools.SlackBuild +++ b/development/android-tools/android-tools.SlackBuild @@ -25,13 +25,13 @@ PRGNAM=android-tools -VERSION=${VERSION:-8.0.0_r24} -SRC1=core-6cd85e2a89347e0a107f59e38ece61fa19e6da78.tar.gz -SRC2=extras-af2dce5151ad478673401211dd71ae1579d2b5be.tar.gz -SRC3=selinux-be29c2550c3ff6551a56048c075a88da01b46cab.tar.gz -SRC4=f2fs-tools-b8baf1712d991541141bb0bdddd625f527e6d41f.tar.gz -SRC5=boringssl-58e449904e248f34bdfc2be7a609c58bcb0257b7.tar.gz - +VERSION=${VERSION:-9.0.0_r18} +SRC1=core-c9602275fc7dae822d22ba36c933d29f4556d6aa.tar.gz +SRC2=e2fsprogs-fecf0a211618bbed183ebf58d5bf489105bed72c.tar.gz +SRC3=extras-9d680761912ab259ffd35b05c880b9e49d800bc8.tar.gz +SRC4=f2fs-tools-d2d127499ebdfaa681df4c13a303a7d0445f1e80.tar.gz +SRC5=selinux-0d8f825909d3e600facbf23be4758877f98c2602.tar.gz +SRC6=boringssl-45210dd4e21ace9d28cb76b3f83303fcdd2efcce.tar.gz BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -73,19 +73,25 @@ cd $TMP/android-tools mkdir core tar -xvf $CWD/$SRC1 -C core +mkdir e2fsprogs +tar -xvf $CWD/$SRC2 -C e2fsprogs mkdir extras -tar -xvf $CWD/$SRC2 -C extras -mkdir selinux -tar -xvf $CWD/$SRC3 -C selinux +tar -xvf $CWD/$SRC3 -C extras mkdir f2fs-tools tar -xvf $CWD/$SRC4 -C f2fs-tools +mkdir selinux +tar -xvf $CWD/$SRC5 -C selinux mkdir boringssl -tar -xvf $CWD/$SRC5 -C boringssl +tar -xvf $CWD/$SRC6 -C boringssl +## android.googlesource.com stuff takes android-$VERSION as a tag #git clone --branch android-$VERSION --depth 1 https://android.googlesource.com/platform/system/core #git clone --branch android-$VERSION --depth 1 https://android.googlesource.com/platform/system/extras -#git clone --branch android-$VERSION --depth 1 https://android.googlesource.com/platform/external/libselinux +#git clone --branch android-$VERSION --depth 1 https://android.googlesource.com/platform/external/selinux +#git clone --branch android-$VERSION --depth 1 https://android.googlesource.com/platform/external/e2fsprogs #git clone --branch android-$VERSION --depth 1 https://android.googlesource.com/platform/external/f2fs-tools +## boringssl commit id is from https://android.googlesource.com/platform/external/boringssl/+/$VERSION/BORINGSSL_REVISION +#git clone https://boringssl.googlesource.com/boringssl # generate_build.rb borrowed from Arch Linux # And thanks to Alan Alberghini for the make_ext4fs patch. @@ -95,6 +101,10 @@ cd core patch -p1 < $CWD/fix_build_core.patch cd .. +cd e2fsprogs +patch -p1 < $CWD/fix_build_e2fsprogs.patch +cd .. + cd selinux patch -p1 < $CWD/fix_build_selinux.patch cd .. @@ -119,7 +129,11 @@ mkdir -p $PKG/usr/bin install -Dm 755 adb $PKG/usr/bin/adb install -Dm 755 fastboot $PKG/usr/bin/fastboot install -Dm 755 core/mkbootimg/mkbootimg $PKG/usr/bin/mkbootimg -install -Dm 755 make_ext4fs $PKG/usr/bin/make_ext4fs +install -Dm 755 mke2fs.android $PKG/usr/bin/mke2fs.android +install -Dm 755 e2fsdroid $PKG/usr/bin/e2fsdroid +install -Dm 755 ext2simg $PKG/usr/bin/ext2simg + +install -Dm 644 $CWD/bash_completion.fastboot $PKG/usr/share/bash-completion/completions/fastboot 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/development/android-tools/android-tools.info b/development/android-tools/android-tools.info index ba44d787e2..0be06697ab 100644 --- a/development/android-tools/android-tools.info +++ b/development/android-tools/android-tools.info @@ -1,16 +1,18 @@ PRGNAM="android-tools" -VERSION="8.0.0_r24" +VERSION="9.0.0_r18" HOMEPAGE="http://developer.android.com/sdk/" -DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/android-tools/8.0.0_r24/core-6cd85e2a89347e0a107f59e38ece61fa19e6da78.tar.gz \ - https://sourceforge.net/projects/slackbuildsdirectlinks/files/android-tools/8.0.0_r24/extras-af2dce5151ad478673401211dd71ae1579d2b5be.tar.gz \ - https://sourceforge.net/projects/slackbuildsdirectlinks/files/android-tools/8.0.0_r24/f2fs-tools-b8baf1712d991541141bb0bdddd625f527e6d41f.tar.gz \ - https://sourceforge.net/projects/slackbuildsdirectlinks/files/android-tools/8.0.0_r24/selinux-be29c2550c3ff6551a56048c075a88da01b46cab.tar.gz \ - https://sourceforge.net/projects/slackbuildsdirectlinks/files/android-tools/8.0.0_r24/boringssl-58e449904e248f34bdfc2be7a609c58bcb0257b7.tar.gz" -MD5SUM="b5b3857b5edae7305f5348e1db148b61 \ - 19bdc27835ed340fdbb4205d6af8e721 \ - 2ebe16bb82a5b24706d78d9e16d66f6e \ - 0599c72a1ff3142ad6baed8886d074a3 \ - 83ed1371eee7769f29b767c217e865e7" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/android-tools/9.0.0_r18/core-c9602275fc7dae822d22ba36c933d29f4556d6aa.tar.gz \ + http://ponce.cc/slackware/sources/repo/android-tools/9.0.0_r18/e2fsprogs-fecf0a211618bbed183ebf58d5bf489105bed72c.tar.gz \ + http://ponce.cc/slackware/sources/repo/android-tools/9.0.0_r18/extras-9d680761912ab259ffd35b05c880b9e49d800bc8.tar.gz \ + http://ponce.cc/slackware/sources/repo/android-tools/9.0.0_r18/f2fs-tools-d2d127499ebdfaa681df4c13a303a7d0445f1e80.tar.gz \ + http://ponce.cc/slackware/sources/repo/android-tools/9.0.0_r18/selinux-0d8f825909d3e600facbf23be4758877f98c2602.tar.gz \ + http://ponce.cc/slackware/sources/repo/android-tools/9.0.0_r18/boringssl-45210dd4e21ace9d28cb76b3f83303fcdd2efcce.tar.gz" +MD5SUM="8bba902ab4b5aace76e2efc34e47fe46 \ + 8f01009b219d13fce4960a9b5de2e868 \ + 44894217f0c6b8dcae77292b08e51d40 \ + 789498e1c7f5dc2851590d8e2fa05028 \ + b94232d9153df5a020419ac228153837 \ + a532caf142cb80ca418629e45cfa4b67" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gtest ninja pcre2" diff --git a/development/android-tools/bash_completion.fastboot b/development/android-tools/bash_completion.fastboot new file mode 100644 index 0000000000..bc59ee8636 --- /dev/null +++ b/development/android-tools/bash_completion.fastboot @@ -0,0 +1,90 @@ +## Bash completion for the Android SDK tools. +## +## Copyright (c) 2009 Matt Brubeck +## +## Permission is hereby granted, free of charge, to any person obtaining a copy +## of this software and associated documentation files (the "Software"), to deal +## in the Software without restriction, including without limitation the rights +## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +## copies of the Software, and to permit persons to whom the Software is +## furnished to do so, subject to the following conditions: +## +## The above copyright notice and this permission notice shall be included in +## all copies or substantial portions of the Software. +## +## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +## IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +## AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +## THE SOFTWARE. + + +function _fastboot() +{ + local cur prev opts cmds c subcommand device_selected + COMPREPLY=() + cur="${COMP_WORDS[COMP_CWORD]}" + prev="${COMP_WORDS[COMP_CWORD-1]}" + opts="-w -s -p -c -i -b -n" + cmds="update flashall flash erase getvar boot devices \ + reboot reboot-bootloader oem continue" + subcommand="" + partition_list="boot recovery system userdata bootloader radio" + device_selected="" + + # Look for the subcommand. + c=1 + while [ $c -lt $COMP_CWORD ]; do + word="${COMP_WORDS[c]}" + if [ "$word" = "-s" ]; then + device_selected=true + fi + for cmd in $cmds; do + if [ "$cmd" = "$word" ]; then + subcommand="$word" + fi + done + c=$((++c)) + done + + case "${subcommand}" in + '') + case "${prev}" in + -s) + # Use 'fastboot devices' to list serial numbers. + COMPREPLY=( $(compgen -W "$(fastboot devices|cut -f1)" -- ${cur} ) ) + return 0 + ;; + esac + case "${cur}" in + -*) + COMPREPLY=( $(compgen -W "$opts" -- ${cur}) ) + return 0 + ;; + esac + if [ -z "$device_selected" ]; then + local num_devices=$(( $(fastboot devices 2>/dev/null|wc -l) )) + if [ "$num_devices" -gt "1" ]; then + # With multiple devices, you must choose a device first. + COMPREPLY=( $(compgen -W "-s" -- ${cur}) ) + return 0 + fi + fi + COMPREPLY=( $(compgen -W "${cmds}" -- ${cur}) ) + return 0 + ;; + flash) + # partition name + COMPREPLY=( $(compgen -W "${partition_list}" -- ${cur}) ) + return 0 + ;; + erase) + # partition name + COMPREPLY=( $(compgen -W "${partition_list}" -- ${cur}) ) + return 0 + ;; + esac +} +complete -o default -F _fastboot fastboot diff --git a/development/android-tools/fix_build_core.patch b/development/android-tools/fix_build_core.patch index b67a540199..7b163633de 100644 --- a/development/android-tools/fix_build_core.patch +++ b/development/android-tools/fix_build_core.patch @@ -1,16 +1,16 @@ diff --git a/adb/client/usb_libusb.cpp b/adb/client/usb_libusb.cpp -index 7025f283c..66fad6564 100644 +index 46c3f58ec5..a0c36f0151 100644 --- a/adb/client/usb_libusb.cpp +++ b/adb/client/usb_libusb.cpp -@@ -21,6 +21,7 @@ - #include <stdint.h> +@@ -22,6 +22,7 @@ + #include <stdlib.h> #include <atomic> +#include <condition_variable> #include <chrono> + #include <condition_variable> #include <memory> - #include <mutex> -@@ -28,7 +29,7 @@ +@@ -30,7 +31,7 @@ #include <thread> #include <unordered_map> @@ -19,20 +19,32 @@ index 7025f283c..66fad6564 100644 #include <android-base/file.h> #include <android-base/logging.h> +diff --git a/adb/client/usb_linux.cpp b/adb/client/usb_linux.cpp +index 1f376a4c93..f1d6779159 100644 +--- a/adb/client/usb_linux.cpp ++++ b/adb/client/usb_linux.cpp +@@ -29,6 +29,7 @@ + #include <stdlib.h> + #include <string.h> + #include <sys/ioctl.h> ++#include <sys/sysmacros.h> + #include <sys/time.h> + #include <sys/types.h> + #include <unistd.h> diff --git a/adb/sysdeps/posix/network.cpp b/adb/sysdeps/posix/network.cpp -index 45da5af4a..516c716d9 100644 +index ecd1fd24ec..86166c0e2c 100644 --- a/adb/sysdeps/posix/network.cpp +++ b/adb/sysdeps/posix/network.cpp -@@ -16,6 +16,7 @@ +@@ -21,6 +21,7 @@ + #include <sys/socket.h> - #include "sysdeps/network.h" + #include <string> ++#include <string.h> + + #include "adb_unique_fd.h" -+#include <cstring> - #include <errno.h> - #include <netinet/in.h> - #include <sys/socket.h> diff --git a/base/errors_unix.cpp b/base/errors_unix.cpp -index 296995efe..48269b675 100644 +index 296995efe2..48269b6750 100644 --- a/base/errors_unix.cpp +++ b/base/errors_unix.cpp @@ -17,6 +17,7 @@ @@ -44,7 +56,7 @@ index 296995efe..48269b675 100644 namespace android { namespace base { diff --git a/base/file.cpp b/base/file.cpp -index 2f697a1cc..81aef5758 100644 +index 2f697a1cc1..81aef5758c 100644 --- a/base/file.cpp +++ b/base/file.cpp @@ -22,6 +22,7 @@ @@ -56,7 +68,7 @@ index 2f697a1cc..81aef5758 100644 #include <memory> #include <mutex> diff --git a/base/logging.cpp b/base/logging.cpp -index 6357b4ba7..3c7dbce13 100644 +index a31feefab2..d746cc4d78 100644 --- a/base/logging.cpp +++ b/base/logging.cpp @@ -23,6 +23,7 @@ @@ -67,15 +79,40 @@ index 6357b4ba7..3c7dbce13 100644 // For getprogname(3) or program_invocation_short_name. #if defined(__ANDROID__) || defined(__APPLE__) +diff --git a/fastboot/fs.cpp b/fastboot/fs.cpp +index c30ca1e4b3..fdc042ff36 100644 +--- a/fastboot/fs.cpp ++++ b/fastboot/fs.cpp +@@ -117,7 +117,7 @@ static int generate_ext4_image(const char* fileName, long long partSize, + static constexpr int block_size = 4096; + const std::string exec_dir = android::base::GetExecutableDirectory(); + +- const std::string mke2fs_path = exec_dir + "/mke2fs"; ++ const std::string mke2fs_path = exec_dir + "/mke2fs.android"; + std::vector<const char*> mke2fs_args = {mke2fs_path.c_str(), "-t", "ext4", "-b"}; + + std::string block_size_str = std::to_string(block_size); diff --git a/libsparse/sparse_read.cpp b/libsparse/sparse_read.cpp -index bd668735a..76cf43299 100644 +index 4379635270..ccb565bb63 100644 --- a/libsparse/sparse_read.cpp +++ b/libsparse/sparse_read.cpp -@@ -18,6 +18,7 @@ - #define _LARGEFILE64_SOURCE 1 +@@ -26,6 +26,7 @@ + #include <stdlib.h> + #include <string.h> + #include <string> ++#include <string.h> + #include <unistd.h> - #include <algorithm> -+#include <cstring> - #include <inttypes.h> - #include <fcntl.h> - #include <stdarg.h> + #include <sparse/sparse.h> +diff --git a/libziparchive/zip_archive.cc b/libziparchive/zip_archive.cc +index 5e5e7afd18..ebbc819a7a 100644 +--- a/libziparchive/zip_archive.cc ++++ b/libziparchive/zip_archive.cc +@@ -29,6 +29,7 @@ + #include <string.h> + #include <time.h> + #include <unistd.h> ++#include <string_view> + + #include <memory> + #include <vector> diff --git a/development/android-tools/fix_build_e2fsprogs.patch b/development/android-tools/fix_build_e2fsprogs.patch new file mode 100644 index 0000000000..b9fdb5eafe --- /dev/null +++ b/development/android-tools/fix_build_e2fsprogs.patch @@ -0,0 +1,83 @@ +diff --git a/contrib/android/perms.c b/contrib/android/perms.c +index d83ad35a..dca5b620 100644 +--- a/contrib/android/perms.c ++++ b/contrib/android/perms.c +@@ -5,6 +5,7 @@ + #include "support/nls-enable.h" + #include <time.h> + #include <sys/stat.h> ++#include "private/android_filesystem_capability.h" + + #ifndef XATTR_SELINUX_SUFFIX + # define XATTR_SELINUX_SUFFIX "selinux" +diff --git a/lib/ext2fs/bitops.h b/lib/ext2fs/bitops.h +index 505b3c9c..7be5105f 100644 +--- a/lib/ext2fs/bitops.h ++++ b/lib/ext2fs/bitops.h +@@ -233,11 +233,11 @@ extern errcode_t ext2fs_find_first_set_generic_bmap(ext2fs_generic_bitmap bitmap + #if (__STDC_VERSION__ >= 199901L) + #define _INLINE_ extern inline + #else +-#define _INLINE_ inline ++#define _INLINE_ static inline + #endif + #else /* !INCLUDE_INLINE FUNCS */ + #if (__STDC_VERSION__ >= 199901L) +-#define _INLINE_ inline ++#define _INLINE_ static inline + #else /* not C99 */ + #ifdef __GNUC__ + #define _INLINE_ extern __inline__ +diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h +index 470e7d7a..95a41e0d 100644 +--- a/lib/ext2fs/ext2fs.h ++++ b/lib/ext2fs/ext2fs.h +@@ -1743,7 +1743,7 @@ extern const struct ext2_inode *ext2fs_const_inode(const struct ext2_inode_large + #define _INLINE_ extern + #else + #if (__STDC_VERSION__ >= 199901L) +-#define _INLINE_ inline ++#define _INLINE_ static inline + #else + #ifdef __GNUC__ + #define _INLINE_ extern __inline__ +diff --git a/misc/create_inode.c b/misc/create_inode.c +index 1373b46b..e6f34bd9 100644 +--- a/misc/create_inode.c ++++ b/misc/create_inode.c +@@ -403,7 +403,7 @@ static ssize_t my_pread(int fd, void *buf, size_t count, off_t offset) + } + #endif /* !defined HAVE_PREAD64 && !defined HAVE_PREAD */ + +-static errcode_t copy_file_range(ext2_filsys fs, int fd, ext2_file_t e2_file, ++static errcode_t e2_copy_file_range(ext2_filsys fs, int fd, ext2_file_t e2_file, + off_t start, off_t end, char *buf, + char *zerobuf) + { +@@ -477,7 +477,7 @@ static errcode_t try_lseek_copy(ext2_filsys fs, int fd, struct stat *statbuf, + + data_blk = data & ~(fs->blocksize - 1); + hole_blk = (hole + (fs->blocksize - 1)) & ~(fs->blocksize - 1); +- err = copy_file_range(fs, fd, e2_file, data_blk, hole_blk, buf, ++ err = e2_copy_file_range(fs, fd, e2_file, data_blk, hole_blk, buf, + zerobuf); + if (err) + return err; +@@ -527,7 +527,7 @@ static errcode_t try_fiemap_copy(ext2_filsys fs, int fd, ext2_file_t e2_file, + } + for (i = 0, ext = ext_buf; i < fiemap_buf->fm_mapped_extents; + i++, ext++) { +- err = copy_file_range(fs, fd, e2_file, ext->fe_logical, ++ err = e2_copy_file_range(fs, fd, e2_file, ext->fe_logical, + ext->fe_logical + ext->fe_length, + buf, zerobuf); + if (err) +@@ -580,7 +580,7 @@ static errcode_t copy_file(ext2_filsys fs, int fd, struct stat *statbuf, + goto out; + #endif + +- err = copy_file_range(fs, fd, e2_file, 0, statbuf->st_size, buf, ++ err = e2_copy_file_range(fs, fd, e2_file, 0, statbuf->st_size, buf, + zerobuf); + out: + ext2fs_free_mem(&zerobuf); diff --git a/development/android-tools/generate_build.rb b/development/android-tools/generate_build.rb index cb3e1e685c..91f42fec0b 100644 --- a/development/android-tools/generate_build.rb +++ b/development/android-tools/generate_build.rb @@ -5,7 +5,7 @@ # This script tries to mimic Android build rules. def expand(dir, files) - files.map{|f| File.join(dir,f)} + files.map { |f| File.join(dir, f) } end # Compiles sources to *.o files. @@ -16,17 +16,17 @@ def compile(sources, cflags) ext = File.extname(s) case ext - when '.c' - cc = 'cc' - lang_flags = '-std=gnu11 $CFLAGS $CPPFLAGS' - when '.cpp', '.cc' - cc = 'cxx' - lang_flags = '-std=gnu++14 $CXXFLAGS $CPPFLAGS' + when ".c" + cc = "cc" + lang_flags = "-std=gnu11 $CFLAGS $CPPFLAGS" + when ".cpp", ".cc" + cc = "cxx" + lang_flags = "-std=gnu++17 $CXXFLAGS $CPPFLAGS" else - raise "Unknown extension #{ext}" + raise "Unknown extension #{ext}" end - output = s + '.o' + output = s + ".o" outputs << output puts "build #{output}: #{cc} #{s}\n cflags = #{lang_flags} #{cflags}" end @@ -38,24 +38,23 @@ end # lib - static library path relative to dir def subninja(dir, lib) puts "subninja #{dir}build.ninja" - return lib.each{|l| dir + l} + return lib.each { |l| dir + l } end # Links object files def link(output, objects, ldflags) - puts "build #{output}: link #{objects.join(' ')}\n ldflags = #{ldflags} $LDFLAGS" + puts "build #{output}: link #{objects.join(" ")}\n ldflags = #{ldflags} $LDFLAGS" end puts "# This set of commands generated by generate_build.rb script\n\n" -puts "CC = #{ENV['CC'] || 'clang'}" -puts "CXX = #{ENV['CXX'] || 'clang++'}\n\n" -puts "CFLAGS = #{ENV['CFLAGS']}" -puts "CXXFLAGS = #{ENV['CXXFLAGS']}" -puts "LDFLAGS = #{ENV['LDFLAGS']}" -puts "PKGVER = #{ENV['PKGVER']}\n\n" - - -puts """ +puts "CC = #{ENV["CC"] || "clang"}" +puts "CXX = #{ENV["CXX"] || "clang++"}\n\n" +puts "CFLAGS = #{ENV["CFLAGS"]}" +puts "CXXFLAGS = #{ENV["CXXFLAGS"]}" +puts "LDFLAGS = #{ENV["LDFLAGS"]}" +puts "PKGVER = #{ENV["PKGVER"]}\n\n" + +puts "" " rule cc command = $CC $cflags -c $in -o $out @@ -66,7 +65,7 @@ rule link command = $CXX $ldflags $LDFLAGS $in -o $out -""" +" "" adbdfiles = %w( adb.cpp @@ -85,7 +84,7 @@ adbdfiles = %w( adb_auth_host.cpp shell_service_protocol.cpp ) -libadbd = compile(expand('core/adb', adbdfiles), '-DADB_VERSION="\"$PKGVER\"" -DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb -Icore/libcrypto_utils/include -Iboringssl/include') +libadbd = compile(expand("core/adb", adbdfiles), '-DADB_VERSION="\"$PKGVER\"" -DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb -Icore/libcrypto_utils/include -Iboringssl/include') adbfiles = %w( console.cpp @@ -96,13 +95,13 @@ adbfiles = %w( file_sync_client.cpp sysdeps_unix.cpp sysdeps/errno.cpp - sysdeps/posix/network.cpp client/main.cpp client/usb_dispatch.cpp client/usb_linux.cpp client/usb_libusb.cpp + sysdeps/posix/network.cpp ) -libadb = compile(expand('core/adb', adbfiles), '-D_GNU_SOURCE -DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb') +libadb = compile(expand("core/adb", adbfiles), "-D_GNU_SOURCE -DADB_HOST=1 -Icore/include -Icore/base/include -Icore/adb") basefiles = %w( file.cpp @@ -113,7 +112,7 @@ basefiles = %w( errors_unix.cpp test_utils.cpp ) -libbase = compile(expand('core/base', basefiles), '-DADB_HOST=1 -Icore/base/include -Icore/include') +libbase = compile(expand("core/base", basefiles), "-DADB_HOST=1 -Icore/base/include -Icore/include") logfiles = %w( log_event_write.c @@ -129,39 +128,38 @@ logfiles = %w( stderr_write.c logprint.c ) -liblog = compile(expand('core/liblog', logfiles), '-DLIBLOG_LOG_TAG=1006 -D_XOPEN_SOURCE=700 -DFAKE_LOG_DEVICE=1 -Icore/log/include -Icore/include') +liblog = compile(expand("core/liblog", logfiles), "-DLIBLOG_LOG_TAG=1006 -D_XOPEN_SOURCE=700 -DFAKE_LOG_DEVICE=1 -Icore/log/include -Icore/include") cutilsfiles = %w( - load_file.c - canned_fs_config.c - fs_config.cpp - socket_local_client_unix.c - socket_network_client_unix.c - socket_local_server_unix.c + load_file.cpp + socket_local_client_unix.cpp + socket_network_client_unix.cpp + socket_local_server_unix.cpp sockets_unix.cpp - socket_inaddr_any_server_unix.c + socket_inaddr_any_server_unix.cpp sockets.cpp android_get_control_file.cpp - threads.c + threads.cpp + fs_config.cpp + canned_fs_config.cpp ) -libcutils = compile(expand('core/libcutils', cutilsfiles), '-D_GNU_SOURCE -Icore/include -Icore/libcutils/include') +libcutils = compile(expand("core/libcutils", cutilsfiles), "-D_GNU_SOURCE -Icore/libcutils/include -Icore/include") diagnoseusbfiles = %w( diagnose_usb.cpp ) -libdiagnoseusb = compile(expand('core/adb', diagnoseusbfiles), '-Icore/include -Icore/base/include') +libdiagnoseusb = compile(expand("core/adb", diagnoseusbfiles), "-Icore/include -Icore/base/include") libcryptofiles = %w( android_pubkey.c ) -libcrypto = compile(expand('core/libcrypto_utils', libcryptofiles), '-Icore/libcrypto_utils/include -Iboringssl/include') +libcrypto = compile(expand("core/libcrypto_utils", libcryptofiles), "-Icore/libcrypto_utils/include -Iboringssl/include") # TODO: make subninja working #boringssl = subninja('boringssl/build/', ['crypto/libcrypto.a']) -boringssl = ['boringssl/build/crypto/libcrypto.a'] - -link('adb', libbase + liblog + libcutils + libadbd + libadb + libdiagnoseusb + libcrypto + boringssl, '-lpthread -lusb-1.0') +boringssl = ["boringssl/build/crypto/libcrypto.a"] +link("adb", libbase + liblog + libcutils + libadbd + libadb + libdiagnoseusb + libcrypto + boringssl, "-lpthread -lusb-1.0") fastbootfiles = %w( protocol.cpp @@ -175,7 +173,7 @@ fastbootfiles = %w( tcp.cpp udp.cpp ) -libfastboot = compile(expand('core/fastboot', fastbootfiles), '-DFASTBOOT_VERSION="\"$PKGVER\"" -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -DUSE_F2FS -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils/include -Iextras/f2fs_utils') +libfastboot = compile(expand("core/fastboot", fastbootfiles), '-DFASTBOOT_VERSION="\"$PKGVER\"" -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -DUSE_F2FS -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg -Iextras/ext4_utils/include -Iextras/f2fs_utils -Icore/libziparchive/include -Icore/mkbootimg/include/bootimg') sparsefiles = %w( backed_block.c @@ -185,44 +183,28 @@ sparsefiles = %w( sparse_err.c sparse_read.cpp ) -libsparse = compile(expand('core/libsparse', sparsefiles), '-Icore/libsparse/include -Icore/base/include') +libsparse = compile(expand("core/libsparse", sparsefiles), "-Icore/libsparse/include -Icore/base/include") f2fsfiles = %w( - f2fs_utils.c - f2fs_ioutils.c - f2fs_dlutils.c ) -f2fs = compile(expand('extras/f2fs_utils', f2fsfiles), '-Iextras/f2fs_utils -If2fs-tools/include -If2fs-tools/mkfs -Icore/libsparse/include -Iselinux/libselinux/include') +f2fs = compile(expand("extras/f2fs_utils", f2fsfiles), "-DHAVE_LINUX_TYPES_H -If2fs-tools/include -Icore/liblog/include") zipfiles = %w( zip_archive.cc ) -libzip = compile(expand('core/libziparchive', zipfiles), '-Icore/base/include -Icore/include') +libzip = compile(expand("core/libziparchive", zipfiles), "-Icore/base/include -Icore/include -Icore/libziparchive/include") utilfiles = %w( FileMap.cpp ) -libutil = compile(expand('core/libutils', utilfiles), '-Icore/include') +libutil = compile(expand("core/libutils", utilfiles), "-Icore/include") ext4files = %w( - make_ext4fs.c - ext4fixup.c ext4_utils.c - allocate.c - contents.c - extent.c - indirect.c - sha1.c wipe.c - crc16.c ext4_sb.c ) -libext4 = compile(expand('extras/ext4_utils', ext4files), '-D_GNU_SOURCE -Icore/libsparse/include -Icore/include -Iselinux/libselinux/include -Iextras/ext4_utils/include -DANDROID -DHOST=1') - -make_ext4files = %w( - make_ext4fs_main.c -) -libmake_ext4 = compile(expand('extras/ext4_utils', make_ext4files), '-DANDROID -Icore/libsparse/include -Icore/include -Iselinux/libselinux/include -Iextras/ext4_utils/include -DHOST=1') +libext4 = compile(expand("extras/ext4_utils", ext4files), "-D_GNU_SOURCE -Icore/libsparse/include -Icore/include -Iselinux/libselinux/include -Iextras/ext4_utils/include") selinuxfiles = %w( callbacks.c @@ -250,7 +232,7 @@ selinuxfiles = %w( getenforce.c setenforce.c ) -libselinux = compile(expand('selinux/libselinux/src', selinuxfiles), '-DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -DUSE_PCRE2 -DNO_PERSISTENTLY_STORED_PATTERNS -DDISABLE_SETRANS -DDISABLE_BOOL -DNO_MEDIA_BACKEND -DNO_X_BACKEND -DNO_DB_BACKEND -DPCRE2_CODE_UNIT_WIDTH=8 -Iselinux/libselinux/include -Iselinux/libsepol/include') +libselinux = compile(expand("selinux/libselinux/src", selinuxfiles), "-DAUDITD_LOG_TAG=1003 -D_GNU_SOURCE -DHOST -DUSE_PCRE2 -DNO_PERSISTENTLY_STORED_PATTERNS -DDISABLE_SETRANS -DDISABLE_BOOL -DNO_MEDIA_BACKEND -DNO_X_BACKEND -DNO_DB_BACKEND -DPCRE2_CODE_UNIT_WIDTH=8 -Iselinux/libselinux/include -Iselinux/libsepol/include") libsepolfiles = %w( policydb_public.c @@ -277,7 +259,140 @@ libsepolfiles = %w( expand.c hierarchy.c ) -libsepol = compile(expand('selinux/libsepol/src', libsepolfiles), '-Iselinux/libsepol/include') +libsepol = compile(expand("selinux/libsepol/src", libsepolfiles), "-Iselinux/libsepol/include") + +link("fastboot", libsparse + libzip + libcutils + liblog + libutil + libbase + libext4 + f2fs + libselinux + libsepol + libfastboot + libdiagnoseusb, "-lz -lpcre2-8 -lpthread -ldl") + +# mke2fs.android - a ustom version of mke2fs that supports --android_sparse (FS#56955) +libext2fsfiles = %w( + lib/blkid/cache.c + lib/blkid/dev.c + lib/blkid/devname.c + lib/blkid/devno.c + lib/blkid/getsize.c + lib/blkid/llseek.c + lib/blkid/probe.c + lib/blkid/read.c + lib/blkid/resolve.c + lib/blkid/save.c + lib/blkid/tag.c + lib/e2p/feature.c + lib/e2p/hashstr.c + lib/e2p/mntopts.c + lib/e2p/ostype.c + lib/e2p/parse_num.c + lib/e2p/uuid.c + lib/et/com_err.c + lib/et/error_message.c + lib/et/et_name.c + lib/ext2fs/alloc.c + lib/ext2fs/alloc_sb.c + lib/ext2fs/alloc_stats.c + lib/ext2fs/alloc_tables.c + lib/ext2fs/atexit.c + lib/ext2fs/badblocks.c + lib/ext2fs/bb_inode.c + lib/ext2fs/bitmaps.c + lib/ext2fs/bitops.c + lib/ext2fs/blkmap64_ba.c + lib/ext2fs/blkmap64_rb.c + lib/ext2fs/blknum.c + lib/ext2fs/block.c + lib/ext2fs/bmap.c + lib/ext2fs/closefs.c + lib/ext2fs/crc16.c + lib/ext2fs/crc32c.c + lib/ext2fs/csum.c + lib/ext2fs/dirblock.c + lib/ext2fs/dir_iterate.c + lib/ext2fs/expanddir.c + lib/ext2fs/ext2_err.c + lib/ext2fs/ext_attr.c + lib/ext2fs/extent.c + lib/ext2fs/fallocate.c + lib/ext2fs/fileio.c + lib/ext2fs/freefs.c + lib/ext2fs/gen_bitmap64.c + lib/ext2fs/gen_bitmap.c + lib/ext2fs/get_num_dirs.c + lib/ext2fs/getsectsize.c + lib/ext2fs/getsize.c + lib/ext2fs/hashmap.c + lib/ext2fs/i_block.c + lib/ext2fs/ind_block.c + lib/ext2fs/initialize.c + lib/ext2fs/inline.c + lib/ext2fs/inline_data.c + lib/ext2fs/inode.c + lib/ext2fs/io_manager.c + lib/ext2fs/ismounted.c + lib/ext2fs/link.c + lib/ext2fs/llseek.c + lib/ext2fs/lookup.c + lib/ext2fs/mkdir.c + lib/ext2fs/mkjournal.c + lib/ext2fs/mmp.c + lib/ext2fs/namei.c + lib/ext2fs/newdir.c + lib/ext2fs/openfs.c + lib/ext2fs/progress.c + lib/ext2fs/punch.c + lib/ext2fs/rbtree.c + lib/ext2fs/read_bb.c + lib/ext2fs/read_bb_file.c + lib/ext2fs/res_gdt.c + lib/ext2fs/rw_bitmaps.c + lib/ext2fs/sha512.c + lib/ext2fs/sparse_io.c + lib/ext2fs/symlink.c + lib/ext2fs/undo_io.c + lib/ext2fs/unix_io.c + lib/ext2fs/valid_blk.c + lib/support/dict.c + lib/support/mkquota.c + lib/support/parse_qtype.c + lib/support/plausible.c + lib/support/prof_err.c + lib/support/profile.c + lib/support/quotaio.c + lib/support/quotaio_tree.c + lib/support/quotaio_v2.c + lib/uuid/gen_uuid.c + lib/uuid/isnull.c + lib/uuid/pack.c + lib/uuid/parse.c + lib/uuid/unpack.c + lib/uuid/unparse.c + misc/create_inode.c +) +libext2fs = compile(expand("e2fsprogs", libext2fsfiles), "-Ie2fsprogs/lib -Ie2fsprogs/lib/ext2fs -Icore/libsparse/include") + +mke2fsfiles = %w( + misc/default_profile.c + misc/mke2fs.c + misc/mk_hugefiles.c + misc/util.c +) +mke2fs = compile(expand("e2fsprogs", mke2fsfiles), "-Ie2fsprogs/lib") + +link("mke2fs.android", mke2fs + libext2fs + libsparse + libbase + libzip + liblog + libutil, "-lpthread -lz") + +e2fsdroidfiles = %w( + contrib/android/e2fsdroid.c + contrib/android/basefs_allocator.c + contrib/android/block_range.c + contrib/android/base_fs.c + contrib/android/fsmap.c + contrib/android/block_list.c + contrib/android/perms.c +) +e2fsdroid = compile(expand("e2fsprogs", e2fsdroidfiles), "-Ie2fsprogs/lib -Ie2fsprogs/lib/ext2fs -Iselinux/libselinux/include -Icore/libcutils/include -Ie2fsprogs/misc") + +link("e2fsdroid", e2fsdroid + libext2fs + libsparse + libbase + libzip + liblog + libutil + libselinux + libsepol + libcutils, "-lz -lpthread -lpcre2-8") + +ext2simgfiles = %w( + contrib/android/ext2simg.c +) +ext2simg = compile(expand("e2fsprogs", ext2simgfiles), "-Ie2fsprogs/lib -Icore/libsparse/include") -link('fastboot', libsparse + libzip + libcutils + liblog + libutil + libbase + libext4 + f2fs + libselinux + libsepol + libfastboot + libdiagnoseusb, '-lz -lpcre2-8 -lpthread -ldl') -link('make_ext4fs', libmake_ext4 + libzip + libcutils + liblog + libutil + libbase + libext4 + libselinux + libsepol + libsparse, '-lz -lpcre2-8 -lpthread') +link("ext2simg", ext2simg + libext2fs + libsparse + libbase + libzip + liblog + libutil, "-lz -lpthread") diff --git a/development/anjuta/anjuta.SlackBuild b/development/anjuta/anjuta.SlackBuild index f9944de6a4..6ad50aec7b 100644 --- a/development/anjuta/anjuta.SlackBuild +++ b/development/anjuta/anjuta.SlackBuild @@ -69,7 +69,7 @@ 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" \ +CFLAGS="$SLKCFLAGS -Wno-error=format-nonliteral -Wno-error=format-y2k" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/development/apache-log4cxx/apache-log4cxx.SlackBuild b/development/apache-log4cxx/apache-log4cxx.SlackBuild index 8e1adafefb..a0971e9701 100644 --- a/development/apache-log4cxx/apache-log4cxx.SlackBuild +++ b/development/apache-log4cxx/apache-log4cxx.SlackBuild @@ -70,6 +70,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; zcat $CWD/fixincludes.patch.gz | patch -p1 || exit +zcat $CWD/narrowing-fixes.patch.gz | patch -p1 || exit CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/development/apache-log4cxx/narrowing-fixes.patch.gz b/development/apache-log4cxx/narrowing-fixes.patch.gz Binary files differnew file mode 100644 index 0000000000..cd79cc6971 --- /dev/null +++ b/development/apache-log4cxx/narrowing-fixes.patch.gz diff --git a/development/autogen/autogen.SlackBuild b/development/autogen/autogen.SlackBuild index 8318ecd660..3fdb23b320 100644 --- a/development/autogen/autogen.SlackBuild +++ b/development/autogen/autogen.SlackBuild @@ -70,7 +70,11 @@ 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" \ +# Patched for guile 2.2.x +patch -p1 < $CWD/guile-2.2.patch + +autoreconf +CFLAGS="$SLKCFLAGS -Wno-error=implicit-fallthrough -Wno-error=format-overflow" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -81,6 +85,7 @@ CXXFLAGS="$SLKCFLAGS" \ --infodir=/usr/info \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --enable-static=no \ + --disable-dependency-tracking \ --build=$ARCH-slackware-linux make diff --git a/development/autogen/guile-2.2.patch b/development/autogen/guile-2.2.patch new file mode 100644 index 0000000000..b3d50f4b79 --- /dev/null +++ b/development/autogen/guile-2.2.patch @@ -0,0 +1,78 @@ +diff --git a/agen5/guile-iface.h b/agen5/guile-iface.h +index 0aeabb0..6ce3520 100644 +--- a/agen5/guile-iface.h ++++ b/agen5/guile-iface.h +@@ -9,7 +9,7 @@ + # error AutoGen does not work with this version of Guile + choke me. + +-#elif GUILE_VERSION < 201000 ++#else + # define AG_SCM_IS_PROC(_p) scm_is_true( scm_procedure_p(_p)) + # define AG_SCM_LIST_P(_l) scm_is_true( scm_list_p(_l)) + # define AG_SCM_PAIR_P(_p) scm_is_true( scm_pair_p(_p)) +@@ -24,9 +24,6 @@ + # define AG_SCM_TO_ULONG(_v) ((unsigned long)scm_to_ulong(_v)) + # define AG_SCM_VEC_P(_v) scm_is_vector(_v) + +-#else +-# error unknown GUILE_VERSION +- choke me. + #endif + + #endif /* MUTATING_GUILE_IFACE_H_GUARD */ +diff --git a/configure b/configure +index befe20b..c4254eb 100755 +--- a/configure ++++ b/configure +@@ -14191,7 +14191,7 @@ $as_echo "no" >&6; } + PKG_CONFIG="" + fi + fi +- _guile_versions_to_search="2.0 1.8" ++ _guile_versions_to_search="2.2 2.0 1.8" + if test -n "$GUILE_EFFECTIVE_VERSION"; then + _guile_tmp="" + for v in $_guile_versions_to_search; do + +diff --git a/agen5/guile-iface.h b/agen5/guile-iface.h +index 0aeabb0..6ce3520 100644 +--- autogen-5.18.12/config/guile-orig.m4 2017-11-21 15:23:45.047606700 -0500 ++++ autogen-5.18.12/config/guile.m4 2017-11-21 15:24:20.414686700 -0500 +@@ -47,7 +47,7 @@ + # for an available version of Guile. + # + # By default, this macro will search for the latest stable version of +-# Guile (e.g. 2.0), falling back to the previous stable version ++# Guile (e.g. 2.2), falling back to the previous stable version + # (e.g. 1.8) if it is available. If no guile-@var{VERSION}.pc file is + # found, an error is signalled. The found version is stored in + # @var{GUILE_EFFECTIVE_VERSION}. +@@ -61,7 +61,7 @@ + # + AC_DEFUN([GUILE_PKG], + [PKG_PROG_PKG_CONFIG +- _guile_versions_to_search="m4_default([$1], [2.0 1.8])" ++ _guile_versions_to_search="m4_default([$1], [2.2 1.8])" + if test -n "$GUILE_EFFECTIVE_VERSION"; then + _guile_tmp="" + for v in $_guile_versions_to_search; do +@@ -184,7 +184,7 @@ + # If @code{guile} is not found, signal an error. + # + # By default, this macro will search for the latest stable version of +-# Guile (e.g. 2.0). x.y or x.y.z versions can be specified. If an older ++# Guile (e.g. 2.2). x.y or x.y.z versions can be specified. If an older + # version is found, the macro will signal an error. + # + # The effective version of the found @code{guile} is set to +@@ -201,7 +201,7 @@ + [AC_PATH_PROG(GUILE,guile) + _guile_required_version="m4_default([$1], [$GUILE_EFFECTIVE_VERSION])" + if test -z "$_guile_required_version"; then +- _guile_required_version=2.0 ++ _guile_required_version=2.2 + fi + if test "$GUILE" = "" ; then + AC_MSG_ERROR([guile required but not found]) + diff --git a/development/avr-binutils/avr-binutils.SlackBuild b/development/avr-binutils/avr-binutils.SlackBuild index 3b31a96b3f..a3b68d60ec 100644 --- a/development/avr-binutils/avr-binutils.SlackBuild +++ b/development/avr-binutils/avr-binutils.SlackBuild @@ -9,13 +9,13 @@ # This file is placed in the public domain. PRGNAM=avr-binutils -VERSION=${VERSION:-2.25} +VERSION=${VERSION:-2.31} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -26,8 +26,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -50,10 +50,10 @@ tar xvf $CWD/binutils-$VERSION.tar.bz2 cd binutils-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -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 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # Apply patch for AVR specific output of 'size' (avr-size) patch -p0 < $CWD/avr-size.patch @@ -95,7 +95,7 @@ rm -f $PKG/usr/man/man1/avr-dlltool.1 rm -f $PKG/usr/man/man1/avr-nlmconv.1 rm -f $PKG/usr/man/man1/avr-windres.1 -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +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 find $PKG/usr/man -type f -exec gzip -9 {} \; diff --git a/development/avr-binutils/avr-binutils.info b/development/avr-binutils/avr-binutils.info index 6b640d3296..9d5458e879 100644 --- a/development/avr-binutils/avr-binutils.info +++ b/development/avr-binutils/avr-binutils.info @@ -1,8 +1,8 @@ PRGNAM="avr-binutils" -VERSION="2.25" +VERSION="2.31" HOMEPAGE="http://www.gnu.org/software/binutils" -DOWNLOAD="http://ftp.gnu.org/gnu/binutils/binutils-2.25.tar.bz2" -MD5SUM="d9f3303f802a5b6b0bb73a335ab89d66" +DOWNLOAD="http://ftp.gnu.org/gnu/binutils/binutils-2.31.tar.bz2" +MD5SUM="50a489aa6d4b8630b7b89b2de6b185be" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/avr-binutils/avr-size.patch b/development/avr-binutils/avr-size.patch index 2e01c3d31f..b36f3d6d08 100644 --- a/development/avr-binutils/avr-size.patch +++ b/development/avr-binutils/avr-size.patch @@ -1,8 +1,10 @@ -AVR specific only --------------------------------------------------------------------------------- +AVR only; support -C for AVR memory usage + +Source: http://git.makehackvoid.com/cgi-bin/gitweb.cgi?p=mhvavrtools.git;a=blob_plain;f=mhvavrtools/patches/binutils-001-avr-size.patch;h=e80d28eae46217551d996a2253256c97d10aa4b5;hb=refs/heads/master +=========================================================== --- binutils/size.c 2007-08-06 13:56:14.000000000 -0600 +++ binutils/size.c 2007-09-13 09:13:10.281250000 -0600 -@@ -35,10 +35,31 @@ +@@ -36,10 +36,31 @@ #include "getopt.h" #include "bucomm.h" @@ -36,7 +38,7 @@ AVR specific only /* Program options. */ static enum -@@ -47,9 +68,8 @@ static enum +@@ -48,9 +69,8 @@ static enum } radix = decimal; @@ -47,7 +49,7 @@ AVR specific only static int show_version = 0; static int show_help = 0; static int show_totals = 0; -@@ -63,6 +83,157 @@ static bfd_size_type total_textsize; +@@ -64,6 +84,246 @@ static bfd_size_type total_textsize; /* Program exit status. */ static int return_code = 0; @@ -63,12 +65,18 @@ AVR specific only +#define AVR4K 4096UL +#define AVR8K 8192UL +#define AVR16K 16384UL ++#define AVR20K 20480UL +#define AVR24K 24576UL +#define AVR32K 32768UL ++#define AVR36K 36864UL +#define AVR40K 40960UL +#define AVR64K 65536UL ++#define AVR68K 69632UL +#define AVR128K 131072UL ++#define AVR136K 139264UL ++#define AVR200K 204800UL +#define AVR256K 262144UL ++#define AVR264K 270336UL + +typedef struct +{ @@ -80,123 +88,206 @@ AVR specific only + +avr_device_t avr[] = +{ -+ {"atmega2560", AVR256K, AVR8K, AVR4K}, -+ {"atmega2561", AVR256K, AVR8K, AVR4K}, -+ -+ {"at43usb320", AVR128K, 608UL, 0}, -+ {"at90can128", AVR128K, AVR4K, AVR4K}, -+ {"at90usb1286", AVR128K, AVR8K, AVR4K}, -+ {"at90usb1287", AVR128K, AVR8K, AVR4K}, -+ {"atmega128", AVR128K, AVR4K, AVR4K}, -+ {"atmega1280", AVR128K, AVR8K, AVR4K}, -+ {"atmega1281", AVR128K, AVR8K, AVR4K}, -+ {"atmega1284P", AVR128K, AVR16K, AVR4K}, -+ {"atmega103", AVR128K, 4000UL, AVR4K}, -+ {"atxmega128a1",AVR128K, AVR8K, AVR2K}, -+ -+ {"at90can64", AVR64K, AVR4K, AVR2K}, -+ {"at90usb646", AVR64K, AVR4K, AVR2K}, -+ {"at90usb647", AVR64K, AVR4K, AVR2K}, -+ {"atmega64", AVR64K, AVR4K, AVR2K}, -+ {"atmega640", AVR64K, AVR8K, AVR4K}, -+ {"atmega644", AVR64K, AVR4K, AVR2K}, -+ {"atmega644p", AVR64K, AVR4K, AVR2K}, -+ {"atmega645", AVR64K, AVR4K, AVR2K}, -+ {"atmega6450", AVR64K, AVR4K, AVR2K}, -+ {"atmega649", AVR64K, AVR4K, AVR2K}, -+ {"atmega6490", AVR64K, AVR4K, AVR2K}, -+ {"atxmega64a1", AVR64K, AVR4K, AVR2K}, -+ -+ {"atmega406", AVR40K, AVR512, AVR2K}, -+ -+ {"at90can32", AVR32K, AVR2K, AVR1K}, -+ {"at94k", AVR32K, AVR4K, 0}, -+ {"atmega32", AVR32K, AVR2K, AVR1K}, -+ {"atmega323", AVR32K, AVR2K, AVR1K}, -+ {"atmega324p", AVR32K, AVR2K, AVR1K}, -+ {"atmega325", AVR32K, AVR2K, AVR1K}, -+ {"atmega325p", AVR32K, AVR2K, AVR1K}, -+ {"atmega3250", AVR32K, AVR2K, AVR1K}, -+ {"atmega3250p", AVR32K, AVR2K, AVR1K}, -+ {"atmega328p", AVR32K, AVR2K, AVR1K}, -+ {"atmega329", AVR32K, AVR2K, AVR1K}, -+ {"atmega329p", AVR32K, AVR2K, AVR1K}, -+ {"atmega3290", AVR32K, AVR2K, AVR1K}, -+ {"atmega3290p", AVR32K, AVR2K, AVR1K}, -+ {"atmega32hvb", AVR32K, AVR2K, AVR1K}, -+ {"atmega32c1", AVR32K, AVR2K, AVR1K}, -+ {"atmega32m1", AVR32K, AVR2K, AVR1K}, -+ {"atmega32u4", AVR32K, 2560UL, AVR1K}, -+ -+ {"at43usb355", AVR24K, 1120, 0}, -+ -+ {"at76c711", AVR16K, AVR2K, 0}, -+ {"at90pwm216", AVR16K, AVR1K, AVR512}, -+ {"at90pwm316", AVR16K, AVR1K, AVR512}, -+ {"at90usb162", AVR16K, AVR512, AVR512}, -+ {"atmega16", AVR16K, AVR1K, AVR512}, -+ {"atmega161", AVR16K, AVR1K, AVR512}, -+ {"atmega162", AVR16K, AVR1K, AVR512}, -+ {"atmega163", AVR16K, AVR1K, AVR512}, -+ {"atmega164", AVR16K, AVR1K, AVR512}, -+ {"atmega164p", AVR16K, AVR1K, AVR512}, -+ {"atmega165", AVR16K, AVR1K, AVR512}, -+ {"atmega165p", AVR16K, AVR1K, AVR512}, -+ {"atmega168", AVR16K, AVR1K, AVR512}, -+ {"atmega168p", AVR16K, AVR1K, AVR512}, -+ {"atmega169", AVR16K, AVR1K, AVR512}, -+ {"atmega169p", AVR16K, AVR1K, AVR512}, -+ {"attiny167", AVR16K, AVR512, AVR512}, -+ {"atxmega16d4", AVR16K, AVR2K, AVR1K}, -+ -+ {"at90c8534", AVR8K, 352, AVR512}, -+ {"at90pwm1", AVR8K, AVR512, AVR512}, -+ {"at90pwm2", AVR8K, AVR512, AVR512}, -+ {"at90pwm2b", AVR8K, AVR512, AVR512}, -+ {"at90pwm3", AVR8K, AVR512, AVR512}, -+ {"at90pwm3b", AVR8K, AVR512, AVR512}, -+ {"at90s8515", AVR8K, AVR512, AVR512}, -+ {"at90s8535", AVR8K, AVR512, AVR512}, -+ {"at90usb82", AVR8K, AVR512, AVR512}, -+ {"atmega8", AVR8K, AVR1K, AVR512}, -+ {"atmega8515", AVR8K, AVR512, AVR512}, -+ {"atmega8535", AVR8K, AVR512, AVR512}, -+ {"atmega88", AVR8K, AVR1K, AVR512}, -+ {"atmega88p", AVR8K, AVR1K, AVR512}, -+ {"attiny84", AVR8K, AVR512, AVR512}, -+ {"attiny85", AVR8K, AVR512, AVR512}, -+ {"attiny861", AVR8K, AVR512, AVR512}, -+ {"attiny88", AVR8K, AVR256, AVR64}, -+ -+ {"at90s4414", AVR4K, 352, AVR256}, -+ {"at90s4433", AVR4K, AVR128, AVR256}, -+ {"at90s4434", AVR4K, 352, AVR256}, -+ {"atmega48", AVR4K, AVR512, AVR256}, -+ {"atmega48p", AVR4K, AVR512, AVR256}, -+ {"attiny43u", AVR4K, AVR256, AVR64}, -+ {"attiny44", AVR4K, AVR256, AVR256}, -+ {"attiny45", AVR4K, AVR256, AVR256}, -+ {"attiny461", AVR4K, AVR256, AVR256}, -+ {"attiny48", AVR4K, AVR256, AVR64}, -+ -+ {"at86rf401", AVR2K, 224, AVR128}, -+ {"at90s2313", AVR2K, AVR128, AVR128}, -+ {"at90s2323", AVR2K, AVR128, AVR128}, -+ {"at90s2333", AVR2K, 224, AVR128}, -+ {"at90s2343", AVR2K, AVR128, AVR128}, -+ {"attiny22", AVR2K, 224, AVR128}, -+ {"attiny2313", AVR2K, AVR128, AVR128}, -+ {"attiny24", AVR2K, AVR128, AVR128}, -+ {"attiny25", AVR2K, AVR128, AVR128}, -+ {"attiny26", AVR2K, AVR128, AVR128}, -+ {"attiny261", AVR2K, AVR128, AVR128}, -+ {"attiny28", AVR2K, 0, 0}, -+ -+ {"at90s1200", AVR1K, 0, AVR64}, -+ {"attiny11", AVR1K, 0, AVR64}, -+ {"attiny12", AVR1K, 0, AVR64}, -+ {"attiny13", AVR1K, AVR64, AVR64}, -+ {"attiny15", AVR1K, 0, AVR64}, ++ {"atxmega256a3", AVR264K, AVR16K, AVR4K}, ++ {"atxmega256a3b", AVR264K, AVR16K, AVR4K}, ++ {"atxmega256d3", AVR264K, AVR16K, AVR4K}, ++ ++ {"atmega2560", AVR256K, AVR8K, AVR4K}, ++ {"atmega2561", AVR256K, AVR8K, AVR4K}, ++ ++ {"atxmega192a3", AVR200K, AVR16K, AVR2K}, ++ {"atxmega192d3", AVR200K, AVR16K, AVR2K}, ++ ++ {"atxmega128a1", AVR136K, AVR8K, AVR2K}, ++ {"atxmega128a1u", AVR136K, AVR8K, AVR2K}, ++ {"atxmega128a3", AVR136K, AVR8K, AVR2K}, ++ {"atxmega128d3", AVR136K, AVR8K, AVR2K}, ++ ++ {"at43usb320", AVR128K, 608UL, 0UL}, ++ {"at90can128", AVR128K, AVR4K, AVR4K}, ++ {"at90usb1286", AVR128K, AVR8K, AVR4K}, ++ {"at90usb1287", AVR128K, AVR8K, AVR4K}, ++ {"atmega128", AVR128K, AVR4K, AVR4K}, ++ {"atmega1280", AVR128K, AVR8K, AVR4K}, ++ {"atmega1281", AVR128K, AVR8K, AVR4K}, ++ {"atmega1284p", AVR128K, AVR16K, AVR4K}, ++ {"atmega128rfa1", AVR128K, AVR16K, AVR4K}, ++ {"atmega103", AVR128K, 4000UL, AVR4K}, ++ ++ {"atxmega64a1", AVR68K, AVR4K, AVR2K}, ++ {"atxmega64a1u", AVR68K, AVR4K, AVR2K}, ++ {"atxmega64a3", AVR68K, AVR4K, AVR2K}, ++ {"atxmega64d3", AVR68K, AVR4K, AVR2K}, ++ ++ {"at90can64", AVR64K, AVR4K, AVR2K}, ++ {"at90scr100", AVR64K, AVR4K, AVR2K}, ++ {"at90usb646", AVR64K, AVR4K, AVR2K}, ++ {"at90usb647", AVR64K, AVR4K, AVR2K}, ++ {"atmega64", AVR64K, AVR4K, AVR2K}, ++ {"atmega640", AVR64K, AVR8K, AVR4K}, ++ {"atmega644", AVR64K, AVR4K, AVR2K}, ++ {"atmega644a", AVR64K, AVR4K, AVR2K}, ++ {"atmega644p", AVR64K, AVR4K, AVR2K}, ++ {"atmega644pa", AVR64K, AVR4K, AVR2K}, ++ {"atmega645", AVR64K, AVR4K, AVR2K}, ++ {"atmega645a", AVR64K, AVR4K, AVR2K}, ++ {"atmega645p", AVR64K, AVR4K, AVR2K}, ++ {"atmega6450", AVR64K, AVR4K, AVR2K}, ++ {"atmega6450a", AVR64K, AVR4K, AVR2K}, ++ {"atmega6450p", AVR64K, AVR4K, AVR2K}, ++ {"atmega649", AVR64K, AVR4K, AVR2K}, ++ {"atmega649a", AVR64K, AVR4K, AVR2K}, ++ {"atmega649p", AVR64K, AVR4K, AVR2K}, ++ {"atmega6490", AVR64K, AVR4K, AVR2K}, ++ {"atmega6490a", AVR64K, AVR4K, AVR2K}, ++ {"atmega6490p", AVR64K, AVR4K, AVR2K}, ++ {"atmega64c1", AVR64K, AVR4K, AVR2K}, ++ {"atmega64hve", AVR64K, AVR4K, AVR1K}, ++ {"atmega64m1", AVR64K, AVR4K, AVR2K}, ++ {"m3000", AVR64K, AVR4K, 0UL}, ++ ++ {"atmega406", AVR40K, AVR2K, AVR512}, ++ ++ {"atxmega32a4", AVR36K, AVR4K, AVR1K}, ++ {"atxmega32d4", AVR36K, AVR4K, AVR1K}, ++ ++ {"at90can32", AVR32K, AVR2K, AVR1K}, ++ {"at94k", AVR32K, AVR4K, 0UL}, ++ {"atmega32", AVR32K, AVR2K, AVR1K}, ++ {"atmega323", AVR32K, AVR2K, AVR1K}, ++ {"atmega324a", AVR32K, AVR2K, AVR1K}, ++ {"atmega324p", AVR32K, AVR2K, AVR1K}, ++ {"atmega324pa", AVR32K, AVR2K, AVR1K}, ++ {"atmega325", AVR32K, AVR2K, AVR1K}, ++ {"atmega325a", AVR32K, AVR2K, AVR1K}, ++ {"atmega325p", AVR32K, AVR2K, AVR1K}, ++ {"atmega3250", AVR32K, AVR2K, AVR1K}, ++ {"atmega3250a", AVR32K, AVR2K, AVR1K}, ++ {"atmega3250p", AVR32K, AVR2K, AVR1K}, ++ {"atmega328", AVR32K, AVR2K, AVR1K}, ++ {"atmega328p", AVR32K, AVR2K, AVR1K}, ++ {"atmega329", AVR32K, AVR2K, AVR1K}, ++ {"atmega329a", AVR32K, AVR2K, AVR1K}, ++ {"atmega329p", AVR32K, AVR2K, AVR1K}, ++ {"atmega329pa", AVR32K, AVR2K, AVR1K}, ++ {"atmega3290", AVR32K, AVR2K, AVR1K}, ++ {"atmega3290a", AVR32K, AVR2K, AVR1K}, ++ {"atmega3290p", AVR32K, AVR2K, AVR1K}, ++ {"atmega32hvb", AVR32K, AVR2K, AVR1K}, ++ {"atmega32c1", AVR32K, AVR2K, AVR1K}, ++ {"atmega32hvb", AVR32K, AVR2K, AVR1K}, ++ {"atmega32m1", AVR32K, AVR2K, AVR1K}, ++ {"atmega32u2", AVR32K, AVR1K, AVR1K}, ++ {"atmega32u4", AVR32K, 2560UL, AVR1K}, ++ {"atmega32u6", AVR32K, 2560UL, AVR1K}, ++ ++ {"at43usb355", AVR24K, 1120UL, 0UL}, ++ ++ {"atxmega16a4", AVR20K, AVR2K, AVR1K}, ++ {"atxmega16d4", AVR20K, AVR2K, AVR1K}, ++ ++ {"at76c711", AVR16K, AVR2K, 0UL}, ++ {"at90pwm216", AVR16K, AVR1K, AVR512}, ++ {"at90pwm316", AVR16K, AVR1K, AVR512}, ++ {"at90usb162", AVR16K, AVR512, AVR512}, ++ {"atmega16", AVR16K, AVR1K, AVR512}, ++ {"atmega16a", AVR16K, AVR1K, AVR512}, ++ {"atmega161", AVR16K, AVR1K, AVR512}, ++ {"atmega162", AVR16K, AVR1K, AVR512}, ++ {"atmega163", AVR16K, AVR1K, AVR512}, ++ {"atmega164", AVR16K, AVR1K, AVR512}, ++ {"atmega164a", AVR16K, AVR1K, AVR512}, ++ {"atmega164p", AVR16K, AVR1K, AVR512}, ++ {"atmega165a", AVR16K, AVR1K, AVR512}, ++ {"atmega165", AVR16K, AVR1K, AVR512}, ++ {"atmega165p", AVR16K, AVR1K, AVR512}, ++ {"atmega168", AVR16K, AVR1K, AVR512}, ++ {"atmega168a", AVR16K, AVR1K, AVR512}, ++ {"atmega168p", AVR16K, AVR1K, AVR512}, ++ {"atmega169", AVR16K, AVR1K, AVR512}, ++ {"atmega169a", AVR16K, AVR1K, AVR512}, ++ {"atmega169p", AVR16K, AVR1K, AVR512}, ++ {"atmega169pa", AVR16K, AVR1K, AVR512}, ++ {"atmega16hva", AVR16K, 768UL, AVR256}, ++ {"atmega16hva2", AVR16K, AVR1K, AVR256}, ++ {"atmega16hvb", AVR16K, AVR1K, AVR512}, ++ {"atmega16m1", AVR16K, AVR1K, AVR512}, ++ {"atmega16u2", AVR16K, AVR512, AVR512}, ++ {"atmega16u4", AVR16K, 1280UL, AVR512}, ++ {"attiny167", AVR16K, AVR512, AVR512}, ++ ++ {"at90c8534", AVR8K, 352UL, AVR512}, ++ {"at90pwm1", AVR8K, AVR512, AVR512}, ++ {"at90pwm2", AVR8K, AVR512, AVR512}, ++ {"at90pwm2b", AVR8K, AVR512, AVR512}, ++ {"at90pwm3", AVR8K, AVR512, AVR512}, ++ {"at90pwm3b", AVR8K, AVR512, AVR512}, ++ {"at90pwm81", AVR8K, AVR256, AVR512}, ++ {"at90s8515", AVR8K, AVR512, AVR512}, ++ {"at90s8535", AVR8K, AVR512, AVR512}, ++ {"at90usb82", AVR8K, AVR512, AVR512}, ++ {"ata6289", AVR8K, AVR512, 320UL}, ++ {"atmega8", AVR8K, AVR1K, AVR512}, ++ {"atmega8515", AVR8K, AVR512, AVR512}, ++ {"atmega8535", AVR8K, AVR512, AVR512}, ++ {"atmega88", AVR8K, AVR1K, AVR512}, ++ {"atmega88a", AVR8K, AVR1K, AVR512}, ++ {"atmega88p", AVR8K, AVR1K, AVR512}, ++ {"atmega88pa", AVR8K, AVR1K, AVR512}, ++ {"atmega8hva", AVR8K, 768UL, AVR256}, ++ {"atmega8u2", AVR8K, AVR512, AVR512}, ++ {"attiny84", AVR8K, AVR512, AVR512}, ++ {"attiny84a", AVR8K, AVR512, AVR512}, ++ {"attiny85", AVR8K, AVR512, AVR512}, ++ {"attiny861", AVR8K, AVR512, AVR512}, ++ {"attiny861a", AVR8K, AVR512, AVR512}, ++ {"attiny87", AVR8K, AVR512, AVR512}, ++ {"attiny88", AVR8K, AVR512, AVR64}, ++ ++ {"at90s4414", AVR4K, 352UL, AVR256}, ++ {"at90s4433", AVR4K, AVR128, AVR256}, ++ {"at90s4434", AVR4K, 352UL, AVR256}, ++ {"atmega48", AVR4K, AVR512, AVR256}, ++ {"atmega48a", AVR4K, AVR512, AVR256}, ++ {"atmega48p", AVR4K, AVR512, AVR256}, ++ {"attiny4313", AVR4K, AVR256, AVR256}, ++ {"attiny43u", AVR4K, AVR256, AVR64}, ++ {"attiny44", AVR4K, AVR256, AVR256}, ++ {"attiny44a", AVR4K, AVR256, AVR256}, ++ {"attiny45", AVR4K, AVR256, AVR256}, ++ {"attiny461", AVR4K, AVR256, AVR256}, ++ {"attiny461a", AVR4K, AVR256, AVR256}, ++ {"attiny48", AVR4K, AVR256, AVR64}, ++ ++ {"at86rf401", AVR2K, 224UL, AVR128}, ++ {"at90s2313", AVR2K, AVR128, AVR128}, ++ {"at90s2323", AVR2K, AVR128, AVR128}, ++ {"at90s2333", AVR2K, 224UL, AVR128}, ++ {"at90s2343", AVR2K, AVR128, AVR128}, ++ {"attiny20", AVR2K, AVR128, 0UL}, ++ {"attiny22", AVR2K, 224UL, AVR128}, ++ {"attiny2313", AVR2K, AVR128, AVR128}, ++ {"attiny2313a", AVR2K, AVR128, AVR128}, ++ {"attiny24", AVR2K, AVR128, AVR128}, ++ {"attiny24a", AVR2K, AVR128, AVR128}, ++ {"attiny25", AVR2K, AVR128, AVR128}, ++ {"attiny26", AVR2K, AVR128, AVR128}, ++ {"attiny261", AVR2K, AVR128, AVR128}, ++ {"attiny261a", AVR2K, AVR128, AVR128}, ++ {"attiny28", AVR2K, 0UL, 0UL}, ++ {"attiny40", AVR2K, AVR256, 0UL}, ++ ++ {"at90s1200", AVR1K, 0UL, AVR64}, ++ {"attiny9", AVR1K, 32UL, 0UL}, ++ {"attiny10", AVR1K, 32UL, 0UL}, ++ {"attiny11", AVR1K, 0UL, AVR64}, ++ {"attiny12", AVR1K, 0UL, AVR64}, ++ {"attiny13", AVR1K, AVR64, AVR64}, ++ {"attiny13a", AVR1K, AVR64, AVR64}, ++ {"attiny15", AVR1K, 0UL, AVR64}, ++ ++ {"attiny4", AVR512, 32UL, 0UL}, ++ {"attiny5", AVR512, 32UL, 0UL}, +}; + +static char *avrmcu = NULL; @@ -205,7 +296,7 @@ AVR specific only static char *target = NULL; /* Forward declarations. */ -@@ -78,7 +240,8 @@ usage (FILE *stream, int status) +@@ -79,7 +337,8 @@ usage (FILE *stream, int status) fprintf (stream, _(" Displays the sizes of sections inside binary files\n")); fprintf (stream, _(" If no input file(s) are specified, a.out is assumed\n")); fprintf (stream, _(" The options are:\n\ @@ -215,7 +306,7 @@ AVR specific only -o|-d|-x --radix={8|10|16} Display numbers in octal, decimal or hex\n\ -t --totals Display the total sizes (Berkeley only)\n\ --common Display total size for *COM* syms\n\ -@@ -87,11 +250,7 @@ usage (FILE *stream, int status) +@@ -88,11 +337,7 @@ usage (FILE *stream, int status) -h --help Display this information\n\ -v --version Display the program's version\n\ \n"), @@ -228,7 +319,7 @@ AVR specific only ); list_supported_targets (program_name, stream); if (REPORT_BUGS_TO[0] && status == 0) -@@ -102,6 +261,7 @@ usage (FILE *stream, int status) +@@ -103,6 +359,7 @@ usage (FILE *stream, int status) #define OPTION_FORMAT (200) #define OPTION_RADIX (OPTION_FORMAT + 1) #define OPTION_TARGET (OPTION_RADIX + 1) @@ -236,7 +327,7 @@ AVR specific only static struct option long_options[] = { -@@ -109,6 +269,7 @@ static struct option long_options[] = +@@ -110,6 +368,7 @@ static struct option long_options[] = {"format", required_argument, 0, OPTION_FORMAT}, {"radix", required_argument, 0, OPTION_RADIX}, {"target", required_argument, 0, OPTION_TARGET}, @@ -244,7 +335,7 @@ AVR specific only {"totals", no_argument, &show_totals, 1}, {"version", no_argument, &show_version, 1}, {"help", no_argument, &show_help, 1}, -@@ -140,7 +301,7 @@ main (int argc, char **argv) +@@ -141,7 +399,7 @@ main (int argc, char **argv) bfd_init (); set_default_bfd_target (); @@ -253,7 +344,7 @@ AVR specific only (int *) 0)) != EOF) switch (c) { -@@ -149,11 +310,15 @@ main (int argc, char **argv) +@@ -150,11 +409,15 @@ main (int argc, char **argv) { case 'B': case 'b': @@ -271,7 +362,7 @@ AVR specific only break; default: non_fatal (_("invalid argument to --format: %s"), optarg); -@@ -161,6 +326,10 @@ main (int argc, char **argv) +@@ -162,6 +424,10 @@ main (int argc, char **argv) } break; @@ -282,7 +373,7 @@ AVR specific only case OPTION_TARGET: target = optarg; break; -@@ -189,11 +358,14 @@ main (int argc, char **argv) +@@ -190,11 +457,14 @@ main (int argc, char **argv) break; case 'A': @@ -299,7 +390,7 @@ AVR specific only case 'v': case 'V': show_version = 1; -@@ -239,7 +411,7 @@ main (int argc, char **argv) +@@ -240,7 +509,7 @@ main (int argc, char **argv) for (; optind < argc;) display_file (argv[optind++]); @@ -308,7 +399,7 @@ AVR specific only { bfd_size_type total = total_textsize + total_datasize + total_bsssize; -@@ -600,13 +772,117 @@ print_sysv_format (bfd *file) +@@ -599,13 +869,117 @@ print_sysv_format (bfd *file) printf ("\n\n"); } @@ -341,12 +432,12 @@ AVR specific only + int rammax = 0; + int eeprommax = 0; + asection *section; -+ bfd_size_type data_size = 0; -+ bfd_size_type text_size = 0; -+ bfd_size_type bss_size = 0; -+ bfd_size_type bootloader_size = 0; -+ bfd_size_type noinit_size = 0; -+ bfd_size_type eeprom_size = 0; ++ bfd_size_type my_datasize = 0; ++ bfd_size_type my_textsize = 0; ++ bfd_size_type my_bsssize = 0; ++ bfd_size_type bootloadersize = 0; ++ bfd_size_type noinitsize = 0; ++ bfd_size_type eepromsize = 0; + + avr_device_t *avrdevice = avr_find_device(); + if (avrdevice != NULL) @@ -358,21 +449,21 @@ AVR specific only + } + + if ((section = bfd_get_section_by_name (file, ".data")) != NULL) -+ data_size = bfd_section_size (file, section); ++ my_datasize = bfd_section_size (file, section); + if ((section = bfd_get_section_by_name (file, ".text")) != NULL) -+ text_size = bfd_section_size (file, section); ++ my_textsize = bfd_section_size (file, section); + if ((section = bfd_get_section_by_name (file, ".bss")) != NULL) -+ bss_size = bfd_section_size (file, section); ++ my_bsssize = bfd_section_size (file, section); + if ((section = bfd_get_section_by_name (file, ".bootloader")) != NULL) -+ bootloader_size = bfd_section_size (file, section); ++ bootloadersize = bfd_section_size (file, section); + if ((section = bfd_get_section_by_name (file, ".noinit")) != NULL) -+ noinit_size = bfd_section_size (file, section); ++ noinitsize = bfd_section_size (file, section); + if ((section = bfd_get_section_by_name (file, ".eeprom")) != NULL) -+ eeprom_size = bfd_section_size (file, section); ++ eepromsize = bfd_section_size (file, section); + -+ bfd_size_type text = text_size + data_size + bootloader_size; -+ bfd_size_type data = data_size + bss_size + noinit_size; -+ bfd_size_type eeprom = eeprom_size; ++ bfd_size_type text = my_textsize + my_datasize + bootloadersize; ++ bfd_size_type data = my_datasize + my_bsssize + noinitsize; ++ bfd_size_type eeprom = eepromsize; + + printf ("AVR Memory Usage\n" + "----------------\n" diff --git a/development/avr-gcc/avr-gcc.SlackBuild b/development/avr-gcc/avr-gcc.SlackBuild index a91986fe8c..ba8b2d314f 100644 --- a/development/avr-gcc/avr-gcc.SlackBuild +++ b/development/avr-gcc/avr-gcc.SlackBuild @@ -8,13 +8,14 @@ # This file is placed in the public domain. PRGNAM=avr-gcc -VERSION=${VERSION:-4.9.2} +VERSION=${VERSION:-8.2.0} +ISLVERSION=${ISLVERSION:-0.19} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -25,8 +26,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -42,21 +43,25 @@ fi set -e rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf gcc-$VERSION avr-gcc-build-$VERSION -tar xvf $CWD/gcc-$VERSION.tar.bz2 || exit 1 -mkdir avr-gcc-build-$VERSION -cd avr-gcc-build-$VERSION || exit 1 -chown -R root:root . +mkdir -p $TMP/$PRGNAM $PKG $OUTPUT +cd $TMP/$PRGNAM +rm -rf $TMP/$PRGNAM/* +tar xvf $CWD/gcc-$VERSION.tar.xz +tar xvf $CWD/isl-$ISLVERSION.tar.bz2 find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -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 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +cd gcc-$VERSION +ln -s ../isl-$ISLVERSION isl + +mkdir ../avr-gcc-build-$VERSION +cd ../avr-gcc-build-$VERSION + +export CFLAGS_FOR_TARGET="$SLKCFLAGS" +export CXXFLAGS_FOR_TARGET="$SLKCFLAGS" -CFLAGS_FOR_BUILD="$SLKCFLAGS" \ -CXXFLAGS_FOR_BUILD="$SLKCFLAGS" \ ../gcc-$VERSION/configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -71,11 +76,12 @@ CXXFLAGS_FOR_BUILD="$SLKCFLAGS" \ --disable-linker-build-id \ --disable-nls \ --disable-werror \ - --enable-__cxa_atexit \ + --disable-__cxa_atexit \ --enable-checking=release \ --enable-clocale=gnu \ --enable-cloog-backend=isl \ --enable-gnu-unique-object \ + --enable-gnu-indirect-function \ --enable-gold \ --enable-languages=c,c++ \ --enable-ld=default \ @@ -90,22 +96,24 @@ CXXFLAGS_FOR_BUILD="$SLKCFLAGS" \ --with-plugin-ld=ld.gold \ --with-system-zlib \ --with-dwarf2 \ + --with-isl \ --program-prefix="avr-" \ --program-suffix="" \ --build=$ARCH-slackware-linux make || exit 1 -make install DESTDIR=$PKG || exit 1 +make -j1 install DESTDIR=$PKG || exit 1 # Remove useless stuff rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/libiberty.a +rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/libcc1.* rm -rf $PKG/usr/info rm -rf $PKG/usr/include rm -rf $PKG/usr/share rm -rf $PKG/usr/man/man7 rm -rf $PKG/usr/libexec/gcc/avr/$VERSION/install-tools -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +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 find $PKG/usr/man -type f -exec gzip -9 {} \; diff --git a/development/avr-gcc/avr-gcc.info b/development/avr-gcc/avr-gcc.info index 6bd3a9b64d..a57c77698b 100644 --- a/development/avr-gcc/avr-gcc.info +++ b/development/avr-gcc/avr-gcc.info @@ -1,8 +1,10 @@ PRGNAM="avr-gcc" -VERSION="4.9.2" +VERSION="8.2.0" HOMEPAGE="http://www.gnu.org/software/gcc/" -DOWNLOAD="ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.9.2/gcc-4.9.2.tar.bz2" -MD5SUM="4df8ee253b7f3863ad0b86359cd39c43" +DOWNLOAD="ftp://ftp.gnu.org/pub/gnu/gcc/gcc-8.2.0/gcc-8.2.0.tar.xz \ + http://isl.gforge.inria.fr/isl-0.19.tar.bz2" +MD5SUM="4ab282f414676496483b3e1793d07862 \ + 7850d46a96e5ea31e34913190895e154" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="avr-binutils" diff --git a/development/camlp4/camlp4.SlackBuild b/development/camlp4/camlp4.SlackBuild index 932c6d73fc..cfd34f6caa 100644 --- a/development/camlp4/camlp4.SlackBuild +++ b/development/camlp4/camlp4.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for camlp4 -# Copyright 2013 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2013-2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=camlp4 -VERSION=${VERSION:-4.03_1} +VERSION=${VERSION:-4.08_1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -55,17 +55,15 @@ else fi DOCS="CHANGES* LICENSE" -TVERSION=$(echo $VERSION | tr _ +) -CVERSION=$(echo $VERSION | tr _ -) set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$CVERSION -tar xvf $CWD/$PRGNAM-$CVERSION.tar.?z* || tar xvf $CWD/$TVERSION.tar.?z* -cd $PRGNAM-$CVERSION +rm -rf $PRGNAM-$(echo $VERSION | tr _ -) +tar xvf $CWD/$PRGNAM-$(echo $VERSION | tr _ -).tar.?z* +cd $PRGNAM-$(echo $VERSION | tr _ -) chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/development/camlp4/camlp4.info b/development/camlp4/camlp4.info index f7192e0340..1fa1c27557 100644 --- a/development/camlp4/camlp4.info +++ b/development/camlp4/camlp4.info @@ -1,8 +1,8 @@ PRGNAM="camlp4" -VERSION="4.03_1" +VERSION="4.08_1" HOMEPAGE="http://caml.inria.fr" -DOWNLOAD="https://github.com/ocaml/camlp4/archive/4.03+1.tar.gz" -MD5SUM="65ece8d2c8f4b1e06d62323e78759a7c" +DOWNLOAD="https://github.com/ocaml/camlp4/archive/4.08+1/camlp4-4.08-1.tar.gz" +MD5SUM="7e09e32fdfb185050f69cb2f1e77bf8a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="ocamlbuild" diff --git a/development/camlp5/camlp5.SlackBuild b/development/camlp5/camlp5.SlackBuild index 1f504f9e2a..5e7034d981 100644 --- a/development/camlp5/camlp5.SlackBuild +++ b/development/camlp5/camlp5.SlackBuild @@ -1,5 +1,7 @@ #!/bin/sh # +# Slackware build script for camlp5 +# # 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 3 of the License, or @@ -12,15 +14,13 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# Slackware build script for camlp5 # Written by adaptr (jeroen@adaptr.nl) # Rewrite for updated camlp5 Panagiotis Nikolaou, Culver City, CA PRGNAM=camlp5 -VERSION=${VERSION:-7.05} -SRCVER=rel705 +VERSION=${VERSION:-7.10} +SRCVER=rel710 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -81,7 +81,7 @@ 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 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CHANGES INSTALL LICENSE MODE README $PKG/usr/doc/$PRGNAM-$VERSION/ +cp -a CHANGES LICENSE MODE README* $PKG/usr/doc/$PRGNAM-$VERSION/ ## Build TeX, PS, PDF, TeXinfo and HTML Documentation cd doc/htmlp diff --git a/development/camlp5/camlp5.info b/development/camlp5/camlp5.info index 40cf6cf6ad..9141974c55 100644 --- a/development/camlp5/camlp5.info +++ b/development/camlp5/camlp5.info @@ -1,8 +1,8 @@ PRGNAM="camlp5" -VERSION="7.05" +VERSION="7.10" HOMEPAGE="https://camlp5.github.io/" -DOWNLOAD="https://github.com/camlp5/camlp5/archive/rel705/camlp5-rel705.tar.gz" -MD5SUM="cf9d909191711afb1b634f75acbe1cfe" +DOWNLOAD="https://github.com/camlp5/camlp5/archive/rel710/camlp5-rel710.tar.gz" +MD5SUM="1c396142b981c5af1af7470bb23bf0ce" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="ocaml" diff --git a/development/device-tree-compiler/device-tree-compiler.SlackBuild b/development/device-tree-compiler/device-tree-compiler.SlackBuild index 58b655f1fa..26766281f5 100644 --- a/development/device-tree-compiler/device-tree-compiler.SlackBuild +++ b/development/device-tree-compiler/device-tree-compiler.SlackBuild @@ -25,7 +25,7 @@ # With tweaks from rworkman to use in SlackBuilds.org tree PRGNAM=device-tree-compiler -VERSION=${VERSION:-1.4.4} +VERSION=${VERSION:-1.5.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,7 +60,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz +tar xvf $CWD/$PRGNAM-$VERSION.tar.lz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ diff --git a/development/device-tree-compiler/device-tree-compiler.info b/development/device-tree-compiler/device-tree-compiler.info index 38575f14af..93be5bab57 100644 --- a/development/device-tree-compiler/device-tree-compiler.info +++ b/development/device-tree-compiler/device-tree-compiler.info @@ -1,8 +1,8 @@ PRGNAM="device-tree-compiler" -VERSION="1.4.4" +VERSION="1.5.0" HOMEPAGE="https://git.kernel.org/cgit/utils/dtc/dtc.git" -DOWNLOAD="http://harrier.slackbuilds.org/misc/device-tree-compiler-1.4.4.tar.xz" -MD5SUM="ccc3b88d50823b19791f42bc2e5c9309" +DOWNLOAD="http://harrier.slackbuilds.org/misc/device-tree-compiler-1.5.0.tar.lz" +MD5SUM="a609b2995f94de58fc7544a429ac0b28" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/docutils/README b/development/docutils/README deleted file mode 100644 index 1160a389f0..0000000000 --- a/development/docutils/README +++ /dev/null @@ -1,6 +0,0 @@ -Docutils (Python Documentation Utilities) - -Docutils is a modular system for processing documentation into useful -formats, such as HTML, XML, and LaTeX. For input Docutils supports -reStructuredText, an easy-to-read, what-you-see-is-what-you-get plaintext -markup syntax. diff --git a/development/docutils/docutils.SlackBuild b/development/docutils/docutils.SlackBuild deleted file mode 100644 index b953ca5071..0000000000 --- a/development/docutils/docutils.SlackBuild +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/sh - -# Slackware build script for docutils - -# Copyright 2006-2019 Robby Workman Tuscaloosa, AL, 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. - -PRGNAM=docutils -VERSION=${VERSION:-0.14} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -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 {} \; - -python setup.py install --root=$PKG -2to3 --write --no-diffs docutils -python3 setup.py install --root=$PKG - -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 - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a *.txt PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/development/docutils/docutils.info b/development/docutils/docutils.info deleted file mode 100644 index 5e22f0645a..0000000000 --- a/development/docutils/docutils.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="docutils" -VERSION="0.14" -HOMEPAGE="http://docutils.sourceforge.net" -DOWNLOAD="http://downloads.sourceforge.net/docutils/docutils-0.14.tar.gz" -MD5SUM="c53768d63db3873b7d452833553469de" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="python3" -MAINTAINER="Robby Workman" -EMAIL="rworkman@slackbuilds.org" diff --git a/development/docutils/slack-desc b/development/docutils/slack-desc deleted file mode 100644 index 06dc8a4d0d..0000000000 --- a/development/docutils/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 ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -docutils: docutils (Python Document Utilities module) -docutils: -docutils: Docutils is an open-source text processing system for processing -docutils: plaintext documentation into useful formats, such as HTML or LaTeX. -docutils: It includes reStructuredText, the easy to read, easy to use, -docutils: what-you-see-is-what-you-get plaintext markup language. -docutils: -docutils: Homepage: http://docutils.sourceforge.net/ -docutils: -docutils: -docutils: diff --git a/development/dune/README b/development/dune/README new file mode 100644 index 0000000000..4bee426ba6 --- /dev/null +++ b/development/dune/README @@ -0,0 +1,5 @@ +Dune is a build system designed for OCaml/Reason projects only. +It focuses on providing the user with a consistent experience and +takes care of most of the low-level details of OCaml compilation. +All you have to do is provide a description of your project and +dune will do the rest. diff --git a/development/meson/meson.SlackBuild b/development/dune/dune.SlackBuild index cf0cb3a6d1..753b06d084 100644 --- a/development/meson/meson.SlackBuild +++ b/development/dune/dune.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for meson +# Slackware build script for dune -# Copyright 2017-2018 Jeremy Hansen <jebrhansen+SBo -at- gmail.com> +# Copyright 2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,8 +22,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=meson -VERSION=${VERSION:-0.51.0} +PRGNAM=dune +VERSION=${VERSION:-1.11.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,28 +60,27 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -python3 setup.py install --root=$PKG +make release +make DESTDIR=$PKG INSTALL_ARGS="--prefix=/usr --libdir='$(ocamlfind printconf destdir)'" install 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 -mv $PKG/usr/share/man $PKG/usr/ 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 +rm -fR $PKG/usr/doc mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - COPYING README.md PKG-INFO \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a *.md $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/development/dune/dune.info b/development/dune/dune.info new file mode 100644 index 0000000000..87e20a4d06 --- /dev/null +++ b/development/dune/dune.info @@ -0,0 +1,10 @@ +PRGNAM="dune" +VERSION="1.11.3" +HOMEPAGE="http://caml.inria.fr" +DOWNLOAD="https://github.com/ocaml/dune/archive/1.11.3/dune-1.11.3.tar.gz" +MD5SUM="483164bdca4d0f568f4c95987737899b" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="ocaml-findlib" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/development/lmdb/slack-desc b/development/dune/slack-desc index 22a92101a3..4e035d51d4 100644 --- a/development/lmdb/slack-desc +++ b/development/dune/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -lmdb: lmdb (embedded data store) -lmdb: -lmdb: LMDB is an ultra-fast, ultra-compact key-value embedded data store -lmdb: developed by Symas for the OpenLDAP Project. -lmdb: -lmdb: Online documentation available at: -lmdb: http://symas.com/mdb/ -lmdb: -lmdb: -lmdb: -lmdb: +dune: dune (ocaml build system - formerly jbuilder) +dune: +dune: Dune is a build system designed for OCaml/Reason projects only. +dune: It focuses on providing the user with a consistent experience and +dune: takes care of most of the low-level details of OCaml compilation. +dune: All you have to do is provide a description of your project and +dune: dune will do the rest. +dune: +dune: homepage: https://github.com/ocaml/dune +dune: +dune: diff --git a/development/freetds/freetds.SlackBuild b/development/freetds/freetds.SlackBuild index 826125272e..64317e53d1 100644 --- a/development/freetds/freetds.SlackBuild +++ b/development/freetds/freetds.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=freetds -VERSION=${VERSION:-1.00.9} +VERSION=${VERSION:-1.00.99} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/development/freetds/freetds.info b/development/freetds/freetds.info index 530fdb3b51..81e2313fd5 100644 --- a/development/freetds/freetds.info +++ b/development/freetds/freetds.info @@ -1,8 +1,8 @@ PRGNAM="freetds" -VERSION="1.00.9" +VERSION="1.00.99" HOMEPAGE="http://www.freetds.org/" -DOWNLOAD="ftp://ftp.freetds.org/pub/freetds/stable/freetds-1.00.9.tar.gz" -MD5SUM="9f3518c9763f195eca119e4ee504be8d" +DOWNLOAD="ftp://ftp.freetds.org/pub/freetds/stable/freetds-1.00.99.tar.gz" +MD5SUM="32777effeb8e45daa5890ef5ad636230" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/gcc5/README b/development/gcc5/README new file mode 100644 index 0000000000..043d62efcf --- /dev/null +++ b/development/gcc5/README @@ -0,0 +1,46 @@ +This gcc5 package can be installed alongside Slackware's gcc-7 packages. +These version 7 compilers can sometimes be quite a bit more strict about +what they accept as valid code. As a consequence, you will regularly run +into compilation issues with software. Not just the software made with +the scripts on slackbuilds.org, but also some of the software in +the Slackware core distribution requires patches in order to get them +to compile. + +Still having the gcc version 5 compilers can sometimes be a lifesaver. +Particulars of the gcc5 package: +- The gcc5 binaries were given a suffix '-5' to make them stand apart + from Slackware's default compilers. +- The gcc5 package only contains the C, C++ and Java language compilers. +- One all-encompassing package is built by the SlackBuild script. +- Profile scripts are added to /etc/profile.d/. You can 'source' + the profile script to prefer the gcc-5 compilers over gcc-7. +- On 64bit Slackware, the gcc5.SlackBuild will detect an existing gcc + multilib compiler and will then build a multilib capable gcc5. + If you run pure 64bit Slackware, then a pure 64bit gcc5 package is built. + +How to use these gcc5 compilers instead of Slackware's default C and C++? +Simple: +In your console or terminal, you 'source' the provided profile script, +like this (a c-shell compatible script is available as well): + + source /etc/profile.d/gcc5.sh + +The command 'source' is equivalent to the dot command ' . '. +The profile script will (re-)define the common variables that are used +by make and other programs to determine which binary to run as the compiler: + +export CC=gcc-5 +export CPP=cpp-5 +export CXX=g++-5 +export AR=gcc-ar-5 +export NM=gcc-nm-5 +export RANLIB=gcc-ranlib-5 + +Nothing else needs to be done after sourcing the profile script. +All you do next is run your compile job as usual in that same console. +Your program will be compiled with the binaries provided by the gcc5 package. + +** WARNING: +** The temporary build location used by the script (defaulting here to /tmp/SBo) +** should *NOT* be a directory path a non-root user could create later... + diff --git a/development/gcc5/c89.sh b/development/gcc5/c89.sh new file mode 100644 index 0000000000..424b1e1669 --- /dev/null +++ b/development/gcc5/c89.sh @@ -0,0 +1,11 @@ +#!/bin/sh +fl="-std=c89" +CC=${CC:-"gcc"} +for opt; do + case "$opt" in + -ansi|-std=c89|-std=iso9899:1990) fl="";; + -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2 + exit 1;; + esac +done +exec $CC $fl ${1+"$@"} diff --git a/development/gcc5/c99.sh b/development/gcc5/c99.sh new file mode 100644 index 0000000000..c33636937c --- /dev/null +++ b/development/gcc5/c99.sh @@ -0,0 +1,11 @@ +#!/bin/sh +fl="-std=c99" +CC=${CC:-"gcc"} +for opt; do + case "$opt" in + -std=c99|-std=iso9899:1999) fl="";; + -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2 + exit 1;; + esac +done +exec $CC $fl ${1+"$@"} diff --git a/development/gcc5/ecj.sh b/development/gcc5/ecj.sh new file mode 100644 index 0000000000..1d8b797931 --- /dev/null +++ b/development/gcc5/ecj.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +CLASSPATH=@JAVADIR@/ecj.jar${CLASSPATH:+:}$CLASSPATH \ + java org.eclipse.jdt.internal.compiler.batch.Main "$@" + diff --git a/development/gcc5/fastjar-patches/1000-fastjar-0.97-segfault.patch b/development/gcc5/fastjar-patches/1000-fastjar-0.97-segfault.patch new file mode 100644 index 0000000000..ab6262407a --- /dev/null +++ b/development/gcc5/fastjar-patches/1000-fastjar-0.97-segfault.patch @@ - |