diff options
Diffstat (limited to 'deps')
326 files changed, 10356 insertions, 13099 deletions
diff --git a/deps/telepathy/telepathy-gabble/telepathy-gabble.SlackBuild b/deps/LibRaw/LibRaw.SlackBuild index 9834722..5901164 100755 --- a/deps/telepathy/telepathy-gabble/telepathy-gabble.SlackBuild +++ b/deps/LibRaw/LibRaw.SlackBuild @@ -1,9 +1,9 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2015, 2016, 2017, 2018 Eric Hameleers, Eindhoven, NL -# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2013, 2015, 2016, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2013 Eric Hameleers, Eindhoven, NL # All rights reserved. -# + # Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: # @@ -21,22 +21,32 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) -PKGNAM=telepathy-gabble -VERSION=${VERSION:-"0.18.4"} -BUILD=${BUILD:-3} +PKGNAM=LibRaw +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-" -j$(nproc) "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + case "$MARCH" in + i?86) export ARCH=i586 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; + *) export ARCH=$MARCH ;; esac - export ARCH +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 fi if [ "$ARCH" = "i586" ]; then @@ -57,37 +67,45 @@ else fi case "$ARCH" in - arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; - *) TARGET=$ARCH-slackware-linux ;; + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; esac -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +rm -rf $PKGNAM-$VERSION-build +mkdir $PKGNAM-$VERSION-build +cd $PKGNAM-$VERSION-build +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ + +# Don't use icecream: +PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g") +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --libexecdir=/usr/lib${LIBDIRSUFFIX}/telepathy \ + --sysconfdir=/etc \ + --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PKGNAM-$VERSION \ - --localstatedir=/var \ - --sysconfdir=/etc \ - --disable-debug \ --disable-static \ + --enable-jasper \ + --enable-lcms \ + --disable-examples \ --build=$TARGET || exit 1 make $NUMJOBS || make || exit 1 @@ -99,18 +117,15 @@ rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -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/$PKGNAM-$VERSION cp -a \ - AUTHORS COPYING ChangeLog INSTALL NEWS README \ + COPYRIGHT Changelog.txt LICENSE* README* doc \ $PKG/usr/doc/$PKGNAM-$VERSION +mv $PKG/usr/doc/$PKGNAM-$VERSION/doc $PKG/usr/doc/$PKGNAM-$VERSION/html +find $PKG/usr/doc/$PKGNAM-$VERSION -type f -exec chmod 0644 {} \+ 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 $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/LibRaw/slack-desc b/deps/LibRaw/slack-desc new file mode 100644 index 0000000..d5eb44c --- /dev/null +++ b/deps/LibRaw/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------------------------------------------------------| +LibRaw: LibRaw (library for decoding raw digital photos) +LibRaw: +LibRaw: LibRaw is a library for reading RAW files from digital photo cameras +LibRaw: (CRW/CR2, NEF, RAF, DNG, MOS, KDC, DCR, etc, virtually all RAW formats +LibRaw: are supported). It pays special attention to correct retrieval of data +LibRaw: required for subsequent RAW conversion. The library is intended for +LibRaw: embedding in RAW converters, data analyzers, and other programs using +LibRaw: RAW files as the initial data. +LibRaw: +LibRaw: Homepage: https://www.libraw.org/ +LibRaw: diff --git a/deps/OpenAL/.deps b/deps/OpenAL/.deps deleted file mode 100644 index b787fd1..0000000 --- a/deps/OpenAL/.deps +++ /dev/null @@ -1 +0,0 @@ -SDL_sound diff --git a/deps/OpenAL/.url b/deps/OpenAL/.url deleted file mode 100644 index 51a72d9..0000000 --- a/deps/OpenAL/.url +++ /dev/null @@ -1,2 +0,0 @@ -http://kcat.strangesoft.net/openal-releases/openal-soft-1.19.1.tar.bz2 - diff --git a/deps/OpenAL/slack-desc b/deps/OpenAL/slack-desc deleted file mode 100644 index 9519678..0000000 --- a/deps/OpenAL/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -OpenAL: OpenAL (implementation of the OpenAL 3D audio API) -OpenAL: -OpenAL: OpenAL Soft is an LGPL-licensed, cross-platform, implementation -OpenAL: of the OpenAL 3D audio API. OpenAL provides capabilities for -OpenAL: playing audio in a virtual 3D environment. It also facilitates -OpenAL: streaming audio, multi-channel buffers, and audio capture. -OpenAL: -OpenAL: -OpenAL: OpenAL by Creative Labs: http://www.OpenAL.org/ -OpenAL: OpenAL Soft home: http://openal-soft.org/ -OpenAL: diff --git a/deps/PyQt/.url b/deps/PyQt/.url deleted file mode 100644 index 8e479e7..0000000 --- a/deps/PyQt/.url +++ /dev/null @@ -1 +0,0 @@ -http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-4.12.3/PyQt4_gpl_x11-4.12.3.tar.gz diff --git a/deps/PyQt/PyQt.SlackBuild b/deps/PyQt/PyQt.SlackBuild deleted file mode 100755 index 2c55e12..0000000 --- a/deps/PyQt/PyQt.SlackBuild +++ /dev/null @@ -1,140 +0,0 @@ -#!/bin/sh - -# Slackware build script for PyQt - -# Copyright 2008 Aleksandar Samardzic <asamardzic@gmail.com> -# Copyright 2008, 2009, 2010, 2011, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# Modified by Robby Workman <rworkman@slackware.com> -# Modified by Eric Hameleers <alien@slackware.com> - -cd $(dirname $0) ; CWD=$(pwd) - -PKGNAM=PyQt -VERSION=${VERSION:-4.12.3} -BUILD=${BUILD:-1} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" -else - SLKCFLAGS="-O2" -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PKGNAM-$(echo $VERSION |tr - _)-$ARCH-$BUILD.txz" - exit 0 -fi - -NUMJOBS=${NUMJOBS:-"-j$(nproc)"} - -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -PYTHON2LIB=$( python2 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' 2>/dev/null ) -PYTHON3LIB=$( python3 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' 2>/dev/null ) - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP - -rm -rf ${PKGNAM}4_gpl_x11-$VERSION -tar xvf $CWD/${PKGNAM}4_gpl_x11-$VERSION.tar.?z* || exit 1 -cd ${PKGNAM}4_gpl_x11-$VERSION || exit 1 - -# Fix phonon detection: -cat $CWD/$PKGNAM.phonon.diff | patch -p1 --verbose || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# This avoids compiling a version number into KDE's .la files: -export QTDIR=/usr/lib${LIBDIRSUFFIX}/qt -export QT4DIR=/usr/lib${LIBDIRSUFFIX}/qt - -export CFLAGS="$SLKCFLAGS" -export CXXFLAGS="$SLKCFLAGS" - -python3 configure.py \ - --confirm-license \ - --qsci-api \ - --verbose -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1 -make clean - -mv $PKG/usr/bin/pyuic4 $PKG/usr/bin/pyuic4-py3 -rm -rf $PKG/$PYTHON3LIB/${PKGNAM}4/uic/port_v2/ - -python2 configure.py \ - --confirm-license \ - --qsci-api \ - --verbose - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1 - -rm -rf $PKG/$PYTHON2LIB/${PKGNAM}4/uic/port_v3/ - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -# Remove rpaths: -for file in $(find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : 2> /dev/null) ; do - if [ ! "$(patchelf --print-rpath $file 2> /dev/null)" = "" ]; then - patchelf --remove-rpath $file - fi -done - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - GPL_EXCEPTION*.TXT LICENSE.* NEWS OPENSOURCE-NOTICE.TXT README THANKS doc/* \ - $PKG/usr/doc/$PKGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$(echo $VERSION |tr - _)-$ARCH-$BUILD.txz - diff --git a/deps/PyQt/PyQt.phonon.diff b/deps/PyQt/PyQt.phonon.diff deleted file mode 100644 index feda650..0000000 --- a/deps/PyQt/PyQt.phonon.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- PyQt-x11-gpl-4.6.2/configure.py.orig 2010-01-08 23:39:46.000000000 +0100 -+++ PyQt-x11-gpl-4.6.2/configure.py 2010-01-08 23:45:18.000000000 +0100 -@@ -451,7 +451,7 @@ - generate_code("QtXmlPatterns") - - if "phonon" in pyqt_modules: -- generate_code("phonon") -+ generate_code("phonon", extra_include_dirs=["/usr/include/phonon"]) - - if "QtAssistant" in pyqt_modules: - generate_code("QtAssistant") diff --git a/deps/PyQt5/.deps b/deps/PyQt5/.deps deleted file mode 100644 index 64526d1..0000000 --- a/deps/PyQt5/.deps +++ /dev/null @@ -1,3 +0,0 @@ -python-enum34 -qt5 -sip diff --git a/deps/PyQt5/.url b/deps/PyQt5/.url deleted file mode 100644 index 4bf101b..0000000 --- a/deps/PyQt5/.url +++ /dev/null @@ -1,2 +0,0 @@ -https://www.riverbankcomputing.com/static/Downloads/PyQt5/PyQt5_gpl-5.12.tar.gz - diff --git a/deps/PyQt5/PyQt5.SlackBuild b/deps/PyQt5/PyQt5.SlackBuild deleted file mode 100755 index 395155a..0000000 --- a/deps/PyQt5/PyQt5.SlackBuild +++ /dev/null @@ -1,131 +0,0 @@ -#!/bin/sh - -# Slackware build script for PyQt - -# Copyright 2008 Aleksandar Samardzic <asamardzic@gmail.com> -# Copyright 2008, 2009, 2010, 2011, 2015, 2016, 2017 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# Modified by Robby Workman <rworkman@slackware.com> -# Modified by Eric Hameleers <alien@slackware.com> - -PKGNAM=PyQt5 -VERSION=${VERSION:-5.12} -BUILD=${BUILD:-2} - -NUMJOBS=${NUMJOBS:-" -j$(nproc) "} - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" -elif [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" -else - SLKCFLAGS="-O2" -fi - -PYTHONLIB=$( python -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' 2>/dev/null ) -PYTHON3LIB=$( python3 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' 2>/dev/null ) - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf ${PKGNAM}_gpl-$VERSION -tar xvf $CWD/${PKGNAM}_gpl-$VERSION.tar.?z* || exit 1 -cd ${PKGNAM}_gpl-$VERSION || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# This avoids compiling a version number into KDE's .la files: -export QTDIR=/usr/lib${LIBDIRSUFFIX}/qt5 -export QT5DIR=/usr/lib${LIBDIRSUFFIX}/qt5 - -export CFLAGS="$SLKCFLAGS" -export CXXFLAGS="$SLKCFLAGS" - -python configure.py \ - --confirm-license \ - --verbose \ - --qsci-api \ - -q /usr/bin/qmake-qt5 \ - || exit 1 - -make $NUMJOBS || make || exit 1 -# INSTALL_ROOT is needed for QtDesigner, the other Makefiles use DESTDIR -make -j1 install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1 - -mv $PKG/usr/bin/pyrcc5 $PKG/usr/bin/pyrcc5-py2 -mv $PKG/usr/bin/pyuic5 $PKG/usr/bin/pyuic5-py2 -mv $PKG/usr/bin/pylupdate5 $PKG/usr/bin/pylupdate5-py2 -rm -rf $PKG/$PYTHONLIB/${PKGNAM}/uic/port_v3/ - -python3 configure.py \ - --confirm-license \ - --verbose \ - --qsci-api \ - -q /usr/bin/qmake-qt5 \ - || exit 1 - -make $NUMJOBS || make || exit 1 -# INSTALL_ROOT is needed for QtDesigner, the other Makefiles use DESTDIR -make -j1 install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1 -make clean - -rm -rf $PKG/$PYTHON3LIB/${PKGNAM}/uic/port_v2/ - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - ChangeLog LICENSE* NEWS README doc/* \ - $PKG/usr/doc/$PKGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$(echo $VERSION |tr - _)-$ARCH-$BUILD.txz - diff --git a/deps/PyQt5/patches/pyqt-qt5.11.patch b/deps/PyQt5/patches/pyqt-qt5.11.patch deleted file mode 100644 index 96c8a51..0000000 --- a/deps/PyQt5/patches/pyqt-qt5.11.patch +++ /dev/null @@ -1,17 +0,0 @@ -From: Fabian Vogt <fabian@ritter-vogt.de> -Subject: QTest::waitForEvents() is internal only - -Must not be used, got removed with Qt 5.11. - -Index: PyQt5_gpl-5.10.1/sip/QtTest/qtestmouse.sip -=================================================================== ---- PyQt5_gpl-5.10.1.orig/sip/QtTest/qtestmouse.sip -+++ PyQt5_gpl-5.10.1/sip/QtTest/qtestmouse.sip -@@ -41,7 +41,6 @@ namespace QTest - void mousePress(QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier = 0, QPoint pos = QPoint(), int delay = -1); - void mouseRelease(QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier = 0, QPoint pos = QPoint(), int delay = -1); - void mouseEvent(QTest::MouseAction action, QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier, QPoint pos, int delay = -1); -- void waitForEvents() /ReleaseGIL/; - void mouseEvent(QTest::MouseAction action, QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier, QPoint pos, int delay = -1); - void mousePress(QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier = Qt::KeyboardModifiers(), QPoint pos = QPoint(), int delay = -1); - void mouseRelease(QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier = Qt::KeyboardModifiers(), QPoint pos = QPoint(), int delay = -1); diff --git a/deps/PyQt5/patches/pyqt-support-new-qt.patch b/deps/PyQt5/patches/pyqt-support-new-qt.patch deleted file mode 100644 index 1464384..0000000 --- a/deps/PyQt5/patches/pyqt-support-new-qt.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru a/sip/QtCore/QtCoremod.sip b/sip/QtCore/QtCoremod.sip ---- a/sip/QtCore/QtCoremod.sip 2016-12-25 18:56:11.000000000 +0100 -+++ b/sip/QtCore/QtCoremod.sip 2017-01-24 12:03:50.707514377 +0100 -@@ -22,7 +22,7 @@ - - %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", use_limited_api=True) - --%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_99 Qt_5_10_0 Qt_5_10_1} -+%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_99 Qt_5_10_0 Qt_5_10_1 Qt_5_11_0} - - %Platforms {WS_X11 WS_WIN WS_MACX} - diff --git a/deps/PyQt5/patches/pyqt5-cura-crash.patch b/deps/PyQt5/patches/pyqt5-cura-crash.patch deleted file mode 100644 index 9b79407..0000000 --- a/deps/PyQt5/patches/pyqt5-cura-crash.patch +++ /dev/null @@ -1,559 +0,0 @@ -diff -ur --new-file PyQt5_gpl-5.10.1/qpy/QtQuick/qpyquick_register_type.cpp PyQt5_gpl-5.10.2.dev1803281228/qpy/QtQuick/qpyquick_register_type.cpp ---- PyQt5_gpl-5.10.1/qpy/QtQuick/qpyquick_register_type.cpp 2018-02-27 11:43:52.000000000 +0100 -+++ PyQt5_gpl-5.10.2.dev1803281228/qpy/QtQuick/qpyquick_register_type.cpp 2018-03-29 03:32:17.000000000 +0200 -@@ -22,6 +22,8 @@ - #include "qpyquickframebufferobject.h" - #include "qpyquickitem.h" - #include "qpyquickpainteditem.h" -+#include "qpyquickview.h" -+#include "qpyquickwindow.h" - - #include "sipAPIQtQuick.h" - -@@ -30,6 +32,9 @@ - const QMetaObject *mo, const QByteArray &ptr_name, - const QByteArray &list_name, QQmlPrivate::RegisterType **rtp) - { -+ // Make sure the types are tested in the right order (ie. more specific -+ // types first). -+ - #if QT_VERSION >= 0x050200 - if (PyType_IsSubtype(py_type, sipTypeAsPyTypeObject(sipType_QQuickFramebufferObject))) - return ((*rtp = QPyQuickFramebufferObject::addType(py_type, mo, ptr_name, list_name)) ? sipErrorNone : sipErrorFail); -@@ -41,6 +46,12 @@ - if (PyType_IsSubtype(py_type, sipTypeAsPyTypeObject(sipType_QQuickItem))) - return ((*rtp = QPyQuickItem::addType(py_type, mo, ptr_name, list_name)) ? sipErrorNone : sipErrorFail); - -+ if (PyType_IsSubtype(py_type, sipTypeAsPyTypeObject(sipType_QQuickView))) -+ return ((*rtp = QPyQuickView::addType(py_type, mo, ptr_name, list_name)) ? sipErrorNone : sipErrorFail); -+ -+ if (PyType_IsSubtype(py_type, sipTypeAsPyTypeObject(sipType_QQuickWindow))) -+ return ((*rtp = QPyQuickWindow::addType(py_type, mo, ptr_name, list_name)) ? sipErrorNone : sipErrorFail); -+ - // We don't recognise the type. - return sipErrorContinue; - } -diff -ur --new-file PyQt5_gpl-5.10.1/qpy/QtQuick/qpyquickview.cpp PyQt5_gpl-5.10.2.dev1803281228/qpy/QtQuick/qpyquickview.cpp ---- PyQt5_gpl-5.10.1/qpy/QtQuick/qpyquickview.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ PyQt5_gpl-5.10.2.dev1803281228/qpy/QtQuick/qpyquickview.cpp 2018-03-29 03:32:17.000000000 +0200 -@@ -0,0 +1,155 @@ -+// This is the implementation of the QPyQuickWindow classes. -+// -+// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com> -+// -+// This file is part of PyQt5. -+// -+// This file may be used under the terms of the GNU General Public License -+// version 3.0 as published by the Free Software Foundation and appearing in -+// the file LICENSE included in the packaging of this file. Please review the -+// following information to ensure the GNU General Public License version 3.0 -+// requirements will be met: http://www.gnu.org/copyleft/gpl.html. -+// -+// If you do not wish to use this file under the terms of the GPL version 3.0 -+// then you may purchase a commercial license. For more information contact -+// info@riverbankcomputing.com. -+// -+// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -+// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -+ -+ -+#include <Python.h> -+ -+#include <QQmlListProperty> -+ -+#include "qpyquickview.h" -+ -+#include "sipAPIQtQuick.h" -+ -+ -+// The maximum number of Python QQuickView types. -+const int NrOfQuickViewTypes = 20; -+ -+// The list of registered Python types. -+static QList<PyTypeObject *> pyqt_types; -+ -+// The registration data for the canned types. -+static QQmlPrivate::RegisterType canned_types[NrOfQuickViewTypes]; -+ -+ -+#define QPYQUICKVIEW_INIT(n) \ -+ case n##U: \ -+ QPyQuickView##n::staticMetaObject = *mo; \ -+ rt->typeId = qRegisterNormalizedMetaType<QPyQuickView##n *>(ptr_name); \ -+ rt->listId = qRegisterNormalizedMetaType<QQmlListProperty<QPyQuickView##n> >(list_name); \ -+ rt->objectSize = sizeof(QPyQuickView##n); \ -+ rt->create = QQmlPrivate::createInto<QPyQuickView##n>; \ -+ rt->metaObject = mo; \ -+ rt->attachedPropertiesFunction = QQmlPrivate::attachedPropertiesFunc<QPyQuickView##n>(); \ -+ rt->attachedPropertiesMetaObject = QQmlPrivate::attachedPropertiesMetaObject<QPyQuickView##n>(); \ -+ rt->parserStatusCast = QQmlPrivate::StaticCastSelector<QPyQuickView##n,QQmlParserStatus>::cast(); \ -+ rt->valueSourceCast = QQmlPrivate::StaticCastSelector<QPyQuickView##n,QQmlPropertyValueSource>::cast(); \ -+ rt->valueInterceptorCast = QQmlPrivate::StaticCastSelector<QPyQuickView##n,QQmlPropertyValueInterceptor>::cast(); \ -+ break -+ -+ -+// The ctor. -+QPyQuickView::QPyQuickView(QWindow *parent) : sipQQuickView(parent) -+{ -+} -+ -+ -+// Add a new Python type and return its number. -+QQmlPrivate::RegisterType *QPyQuickView::addType(PyTypeObject *type, -+ const QMetaObject *mo, const QByteArray &ptr_name, -+ const QByteArray &list_name) -+{ -+ int type_nr = pyqt_types.size(); -+ -+ // Check we have a spare canned type. -+ if (type_nr >= NrOfQuickViewTypes) -+ { -+ PyErr_Format(PyExc_TypeError, -+ "a maximum of %d QQuickView types may be registered with QML", -+ NrOfQuickViewTypes); -+ return 0; -+ } -+ -+ pyqt_types.append(type); -+ -+ QQmlPrivate::RegisterType *rt = &canned_types[type_nr]; -+ -+ // Initialise those members that depend on the C++ type. -+ switch (type_nr) -+ { -+ QPYQUICKVIEW_INIT(0); -+ QPYQUICKVIEW_INIT(1); -+ QPYQUICKVIEW_INIT(2); -+ QPYQUICKVIEW_INIT(3); -+ QPYQUICKVIEW_INIT(4); -+ QPYQUICKVIEW_INIT(5); -+ QPYQUICKVIEW_INIT(6); -+ QPYQUICKVIEW_INIT(7); -+ QPYQUICKVIEW_INIT(8); -+ QPYQUICKVIEW_INIT(9); -+ QPYQUICKVIEW_INIT(10); -+ QPYQUICKVIEW_INIT(11); -+ QPYQUICKVIEW_INIT(12); -+ QPYQUICKVIEW_INIT(13); -+ QPYQUICKVIEW_INIT(14); -+ QPYQUICKVIEW_INIT(15); -+ QPYQUICKVIEW_INIT(16); -+ QPYQUICKVIEW_INIT(17); -+ QPYQUICKVIEW_INIT(18); -+ QPYQUICKVIEW_INIT(19); -+ } -+ -+ return rt; -+} -+ -+ -+// Create the Python instance. -+void QPyQuickView::createPyObject(QWindow *parent) -+{ -+ SIP_BLOCK_THREADS -+ -+ // Assume C++ owns everything. -+ PyObject *obj = sipConvertFromNewPyType(this, pyqt_types.at(typeNr()), -+ NULL, &sipPySelf, "D", parent, sipType_QWindow, NULL); -+ -+ if (!obj) -+ pyqt5_qtquick_err_print(); -+ -+ SIP_UNBLOCK_THREADS -+} -+ -+ -+// The canned type implementations. -+#define QPYQUICKVIEW_IMPL(n) \ -+QPyQuickView##n::QPyQuickView##n(QWindow *parent) : QPyQuickView(parent) \ -+{ \ -+ createPyObject(parent); \ -+} \ -+QMetaObject QPyQuickView##n::staticMetaObject -+ -+ -+QPYQUICKVIEW_IMPL(0); -+QPYQUICKVIEW_IMPL(1); -+QPYQUICKVIEW_IMPL(2); -+QPYQUICKVIEW_IMPL(3); -+QPYQUICKVIEW_IMPL(4); -+QPYQUICKVIEW_IMPL(5); -+QPYQUICKVIEW_IMPL(6); -+QPYQUICKVIEW_IMPL(7); -+QPYQUICKVIEW_IMPL(8); -+QPYQUICKVIEW_IMPL(9); -+QPYQUICKVIEW_IMPL(10); -+QPYQUICKVIEW_IMPL(11); -+QPYQUICKVIEW_IMPL(12); -+QPYQUICKVIEW_IMPL(13); -+QPYQUICKVIEW_IMPL(14); -+QPYQUICKVIEW_IMPL(15); -+QPYQUICKVIEW_IMPL(16); -+QPYQUICKVIEW_IMPL(17); -+QPYQUICKVIEW_IMPL(18); -+QPYQUICKVIEW_IMPL(19); -diff -ur --new-file PyQt5_gpl-5.10.1/qpy/QtQuick/qpyquickview.h PyQt5_gpl-5.10.2.dev1803281228/qpy/QtQuick/qpyquickview.h ---- PyQt5_gpl-5.10.1/qpy/QtQuick/qpyquickview.h 1970-01-01 01:00:00.000000000 +0100 -+++ PyQt5_gpl-5.10.2.dev1803281228/qpy/QtQuick/qpyquickview.h 2018-03-29 03:32:17.000000000 +0200 -@@ -0,0 +1,87 @@ -+// This is the definition of the QPyQuickView classes. -+// -+// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com> -+// -+// This file is part of PyQt5. -+// -+// This file may be used under the terms of the GNU General Public License -+// version 3.0 as published by the Free Software Foundation and appearing in -+// the file LICENSE included in the packaging of this file. Please review the -+// following information to ensure the GNU General Public License version 3.0 -+// requirements will be met: http://www.gnu.org/copyleft/gpl.html. -+// -+// If you do not wish to use this file under the terms of the GPL version 3.0 -+// then you may purchase a commercial license. For more information contact -+// info@riverbankcomputing.com. -+// -+// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -+// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -+ -+ -+#ifndef _QPYQUICKVIEW_H -+#define _QPYQUICKVIEW_H -+ -+ -+#include <Python.h> -+ -+#include <qqmlprivate.h> -+#include <QByteArray> -+#include <QMetaObject> -+#include <QQuickView> -+ -+#include "sipAPIQtQuick.h" -+ -+ -+class QPyQuickView : public sipQQuickView -+{ -+public: -+ QPyQuickView(QWindow *parent = 0); -+ -+ virtual int typeNr() const = 0; -+ -+ static QQmlPrivate::RegisterType *addType(PyTypeObject *type, -+ const QMetaObject *mo, const QByteArray &ptr_name, -+ const QByteArray &list_name); -+ void createPyObject(QWindow *parent); -+ -+private: -+ QPyQuickView(const QPyQuickView &); -+}; -+ -+ -+// The canned type declarations. -+#define QPYQUICKVIEW_DECL(n) \ -+class QPyQuickView##n : public QPyQuickView \ -+{ \ -+public: \ -+ QPyQuickView##n(QWindow *parent = 0); \ -+ static QMetaObject staticMetaObject; \ -+ virtual int typeNr() const {return n##U;} \ -+private: \ -+ QPyQuickView##n(const QPyQuickView##n &); \ -+} -+ -+ -+QPYQUICKVIEW_DECL(0); -+QPYQUICKVIEW_DECL(1); -+QPYQUICKVIEW_DECL(2); -+QPYQUICKVIEW_DECL(3); -+QPYQUICKVIEW_DECL(4); -+QPYQUICKVIEW_DECL(5); -+QPYQUICKVIEW_DECL(6); -+QPYQUICKVIEW_DECL(7); -+QPYQUICKVIEW_DECL(8); -+QPYQUICKVIEW_DECL(9); -+QPYQUICKVIEW_DECL(10); -+QPYQUICKVIEW_DECL(11); -+QPYQUICKVIEW_DECL(12); -+QPYQUICKVIEW_DECL(13); -+QPYQUICKVIEW_DECL(14); -+QPYQUICKVIEW_DECL(15); -+QPYQUICKVIEW_DECL(16); -+QPYQUICKVIEW_DECL(17); -+QPYQUICKVIEW_DECL(18); -+QPYQUICKVIEW_DECL(19); -+ -+ -+#endif -diff -ur --new-file PyQt5_gpl-5.10.1/qpy/QtQuick/qpyquickwindow.cpp PyQt5_gpl-5.10.2.dev1803281228/qpy/QtQuick/qpyquickwindow.cpp ---- PyQt5_gpl-5.10.1/qpy/QtQuick/qpyquickwindow.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ PyQt5_gpl-5.10.2.dev1803281228/qpy/QtQuick/qpyquickwindow.cpp 2018-03-29 03:32:17.000000000 +0200 -@@ -0,0 +1,155 @@ -+// This is the implementation of the QPyQuickWindow classes. -+// -+// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com> -+// -+// This file is part of PyQt5. -+// -+// This file may be used under the terms of the GNU General Public License -+// version 3.0 as published by the Free Software Foundation and appearing in -+// the file LICENSE included in the packaging of this file. Please review the -+// following information to ensure the GNU General Public License version 3.0 -+// requirements will be met: http://www.gnu.org/copyleft/gpl.html. -+// -+// If you do not wish to use this file under the terms of the GPL version 3.0 -+// then you may purchase a commercial license. For more information contact -+// info@riverbankcomputing.com. -+// -+// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -+// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -+ -+ -+#include <Python.h> -+ -+#include <QQmlListProperty> -+ -+#include "qpyquickwindow.h" -+ -+#include "sipAPIQtQuick.h" -+ -+ -+// The maximum number of Python QQuickWindow types. -+const int NrOfQuickWindowTypes = 20; -+ -+// The list of registered Python types. -+static QList<PyTypeObject *> pyqt_types; -+ -+// The registration data for the canned types. -+static QQmlPrivate::RegisterType canned_types[NrOfQuickWindowTypes]; -+ -+ -+#define QPYQUICKWINDOW_INIT(n) \ -+ case n##U: \ -+ QPyQuickWindow##n::staticMetaObject = *mo; \ -+ rt->typeId = qRegisterNormalizedMetaType<QPyQuickWindow##n *>(ptr_name); \ -+ rt->listId = qRegisterNormalizedMetaType<QQmlListProperty<QPyQuickWindow##n> >(list_name); \ -+ rt->objectSize = sizeof(QPyQuickWindow##n); \ -+ rt->create = QQmlPrivate::createInto<QPyQuickWindow##n>; \ -+ rt->metaObject = mo; \ -+ rt->attachedPropertiesFunction = QQmlPrivate::attachedPropertiesFunc<QPyQuickWindow##n>(); \ -+ rt->attachedPropertiesMetaObject = QQmlPrivate::attachedPropertiesMetaObject<QPyQuickWindow##n>(); \ -+ rt->parserStatusCast = QQmlPrivate::StaticCastSelector<QPyQuickWindow##n,QQmlParserStatus>::cast(); \ -+ rt->valueSourceCast = QQmlPrivate::StaticCastSelector<QPyQuickWindow##n,QQmlPropertyValueSource>::cast(); \ -+ rt->valueInterceptorCast = QQmlPrivate::StaticCastSelector<QPyQuickWindow##n,QQmlPropertyValueInterceptor>::cast(); \ -+ break -+ -+ -+// The ctor. -+QPyQuickWindow::QPyQuickWindow(QWindow *parent) : sipQQuickWindow(parent) -+{ -+} -+ -+ -+// Add a new Python type and return its number. -+QQmlPrivate::RegisterType *QPyQuickWindow::addType(PyTypeObject *type, -+ const QMetaObject *mo, const QByteArray &ptr_name, -+ const QByteArray &list_name) -+{ -+ int type_nr = pyqt_types.size(); -+ -+ // Check we have a spare canned type. -+ if (type_nr >= NrOfQuickWindowTypes) -+ { -+ PyErr_Format(PyExc_TypeError, -+ "a maximum of %d QQuickWindow types may be registered with QML", -+ NrOfQuickWindowTypes); -+ return 0; -+ } -+ -+ pyqt_types.append(type); -+ -+ QQmlPrivate::RegisterType *rt = &canned_types[type_nr]; -+ -+ // Initialise those members that depend on the C++ type. -+ switch (type_nr) -+ { -+ QPYQUICKWINDOW_INIT(0); -+ QPYQUICKWINDOW_INIT(1); -+ QPYQUICKWINDOW_INIT(2); -+ QPYQUICKWINDOW_INIT(3); -+ QPYQUICKWINDOW_INIT(4); -+ QPYQUICKWINDOW_INIT(5); -+ QPYQUICKWINDOW_INIT(6); -+ QPYQUICKWINDOW_INIT(7); -+ QPYQUICKWINDOW_INIT(8); -+ QPYQUICKWINDOW_INIT(9); -+ QPYQUICKWINDOW_INIT(10); -+ QPYQUICKWINDOW_INIT(11); -+ QPYQUICKWINDOW_INIT(12); -+ QPYQUICKWINDOW_INIT(13); -+ QPYQUICKWINDOW_INIT(14); -+ QPYQUICKWINDOW_INIT(15); -+ QPYQUICKWINDOW_INIT(16); -+ QPYQUICKWINDOW_INIT(17); -+ QPYQUICKWINDOW_INIT(18); -+ QPYQUICKWINDOW_INIT(19); -+ } -+ -+ return rt; -+} -+ -+ -+// Create the Python instance. -+void QPyQuickWindow::createPyObject(QWindow *parent) -+{ -+ SIP_BLOCK_THREADS -+ -+ // Assume C++ owns everything. -+ PyObject *obj = sipConvertFromNewPyType(this, pyqt_types.at(typeNr()), -+ NULL, &sipPySelf, "D", parent, sipType_QWindow, NULL); -+ -+ if (!obj) -+ pyqt5_qtquick_err_print(); -+ -+ SIP_UNBLOCK_THREADS -+} -+ -+ -+// The canned type implementations. -+#define QPYQUICKWINDOW_IMPL(n) \ -+QPyQuickWindow##n::QPyQuickWindow##n(QWindow *parent) : QPyQuickWindow(parent) \ -+{ \ -+ createPyObject(parent); \ -+} \ -+QMetaObject QPyQuickWindow##n::staticMetaObject -+ -+ -+QPYQUICKWINDOW_IMPL(0); -+QPYQUICKWINDOW_IMPL(1); -+QPYQUICKWINDOW_IMPL(2); -+QPYQUICKWINDOW_IMPL(3); -+QPYQUICKWINDOW_IMPL(4); -+QPYQUICKWINDOW_IMPL(5); -+QPYQUICKWINDOW_IMPL(6); -+QPYQUICKWINDOW_IMPL(7); -+QPYQUICKWINDOW_IMPL(8); -+QPYQUICKWINDOW_IMPL(9); -+QPYQUICKWINDOW_IMPL(10); -+QPYQUICKWINDOW_IMPL(11); -+QPYQUICKWINDOW_IMPL(12); -+QPYQUICKWINDOW_IMPL(13); -+QPYQUICKWINDOW_IMPL(14); -+QPYQUICKWINDOW_IMPL(15); -+QPYQUICKWINDOW_IMPL(16); -+QPYQUICKWINDOW_IMPL(17); -+QPYQUICKWINDOW_IMPL(18); -+QPYQUICKWINDOW_IMPL(19); -diff -ur --new-file PyQt5_gpl-5.10.1/qpy/QtQuick/qpyquickwindow.h PyQt5_gpl-5.10.2.dev1803281228/qpy/QtQuick/qpyquickwindow.h ---- PyQt5_gpl-5.10.1/qpy/QtQuick/qpyquickwindow.h 1970-01-01 01:00:00.000000000 +0100 -+++ PyQt5_gpl-5.10.2.dev1803281228/qpy/QtQuick/qpyquickwindow.h 2018-03-29 03:32:17.000000000 +0200 -@@ -0,0 +1,87 @@ -+// This is the definition of the QPyQuickWindow classes. -+// -+// Copyright (c) 2018 Riverbank Computing Limited <info@riverbankcomputing.com> -+// -+// This file is part of PyQt5. -+// -+// This file may be used under the terms of the GNU General Public License -+// version 3.0 as published by the Free Software Foundation and appearing in -+// the file LICENSE included in the packaging of this file. Please review the -+// following information to ensure the GNU General Public License version 3.0 -+// requirements will be met: http://www.gnu.org/copyleft/gpl.html. -+// -+// If you do not wish to use this file under the terms of the GPL version 3.0 -+// then you may purchase a commercial license. For more information contact -+// info@riverbankcomputing.com. -+// -+// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -+// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -+ -+ -+#ifndef _QPYQUICKWINDOW_H -+#define _QPYQUICKWINDOW_H -+ -+ -+#include <Python.h> -+ -+#include <qqmlprivate.h> -+#include <QByteArray> -+#include <QMetaObject> -+#include <QQuickWindow> -+ -+#include "sipAPIQtQuick.h" -+ -+ -+class QPyQuickWindow : public sipQQuickWindow -+{ -+public: -+ QPyQuickWindow(QWindow *parent = 0); -+ -+ virtual int typeNr() const = 0; -+ -+ static QQmlPrivate::RegisterType *addType(PyTypeObject *type, -+ const QMetaObject *mo, const QByteArray &ptr_name, -+ const QByteArray &list_name); -+ void createPyObject(QWindow *parent); -+ -+private: -+ QPyQuickWindow(const QPyQuickWindow &); -+}; -+ -+ -+// The canned type declarations. -+#define QPYQUICKWINDOW_DECL(n) \ -+class QPyQuickWindow##n : public QPyQuickWindow \ -+{ \ -+public: \ -+ QPyQuickWindow##n(QWindow *parent = 0); \ -+ static QMetaObject staticMetaObject; \ -+ virtual int typeNr() const {return n##U;} \ -+private: \ -+ QPyQuickWindow##n(const QPyQuickWindow##n &); \ -+} -+ -+ -+QPYQUICKWINDOW_DECL(0); -+QPYQUICKWINDOW_DECL(1); -+QPYQUICKWINDOW_DECL(2); -+QPYQUICKWINDOW_DECL(3); -+QPYQUICKWINDOW_DECL(4); -+QPYQUICKWINDOW_DECL(5); -+QPYQUICKWINDOW_DECL(6); -+QPYQUICKWINDOW_DECL(7); -+QPYQUICKWINDOW_DECL(8); -+QPYQUICKWINDOW_DECL(9); -+QPYQUICKWINDOW_DECL(10); -+QPYQUICKWINDOW_DECL(11); -+QPYQUICKWINDOW_DECL(12); -+QPYQUICKWINDOW_DECL(13); -+QPYQUICKWINDOW_DECL(14); -+QPYQUICKWINDOW_DECL(15); -+QPYQUICKWINDOW_DECL(16); -+QPYQUICKWINDOW_DECL(17); -+QPYQUICKWINDOW_DECL(18); -+QPYQUICKWINDOW_DECL(19); -+ -+ -+#endif -diff -ur --new-file PyQt5_gpl-5.10.1/sip/QtQuick/qquickview.sip PyQt5_gpl-5.10.2.dev1803281228/sip/QtQuick/qquickview.sip ---- PyQt5_gpl-5.10.1/sip/QtQuick/qquickview.sip 2018-02-27 11:43:53.000000000 +0100 -+++ PyQt5_gpl-5.10.2.dev1803281228/sip/QtQuick/qquickview.sip 2018-03-29 03:32:18.000000000 +0200 -@@ -20,7 +20,7 @@ - // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - - --class QQuickView : QQuickWindow -+class QQuickView : QQuickWindow /ExportDerived/ - { - %TypeHeaderCode - #include <qquickview.h> -diff -ur --new-file PyQt5_gpl-5.10.1/sip/QtQuick/qquickwindow.sip PyQt5_gpl-5.10.2.dev1803281228/sip/QtQuick/qquickwindow.sip ---- PyQt5_gpl-5.10.1/sip/QtQuick/qquickwindow.sip 2018-02-27 11:43:53.000000000 +0100 -+++ PyQt5_gpl-5.10.2.dev1803281228/sip/QtQuick/qquickwindow.sip 2018-03-29 03:32:18.000000000 +0200 -@@ -20,7 +20,7 @@ - // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - - --class QQuickWindow : QWindow -+class QQuickWindow : QWindow /ExportDerived/ - { - %TypeHeaderCode - #include <qquickwindow.h> diff --git a/deps/PyQt5/slack-desc b/deps/PyQt5/slack-desc deleted file mode 100644 index 9c1fd74..0000000 --- a/deps/PyQt5/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -PyQt5: PyQt5 (Python bindings for Qt) -PyQt5: -PyQt5: PyQt5 is a set of Python bindings for Trolltech's Qt5 application -PyQt5: framework and runs on all platforms supported by Qt5. -PyQt5: -PyQt5: -PyQt5: -PyQt5: -PyQt5: -PyQt5: Homepage: http://www.riverbankcomputing.co.uk/software/pyqt/ -PyQt5: diff --git a/deps/QScintilla/.url b/deps/QScintilla/.url deleted file mode 100644 index 66849ec..0000000 --- a/deps/QScintilla/.url +++ /dev/null @@ -1 +0,0 @@ -https://www.riverbankcomputing.com/static/Downloads/QScintilla/QScintilla_gpl-2.11.1.tar.gz diff --git a/deps/QScintilla/QScintilla.SlackBuild b/deps/QScintilla/QScintilla.SlackBuild deleted file mode 100755 index 1ddc363..0000000 --- a/deps/QScintilla/QScintilla.SlackBuild +++ /dev/null @@ -1,221 +0,0 @@ -#!/bin/sh - -# Slackware build script for QScintilla - -# Copyright 2008 Robby Workman <rworkman@slackware.com> Northport, AL, USA -# Copyright 2008, 2009, 2010, 2011, 2012, 2018 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# 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. - -# Modified 2018, 2019 by Eric Hameleers <alien@slackware.com> (add Qt5 support) - -cd $(dirname $0) ; CWD=$(pwd) - -PKGNAM=QScintilla -VERSION=${VERSION:-2.11.1} -BUILD=${BUILD:-2} - -NUMJOBS=${NUMJOBS:-" -j$(nproc) "} - -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" - exit 0 -fi - -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" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf ${PKGNAM}_gpl-$VERSION -tar xvf $CWD/${PKGNAM}_gpl-$VERSION.tar.?z || exit 1 -cd ${PKGNAM}_gpl-$VERSION || exit 1 - -# Fix compilation: -cat $CWD/patches/QScintilla_qsciscintillabase_qurl.diff | patch -p1 --verbose || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Define QMAKEFEATURES to that we can re-use already built libs -# without spamming the harddisk: -export QMAKEFEATURES=${PWD}/Qt4Qt5/features/ - -# Conditional build of Qt5 support: -if qtpaths-qt5 --qt-version 1>/dev/null 2>/dev/null ; then - echo "-- Compiling Qt5 support --" - # QT5 support first: - cd Qt4Qt5 - echo "-- >> Qt4Qt5 --" - qmake-qt5 \ - -o Makefile \ - QMAKE_CFLAGS+="$SLKCFLAGS" \ - QMAKE_CXXFLAGS+="$SLKCFLAGS -std=c++11" \ - qscintilla.pro || exit 1 - make $NUMJOBS || exit 1 - make install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1 - cd - - - cd designer-Qt4Qt5 - echo "-- >> designer-Qt4Qt5 --" - qmake-qt5 \ - -o Makefile \ - INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 \ - QMAKE_CFLAGS+="$SLKCFLAGS" \ - QMAKE_CXXFLAGS+="$SLKCFLAGS -std=c++11" \ - designer.pro || exit 1 - make $NUMJOBS || exit 1 - make install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1 - cd - - - cd Python - echo "-- >> Python --" - python3 configure.py \ - --verbose \ - --qmake /usr/bin/qmake-qt5 \ - --pyqt=PyQt5 \ - -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c \ - || exit 1 - make || exit 1 - make -j1 install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1 - - make clean || exit 1 - - python2 configure.py \ - --verbose \ - --qmake /usr/bin/qmake-qt5 \ - --pyqt=PyQt5 \ - -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c \ - || exit 1 - make || exit 1 - make -j1 install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1 - cd - - - # In order to compile Qt4 support next, clean up first: - make clean -C Qt4Qt5 || exit 1 - make clean -C designer-Qt4Qt5 || exit 1 - make clean -C Python || exit 1 -fi - -# QT4 SUPPORT CURRENTLY DOES NOT COMPILE... -# /usr/lib64/qt/include/QtCore/qglobal.h:2242:20: error: invalid application of 'sizeof' to incomplete type 'QUrl' -# QT4 support: -echo "-- Compiling Qt4 support --" -cd Qt4Qt5 - echo "-- >> Qt4Qt5 --" - qmake \ - -o Makefile \ - QMAKE_CFLAGS+="$SLKCFLAGS" \ - QMAKE_CXXFLAGS+="$SLKCFLAGS -std=c++11" \ - qscintilla.pro || exit 1 - make $NUMJOBS || exit 1 - make install INSTALL_ROOT=$PKG || exit 1 -cd - - -cd designer-Qt4Qt5 - echo "-- >> designer-Qt4Qt5 --" - qmake \ - -o Makefile \ - INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 \ - QMAKE_CFLAGS+="$SLKCFLAGS" \ - QMAKE_CXXFLAGS+="$SLKCFLAGS -std=c++11" \ - designer.pro || exit 1 - make $NUMJOBS || exit 1 - make install INSTALL_ROOT=$PKG || exit 1 -cd - - -cd Python - echo "-- >> Python --" - python3 configure.py \ - --verbose \ - --qmake /usr/bin/qmake \ - -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c \ - || exit 1 - make -j1 || exit 1 - make -j1 install INSTALL_ROOT=$PKG || exit 1 - - make clean || exit 1 - - python2 configure.py \ - --verbose \ - --qmake /usr/bin/qmake \ - -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c \ - || exit 1 - make -j1 || exit 1 - make -j1 install INSTALL_ROOT=$PKG || exit 1 -cd - - -# Link the shared qt4 libraries into /usr/lib${LIBDIRSUFFIX}: -( cd $PKG/usr/lib${LIBDIRSUFFIX} - for file in $(ls -1 qt/lib/*.so* 2>/dev/null) ; do - ln -sf $file . - done -) - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - LICENSE NEWS README* \ - doc/html-Qt4Qt5 doc/Scintilla \ - $PKG/usr/doc/$PKGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/QScintilla/patches/QScintilla_qsciscintillabase_qurl.diff b/deps/QScintilla/patches/QScintilla_qsciscintillabase_qurl.diff deleted file mode 100644 index 9720a4b..0000000 --- a/deps/QScintilla/patches/QScintilla_qsciscintillabase_qurl.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- QScintilla_gpl-2.11.1/Qt4Qt5/qsciscintillabase.cpp.orig -+++ QScintilla_gpl-2.11.1/Qt4Qt5/qsciscintillabase.cpp -@@ -37,6 +37,7 @@ - #include <QScrollBar> - #include <QStyle> - #include <QTextCodec> -+#include <QUrl> - - #include "SciAccessibility.h" - #include "ScintillaQt.h" - diff --git a/deps/QScintilla/slack-desc b/deps/QScintilla/slack-desc deleted file mode 100644 index cb3fdd3..0000000 --- a/deps/QScintilla/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler--------------------------------------------------| -QScintilla: QScintilla (Qt port of the Scintilla C++ editor control) -QScintilla: -QScintilla: QScintilla includes features especially useful when editing and -QScintilla: debugging source code. These include support for syntax styling, -QScintilla: error indicators, code completion, and call tips. The selection -QScintilla: margin can contain markers like those used in debuggers to -QScintilla: indicate breakpoints and the current line. Styling choices are -QScintilla: more open than with many editors, allowing the use of -QScintilla: proportional fonts, bold and italics, multiple foreground and -QScintilla: background colours, and multiple fonts. -QScintilla: diff --git a/deps/SDL_sound/.url b/deps/SDL_sound/.url deleted file mode 100644 index 70b1017..0000000 --- a/deps/SDL_sound/.url +++ /dev/null @@ -1 +0,0 @@ -http://icculus.org/SDL_sound/downloads/SDL_sound-1.0.3.tar.gz diff --git a/deps/SDL_sound/SDL_sound.SlackBuild b/deps/SDL_sound/SDL_sound.SlackBuild deleted file mode 100755 index 99dfd4d..0000000 --- a/deps/SDL_sound/SDL_sound.SlackBuild +++ /dev/null @@ -1,114 +0,0 @@ -#!/bin/sh - -# Copyright 2019 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2019 Eric Hameleers, Eindhoven, NL -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -cd $(dirname $0) ; CWD=$(pwd) - -PKGNAM=SDL_sound -VERSION=${VERSION:-1.0.3} -BUILD=${BUILD:-1} - -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -# Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX: -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "arm" ]; then - SLKCFLAGS="-O2 -march=armv5te" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -case "$ARCH" in - arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; - *) TARGET=$ARCH-slackware-linux ;; -esac - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz" - exit 0 -fi - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.gz || exit 1 -cd $PKGNAM-$VERSION || exit 1 -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 \ - --disable-static \ - --build=$TARGET || exit 1 - -make || exit 1 -make install-strip DESTDIR=$PKG || exit 1 - -# Add documentation: -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a CHANGELOG COPYING CREDITS INSTALL README TODO \ - $PKG/usr/doc/$PKGNAM-$VERSION - -# Strip binaries (if any): -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -# Add a package description: -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -# Build the package: -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/SDL_sound/slack-desc b/deps/SDL_sound/slack-desc deleted file mode 100644 index 961108c..0000000 --- a/deps/SDL_sound/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------------------------------------------------------| -SDL_sound: SDL_sound (a sound library add-on for SDL) -SDL_sound: -SDL_sound: SDL_sound is a library to decode sseveral popular sound file formats, -SDL_sound: such as .WAV and .MP3. -SDL_sound: -SDL_sound: -SDL_sound: -SDL_sound: -SDL_sound: -SDL_sound: Homepage: https://icculus.org/SDL_sound/ -SDL_sound: diff --git a/deps/accountsservice/.url b/deps/accountsservice/.url index f11ad9a..f006aab 100644 --- a/deps/accountsservice/.url +++ b/deps/accountsservice/.url @@ -1 +1 @@ -https://www.freedesktop.org/software/accountsservice/accountsservice-0.6.45.tar.xz +https://www.freedesktop.org/software/accountsservice/accountsservice-0.6.55.tar.xz diff --git a/deps/accountsservice/accountsservice.SlackBuild b/deps/accountsservice/accountsservice.SlackBuild index fa52966..8ad729a 100755 --- a/deps/accountsservice/accountsservice.SlackBuild +++ b/deps/accountsservice/accountsservice.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2017 Eric Hameleers, Eindhoven, NL +# Copyright 2017, 2020 Eric Hameleers, Eindhoven, NL # Copyright 2017 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # @@ -25,7 +25,7 @@ PKGNAM=accountsservice -VERSION=${VERSION:-0.6.45} +VERSION=${VERSION:-0.6.55} BUILD=${BUILD:-2} CWD=$(pwd) @@ -72,6 +72,7 @@ cd $TMP rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 + chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -79,33 +80,39 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -[ ! -x configure ] && autoreconf -vif +# Choose correct options depending on whether elogind is installed: +if [ -L /lib${LIBDIRSUFFIX}/libelogind.so.? ]; then + DO_ELOGIND=true +else + DO_ELOGIND=false +fi -LDFLAGS="$SLKLDFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -CFLAGS="$SLKCFLAGS" \ -./configure \ +export LDFLAGS="$SLKLDFLAGS" +export CXXFLAGS="$SLKCFLAGS" +export CFLAGS="$SLKCFLAGS" +meson build \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ --localstatedir=/var \ --sysconfdir=/etc \ - --disable-gtk-doc \ - --disable-systemd \ - --enable-admin-group=wheel \ - --program-prefix= \ - --program-suffix= \ - --build=$TARGET + -D admin_group=wheel \ + -D docbook=false \ + -D gtk_doc=true \ + -D elogind=${DO_ELOGIND} \ + -D systemd=false \ + -D systemdsystemunitdir=no \ + -D user_heuristics=false \ + || exit 1 # Build and install: -make || exit 1 -make DESTDIR=$PKG install || exit 1 +"${NINJA:=ninja}" $NUMJOBS -C build || exit 1 +DESTDIR=$PKG meson install -C build || exit 1 # Add documentation: mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - AUTHORS COPYING NEWS README TODO \ + AUTHORS COPYING NEWS README* TODO \ $PKG/usr/doc/$PKGNAM-$VERSION # Compress the man page(s): diff --git a/deps/alldeps.SlackBuild b/deps/alldeps.SlackBuild index 29afcf6..6fdb0c4 100755 --- a/deps/alldeps.SlackBuild +++ b/deps/alldeps.SlackBuild @@ -15,33 +15,18 @@ QTDIR=/usr/lib${LIBDIRSUFFIX}/qt ; export QTDIR ALLDEPS=" \ extra-cmake-modules \ - ninja \ + elogind \ + md4c \ sni-qt \ - libwacom \ - libinput \ - libxkbcommon \ - wayland \ - hyphen \ - qt5 \ - qt5-webkit \ - SDL_sound \ - OpenAL \ - qt-gstreamer \ qjson \ phonon \ phonon-gstreamer \ + phonon-qt4 \ + phonon-qt4-gstreamer \ python-enum34 \ pyxdg \ - pcaudiolib \ - espeak-ng \ dotconf \ - flite \ speech-dispatcher \ - qt5-speech \ - sip \ - PyQt \ - PyQt5 \ - QScintilla \ qca-qt5 \ libdbusmenu-qt5 \ polkit-qt-1 \ @@ -49,20 +34,12 @@ ALLDEPS=" \ grantlee \ grantlee-qt4 \ poppler \ - json-glib \ libdbusmenu-gtk \ libindicator \ libappindicator \ cfitsio \ - lmdb \ libdmtx \ qrencode \ - libproxy \ - telepathy \ - hack-font-ttf \ - noto-font-ttf \ - noto-cjk-font-ttf \ - gpgme \ lensfun \ opencv \ dvdauthor \ @@ -85,11 +62,13 @@ ALLDEPS=" \ drumstick \ libsass \ sassc \ + rttr \ + quazip \ + kdsoap \ + libqalculate \ + exiv2 \ + pipewire \ " - # Only needed when adding support for Wayland: - #elogind \ - # Not needed, conflicts with qt-gstreamer files - #qt-gstreamer0 \ # Allow for specification of individual packages to be built: if [ -z "$1" ]; then diff --git a/deps/autoconf-archive/autoconf-archive.SlackBuild b/deps/autoconf-archive/autoconf-archive.SlackBuild new file mode 100755 index 0000000..2a93c07 --- /dev/null +++ b/deps/autoconf-archive/autoconf-archive.SlackBuild @@ -0,0 +1,70 @@ +#!/bin/sh + +# Slackware build script for autoconf-archive + +# Copyright 2018-2019 Hunter Sezen California, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=autoconf-archive +VERSION=${VERSION:-2019.01.06} +BUILD=${BUILD:-1} + +ARCH=noarch + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz +cd $PKGNAM-$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 {} \; + +[ ! -x configure ] && autoreconf -vif + +./configure \ + --prefix=/usr \ + --infodir=/usr/info \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --build=$ARCH-slackware-linux + +make +make install DESTDIR=$PKG + +rm -f $PKG/usr/info/dir +gzip -9 $PKG/usr/info/*.info* + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a ChangeLog INSTALL NEWS TODO $PKG/usr/doc/$PKGNAM-$VERSION +cat $CWD/$PKGNAM.SlackBuild > $PKG/usr/doc/$PKGNAM-$VERSION/$PKGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/deps/autoconf-archive/autoconf-archive.info b/deps/autoconf-archive/autoconf-archive.info new file mode 100644 index 0000000..cfda18c --- /dev/null +++ b/deps/autoconf-archive/autoconf-archive.info @@ -0,0 +1,10 @@ +PRGNAM="autoconf-archive" +VERSION="2019.01.06" +HOMEPAGE="https://www.gnu.org/software/autoconf-archive/" +DOWNLOAD="https://ftpmirror.gnu.org/autoconf-archive/autoconf-archive-2019.01.06.tar.xz" +MD5SUM="d46413c8b00a125b1529bae385bbec55" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Hunter Sezen" +EMAIL="orbea@riseup.net" diff --git a/deps/autoconf-archive/slack-desc b/deps/autoconf-archive/slack-desc new file mode 100644 index 0000000..5264c36 --- /dev/null +++ b/deps/autoconf-archive/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------------------------------------------------------| +autoconf-archive: autoconf-archive (GNU Autoconf macros) +autoconf-archive: +autoconf-archive: The GNU Autoconf Archive is a collection of more than 500 macros for +autoconf-archive: GNU Autoconf that have been contributed as free software by friendly +autoconf-archive: supporters of the cause from all over the Internet. +autoconf-archive: +autoconf-archive: Homepage: https://www.gnu.org/software/autoconf-archive/ +autoconf-archive: +autoconf-archive: +autoconf-archive: +autoconf-archive: diff --git a/deps/cracklib/.url b/deps/cracklib/.url deleted file mode 100644 index ef871d8..0000000 --- a/deps/cracklib/.url +++ /dev/null @@ -1 +0,0 @@ -https://github.com/cracklib/cracklib/releases/download/cracklib-2.9.6/cracklib-2.9.6.tar.gz diff --git a/deps/cracklib/cracklib.SlackBuild b/deps/cracklib/cracklib.SlackBuild deleted file mode 100755 index 20fcd55..0000000 --- a/deps/cracklib/cracklib.SlackBuild +++ /dev/null @@ -1,142 +0,0 @@ -#!/bin/sh - -# Copyright 2017 Eric Hameleers, Eindhoven, NL -# Copyright 2017 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Permission to use, copy, modify, and distribute this software for -# any purpose with or without fee is hereby granted, provided that -# the above copyright notice and this permission notice appear in all -# copies. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR -# 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. -# ----------------------------------------------------------------------------- - - -PKGNAM=cracklib -VERSION=${VERSION:-2.9.6} -BUILD=${BUILD:-1} - -DICTPATH=/usr/share/cracklib/pw_dict - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i486 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -case "$ARCH" in - i486) SLKCFLAGS="-O2 -march=i486 -mtune=i686" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; - x86_64) SLKCFLAGS="-O2 -fPIC" - SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64" - ;; - armv7hl) SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; - armv6hl) SLKCFLAGS="-O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; - *) SLKCFLAGS=${SLKCFLAGS:-"O2"} - SLKLDFLAGS=${SLKLDFLAGS:-""}; LIBDIRSUFFIX=${LIBDIRSUFFIX:-""} - ;; -esac - -case "$ARCH" in - arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; - *) TARGET=$ARCH-slackware-linux ;; -esac - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.gz || exit 1 -cd $PKGNAM-$VERSION || exit 1 - -# CVE-2016-6318 - avoid overflows in GECOS handling and mangling password: -cat $CWD/patches/cracklib-2.9.6-cve-2016-6318.patch \ - | patch -p2 --verbose || exit 1 - -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 {} \; - -[ ! -x configure ] && ./autogen.sh - -LDFLAGS="$SLKLDFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -CFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --localstatedir=/var \ - --sysconfdir=/etc \ - --program-prefix= \ - --program-suffix= \ - --disable-static \ - --without-python \ - --with-default-dict=${DICTPATH} \ - --build=$TARGET - -# Build and install: -make || exit 1 -make DESTDIR=$PKG install || exit 1 - -# Generate a dictionary from the included 'cracklib-small'; -# If you want, you can download a larger file from the project web site: -mkdir -p $PKG/usr/share/dict -ln -sf /usr/share/cracklib/cracklib-small $PKG/usr/share/dict/cracklib-small -sh util/cracklib-format dicts/cracklib-small \ - | ./util/cracklib-packer $PKG/${DICTPATH} - -# Add documentation: -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - AUTHORS INSTALL NEWS README* \ - $PKG/usr/doc/$PKGNAM-$VERSION - -# Compress the man page(s): -if [ -d $PKG/usr/man ]; then - find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; - for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -fi - -# Strip binaries (if any): -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -# Add a package description: -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -# Build the package: -cd $PKG -/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz - diff --git a/deps/cracklib/patches/cracklib-2.9.6-cve-2016-6318.patch b/deps/cracklib/patches/cracklib-2.9.6-cve-2016-6318.patch deleted file mode 100644 index bc47734..0000000 --- a/deps/cracklib/patches/cracklib-2.9.6-cve-2016-6318.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 47e5dec521ab6243c9b249dd65b93d232d90d6b1 Mon Sep 17 00:00:00 2001 -From: Jan Dittberner <jan@dittberner.info> -Date: Thu, 25 Aug 2016 17:13:49 +0200 -Subject: [PATCH] Apply patch to fix CVE-2016-6318 - -This patch fixes an issue with a stack-based buffer overflow whne -parsing large GECOS field. See -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-6318 and -https://security-tracker.debian.org/tracker/CVE-2016-6318 for more -information. ---- - src/NEWS | 1 + - src/lib/fascist.c | 57 ++++++++++++++++++++++++++++++++----------------------- - 2 files changed, 34 insertions(+), 24 deletions(-) - -diff --git a/src/NEWS b/src/NEWS -index 26abeee..361a207 100644 ---- a/src/NEWS -+++ b/src/NEWS -@@ -1,3 +1,4 @@ -+v2.9.x apply patch to fix CVE-2016-6318 Stack-based buffer overflow when parsing large GECOS field - v2.9.6 updates to cracklib-words to add a bunch of other dictionary lists - migration to github - patch to add some particularly bad cases to the cracklib small dictionary (Matthew Miller) -diff --git a/src/lib/fascist.c b/src/lib/fascist.c -index a996509..d4deb15 100644 ---- a/src/lib/fascist.c -+++ b/src/lib/fascist.c -@@ -502,7 +502,7 @@ FascistGecosUser(char *password, const char *user, const char *gecos) - char gbuffer[STRINGSIZE]; - char tbuffer[STRINGSIZE]; - char *uwords[STRINGSIZE]; -- char longbuffer[STRINGSIZE * 2]; -+ char longbuffer[STRINGSIZE]; - - if (gecos == NULL) - gecos = ""; -@@ -583,38 +583,47 @@ FascistGecosUser(char *password, const char *user, const char *gecos) - { - for (i = 0; i < j; i++) - { -- strcpy(longbuffer, uwords[i]); -- strcat(longbuffer, uwords[j]); -- -- if (GTry(longbuffer, password)) -+ if (strlen(uwords[i]) + strlen(uwords[j]) < STRINGSIZE) - { -- return _("it is derived from your password entry"); -- } -+ strcpy(longbuffer, uwords[i]); -+ strcat(longbuffer, uwords[j]); - -- strcpy(longbuffer, uwords[j]); -- strcat(longbuffer, uwords[i]); -+ if (GTry(longbuffer, password)) -+ { -+ return _("it is derived from your password entry"); -+ } - -- if (GTry(longbuffer, password)) -- { -- return _("it's derived from your password entry"); -- } -+ strcpy(longbuffer, uwords[j]); -+ strcat(longbuffer, uwords[i]); - -- longbuffer[0] = uwords[i][0]; -- longbuffer[1] = '\0'; -- strcat(longbuffer, uwords[j]); -+ if (GTry(longbuffer, password)) -+ { -+ return _("it's derived from your password entry"); -+ } -+ } - -- if (GTry(longbuffer, password)) -+ if (strlen(uwords[j]) < STRINGSIZE - 1) - { -- return _("it is derivable from your password entry"); -+ longbuffer[0] = uwords[i][0]; -+ longbuffer[1] = '\0'; -+ strcat(longbuffer, uwords[j]); -+ -+ if (GTry(longbuffer, password)) -+ { -+ return _("it is derivable from your password entry"); -+ } - } - -- longbuffer[0] = uwords[j][0]; -- longbuffer[1] = '\0'; -- strcat(longbuffer, uwords[i]); -- -- if (GTry(longbuffer, password)) -+ if (strlen(uwords[i]) < STRINGSIZE - 1) - { -- return _("it's derivable from your password entry"); -+ longbuffer[0] = uwords[j][0]; -+ longbuffer[1] = '\0'; -+ strcat(longbuffer, uwords[i]); -+ -+ if (GTry(longbuffer, password)) -+ { -+ return _("it's derivable from your password entry"); -+ } - } - } - } diff --git a/deps/cracklib/slack-desc b/deps/cracklib/slack-desc deleted file mode 100644 index 0f475fb..0000000 --- a/deps/cracklib/slack-desc +++ /dev/null @@ -1,20 +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------------------------------------------------------| -cracklib: cracklib (password crack library) -cracklib: -cracklib: CrackLib is a library allowing a "passwd"-like program to filter out -cracklib: passwords that are considered easy to crack by brute-force. -cracklib: Cracklib uses dictionary lists of easy to guess passwords. -cracklib: -cracklib: -cracklib: -cracklib: -cracklib: See also: https://github.com/cracklib/cracklib -cracklib: - diff --git a/deps/cryfs/.url b/deps/cryfs/.url index 002fe91..fea16bf 100644 --- a/deps/cryfs/.url +++ b/deps/cryfs/.url @@ -1 +1 @@ -https://github.com/cryfs/cryfs/releases/download/0.9.9/cryfs-0.9.9.tar.xz +https://github.com/cryfs/cryfs/releases/download/0.10.2/cryfs-0.10.2.tar.xz diff --git a/deps/cryfs/cryfs.SlackBuild b/deps/cryfs/cryfs.SlackBuild index 0c8a195..a7a2463 100755 --- a/deps/cryfs/cryfs.SlackBuild +++ b/deps/cryfs/cryfs.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2018 Eric Hameleers, Eindhoven, NL +# Copyright 2018, 2019, 2020 Eric Hameleers, Eindhoven, NL # Copyright 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # @@ -27,8 +27,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=cryfs -VERSION=${VERSION:-0.9.9} -BUILD=${BUILD:-6} +VERSION=${VERSION:-0.10.2} +BUILD=${BUILD:-3} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -81,7 +81,7 @@ cd $TMP rm -rf $PKGNAM-$VERSION mkdir $PKGNAM-$VERSION cd $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 # Fix bogus permissions: chown -R root:root . @@ -92,6 +92,8 @@ find . \ -exec chmod 644 {} \; # Configure and compile: +export LDFLAGS="$SLKLDFLAGS -lboost_thread -lboost_program_options -lboost_filesystem -lboost_chrono -lcryptopp -lfuse" + mkdir -p build cd build cmake \ @@ -102,13 +104,21 @@ cd build -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_MANDIR=/usr/man \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DBUILD_TESTING=OFF \ - -DBoost_USE_STATIC_LIBS=off \ + -DBUILD_SHARED_LIBS=ON \ + -DBUILD_TESTING=OFF \ + -DBoost_INCLUDE_DIRS=/usr/include/boost \ + -DBoost_USE_STATIC_LIBS=OFF \ -DCRYFS_UPDATE_CHECKS=OFF \ .. make make install DESTDIR=$PKG + + # Since we don't have static boost libraries, compile & install goes south + # and we end up with a set of dynamically linked binaries. + mkdir -p $PKG/usr/lib${LIBDIRSUFFIX} + install -m0755 ./src/cryfs-cli/libcryfs-cli.so $PKG/usr/lib${LIBDIRSUFFIX}/libcryfs-cli.so + install -m0755 ./src/cryfs-unmount/libcryfs-unmount.so $PKG/usr/lib${LIBDIRSUFFIX}/libcryfs-unmount.so cd .. # Add documentation: diff --git a/deps/cryptopp/.url b/deps/cryptopp/.url index 3a7d5c8..1bc3357 100644 --- a/deps/cryptopp/.url +++ b/deps/cryptopp/.url @@ -1 +1 @@ -https://www.cryptopp.com/cryptopp700.zip +https://www.cryptopp.com/cryptopp820.zip diff --git a/deps/cryptopp/cryptopp.SlackBuild b/deps/cryptopp/cryptopp.SlackBuild index 97a4fd7..bfd1a62 100755 --- a/deps/cryptopp/cryptopp.SlackBuild +++ b/deps/cryptopp/cryptopp.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2014, 2018 Eric Hameleers, Eindhoven, NL +# Copyright 2014, 2018, 2019 Eric Hameleers, Eindhoven, NL # Copyright 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=cryptopp -VERSION=${VERSION:-7.0.0} +VERSION=${VERSION:-8.2.0} SRCVER=$(echo $VERSION | tr -d '.') BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-"-j$(nproc)"} @@ -86,9 +86,6 @@ mkdir -p ${PKGNAM}-${VERSION} unzip -a ${CWD}/${PKGNAM}${SRCVER}.zip -d ${PKGNAM}-${VERSION} || exit 1 cd ${PKGNAM}-${VERSION} || exit 1 -## Do not mess up the CXXFLAGS: -#cat $CWD/patches/cryptopp_slkcflags.patch | patch -p1 --verbose || exit 1 - # Fix bogus permissions: chown -R root:root . find . \ @@ -101,16 +98,14 @@ find . \ sed -i -e "s,(PREFIX)/lib,(PREFIX)/lib${LIBDIRSUFFIX},g" GNUmakefile # Compile and install: -make dynamic $NUMJOBS \ +make all dynamic libcryptopp.pc $NUMJOBS \ CXXFLAGS="${SLKCFLAGS} -DNDEBUG" LDFLAGS="${LDFLAGS}" -make install PREFIX=$PKG/usr - -# Install a pkg-config file: -mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig -cat $CWD/${PKGNAM}.pc | sed \ - -e "s,@LIBDIRSUFFIX@,${LIBDIRSUFFIX},g" \ - -e "s,@VERSION@,${VERSION},g" \ - > $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/cryptopp.pc +make install-lib PREFIX=$PKG/usr + +# Fix the installed pkg-config file: +sed \ + -i $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/libcryptopp.pc \ + -e "s,/usr/local,/usr,g" # Add documentation: mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION diff --git a/deps/cryptopp/cryptopp.pc b/deps/cryptopp/cryptopp.pc deleted file mode 100644 index 14dca21..0000000 --- a/deps/cryptopp/cryptopp.pc +++ /dev/null @@ -1,15 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${prefix}/lib@LIBDIRSUFFIX@ -includedir=${prefix}/include/cryptopp - -Name: Crypto++ -Description: A free C++ class library of cryptographic schemes -Version: @VERSION@ -URL: http://www.cryptopp.com -Requires: -Conflicts: -Libs: -L${libdir} -lcryptopp -Libs.private: -Cflags: -I${includedir} - diff --git a/deps/dbus/dbus-1.12.x-allow_root_globally.diff b/deps/dbus/dbus-1.12.x-allow_root_globally.diff new file mode 100644 index 0000000..2ff5a53 --- /dev/null +++ b/deps/dbus/dbus-1.12.x-allow_root_globally.diff @@ -0,0 +1,18 @@ +diff -Nur dbus-1.12.0.orig/bus/system.conf.in dbus-1.12.0/bus/system.conf.in +--- dbus-1.12.0.orig/bus/system.conf.in 2017-10-30 07:26:18.000000000 -0500 ++++ dbus-1.12.0/bus/system.conf.in 2017-10-31 00:17:34.989634085 -0500 +@@ -125,6 +125,14 @@ + <!-- <limit name="max_match_rules_per_connection">512</limit> --> + <!-- <limit name="max_replies_per_connection">128</limit> --> + ++ <!-- Allow root to do anything over the messagebus. ++ Don't whine about "security" - anyone with root privileges ++ can edit this file anyway, so -ENOHOLE here. --> ++ <policy user="root"> ++ <allow send_destination="*"/> ++ <allow send_interface="*"/> ++ </policy> ++ + <!-- Config files are placed here that among other things, punch + holes in the above policy for specific services. --> + <includedir>system.d</includedir> diff --git a/deps/dbus/dbus-enable-elogind.patch b/deps/dbus/dbus-enable-elogind.patch new file mode 100644 index 0000000..5cb5d64 --- /dev/null +++ b/deps/dbus/dbus-enable-elogind.patch @@ -0,0 +1,73 @@ +--- a/dbus/dbus-userdb-util.c 2015-09-30 16:48:40.000000000 +0200 ++++ b/dbus/dbus-userdb-util.c 2016-11-03 11:09:42.550520587 +0100 +@@ -32,6 +32,9 @@ + #if HAVE_SYSTEMD + #include <systemd/sd-login.h> + #endif ++#if HAVE_ELOGIND ++#include <elogind/sd-login.h> ++#endif + + /** + * @addtogroup DBusInternalsUtils +@@ -54,7 +57,7 @@ + const DBusUserInfo *info; + dbus_bool_t result = FALSE; + +-#ifdef HAVE_SYSTEMD ++#if defined(HAVE_SYSTEMD) || defined(HAVE_ELOGIND) + /* check if we have logind */ + if (access ("/run/systemd/seats/", F_OK) >= 0) + { +--- a/configure.ac 2016-11-03 11:13:58.286528265 +0100 ++++ b/configure.ac 2016-11-03 11:22:11.210543063 +0100 +@@ -185,6 +185,7 @@ + AC_ARG_ENABLE(kqueue, AS_HELP_STRING([--enable-kqueue],[build with kqueue support]),enable_kqueue=$enableval,enable_kqueue=auto) + AC_ARG_ENABLE(console-owner-file, AS_HELP_STRING([--enable-console-owner-file],[enable console owner file]),enable_console_owner_file=$enableval,enable_console_owner_file=auto) + AC_ARG_ENABLE(launchd, AS_HELP_STRING([--enable-launchd],[build with launchd auto-launch support]),enable_launchd=$enableval,enable_launchd=auto) ++AC_ARG_ENABLE(elogind, AS_HELP_STRING([--enable-elogind],[build with elogind user seat support]),enable_elogind=$enableval,enable_elogind=auto) + AC_ARG_ENABLE(systemd, AS_HELP_STRING([--enable-systemd],[build with systemd at_console support]),enable_systemd=$enableval,enable_systemd=auto) + + AC_ARG_WITH(init-scripts, AS_HELP_STRING([--with-init-scripts=[redhat]],[Style of init scripts to install])) +@@ -1184,6 +1185,24 @@ + + AM_CONDITIONAL(HAVE_CONSOLE_OWNER_FILE, test x$have_console_owner_file = xyes) + ++dnl elogind detection ++if test x$enable_elogind = xno ; then ++ have_elogind=no; ++else ++ PKG_CHECK_MODULES([ELOGIND], ++ [libelogind >= 209], ++ [have_elogind=yes], ++ [have_elogind=no]) ++fi ++ ++if test x$have_elogind = xyes; then ++ AC_DEFINE(HAVE_ELOGIND,1,[Have elogind]) ++fi ++ ++if test x$enable_elogind = xyes -a x$have_elogind != xyes ; then ++ AC_MSG_ERROR([Explicitly requested elogind support, but libelogind not found]) ++fi ++ + dnl systemd detection + if test x$enable_systemd = xno ; then + have_systemd=no; +@@ -1290,7 +1309,7 @@ + fi + + #### Set up final flags +-LIBDBUS_LIBS="$THREAD_LIBS $NETWORK_libs $SYSTEMD_LIBS" ++LIBDBUS_LIBS="$THREAD_LIBS $NETWORK_libs $SYSTEMD_LIBS $ELOGIND_LIBS" + AC_SUBST([LIBDBUS_LIBS]) + + ### X11 detection +@@ -1949,6 +1968,7 @@ + Building AppArmor support: ${have_apparmor} + Building inotify support: ${have_inotify} + Building kqueue support: ${have_kqueue} ++ Building elogind support: ${have_elogind} + Building systemd support: ${have_systemd} + Building X11 code: ${have_x11} + Building Doxygen docs: ${enable_doxygen_docs} diff --git a/deps/gpgme/gpgme.SlackBuild b/deps/dbus/dbus.SlackBuild index d9fe9f3..eb6364e 100755 --- a/deps/gpgme/gpgme.SlackBuild +++ b/deps/dbus/dbus.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash -# Copyright 2006-2009 Robby Workman, Northport, AL, USA -# Copyright 2007, 2008, 2009, 2010, 2016, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2007-2010 Robby Workman, Northport, Alabama, USA +# Copyright 2007-2018 Patrick Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -12,7 +12,7 @@ # # 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 +# 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; @@ -21,35 +21,25 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Modified 2017 by Eric Hameleers <alien@slackware.com> +# Modified 2020 by Eric Hameleers to add support for elogind. + cd $(dirname $0) ; CWD=$(pwd) -PKGNAM=gpgme -VERSION=${VERSION:-1.12.0} +PKGNAM=dbus +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} BUILD=${BUILD:-1} -# Find out the default python version: -if [ $( python -c 'import sys ; print sys.version_info[0]' ) -eq 3 ]; then - MYPY="python" -else - MYPY="python2" -fi - -NUMJOBS=${NUMJOBS:-"-j$(nproc)"} - -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + case "$( uname -m )" in + i?86) export ARCH=i586 ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; + *) export ARCH=$( uname -m ) ;; esac - export ARCH fi # If the variable PRINT_PACKAGE_NAME is set, then this script will report what @@ -59,6 +49,10 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" exit 0 fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" @@ -73,38 +67,48 @@ else LIBDIRSUFFIX="" fi -case "$ARCH" in - arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; - *) TARGET=$ARCH-slackware-linux ;; -esac - -rm -rf $PKG +rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 - chown -R root:root . find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ +cat $CWD/dbus-1.12.x-allow_root_globally.diff | patch -p1 --verbose || exit 1 +cat $CWD/dbus-enable-elogind.patch | patch -p1 --verbose || exit 1 + +NOCONFIGURE=1 ./autogen.sh || exit 1 CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ --infodir=/usr/info \ - --docdir=/usr/doc/gpgme-$VERSION \ - --enable-languages="cl cpp $MYPY qt" \ - --disable-gpgsm-test \ - --build=$TARGET \ - --host=$TARGET \ - || exit 1 + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --disable-doxygen-docs \ + --disable-apparmor \ + --disable-selinux \ + --enable-shared=yes \ + --enable-static=no \ + --enable-inotify \ + --enable-user-session \ + --enable-x11-autolaunch \ + --enable-elogind \ + --disable-systemd \ + --without-systemdsystemunitdir \ + --with-system-pid-file=/var/run/dbus/dbus.pid \ + --with-system-socket=/var/run/dbus/system_bus_socket \ + --with-console-auth-dir=/var/run/console \ + --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 @@ -115,13 +119,35 @@ rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -rm $PKG/usr/info/dir -gzip -9 $PKG/usr/info/* +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# Install a custom init script for dbus - the included one is not good for us +mkdir -p $PKG/etc/rc.d +zcat $CWD/rc.messagebus.gz > $PKG/etc/rc.d/rc.messagebus.new +chmod 0755 $PKG/etc/rc.d/rc.messagebus.new + +# Fix some directory ownership +chown messagebus $PKG/var/lib/dbus +# Add documentation mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - AUTHORS COPYING* INSTALL NEWS README* THANKS TODO VERSION \ + AUTHORS COPYING* HACKING INSTALL NEWS README* doc/*.{txt,html,dtd} \ $PKG/usr/doc/$PKGNAM-$VERSION +find $PKG/usr/doc/$PKGNAM-$VERSION -type f -exec chmod 0644 {} \+ # If there's a ChangeLog, installing at least part of the recent history # is useful, but don't let it get totally out of control: @@ -133,6 +159,7 @@ fi mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/deps/dbus/dbus.url b/deps/dbus/dbus.url new file mode 100644 index 0000000..ab5a193 --- /dev/null +++ b/deps/dbus/dbus.url @@ -0,0 +1 @@ +http://dbus.freedesktop.org/releases/dbus/ diff --git a/deps/dbus/doinst.sh.gz b/deps/dbus/doinst.sh.gz Binary files differnew file mode 100644 index 0000000..c116f02 --- /dev/null +++ b/deps/dbus/doinst.sh.gz diff --git a/deps/dbus/rc.messagebus.gz b/deps/dbus/rc.messagebus.gz Binary files differnew file mode 100644 index 0000000..6c002bb --- /dev/null +++ b/deps/dbus/rc.messagebus.gz diff --git a/deps/dbus/slack-desc b/deps/dbus/slack-desc new file mode 100644 index 0000000..524723d --- /dev/null +++ b/deps/dbus/slack-desc @@ -0,0 +1,18 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + |-----handy-ruler------------------------------------------------------| +dbus: dbus (D-Bus message bus system) +dbus: +dbus: D-Bus supplies both a system daemon (for events such as "new hardware +dbus: device added" or "printer queue changed") and a per user login +dbus: session daemon (for general IPC needs among user applications). +dbus: Also, the message bus is built on top of a general one-to-one message +dbus: passing framework, which can be used by any two apps to communicate +dbus: directly (without going through the message bus daemon). +dbus: +dbus: Homepage: https://dbus.freedesktop.org/ +dbus: diff --git a/deps/dvdauthor/dvdauthor.SlackBuild b/deps/dvdauthor/dvdauthor.SlackBuild index fc1caaf..07b7f32 100755 --- a/deps/dvdauthor/dvdauthor.SlackBuild +++ b/deps/dvdauthor/dvdauthor.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2017, 2018 Eric Hameleers, Eindhoven, NL +# Copyright 2017, 2018, 2019, 2020 Eric Hameleers, Eindhoven, NL # Copyright 2017 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # @@ -26,7 +26,7 @@ PKGNAM=dvdauthor VERSION=${VERSION:-0.7.2} -BUILD=${BUILD:-4} +BUILD=${BUILD:-6} NUMJOBS=${NUMJOBS:-"-j$(nproc)"} CWD=$(pwd) @@ -73,6 +73,10 @@ cd $TMP rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.gz || exit 1 cd $PKGNAM-$VERSION || exit 1 + +# Make it compile with imagemagick 7.x: +cat $CWD/patches/dvdauthor-0.7.2_imagemagick7.patch | patch -p1 --verbose || exit 1 + chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/deps/dvdauthor/patches/dvdauthor-0.7.2_imagemagick7.patch b/deps/dvdauthor/patches/dvdauthor-0.7.2_imagemagick7.patch new file mode 100644 index 0000000..0f6bed4 --- /dev/null +++ b/deps/dvdauthor/patches/dvdauthor-0.7.2_imagemagick7.patch @@ -0,0 +1,75 @@ +--- dvdauthor/src/subgen-image.c 2014-01-21 00:12:37.000000000 +0100 ++++ dvdauthor/src/subgen-image.c 2017-11-27 20:26:53.682914041 +0100 +@@ -30,7 +30,7 @@ + + #if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK) + #include <stdarg.h> +-#include <magick/api.h> ++#include <MagickWand/MagickWand.h> + #else + #include <png.h> + #endif +@@ -176,18 +176,18 @@ + { + Image *im; + ImageInfo *ii; +- ExceptionInfo ei; ++ ExceptionInfo *ei; + int x,y; + unsigned long magickver; + unsigned char amask; + +- GetExceptionInfo(&ei); ++ ei = AcquireExceptionInfo(); + ii=CloneImageInfo(NULL); + strcpy(ii->filename,s->fname); +- im=ReadImage(ii,&ei); ++ im=ReadImage(ii,ei); + + if( !im ) { +- MagickError(ei.severity,"Unable to load file",ii->filename); ++ MagickError(ei->severity,"Unable to load file",ii->filename); + return -1; + } + +@@ -202,10 +202,10 @@ + for( y=0; y<im->rows; y++ ) { + char pdata[MAXX*4]; + +- if(!ExportImagePixels(im,0,y,im->columns,1,"RGBA",CharPixel,pdata,&ei)) { +- fprintf(stderr,"ERR: Extracting row %d from %s (%s,%s)\n",y,s->fname,ei.reason,ei.description); +- CatchException(&ei); +- MagickError(ei.severity,ei.reason,ei.description); ++ if(!ExportImagePixels(im,0,y,im->columns,1,"RGBA",CharPixel,pdata,ei)) { ++ fprintf(stderr,"ERR: Extracting row %d from %s (%s,%s)\n",y,s->fname,ei->reason,ei->description); ++ CatchException(ei); ++ MagickError(ei->severity,ei->reason,ei->description); + DestroyImage(im); + return -1; + } +@@ -219,7 +219,7 @@ + } + } + DestroyImage(im); +- DestroyExceptionInfo(&ei); ++ DestroyExceptionInfo(ei); + fprintf(stderr,"INFO: Picture %s had %d colors\n",s->fname,s->numpal); + + return 0; +@@ -1098,13 +1098,13 @@ + void image_init() + { + #if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK) +- InitializeMagick(NULL); ++ MagickCoreGenesis("", MagickFalse); + #endif + } + + void image_shutdown() + { + #if defined(HAVE_MAGICK) || defined(HAVE_GMAGICK) +- DestroyMagick(); ++ MagickCoreTerminus(); + #endif + } + diff --git a/deps/elogind/.url b/deps/elogind/.url index 444f958..2fd0c45 100644 --- a/deps/elogind/.url +++ b/deps/elogind/.url @@ -1,2 +1 @@ -https://github.com/wingo/elogind/archive/v219.12.tar.gz -https://github.com/wingo/elogind/archive/master.zip +https://github.com/elogind/elogind/archive/v243.7.tar.gz diff --git a/deps/elogind/doinst.sh b/deps/elogind/doinst.sh index 75adb23..dc85465 100755 --- a/deps/elogind/doinst.sh +++ b/deps/elogind/doinst.sh @@ -26,16 +26,23 @@ preserve_perms() { # # Preserve permissions while moving into place: +config etc/elogind/logind.conf.new preserve_perms etc/rc.d/rc.elogind.new -# -# Update rc.local so that elogind will be functional after boot: -if ! grep "rc.elogind" etc/rc.d/rc.local 1>/dev/null 2>/dev/null ; then - cat <<_EOM_ >> etc/rc.d/rc.local - -if [ -x /etc/rc.d/rc.elogind ]; then - # Create runtime for elogind (standalone logind extracted from systemd): - /etc/rc.d/rc.elogind -fi -_EOM_ +if pgrep -f elogind-daemon | grep -q 'elogind-daemon'; then + echo "Reloading elogind-daemon..." + pkill -HUP -f elogind-daemon fi + +## Now taken care of in Slackware's /etc/rc.d/rc.M: +## +## Update rc.local so that elogind will be functional after boot: +#if ! grep "rc.elogind" etc/rc.d/rc.local 1>/dev/null 2>/dev/null ; then +# cat <<_EOM_ >> etc/rc.d/rc.local +# +#if [ -x /etc/rc.d/rc.elogind ]; then +# # Create runtime for elogind (standalone logind extracted from systemd): +# /etc/rc.d/rc.elogind start +#fi +#_EOM_ +#fi diff --git a/deps/elogind/elogind.SlackBuild b/deps/elogind/elogind.SlackBuild index b9d2d70..0160852 100755 --- a/deps/elogind/elogind.SlackBuild +++ b/deps/elogind/elogind.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # Copyright 2016 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2016, 2017 Eric Hameleers, Eindhoven, NL +# Copyright 2016, 2017, 2020 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -22,54 +22,52 @@ # SUCH DAMAGE. # ----------------------------------------------------------------------------- +# Thanks to Widya Walesa for script improvements. -PKGNAM=elogind -VERSION=${VERSION:-219.14} -BUILD=${BUILD:-2} +cd $(dirname $0) ; CWD=$(pwd) -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM +PKGNAM=elogind +VERSION=${VERSION:-243.7} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi -# We do not use PAM by default: -USE_PAM=${USE_PAM:-"NO"} -[ "$USE_PAM" = "NO" -o "$USE_PAM" = "no" ] && DO_PAM="dis" || DO_PAM="en" +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi -if [ -e $CWD/machine.conf ]; then - . $CWD/machine.conf ] -elif [ -e /etc/slackbuild/machine.conf ]; then - . /etc/slackbuild/machine.conf ] +# Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX: +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "arm" ]; then + SLKCFLAGS="-O2 -march=armv5te" + LIBDIRSUFFIX="" else - # Automatically determine the architecture we're building on: - MARCH=$( uname -m ) - if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i486 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$MARCH ;; - esac - fi - # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX: - if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" - elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" - elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" - elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" - elif [ "$ARCH" = "arm" ]; then - SLKCFLAGS="-O2 -march=armv5te" - LIBDIRSUFFIX="" - else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" - fi + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi case "$ARCH" in @@ -77,6 +75,9 @@ case "$ARCH" in *) TARGET=$ARCH-slackware-linux ;; esac +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP @@ -84,16 +85,14 @@ rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.gz || exit 1 cd $PKGNAM-$VERSION || exit 1 +# Our nobody user has UIDNumber 99, not 65534: +sed -e "s/65534/99/g" -i $(grep -lr 65534 .) + # Launch elogind when called via DBus and make sure its rundir exists # (in Slackware, /run is mounted as a tmpfs): -sed -i src/login/org.freedesktop.login1.service \ - -e "s,/bin/false,/bin/bash -c \"[[ ! -d /run/systemd ]] \&\& mkdir /run/systemd;/usr/libexec/elogind/elogind\"," - -# Apply Gentoo patches: -#cat $CWD/patches/elogind-219.12-session.patch | patch -p1 --verbose || exit 1 -cat $CWD/patches/elogind-219.12-runtime.patch | patch -p1 --verbose || exit 1 -cat $CWD/patches/elogind-lrt.patch | patch -p1 --verbose || exit 1 -cat $CWD/patches/elogind-docs.patch | patch -p1 --verbose || exit 1 +sed -i src/login/org.freedesktop.login1.service.in \ + -e "s,/bin/false,/lib${LIBDIRSUFFIX}/elogind," + # Merge a pull request for an upstream fix: cat $CWD/patches/elogind-polkit.patch | patch -p1 --verbose || exit 1 @@ -105,31 +104,54 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Thanks to Widya Walesa: +# Slackware still using cgroup v1 or legacy mode. Check the outcome of: +# [ $(stat -fc %T /sys/fs/cgroup/) = "cgroup2fs" ] && echo "unified" \ +# || ( [ -e /sys/fs/cgroup/unified/ ] && echo "hybrid" || echo "legacy") + # Configure: -autoreconf -vif -intltoolize -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --libexecdir=/usr/libexec \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --disable-seccomp \ - --disable-selinux \ - --disable-apparmor \ - --${DO_PAM}able-pam \ - --disable-smack \ - --disable-tests \ - --enable-split-usr \ - --build=$TARGET +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +meson \ + --buildtype release \ + --prefix /usr \ + --libdir /usr/lib${LIBDIRSUFFIX} \ + -Drootlibdir="/lib${LIBDIRSUFFIX}" \ + -Drootlibexecdir="/lib${LIBDIRSUFFIX}/elogind" \ + -Dudevrulesdir="/etc/udev/rules.d" \ + -Ddocdir="/usr/doc/$PKGNAM-$VERSION" \ + -Dhtmldir="/usr/doc/$PKGNAM-$VERSION/html" \ + -Dmandir="/usr/man" \ + -Dman=true \ + -Dhtml=false \ + -Dbashcompletiondir="/usr/share/bash-completion/completions" \ + -Dnobody-group=nogroup \ + -Dpam=true \ + -Dpamlibdir="/lib${LIBDIRSUFFIX}/security" \ + -Dpamconfdir="/etc/pam.d" \ + -Dacl=true \ + -Dsmack=false \ + -Dutmp=true \ + -Ddefault-hierarchy=legacy \ + -Dcgroup-controller=elogind \ + -Dhalt-path=/sbin/halt \ + -Dpoweroff-path=/sbin/poweroff \ + -Dreboot-path=/sbin/reboot \ + -Ddefault-kill-user-processes=false \ + build_elogind \ + || exit 1 # Build and install: -make || exit 1 -make install DESTDIR=$PKG || exit 1 +ninja -C build_elogind || exit 1 +DESTDIR=$PKG ninja install -C build_elogind || exit 1 + +# Create symlinks for elogind binaries to /usr/bin/: +mkdir -p $PKG/usr/bin +ln -sf /bin/elogind-inhibit $PKG/usr/bin/elogind-inhibit +ln -sf /bin/loginctl $PKG/usr/bin/loginctl + +# Make sure we do not overwrite the user's customizations: +mv -i $PKG/etc/elogind/logind.conf{,.new} # Strip binaries: find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ @@ -150,14 +172,18 @@ if [ -d $PKG/usr/man ]; then ) fi -# Add a rc script; Slackware does not support this out of the box: +# Add a rc script; Slackware does not yet support this out of the box. +# Preferably the rc code will get added right before starting rc.messagebus: mkdir -p $PKG/etc/rc.d -install -m 0755 $CWD/rc.elogind $PKG/etc/rc.d/rc.elogind.new +cat $CWD/rc.elogind \ + | sed -e "s/@LIBDIRSUFFIX@/${LIBDIRSUFFIX}/g" \ + > $PKG/etc/rc.d/rc.elogind.new +chmod 755 $PKG/etc/rc.d/rc.elogind.new # Add documentation: mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - CODING_STYLE LICENSE* NEWS README TODO \ + LICENSE* README* TODO \ $PKG/usr/doc/$PKGNAM-$VERSION # Add a description and post-install script: diff --git a/deps/elogind/rc.elogind b/deps/elogind/rc.elogind index b1adcaa..e5e7324 100644 --- a/deps/elogind/rc.elogind +++ b/deps/elogind/rc.elogind @@ -1,9 +1,12 @@ # # /etc/rc.d/rc.elogind # Initializes the elogind service on Slackware. +# There is no need to explicitly start a daemon; this will be taken +# care of automatically by dbus when that starts. # # Author: # Eric Hameleers <alien@slackware.com> 2016 +# Widya Walesa 2020 # # Description: # We use elogind (standalone subset extracted from systemd) instead of @@ -13,17 +16,51 @@ # Slackware has a tmpfs mounted on /run (see rc.S). # -# The systemd/elogind state directory: -mkdir -p /run/systemd -chmod 0755 /run/systemd +start_elogind() { + if [ -x /lib@LIBDIRSUFFIX@/elogind/elogind ]; then + if [ ! -d /run/user ]; then + mkdir -p /run/user + fi + if [ ! -d /run/systemd ]; then + mkdir -p /run/elogind /sys/fs/cgroup/elogind + ( cd /run; rm -rf systemd; ln -sf elogind systemd; ) + ( cd /sys/fs/cgroup; rm -rf systemd; ln -sf elogind systemd; ) + fi + if pgrep -l -F /run/elogind.pid 2>/dev/null | grep -q elogind; then + echo "Elogind is already running" + else + echo -n "Starting elogind: " + rm -f /run/elogind.pid + /lib@LIBDIRSUFFIX@/elogind/elogind --daemon + echo "/lib@LIBDIRSUFFIX@/elogind/elogind --daemon" + fi + fi +} -# Toplevel directory for runtime user session data: -mkdir -p /run/user -chmod 1777 /run/user +stop_elogind() { + if pgrep -l -F /run/elogind.pid 2>/dev/null | grep -q elogind; then + echo -n "Stopping elogind: " + pkill -F /run/elogind.pid 2>/dev/null + echo "DONE" + else + echo "Elogind is not running" + fi +} + +case "$1" in + start) + start_elogind + ;; + stop) + stop_elogind + ;; + restart) + stop_elogind + sleep 1 + start_elogind + ;; + *) + echo "Usage: $0 start|stop|restart" +esac -# Elogind uses cgroups to organize processes like mapping PIDs to sessions. -# Elogind's cgroup hierarchy isn't associated with any resource controller -# ("subsystem") so we must create it manually: -mkdir -p /sys/fs/cgroup/elogind -mount -t cgroup -o none,name=elogind elogind /sys/fs/cgroup/elogind diff --git a/deps/espeak-ng/.deps b/deps/espeak-ng/.deps deleted file mode 100644 index 60c2f98..0000000 --- a/deps/espeak-ng/.deps +++ /dev/null @@ -1 +0,0 @@ -pcaudiolib diff --git a/deps/espeak-ng/.url b/deps/espeak-ng/.url deleted file mode 100644 index a1127ef..0000000 --- a/deps/espeak-ng/.url +++ /dev/null @@ -1 +0,0 @@ -https://github.com/espeak-ng/espeak-ng/releases/download/1.49.2/espeak-ng-1.49.2.tar.gz diff --git a/deps/espeak-ng/espeak-ng.SlackBuild b/deps/espeak-ng/espeak-ng.SlackBuild deleted file mode 100755 index 5a530da..0000000 --- a/deps/espeak-ng/espeak-ng.SlackBuild +++ /dev/null @@ -1,118 +0,0 @@ -#!/bin/sh - -# Copyright 2019 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2019 Eric Hameleers, Eindhoven, NL -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -cd $(dirname $0) ; CWD=$(pwd) - -PKGNAM=espeak-ng -VERSION=${VERSION:-1.49.2} -BUILD=${BUILD:-1} - -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -# Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX: -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "arm" ]; then - SLKCFLAGS="-O2 -march=armv5te" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -case "$ARCH" in - arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; - *) TARGET=$ARCH-slackware-linux ;; -esac - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz" - exit 0 -fi - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.gz || exit 1 -cd $PKGNAM-$VERSION || exit 1 -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 {} \; - -[ ! -x configure ] && ./autogen.sh - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --disable-static \ - --build=$TARGET || exit 1 - -make src/espeak-ng src/speak-ng || exit 1 -make -j1 || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Add documentation: -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - AUTHORS CHANGELOG.md COPYING* ChangeLog README.md \ - $PKG/usr/doc/$PKGNAM-$VERSION - -# Strip binaries (if any): -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -# Add a package description: -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -# Build the package: -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/espeak-ng/slack-desc b/deps/espeak-ng/slack-desc deleted file mode 100644 index a4308ab..0000000 --- a/deps/espeak-ng/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------------------------------------------------------| -espeak-ng: espeak-ng (multi-lingual software speech synthesizer) -espeak-ng: -espeak-ng: espeak-ng is a multi-lingual software speech synthesizer. -espeak-ng: It is a fork of the unmaintained espeak code. -espeak-ng: -espeak-ng: -espeak-ng: -espeak-ng: -espeak-ng: -espeak-ng: Homepage: https://github.com/espeak-ng/espeak-ng -espeak-ng: diff --git a/deps/exiv2/exiv2.SlackBuild b/deps/exiv2/exiv2.SlackBuild new file mode 100755 index 0000000..28fc6c7 --- /dev/null +++ b/deps/exiv2/exiv2.SlackBuild @@ -0,0 +1,139 @@ +#!/bin/bash + +# Copyright 2007 Frank Caraballo <fecaraballo{at}gmail{dot}com> +# Copyright 2008, 2009, 2011, 2015, 2017, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Modified by Robby Workman <rworkman at slackware.com> + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=exiv2 +VERSION=${VERSION:-$(echo $PKGNAM-*-Source.tar.?z | rev | cut -f 3- -d . | cut -f 2 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i586 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION-Source + +tar xvf $CWD/$PKGNAM-$VERSION-Source.tar.?z || exit 1 +cd $PKGNAM-$VERSION-Source || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +# Configure, build, and install: +mkdir cmake-build +cd cmake-build + cmake \ + -DCMAKE_C_FLAGS="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_SUFFIX="$LIBDIRSUFFIX" \ + -DMAN_INSTALL_DIR=/usr/man \ + -DBUILD_SHARED_LIBS=ON \ + -DEXIV2_ENABLE_CURL=ON \ + -DEXIV2_ENABLE_VIDEO=ON \ + -DEXIV2_ENABLE_WEBREADY==ON \ + -DEXIV2_ENABLE_XMP=ON \ + -DEXIV2_BUILD_SAMPLES=OFF \ + -DEXIV2_ENABLE_NLS=ON \ + .. || exit 1 + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG || exit 1 +cd .. + +# Make sure shared libraries are executable: +chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/lib*.so.* + +find $PKG | xargs file | grep -e "executable" -e "shared object" \ + | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Move manpage directory: +mv $PKG/usr/share/man $PKG/usr + +# Compress manual pages: +find $PKG/usr/man -type f -exec gzip -9 {} \+ +for i in $( find $PKG/usr/man -type l ) ; do + ln -s $( readlink $i ).gz $i.gz + rm $i +done + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS CODING_GUIDELINES* CONTRIBUTING* COPYING* README* \ + doc/{COPYING-XMPSDK,README-XMP,cmd.txt,cmdxmp.txt} \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r doc/ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat doc/ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r doc/ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/deps/exiv2/paredown.sh b/deps/exiv2/paredown.sh new file mode 100755 index 0000000..bd2685e --- /dev/null +++ b/deps/exiv2/paredown.sh @@ -0,0 +1,52 @@ +#!/bin/sh + +# Copyright 2013, 2019 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Remove the reference PNG files from the cairo source tarball. +# These are used only for build time testing, and cairo always fails +# a large number of tests, making these files more or less useless to +# the average end user. If you really need them for some reason, you +# can fetch the original tarball from cairographics.org. +# +# Removing these files reduces the size of the source tarball by 93%. + +PKGNAM=exiv2 +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.gz | rev | cut -f 3- -d . | cut -f 2 -d - | rev)} + +if [ ! -r $PKGNAM-${VERSION}-Source.tar.gz ]; then + echo "$PKGNAM-${VERSION}-Source.tar.gz does not exist. Exiting." + exit 1 +fi + +touch -r $PKGNAM-${VERSION}-Source.tar.gz tmp-timestamp || exit 1 + +rm -rf $PKGNAM-${VERSION}-Source +tar xf $PKGNAM-${VERSION}-Source.tar.gz || exit 1 +rm -rf $PKGNAM-${VERSION}-Source/test/data/* +rm -rf $PKGNAM-${VERSION}-Source/tests/bugfixes/* +rm -f $PKGNAM-${VERSION}-Source.tar.lz +tar cf $PKGNAM-${VERSION}-Source.tar $PKGNAM-${VERSION}-Source +touch -r tmp-timestamp $PKGNAM-${VERSION}-Source.tar +plzip -9 -v $PKGNAM-${VERSION}-Source.tar +rm -rf $PKGNAM-${VERSION}-Source tmp-timestamp + +echo "Repacking of $PKGNAM-${VERSION}-Source.tar.lz complete." + diff --git a/deps/exiv2/slack-desc b/deps/exiv2/slack-desc new file mode 100644 index 0000000..b2b3145 --- /dev/null +++ b/deps/exiv2/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +exiv2: exiv2 (Exif and IPTC Metadata Library and Tools) +exiv2: +exiv2: Exiv2 is a C++ library and a command line utility to read and write +exiv2: Exif and IPTC image metadata. +exiv2: +exiv2: Homepage: https://www.exiv2.org/ +exiv2: +exiv2: +exiv2: +exiv2: +exiv2: diff --git a/deps/flite/.url b/deps/flite/.url deleted file mode 100644 index bf3e1c8..0000000 --- a/deps/flite/.url +++ /dev/null @@ -1 +0,0 @@ -http://festvox.org/flite/packed/flite-2.1/flite-2.1-release.tar.bz2 diff --git a/deps/flite/flite.SlackBuild b/deps/flite/flite.SlackBuild deleted file mode 100755 index aba913e..0000000 --- a/deps/flite/flite.SlackBuild +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/sh - -# Copyright 2019 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2019 Eric Hameleers, Eindhoven, NL -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -cd $(dirname $0) ; CWD=$(pwd) - -PKGNAM=flite -VERSION=${VERSION:-2.1} -BUILD=${BUILD:-1} - -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -# Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX: -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "arm" ]; then - SLKCFLAGS="-O2 -march=armv5te" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -case "$ARCH" in - arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; - *) TARGET=$ARCH-slackware-linux ;; -esac - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz" - exit 0 -fi - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PKGNAM-$VERSION-release -tar xvf $CWD/$PKGNAM-$VERSION-release.tar.?z* || exit 1 -cd $PKGNAM-$VERSION-release || exit 1 -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 {} \; - -[ ! -x configure ] && ./autogen.sh - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --with-audio=alsa \ - --build=$TARGET || exit 1 - -make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Add documentation: -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - ACKNOWLEDGEMENTS COPYING README* \ - $PKG/usr/doc/$PKGNAM-$VERSION - -# Strip binaries (if any): -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -# Add a package description: -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -# Build the package: -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/flite/slack-desc b/deps/flite/slack-desc deleted file mode 100644 index e2990b7..0000000 --- a/deps/flite/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------------------------------------------------------| -flite: flite (lightweight speech synthesis engine) -flite: -flite: Flite (or Festival Lite) is a small and fast run-time synthesis engine -flite: designed for embedded systems and servers. -flite: Flite is able to load extra voice files at runtime, in its own -flite: .flitevox format and installed in /usr/share/flite/, -flite: -flite: -flite: -flite: Homepage: https://www.festvox.org/flite/ -flite: diff --git a/deps/frei0r-plugins/frei0r-plugins.SlackBuild b/deps/frei0r-plugins/frei0r-plugins.SlackBuild index 6e91161..9d526ec 100755 --- a/deps/frei0r-plugins/frei0r-plugins.SlackBuild +++ b/deps/frei0r-plugins/frei0r-plugins.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2017 Eric Hameleers, Eindhoven, NL +# Copyright 2017, 2019 Eric Hameleers, Eindhoven, NL # Copyright 2017 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # @@ -26,7 +26,7 @@ PKGNAM=frei0r-plugins VERSION=${VERSION:-1.6.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} CWD=$(pwd) TMP=${TMP:-/tmp} @@ -35,7 +35,7 @@ PKG=$TMP/package-$PKGNAM # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -43,8 +43,8 @@ if [ -z "$ARCH" ]; then export ARCH fi -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" SLKLDFLAGS="" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then @@ -85,6 +85,9 @@ find . \ sed -i CMakeLists.txt \ -e "s, lib/, lib${LIBDIRSUFFIX}/,g" -e "s,/lib,/lib${LIBDIRSUFFIX},g" +## Apply a patch to make it compile against opencv >= 3.4: +#cat $CWD/patches/frei0r_opencv2_include.patch | patch -p1 --verbose || exit 1 + # Configure and compile: mkdir -p build cd build @@ -96,6 +99,7 @@ cd build -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DWITHOUT_OPENCV=ON \ .. make make install DESTDIR=$PKG diff --git a/deps/frei0r-plugins/patches/frei0r_opencv2_include.patch b/deps/frei0r-plugins/patches/frei0r_opencv2_include.patch new file mode 100644 index 0000000..d139575 --- /dev/null +++ b/deps/frei0r-plugins/patches/frei0r_opencv2_include.patch @@ -0,0 +1,10 @@ +--- frei0r-plugins-1.6.1/src/filter/facebl0r/facebl0r.cpp.orig 2018-07-14 20:49:01.564511495 +1000 ++++ frei0r-plugins-1.6.1/src/filter/facebl0r/facebl0r.cpp 2018-07-14 18:47:44.430685507 +1000 +@@ -19,6 +19,7 @@ + #include <stdlib.h> + #include <opencv/cv.h> + #include <opencv/highgui.h> ++#include <opencv2/imgproc.hpp> + + + #include <frei0r.hpp> diff --git a/deps/gpgme/.url b/deps/gpgme/.url deleted file mode 100644 index fa15d27..0000000 --- a/deps/gpgme/.url +++ /dev/null @@ -1 +0,0 @@ -https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.12.0.tar.bz2 diff --git a/deps/gpgme/patches/gpgme-1.8.0_libsuffix.patch b/deps/gpgme/patches/gpgme-1.8.0_libsuffix.patch deleted file mode 100644 index a62cc55..0000000 --- a/deps/gpgme/patches/gpgme-1.8.0_libsuffix.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Heiko Becker <heirecka@exherbo.org> -Date: Wed, 16 Nov 2016 22:09:45 +0000 (+0100) -Subject: Remove a forgotten instance of @libsuffix@ -X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commitdiff_plain;h=572c1aac107125ce62230251713349348373db5a - -Remove a forgotten instance of @libsuffix@ - -* lang/cpp/src/GpgmeppConfig.cmake.in.in: Remove a forgotten -instance of @libsuffix@. --- - -b2c07bd47bd608afa5cc819b60a7b5bb8c9dd96a removed @libsuffix@ from -cmake config files, but missed one instance. - -Signed-off-by: Heiko Becker <heirecka@exherbo.org> ---- - -diff --git a/lang/cpp/src/GpgmeppConfig.cmake.in.in b/lang/cpp/src/GpgmeppConfig.cmake.in.in -index 928d19f..cbe9713 100644 ---- a/lang/cpp/src/GpgmeppConfig.cmake.in.in -+++ b/lang/cpp/src/GpgmeppConfig.cmake.in.in -@@ -63,7 +63,7 @@ add_library(Gpgmepp SHARED IMPORTED) - - set_target_properties(Gpgmepp PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/gpgme++;@resolved_includedir@" -- INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme@libsuffix@;@LIBASSUAN_LIBS@" -+ INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme.so;@LIBASSUAN_LIBS@" - IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp.so" - ) - diff --git a/deps/gpgme/slack-desc b/deps/gpgme/slack-desc deleted file mode 100644 index 3436b08..0000000 --- a/deps/gpgme/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -gpgme: gpgme (GnuPG Made Easy) -gpgme: -gpgme: GPGME (GnuPG Made Easy) is a C language library that allows to add -gpgme: support for cryptography to a program. It is designed to make access -gpgme: to public key crypto engines like GnuPG or GpgSM easier for -gpgme: applications. GPGME provides a high-level crypto API for encryption, -gpgme: decryption, signing, signature verification and key management. -gpgme: -gpgme: GPGME uses GnuPG and GpgSM as its backends to support OpenPGP and the -gpgme: Cryptographic Message Syntax (CMS). -gpgme: diff --git a/deps/grantlee-qt4/grantlee-qt4.SlackBuild b/deps/grantlee-qt4/grantlee-qt4.SlackBuild index e8107c8..33ac441 100755 --- a/deps/grantlee-qt4/grantlee-qt4.SlackBuild +++ b/deps/grantlee-qt4/grantlee-qt4.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2010, 2011, 2015 Eric Hameleers, Eindhoven, NL -# Copyright 2010, 2011, 2015 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2010, 2011, 2015, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,18 +22,20 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=grantlee-qt4 SRCNAM=grantlee VERSION=${VERSION:-0.5.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:--j7} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) if [ -z "$ARCH" ]; then case "$MARCH" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; armv7hl) export ARCH=$MARCH ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: @@ -41,8 +43,16 @@ if [ -z "$ARCH" ]; then esac fi -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" @@ -71,9 +81,9 @@ cd $SRCNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # Make sure this package does not clash with Qt5 based grantlee: sed -i CMakeLists.txt \ diff --git a/deps/grantlee-qt4/slack-desc b/deps/grantlee-qt4/slack-desc index beb6266..50c6dc2 100644 --- a/deps/grantlee-qt4/slack-desc +++ b/deps/grantlee-qt4/slack-desc @@ -7,7 +7,7 @@ |-----handy-ruler-------------------------------------------------------| grantlee-qt4: grantlee-qt4 (string template engine for Qt4) -grantlee-qt4: +grantlee-qt4: grantlee-qt4: Grantlee is a plugin based String Template system written using the grantlee-qt4: Qt4 framework. The goals of the project are to make it easier for grantlee-qt4: application developers to separate the structure of documents from diff --git a/deps/grantlee/.url b/deps/grantlee/.url index 09d105e..43a9f6f 100644 --- a/deps/grantlee/.url +++ b/deps/grantlee/.url @@ -1,2 +1,2 @@ -http://downloads.grantlee.org/grantlee-5.1.0.tar.gz +http://downloads.grantlee.org/grantlee-5.2.0.tar.gz diff --git a/deps/grantlee/grantlee.SlackBuild b/deps/grantlee/grantlee.SlackBuild index a9e437e..e4afb09 100755 --- a/deps/grantlee/grantlee.SlackBuild +++ b/deps/grantlee/grantlee.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2015, 2016, 2017 Eric Hameleers, Eindhoven, NL +# Copyright 2015, 2016, 2017, 2020 Eric Hameleers, Eindhoven, NL # Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # @@ -25,10 +25,10 @@ # Used to be called 'grantlee-qt5' PKGNAM=grantlee SRCNAM=grantlee -VERSION=${VERSION:-5.1.0} -BUILD=${BUILD:-3} +VERSION=${VERSION:-5.2.0} +BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:--j7} +NUMJOBS=${NUMJOBS:-$(nproc)} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -79,10 +79,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -## Don't make it clash with grantlee 0.x: -#sed -i CMakeLists.txt \ -# -e 's|INCLUDE_INSTALL_DIR include|INCLUDE_INSTALL_DIR include/grantlee-qt5|' - mkdir -p build cd build QTDIR=/usr/lib${LIBDIRSUFFIX}/qt5 \ @@ -102,7 +98,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a AUTHORS CHANGELOG COPYING* GOALS README \ +cp -a AUTHORS CHANGELOG COPYING* README* \ $PKG/usr/doc/$PKGNAM-$VERSION mkdir -p $PKG/install diff --git a/deps/grantlee/slack-desc b/deps/grantlee/slack-desc index 710b1eb..c11db28 100644 --- a/deps/grantlee/slack-desc +++ b/deps/grantlee/slack-desc @@ -7,7 +7,7 @@ |-----handy-ruler-------------------------------------------------------| grantlee: grantlee (string template engine for Qt5) -grantlee: +grantlee: grantlee: Grantlee is a plugin based String Template system written with the grantlee: Qt5 framework. The goals of the project are to make it easier for grantlee: application developers to separate the structure of documents from diff --git a/deps/hack-font-ttf/.url b/deps/hack-font-ttf/.url deleted file mode 100644 index 0a9120a..0000000 --- a/deps/hack-font-ttf/.url +++ /dev/null @@ -1,4 +0,0 @@ -https://github.com/chrissimpkins/Hack/releases/download/v2.020/Hack-v2_020-ttf.tar.xz -https://raw.githubusercontent.com/chrissimpkins/Hack/master/CHANGELOG.md -https://raw.githubusercontent.com/chrissimpkins/Hack/master/LICENSE.md -https://raw.githubusercontent.com/chrissimpkins/Hack/master/README.md diff --git a/deps/hack-font-ttf/CHANGELOG.md b/deps/hack-font-ttf/CHANGELOG.md deleted file mode 100644 index db91f4b..0000000 --- a/deps/hack-font-ttf/CHANGELOG.md +++ /dev/null @@ -1,743 +0,0 @@ -# Version 2.020 - -- divided the vertical stroke in the pipe glyph (U+007C), italic and bold italic sets -- modified U+007C hints in TrueType builds at 6, 7, 10, 11, 12, 13, 14 ppem italic set -- modified U+007C hints in TrueType builds at 6, 7, 10, 14 ppem bold italic set -- modified slant angle and stroke length (U+005C), italic and bold italic sets -- centered U+007C and U+005C, all sets -- modified zero (U+0030) oval fill hints in regular set -- added Powerline glyphs to the bold, italic, and bold italic sets -- U+2502 upper terminal to 1950, lower terminal to -530, all sets -- U+2503 upper terminal to 1950, lower terminal to -530, all sets -- U+250C lower terminal to -530, all sets -- U+250D lower terminal to -530, all sets -- U+250E lower terminal to -530, all sets -- U+250F lower terminal to -530, all sets -- U+2510 lower terminal to -530, all sets -- U+2511 lower terminal to -530, all sets -- U+2512 lower terminal to -530, all sets -- U+2513 lower terminal to -530, all sets -- U+2514 upper terminal to 1950, all sets -- U+2515 upper terminal to 1950, all sets -- U+2516 upper terminal to 1950, all sets -- U+2517 upper terminal to 1950, all sets -- U+2518 upper terminal to 1950, all sets -- U+2519 upper terminal to 1950, all sets -- U+251A upper terminal to 1950, all sets -- U+251B upper terminal to 1950, all sets -- U+251C upper terminal to 1950, lower terminal to -530, all sets -- U+251D upper terminal to 1950, lower terminal to -530, all sets -- U+251E upper terminal to 1950, lower terminal to -530, all sets -- U+251F upper terminal to 1950, lower terminal to -530, all sets -- U+2520 upper terminal to 1950, lower terminal to -530, all sets -- U+2521 upper terminal to 1950, lower terminal to -530, all sets -- U+2522 upper terminal to 1950, lower terminal to -530, all sets -- U+2523 upper terminal to 1950, lower terminal to -530, all sets -- U+2524 upper terminal to 1950, lower terminal to -530, all sets -- U+2525 upper terminal to 1950, lower terminal to -530, all sets -- U+2526 upper terminal to 1950, lower terminal to -530, all sets -- U+2527 upper terminal to 1950, lower terminal to -530, all sets -- U+2528 upper terminal to 1950, lower terminal to -530, all sets -- U+2529 upper terminal to 1950, lower terminal to -530, all sets -- U+252A upper terminal to 1950, lower terminal to -530, all sets -- U+252B upper terminal to 1950, lower terminal to -530, all sets -- U+252C lower terminal to -530, all sets -- U+252D lower terminal to -530, all sets -- U+252E lower terminal to -530, all sets -- U+252F lower terminal to -530, all sets -- U+2530 lower terminal to -530, all sets -- U+2531 lower terminal to -530, all sets -- U+2532 lower terminal to -530, all sets -- U+2533 lower terminal to -530, all sets -- U+2534 upper terminal to 1950, all sets -- U+2535 upper terminal to 1950, all sets -- U+2536 upper terminal to 1950, all sets -- U+2537 upper terminal to 1950, all sets -- U+2538 upper terminal to 1950, all sets -- U+2539 upper terminal to 1950, all sets -- U+253A upper terminal to 1950, all sets -- U+253B upper terminal to 1950, all sets -- U+252C upper terminal to 1950, lower terminal to -530, all sets -- U+252D upper terminal to 1950, lower terminal to -530, all sets -- U+253E upper terminal to 1950, lower terminal to -530, all sets -- U+253F upper terminal to 1950, lower terminal to -530, all sets -- U+2540 upper terminal to 1950, lower terminal to -530, all sets -- U+2541 upper terminal to 1950, lower terminal to -530, all sets -- U+2542 upper terminal to 1950, lower terminal to -530, all sets -- U+2543 upper terminal to 1950, lower terminal to -530, all sets -- U+2544 upper terminal to 1950, lower terminal to -530, all sets -- U+2545 upper terminal to 1950, lower terminal to -530, all sets -- U+2546 upper terminal to 1950, lower terminal to -530, all sets -- U+2547 upper terminal to 1950, lower terminal to -530, all sets -- U+2548 upper terminal to 1950, lower terminal to -530, all sets -- U+2549 upper terminal to 1950, lower terminal to -530, all sets -- U+254A upper terminal to 1950, lower terminal to -530, all sets -- U+254B upper terminal to 1950, lower terminal to -530, all sets -- U+2551 upper terminal to 1950, lower terminal to -530, all sets -- U+2552 lower terminal to -530, all sets -- U+2553 lower terminals to -530, all sets -- U+2554 lower terminals to -530, all sets -- U+2555 lower terminal to -530, all sets -- U+2556 lower terminals to -530, all sets -- U+2557 lower terminals to -530, all sets -- U+2558 upper terminal to 1950, all sets -- U+2558 upper terminals to 1950, all sets -- U+2559 upper terminals to 1950, all sets -- U+255A upper terminals to 1950, all sets -- U+255B upper terminal to 1950, all sets -- U+255C upper terminals to 1950, all sets -- U+255D upper terminals to 1950, all sets -- U+255E upper terminal to 1950, lower terminal to -530, all sets -- U+255F upper terminals to 1950, lower terminals to -530, all sets -- U+2560 upper terminals to 1950, lower terminals to -530, all sets -- U+2561 upper terminal to 1950, lower terminal to -530, all sets -- U+2562 upper terminals to 1950, lower terminals to -530, all sets -- U+2563 upper terminals to 1950, lower terminals to -530, all sets -- U+2564 lower terminal to -530, all sets -- U+2565 lower terminals to -530, all sets -- U+2566 lower terminals to -530, all sets -- U+2567 upper terminal to 1950, all sets -- U+2568 upper terminals to 1950, all sets -- U+2569 upper terminals to 1950, all sets -- U+256A upper terminal to 1950, lower terminal to -530, all sets -- U+256B upper terminals to 1950, lower terminals to -530, all sets -- U+256C upper terminals to 1950, lower terminals to -530, all sets -- U+256D lower terminal to -530, all sets -- U+256E lower terminal to -530, all sets -- U+256F upper terminal to 1950, all sets -- U+2570 upper terminal to 1950, all sets -- U+2571 adjusted horizontal position and length of strokes -- U+2572 adjusted horizontal position and length of strokes -- U+2573 adjusted horizontal position and length of strokes -- U+2575 upper terminal to 1950, all sets -- U+2577 lower terminal to -530, all sets -- U+2578 horizontal alignment of superior margin of the stroke (1 unit adjustment) -- U+2579 upper terminal to 1950, all sets -- U+257B lower terminal to -530, all sets -- U+257D upper terminal to 1950, lower terminal to -530, all sets -- U+257F upper terminal to 1950, lower terminal to -530, all sets -- updated OpenType name table field 1 0 0 -- updated OpenType name table field 3 1 1033 -- new [Windows installer](https://github.com/source-foundry/Hack-windows-installer) -- added line spacing adjustment shell scripts -- added font-tables.py OpenType table reporting script -- updated dev-versioner.py OpenType table versioning script to support UTF16 big endian encoding of nameID=5, platformID=3 name table - - -# Version 2.019 (release build) - -ttf, otf, webfont builds - -- removed SVG from webfont releases -- Corrected U+2588 glyph shape in regular set (had inappropriately small width and height) -- decreased width U+2580 all sets -- decreased width U+2581 all sets -- decreased width U+2582 all sets -- decreased width U+2583 all sets -- decreased width U+2584 all sets -- decreased width U+2585 all sets -- decreased width U+2586 all sets -- decreased width U+2857 all sets -- adjusted left sidebearing U+2589 all sets -- adjusted left sidebearing U+258A all sets -- adjusted left sidebearing U+258B all sets -- adjusted left sidebearing U+258C all sets -- adjusted left sidebearing U+258D all sets -- adjusted left sidebearing U+258E all sets -- adjusted left sidebearing U+258F all sets -- adjusted right sidebearing U+2590 all sets -- decreased width of U+2594 all sets -- adjusted right sidebearing U+2595 all sets -- adjusted left sidebearing U+2596 all sets -- adjusted right sidebearing U+2597 all sets -- adjusted left sidebearing U+2598 all sets -- decreased width of U+2599 all sets -- decreased width of U+259A all sets -- decreased width of U+259B all sets -- decreased width of U+259C all sets -- adjusted right sidebearing U+259D all sets -- decreased width of U+259E all sets -- decreased width of U+259F all sets -- increased upper terminal position to 1950 units U+2580 all sets -- increased upper terminal position to 1950 units U+2588 all sets -- increased upper terminal position to 1950 units U+2589 all sets -- increased upper terminal position to 1950 units U+258A all sets -- increased upper terminal position to 1950 units U+258B all sets -- increased upper terminal position to 1950 units U+258C all sets -- increased upper terminal position to 1950 units U+258D all sets -- increased upper terminal position to 1950 units U+258E all sets -- increased upper terminal position to 1950 units U+258F all sets -- increased upper terminal position to 1950 units U+2590 all sets -- increased upper terminal position to 1950 units U+2594 all sets -- increased upper terminal position to 1950 units U+2595 all sets -- increased upper terminal position to 1950 units U+2598 all sets -- increased upper terminal position to 1950 units U+2599 all sets -- increased upper terminal position to 1950 units U+259A all sets -- increased upper terminal position to 1950 units U+259B all sets -- increased upper terminal position to 1950 units U+259C all sets -- increased upper terminal position to 1950 units U+259D all sets -- increased upper terminal position to 1950 units U+259E all sets -- increased upper terminal position to 1950 units U+259F all sets -- reverted Cyrillic lower case es glyph (U+0441) to Latin lower case c shape -- reverted Cyrillic upper case es glyph (U+0421) to Latin upper case C shape - - -# Version 2.018 (release build) - -ttf, otf, webfont builds - -Patch for missing glyphs in regular set: - -- added U+016C (upper case U breve), regular set - Issue #21 -- added U+016D (lower case u breve), regular set - Issue #21 - - -# Version 2.017 (release build) - -ttf, otf, webfont builds - -Changes vs. release v2.015: - -- increased vertical position of the tilde (U+007E) to improve alignment with other glyphs - Issue #23 -- increased width of the vertical stroke on the dollar symbol (U+0024) - Issue #92 -- modified Cyrillic upper case C (U+0421) to differentiate from Latin C - Issues #22 & #29 -- modified Cyrillic lower case c (U+0441) to differentiate from Latin c - Issues #22 & #29 -- modified upper case theta (U+0398) to differentiate from lower case theta - Issue #36 -- added U+0132 (IJ) glyph - Issue #52 -- added U+0133 (ij) glyph - Issue #52 -- added U+013F (upper case L dot) glyph - Issue #52 -- added U+0140 (lower case l dot) glyph - Issue #52 -- added U+0162 (upper case T cedilla) glyph - Issue #52 -- added U+0163 (lower case t cedilla) glyph - Issue #52 -- added U+0138 (kgreenlandic) glyph - Issue #52 -- added U+266A (musical note) glyph - Issue #52 -- added U+0149 (lower case n apostrophe) - Issue #52 -- added U+1EF9 (lower case y tilde) glyph - Issue #102 -- added U+1EF8 (upper case Y tilde) glyph - Issue #102 -- added U+1EBD (lower case e tilde) glyph - Issue #102 -- added U+1EBC (upper case E tilde) glyph - Issue #102 -- added U+2116 (numero) glyph - Issues #22 & #114 -- added U+01A4 (p hook) glyph - Issue #105 -- added U+0108 (upper case C circumflex) - Issue #21 -- added U+0109 (lower case c circumflex) - Issue #21 -- added U+011C (upper case G circumflex) - Issue #21 -- added U+011D (lower case g circumflex) - Issue #21 -- added U+0124 (upper case H circumflex) - Issue #21 -- added U+0125 (lower case h circumflex) - Issue #21 -- added U+0134 (upper case J circumflex) - Issue #21 -- added U+0135 (lower case j circumflex) - Issue #21 -- added U+015C (upper case S circumflex) - Issue #21 -- added U+015D (lower case s circumflex) - Issue #21 -- added U+016C (upper case U breve) - Issue #21 -- added U+016D (lower case u breve) - Issue #21 -- added U+20B7 (spesmilo) - Issue #21 -- fixed missing null glyph (U+0000) in regular, italic, bolditalic sets -- removed duplicate CR glyph (U+000D) in all sets - Issue #149 -- updated ttfautohint to version 1.4.1 for TrueType (.ttf) build instruction sets - -# Version 2.016 (testing build) - -- increased vertical position of the tilde (U+007E) to improve alignment with other glyphs - Issue #23 -- increased width of the vertical stroke on the dollar symbol (U+0024) - Issue #92 -- modified Cyrillic upper case C (U+0421) to differentiate from Latin C - Issues #22 & #29 -- modified Cyrillic lower case c (U+0441) to differentiate from Latin c - Issues #22 & #29 -- modified upper case theta (U+0398) to differentiate from lower case theta - Issue #36 -- added U+1EF9 (lower case y tilde) glyph - Issue #102 -- added U+1EF8 (upper case Y tilde) glyph - Issue #102 -- added U+1EBD (lower case e tilde) glyph - Issue #102 -- added U+1EBC (upper case E tilde) glyph - Issue #102 -- added U+2116 (numero) glyph - Issues #22 & #114 -- added U+01A4 (p hook) glyph - Issue #105 -- added U+0108 (upper case C circumflex) - Issue #21 -- added U+0109 (lower case c circumflex) - Issue #21 -- added U+011C (upper case G circumflex) - Issue #21 -- added U+011D (lower case g circumflex) - Issue #21 -- added U+0124 (upper case H circumflex) - Issue #21 -- added U+0125 (lower case h circumflex) - Issue #21 -- added U+0134 (upper case J circumflex) - Issue #21 -- added U+0135 (lower case j circumflex) - Issue #21 -- added U+015C (upper case S circumflex) - Issue #21 -- added U+015D (lower case s circumflex) - Issue #21 -- added U+016C (upper case U breve) - Issue #21 -- added U+016D (lower case u breve) - Issue #21 -- added U+20B7 (spesmilo) - Issue #21 -- updated ttfautohint to version 1.4 for TrueType (.ttf) build instruction sets - - -# Version 2.015 (release build) - -ttf, otf, webfont builds - -Changes vs. release v2.013: - -- new vertical metrics = decreased line spacing height - Issues #28, #32, #39, #41, #95, #103 -- adjusted vertical position of the colon to a higher position, improves alignment with other punctuation glyphs (U+003A) - Issue #66 -- changed vertical position of the dash (U+002D) so that regular and oblique, bold and bold oblique are properly aligned - Issue #107 -- updated hinting algorithm for bold set (improved point position over stem of lowercase j/i for some text sizes) - Issue #84 -- underscore (U+005F) centered, increased width, increased height & aligned vertical position closer to baseline - Issues #97, #98, #100, 103, -- increased vertical position of dieresis mark on lowercase u dieresis (U+00FC) - Issue #61 -- increased vertical position of dieresis mark on lowercase i dieresis (U+00EF) -- increased vertical position of dieresis mark on lowercase e dieresis (U+00EB) -- decreased vertical position of the asterisk (U+002A) - Issue #34 -- new design for ascii tilde - broader curves, taller glyph with goal to improve appearance at small text sizes where it tended to render like a dash (U+007E) - Issue #37 -- new ttf build autohinting script (./postbuild_processing/tt-hinting/autohint.sh) -- new ttf build autohinting Control Instructions File - bold set (./postbuild_processing/tt-hinting/Hack-Bold-TA.txt) -- new ttf build release script (./postbuild_processing/tt-hinting/release.sh) -- new web font release script (./postbuild_processing/webfonts/releasewebfonts.sh) -- new vfb to UFO source file conversion script (./tools/makeufo.sh) -- new UFO source file types - includes separate source files for TrueType (`*-TT.ufo`) and PostScript (`*-PS.ufo`) releases -- source file path changes: now includes separate `ufo` and `vfb` directories under the `./source` repository directory -- Hack Open Font license updated to version 2.0. The license changes better define the Hack project as a derivative project of the Bitstream Vera Sans Mono typeface project and are intended to make the license more consistent with the Bitstream Vera libre, open source license under which Hack is co-licensed. There are no new restrictions on use of the fonts with these license changes. Embedding permissions are made explicit in this version of the Hack Open Font license. - - -# Version 2.014 (testing build) - -- ttf only build for testing -- updated hinting algorithm for bold set (corrected incorrect point position of lowercase j/i at some sizes) - Issue #84 -- adjusted vertical metrics - Issues #28, #32, #39, #41, #95, #103 -- centered, increased width, & adjusted vertical position of underscore - Issues #97, #98, #100, 103, -- increased vertical position of dieresis mark on lowercase u dieresis (U+00FC) - Issue #61 -- increased vertical position of dieresis mark on lowercase i dieresis (U+00EF) -- increased vertical position of dieresis mark on lowercase e dieresis (U+00EB) -- decreased vertical position of the asterisk (U+002A) - Issue #34 -- new design for ascii tilde (U+007E) - Issue #37 - - -# Version 2.013 (release build) - -ttf, otf, webfont builds - -Changes vs. release v2.010 - -- Fixed missing middle dot glyph (U+00B7), adjusted width of U+00B7 em box to address spacing issues in editors that highlight empty spaces (Issues #27 & 46) -- Powerline glyph alignment and size adjustments (Issue #33) -- Fixed name tables to address: - - incorrect oblique rendering with Java type renderers on OS X (Issue #26) - - incorrect italic + bold + bold oblique rendering in some syntax highlighters (Issues #42, #50, #60) - - backslash character took inappropriate vertical alignment because of incorrect slant angle in some editors (Issue #67) -- Changed oblique and bold oblique font names to "Hack Italic" and "Hack Bold Italic" to address Windows listings -- Changed oblique and bold oblique webfont names to "hack-italic-webfont.[xxx]" and "hack-bolditalic-webfont.[xxx]" -- Changed oblique and bold oblique basic Latin + Latin-1 webfont subsets to the names "hack-italic-latin-webfont.[xxx]" and "hack-bolditalic-latin-webfont.[xxx]" -- Changed license name from "Modified SIL Open Font License" to "Hack Open Font License" to comply with SIL regulations for SIL Open Font License modifications -- Removed all license references to SIL to comply with SIL regulations for modifications of the SIL Open Font License -- Removed SIL Open Font License preamble from the Hack Open Font License to comply with SIL regulations for modifications of the SIL Open Font License -- Removed the following statement from Hack Open Font License condition #3: "This restriction only applies to the primary font name as presented to the users." to address a reserved font name conflict with the Bitstream Vera license -- Modified the build directory structure for the Hack web fonts -- Added Hack webfont CSS files to the build directory - -# Version 2.012 (testing build) - -- ttf only build for testing -- Powerline glyph alignment and size adjustments (Issue #33) -- Fixed name tables to address: - - incorrect oblique rendering with Java type renderers on OS X (Issue #26) - - incorrect italic + bold + bold oblique rendering in some syntax highlighters (Issues #42, #50, #60) - - backslash character took inappropriate vertical alignment because of incorrect slant angle in some editors (Issue #67) - -# Version 2.011 (testing build) - -- ttf only build for testing -- fixed missing middle dot glyph (U+00B7), adjusted width of U+00B7 em box to address spacing issues in editors that highlight empty spaces (Issues 27 & 46) - - -# Version 2.010 - -### New Glyphs - -- New glyphs for Revised Western European (ISO-8859-15, Latin-9) character set (shapes from DejaVu Sans Mono typeface) -- New glyphs for Central European (ISO-8859-2, Latin-2) character set (shapes from DejaVu Sans Mono typeface) -- New glyphs for South European (ISO-8859-3, Latin-3) character set (shapes from DejaVu Sans Mono typeface) -- New glyphs for Vietnamese character set (shapes from DejaVu Sans Mono typeface) -- New glyphs for Pan African Latin character set (shapes from DejaVu Sans Mono typeface) -- New glyphs for Cyrillic (ISO-8859-5) character set (shapes from DejaVu Sans Mono typeface) -- New glyphs for Greek (ISO-8859-7) character set (shapes from DejaVu Sans Mono typeface) -- New glyphs for Armenian character set (shapes from DejaVu Sans Mono typeface) -- New glyphs for Georgian character set (shapes from DejaVu Sans Mono typeface) -- New punctuation glyphs -- New Powerline glyphs -- New number glyphs -- New scientific inferior numerals -- New superscript numerals -- New subscript numerals -- New symbol glyphs -- New **dotlessi** -- New **iacute** -- New **icircumflex** -- New **idieresis** -- New **igrave** -- New **imacron** -- New **iogonek** -- New **itilde** -- New **uppercase upsilon** -- New **uppercase upsilon tonos** -- New uni0069 -- New uni0457 -- New uni0458 - - -### Modified Glyphs - -##### Latin Character Set - -- Modified **uppercase Q** - added flared tail and modified tail angle -- Modified **uppercase F** - central arm lowered to fill open gap at the base -- Modified **lowercase a** - added curved tail/spur -- Modified **lowercase b** - decreased width of terminal, opened angle -- Modified **lowercase d** - decreased width of terminal, opened angle -- Modified **lowercase g** - decreased width of terminal, opened angle -- Modified **lowercase i** - rounded corners of the dot, oriented dot position left of center relative to vertical stem, adjusted vertical position of the horizontal stem to x-height, lengthened the vertical stem to slightly overshoot baseline with the curved tail, decreased width of horizontal stem -- Modified **lowercase j** - rounded corners of the dot, oriented dot position left of center relative to vertical stem -- Modified **lowercase l** - lengthened the vertical stem to overshoot the baseline with the curved tail -- Modified **lowercase m** - decreased width of terminal, opened angle -- Modified **lowercase n** - decreased width of terminal, opened angle -- Modified **lowercase p** - decreased width of terminal, opened angle -- Modified **lowercase q** - decreased width of terminal, opened angle -- Modified **lowercase r** - decreased width of terminal, opened angle -- Modified **lowercase t** - added angle to the upper terminal, increased length of the vertical stem to allow the curved tail to slightly overshoot the baseline -- Modified **lowercase y** - modified curves -- Modified **0** - modified width and length of central oval fill, improved symmetry of the oval fill in all sets -- Modified **2** - rounded the upper left corner of the base, decreased width of the spine of the hook -- Modified **Abreve** - modified curves -- Modified **Aogonek** - modified curve, decreased the width of the tail to meet typeface metrics -- Modified **Eogonek** - modified tail curve -- Modified **Iogonek** - modified tail curve -- Modified **Itilde** - modified tilde curve -- Modified **Ohorn** - modified horn curve -- Modified **Oslash** - modified curves -- Modified **Oslashacute** - modified curves -- Modified **Otilde** - modified tilde curve -- Modified **Racute** - modified bowl and leg curves -- Modified **Rcaron** - modiifed bowl and leg curves -- Modified **Rcommaaccent** - modified bowl and leg curves -- Modified **Scommaaccent** - modified curves -- Modified **Tcommaaccent** - modified comma accent curves -- Modified **Ucircumflex** - modified curves -- Modified **Udieresis** - modified curves -- Modified **Ugrave** - modified curves -- Modified **Uhorn** - modified curves -- Modified **Uhungarumlaut** - modified curves -- Modified **Umacron** - modified curves -- Modified **Uogonek** - modified curves -- Modified **Uring** - modified curves -- Modified **Utilde** - modified curves -- Modified **agrave** - decreased width of terminal, opened angle in regular and bold sets -- Modified **aacute** - decreased width of terminal, opened angle in regular and bold sets -- Modified **abreve** - decreased width of upper terminal to create an angled stem -- Modified **acircumflex** - decreased width of terminal, opened angle -- Modified **atilde** - decreased width of terminal, opened angle -- Modified **adieresis** - decreased width of terminal, opened angle -- Modified **amacron** - decreased width of upper terminal to create an angled stem -- Modified **aring** - decreased width of terminal, opened angle -- Modified **dcroat** - decreased width of terminal, opened angle -- Modified **dcaron** - decreased width of lower terminal to create angled stem -- Modified **ecaron** - modified curves -- Modified **ecircumflex** - modified curves -- Modified **edieresis** - modified curves -- Modified **egrave** - modified curves -- Modified **emacron** - modified curves -- Modified **eogonek** - modified curves -- Modified **gbreve** - modified curves of bowl and tail -- Modified **gcaron** - modified curves of bowl and tail, decreased width of upper terminal to create angled stem -- Modified **gcommaaccent** - modified curves of bowl and tail, decreased width of upper terminal to create angled stem -- Modified **gdotaccent** - modified curves of bowl and tail, decreased width of upper terminal to create angled stem -- Modified **hbar** - adjusted curves -- Modified **dotlessi** - decreased width of horizontal stem -- Modified **iacute** - decreased width of horizontal stem -- Modified **icircumflex** - decreased width of horizontal stem -- Modified **idieresis** - decreased width of horizontal stem -- Modified **igrave** - decreased width of horizontal stem -- Modified **imacron** - decreased width of horizontal stem -- Modified **iogonek** - decreased width of horizontal stem -- Modified **itilde** -decreased width of horizontal stem -- Modified **nacute** - adjusted curves -- Modified **ncaron** - adjusted curves -- Modified **ncommaaccent** - adjusted curves -- Modified **eng** - adjusted curves, decreased the upper terminal width to create an angled stem -- Modified **nacute** - decreased width of upper terminal to create angled stem -- Modified **ncaron** - decreased width of upper terminal to create angled stem -- Modified **ncommaaccent** - decreased width of upper terminal to create angled stem -- Modified **ntilde** - adjusted curves -- Modified **ohorn** - adjusted curves -- Modified **ohungarumlaut** - adjusted curves -- Modified **omacron** - adjusted curves -- Modified **oslash** - adjusted curves -- Modified **oslashacute** - adjusted curves -- Modified **otilde** - adjusted curves -- Modified **racute** - adjusted curves, decreased width of upper terminal to create angled stem -- Modified **rcaron** - adjusted curves, decreased width of upper terminal to create angled stem -- Modified **rcommaaccent** - adjusted curves, decreased width of upper terminal to create angled stem -- Modified **sacute** - adjusted curves -- Modified **scedila** - adjusted curves -- Modified **scommaaccent** - adjusted curves -- Modified **lowercase t** - decreased length of the left terminal to angle the horizontal stem -- Modified **tbar** - decreased length of the left terminal to angle the horizontal stem -- Modified **tcaron** - decreased length of the left terminal to angle the horizontal stem -- Modified **tcommaaccent** - adjusted curves, decreased length of the left terminal to angle the horizontal stem -- Modified **uhorn** - adjusted curves, decreased width of lower terminal to create angled stem -- Modified **uhungarumlaut** - adjusted curves, decreased width of lower terminal to create angled stem -- Modified **umacron** - adjusted curves, decreased width of lower terminal to create angled stem -- Modified **uogonek** - adjusted curves, decreased width of lower terminal to create angled stem -- Modified **uring** - adjusted curves, decreased width of lower terminal to create angled stem -- Modified **utilde** - adjusted curves, decreased width of lower terminal to create angled stem -- Modified **yacute** - adjusted curves -- Modified **ycircumflex** - adjusted curves -- Modified **ydieresis** - adjusted curves -- Modified **ygrave** - adjusted curves -- Modified **zdotaccent** - rounded corners of dot -- Modified **gbreve** - decreased width of terminal, opened angle in regular and bold sets -- Modified **ntilde** - decreased width of terminal, opened angle in regular and bold sets -- Modified **ugrave** - decreased width of terminal, opened angle in regular and bold sets -- Modified **uacute** - decreased width of terminal, opened angle in regular and bold sets -- Modified **ucircumflex** - decreased width of terminal, opened angle in regular and bold sets -- Modified **udieresis** - decreased width of terminal, opened angle in regular and bold sets -- Modified **exclamdown** - rounded corners of the dot -- Modified **dieresis** - rounded corners -- Modified **questionmarkdown** - rounded corners of the dot -- Modified **ordfeminine** - decreased width of lower terminal on the a character to create angled stem -- Modified **Adieresis** - rounded corners of dieresis component of glyph -- Modified **Edieresis** - rounded corners of dieresis component of glyph -- Modified **Idieresis** - rounded corners of dieresis component of glyph -- Modified **Odieresis** - rounded corners of dieresis component of glyph -- Modified **Udieresis** - rounded corners of dieresis component of glyph -- Modified **Ydieresis** - rounded corners of dieresis component of glyph -- Modified **adieresis** - rounded corners of dieresis component of glyph -- Modified **edieresis** - rounded corners of dieresis component of glyph -- Modified **idieresis** - rounded corners of dieresis component of glyph -- Modified **odieresis** - rounded corners of dieresis component of glyph -- Modified **udieresis** - rounded corners of dieresis component of glyph -- Modified **ydieresis** - rounded corners of dieresis component of glyph -- Modified **Idotaccent** - rounded corners of the dot -- Modified **dotaccent** - rounded corners of the dot -- Modified **ellipsis** - rounded corners of the dots -- Modified **periodcentered** - rounded corners of the dot - - -##### Greek Character Set - -- Modified **upsilondieresistonos** - adjusted vertical position to properly position on the baseline -- Modified **iotadieresistonos** - adjusted vertical position to properly position on the baseline -- Modified **eth** - altered curve of the neck -- Modified **uppercase eta** - modified the curves -- Modified **uppercase theta** - modified the curves -- Modified **uppercase omicron** - modified the curves -- Modified **uppercase rho** - modified the curves -- Modified **uppercase psi** - modified the curves -- Modified **uppercase upsilon** - new glyph style (change from Latin Y shape) -- Modified **uppercase omega** - modified the curves -- Modified **uppercase alphatonos** - adjusted right and left sidebearings, corrected position of the tonos symbol -- Modified **uppercase epsilontonos** - adjusted right and left sidebearings, corrected position of the tonos symbol -- Modified **uppercase etatonos** - adjusted right and left sidebearings, corrected position of the tonos symbol -- Modified **uppercase iotatonos** - adjusted right and left sidebearings, corrected position of the tonos symbol -- Modified **uppercase omicrontonos** - adjusted right and left sidebearings, corrected position of the tonos symbol -- Modified **uppercase upsilontonos** - adjusted right and left sidebearings, corrected position of the tonos symbol -- Modified **uppercase omegatonos** - adjusted right and left sidebearings, corrected position of the tonos symbol -- Modified **uppercase iotadieresis** - rounded the dieresis points -- Modified **uppercase upsilondieresis** - new upsilon shape, rounded the dieresis points -- Modified **lowercase alpha** - adjusted curves -- Modified **lowercase beta** - adjusted curves -- Modified **lowercase gamma** - adjusted curves -- Modified **lowercase delta** - adjusted curves -- Modified **lowercase epsilon** - adjusted curves -- Modified **lowercase zeta** - adjusted curves -- Modified **lowercase eta** - decreased width of the top terminal to create angled stem, adjusted curves -- Modified **lowercase theta** - adjusted curves -- Modified **lowercase iota** - adjusted curves -- Modified **lowercase lambda** - adjusted curves -- Modified **lowercase mu** - adjusted curves -- Modified **lowercase nu** - adjusted curves -- Modified **lowercase xi** - adjusted curves -- Modified **lowercase omicron** - adjusted curves -- Modified **lowercase pi** - adjusted curves -- Modified **lowercase rho** - adjusted curves -- Modified **lowercase sigmafinal** - adjusted curves -- Modified **lowercase sigma** - adjusted curves -- Modified **lowercase tau** - adjusted curves -- Modified **lowercase upsilon** - adjusted curves -- Modified **lowercase phi** - adjusted curves -- Modified **lowercase chi** - adjusted curves -- Modified **lowercase psi** - adjusted curves -- Modified **lowercase omega** - adjusted curves -- Modified **lowercase iotatonos** - adjusted curves -- Modified **lowercase iotadieresis** - rounded points of the dieresis, adjusted curves -- Modified **iotadieresistonos** - rounded corners of points of dieresis mark, appropriately positioned tonos mark, adjusted curves -- Modified **lowercase upsilontonos** - adjusted curves -- Modified **lowercase upsilondieresis** - rounded points of dieresis mark, adjusted curves -- Modified **upsilondieresistonos** - rounded corners of points of dieresis mark, appropriately positioned tonos mark, adjusted curves -- Modified **lowercase omicrontonos** - adjusted curves -- Modified **lowercase omegatonos** - adjusted curves -- Modified **lowercase alphatonos** - adjusted curves -- Modified **lowercase epsilontonos** - adjusted curves -- Modified **lowercase etatonos** - decreased width of top terminal to create angled stem, adjusted curves - - -##### Cyrillic Character Set - -- Modified curves in uni0411, uni0412, uni0401, uni0417, uni041B, uni041E, uni0420, uni0421, uni0423, uni040E, uni0424, uni0427, uni042F, uni042C, uni042A, uni042B, uni0409, uni040A, uni0405, uni0404, uni042D, uni0408, uni040B, uni042E, uni0402, uni0462, uni0472, uni0494, uni0498, uni04AA, uni04BA, uni04CB, uni04D0, uni04D2, uni04D6, uni04D8, uni04DA, uni04DC, uni04DE, uni04E0, uni04E4, uni04E6, uni04E8, uni04EA, uni04EC, uni04EE, uni04F0, uni04F2, uni04F4, uni04F8, uni0510, uni051A, uni0430, uni0431, uni0432, uni0434, uni0435, uni0450, uni0451, uni0437, uni0439, uni043B, uni043E, uni0440, uni0441, uni0443, uni045E, uni0444, uni0447, uni044F, uni044C, uni044A, uni044B, uni0459, uni045A, uni0455, uni0454, uni044D, uni0456, uni0457, uni0458, uni045B, uni044E, uni0452, uni0463, uni0473, uni0499, uni04AB, uni04BB, uni04CC, uni04D1, uni04D3, uni04D7, uni04D9, uni04DB, uni04DD, uni04DF, uni04E1, uni04E5, uni04E7, uni04E9, uni04EB, uni04ED, uni04EF, uni04F1, uni04F3, uni04F5, uni04F9, uni0511, uni051B, uni04D5 -- Rounded corners of points of dieresis marks in uni0401, uni0407, uni04D2, uni04DA, uni04DC, uni04DE, uni04E4, uni04E6, uni04EA, uni04EC, uni04F0, uni04F4, uni04F8, uni0451, uni0457, uni04D3, uni04DB, uni04DD, uni04DF, uni04E5, uni04E7, uni04EB, uni04ED, uni04F1, uni04F5, uni04F9 -- Rounded corners of dots in uni0456, uni0458 -- Modified **lowercase i** glyphs (uni0456, uni0457) so that they are consistent with the shape of the Hack Latin lowercase i -- Modified **uni0430** - decreased width of lower terminal to create angle -- Modified **uni0440** - decreased width of upper terminal to create angle -- Modified **uni04D1** - decreased width of lower terminal to create angle -- Modified **uni04D3** - decreased width of lower terminal to create angle -- Modified **uni051B** - decreased width of upper terminal to create angle -- Numerous metrics changes to better align the Cyrillic glyphs in a fixed width format - -##### Armenian Character Set - -- Modified curves in uni0531, uni0532, uni0533, uni0534, uni0535, uni0536, uni0538, uni0539, uni053A, uni053B, uni053D, uni053E, uni053F, uni0540, uni0541, uni0542, uni0543, uni0544, uni0545, uni0546, uni0547, uni0548, uni0549, uni054A, uni054B, uni054C, uni054D, uni054E, uni054F, uni0550, uni0551, uni0553, uni0554, uni0555, uni0556, uni0561, uni0562, uni0563, uni0564, uni0565, uni0566, uni0568, uni0569, uni056A, uni056B, uni056D, uni056E, uni056F, uni0570, uni0571, uni0572, uni0573, uni0574, uni0575, uni0576, uni0577, uni0578, uni0579, uni057A, uni057B, uni057C, uni057D, uni057E, uni057F, uni0580, uni0581, uni0583, uni0584, uni0585, uni0586, uni0587 -- Modified **uni0563** - decreased width of the upper terminal to create angle -- Modified **uni0564** - decreased width of the upper terminal to create angle -- Modified **uni0566** - decreased width of the upper terminal to create angle -- Modified **uni0568** - decreased width of the upper terminal to create angle -- Modified **uni0569** - decreased width of the upper terminal to create angle -- Modified **uni0572** - decreased width of the upper terminal to create angle -- Modified **uni0573** - decreased width of the upper terminal to create angle -- Modified **uni0574** - decreased width of the upper terminal to create angle -- Modified **uni0576** - decreased width of the upper terminal to create angle -- Modified **uni0578** - decreased width of the upper terminal to create angle -- Modified **uni057C** - decreased width of the upper terminal to create angle -- Modified **uni057D** - decreased width of the upper terminal to create angle -- Modified **uni0580** - decreased width of the upper terminal to create angle -- Modified **uni0581** - decreased width of the upper terminal to create angle -- Modified **uni0584** - decreased width of the upper terminal to create angle - - -##### Georgian Character Set - -- Modified curves in uni10D0, uni10D1, uni10D2, uni10D3, uni10D4, uni10D5, uni10D6, uni10D7, uni10D8, uni10D9, uni10DA, uni10DB, uni10DC, uni10DD, uni10DE, uni10DF, uni10E0, uni10E1, uni10E2, uni10E3, uni10E4, uni10E5, uni10E6, uni10E7, uni10E8, uni10E9, uni10EA, uni10EB, uni10EC, uni10ED, uni10EE, uni10EF, uni10F0, uni10F1, uni10F2, uni10F3, uni10F4, uni10F5, uni10F6, uni10F7, uni10F8, uni10F9, uni10FA, uni10FC, uni055C, uni055E -- Rounded corners of points in uni10FB, uni0589 - - -##### Punctuation Character Set - -- Modified curves in uni2047, questiondown, uni203D, uni203F, uni2048, uni2049, uni204B, uni2E18, uni2E1F, uni2E2E, uni2E18.case, questiondown.case, uni208E, uni207E, uni2768, uni2769, uni276B, uni27C5, uni27C6, uni2987, uni2988, uni055C, uni055E, uni061F, H18533, circle, uni25EF, uni25D0, uni25D1, uni25D2, uni25D3, uni25D6, uni25D7, uni25D4, uni25D5, uni25F4, uni25F5, uni25F6, uni25F7, uni25CD, uni25C9, uni25CE, openbullet, invbullet, invcircle, uni25DA, uni25DB, uni25E0, uni25E1, uni25DC, uni25DD, uni25DE, uni25DF, ampersand, copyright, registered, section, degree -- Modified **dong** - decreased width of the lower terminal to create an angled stem -- Modified **uni20A5** - decreased width of the upper terminal to create an angled stem -- Modified **uni225D** - decreased width of the lower terminal on the d character to create an angled stem -- Modified **uni225E** - decreased width of the upper terminal to create an angled stem - - -##### Symbol Character Set - -- Modified curves in cent, colonmonetary, dong, euro, florin, lira, peseta, sterling, uni0E3F, uni20A0, uni20A2, uni20A5, uni20A8, uni20AA, uni20AF, uni20B0, uni20B1, uni20B2, uni20B4, uni20B5, uni20B9, approxequal, asciitilde, circlemultiply, circleplus, congruent, element, emptyset, infinity, integral, integralbt, integraltp, intersection, notelement, notsubset, partialdiff, percent, perthousand, propersubset, propersuperset, proportional, reflexsubset, reflexsuperset, similar, suchthat, therefore, uni2031, uni2126, uni2201, uni220A, uni220C, uni220D, uni2218, uni221B, uni222C, uni222D, uni2235, uni2236, uni2237, uni2238, uni2239, uni223A, uni223B, uni223D, uni2241, uni2242, uni2243, uni2244, uni2246, uni2247, uni2249, uni224A, uni224B, uni224C, uni224E, uni224F, uni2250, uni2251, uni2252, uni2253, uni2254, uni2255, uni2256, uni2257, uni2258, uni225D, uni225E, uni225F, uni2272, uni2273, uni2274, uni2275, uni227C, uni227D, uni227E, uni227F, uni2285, uni2288, uni2289, uni228B, uni228D, uni2296, uni2298, uni2299, uni229A, uni229B, uni229C, uni229D, uni22B8, uni22CD, uni22D0, uni22D1, uni22DE, uni22DF, uni22E0, uni22E1, uni22E6, uni22E7, uni22E8, uni22E9, uni22EF, uni23A8, uni23AC, uni27DC, uni2A00, uni2A6A, uni2A6B, union, uni219C, uni219D, uni21AD, uni21A9, uni21AA, uni21AB, uni21AC, uni21B6, uni21B7, uni21BA, uni21BB, uni21F4, H18533, circle, uni25EF, uni25D0, uni25D1, uni25D2, uni25D3, uni25D6, uni25D7, uni25D4, uni25D5, uni25F4, uni25F5, uni25F6, uni25F7, uni25CD, uni25C9, uni25CE, openbullet, invbullet, invcircle, uni25DA, uni25DB, uni25E0, uni25E1, uni25DC, uni25DD, uni25DE, uni25DF, at, ampersand, copyright, registered, section, degree, uni0606, uni03F6 - -### Metrics Changes - -- Changed line gap / typo line gap to 275 units -- Modified **uppercase P** - increased right sidebearing to equal sidebearing of uppercase O glyph -- Modified **uppercase Z** - changed to right = left sidebearing (shifts orientation to left) for regular, bold, oblique sets -- Modified **uppercase Z** - reduced left sidebearing for bold oblique set, not necessary to make this equal as with above sets -- Modified **lowercase a** - reduced left sidebearing -- Modified **lowercase c** - reduced left sidebearing -- Modified **lowercase e** - increased left sidebearing -- Modified **lowercase g** - increased left sidebearing -- Modified **lowercase i** - increased left sidebearing -- Modified **lowercase j** - increased left sidebearing -- Modified **lowercase k** - reduced left sidebearing -- Modified **lowercase r** - reduced left sidebearing -- Modified **3** - increased left sidebearing -- Modified **Zacute** - centered glyph (reduced left sidebearing, increased right sidebearing) -- Modified **Zcaron** - centered glyph (reduced left sidebearing, increased right sidebearing) -- Modified **Zdotaccent** - centered glyph (reduced left sidebearing, increased right sidebearing) -- Modified **aacute** - increased left sidebearing -- Modified **abreve** - increased left sidebearing -- Modified **acircumflex** - increased left sidebearing -- Modified **adieresis** - increased left sidebearing -- Modified **agrave** - increased left sidebearing -- Modified **amacron** - increased left sidebearing -- Modified **aogonek** - increased left sidebearing -- Modified **aring** - increased left sidebearing -- Modified **atilde** - increased left sidebearing -- Modified **kcommaaccent** - decreased left sidebearing -- Modified **racute** - decreased left sidebearing -- Modified **rcaron** - decreased left sidebearing -- Modified **rcommaaccent** - decreased left sidebearing -- Mofified **Mu** - increased left sidebearing -- Modified **Zeta** - reduced left sidebearing to center the glyph -- Modified **Rho** - reduced left sidebearing -- Modified **Phi** - increased left sidebearing -- Modified **left guillemet** - increased right sidebearing -- Modified **right guillemet** - increased left sidebearing -- Modified **left brace** - increased right sidebearing -- Modified **right brace** - increased left sidebearing -- Modified **left bracket** - increased right sidebearing -- Modified **right bracket** - increased left sidebearing -- Modified **left parenthesis** - increased right sidebearing -- Modified **right parenthesis** - increased left sidebearing -- Adjusted spacing on all diacritic marks in the regular, bold, oblique, and bold oblique set - -### True Type Instructions / PostScript Hinting - -- New TrueType instructions / PostScript hinting across the entire glyph set - -### Removed - -- Removed **fi** and **fl** ligatures. Spacing issues that require these ligatures are not present in this monospaced typeface - - -# Version 1.3 - -### Modified Glyphs - -- Curve adjustments & curve smoothing across all glyphs in the font collection -- hinting improvements - -### Build Files - -- New binary build system - should result in improved cross-platform compatibility for font binaries - - -# Version 1.2 - -### Modified Glyphs - -- Modified **lowercase i** glyph. Removed serif and added curved tail -- Modified **hyphen** glyph. Widened -- Modified **zero** glyph. Adjusted alignment and shape of the oval fill -- Modified **left parenthesis** glyph. Increased right sidebearing length -- Modified **right parenthesis** glyph. Increased left sidebearing length - -### Source - -- Converted to UFO formatted source - - -# Version 1.0.1 - -- Modified the SIL license to permit dual licensing with the Bitstream Vera license. This modification removed the stipulation that multiple licenses are not possible (preamble and section #5) and was intended to create the new Reserved Font Name Hack for this typeface modification and preserve the right (for myself and others) to define Reserved Font Names for all future fonts derived from this typeface. There are no other modifications to either license under which this font is released. -- This release did not introduce changes to the glyphs included in the typeface - - -# Version 1.0.0 -- Branched Bitstream Vera Sans Mono 1.10 release - -## Changes - -### New Glyphs - -- New **exclamation point** glyph. Circular full stop point, tapered line, increased weight relative to other characters. -- New **asterisk** glyph. Glyph shape from Source Code Pro. Modified vertical position of the glyph to orient closer to the ascender. -- New **period** glyph. Circular full stop point, modified from square glyph. -- New **comma** glyph. Rounded comma shape from Source Code Pro, modified from square glyph. -- New **colon** glyph. Circular colon points, modified from square points. -- New **semicolon** glyph. Circular point and rounded comma shape from Source Code Pro, increased vertical spacing between the shapes - - -### Modified Glyphs -- Modified **percent** glyph. Increased line length and added vertical line ends. -- Modified **zero** glyph. Changed circular fill to oval fill. -- Modified **left square bracket** glyph. Increased height of the glyph. -- Modified **right square bracket** glyph. Increased height of the glyph. -- Modified **left curly bracket** glyph. Modified vertical position, increased length of the horizontal stem, decreased left sidebearing -- Modified **right curly bracket** glyph. Modified vertical position, increased length of the horizontal stem, decreased right sidebearing -- Modified **question mark** glyph. Changed square full stop point to circular full stop point. -- Modified **hyphen** glyph. Raised vertical alignment to center `->` character combinations. - -### Font Styles -- **Regular** - includes all changes indicated above -- **Regular Oblique** - includes all changes indicated above -- **Bold** - includes all changes indicated above -- **Bold Oblique** - includes all changes indicated above - - diff --git a/deps/hack-font-ttf/LICENSE.md b/deps/hack-font-ttf/LICENSE.md deleted file mode 100644 index e9fc8a1..0000000 --- a/deps/hack-font-ttf/LICENSE.md +++ /dev/null @@ -1,64 +0,0 @@ -## License - -Hack Copyright 2015, Christopher Simpkins with Reserved Font Name "Hack". - -Bitstream Vera Sans Mono Copyright 2003 Bitstream Inc. and licensed under the Bitstream Vera License with Reserved Font Names "Bitstream" and "Vera" - -DejaVu modifications of the original Bitstream Vera Sans Mono typeface have been committed to the public domain. - - - -This Font Software is licensed under the Hack Open Font License v2.0 and the Bitstream Vera License. - -These licenses are copied below. - - -### Hack Open Font License v2.0 - -(Version 1.0 - 06 September 2015) - -(Version 2.0 - 27 September 2015) - -Copyright 2015 by Christopher Simpkins. All Rights Reserved. - -DEFINITIONS - -"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software. - -PERMISSION AND CONDITIONS - -Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license ("Fonts") and associated source code, documentation, and binary files (the "Font Software"), to reproduce and distribute the modifications to the Bitstream Vera Font Software, including without limitation the rights to use, study, copy, merge, embed, modify, redistribute, and/or sell modified or unmodified copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions: - -(1) The above copyright notice and this permission notice shall be included in all modified and unmodified copies of the Font Software typefaces. These notices can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user. - -(2) The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the fonts are renamed to names not containing the word "Hack". - -(3) Neither the Font Software nor any of its individual components, in original or modified versions, may be sold by itself. - -TERMINATION - -This license becomes null and void if any of the above conditions are not met. - -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. - -Except as contained in this notice, the names of Christopher Simpkins and the Author(s) of the Font Software shall not be used to promote, endorse or advertise any modified version, except to acknowledge the contribution(s) of Christopher Simpkins and the Author(s) or with their explicit written permission. For further information, contact: chris at sourcefoundry dot org. - - - -### BITSTREAM VERA LICENSE - -Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy of the fonts accompanying this license ("Fonts") and associated documentation files (the "Font Software"), to reproduce and distribute the Font Software, including without limitation the rights to use, copy, merge, publish, distribute, and/or sell copies of the Font Software, and to permit persons to whom the Font Software is furnished to do so, subject to the following conditions: - -The above copyright and trademark notices and this permission notice shall be included in all copies of one or more of the Font Software typefaces. - -The Font Software may be modified, altered, or added to, and in particular the designs of glyphs or characters in the Fonts may be modified and additional glyphs or characters may be added to the Fonts, only if the fonts are renamed to names not containing either the words "Bitstream" or the word "Vera". - -This License becomes null and void to the extent applicable to Fonts or Font Software that has been modified and is distributed under the "Bitstream Vera" names. - -The Font Software may be sold as part of a larger software package but no copy of one or more of the Font Software typefaces may be sold by itself. - -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. - -Except as contained in this notice, the names of Gnome, the Gnome Foundation, and Bitstream Inc., shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Font Software without prior written authorization from the Gnome Foundation or Bitstream Inc., respectively. For further information, contact: fonts at gnome dot org. diff --git a/deps/hack-font-ttf/hack-font-ttf.SlackBuild b/deps/hack-font-ttf/hack-font-ttf.SlackBuild deleted file mode 100755 index ab48b87..0000000 --- a/deps/hack-font-ttf/hack-font-ttf.SlackBuild +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/sh - -# Copyright 2016 Eric Hameleers, Eindhoven, NL -# Copyright 2016 Patrick J. Volkerding, Sebeka, MN USA -# All rights reserved. -# -# Permission to use, copy, modify, and distribute this software for -# any purpose with or without fee is hereby granted, provided that -# the above copyright notice and this permission notice appear in all -# copies. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR -# 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. -# ----------------------------------------------------------------------------- - - -PRGNAM=hack-font-ttf -SRCNAM=Hack -VERSION=${VERSION:-"2.020"} -SRCVER=$(echo $VERSION |tr . _) -ARCH=noarch -BUILD=${BUILD:-1} - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PRGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG - -# Font directory location depends on the X build prefix: -# Determine what X we're running (the modular X returns the prefix -# in the next command, while older versions stay silent): -XPREF=$(pkg-config --variable=prefix x11) -if [ "$XPREF" = "" ]; then - XPREF='/usr/X11R6' - FONTDIR="$XPREF/lib/X11/fonts/TTF" -else - FONTDIR="/usr/share/fonts/TTF" -fi -mkdir -p $PKG$FONTDIR - -# Install the TTF fonts: -cd $PKG$FONTDIR/ -tar xvf $CWD/${SRCNAM}-v${SRCVER}-ttf.tar.xz || exit 1 -chown -R root:root . -chmod 644 $PKG$FONTDIR/* - -# Post-install script: -mkdir -p $PKG/install -cat << EOT > $PKG/install/doinst.sh -# Update X font indexes and the font cache: -if [ -x .$XPREF/bin/mkfontdir ]; then - chroot . $XPREF/bin/mkfontscale $FONTDIR - chroot . $XPREF/bin/mkfontdir $FONTDIR -fi -if [ -x .$XPREF/bin/fc-cache ]; then - chroot . $XPREF/bin/fc-cache $FONTDIR -fi -EOT - -# Add documentation: -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - $CWD/CHANGELOG.md $CWD/LICENSE.md $CWD/README.md \ - $PKG/usr/doc/$PRGNAM-$VERSION -find $PKG/usr/doc -type f -exec chmod 644 {} \; - -# Add a package description: -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -# Build the package: -cd $PKG -/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz - diff --git a/deps/hack-font-ttf/slack-desc b/deps/hack-font-ttf/slack-desc deleted file mode 100644 index 03c97d1..0000000 --- a/deps/hack-font-ttf/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -hack-font-ttf: hack-font-ttf (TrueType font based on Bitstream Vera Mono) -hack-font-ttf: -hack-font-ttf: Hack is a typeface designed for writing source code. -hack-font-ttf: It expands upon the contributions of the Bitstream Vera -hack-font-ttf: & DejaVu projects. -hack-font-ttf: Hack includes monospaced regular, bold, oblique, and bold oblique -hack-font-ttf: sets to cover all of your syntax highlighting needs. -hack-font-ttf: -hack-font-ttf: -hack-font-ttf: hack-font-ttf home: http://sourcefoundry.org/hack/ -hack-font-ttf: diff --git a/deps/hyphen/.url b/deps/hyphen/.url deleted file mode 100644 index 33c4c38..0000000 --- a/deps/hyphen/.url +++ /dev/null @@ -1 +0,0 @@ -https://sourceforge.net/projects/hunspell/files/Hyphen/2.8/hyphen-2.8.8.tar.gz diff --git a/deps/hyphen/slack-desc b/deps/hyphen/slack-desc deleted file mode 100644 index f9afa89..0000000 --- a/deps/hyphen/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------------------------------------------------------| -hyphen: hyphen (library for high quality hyphenation and justification) -hyphen: -hyphen: Hyphen is a library to use converted TeX hyphenation patterns. -hyphen: -hyphen: -hyphen: -hyphen: -hyphen: -hyphen: -hyphen: Homepage: https://hunspell.github.io/ -hyphen: diff --git a/deps/kdsoap/.url b/deps/kdsoap/.url new file mode 100644 index 0000000..1cb547f --- /dev/null +++ b/deps/kdsoap/.url @@ -0,0 +1 @@ +https://github.com/KDAB/KDSoap/releases/download/kdsoap-1.9.0/kdsoap-1.9.0.tar.gz diff --git a/deps/kdsoap/kdsoap.SlackBuild b/deps/kdsoap/kdsoap.SlackBuild new file mode 100755 index 0000000..e407a3b --- /dev/null +++ b/deps/kdsoap/kdsoap.SlackBuild @@ -0,0 +1,120 @@ +#!/bin/sh + +# Copyright 2020 Eric Hameleers, Eindhoven, NL +# Copyright 2020 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Permission to use, copy, modify, and distribute this software for +# any purpose with or without fee is hereby granted, provided that +# the above copyright notice and this permission notice appear in all +# copies. +# +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR +# 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. +# ----------------------------------------------------------------------------- + + +PKGNAM=kdsoap +VERSION=${VERSION:-1.9.0} +BUILD=${BUILD:-1} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +fi + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686" + SLKLDFLAGS="" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + SLKLDFLAGS="-L/usr/lib64" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + SLKLDFLAGS="" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + SLKLDFLAGS="" + LIBDIRSUFFIX="" +fi + +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf ${PKGNAM}-$VERSION +tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1 +cd ${PKGNAM}-$VERSION || exit 1 + +# Fix bogus permissions: +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Configure and compile: +mkdir -p build +cd build + cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_MANDIR=/usr/man \ + -DCMAKE_INSTALL_DOCDIR=/usr/doc/$PKGNAM-$VERSION \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DBUILD_TESTS=OFF \ + .. + make VERBOSE=1 + make install DESTDIR=$PKG +cd .. + +# Add documentation: +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + LICENSE* README.txt \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# Strip binaries: +find $PKG | xargs file | grep -e "executable" -e "shared object" \ + | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Add a package description: +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +# Build the package: +cd $PKG +makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz + diff --git a/deps/kdsoap/slack-desc b/deps/kdsoap/slack-desc new file mode 100644 index 0000000..091c73c --- /dev/null +++ b/deps/kdsoap/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +kdsoap: kdsoap (Qt-based client/server SOAP component) +kdsoap: +kdsoap: KD SOAP is a tool for creating client applications for web services. +kdsoap: KD SOAP also provides the means to create web services without +kdsoap: the need for any further component such as a dedicated web server. +kdsoap: It makes it possible to interact with applications which have APIs +kdsoap: that can be exported as SOAP objects. The web service then provides +kdsoap: a machine-accessible interface to its functionality via HTTP. +kdsoap: +kdsoap: See also: https://www.kdab.com/development-resources/qt-tools/kd-soap/ +kdsoap: diff --git a/deps/lensfun/.url b/deps/lensfun/.url index 3fc2a84..aee7ede 100644 --- a/deps/lensfun/.url +++ b/deps/lensfun/.url @@ -1 +1 @@ -http://sourceforge.net/projects/lensfun/files/0.3.2/lensfun-0.3.2.tar.gz +https://github.com/lensfun/lensfun/archive/v0.3.95.tar.gz diff --git a/deps/lensfun/lensfun.SlackBuild b/deps/lensfun/lensfun.SlackBuild index 14af1b5..093b9a6 100755 --- a/deps/lensfun/lensfun.SlackBuild +++ b/deps/lensfun/lensfun.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright 2009, 2010, 2012, 2017 Eric Hameleers, Eindhoven, NL -# Copyright 2017 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2010, 2012, 2017, 2019 Eric Hameleers, Eindhoven, NL +# Copyright 2017, 2019 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -25,8 +25,8 @@ PKGNAM=lensfun -VERSION=${VERSION:-0.3.2} -BUILD=${BUILD:-1} +VERSION=${VERSION:-0.3.95} +BUILD=${BUILD:-2} CWD=$(pwd) TMP=${TMP:-/tmp} @@ -35,7 +35,7 @@ PKG=$TMP/package-$PKGNAM # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -43,8 +43,8 @@ if [ -z "$ARCH" ]; then export ARCH fi -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686" SLKLDFLAGS="" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then @@ -96,8 +96,9 @@ cd build -DBUILD_FOR_SSE=ON \ -DBUILD_FOR_SSE2=ON \ -DBUILD_TESTS=OFF \ + -DINSTALL_HELPER_SCRIPTS=ON \ .. - make + make VERBOSE=1 make install DESTDIR=$PKG cd .. diff --git a/deps/libburn/libburn.SlackBuild b/deps/libburn/libburn.SlackBuild index 5b82850..2bfad39 100755 --- a/deps/libburn/libburn.SlackBuild +++ b/deps/libburn/libburn.SlackBuild @@ -88,7 +88,7 @@ CXXFLAGS="$SLKCFLAGS" \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ --disable-static \ --build=$TARGET diff --git a/deps/libdbusmenu-qt5/libdbusmenu-qt5.SlackBuild b/deps/libdbusmenu-qt5/libdbusmenu-qt5.SlackBuild index 103e251..a16f439 100755 --- a/deps/libdbusmenu-qt5/libdbusmenu-qt5.SlackBuild +++ b/deps/libdbusmenu-qt5/libdbusmenu-qt5.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2010, 2011, 2012, 2014, 2015, 2017 Eric Hameleers, Eindhoven, The Netherlands +# Copyright 2010, 2011, 2012, 2014, 2015, 2017, 2020 Eric Hameleers, Eindhoven, The Netherlands # Copyright 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. @@ -29,25 +29,37 @@ # Get version number from # grep dbusmenu_qt_VERSION dbusmenu-qt/CMakeLists.txt +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=libdbusmenu-qt5 SRCNAM=libdbusmenu-qt VERSION=${VERSION:-0.9.3+16.04.20160218} -BUILD=${BUILD:-1} - -NUMJOBS=${NUMJOBS:--j7} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: -MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i586 ;; - armv7hl) export ARCH=$MARCH ;; - arm*) export ARCH=arm ;; + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$MARCH ;; + *) ARCH=$(uname -m) ;; esac + export ARCH +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 fi +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -65,10 +77,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - rm -rf $PKG mkdir -p $TMP $PKG cd $TMP @@ -79,11 +87,9 @@ cd $SRCNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Switch the two booleans USE_QT4 and USE_QT5 to build a Qt4 version instead. + -exec chmod 644 {} \+ mkdir -p build cd build diff --git a/deps/libinput/.url b/deps/libinput/.url deleted file mode 100644 index 9460ebe..0000000 --- a/deps/libinput/.url +++ /dev/null @@ -1,2 +0,0 @@ -https://www.freedesktop.org/software/libinput/libinput-1.5.4.tar.xz - diff --git a/deps/libinput/libinput.SlackBuild b/deps/libinput/libinput.SlackBuild deleted file mode 100755 index e6663d3..0000000 --- a/deps/libinput/libinput.SlackBuild +++ /dev/null @@ -1,145 +0,0 @@ -#!/bin/sh -# Copyright 2016 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2016, 2017 Eric Hameleers, Eindhoven, NL -# All rights reserved. -# -# Permission to use, copy, modify, and distribute this software for -# any purpose with or without fee is hereby granted, provided that -# the above copyright notice and this permission notice appear in all -# copies. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR -# 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. -# ----------------------------------------------------------------------------- - - -PKGNAM=libinput -VERSION=${VERSION:-1.5.4} -BUILD=${BUILD:-1} - -# Support for (wacom) tablets requires libwacom as additional dependency: -TABLET_SUPPORT=${TABLET_SUPPORT:-"YES"} - -NUMJOBS=${NUMJOBS:-" -j4 "} - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -if [ -e $CWD/machine.conf ]; then - . $CWD/machine.conf ] -elif [ -e /etc/slackbuild/machine.conf ]; then - . /etc/slackbuild/machine.conf ] -else - # Automatically determine the architecture we're building on: - MARCH=$( uname -m ) - if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$MARCH ;; - esac - fi - # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX: - if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" - elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" - elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" - elif [ "$ARCH" = "arm" ]; then - SLKCFLAGS="-O2 -march=armv5te" - LIBDIRSUFFIX="" - else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" - fi -fi - -case "$ARCH" in - arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; - *) TARGET=$ARCH-slackware-linux ;; -esac - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 -cd $PKGNAM-$VERSION || exit 1 - -# Make sure ownerships and permissions are sane: -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Configure: -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --with-udev-dir=/lib/udev \ - --disable-static \ - --disable-documentation \ - --$([ "$TABLET_SUPPORT" = "NO" ] && echo dis || echo en)able-libwacom \ - --build=$TARGET - -# Build and install: -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Strip binaries: -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 - -# Compress and link manpages, if any: -if [ -d $PKG/usr/man ]; then - ( cd $PKG/usr/man - for manpagedir in $(find . -type d -name "man*") ; do - ( cd $manpagedir - for eachpage in $( find . -type l -maxdepth 1) ; do - ln -s $( readlink $eachpage ).gz $eachpage.gz - rm $eachpage - done - gzip -9 *.? - ) - done - ) -fi - -# Add documentation: -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - AUTHORS COPYING LICENSE README NEWS THANKS TODO \ - $PKG/usr/doc/$PKGNAM-$VERSION - -# Add a description: -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -# Create the package: -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/libinput/slack-desc b/deps/libinput/slack-desc deleted file mode 100644 index 17d37d6..0000000 --- a/deps/libinput/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------------------------------------------------------| -libinput: libinput (Input device library) -libinput: -libinput: libinput is a library that handles input devices for display servers -libinput: and other applications that need to directly deal with input devices. -libinput: -libinput: -libinput: -libinput: -libinput: -libinput: Homepage: http://www.freedesktop.org/wiki/Software/libinput/ -libinput: diff --git a/deps/libpwquality/.url b/deps/libpwquality/.url deleted file mode 100644 index 24e1977..0000000 --- a/deps/libpwquality/.url +++ /dev/null @@ -1 +0,0 @@ -https://github.com/libpwquality/libpwquality/releases/download/libpwquality-1.4.0/libpwquality-1.4.0.tar.bz2 diff --git a/deps/libpwquality/slack-desc b/deps/libpwquality/slack-desc deleted file mode 100644 index 740055f..0000000 --- a/deps/libpwquality/slack-desc +++ /dev/null @@ -1,20 +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------------------------------------------------------| -libpwquality: libpwquality (password quality checking library) -libpwquality: -libpwquality: The libpwquality library purpose is to provide common functions -libpwquality: for password quality checking and also scoring them based on their -libpwquality: apparent randomness. -libpwquality: The library also provides a function for generating random -libpwquality: passwords with good pronounceability. -libpwquality: -libpwquality: -libpwquality: See also: https://github.com/libpwquality/libpwquality -libpwquality: - diff --git a/deps/libqalculate/.url b/deps/libqalculate/.url new file mode 100644 index 0000000..5bb56c9 --- /dev/null +++ b/deps/libqalculate/.url @@ -0,0 +1 @@ +https://github.com/Qalculate/libqalculate/releases/download/v3.10.0/libqalculate-3.10.0.tar.gz diff --git a/deps/pcaudiolib/pcaudiolib.SlackBuild b/deps/libqalculate/libqalculate.SlackBuild index 272e58c..60e7855 100755 --- a/deps/pcaudiolib/pcaudiolib.SlackBuild +++ b/deps/libqalculate/libqalculate.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright 2019 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2019 Eric Hameleers, Eindhoven, NL +# Copyright 2020 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2020 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,8 +24,8 @@ cd $(dirname $0) ; CWD=$(pwd) -PKGNAM=pcaudiolib -VERSION=${VERSION:-1.1} +PKGNAM=libqalculate +VERSION=${VERSION:-3.10.0} BUILD=${BUILD:-1} TMP=${TMP:-/tmp} @@ -74,7 +74,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.gz || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find -L . \ @@ -83,7 +83,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 {} \; -[ ! -x configure ] && ./autogen.sh +[ ! -x configure ] && autoreconf -vif CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -91,22 +91,33 @@ CXXFLAGS="$SLKCFLAGS" \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ - --disable-static \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --with-libcurl \ + --with-icu \ --build=$TARGET || exit 1 make || exit 1 make install DESTDIR=$PKG || exit 1 +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + # Add documentation: mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - AUTHORS CHANGELOG.md COPYING README.md \ + AUTHORS ChangeLog COPYING NEWS README* TODO \ $PKG/usr/doc/$PKGNAM-$VERSION # Strip binaries (if any): find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +# Compress man page(s): +if [ -d $PKG/usr/man ]; then + gzip -9 $PKG/usr/man/man?/* +fi + # Add a package description: mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/deps/libqalculate/slack-desc b/deps/libqalculate/slack-desc new file mode 100644 index 0000000..2359d9c --- /dev/null +++ b/deps/libqalculate/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------------------------------------------------------| +libqalculate: libqalculate (desktop caculator library) +libqalculate: +libqalculate: Qalculate! is a multi-purpose desktop calculator. +libqalculate: It is small and simple to use but with much power and versatility +libqalculate: underneath. Features include customizable functions, units, +libqalculate: arbitrary precision, plotting, command-line interface and +libqalculate: optionally a user-friendly GTK+ interface. +libqalculate: +libqalculate: +libqalculate: See also: http://qalculate.github.io/ +libqalculate: diff --git a/deps/libsass/libsass.SlackBuild b/deps/libsass/libsass.SlackBuild index 254f216..ed0642d 100755 --- a/deps/libsass/libsass.SlackBuild +++ b/deps/libsass/libsass.SlackBuild @@ -92,12 +92,15 @@ CXXFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ --build=$TARGET || exit 1 make || exit 1 make install DESTDIR=$PKG || exit 1 +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + # Add documentation: mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ diff --git a/deps/libwacom/.url b/deps/libwacom/.url deleted file mode 100644 index b289c17..0000000 --- a/deps/libwacom/.url +++ /dev/null @@ -1,2 +0,0 @@ -https://sourceforge.net/projects/linuxwacom/files/libwacom/libwacom-0.22.tar.bz2 - diff --git a/deps/libwacom/libwacom.SlackBuild b/deps/libwacom/libwacom.SlackBuild deleted file mode 100755 index 49cdc7f..0000000 --- a/deps/libwacom/libwacom.SlackBuild +++ /dev/null @@ -1,139 +0,0 @@ -#!/bin/sh -# Copyright 2016 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2016 Eric Hameleers, Eindhoven, NL -# All rights reserved. -# -# Permission to use, copy, modify, and distribute this software for -# any purpose with or without fee is hereby granted, provided that -# the above copyright notice and this permission notice appear in all -# copies. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR -# 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. -# ----------------------------------------------------------------------------- - - -PKGNAM=libwacom -VERSION=${VERSION:-0.22} -BUILD=${BUILD:-1} - -NUMJOBS=${NUMJOBS:-" -j4 "} - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -if [ -e $CWD/machine.conf ]; then - . $CWD/machine.conf ] -elif [ -e /etc/slackbuild/machine.conf ]; then - . /etc/slackbuild/machine.conf ] -else - # Automatically determine the architecture we're building on: - MARCH=$( uname -m ) - if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$MARCH ;; - esac - fi - # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX: - if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" - elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" - elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" - elif [ "$ARCH" = "arm" ]; then - SLKCFLAGS="-O2 -march=armv5te" - LIBDIRSUFFIX="" - else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" - fi -fi - -case "$ARCH" in - arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; - *) TARGET=$ARCH-slackware-linux ;; -esac - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1 -cd $PKGNAM-$VERSION || exit 1 - -# Make sure ownerships and permissions are sane: -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Configure: -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --disable-static \ - --build=$TARGET - -# Build and install: -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Strip binaries: -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 - -# Compress and link manpages, if any: -if [ -d $PKG/usr/man ]; then - ( cd $PKG/usr/man - for manpagedir in $(find . -type d -name "man*") ; do - ( cd $manpagedir - for eachpage in $( find . -type l -maxdepth 1) ; do - ln -s $( readlink $eachpage ).gz $eachpage.gz - rm $eachpage - done - gzip -9 *.? - ) - done - ) -fi - -# Add documentation: -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - COPYING NEWS README \ - $PKG/usr/doc/$PKGNAM-$VERSION - -# Add a description: -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -# Create the package: -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/libwacom/slack-desc b/deps/libwacom/slack-desc deleted file mode 100644 index 428dd7a..0000000 --- a/deps/libwacom/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------------------------------------------------------| -libwacom: libwacom (library to identify Wacom tablets and their features) -libwacom: -libwacom: The Linux Wacom Project manages the libraries, configuration, -libwacom: and diagnostic tools for Wacom tablets running under Linux. -libwacom: It also maintains updated Linux kernel drivers and Xorg/XFree86 -libwacom: XInput drivers. -libwacom: -libwacom: -libwacom: -libwacom: Home Page: http://linuxwacom.sourceforge.net/ -libwacom: diff --git a/deps/libxkbcommon/.url b/deps/libxkbcommon/.url deleted file mode 100644 index 5c4d34e..0000000 --- a/deps/libxkbcommon/.url +++ /dev/null @@ -1,2 +0,0 @@ -https://xkbcommon.org/download/libxkbcommon-0.8.3.tar.xz - diff --git a/deps/libxkbcommon/libxkbcommon.SlackBuild b/deps/libxkbcommon/libxkbcommon.SlackBuild deleted file mode 100755 index 0ccf3e5..0000000 --- a/deps/libxkbcommon/libxkbcommon.SlackBuild +++ /dev/null @@ -1,125 +0,0 @@ -#!/bin/sh - -# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2015, 2017, 2018, 2019 Eric Hameleers, Eindhoven, NL -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -cd $(dirname $0) ; CWD=$(pwd) - -PKGNAM=libxkbcommon -VERSION=${VERSION:-0.8.3} -BUILD=${BUILD:-1} - -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -# Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX: -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "arm" ]; then - SLKCFLAGS="-O2 -march=armv5te" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -case "$ARCH" in - arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; - *) TARGET=$ARCH-slackware-linux ;; -esac - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" - exit 0 -fi - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 -cd $PKGNAM-$VERSION || exit 1 -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 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --disable-static \ - --build=$TARGET - -# Build and install: -make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -# Add documentation: -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - LICENSE NEWS PACKAGING README* \ - $PKG/usr/doc/$PKGNAM-$VERSION - -# Strip binaries (if any): -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -# Add a package description: -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -# Build the package: -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/libxkbcommon/slack-desc b/deps/libxkbcommon/slack-desc deleted file mode 100644 index 6e5e0ea..0000000 --- a/deps/libxkbcommon/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------------------------------------------------------| -libxkbcommon: libxkbcommon (library to handle keyboard descriptions) -libxkbcommon: -libxkbcommon: xkbcommon is a library to handle keyboard descriptions, including -libxkbcommon: loading them from disk, parsing them and handling their state. -libxkbcommon: It's mainly meant for client toolkits, window systems, and other -libxkbcommon: system applications; currently that includes Wayland, kmscon, -libxkbcommon: GTK+, Qt, Clutter, and more. It is also used by some XCB -libxkbcommon: applications for proper keyboard support. -libxkbcommon: -libxkbcommon: -libxkbcommon: Home page: http://xkbcommon.org/ diff --git a/deps/md4c/.url b/deps/md4c/.url new file mode 100644 index 0000000..e059ce8 --- /dev/null +++ b/deps/md4c/.url @@ -0,0 +1 @@ +https://github.com/mity/md4c/archive/release-0.4.2.tar.gz diff --git a/deps/md4c/md4c.SlackBuild b/deps/md4c/md4c.SlackBuild new file mode 100755 index 0000000..06903d5 --- /dev/null +++ b/deps/md4c/md4c.SlackBuild @@ -0,0 +1,122 @@ +#!/bin/sh + +# Copyright 2019 Eric Hameleers, Eindhoven, NL +# Copyright 2019 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Permission to use, copy, modify, and distribute this software for +# any purpose with or without fee is hereby granted, provided that +# the above copyright notice and this permission notice appear in all +# copies. +# +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR +# 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. +# ----------------------------------------------------------------------------- + + +PKGNAM=md4c +VERSION=${VERSION:-0.4.2} +BUILD=${BUILD:-1} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +fi + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686" + SLKLDFLAGS="" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + SLKLDFLAGS="-L/usr/lib64" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + SLKLDFLAGS="" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + SLKLDFLAGS="" + LIBDIRSUFFIX="" +fi + +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf ${PKGNAM}*-$VERSION +tar xvf $CWD/${PKGNAM}*-$VERSION.tar.?z* || exit 1 +cd ${PKGNAM}*-$VERSION || exit 1 + +# Fix bogus permissions: +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Configure and compile: +mkdir -p build +cd build + cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_MANDIR=/usr/man \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DBUILD_TESTS=OFF \ + .. + make VERBOSE=1 + make install DESTDIR=$PKG +cd .. + +# Add documentation: +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + *.md \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# Compress man page: +gzip -9 $PKG/usr/man/man?/*.1 + +# Strip binaries: +find $PKG | xargs file | grep -e "executable" -e "shared object" \ + | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Add a package description: +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +# Build the package: +cd $PKG +makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz + diff --git a/deps/PyQt/slack-desc b/deps/md4c/slack-desc index b139061..8574885 100644 --- a/deps/PyQt/slack-desc +++ b/deps/md4c/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -PyQt: PyQt (Python bindings for Qt) -PyQt: -PyQt: PyQt is a set of Python bindings for the Qt application framework and -PyQt: runs on all platforms supported by Qt. -PyQt: -PyQt: -PyQt: -PyQt: -PyQt: -PyQt: Homepage: http://www.riverbankcomputing.co.uk/software/pyqt/ -PyQt: +md4c: md4c (C Markdown parser) +md4c: +md4c: MD4C stands for "Markdown for C" and that is exactly what +md4c: this project is about. +md4c: Markdown is the markup language you will commonly see used in +md4c: README.md files. +md4c: +md4c: +md4c: +md4c: md4c home: https://github.com/mity/md4c +md4c: diff --git a/deps/mlt/.url b/deps/mlt/.url index 5fb8e29..c2c715f 100644 --- a/deps/mlt/.url +++ b/deps/mlt/.url @@ -1,2 +1,2 @@ -https://github.com/mltframework/mlt/archive/v6.10.0.tar.gz +https://github.com/mltframework/mlt/archive/v6.20.0.tar.gz diff --git a/deps/mlt/mlt.SlackBuild b/deps/mlt/mlt.SlackBuild index 5ebd44d..e6139cb 100755 --- a/deps/mlt/mlt.SlackBuild +++ b/deps/mlt/mlt.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # $Id$ -# Copyright 2017,2018 Eric Hameleers, Eindhoven, NL +# Copyright 2017, 2018, 2019, 2020 Eric Hameleers, Eindhoven, NL # Copyright 2017 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # @@ -27,10 +27,10 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mlt -VERSION=${VERSION:-6.10.0} -BUILD=${BUILD:-1} +VERSION=${VERSION:-6.20.0} +BUILD=${BUILD:-2} -PYTHONSITEPKG=$(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") +PYTHONSITEPKG=$(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -84,6 +84,10 @@ rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 cd $PKGNAM-$VERSION || exit 1 +# Apply patches: +# Make mlt compile against Qt 5.15: +cat $CWD/patches/mlt_qt515.patch | patch -p1 --verbose || exit 1 + # Fix bogus permissions: chown -R root:root . find . \ @@ -103,6 +107,7 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-gpl \ --enable-gpl3 \ --enable-motion-est \ + --enable-opencv \ --enable-qt \ --qt-libdir=$(pkg-config Qt5Core --variable=libdir) \ --qt-includedir=$(pkg-config Qt5Core --variable=includedir) \ diff --git a/deps/mlt/patches/mlt_qt515.patch b/deps/mlt/patches/mlt_qt515.patch new file mode 100644 index 0000000..edc1837 --- /dev/null +++ b/deps/mlt/patches/mlt_qt515.patch @@ -0,0 +1,49 @@ +From f58b44d73442986eeffec7431e59b7d19d214c1b Mon Sep 17 00:00:00 2001 +From: Heiko Becker <heirecka@exherbo.org> +Date: Tue, 24 Mar 2020 21:17:05 +0100 +Subject: [PATCH] Fix build with Qt 5.15.0 + +QPainterPath is no longer included via qtransform.h (since +5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git). +--- + src/modules/qt/filter_qtext.cpp | 1 + + src/modules/qt/graph.cpp | 1 + + src/modules/qt/producer_qtext.cpp | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/src/modules/qt/filter_qtext.cpp b/src/modules/qt/filter_qtext.cpp +index c3de1fadc..c3e10f1a3 100644 +--- a/src/modules/qt/filter_qtext.cpp ++++ b/src/modules/qt/filter_qtext.cpp +@@ -21,6 +21,7 @@ + #include <framework/mlt.h> + #include <framework/mlt_log.h> + #include <QPainter> ++#include <QPainterPath> + #include <QString> + + static QRectF get_text_path( QPainterPath* qpath, mlt_properties filter_properties, const char* text, double scale ) +diff --git a/src/modules/qt/graph.cpp b/src/modules/qt/graph.cpp +index 6d4d669ca..7e91bb12f 100644 +--- a/src/modules/qt/graph.cpp ++++ b/src/modules/qt/graph.cpp +@@ -18,6 +18,7 @@ + */ + + #include "graph.h" ++#include <QPainterPath> + #include <QVector> + #include <math.h> + +diff --git a/src/modules/qt/producer_qtext.cpp b/src/modules/qt/producer_qtext.cpp +index 603c2b780..ff95a8e26 100644 +--- a/src/modules/qt/producer_qtext.cpp ++++ b/src/modules/qt/producer_qtext.cpp +@@ -26,6 +26,7 @@ + #include <QImage> + #include <QColor> + #include <QPainter> ++#include <QPainterPath> + #include <QFont> + #include <QString> + #include <QTextCodec> diff --git a/deps/ninja/.url b/deps/ninja/.url deleted file mode 100644 index 3bf2926..0000000 --- a/deps/ninja/.url +++ /dev/null @@ -1 +0,0 @@ -https://github.com/ninja-build/ninja/archive/v1.8.2.tar.gz diff --git a/deps/ninja/ninja.SlackBuild b/deps/ninja/ninja.SlackBuild deleted file mode 100755 index ec75d03..0000000 --- a/deps/ninja/ninja.SlackBuild +++ /dev/null @@ -1,119 +0,0 @@ -#!/bin/sh - -# Copyright 2016, 2017 Eric Hameleers, Eindhoven, NL -# Copyright 2016 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -PKGNAM=ninja -VERSION=${VERSION:-1.8.2} -BUILD=${BUILD:-1} - -NUMJOBS=${NUMJOBS:--j7} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - SLKLDFLAGS="-L/usr/lib64" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -fi - -case "$ARCH" in - arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; - *) TARGET=$ARCH-slackware-linux ;; -esac - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION || exit 1 - -# Fix bogus permissions: -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Build the program: -LDFLAGS="$SLKLDFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -CFLAGS="$SLKCFLAGS" \ - python bootstrap.py \ - 2>&1 | tee $OUTPUT/make-${PRGNAM}.log - -# Manually install stuff: -install -D -m0755 ninja $PKG/usr/bin/ninja -install -D -m0644 misc/bash-completion $PKG/etc/bash_completion.d/ninja -install -D -m0644 misc/ninja.vim $PKG/usr/share/vim/vimfiles/after/syntax//ninja.vim - -# Compress the man page(s): -if [ -d $PKG/usr/man ]; then - find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; - for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -fi - -# Strip binaries (if any): -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -# Add documentation: -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - COPYING HACKING.md README RELEASING \ - $PKG/usr/doc/$PKGNAM-$VERSION - -# Add a package description: -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -# Build the package: -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/ninja/slack-desc b/deps/ninja/slack-desc deleted file mode 100644 index dbd4c4e..0000000 --- a/deps/ninja/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------------------------------------------------------| -ninja: ninja (build system with a focus on speed) -ninja: -ninja: Ninja is a small build system with a focus on speed. -ninja: It differs from other build systems in two major respects: -ninja: it is designed to have its input files generated by a higher-level -ninja: build system, and it is designed to run builds as fast as possible. -ninja: -ninja: -ninja: -ninja: ninja home: https://ninja-build.org/ -ninja: diff --git a/deps/noto-cjk-font-ttf/.url b/deps/noto-cjk-font-ttf/.url deleted file mode 100644 index 4fd3b76..0000000 --- a/deps/noto-cjk-font-ttf/.url +++ /dev/null @@ -1 +0,0 @@ -https://github.com/googlei18n/noto-cjk/archive/v1.004.tar.gz diff --git a/deps/noto-cjk-font-ttf/70-noto-cjk.conf b/deps/noto-cjk-font-ttf/70-noto-cjk.conf deleted file mode 100644 index c1052bb..0000000 --- a/deps/noto-cjk-font-ttf/70-noto-cjk.conf +++ /dev/null @@ -1,147 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> -<fontconfig> - <match target="pattern"> - <test name="lang"> - <string>ja</string> - </test> - <test name="family"> - <string>serif</string> - </test> - <edit name="family" mode="prepend"> - <string>Noto Serif CJK JP</string> - </edit> - </match> - - <match target="pattern"> - <test name="lang"> - <string>ko</string> - </test> - <test name="family"> - <string>serif</string> - </test> - <edit name="family" mode="prepend"> - <string>Noto Serif CJK KR</string> - </edit> - </match> - - <match target="pattern"> - <test name="lang"> - <string>zh-cn</string> - </test> - <test name="family"> - <string>serif</string> - </test> - <edit name="family" mode="prepend"> - <string>Noto Serif CJK SC</string> - </edit> - </match> - - <match target="pattern"> - <test name="lang"> - <string>zh-tw</string> - </test> - <test name="family"> - <string>serif</string> - </test> - <edit name="family" mode="prepend"> - <string>Noto Serif CJK TC</string> - </edit> - </match> - - <match target="pattern"> - <test name="lang"> - <string>ja</string> - </test> - <test name="family"> - <string>sans-serif</string> - </test> - <edit name="family" mode="prepend"> - <string>Noto Sans CJK JP</string> - </edit> - </match> - - <match target="pattern"> - <test name="lang"> - <string>ko</string> - </test> - <test name="family"> - <string>sans-serif</string> - </test> - <edit name="family" mode="prepend"> - <string>Noto Sans CJK KR</string> - </edit> - </match> - - <match target="pattern"> - <test name="lang"> - <string>zh-cn</string> - </test> - <test name="family"> - <string>sans-serif</string> - </test> - <edit name="family" mode="prepend"> - <string>Noto Sans CJK SC</string> - </edit> - </match> - - <match target="pattern"> - <test name="lang"> - <string>zh-tw</string> - </test> - <test name="family"> - <string>sans-serif</string> - </test> - <edit name="family" mode="prepend"> - <string>Noto Sans CJK TC</string> - </edit> - </match> - - <match target="pattern"> - <test name="lang"> - <string>ja</string> - </test> - <test name="family"> - <string>monospace</string> - </test> - <edit name="family" mode="prepend"> - <string>Noto Sans Mono CJK JP</string> - </edit> - </match> - - <match target="pattern"> - <test name="lang"> - <string>ko</string> - </test> - <test name="family"> - <string>monospace</string> - </test> - <edit name="family" mode="prepend"> - <string>Noto Sans Mono CJK KR</string> - </edit> - </match> - - <match target="pattern"> - <test name="lang"> - <string>zh-cn</string> - </test> - <test name="family"> - <string>monospace</string> - </test> - <edit name="family" mode="prepend"> - <string>Noto Sans Mono CJK SC</string> - </edit> - </match> - - <match target="pattern"> - <test name="lang"> - <string>zh-tw</string> - </test> - <test name="family"> - <string>monospace</string> - </test> - <edit name="family" mode="prepend"> - <string>Noto Sans Mono CJK TC</string> - </edit> - </match> -</fontconfig> diff --git a/deps/noto-cjk-font-ttf/HISTORY b/deps/noto-cjk-font-ttf/HISTORY deleted file mode 100644 index c63fb9f..0000000 --- a/deps/noto-cjk-font-ttf/HISTORY +++ /dev/null @@ -1,128 +0,0 @@ -------------------- -Prior Release Notes -------------------- - -Noto Sans CJK 1.003 Release Notes -================================= - -June 8, 2015 - -- Regularized the vertical metrics across all weights by setting the O/2.uWinAscent and - O/2.uWinDescent values to 1160 and 320 respectively and using those sames values in the - horizontal header (hhea) table. -- The ‘locl’ GSUB feature was reconfigured to be usable in a broader range of contexts. - - - -Noto Sans CJK 1.002 Release Notes -================================= - -April 20, 2015 - -This release includes a license change, the addition of several new font instances, and a -number of bug fixes. - ----------------------- -License Change ----------------------- -The open source license is changed from Apache License, Version 2.0 to SIL Open Font -License, Version 1.1. - ---------------------------- -New Font Instances ---------------------------- -In total eight (4 languages x 2 weights) monospaced half-width OTF fonts were added, in -regular and bold weights. - - - Noto Sans Mono CJK SC Regular and Bold - - Noto Sans Mono CJK JP Regular and Bold - - Noto Sans Mono CJK KR Regular and Bold - - Noto Sans Mono CJK TC Regular and Bold - -The monospace fonts differ from the existing ones only in that the default (encoded) -glyphs for ASCII (U+0020 to U+007E), U+00A0 ( ), U+00A5 (Â¥), U+2011 (‑), and U+20A9 (â‚©) -are half-width instead of proportional. - -The new monospace fonts can be found in: - - All-in-one CJK super OTC font (now includes 36 font instances) - - CJK OTF fonts with different default language (two additional font instances for each - language) - - NotoSansCJK-Regular.ttc and NotoSansCJK-Bold.ttc (four additional font instances in - each) - -Although eight new font instances were added, the footprint of the super OTC only -increased by 1M or so, mainly due to the four additional 'cmap' tables. Two of the seven -OTC now contain eight font instances. - --------------- -Bug Fixes --------------- -The Noto issues that have been fixed include: - - - https://code.google.com/p/noto/issues/detail?id=74 - - https://code.google.com/p/noto/issues/detail?id=126 - - https://code.google.com/p/noto/issues/detail?id=136 - - https://code.google.com/p/noto/issues/detail?id=151 - - https://code.google.com/p/noto/issues/detail?id=182 - - https://code.google.com/p/noto/issues/detail?id=193 - - https://code.google.com/p/noto/issues/detail?id=266 - -In addition to the issues tracked at code.google.com/p/noto/issues, there are also a -number of fixes to issues tracked at https://github.com/adobe-fonts/source-han-sans. -Please find the details in the release notes for Source Han Sans. - - -================================= -Noto Sans CJK 1.001 Release Notes -================================= - -September 12, 2014 - -With this release there have been a number of bug fixes and some -reorganization of the packages. The package reorganization carries with it -a small name change that affects the name of the file, menu name, and the -internal PostScript name of the original OTF format font. This is a one -time name change only and names will be stable going forward. - -Bug Fixes ---------- -There have been a number of fixes but the two most obvious ones are the fix -in the alignment of the traditional Chinese punctuation and adjustment of -the designs used for traditional Chinese to align better for usage in Hong -Kong. - -https://code.google.com/p/noto/issues/detail?id=38 -https://code.google.com/p/noto/issues/detail?id=54 - -Package Reorganization ----------------------- -With this release there was an expansion in the number of file formats and -combinations in which the fonts are being made available. - -There are now four major groups of font files by package in this release. -These are: - -* Super OpenType Collection (Super OTC) - - This is a new format this release that bundles all 7 weights for all 4 - languages into one large font resource. It is smaller overall than - the combination of the 28 fonts that would be used otherwise because - of resource sharing and it is much easier to install. - -* OpenType Collection (OTC) - - Each OTC fully supports each of the four languages. There are 7 of these - with one for each weight. - -* Language Specific OTF - - Each font file supports each of the four languages by using the OpenType - ‘locl’ feature. However, by default, when the ‘locl’ feature is not - used, each font file supports a specific language. That means that - there are 28 font files - 4 languages x 7 weights. - - This format of 4 language specific variants is new with this release and - replaces the previous single language variant that required the use of - the ‘locl’ feature. This is where the name change occurred as we now - tag the various versions with the name of the default language. - -* Region Specific OTF subsets - - Each font file supports a region specific subset of the full fonts. - These contain only the glyphs needed for the specific region. There - are 28 of these font files - 4 languages x 7 weights. diff --git a/deps/noto-cjk-font-ttf/LICENSE b/deps/noto-cjk-font-ttf/LICENSE deleted file mode 100644 index d952d62..0000000 --- a/deps/noto-cjk-font-ttf/LICENSE +++ /dev/null @@ -1,92 +0,0 @@ -This Font Software is licensed under the SIL Open Font License, -Version 1.1. - -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font -creation efforts of academic and linguistic communities, and to -provide a free and open framework in which fonts may be shared and -improved in partnership with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply to -any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software -components as distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, -deleting, or substituting -- in part or in whole -- any of the -components of the Original Version, by changing formats or by porting -the Font Software to a new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, -modify, redistribute, and sell modified and unmodified copies of the -Font Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, in -Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the -corresponding Copyright Holder. This restriction only applies to the -primary font name as presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created using -the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/deps/noto-cjk-font-ttf/NEWS b/deps/noto-cjk-font-ttf/NEWS deleted file mode 100644 index 9b5435e..0000000 --- a/deps/noto-cjk-font-ttf/NEWS +++ /dev/null @@ -1,15 +0,0 @@ -Noto Sans CJK 1.004 Release Notes -================================= - -June 15, 2015 - -- Restore correct vertical Japanese Kana forms - -The vertical kana glyphs that are made accessible via the 'vert' GSUB feature were -inadvertently reverted to their Version 1.000 forms (except for those that were added in -Version 1.002, meaning CIDs 65496 through 65505) in Version 1.002, which affected CIDs -65166 through 65251, 65256 through 65258, 65260 through 65352, 65354 through 65369, and -65471 through 65484. The correct forms, which were present in Version 1.001, are now -included. - -See HISTORY for prior release notes. diff --git a/deps/noto-cjk-font-ttf/noto-cjk-font-ttf.SlackBuild b/deps/noto-cjk-font-ttf/noto-cjk-font-ttf.SlackBuild deleted file mode 100755 index 72eaec5..0000000 --- a/deps/noto-cjk-font-ttf/noto-cjk-font-ttf.SlackBuild +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/sh - -# Copyright 2015, 2018 Eric Hameleers, Eindhoven, NL -# Copyright 2015,2018 Patrick J. Volkerding, Sebeka, MN USA -# All rights reserved. -# -# Permission to use, copy, modify, and distribute this software for -# any purpose with or without fee is hereby granted, provided that -# the above copyright notice and this permission notice appear in all -# copies. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR -# 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. -# ----------------------------------------------------------------------------- - - -PRGNAM=noto-cjk-font-ttf -SRCNAM=NotoSansCJK -VERSION=${VERSION:-"1.004"} -ARCH=noarch -BUILD=${BUILD:-2} - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PRGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG - -FONTDIR="/usr/share/fonts/TTF" -mkdir -p $PKG$FONTDIR - -# Unzip the ZIP file with the Super OTC font: -unzip $CWD/${SRCNAM}.ttc.zip -d $PKG$FONTDIR || exit 1 -chown -R root:root $PKG$FONTDIR -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Add a font configuration file (taken from Arch repository): -install -Dm644 $CWD/70-noto-cjk.conf -t $PKG/etc/fonts/conf.avail - -# Post-install script: -mkdir -p $PKG/install -cat << EOT > $PKG/install/doinst.sh -# Update X font indexes and the font cache: -if [ -x usr/bin/mkfontdir ]; then - chroot . /usr/bin/mkfontscale $FONTDIR - chroot . /usr/bin/mkfontdir $FONTDIR -fi -if [ -x usr/bin/fc-cache ]; then - chroot . /usr/bin/fc-cache $FONTDIR -fi -EOT - -# Add documentation: -# Files downloaded from https://github.com/googlei18n/noto-cjk -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - $CWD/HISTORY $CWD/LICENSE $CWD/NEWS $CWD/README* \ - $PKG/usr/doc/$PRGNAM-$VERSION -find $PKG/usr/doc -type f -exec chmod 644 {} \; - -# Add a package description: -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -# Build the package: -cd $PKG -/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz - diff --git a/deps/noto-cjk-font-ttf/slack-desc b/deps/noto-cjk-font-ttf/slack-desc deleted file mode 100644 index 92f61a8..0000000 --- a/deps/noto-cjk-font-ttf/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -noto-cjk-font-ttf: noto-cjk-font-ttf (Google's Noto CJK TrueType fonts) -noto-cjk-font-ttf: -noto-cjk-font-ttf: Noto CJK 'Super OTC' font: This packaging form carries the fonts for -noto-cjk-font-ttf: each of Simplified Chinese, Traditional Chinese, Japanese, and -noto-cjk-font-ttf: Korean multiplied by all 7 weights for each in one single font file. -noto-cjk-font-ttf: In addition, each language provides monospace versions in Regular -noto-cjk-font-ttf: and Bold weights. Once installed it will appear in font menus -noto-cjk-font-ttf: as 36 separate fonts. This format is the easiest to install of all -noto-cjk-font-ttf: the formats and takes the least space due to sharing between -noto-cjk-font-ttf: the 36 pieces. -noto-cjk-font-ttf: noto-cjk-font-ttf home: https://github.com/googlei18n/noto-cjk diff --git a/deps/noto-font-ttf/.url b/deps/noto-font-ttf/.url deleted file mode 100644 index d44d13e..0000000 --- a/deps/noto-font-ttf/.url +++ /dev/null @@ -1 +0,0 @@ -https://github.com/googlei18n/noto-fonts/archive/v2015-09-29-license-adobe.tar.gz diff --git a/deps/noto-font-ttf/noto-font-ttf.SlackBuild b/deps/noto-font-ttf/noto-font-ttf.SlackBuild deleted file mode 100755 index e9807a2..0000000 --- a/deps/noto-font-ttf/noto-font-ttf.SlackBuild +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/sh - -# Copyright 2015, 2016 Eric Hameleers, Eindhoven, NL -# Copyright 2015 Patrick J. Volkerding, Sebeka, MN USA -# All rights reserved. -# -# Permission to use, copy, modify, and distribute this software for -# any purpose with or without fee is hereby granted, provided that -# the above copyright notice and this permission notice appear in all -# copies. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR -# 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. -# ----------------------------------------------------------------------------- - - -PRGNAM=noto-font-ttf -SRCNAM=noto-fonts -SRCVER=${SRCVER:-"2015-09-29"} -VERSION=$(echo $SRCVER | tr - _) -ARCH=noarch -BUILD=${BUILD:-2} - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PRGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG - -# Font directory location depends on the X build prefix: -# Determine what X we're running (the modular X returns the prefix -# in the next command, while older versions stay silent): -XPREF=$(pkg-config --variable=prefix x11) -if [ "$XPREF" = "" ]; then - XPREF='/usr/X11R6' - FONTDIR="$XPREF/lib/X11/fonts/TTF" -else - FONTDIR="/usr/share/fonts/TTF" -fi -mkdir -p $PKG$FONTDIR - -cd $TMP -rm -rf ${PRGNAM}-${SRCVER} -mkdir ${PRGNAM}-${SRCVER} -cd ${PRGNAM}-${SRCVER} -tar xvf $CWD/${SRCNAM}-${SRCVER}-license-adobe.tar.gz || exit 1 -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; -cd ${SRCNAM}-${SRCVER}-license-adobe - -# Install just the hinted fonts - unhinted fonts for Android and Mac; -# Android and Mac ignore hinting information embedded in fonts: -cp -a hinted/*.{ttf,ttc} $PKG$FONTDIR/ -chmod 644 $PKG$FONTDIR/* - -# Post-install script: -mkdir -p $PKG/install -cat << EOT > $PKG/install/doinst.sh -# Update X font indexes and the font cache: -if [ -x .$XPREF/bin/mkfontdir ]; then - chroot . $XPREF/bin/mkfontscale $FONTDIR - chroot . $XPREF/bin/mkfontdir $FONTDIR -fi -if [ -x .$XPREF/bin/fc-cache ]; then - chroot . $XPREF/bin/fc-cache $FONTDIR -fi -EOT - -# Add documentation: -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - FAQ.md LICENSE README.md \ - $PKG/usr/doc/$PRGNAM-$VERSION -find $PKG/usr/doc -type f -exec chmod 644 {} \; - -# Add a package description: -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -# Build the package: -cd $PKG -/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz - diff --git a/deps/noto-font-ttf/slack-desc b/deps/noto-font-ttf/slack-desc deleted file mode 100644 index 47b1faf..0000000 --- a/deps/noto-font-ttf/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -noto-font-ttf: noto-font-ttf (Google's Noto TrueType fonts) -noto-font-ttf: -noto-font-ttf: Noto's goal is to provide a beautiful reading experience for all -noto-font-ttf: languages. Currently, Noto covers all major languages of the world -noto-font-ttf: and many others, including European, African, Middle Eastern, Indic, -noto-font-ttf: South and Southeast Asian, Central Asian, American, and East Asian -noto-font-ttf: languages. Support for Simplified Chinese, Traditional Chinese, -noto-font-ttf: Japanese, and Korean was first added in July 2014. -noto-font-ttf: All Noto fonts are included, except CJK and Emoji. -noto-font-ttf: -noto-font-ttf: noto-font-ttf home: https://github.com/googlei18n/noto-fonts diff --git a/deps/opencv/.url b/deps/opencv/.url index e2dc286..a277f25 100644 --- a/deps/opencv/.url +++ b/deps/opencv/.url @@ -1,2 +1,2 @@ -https://github.com/Itseez/opencv/archive/3.2.0/opencv-3.2.0.tar.gz -https://github.com/Itseez/opencv_contrib/archive/3.2.0/opencv_contrib-3.2.0.zip +https://github.com/Itseez/opencv/archive/4.1.1/opencv-4.1.1.tar.gz +https://github.com/Itseez/opencv_contrib/archive/4.1.1/opencv_contrib-4.1.1.zip diff --git a/deps/opencv/opencv.SlackBuild b/deps/opencv/opencv.SlackBuild index e1bce8e..8b0202b 100755 --- a/deps/opencv/opencv.SlackBuild +++ b/deps/opencv/opencv.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2015, 2017 Eric Hameleers, Eindhoven, NL +# Copyright 2015, 2017, 2019 Eric Hameleers, Eindhoven, NL # Copyright 2015, 2017 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # @@ -22,22 +22,31 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=opencv -VERSION=${VERSION:-3.2.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-4.1.1} +BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:--j7} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: -MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i486 ;; - armv7hl) export ARCH=$MARCH ;; - arm*) export ARCH=arm ;; + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$MARCH ;; + *) ARCH=$(uname -m) ;; esac + export ARCH +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-${VERSION}-${ARCH}-${BUILD}.txz" + exit 0 fi if [ "$ARCH" = "i486" ]; then @@ -57,7 +66,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -69,6 +77,9 @@ tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 cd $PKGNAM-$VERSION || exit 1 unzip $CWD/${PKGNAM}_contrib-$VERSION.zip || exit 1 +# Remove non-existant include dir from pkgconfig file: +cat $CWD/patches/opencv_includedir.patch | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -88,32 +99,45 @@ cd build -DCMAKE_BUILD_TYPE="Release" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DINSTALL_MAN_DIR=man \ - -DINSTALL_DOC_DIR=doc/$PRGNAM-$VERSION \ + -DINSTALL_DOC_DIR=doc/$PKGNAM-$VERSION \ -DSYSCONF_INSTALL_DIR=/etc \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \ + -DBUILD_CUDA_STUBS=OFF \ -DBUILD_PACKAGE=OFF \ -DBUILD_PERF_TESTS=OFF \ -DBUILD_SHARED_LIBS=ON \ -DBUILD_TESTS=OFF \ -DBUILD_WITH_DEBUG_INFO=OFF \ -DENABLE_PRECOMPILED_HEADERS=OFF \ - -DOPENCV_EXTRA_MODULES_PATH=../${PKGNAM}_contrib-$VERSION/modules \ + -DWITH_CUDA=OFF \ -DWITH_FFMPEG=ON \ + -DWITH_GDAL=OFF \ -DWITH_IPP=OFF \ -DWITH_OPENGL=ON \ + -DWITH_OPENMP=ON \ -DWITH_QT=ON \ + -DWITH_XINE=ON \ + -DOPENCV_ENABLE_NONFREE=ON \ + -DOPENCV_EXTRA_MODULES_PATH=../${PKGNAM}_contrib-$VERSION/modules \ + -DOPENCV_GENERATE_PKGCONFIG=ON \ + -DOPENCV_JNI_INSTALL_PATH=lib${LIBDIRSUFFIX} \ .. make $NUMJOBS VERBOSE=1 || make || exit 1 make install DESTDIR=$PKG || exit 1 cd - +# Add a symlink to 'opencv' to make eg. mlt find it: +ln -s opencv4.pc $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/opencv.pc + find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a COPYING* README* \ $PKG/usr/doc/$PKGNAM-$VERSION +mv $PKG/usr/share/licenses \ + $PKG/usr/doc/$PKGNAM-$VERSION mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/deps/opencv/patches/opencv_includedir.patch b/deps/opencv/patches/opencv_includedir.patch new file mode 100644 index 0000000..69f32bf --- /dev/null +++ b/deps/opencv/patches/opencv_includedir.patch @@ -0,0 +1,12 @@ +# Remove non-existing include directory. + +diff -u -r opencv-4.0.1/cmake/templates/opencv-XXX.pc.in opencv-4.0.1-includedir/cmake/templates/opencv-XXX.pc.in +--- opencv-4.0.1/cmake/templates/opencv-XXX.pc.in 2018-12-22 07:03:30.000000000 +0000 ++++ opencv-4.0.1-includedir/cmake/templates/opencv-XXX.pc.in 2019-02-07 15:08:15.016613349 +0000 +@@ -11,4 +10,4 @@ + Version: @OPENCV_VERSION_PLAIN@ + Libs: @OPENCV_PC_LIBS@ + Libs.private: @OPENCV_PC_LIBS_PRIVATE@ +-Cflags: -I${includedir_old} -I${includedir_new} ++Cflags: -I${includedir_new} + diff --git a/deps/pcaudiolib/.url b/deps/pcaudiolib/.url deleted file mode 100644 index 0244645..0000000 --- a/deps/pcaudiolib/.url +++ /dev/null @@ -1 +0,0 @@ -https://github.com/espeak-ng/pcaudiolib/archive/1.1.tar.gz diff --git a/deps/pcaudiolib/slack-desc b/deps/pcaudiolib/slack-desc deleted file mode 100644 index 91f2646..0000000 --- a/deps/pcaudiolib/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------------------------------------------------------| -pcaudiolib: pcaudiolib (Portable C Audio Library) -pcaudiolib: -pcaudiolib: pcaudiolib is a portable C Audio Library. -pcaudiolib: -pcaudiolib: -pcaudiolib: -pcaudiolib: -pcaudiolib: -pcaudiolib: -pcaudiolib: Homepage: https://github.com/espeak-ng/pcaudiolib -pcaudiolib: diff --git a/deps/phonon-gstreamer/.url b/deps/phonon-gstreamer/.url index 4172160..d2d9cee 100644 --- a/deps/phonon-gstreamer/.url +++ b/deps/phonon-gstreamer/.url @@ -1,2 +1,2 @@ -http://download.kde.org/stable/phonon/phonon-backend-gstreamer/4.9.0/phonon-backend-gstreamer-4.9.0.tar.xz +http://download.kde.org/stable/phonon/phonon-backend-gstreamer/4.10.0/phonon-backend-gstreamer-4.10.0.tar.xz diff --git a/deps/phonon-gstreamer/phonon-gstreamer.SlackBuild b/deps/phonon-gstreamer/phonon-gstreamer.SlackBuild index 13b1e4e..bad913e 100755 --- a/deps/phonon-gstreamer/phonon-gstreamer.SlackBuild +++ b/deps/phonon-gstreamer/phonon-gstreamer.SlackBuild @@ -27,10 +27,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=phonon-gstreamer SRCNAM=phonon-backend-gstreamer -VERSION=${VERSION:-4.9.0} -BUILD=${BUILD:-2} - -NUMJOBS=${NUMJOBS:-"-j$(nproc)"} +VERSION=${VERSION:-4.10.0} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -69,15 +67,17 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION || exit 1 +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1 +cd $SRCNAM-$VERSION || exit 1 chown -R root:root . find . \ @@ -87,8 +87,9 @@ find . \ -exec chmod 644 {} \; echo Building ... -mkdir -p build -cd build +# Qt5 is the only supported version of Qt as of 4.10.0: +mkdir -p build-qt5 +cd build-qt5 cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ @@ -104,27 +105,6 @@ cd build make DESTDIR=$PKG install cd - -# Conditional build of Qt5 support: -if qtpaths-qt5 --qt-version 1>/dev/null 2>/dev/null ; then - mkdir -p build-qt5 - cd build-qt5 - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMAN_INSTALL_DIR=/usr/man \ - -DSYSCONF_INSTALL_DIR=/etc \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DPHONON_BUILD_PHONON4QT5=ON \ - .. - make $NUMJOBS - make DESTDIR=$PKG install - cd - -fi - # Add documentation: mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ diff --git a/deps/phonon-qt4-gstreamer/.url b/deps/phonon-qt4-gstreamer/.url new file mode 100644 index 0000000..4172160 --- /dev/null +++ b/deps/phonon-qt4-gstreamer/.url @@ -0,0 +1,2 @@ +http://download.kde.org/stable/phonon/phonon-backend-gstreamer/4.9.0/phonon-backend-gstreamer-4.9.0.tar.xz + diff --git a/deps/OpenAL/OpenAL.SlackBuild b/deps/phonon-qt4-gstreamer/phonon-qt4-gstreamer.SlackBuild index 9bd806b..b858656 100755 --- a/deps/OpenAL/OpenAL.SlackBuild +++ b/deps/phonon-qt4-gstreamer/phonon-qt4-gstreamer.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2014 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2012, 2013, 2014, 2015, 2017, 2018, 2019 Eric Hameleers, Eindhoven, NL +# Copyright 2011, 2012, 2014, 2015, 2016, 2019 Eric Hameleers, Eindhoven, NL +# Copyright 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -22,38 +22,33 @@ # SUCH DAMAGE. # ----------------------------------------------------------------------------- +# Renamed to phonon-qt4-gstreamer, 2019 Eric Hameleers, Eindhoven, NL + cd $(dirname $0) ; CWD=$(pwd) -PKGNAM=OpenAL -SRCNAM=openal-soft -VERSION=${VERSION:-1.19.1} +PKGNAM=phonon-qt4-gstreamer +SRCNAM=phonon-backend-gstreamer +SRCINT=phonon-gstreamer +VERSION=${VERSION:-4.9.0} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-"-j$(nproc)"} -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM +NUMJOBS=${NUMJOBS:-"-j$(nproc)"} # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + case "$MARCH" in + i?86) export ARCH=i586 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; + *) export ARCH=$MARCH ;; esac - export ARCH fi -# Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX: -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" @@ -61,8 +56,8 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "arm" ]; then - SLKCFLAGS="-O2 -march=armv5te" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" LIBDIRSUFFIX="" else SLKCFLAGS="-O2" @@ -73,16 +68,20 @@ fi # the name of the created package would be, and then exit. This information # could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz" + echo "$PKGNAM-$VERSION-$ARCH-$BUILD$TAG.txz" exit 0 fi +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf $SRCNAM-$VERSION +rm -rf $SRCINT-$VERSION tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1 -cd $SRCNAM-$VERSION || exit 1 +cd $SRCINT-$VERSION || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -90,35 +89,32 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +echo Building ... mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DMAN_INSTALL_DIR=/usr/man \ -DSYSCONF_INSTALL_DIR=/etc \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -G Ninja \ + -D__KDE_HAVE_GCC_VISIBILITY=NO \ .. - ninja || exit 1 - DESTDIR=$PKG ninja install || exit 1 + make $NUMJOBS + make DESTDIR=$PKG install cd - -# Add an example configuration file: -mkdir -p $PKG/etc/openal -install -m0644 alsoftrc.sample $PKG/etc/openal/alsoft.conf.sample +# Conflicts with Qt5 based newer phonon: +rm -rf $PKG/usr/share/icons # Add documentation: mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - COPYING ChangeLog README XCompile.txt docs/*.txt \ - $PKG/usr/doc/$PKGNAM-$VERSION || true -chown -R root:root $PKG/usr/doc/$PKGNAM-$VERSION -find $PKG/usr/doc -type f -exec chmod 644 {} \; + COPYING.LIB gstreamer/lgpl-* \ + $PKG/usr/doc/$PKGNAM-$VERSION # Strip binaries (if any): find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ @@ -130,5 +126,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc # Build the package: cd $PKG -/sbin/makepkg --linkadd y --chown n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/deps/phonon-qt4-gstreamer/slack-desc b/deps/phonon-qt4-gstreamer/slack-desc new file mode 100644 index 0000000..552e152 --- /dev/null +++ b/deps/phonon-qt4-gstreamer/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +phonon-qt4-gstreamer: phonon-qt4-gstreamer (gstreamer backend for phonon-qt4) +phonon-qt4-gstreamer: +phonon-qt4-gstreamer: This package provides an additional gstreamer backend +phonon-qt4-gstreamer: for the phonon-qt4 multimedia framework used in KDE4. +phonon-qt4-gstreamer: +phonon-qt4-gstreamer: For more information, visit: +phonon-qt4-gstreamer: https://projects.kde.org/projects/kdesupport/phonon/phonon-gstreamer +phonon-qt4-gstreamer: +phonon-qt4-gstreamer: +phonon-qt4-gstreamer: +phonon-qt4-gstreamer: diff --git a/deps/phonon-qt4/.url b/deps/phonon-qt4/.url new file mode 100644 index 0000000..fdf4e32 --- /dev/null +++ b/deps/phonon-qt4/.url @@ -0,0 +1 @@ +https://download.kde.org/stable/phonon/4.10.2/phonon-4.10.2.tar.xz.sig diff --git a/deps/qt-gstreamer0/qt-gstreamer0.SlackBuild b/deps/phonon-qt4/phonon-qt4.SlackBuild index 7b2fcaf..861e53a 100755 --- a/deps/qt-gstreamer0/qt-gstreamer0.SlackBuild +++ b/deps/phonon-qt4/phonon-qt4.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright 2014 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2014, 2015, 2016 Eric Hameleers, Eindhoven, NL +# Copyright 2008 Robby Workman, Northport, Alabama, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,18 +21,23 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Modified 2010, 2011, 2012, 2014, 2015, 2016, 2017, 2018, 2019 Eric Hameleers, Eindhoven, NL +# Renamed to phonon-qt4, 2019 Eric Hameleers, Eindhoven, NL -PKGNAM=qt-gstreamer0 -SRCNAM=qt-gstreamer -VERSION=${VERSION:-0.10.3} -BUILD=${BUILD:-3} -NUMJOBS=${NUMJOBS:--j7} +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=phonon-qt4 +SRCNAM=phonon +VERSION=${VERSION:-4.10.2} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:-"-j$(nproc)"} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -43,6 +48,9 @@ fi if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" +elif [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" @@ -57,7 +65,14 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD$TAG.txz" + exit 0 +fi + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -65,8 +80,9 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1 cd $SRCNAM-$VERSION || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -74,52 +90,44 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -mkdir -p build +# Check if we have pulseaudio: +if pkg-config --exists libpulse 2>/dev/null ; then + DOPULSE="ON" +else + DOPULSE="OFF" +fi + +mkdir build cd build cmake \ - -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DMAN_INSTALL_DIR=/usr/man \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DQT_VERSION=4 \ + -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=ON \ + -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib$LIBDIRSUFFIX/qt/plugins/designer \ + -DWITH_QZeitgeist=BOOL:OFF \ + -DWITH_PulseAudio=BOOL:${DOPULSE} \ .. make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 cd - -# Conditional build of Qt5 support: -if qtpaths-qt5 --qt-version 1>/dev/null 2>/dev/null ; then - mkdir -p build-qt5 - cd build-qt5 - cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DQT_VERSION=5 \ - .. - make $NUMJOBS || make || exit 1 - make install DESTDIR=$PKG || exit 1 - cd - -fi +# Conflicts with Qt5 based newer phonon: +rm -rf $PKG/usr/share/icons -if [ -d $PKG/usr/man ]; then - gzip -9 $PKG/usr/man/man?/* -fi +# PyQT won't find the header files otherwise: +sed -i -e 's#{includedir}$#& -I\${includedir}/phonon#' $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/phonon.pc mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - COPYING HACKING NEWS README \ - $PKG/usr/doc/$PKGNAM-$VERSION +cp -a doc/{BUGS,IDEAS,TODO} $PKG/usr/doc/$PKGNAM-$VERSION find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null mkdir -p $PKG/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 $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/deps/phonon-qt4/slack-desc b/deps/phonon-qt4/slack-desc new file mode 100644 index 0000000..ab7f043 --- /dev/null +++ b/deps/phonon-qt4/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +phonon-qt4: phonon-qt4 (multimedia framework for KDE4) +phonon-qt4: +phonon-qt4: Phonon-qt4 is the multimedia API provided by Qt4 and is the standard +phonon-qt4: abstraction for handling multimedia streams within the KDE4 Software +phonon-qt4: Compilation. Phonon provides an API for multimedia using various +phonon-qt4: backends (gstreamer, vlc) to handle the lower level I/O. +phonon-qt4: +phonon-qt4: +phonon-qt4: +phonon-qt4: Homepage: http://phonon.kde.org +phonon-qt4: diff --git a/deps/phonon-vlc/.url b/deps/phonon-vlc/.url index 9353df9..3011dd7 100644 --- a/deps/phonon-vlc/.url +++ b/deps/phonon-vlc/.url @@ -1,2 +1,2 @@ -https://download.kde.org/stable/phonon/phonon-backend-vlc/0.10.2/phonon-backend-vlc-0.10.2.tar.xz +https://download.kde.org/stable/phonon/phonon-backend-vlc/0.11.1/phonon-backend-vlc-0.11.1.tar.xz diff --git a/deps/phonon-vlc/phonon-vlc.SlackBuild b/deps/phonon-vlc/phonon-vlc.SlackBuild index d5c2a2e..4e57ed8 100755 --- a/deps/phonon-vlc/phonon-vlc.SlackBuild +++ b/deps/phonon-vlc/phonon-vlc.SlackBuild @@ -27,11 +27,9 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=phonon-vlc SRCNAM=phonon-backend-vlc -VERSION=${VERSION:-0.10.2} +VERSION=${VERSION:-0.11.1} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-"-j$(nproc)"} - # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in @@ -68,6 +66,8 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -75,7 +75,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1 cd $SRCNAM-$VERSION || exit 1 chown -R root:root . @@ -86,8 +86,10 @@ find . \ -exec chmod 644 {} \; echo Building ... -mkdir -p build -cd build + +# Qt5 is the only supported Qt as if 0.11.0: +mkdir -p build-qt5 +cd build-qt5 cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ @@ -103,27 +105,6 @@ cd build make DESTDIR=$PKG install cd - -# Conditional build of Qt5 support: -if qtpaths-qt5 --qt-version 1>/dev/null 2>/dev/null ; then - mkdir -p build-qt5 - cd build-qt5 - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMAN_INSTALL_DIR=/usr/man \ - -DSYSCONF_INSTALL_DIR=/etc \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DPHONON_BUILD_PHONON4QT5=ON \ - .. - make $NUMJOBS - make DESTDIR=$PKG install - cd - -fi - # Add documentation: mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ diff --git a/deps/phonon/.deps b/deps/phonon/.deps new file mode 100644 index 0000000..bc90dbd --- /dev/null +++ b/deps/phonon/.deps @@ -0,0 +1 @@ +extra-cmake-modules diff --git a/deps/phonon/.url b/deps/phonon/.url index fdf4e32..601658e 100644 --- a/deps/phonon/.url +++ b/deps/phonon/.url @@ -1 +1 @@ -https://download.kde.org/stable/phonon/4.10.2/phonon-4.10.2.tar.xz.sig +https://download.kde.org/stable/phonon/4.11.1/phonon-4.11.1.tar.xz diff --git a/deps/phonon/phonon.SlackBuild b/deps/phonon/phonon.SlackBuild index 6104457..3a79ea5 100755 --- a/deps/phonon/phonon.SlackBuild +++ b/deps/phonon/phonon.SlackBuild @@ -27,11 +27,9 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=phonon -VERSION=${VERSION:-4.10.2} +VERSION=${VERSION:-4.11.1} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-"-j$(nproc)"} - # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in @@ -43,10 +41,7 @@ if [ -z "$ARCH" ]; then export ARCH fi -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i586" ]; then +if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then @@ -71,15 +66,17 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + TMP=${TMP:-/tmp} -PKG=$TMP/package-phonon +PKG=$TMP/package-$PKGNAM rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf phonon-$VERSION -tar xvf $CWD/phonon-$VERSION.tar.?z || exit 1 -cd phonon-$VERSION || exit 1 +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ @@ -95,8 +92,9 @@ else DOPULSE="OFF" fi -mkdir build -cd build +# Qt5 is the only supported version as of 4.11.0: +mkdir build-qt5 +cd build-qt5 cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ @@ -107,37 +105,12 @@ cd build -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib$LIBDIRSUFFIX/qt/plugins/designer \ -DWITH_QZeitgeist=BOOL:OFF \ -DWITH_PulseAudio=BOOL:${DOPULSE} \ + -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt5 \ .. make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 cd - -# Conditional build of Qt5 support: -if qtpaths-qt5 --qt-version 1>/dev/null 2>/dev/null ; then - mkdir build-qt5 - cd build-qt5 - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMAN_INSTALL_DIR=/usr/man \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=ON \ - -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib$LIBDIRSUFFIX/qt/plugins/designer \ - -DWITH_QZeitgeist=BOOL:OFF \ - -DWITH_PulseAudio=BOOL:${DOPULSE} \ - -DPHONON_BUILD_PHONON4QT5=ON \ - -D__KDE_HAVE_GCC_VISIBILITY=NO \ - -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt5 \ - .. - make $NUMJOBS || make || exit 1 - make install DESTDIR=$PKG || exit 1 - cd - -fi - -# PyQT won't find the header files otherwise: -sed -i -e 's#{includedir}$#& -I\${includedir}/phonon#' $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/phonon.pc - # Compress and link manpages, if any: if [ -d $PKG/usr/man ]; then ( cd $PKG/usr/man @@ -153,8 +126,8 @@ if [ -d $PKG/usr/man ]; then ) fi -mkdir -p $PKG/usr/doc/phonon-$VERSION -cp -a doc/{BUGS,IDEAS,TODO} $PKG/usr/doc/phonon-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a doc/{BUGS,IDEAS,TODO} $PKG/usr/doc/$PKGNAM-$VERSION find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null @@ -163,5 +136,5 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/phonon-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/deps/pipewire/.url b/deps/pipewire/.url new file mode 100644 index 0000000..c4ce81d --- /dev/null +++ b/deps/pipewire/.url @@ -0,0 +1 @@ +https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.8/pipewire-0.3.8.tar.bz2 diff --git a/deps/pipewire/doinst.sh b/deps/pipewire/doinst.sh new file mode 100644 index 0000000..5076597 --- /dev/null +++ b/deps/pipewire/doinst.sh @@ -0,0 +1,15 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +config etc/pipewire/pipewire.conf.new + diff --git a/deps/libpwquality/libpwquality.SlackBuild b/deps/pipewire/pipewire.SlackBuild index bbfbd18..87cdc60 100755 --- a/deps/libpwquality/libpwquality.SlackBuild +++ b/deps/pipewire/pipewire.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright 2017 Eric Hameleers, Eindhoven, NL -# Copyright 2017 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2020 Eric Hameleers, Eindhoven, NL +# Copyright 2020 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -24,13 +24,11 @@ # ----------------------------------------------------------------------------- -PKGNAM=libpwquality -VERSION=${VERSION:-1.4.0} -BUILD=${BUILD:-1} +cd $(dirname $0) ; CWD=$(pwd) -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM +PKGNAM=pipewire +VERSION=${VERSION:-0.3.8} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -43,17 +41,22 @@ if [ -z "$ARCH" ]; then export ARCH fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + case "$ARCH" in - i?86) SLKCFLAGS="-O2 -march=$ARCH -mtune=i686" + i?86) SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686" SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; x86_64) SLKCFLAGS="-O2 -fPIC" SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64" ;; - armv7hl) SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; - armv6hl) SLKCFLAGS="-O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard" + arm*) SLKCFLAGS="-O2" SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; *) SLKCFLAGS=${SLKCFLAGS:-"O2"} @@ -66,48 +69,56 @@ case "$ARCH" in *) TARGET=$ARCH-slackware-linux ;; esac +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + rm -rf $PKG mkdir -p $TMP $PKG + cd $TMP rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1 cd $PKGNAM-$VERSION || exit 1 + 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 {} \; - -[ ! -x configure ] && ./autogen.sh - -LDFLAGS="$SLKLDFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -CFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --localstatedir=/var \ - --sysconfdir=/etc \ - --enable-static=no \ - --program-prefix= \ - --program-suffix= \ - --build=$TARGET - -# Build and install: -make || exit 1 -make DESTDIR=$PKG install || exit 1 - -# Directory for additional configuration files: -mkdir -p $PKG/etc/security/pwquality.conf.d +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +export LDFLAGS="$SLKLDFLAGS" +export CXXFLAGS="$SLKCFLAGS" +export CFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build + meson setup \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ + --localstatedir=/var \ + --sysconfdir=/etc \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --buildtype=release \ + -Djack=false \ + -Dpipewire-jack=false \ + .. || exit 1 + + # Build and install: + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +cd .. + +# Do not clobber custom configurations: +mv $PKG/etc/pipewire/pipewire.conf{,.new} + +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la -# Add documentation: -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - AUTHORS ChangeLog COPYING NEWS README \ - $PKG/usr/doc/$PKGNAM-$VERSION +# Strip binaries (if any): +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true # Compress the man page(s): if [ -d $PKG/usr/man ]; then @@ -115,12 +126,15 @@ if [ -d $PKG/usr/man ]; then for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done fi -# Strip binaries (if any): -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +# Add documentation: +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + CODE_OF_CONDUCT.md COPYING INSTALL.md LICENSE NEWS PROTOCOL README.md \ + $PKG/usr/doc/$PKGNAM-$VERSION -# Add a package description: +# Add a package description and the post-install script: mkdir -p $PKG/install +cat $CWD/doinst.sh > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc # Build the package: diff --git a/deps/pipewire/slack-desc b/deps/pipewire/slack-desc new file mode 100644 index 0000000..bdd8586 --- /dev/null +++ b/deps/pipewire/slack-desc @@ -0,0 +1,20 @@ +# 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------------------------------------------------------| +pipewire: pipewire (multimedia processing) +pipewire: +pipewire: PipeWire is a project that aims to greatly improve handling of +pipewire: audio and video under Linux. It provides a low-latency, graph based +pipewire: processing engine on top of audio and video devices that can be +pipewire: used to support the use cases currently handled by both pulseaudio +pipewire: and JACK. +pipewire: PipeWire was designed with a powerful security model particularly +pipewire: suited for containerized applications. +pipewire: +pipewire: See also: https://pipewire.org/ + diff --git a/deps/polkit-qt5-1/.url b/deps/polkit-qt5-1/.url new file mode 100644 index 0000000..2be4684 --- /dev/null +++ b/deps/polkit-qt5-1/.url @@ -0,0 +1 @@ +https://download.kde.org/stable/polkit-qt-1/polkit-qt-1-0.113.0.tar.xz diff --git a/deps/polkit-qt5-1/polkit-qt5-1.SlackBuild b/deps/polkit-qt5-1/polkit-qt5-1.SlackBuild index 39c97a6..e7afa3f 100755 --- a/deps/polkit-qt5-1/polkit-qt5-1.SlackBuild +++ b/deps/polkit-qt5-1/polkit-qt5-1.SlackBuild @@ -20,14 +20,20 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Modified 2014, 2015, 2016, 2017 by Eric Hameleers <alien@slackware.com> +# Modified 2014, 2015, 2016, 2017, 2019, 2020 by Eric Hameleers <alien@slackware.com> +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=polkit-qt5-1 -VERSION=${VERSION:-50624e0_20160719git} -BUILD=${BUILD:-3} +SRCNAM=polkit-qt-1 +VERSION=${VERSION:-0.113.0} +BUILD=${BUILD:-2} + +NUMJOBS=${NUMJOBS:-"-j$(nproc)"} -NUMJOBS=${NUMJOBS:--j7} +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -40,14 +46,19 @@ if [ -z "$ARCH" ]; then export ARCH fi -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=$ARCH -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" + SLKCFLAGS="-O2 -march=$ARCH -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" @@ -61,31 +72,25 @@ else fi # Avoid a version number in .la files: -if [ -d /usr/lib${LIBDIRSUFFIX}/qt ]; then - QTDIR=/usr/lib${LIBDIRSUFFIX}/qt +if [ -d /usr/lib${LIBDIRSUFFIX}/qt5 ]; then + QTDIR=/usr/lib${LIBDIRSUFFIX}/qt5 fi -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - rm -rf $PKG mkdir -p $TMP $PKG/usr cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION || exit 1 +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1 +cd $SRCNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Autodetects the Qt version to use, preferring Qt 5 over Qt 4. -# You can force a Qt 4 build passing -DUSE_QT4:bool=ON to CMake. + -exec chmod 644 {} \+ +# Support for Qt4 was removed in 0.113.0: mkdir -p build cd build cmake \ @@ -96,8 +101,8 @@ cd build -DMAN_INSTALL_DIR=/usr/man \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ .. - make $NUMJOBS || make || exit 1 - make install DESTDIR=$PKG || exit 1 + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG || exit 1 cd - if [ -d $PKG/usr/man ]; then diff --git a/deps/polkit/0001-configure-fix-elogind-support.patch.gz b/deps/polkit/0001-configure-fix-elogind-support.patch.gz Binary files differnew file mode 100644 index 0000000..79547c3 --- /dev/null +++ b/deps/polkit/0001-configure-fix-elogind-support.patch.gz diff --git a/deps/polkit/10-org.freedesktop.NetworkManager.rules b/deps/polkit/10-org.freedesktop.NetworkManager.rules new file mode 100644 index 0000000..9d6557b --- /dev/null +++ b/deps/polkit/10-org.freedesktop.NetworkManager.rules @@ -0,0 +1,7 @@ +polkit.addRule(function(action, subject) { + if (action.id.indexOf("org.freedesktop.NetworkManager.") == 0 && + subject.isInGroup("netdev")) { + return polkit.Result.YES; + } +}); + diff --git a/deps/polkit/20-plugdev-group-mount-override.rules b/deps/polkit/20-plugdev-group-mount-override.rules new file mode 100644 index 0000000..c47a66c --- /dev/null +++ b/deps/polkit/20-plugdev-group-mount-override.rules @@ -0,0 +1,16 @@ +/* http://udisks.freedesktop.org/docs/latest/udisks-polkit-actions.html */ + +polkit.addRule(function(action, subject) { + if (action.id == "org.freedesktop.udisks2.filesystem-mount" && + subject.isInGroup("plugdev")) { + return polkit.Result.YES; + } +}); + +polkit.addRule(function(action, subject) { + if (action.id == "org.freedesktop.udisks2.eject-media" && + subject.isInGroup("plugdev")) { + return polkit.Result.YES; + } +}); + diff --git a/deps/polkit/doinst.sh.gz b/deps/polkit/doinst.sh.gz Binary files differnew file mode 100644 index 0000000..f43cdf8 --- /dev/null +++ b/deps/polkit/doinst.sh.gz diff --git a/deps/polkit/dont-set-wheel-group-as-admin.diff.gz b/deps/polkit/dont-set-wheel-group-as-admin.diff.gz Binary files differnew file mode 100644 index 0000000..3b17f45 --- /dev/null +++ b/deps/polkit/dont-set-wheel-group-as-admin.diff.gz diff --git a/deps/polkit/polkit.SlackBuild b/deps/polkit/polkit.SlackBuild new file mode 100755 index 0000000..15a0a0f --- /dev/null +++ b/deps/polkit/polkit.SlackBuild @@ -0,0 +1,190 @@ +#!/bin/bash + +# Copyright 2009, 2011, 2015 Robby Workman, Northport, Alabama, USA +# Copyright 2010 Eric Hameleers, Eindhoven, NL +# Copyright 2009, 2010, 2011, 2012, 2013, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. + +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=polkit +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-4} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i586 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +# Make sure ownerships and permissions are sane: +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +zcat $CWD/dont-set-wheel-group-as-admin.diff.gz | patch -p1 || exit 1 + +# https://gitlab.freedesktop.org/polkit/polkit/-/issues/29 +zcat $CWD/0001-configure-fix-elogind-support.patch.gz | patch -p1 || exit 1 + +# If we get here and don't have a polkitd user/group, add one. +# Otherwise a few directories in the package will have wrong permissions. +if ! grep -q "^polkitd:" /etc/passwd ; then + groupadd -fg 87 polkitd + useradd -c "PolicyKit daemon owner" -d /var/lib/polkit -u 87 -g polkitd -s /bin/false polkitd +fi + +# Choose correct options depending on whether PAM is installed: +if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then + PAM_OPTIONS="--with-authfw=pam --with-pam-module-dir=/lib${LIBDIRSUFFIX}/security" + unset SHADOW_OPTIONS +else + unset PAM_OPTIONS + SHADOW_OPTIONS="--with-authfw=shadow" +fi + +autoreconf -vif || exit 1 + +LIBELOGIND_CFLAGS="$(pkg-config --cflags libelogind)" \ +LIBELOGIND_LIBS="$(pkg-config --libs libelogind)" \ +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --enable-man-pages \ + --enable-gtk-doc \ + --mandir=/usr/man \ + --disable-static \ + --disable-examples \ + --enable-introspection \ + --enable-libsystemd-login=no \ + --enable-libelogind=yes \ + $PAM_OPTIONS \ + $SHADOW_OPTIONS \ + --enable-verbose-mode \ + --with-os-type=Slackware \ + --build=$ARCH-slackware-linux || exit 1 + +# Build and install: +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + +# Create homedir for polkit. This is mentioned in /etc/passwd, but isn't +# actually used for anything later. Perms don't matter. +mkdir -p $PKG/var/lib/polkit + +# Add default policy files for udisks2 and NetworkManager events: +cat $CWD/10-org.freedesktop.NetworkManager.rules > $PKG/etc/polkit-1/rules.d/10-org.freedesktop.NetworkManager.rules.new +cat $CWD/20-plugdev-group-mount-override.rules > $PKG/etc/polkit-1/rules.d/20-plugdev-group-mount-override.rules.new + +if [ ! -z "$PAM_OPTIONS" ]; then + # Make the PAM file .new: + mv $PKG/etc/pam.d/polkit-1 $PKG/etc/pam.d/polkit-1.new +fi + +# Strip binaries: +find $PKG | xargs file | grep -e "executable" -e "shared object" \ + | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.* + ) + done + ) +fi + +# Add a documentation directory: +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING HACKING INSTALL NEWS README \ + $PKG/usr/doc/$PKGNAM-$VERSION +( cd $PKG/usr/doc/$PKGNAM-$VERSION; ln -s ../../share/gtk-doc/html/polkit-1 html ) + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +zcat $CWD/doinst.sh > $PKG/install/doinst.sh +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/deps/polkit/slack-desc b/deps/polkit/slack-desc new file mode 100644 index 0000000..5eb518d --- /dev/null +++ b/deps/polkit/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler-----------------------------------------------------| +polkit: polkit (authentication framework) +polkit: +polkit: PolicyKit is an application-level toolkit for defining and handling +polkit: the policy that allows unprivileged processes to speak to privileged +polkit: processes. PolicyKit is specifically targeting applications in rich +polkit: desktop environments on multi-user UNIX-like operating systems. +polkit: +polkit: Homepage: http://www.freedesktop.org/wiki/Software/polkit +polkit: +polkit: +polkit: diff --git a/deps/poppler/poppler.SlackBuild b/deps/poppler/poppler.SlackBuild index d3a96c1..7804693 100755 --- a/deps/poppler/poppler.SlackBuild +++ b/deps/poppler/poppler.SlackBuild @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Modified 2016, 2017, 2018 by Eric Hameleers <alien@slackware.com> +# Modified 2016, 2017, 2018, 2020 by Eric Hameleers <alien@slackware.com> cd $(dirname $0) ; CWD=$(pwd) diff --git a/deps/python-enum34/.url b/deps/python-enum34/.url deleted file mode 100644 index 9e07b2f..0000000 --- a/deps/python-enum34/.url +++ /dev/null @@ -1 +0,0 @@ -https://pypi.python.org/packages/bf/3e/31d502c25302814a7c2f1d3959d2a3b3f78e509002ba91aea64993936876/enum34-1.1.6.tar.gz diff --git a/deps/python-enum34/python-enum34.SlackBuild b/deps/python-enum34/python-enum34.SlackBuild deleted file mode 100755 index 1d731dd..0000000 --- a/deps/python-enum34/python-enum34.SlackBuild +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/sh - -# Copyright 2018 Eric Hameleers, Eindhoven, NL -# Copyright 2018 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -PKGNAM=python-enum34 -SRCNAM=enum34 -VERSION=${VERSION:-1.1.6} -BUILD=${BUILD:-1} - -NUMJOBS=${NUMJOBS:-"-j$(nproc)"} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" -else - SLKCFLAGS="-O2" -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1 -cd $SRCNAM-$VERSION || exit 1 -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -python setup.py install --root=$PKG - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - PKG-INFO enum/LICENSE enum/README enum/doc/* \ - $PKG/usr/doc/$PKGNAM-$VERSION -chown -R root:root $PKG/usr/doc - -# If there's a ChangeLog, installing at least part of the recent history -# is useful, but don't let it get totally out of control: -if [ -r ChangeLog ]; then - DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) - cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog - touch -r ChangeLog $DOCSDIR/ChangeLog -fi - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$(echo $VERSION |tr - _)-$ARCH-$BUILD.txz - diff --git a/deps/python-enum34/slack-desc b/deps/python-enum34/slack-desc deleted file mode 100644 index b06f6ad..0000000 --- a/deps/python-enum34/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------------------------------------------------------| -python-enum34: python-enum34 (Python 3.4 Enum backported to Python 2) -python-enum34: -python-enum34: An enumeration is a set of symbolic names (members) bound to -python-enum34: unique, constant values. -python-enum34: Within an enumeration, the members can be compared by identity, -python-enum34: and the enumeration itself can be iterated over. -python-enum34: -python-enum34: -python-enum34: -python-enum34: Homepage: https://pypi.python.org/pypi/enum34 -python-enum34: diff --git a/deps/python3-random2/python3-random2.SlackBuild b/deps/python3-random2/python3-random2.SlackBuild index a0debc7..94147f1 100755 --- a/deps/python3-random2/python3-random2.SlackBuild +++ b/deps/python3-random2/python3-random2.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2018 Eric Hameleers, Eindhoven, NL +# Copyright 2018, 2019 Eric Hameleers, Eindhoven, NL # Copyright 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python3-random2 SRCNAM=random2 VERSION=${VERSION:-1.0.1} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:-" -j$(nproc) "} diff --git a/deps/pyxdg/.url b/deps/pyxdg/.url deleted file mode 100644 index 22d0e08..0000000 --- a/deps/pyxdg/.url +++ /dev/null @@ -1 +0,0 @@ -https://pypi.python.org/packages/source/p/pyxdg/pyxdg-0.26.tar.gz diff --git a/deps/pyxdg/pyxdg.SlackBuild b/deps/pyxdg/pyxdg.SlackBuild deleted file mode 100755 index 64c3ba0..0000000 --- a/deps/pyxdg/pyxdg.SlackBuild +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/sh - -# Copyright 2019 Eric Hameleers, Eindhoven, NL -# Copyright 2019 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -PKGNAM=pyxdg -VERSION=${VERSION:-0.26} -BUILD=${BUILD:-2} - -NUMJOBS=${NUMJOBS:-"-j$(nproc)"} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" -else - SLKCFLAGS="-O2" -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION || exit 1 -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Support both Python 2 and 3: -python2 setup.py install --root=$PKG --prefix=/usr -python3 setup.py install --root=$PKG --prefix=/usr --skip-build --optimize=1 - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - AUTHORS COPYING INSTALL PKG-INFO README TODO \ - $PKG/usr/doc/$PKGNAM-$VERSION -chown -R root:root $PKG/usr/doc - -# If there's a ChangeLog, installing at least part of the recent history -# is useful, but don't let it get totally out of control: -if [ -r ChangeLog ]; then - DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) - cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog - touch -r ChangeLog $DOCSDIR/ChangeLog -fi - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$(echo $VERSION |tr - _)-$ARCH-$BUILD.txz - diff --git a/deps/pyxdg/slack-desc b/deps/pyxdg/slack-desc deleted file mode 100644 index 53ba3d3..0000000 --- a/deps/pyxdg/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------------------------------------------------------| -pyxdg: pyxdg (Python XDG Library) -pyxdg: -pyxdg: PyXDG implements freedesktop.org standards in python (2 and 3). -pyxdg: -pyxdg: -pyxdg: -pyxdg: -pyxdg: -pyxdg: -pyxdg: Homepage: http://freedesktop.org/wiki/Software/pyxdg -pyxdg: diff --git a/deps/qca-qt5/.url b/deps/qca-qt5/.url index f3dd020..0d4c99c 100644 --- a/deps/qca-qt5/.url +++ b/deps/qca-qt5/.url @@ -1,2 +1,2 @@ -https://download.kde.org/stable/qca/2.1.3/src/qca-2.1.3.tar.xz - +https://download.kde.org/stable/qca/2.3.1/qca-2.3.1.tar.xz +https://download.kde.org/stable/qca/2.3.1/qca-2.3.1.tar.xz.sig diff --git a/deps/qca-qt5/patches/qca_openssl11.patch b/deps/qca-qt5/patches/qca_openssl11.patch deleted file mode 100644 index fa6e8ab..0000000 --- a/deps/qca-qt5/patches/qca_openssl11.patch +++ /dev/null @@ -1,2036 +0,0 @@ -diff --git a/plugins/qca-ossl/CMakeLists.txt b/plugins/qca-ossl/CMakeLists.txt -index cdeaeca..f7c5c1b 100644 ---- a/plugins/qca-ossl/CMakeLists.txt -+++ b/plugins/qca-ossl/CMakeLists.txt -@@ -32,7 +32,7 @@ if(OPENSSL_FOUND) - message(WARNING "qca-ossl will be compiled without SHA-0 digest algorithm support") - endif(HAVE_OPENSSL_SHA0) - -- set(QCA_OSSL_SOURCES qca-ossl.cpp) -+ set(QCA_OSSL_SOURCES libcrypto-compat.c qca-ossl.cpp) - - my_automoc( QCA_OSSL_SOURCES ) - -diff --git a/plugins/qca-ossl/libcrypto-compat.c b/plugins/qca-ossl/libcrypto-compat.c -index e69de29..b587845 100644 ---- a/plugins/qca-ossl/libcrypto-compat.c -+++ b/plugins/qca-ossl/libcrypto-compat.c -@@ -0,0 +1,410 @@ -+/* -+ * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. -+ * -+ * Licensed under the OpenSSL license (the "License"). You may not use -+ * this file except in compliance with the License. You can obtain a copy -+ * in the file LICENSE in the source distribution or at -+ * https://www.openssl.org/source/license.html -+ */ -+ -+#include <openssl/evp.h> -+ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ -+#include <string.h> -+#include <openssl/engine.h> -+ -+static void *OPENSSL_zalloc(size_t num) -+{ -+ void *ret = OPENSSL_malloc(num); -+ -+ if (ret != NULL) -+ memset(ret, 0, num); -+ return ret; -+} -+ -+int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) -+{ -+ /* If the fields n and e in r are NULL, the corresponding input -+ * parameters MUST be non-NULL for n and e. d may be -+ * left NULL (in case only the public key is used). -+ */ -+ if ((r->n == NULL && n == NULL) -+ || (r->e == NULL && e == NULL)) -+ return 0; -+ -+ if (n != NULL) { -+ BN_free(r->n); -+ r->n = n; -+ } -+ if (e != NULL) { -+ BN_free(r->e); -+ r->e = e; -+ } -+ if (d != NULL) { -+ BN_free(r->d); -+ r->d = d; -+ } -+ -+ return 1; -+} -+ -+int RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q) -+{ -+ /* If the fields p and q in r are NULL, the corresponding input -+ * parameters MUST be non-NULL. -+ */ -+ if ((r->p == NULL && p == NULL) -+ || (r->q == NULL && q == NULL)) -+ return 0; -+ -+ if (p != NULL) { -+ BN_free(r->p); -+ r->p = p; -+ } -+ if (q != NULL) { -+ BN_free(r->q); -+ r->q = q; -+ } -+ -+ return 1; -+} -+ -+int RSA_set0_crt_params(RSA *r, BIGNUM *dmp1, BIGNUM *dmq1, BIGNUM *iqmp) -+{ -+ /* If the fields dmp1, dmq1 and iqmp in r are NULL, the corresponding input -+ * parameters MUST be non-NULL. -+ */ -+ if ((r->dmp1 == NULL && dmp1 == NULL) -+ || (r->dmq1 == NULL && dmq1 == NULL) -+ || (r->iqmp == NULL && iqmp == NULL)) -+ return 0; -+ -+ if (dmp1 != NULL) { -+ BN_free(r->dmp1); -+ r->dmp1 = dmp1; -+ } -+ if (dmq1 != NULL) { -+ BN_free(r->dmq1); -+ r->dmq1 = dmq1; -+ } -+ if (iqmp != NULL) { -+ BN_free(r->iqmp); -+ r->iqmp = iqmp; -+ } -+ -+ return 1; -+} -+ -+void RSA_get0_key(const RSA *r, -+ const BIGNUM **n, const BIGNUM **e, const BIGNUM **d) -+{ -+ if (n != NULL) -+ *n = r->n; -+ if (e != NULL) -+ *e = r->e; -+ if (d != NULL) -+ *d = r->d; -+} -+ -+void RSA_get0_factors(const RSA *r, const BIGNUM **p, const BIGNUM **q) -+{ -+ if (p != NULL) -+ *p = r->p; -+ if (q != NULL) -+ *q = r->q; -+} -+ -+void RSA_get0_crt_params(const RSA *r, -+ const BIGNUM **dmp1, const BIGNUM **dmq1, -+ const BIGNUM **iqmp) -+{ -+ if (dmp1 != NULL) -+ *dmp1 = r->dmp1; -+ if (dmq1 != NULL) -+ *dmq1 = r->dmq1; -+ if (iqmp != NULL) -+ *iqmp = r->iqmp; -+} -+ -+void DSA_get0_pqg(const DSA *d, -+ const BIGNUM **p, const BIGNUM **q, const BIGNUM **g) -+{ -+ if (p != NULL) -+ *p = d->p; -+ if (q != NULL) -+ *q = d->q; -+ if (g != NULL) -+ *g = d->g; -+} -+ -+int DSA_set0_pqg(DSA *d, BIGNUM *p, BIGNUM *q, BIGNUM *g) -+{ -+ /* If the fields p, q and g in d are NULL, the corresponding input -+ * parameters MUST be non-NULL. -+ */ -+ if ((d->p == NULL && p == NULL) -+ || (d->q == NULL && q == NULL) -+ || (d->g == NULL && g == NULL)) -+ return 0; -+ -+ if (p != NULL) { -+ BN_free(d->p); -+ d->p = p; -+ } -+ if (q != NULL) { -+ BN_free(d->q); -+ d->q = q; -+ } -+ if (g != NULL) { -+ BN_free(d->g); -+ d->g = g; -+ } -+ -+ return 1; -+} -+ -+void DSA_get0_key(const DSA *d, -+ const BIGNUM **pub_key, const BIGNUM **priv_key) -+{ -+ if (pub_key != NULL) -+ *pub_key = d->pub_key; -+ if (priv_key != NULL) -+ *priv_key = d->priv_key; -+} -+ -+int DSA_set0_key(DSA *d, BIGNUM *pub_key, BIGNUM *priv_key) -+{ -+ /* If the field pub_key in d is NULL, the corresponding input -+ * parameters MUST be non-NULL. The priv_key field may -+ * be left NULL. -+ */ -+ if (d->pub_key == NULL && pub_key == NULL) -+ return 0; -+ -+ if (pub_key != NULL) { -+ BN_free(d->pub_key); -+ d->pub_key = pub_key; -+ } -+ if (priv_key != NULL) { -+ BN_free(d->priv_key); -+ d->priv_key = priv_key; -+ } -+ -+ return 1; -+} -+ -+void DSA_SIG_get0(const DSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps) -+{ -+ if (pr != NULL) -+ *pr = sig->r; -+ if (ps != NULL) -+ *ps = sig->s; -+} -+ -+int DSA_SIG_set0(DSA_SIG *sig, BIGNUM *r, BIGNUM *s) -+{ -+ if (r == NULL || s == NULL) -+ return 0; -+ BN_clear_free(sig->r); -+ BN_clear_free(sig->s); -+ sig->r = r; -+ sig->s = s; -+ return 1; -+} -+ -+void ECDSA_SIG_get0(const ECDSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps) -+{ -+ if (pr != NULL) -+ *pr = sig->r; -+ if (ps != NULL) -+ *ps = sig->s; -+} -+ -+int ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s) -+{ -+ if (r == NULL || s == NULL) -+ return 0; -+ BN_clear_free(sig->r); -+ BN_clear_free(sig->s); -+ sig->r = r; -+ sig->s = s; -+ return 1; -+} -+ -+void DH_get0_pqg(const DH *dh, -+ const BIGNUM **p, const BIGNUM **q, const BIGNUM **g) -+{ -+ if (p != NULL) -+ *p = dh->p; -+ if (q != NULL) -+ *q = dh->q; -+ if (g != NULL) -+ *g = dh->g; -+} -+ -+int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g) -+{ -+ /* If the fields p and g in d are NULL, the corresponding input -+ * parameters MUST be non-NULL. q may remain NULL. -+ */ -+ if ((dh->p == NULL && p == NULL) -+ || (dh->g == NULL && g == NULL)) -+ return 0; -+ -+ if (p != NULL) { -+ BN_free(dh->p); -+ dh->p = p; -+ } -+ if (q != NULL) { -+ BN_free(dh->q); -+ dh->q = q; -+ } -+ if (g != NULL) { -+ BN_free(dh->g); -+ dh->g = g; -+ } -+ -+ if (q != NULL) { -+ dh->length = BN_num_bits(q); -+ } -+ -+ return 1; -+} -+ -+void DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key) -+{ -+ if (pub_key != NULL) -+ *pub_key = dh->pub_key; -+ if (priv_key != NULL) -+ *priv_key = dh->priv_key; -+} -+ -+int DH_set0_key(DH *dh, BIGNUM *pub_key, BIGNUM *priv_key) -+{ -+ /* If the field pub_key in dh is NULL, the corresponding input -+ * parameters MUST be non-NULL. The priv_key field may -+ * be left NULL. -+ */ -+ if (dh->pub_key == NULL && pub_key == NULL) -+ return 0; -+ -+ if (pub_key != NULL) { -+ BN_free(dh->pub_key); -+ dh->pub_key = pub_key; -+ } -+ if (priv_key != NULL) { -+ BN_free(dh->priv_key); -+ dh->priv_key = priv_key; -+ } -+ -+ return 1; -+} -+ -+int DH_set_length(DH *dh, long length) -+{ -+ dh->length = length; -+ return 1; -+} -+ -+const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *ctx) -+{ -+ return ctx->iv; -+} -+ -+unsigned char *EVP_CIPHER_CTX_iv_noconst(EVP_CIPHER_CTX *ctx) -+{ -+ return ctx->iv; -+} -+ -+EVP_MD_CTX *EVP_MD_CTX_new(void) -+{ -+ return OPENSSL_zalloc(sizeof(EVP_MD_CTX)); -+} -+ -+void EVP_MD_CTX_free(EVP_MD_CTX *ctx) -+{ -+ EVP_MD_CTX_cleanup(ctx); -+ OPENSSL_free(ctx); -+} -+ -+RSA_METHOD *RSA_meth_dup(const RSA_METHOD *meth) -+{ -+ RSA_METHOD *ret; -+ -+ ret = OPENSSL_malloc(sizeof(RSA_METHOD)); -+ -+ if (ret != NULL) { -+ memcpy(ret, meth, sizeof(*meth)); -+ ret->name = OPENSSL_strdup(meth->name); -+ if (ret->name == NULL) { -+ OPENSSL_free(ret); -+ return NULL; -+ } -+ } -+ -+ return ret; -+} -+ -+int RSA_meth_set1_name(RSA_METHOD *meth, const char *name) -+{ -+ char *tmpname; -+ -+ tmpname = OPENSSL_strdup(name); -+ if (tmpname == NULL) { -+ return 0; -+ } -+ -+ OPENSSL_free((char *)meth->name); -+ meth->name = tmpname; -+ -+ return 1; -+} -+ -+int RSA_meth_set_priv_enc(RSA_METHOD *meth, -+ int (*priv_enc) (int flen, const unsigned char *from, -+ unsigned char *to, RSA *rsa, -+ int padding)) -+{ -+ meth->rsa_priv_enc = priv_enc; -+ return 1; -+} -+ -+int RSA_meth_set_priv_dec(RSA_METHOD *meth, -+ int (*priv_dec) (int flen, const unsigned char *from, -+ unsigned char *to, RSA *rsa, -+ int padding)) -+{ -+ meth->rsa_priv_dec = priv_dec; -+ return 1; -+} -+ -+int RSA_meth_set_finish(RSA_METHOD *meth, int (*finish) (RSA *rsa)) -+{ -+ meth->finish = finish; -+ return 1; -+} -+ -+void RSA_meth_free(RSA_METHOD *meth) -+{ -+ if (meth != NULL) { -+ OPENSSL_free((char *)meth->name); -+ OPENSSL_free(meth); -+ } -+} -+ -+int RSA_bits(const RSA *r) -+{ -+ return (BN_num_bits(r->n)); -+} -+ -+RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey) -+{ -+ if (pkey->type != EVP_PKEY_RSA) { -+ return NULL; -+ } -+ return pkey->pkey.rsa; -+} -+ -+ -+#endif /* OPENSSL_VERSION_NUMBER */ -diff --git a/plugins/qca-ossl/libcrypto-compat.h b/plugins/qca-ossl/libcrypto-compat.h -index e69de29..057f1fe 100644 ---- a/plugins/qca-ossl/libcrypto-compat.h -+++ b/plugins/qca-ossl/libcrypto-compat.h -@@ -0,0 +1,57 @@ -+#ifndef LIBCRYPTO_COMPAT_H -+#define LIBCRYPTO_COMPAT_H -+ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+ -+#include <openssl/rsa.h> -+#include <openssl/dsa.h> -+#include <openssl/ecdsa.h> -+#include <openssl/dh.h> -+#include <openssl/evp.h> -+ -+int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d); -+int RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q); -+int RSA_set0_crt_params(RSA *r, BIGNUM *dmp1, BIGNUM *dmq1, BIGNUM *iqmp); -+void RSA_get0_key(const RSA *r, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d); -+void RSA_get0_factors(const RSA *r, const BIGNUM **p, const BIGNUM **q); -+void RSA_get0_crt_params(const RSA *r, const BIGNUM **dmp1, const BIGNUM **dmq1, const BIGNUM **iqmp); -+ -+void DSA_get0_pqg(const DSA *d, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g); -+int DSA_set0_pqg(DSA *d, BIGNUM *p, BIGNUM *q, BIGNUM *g); -+void DSA_get0_key(const DSA *d, const BIGNUM **pub_key, const BIGNUM **priv_key); -+int DSA_set0_key(DSA *d, BIGNUM *pub_key, BIGNUM *priv_key); -+ -+void DSA_SIG_get0(const DSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps); -+int DSA_SIG_set0(DSA_SIG *sig, BIGNUM *r, BIGNUM *s); -+ -+void ECDSA_SIG_get0(const ECDSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps); -+int ECDSA_SIG_set0(ECDSA_SIG *sig, BIGNUM *r, BIGNUM *s); -+ -+void DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g); -+int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g); -+void DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key); -+int DH_set0_key(DH *dh, BIGNUM *pub_key, BIGNUM *priv_key); -+int DH_set_length(DH *dh, long length); -+ -+const unsigned char *EVP_CIPHER_CTX_iv(const EVP_CIPHER_CTX *ctx); -+unsigned char *EVP_CIPHER_CTX_iv_noconst(EVP_CIPHER_CTX *ctx); -+EVP_MD_CTX *EVP_MD_CTX_new(void); -+void EVP_MD_CTX_free(EVP_MD_CTX *ctx); -+#define EVP_CIPHER_impl_ctx_size(e) e->ctx_size -+#define EVP_CIPHER_CTX_get_cipher_data(ctx) ctx->cipher_data -+ -+RSA_METHOD *RSA_meth_dup(const RSA_METHOD *meth); -+int RSA_meth_set1_name(RSA_METHOD *meth, const char *name); -+#define RSA_meth_get_finish(meth) meth->finish -+int RSA_meth_set_priv_enc(RSA_METHOD *meth, int (*priv_enc) (int flen, const unsigned char *from, unsigned char *to, RSA *rsa, int padding)); -+int RSA_meth_set_priv_dec(RSA_METHOD *meth, int (*priv_dec) (int flen, const unsigned char *from, unsigned char *to, RSA *rsa, int padding)); -+int RSA_meth_set_finish(RSA_METHOD *meth, int (*finish) (RSA *rsa)); -+void RSA_meth_free(RSA_METHOD *meth); -+ -+int RSA_bits(const RSA *r); -+ -+RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey); -+ -+#endif /* OPENSSL_VERSION_NUMBER */ -+ -+#endif /* LIBCRYPTO_COMPAT_H */ -diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp -index f0b9431..d961ad9 100644 ---- a/plugins/qca-ossl/qca-ossl.cpp -+++ b/plugins/qca-ossl/qca-ossl.cpp -@@ -1,6 +1,7 @@ - /* - * Copyright (C) 2004-2007 Justin Karneges <justin@affinix.com> - * Copyright (C) 2004-2006 Brad Hards <bradh@frogmouth.net> -+ * Copyright (C) 2017 Fabian Vogt <fabian@ritter-vogt.de> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public -@@ -38,6 +39,10 @@ - #include <openssl/pkcs12.h> - #include <openssl/ssl.h> - -+extern "C" { -+#include "libcrypto-compat.h" -+} -+ - #ifndef OSSL_097 - // comment this out if you'd rather use openssl 0.9.6 - #define OSSL_097 -@@ -52,6 +57,73 @@ - ((_STACK*) (1 ? p : (type*)0)) - #endif - -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+ #define OSSL_110 -+#endif -+ -+// OpenSSL 1.1.0 compatibility macros -+#ifdef OSSL_110 -+#define M_ASN1_IA5STRING_new() ASN1_IA5STRING_new() -+#else -+static HMAC_CTX *HMAC_CTX_new() { return new HMAC_CTX(); } -+static void HMAC_CTX_free(HMAC_CTX *x) { free(x); } -+static void EVP_PKEY_up_ref(EVP_PKEY *x) { CRYPTO_add(&x->references, 1, CRYPTO_LOCK_EVP_PKEY); } -+static void X509_up_ref(X509 *x) { CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509); } -+static void X509_CRL_up_ref(X509_CRL *x) { CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509_CRL); } -+static DSA *EVP_PKEY_get0_DSA(EVP_PKEY *x) { return x->pkey.dsa; } -+static DH *EVP_PKEY_get0_DH(EVP_PKEY *x) { return x->pkey.dh; } -+static int RSA_meth_set_sign(RSA_METHOD *meth, -+ int (*sign) (int type, const unsigned char *m, -+ unsigned int m_length, -+ unsigned char *sigret, unsigned int *siglen, -+ const RSA *rsa)) -+{ -+ meth->rsa_sign = sign; -+ return 1; -+} -+int RSA_meth_set_verify(RSA_METHOD *meth, -+ int (*verify) (int dtype, const unsigned char *m, -+ unsigned int m_length, -+ const unsigned char *sigbuf, -+ unsigned int siglen, const RSA *rsa)) -+{ -+ meth->rsa_verify = verify; -+ return 1; -+} -+void X509_REQ_get0_signature(const X509_REQ *req, const ASN1_BIT_STRING **psig, -+ const X509_ALGOR **palg) -+{ -+ if (psig != NULL) -+ *psig = req->signature; -+ if (palg != NULL) -+ *palg = req->sig_alg; -+} -+int X509_REQ_get_signature_nid(const X509_REQ *req) -+{ -+ return OBJ_obj2nid(req->sig_alg->algorithm); -+} -+void X509_CRL_get0_signature(const X509_CRL *crl, const ASN1_BIT_STRING **psig, -+ const X509_ALGOR **palg) -+{ -+ if (psig != NULL) -+ *psig = crl->signature; -+ if (palg != NULL) -+ *palg = crl->sig_alg; -+} -+int X509_CRL_get_signature_nid(const X509_CRL *crl) -+{ -+ return OBJ_obj2nid(crl->sig_alg->algorithm); -+} -+const ASN1_INTEGER *X509_REVOKED_get0_serialNumber(const X509_REVOKED *x) -+{ -+ return x->serialNumber; -+} -+const ASN1_TIME *X509_REVOKED_get0_revocationDate(const X509_REVOKED *x) -+{ -+ return x->revocationDate; -+} -+#endif -+ - using namespace QCA; - - namespace opensslQCAPlugin { -@@ -93,7 +165,7 @@ static QByteArray bio2ba(BIO *b) - return buf; - } - --static BigInteger bn2bi(BIGNUM *n) -+static BigInteger bn2bi(const BIGNUM *n) - { - SecureArray buf(BN_num_bytes(n) + 1); - buf[0] = 0; // positive -@@ -109,7 +181,7 @@ static BIGNUM *bi2bn(const BigInteger &n) - - // take lowest bytes of BIGNUM to fit - // pad with high byte zeroes to fit --static SecureArray bn2fixedbuf(BIGNUM *n, int size) -+static SecureArray bn2fixedbuf(const BIGNUM *n, int size) - { - SecureArray buf(BN_num_bytes(n)); - BN_bn2bin(n, (unsigned char *)buf.data()); -@@ -127,8 +199,16 @@ static SecureArray dsasig_der_to_raw(const SecureArray &in) - const unsigned char *inp = (const unsigned char *)in.data(); - d2i_DSA_SIG(&sig, &inp, in.size()); - -- SecureArray part_r = bn2fixedbuf(sig->r, 20); -- SecureArray part_s = bn2fixedbuf(sig->s, 20); -+ const BIGNUM *bnr, *bns; -+ -+#ifdef OSSL_110 -+ DSA_SIG_get0(sig, &bnr, &bns); -+#else -+ bnr = sig->r; bns = sig->s; -+#endif -+ -+ SecureArray part_r = bn2fixedbuf(bnr, 20); -+ SecureArray part_s = bn2fixedbuf(bns, 20); - SecureArray result; - result.append(part_r); - result.append(part_s); -@@ -143,12 +223,20 @@ static SecureArray dsasig_raw_to_der(const SecureArray &in) - return SecureArray(); - - DSA_SIG *sig = DSA_SIG_new(); -- SecureArray part_r(20); -- SecureArray part_s(20); -+ SecureArray part_r(20); BIGNUM *bnr; -+ SecureArray part_s(20); BIGNUM *bns; - memcpy(part_r.data(), in.data(), 20); - memcpy(part_s.data(), in.data() + 20, 20); -- sig->r = BN_bin2bn((const unsigned char *)part_r.data(), part_r.size(), NULL); -- sig->s = BN_bin2bn((const unsigned char *)part_s.data(), part_s.size(), NULL); -+ bnr = BN_bin2bn((const unsigned char *)part_r.data(), part_r.size(), NULL); -+ bns = BN_bin2bn((const unsigned char *)part_s.data(), part_s.size(), NULL); -+ -+#ifdef OSSL_110 -+ if(DSA_SIG_set0(sig, bnr, bns) == 0) -+ return SecureArray(); -+ // Not documented what happens in the failure case, free bnr and bns? -+#else -+ sig->r = bnr; sig->s = bns; -+#endif - - int len = i2d_DSA_SIG(sig, NULL); - SecureArray result(len); -@@ -1004,29 +1092,39 @@ public: - opensslHashContext(const EVP_MD *algorithm, Provider *p, const QString &type) : HashContext(p, type) - { - m_algorithm = algorithm; -- EVP_DigestInit( &m_context, m_algorithm ); -+ m_context = EVP_MD_CTX_new(); -+ EVP_DigestInit( m_context, m_algorithm ); -+ } -+ -+ opensslHashContext(const opensslHashContext &other) -+ : HashContext(other) -+ { -+ m_algorithm = other.m_algorithm; -+ m_context = EVP_MD_CTX_new(); -+ EVP_MD_CTX_copy_ex(m_context, other.m_context); - } - - ~opensslHashContext() - { -- EVP_MD_CTX_cleanup(&m_context); -+ EVP_MD_CTX_free(m_context); - } - - void clear() - { -- EVP_MD_CTX_cleanup(&m_context); -- EVP_DigestInit( &m_context, m_algorithm ); -+ EVP_MD_CTX_free(m_context); -+ m_context = EVP_MD_CTX_new(); -+ EVP_DigestInit( m_context, m_algorithm ); - } - - void update(const MemoryRegion &a) - { -- EVP_DigestUpdate( &m_context, (unsigned char*)a.data(), a.size() ); -+ EVP_DigestUpdate( m_context, (unsigned char*)a.data(), a.size() ); - } - - MemoryRegion final() - { - SecureArray a( EVP_MD_size( m_algorithm ) ); -- EVP_DigestFinal( &m_context, (unsigned char*)a.data(), 0 ); -+ EVP_DigestFinal( m_context, (unsigned char*)a.data(), 0 ); - return a; - } - -@@ -1037,7 +1135,7 @@ public: - - protected: - const EVP_MD *m_algorithm; -- EVP_MD_CTX m_context; -+ EVP_MD_CTX *m_context; - }; - - -@@ -1047,7 +1145,21 @@ public: - opensslPbkdf1Context(const EVP_MD *algorithm, Provider *p, const QString &type) : KDFContext(p, type) - { - m_algorithm = algorithm; -- EVP_DigestInit( &m_context, m_algorithm ); -+ m_context = EVP_MD_CTX_new(); -+ EVP_DigestInit( m_context, m_algorithm ); -+ } -+ -+ opensslPbkdf1Context(const opensslPbkdf1Context &other) -+ : KDFContext(other) -+ { -+ m_algorithm = other.m_algorithm; -+ m_context = EVP_MD_CTX_new(); -+ EVP_MD_CTX_copy(m_context, other.m_context); -+ } -+ -+ ~opensslPbkdf1Context() -+ { -+ EVP_MD_CTX_free(m_context); - } - - Provider::Context *clone() const -@@ -1081,16 +1193,16 @@ public: - DK = Tc<0..dkLen-1> - */ - // calculate T_1 -- EVP_DigestUpdate( &m_context, (unsigned char*)secret.data(), secret.size() ); -- EVP_DigestUpdate( &m_context, (unsigned char*)salt.data(), salt.size() ); -+ EVP_DigestUpdate( m_context, (unsigned char*)secret.data(), secret.size() ); -+ EVP_DigestUpdate( m_context, (unsigned char*)salt.data(), salt.size() ); - SecureArray a( EVP_MD_size( m_algorithm ) ); -- EVP_DigestFinal( &m_context, (unsigned char*)a.data(), 0 ); -+ EVP_DigestFinal( m_context, (unsigned char*)a.data(), 0 ); - - // calculate T_2 up to T_c - for ( unsigned int i = 2; i <= iterationCount; ++i ) { -- EVP_DigestInit( &m_context, m_algorithm ); -- EVP_DigestUpdate( &m_context, (unsigned char*)a.data(), a.size() ); -- EVP_DigestFinal( &m_context, (unsigned char*)a.data(), 0 ); -+ EVP_DigestInit( m_context, m_algorithm ); -+ EVP_DigestUpdate( m_context, (unsigned char*)a.data(), a.size() ); -+ EVP_DigestFinal( m_context, (unsigned char*)a.data(), 0 ); - } - - // shrink a to become DK, of the required length -@@ -1136,19 +1248,19 @@ public: - DK = Tc<0..dkLen-1> - */ - // calculate T_1 -- EVP_DigestUpdate( &m_context, (unsigned char*)secret.data(), secret.size() ); -- EVP_DigestUpdate( &m_context, (unsigned char*)salt.data(), salt.size() ); -+ EVP_DigestUpdate( m_context, (unsigned char*)secret.data(), secret.size() ); -+ EVP_DigestUpdate( m_context, (unsigned char*)salt.data(), salt.size() ); - SecureArray a( EVP_MD_size( m_algorithm ) ); -- EVP_DigestFinal( &m_context, (unsigned char*)a.data(), 0 ); -+ EVP_DigestFinal( m_context, (unsigned char*)a.data(), 0 ); - - // calculate T_2 up to T_c - *iterationCount = 2 - 1; // <- Have to remove 1, unless it computes one - timer.start(); // ^ time more than the base function - // ^ with the same iterationCount - while (timer.elapsed() < msecInterval) { -- EVP_DigestInit( &m_context, m_algorithm ); -- EVP_DigestUpdate( &m_context, (unsigned char*)a.data(), a.size() ); -- EVP_DigestFinal( &m_context, (unsigned char*)a.data(), 0 ); -+ EVP_DigestInit( m_context, m_algorithm ); -+ EVP_DigestUpdate( m_context, (unsigned char*)a.data(), a.size() ); -+ EVP_DigestFinal( m_context, (unsigned char*)a.data(), 0 ); - ++(*iterationCount); - } - -@@ -1163,7 +1275,7 @@ public: - - protected: - const EVP_MD *m_algorithm; -- EVP_MD_CTX m_context; -+ EVP_MD_CTX *m_context; - }; - - class opensslPbkdf2Context : public KDFContext -@@ -1231,12 +1343,28 @@ public: - opensslHMACContext(const EVP_MD *algorithm, Provider *p, const QString &type) : MACContext(p, type) - { - m_algorithm = algorithm; -- HMAC_CTX_init( &m_context ); -+ m_context = HMAC_CTX_new(); -+#ifndef OSSL_110 -+ HMAC_CTX_init( m_context ); -+#endif -+ } -+ -+ opensslHMACContext(const opensslHMACContext &other) -+ : MACContext(other) -+ { -+ m_algorithm = other.m_algorithm; -+ m_context = HMAC_CTX_new(); -+ HMAC_CTX_copy(m_context, other.m_context); -+ } -+ -+ ~opensslHMACContext() -+ { -+ HMAC_CTX_free(m_context); - } - - void setup(const SymmetricKey &key) - { -- HMAC_Init_ex( &m_context, key.data(), key.size(), m_algorithm, 0 ); -+ HMAC_Init_ex( m_context, key.data(), key.size(), m_algorithm, 0 ); - } - - KeyLength keyLength() const -@@ -1246,14 +1374,18 @@ public: - - void update(const MemoryRegion &a) - { -- HMAC_Update( &m_context, (unsigned char *)a.data(), a.size() ); -+ HMAC_Update( m_context, (unsigned char *)a.data(), a.size() ); - } - - void final(MemoryRegion *out) - { - SecureArray sa( EVP_MD_size( m_algorithm ), 0 ); -- HMAC_Final(&m_context, (unsigned char *)sa.data(), 0 ); -- HMAC_CTX_cleanup(&m_context); -+ HMAC_Final(m_context, (unsigned char *)sa.data(), 0 ); -+#ifdef OSSL_110 -+ HMAC_CTX_reset(m_context); -+#else -+ HMAC_CTX_cleanup(m_context); -+#endif - *out = sa; - } - -@@ -1263,7 +1395,7 @@ public: - } - - protected: -- HMAC_CTX m_context; -+ HMAC_CTX *m_context; - const EVP_MD *m_algorithm; - }; - -@@ -1277,7 +1409,7 @@ class EVPKey - public: - enum State { Idle, SignActive, SignError, VerifyActive, VerifyError }; - EVP_PKEY *pkey; -- EVP_MD_CTX mdctx; -+ EVP_MD_CTX *mdctx; - State state; - bool raw_type; - SecureArray raw; -@@ -1287,19 +1419,23 @@ public: - pkey = 0; - raw_type = false; - state = Idle; -+ mdctx = EVP_MD_CTX_new(); - } - - EVPKey(const EVPKey &from) - { - pkey = from.pkey; -- CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY); -+ EVP_PKEY_up_ref(pkey); - raw_type = false; - state = Idle; -+ mdctx = EVP_MD_CTX_new(); -+ EVP_MD_CTX_copy(mdctx, from.mdctx); - } - - ~EVPKey() - { - reset(); -+ EVP_MD_CTX_free(mdctx); - } - - void reset() -@@ -1322,8 +1458,8 @@ public: - else - { - raw_type = false; -- EVP_MD_CTX_init(&mdctx); -- if(!EVP_SignInit_ex(&mdctx, type, NULL)) -+ EVP_MD_CTX_init(mdctx); -+ if(!EVP_SignInit_ex(mdctx, type, NULL)) - state = SignError; - } - } -@@ -1339,8 +1475,8 @@ public: - else - { - raw_type = false; -- EVP_MD_CTX_init(&mdctx); -- if(!EVP_VerifyInit_ex(&mdctx, type, NULL)) -+ EVP_MD_CTX_init(mdctx); -+ if(!EVP_VerifyInit_ex(mdctx, type, NULL)) - state = VerifyError; - } - } -@@ -1352,7 +1488,7 @@ public: - if (raw_type) - raw += in; - else -- if(!EVP_SignUpdate(&mdctx, in.data(), (unsigned int)in.size())) -+ if(!EVP_SignUpdate(mdctx, in.data(), (unsigned int)in.size())) - state = SignError; - } - else if(state == VerifyActive) -@@ -1360,7 +1496,7 @@ public: - if (raw_type) - raw += in; - else -- if(!EVP_VerifyUpdate(&mdctx, in.data(), (unsigned int)in.size())) -+ if(!EVP_VerifyUpdate(mdctx, in.data(), (unsigned int)in.size())) - state = VerifyError; - } - } -@@ -1373,17 +1509,24 @@ public: - unsigned int len = out.size(); - if (raw_type) - { -- if (pkey->type == EVP_PKEY_RSA) -+ int type; -+#ifdef OSSL_110 -+ type = EVP_PKEY_id(pkey); -+#else -+ type = pkey->type; -+#endif -+ if (type == EVP_PKEY_RSA) - { -+ RSA *rsa = EVP_PKEY_get0_RSA(pkey); - if(RSA_private_encrypt (raw.size(), (unsigned char *)raw.data(), -- (unsigned char *)out.data(), pkey->pkey.rsa, -+ (unsigned char *)out.data(), rsa, - RSA_PKCS1_PADDING) == -1) { - - state = SignError; - return SecureArray (); - } - } -- else if (pkey->type == EVP_PKEY_DSA) -+ else if (type == EVP_PKEY_DSA) - { - state = SignError; - return SecureArray (); -@@ -1395,7 +1538,7 @@ public: - } - } - else { -- if(!EVP_SignFinal(&mdctx, (unsigned char *)out.data(), &len, pkey)) -+ if(!EVP_SignFinal(mdctx, (unsigned char *)out.data(), &len, pkey)) - { - state = SignError; - return SecureArray(); -@@ -1418,16 +1561,24 @@ public: - SecureArray out(EVP_PKEY_size(pkey)); - int len = 0; - -- if (pkey->type == EVP_PKEY_RSA) { -+ int type; -+#ifdef OSSL_110 -+ type = EVP_PKEY_type(EVP_PKEY_id(pkey)); -+#else -+ type = pkey->type; -+#endif -+ -+ if (type == EVP_PKEY_RSA) { -+ RSA *rsa = EVP_PKEY_get0_RSA(pkey); - if((len = RSA_public_decrypt (sig.size(), (unsigned char *)sig.data(), -- (unsigned char *)out.data (), pkey->pkey.rsa, -+ (unsigned char *)out.data (), rsa, - RSA_PKCS1_PADDING)) == -1) { - - state = VerifyError; - return false; - } - } -- else if (pkey->type == EVP_PKEY_DSA) -+ else if (type == EVP_PKEY_DSA) - { - state = VerifyError; - return false; -@@ -1447,7 +1598,7 @@ public: - } - else - { -- if(EVP_VerifyFinal(&mdctx, (unsigned char *)sig.data(), (unsigned int)sig.size(), pkey) != 1) -+ if(EVP_VerifyFinal(mdctx, (unsigned char *)sig.data(), (unsigned int)sig.size(), pkey) != 1) - { - state = VerifyError; - return false; -@@ -1561,9 +1712,11 @@ static bool make_dlgroup(const QByteArray &seed, int bits, int counter, DLParams - return false; - if(ret_counter != counter) - return false; -- params->p = bn2bi(dsa->p); -- params->q = bn2bi(dsa->q); -- params->g = bn2bi(dsa->g); -+ const BIGNUM *bnp, *bnq, *bng; -+ DSA_get0_pqg(dsa, &bnp, &bnq, &bng); -+ params->p = bn2bi(bnp); -+ params->q = bn2bi(bnq); -+ params->g = bn2bi(bng); - DSA_free(dsa); - return true; - } -@@ -1826,10 +1979,11 @@ public: - return; - - // extract the public key into DER format -- int len = i2d_RSAPublicKey(evp.pkey->pkey.rsa, NULL); -+ RSA *rsa_pkey = EVP_PKEY_get0_RSA(evp.pkey); -+ int len = i2d_RSAPublicKey(rsa_pkey, NULL); - SecureArray result(len); - unsigned char *p = (unsigned char *)result.data(); -- i2d_RSAPublicKey(evp.pkey->pkey.rsa, &p); -+ i2d_RSAPublicKey(rsa_pkey, &p); - p = (unsigned char *)result.data(); - - // put the DER public key back into openssl -@@ -1852,7 +2006,7 @@ public: - - virtual int maximumEncryptSize(EncryptionAlgorithm alg) const - { -- RSA *rsa = evp.pkey->pkey.rsa; -+ RSA *rsa = EVP_PKEY_get0_RSA(evp.pkey); - int size = 0; - switch(alg) - { -@@ -1867,7 +2021,7 @@ public: - - virtual SecureArray encrypt(const SecureArray &in, EncryptionAlgorithm alg) - { -- RSA *rsa = evp.pkey->pkey.rsa; -+ RSA *rsa = EVP_PKEY_get0_RSA(evp.pkey); - SecureArray buf = in; - int max = maximumEncryptSize(alg); - -@@ -1900,7 +2054,7 @@ public: - - virtual bool decrypt(const SecureArray &in, SecureArray *out, EncryptionAlgorithm alg) - { -- RSA *rsa = evp.pkey->pkey.rsa; -+ RSA *rsa = EVP_PKEY_get0_RSA(evp.pkey); - SecureArray result(RSA_size(rsa)); - int pad; - -@@ -2021,14 +2175,10 @@ public: - evp.reset(); - - RSA *rsa = RSA_new(); -- rsa->n = bi2bn(n); -- rsa->e = bi2bn(e); -- rsa->p = bi2bn(p); -- rsa->q = bi2bn(q); -- rsa->d = bi2bn(d); -- -- if(!rsa->n || !rsa->e || !rsa->p || !rsa->q || !rsa->d) -+ if(RSA_set0_key(rsa, bi2bn(n), bi2bn(e), bi2bn(d)) == 0 -+ || RSA_set0_factors(rsa, bi2bn(p), bi2bn(q)) == 0) - { -+ // Free BIGNUMS? - RSA_free(rsa); - return; - } -@@ -2036,7 +2186,7 @@ public: - // When private key has no Public Exponent (e) or Private Exponent (d) - // need to disable blinding. Otherwise decryption will be broken. - // http://www.mail-archive.com/openssl-users@openssl.org/msg63530.html -- if(BN_is_zero(rsa->e) || BN_is_zero(rsa->d)) -+ if(e == BigInteger(0) || d == BigInteger(0)) - RSA_blinding_off(rsa); - - evp.pkey = EVP_PKEY_new(); -@@ -2049,10 +2199,7 @@ public: - evp.reset(); - - RSA *rsa = RSA_new(); -- rsa->n = bi2bn(n); -- rsa->e = bi2bn(e); -- -- if(!rsa->n || !rsa->e) -+ if(RSA_set0_key(rsa, bi2bn(n), bi2bn(e), NULL) == 0) - { - RSA_free(rsa); - return; -@@ -2065,27 +2212,42 @@ public: - - virtual BigInteger n() const - { -- return bn2bi(evp.pkey->pkey.rsa->n); -+ RSA *rsa = EVP_PKEY_get0_RSA(evp.pkey); -+ const BIGNUM *bnn; -+ RSA_get0_key(rsa, &bnn, NULL, NULL); -+ return bn2bi(bnn); - } - - virtual BigInteger e() const - { -- return bn2bi(evp.pkey->pkey.rsa->e); -+ RSA *rsa = EVP_PKEY_get0_RSA(evp.pkey); -+ const BIGNUM *bne; -+ RSA_get0_key(rsa, NULL, &bne, NULL); -+ return bn2bi(bne); - } - - virtual BigInteger p() const - { -- return bn2bi(evp.pkey->pkey.rsa->p); -+ RSA *rsa = EVP_PKEY_get0_RSA(evp.pkey); -+ const BIGNUM *bnp; -+ RSA_get0_factors(rsa, &bnp, NULL); -+ return bn2bi(bnp); - } - - virtual BigInteger q() const - { -- return bn2bi(evp.pkey->pkey.rsa->q); -+ RSA *rsa = EVP_PKEY_get0_RSA(evp.pkey); -+ const BIGNUM *bnq; -+ RSA_get0_factors(rsa, NULL, &bnq); -+ return bn2bi(bnq); - } - - virtual BigInteger d() const - { -- return bn2bi(evp.pkey->pkey.rsa->d); -+ RSA *rsa = EVP_PKEY_get0_RSA(evp.pkey); -+ const BIGNUM *bnd; -+ RSA_get0_key(rsa, NULL, NULL, &bnd); -+ return bn2bi(bnd); - } - - private slots: -@@ -2134,10 +2296,12 @@ public: - virtual void run() - { - DSA *dsa = DSA_new(); -- dsa->p = bi2bn(domain.p()); -- dsa->q = bi2bn(domain.q()); -- dsa->g = bi2bn(domain.g()); -- if(!DSA_generate_key(dsa)) -+ BIGNUM *pne = bi2bn(domain.p()), -+ *qne = bi2bn(domain.q()), -+ *gne = bi2bn(domain.g()); -+ -+ if(!DSA_set0_pqg(dsa, pne, qne, gne) -+ || !DSA_generate_key(dsa)) - { - DSA_free(dsa); - return; -@@ -2212,10 +2376,11 @@ public: - return; - - // extract the public key into DER format -- int len = i2d_DSAPublicKey(evp.pkey->pkey.dsa, NULL); -+ DSA *dsa_pkey = EVP_PKEY_get0_DSA(evp.pkey); -+ int len = i2d_DSAPublicKey(dsa_pkey, NULL); - SecureArray result(len); - unsigned char *p = (unsigned char *)result.data(); -- i2d_DSAPublicKey(evp.pkey->pkey.dsa, &p); -+ i2d_DSAPublicKey(dsa_pkey, &p); - p = (unsigned char *)result.data(); - - // put the DER public key back into openssl -@@ -2244,7 +2409,7 @@ public: - else - transformsig = false; - -- evp.startSign(EVP_dss1()); -+ evp.startSign(EVP_sha1()); - } - - virtual void startVerify(SignatureAlgorithm, SignatureFormat format) -@@ -2255,7 +2420,7 @@ public: - else - transformsig = false; - -- evp.startVerify(EVP_dss1()); -+ evp.startVerify(EVP_sha1()); - } - - virtual void update(const MemoryRegion &in) -@@ -2305,13 +2470,14 @@ public: - evp.reset(); - - DSA *dsa = DSA_new(); -- dsa->p = bi2bn(domain.p()); -- dsa->q = bi2bn(domain.q()); -- dsa->g = bi2bn(domain.g()); -- dsa->pub_key = bi2bn(y); -- dsa->priv_key = bi2bn(x); -+ BIGNUM *bnp = bi2bn(domain.p()); -+ BIGNUM *bnq = bi2bn(domain.q()); -+ BIGNUM *bng = bi2bn(domain.g()); -+ BIGNUM *bnpub_key = bi2bn(y); -+ BIGNUM *bnpriv_key = bi2bn(x); - -- if(!dsa->p || !dsa->q || !dsa->g || !dsa->pub_key || !dsa->priv_key) -+ if(!DSA_set0_pqg(dsa, bnp, bnq, bng) -+ || !DSA_set0_key(dsa, bnpub_key, bnpriv_key)) - { - DSA_free(dsa); - return; -@@ -2327,12 +2493,13 @@ public: - evp.reset(); - - DSA *dsa = DSA_new(); -- dsa->p = bi2bn(domain.p()); -- dsa->q = bi2bn(domain.q()); -- dsa->g = bi2bn(domain.g()); -- dsa->pub_key = bi2bn(y); -+ BIGNUM *bnp = bi2bn(domain.p()); -+ BIGNUM *bnq = bi2bn(domain.q()); -+ BIGNUM *bng = bi2bn(domain.g()); -+ BIGNUM *bnpub_key = bi2bn(y); - -- if(!dsa->p || !dsa->q || !dsa->g || !dsa->pub_key) -+ if(!DSA_set0_pqg(dsa, bnp, bnq, bng) -+ || !DSA_set0_key(dsa, bnpub_key, NULL)) - { - DSA_free(dsa); - return; -@@ -2345,17 +2512,26 @@ public: - - virtual DLGroup domain() const - { -- return DLGroup(bn2bi(evp.pkey->pkey.dsa->p), bn2bi(evp.pkey->pkey.dsa->q), bn2bi(evp.pkey->pkey.dsa->g)); -+ DSA *dsa = EVP_PKEY_get0_DSA(evp.pkey); -+ const BIGNUM *bnp, *bnq, *bng; -+ DSA_get0_pqg(dsa, &bnp, &bnq, &bng); -+ return DLGroup(bn2bi(bnp), bn2bi(bnq), bn2bi(bng)); - } - - virtual BigInteger y() const - { -- return bn2bi(evp.pkey->pkey.dsa->pub_key); -+ DSA *dsa = EVP_PKEY_get0_DSA(evp.pkey); -+ const BIGNUM *bnpub_key; -+ DSA_get0_key(dsa, &bnpub_key, NULL); -+ return bn2bi(bnpub_key); - } - - virtual BigInteger x() const - { -- return bn2bi(evp.pkey->pkey.dsa->priv_key); -+ DSA *dsa = EVP_PKEY_get0_DSA(evp.pkey); -+ const BIGNUM *bnpriv_key; -+ DSA_get0_key(dsa, NULL, &bnpriv_key); -+ return bn2bi(bnpriv_key); - } - - private slots: -@@ -2404,9 +2580,10 @@ public: - virtual void run() - { - DH *dh = DH_new(); -- dh->p = bi2bn(domain.p()); -- dh->g = bi2bn(domain.g()); -- if(!DH_generate_key(dh)) -+ BIGNUM *bnp = bi2bn(domain.p()); -+ BIGNUM *bng = bi2bn(domain.g()); -+ if(!DH_set0_pqg(dh, bnp, NULL, bng) -+ || !DH_generate_key(dh)) - { - DH_free(dh); - return; -@@ -2478,11 +2655,14 @@ public: - if(!sec) - return; - -- DH *orig = evp.pkey->pkey.dh; -+ DH *orig = EVP_PKEY_get0_DH(evp.pkey); - DH *dh = DH_new(); -- dh->p = BN_dup(orig->p); -- dh->g = BN_dup(orig->g); -- dh->pub_key = BN_dup(orig->pub_key); -+ const BIGNUM *bnp, *bng, *bnpub_key; -+ DH_get0_pqg(orig, &bnp, NULL, &bng); -+ DH_get0_key(orig, &bnpub_key, NULL); -+ -+ DH_set0_key(dh, BN_dup(bnpub_key), NULL); -+ DH_set0_pqg(dh, BN_dup(bnp), NULL, BN_dup(bng)); - - evp.reset(); - -@@ -2498,10 +2678,13 @@ public: - - virtual SymmetricKey deriveKey(const PKeyBase &theirs) - { -- DH *dh = evp.pkey->pkey.dh; -- DH *them = static_cast<const DHKey *>(&theirs)->evp.pkey->pkey.dh; -+ DH *dh = EVP_PKEY_get0_DH(evp.pkey); -+ DH *them = EVP_PKEY_get0_DH(static_cast<const DHKey *>(&theirs)->evp.pkey); -+ const BIGNUM *bnpub_key; -+ DH_get0_key(them, &bnpub_key, NULL); -+ - SecureArray result(DH_size(dh)); -- int ret = DH_compute_key((unsigned char *)result.data(), them->pub_key, dh); -+ int ret = DH_compute_key((unsigned char *)result.data(), bnpub_key, dh); - if(ret <= 0) - return SymmetricKey(); - result.resize(ret); -@@ -2531,12 +2714,13 @@ public: - evp.reset(); - - DH *dh = DH_new(); -- dh->p = bi2bn(domain.p()); -- dh->g = bi2bn(domain.g()); -- dh->pub_key = bi2bn(y); -- dh->priv_key = bi2bn(x); -+ BIGNUM *bnp = bi2bn(domain.p()); -+ BIGNUM *bng = bi2bn(domain.g()); -+ BIGNUM *bnpub_key = bi2bn(y); -+ BIGNUM *bnpriv_key = bi2bn(x); - -- if(!dh->p || !dh->g || !dh->pub_key || !dh->priv_key) -+ if(!DH_set0_key(dh, bnpub_key, bnpriv_key) -+ || !DH_set0_pqg(dh, bnp, NULL, bng)) - { - DH_free(dh); - return; -@@ -2552,11 +2736,12 @@ public: - evp.reset(); - - DH *dh = DH_new(); -- dh->p = bi2bn(domain.p()); -- dh->g = bi2bn(domain.g()); -- dh->pub_key = bi2bn(y); -+ BIGNUM *bnp = bi2bn(domain.p()); -+ BIGNUM *bng = bi2bn(domain.g()); -+ BIGNUM *bnpub_key = bi2bn(y); - -- if(!dh->p || !dh->g || !dh->pub_key) -+ if(!DH_set0_key(dh, bnpub_key, NULL) -+ || !DH_set0_pqg(dh, bnp, NULL, bng)) - { - DH_free(dh); - return; -@@ -2569,17 +2754,26 @@ public: - - virtual DLGroup domain() const - { -- return DLGroup(bn2bi(evp.pkey->pkey.dh->p), bn2bi(evp.pkey->pkey.dh->g)); -+ DH *dh = EVP_PKEY_get0_DH(evp.pkey); -+ const BIGNUM *bnp, *bng; -+ DH_get0_pqg(dh, &bnp, NULL, &bng); -+ return DLGroup(bn2bi(bnp), bn2bi(bng)); - } - - virtual BigInteger y() const - { -- return bn2bi(evp.pkey->pkey.dh->pub_key); -+ DH *dh = EVP_PKEY_get0_DH(evp.pkey); -+ const BIGNUM *bnpub_key; -+ DH_get0_key(dh, &bnpub_key, NULL); -+ return bn2bi(bnpub_key); - } - - virtual BigInteger x() const - { -- return bn2bi(evp.pkey->pkey.dh->priv_key); -+ DH *dh = EVP_PKEY_get0_DH(evp.pkey); -+ const BIGNUM *bnpriv_key; -+ DH_get0_key(dh, NULL, &bnpriv_key); -+ return bn2bi(bnpriv_key); - } - - private slots: -@@ -2618,10 +2812,14 @@ public: - { - key = _key; - RSA_set_method(rsa, rsa_method()); -+#ifndef OSSL_110 - rsa->flags |= RSA_FLAG_SIGN_VER; -+#endif - RSA_set_app_data(rsa, this); -- rsa->n = bi2bn(_key.n()); -- rsa->e = bi2bn(_key.e()); -+ BIGNUM *bnn = bi2bn(_key.n()); -+ BIGNUM *bne = bi2bn(_key.e()); -+ -+ RSA_set0_key(rsa, bnn, bne, NULL); - } - - RSA_METHOD *rsa_method() -@@ -2630,12 +2828,16 @@ public: - - if(!ops) - { -- ops = new RSA_METHOD(*RSA_get_default_method()); -- ops->rsa_priv_enc = 0;//pkcs11_rsa_encrypt; -- ops->rsa_priv_dec = rsa_priv_dec; -- ops->rsa_sign = rsa_sign; -- ops->rsa_verify = 0;//pkcs11_rsa_verify; -- ops->finish = rsa_finish; -+ ops = RSA_meth_dup(RSA_get_default_method()); -+ RSA_meth_set_priv_enc(ops, NULL); //pkcs11_rsa_encrypt -+ RSA_meth_set_priv_dec(ops, rsa_priv_dec); //pkcs11_rsa_encrypt -+#ifdef OSSL_110 -+ RSA_meth_set_sign(ops, NULL); -+#else -+ RSA_meth_set_sign(ops, rsa_sign); -+#endif -+ RSA_meth_set_verify(ops, NULL); //pkcs11_rsa_verify -+ RSA_meth_set_finish(ops, rsa_finish); - } - return ops; - } -@@ -2654,7 +2856,7 @@ public: - } - else - { -- RSAerr(RSA_F_RSA_EAY_PRIVATE_DECRYPT, RSA_R_UNKNOWN_PADDING_TYPE); -+ RSAerr(RSA_F_RSA_OSSL_PRIVATE_DECRYPT, RSA_R_UNKNOWN_PADDING_TYPE); - return -1; - } - -@@ -2675,6 +2877,7 @@ public: - return -1; - } - -+#ifndef OSSL_110 - static int rsa_sign(int type, const unsigned char *m, unsigned int m_len, unsigned char *sigret, unsigned int *siglen, const RSA *rsa) - { - QCA_RSA_METHOD *self = (QCA_RSA_METHOD *)RSA_get_app_data(rsa); -@@ -2691,7 +2894,6 @@ public: - } - else - { -- - // make X509 packet - X509_SIG sig; - ASN1_TYPE parameter; -@@ -2765,6 +2967,7 @@ public: - - return 1; - } -+#endif - - static int rsa_finish(RSA *rsa) - { -@@ -2866,21 +3069,22 @@ public: - PKeyBase *pkeyToBase(EVP_PKEY *pkey, bool sec) const - { - PKeyBase *nk = 0; -- if(pkey->type == EVP_PKEY_RSA) -+ int pkey_type = EVP_PKEY_type(EVP_PKEY_id(pkey)); -+ if(pkey_type == EVP_PKEY_RSA) - { - RSAKey *c = new RSAKey(provider()); - c->evp.pkey = pkey; - c->sec = sec; - nk = c; - } -- else if(pkey->type == EVP_PKEY_DSA) -+ else if(pkey_type == EVP_PKEY_DSA) - { - DSAKey *c = new DSAKey(provider()); - c->evp.pkey = pkey; - c->sec = sec; - nk = c; - } -- else if(pkey->type == EVP_PKEY_DH) -+ else if(pkey_type == EVP_PKEY_DH) - { - DHKey *c = new DHKey(provider()); - c->evp.pkey = pkey; -@@ -2898,8 +3102,10 @@ public: - { - EVP_PKEY *pkey = get_pkey(); - -+ int pkey_type = EVP_PKEY_type(EVP_PKEY_id(pkey)); -+ - // OpenSSL does not have DH import/export support -- if(pkey->type == EVP_PKEY_DH) -+ if(pkey_type == EVP_PKEY_DH) - return QByteArray(); - - BIO *bo = BIO_new(BIO_s_mem()); -@@ -2912,8 +3118,10 @@ public: - { - EVP_PKEY *pkey = get_pkey(); - -+ int pkey_type = EVP_PKEY_type(EVP_PKEY_id(pkey)); -+ - // OpenSSL does not have DH import/export support -- if(pkey->type == EVP_PKEY_DH) -+ if(pkey_type == EVP_PKEY_DH) - return QString(); - - BIO *bo = BIO_new(BIO_s_mem()); -@@ -2978,9 +3186,10 @@ public: - return SecureArray(); - - EVP_PKEY *pkey = get_pkey(); -+ int pkey_type = EVP_PKEY_type(EVP_PKEY_id(pkey)); - - // OpenSSL does not have DH import/export support -- if(pkey->type == EVP_PKEY_DH) -+ if(pkey_type == EVP_PKEY_DH) - return SecureArray(); - - BIO *bo = BIO_new(BIO_s_mem()); -@@ -3007,9 +3216,10 @@ public: - return QString(); - - EVP_PKEY *pkey = get_pkey(); -+ int pkey_type = EVP_PKEY_type(EVP_PKEY_id(pkey)); - - // OpenSSL does not have DH import/export support -- if(pkey->type == EVP_PKEY_DH) -+ if(pkey_type == EVP_PKEY_DH) - return QString(); - - BIO *bo = BIO_new(BIO_s_mem()); -@@ -3110,11 +3320,18 @@ public: - crl = from.crl; - - if(cert) -- CRYPTO_add(&cert->references, 1, CRYPTO_LOCK_X509); -+ X509_up_ref(cert); - if(req) -+ { -+#ifdef OSSL_110 -+ // Not exposed, so copy -+ req = X509_REQ_dup(req); -+#else - CRYPTO_add(&req->references, 1, CRYPTO_LOCK_X509_REQ); -+#endif -+ } - if(crl) -- CRYPTO_add(&crl->references, 1, CRYPTO_LOCK_X509_CRL); -+ X509_CRL_up_ref(crl); - } - - return *this; -@@ -3220,7 +3437,7 @@ public: - // - // This code is mostly taken from OpenSSL v0.9.5a - // by Eric Young --QDateTime ASN1_UTCTIME_QDateTime(ASN1_UTCTIME *tm, int *isGmt) -+QDateTime ASN1_UTCTIME_QDateTime(const ASN1_UTCTIME *tm, int *isGmt) - { - QDateTime qdt; - char *v; -@@ -3318,7 +3535,7 @@ public: - - void fromX509(X509 *x) - { -- CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509); -+ X509_up_ref(x); - item.cert = x; - make_props(); - } -@@ -3349,7 +3566,7 @@ public: - if(priv.key()->type() == PKey::RSA) - md = EVP_sha1(); - else if(priv.key()->type() == PKey::DSA) -- md = EVP_dss1(); -+ md = EVP_sha1(); - else - return false; - -@@ -3480,7 +3697,7 @@ public: - - const MyCertContext *our_cc = this; - X509 *x = our_cc->item.cert; -- CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509); -+ X509_up_ref(x); - sk_X509_push(untrusted_list, x); - - const MyCertContext *other_cc = static_cast<const MyCertContext *>(other); -@@ -3595,14 +3812,21 @@ public: - p.policies = get_cert_policies(ex); - } - -- if (x->signature) -+#ifdef OSSL_110 -+ const -+#endif -+ ASN1_BIT_STRING *signature; -+ -+ X509_get0_signature(&signature, NULL, x); -+ if(signature) - { -- p.sig = QByteArray(x->signature->length, 0); -- for (int i=0; i< x->signature->length; i++) -- p.sig[i] = x->signature->data[i]; -+ p.sig = QByteArray(signature->length, 0); -+ for (int i=0; i< signature->length; i++) -+ p.sig[i] = signature->data[i]; - } - -- switch( OBJ_obj2nid(x->cert_info->signature->algorithm) ) -+ -+ switch( X509_get_signature_nid(x) ) - { - case NID_sha1WithRSAEncryption: - p.sigalgo = QCA::EMSA3_SHA1; -@@ -3634,7 +3858,7 @@ public: - p.sigalgo = QCA::EMSA3_SHA512; - break; - default: -- qDebug() << "Unknown signature value: " << OBJ_obj2nid(x->cert_info->signature->algorithm); -+ qDebug() << "Unknown signature value: " << X509_get_signature_nid(x); - p.sigalgo = QCA::SignatureUnknown; - } - -@@ -3751,7 +3975,7 @@ public: - if(privateKey -> key()->type() == PKey::RSA) - md = EVP_sha1(); - else if(privateKey -> key()->type() == PKey::DSA) -- md = EVP_dss1(); -+ md = EVP_sha1(); - else - return 0; - -@@ -3934,7 +4158,7 @@ public: - if(priv.key()->type() == PKey::RSA) - md = EVP_sha1(); - else if(priv.key()->type() == PKey::DSA) -- md = EVP_dss1(); -+ md = EVP_sha1(); - else - return false; - -@@ -4095,14 +4319,17 @@ public: - - sk_X509_EXTENSION_pop_free(exts, X509_EXTENSION_free); - -- if (x->signature) -+ const ASN1_BIT_STRING *signature; -+ -+ X509_REQ_get0_signature(x, &signature, NULL); -+ if(signature) - { -- p.sig = QByteArray(x->signature->length, 0); -- for (int i=0; i< x->signature->length; i++) -- p.sig[i] = x->signature->data[i]; -+ p.sig = QByteArray(signature->length, 0); -+ for (int i=0; i< signature->length; i++) -+ p.sig[i] = signature->data[i]; - } - -- switch( OBJ_obj2nid(x->sig_alg->algorithm) ) -+ switch( X509_REQ_get_signature_nid(x) ) - { - case NID_sha1WithRSAEncryption: - p.sigalgo = QCA::EMSA3_SHA1; -@@ -4122,7 +4349,7 @@ public: - p.sigalgo = QCA::EMSA1_SHA1; - break; - default: -- qDebug() << "Unknown signature value: " << OBJ_obj2nid(x->sig_alg->algorithm); -+ qDebug() << "Unknown signature value: " << X509_REQ_get_signature_nid(x); - p.sigalgo = QCA::SignatureUnknown; - } - -@@ -4186,7 +4413,7 @@ public: - - void fromX509(X509_CRL *x) - { -- CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509_CRL); -+ X509_CRL_up_ref(x); - item.crl = x; - make_props(); - } -@@ -4238,8 +4465,8 @@ public: - - for (int i = 0; i < sk_X509_REVOKED_num(revokeStack); ++i) { - X509_REVOKED *rev = sk_X509_REVOKED_value(revokeStack, i); -- BigInteger serial = bn2bi(ASN1_INTEGER_to_BN(rev->serialNumber, NULL)); -- QDateTime time = ASN1_UTCTIME_QDateTime( rev->revocationDate, NULL); -+ BigInteger serial = bn2bi(ASN1_INTEGER_to_BN(X509_REVOKED_get0_serialNumber(rev), NULL)); -+ QDateTime time = ASN1_UTCTIME_QDateTime( X509_REVOKED_get0_revocationDate(rev), NULL); - QCA::CRLEntry::Reason reason = QCA::CRLEntry::Unspecified; - int pos = X509_REVOKED_get_ext_by_NID(rev, NID_crl_reason, -1); - if (pos != -1) { -@@ -4288,13 +4515,18 @@ public: - p.revoked.append(thisEntry); - } - -- if (x->signature) -+ const ASN1_BIT_STRING *signature; -+ -+ X509_CRL_get0_signature(x, &signature, NULL); -+ if(signature) - { -- p.sig = QByteArray(x->signature->length, 0); -- for (int i=0; i< x->signature->length; i++) -- p.sig[i] = x->signature->data[i]; -+ p.sig = QByteArray(signature->length, 0); -+ for (int i=0; i< signature->length; i++) -+ p.sig[i] = signature->data[i]; - } -- switch( OBJ_obj2nid(x->sig_alg->algorithm) ) -+ -+ -+ switch( X509_CRL_get_signature_nid(x) ) - { - case NID_sha1WithRSAEncryption: - p.sigalgo = QCA::EMSA3_SHA1; -@@ -4326,7 +4558,7 @@ public: - p.sigalgo = QCA::EMSA3_SHA512; - break; - default: -- qWarning() << "Unknown signature value: " << OBJ_obj2nid(x->sig_alg->algorithm); -+ qWarning() << "Unknown signature value: " << X509_CRL_get_signature_nid(x); - p.sigalgo = QCA::SignatureUnknown; - } - -@@ -4487,21 +4719,21 @@ Validity MyCertContext::validate(const QList<CertContext*> &trusted, const QList - { - const MyCertContext *cc = static_cast<const MyCertContext *>(trusted[n]); - X509 *x = cc->item.cert; -- CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509); -+ X509_up_ref(x); - sk_X509_push(trusted_list, x); - } - for(n = 0; n < untrusted.count(); ++n) - { - const MyCertContext *cc = static_cast<const MyCertContext *>(untrusted[n]); - X509 *x = cc->item.cert; -- CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509); -+ X509_up_ref(x); - sk_X509_push(untrusted_list, x); - } - for(n = 0; n < crls.count(); ++n) - { - const MyCRLContext *cc = static_cast<const MyCRLContext *>(crls[n]); - X509_CRL *x = cc->item.crl; -- CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509_CRL); -+ X509_CRL_up_ref(x); - crl_list.append(x); - } - -@@ -4526,7 +4758,7 @@ Validity MyCertContext::validate(const QList<CertContext*> &trusted, const QList - int ret = X509_verify_cert(ctx); - int err = -1; - if(!ret) -- err = ctx->error; -+ err = X509_STORE_CTX_get_error(ctx); - - // cleanup - X509_STORE_CTX_free(ctx); -@@ -4560,21 +4792,21 @@ Validity MyCertContext::validate_chain(const QList<CertContext*> &chain, const Q - { - const MyCertContext *cc = static_cast<const MyCertContext *>(trusted[n]); - X509 *x = cc->item.cert; -- CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509); -+ X509_up_ref(x); - sk_X509_push(trusted_list, x); - } - for(n = 1; n < chain.count(); ++n) - { - const MyCertContext *cc = static_cast<const MyCertContext *>(chain[n]); - X509 *x = cc->item.cert; -- CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509); -+ X509_up_ref(x); - sk_X509_push(untrusted_list, x); - } - for(n = 0; n < crls.count(); ++n) - { - const MyCRLContext *cc = static_cast<const MyCRLContext *>(crls[n]); - X509_CRL *x = cc->item.crl; -- CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509_CRL); -+ X509_CRL_up_ref(x); - crl_list.append(x); - } - -@@ -4599,7 +4831,7 @@ Validity MyCertContext::validate_chain(const QList<CertContext*> &chain, const Q - int ret = X509_verify_cert(ctx); - int err = -1; - if(!ret) -- err = ctx->error; -+ err = X509_STORE_CTX_get_error(ctx); - - // grab the chain, which may not be fully populated - STACK_OF(X509) *xchain = X509_STORE_CTX_get_chain(ctx); -@@ -4663,7 +4895,7 @@ public: - for(int n = 1; n < chain.count(); ++n) - { - X509 *x = static_cast<const MyCertContext *>(chain[n])->item.cert; -- CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509); -+ X509_up_ref(x); - sk_X509_push(ca, x); - } - } -@@ -5398,7 +5630,7 @@ public: - OpenSSL_add_ssl_algorithms(); - SSL_CTX *ctx = 0; - switch (version) { --#ifndef OPENSSL_NO_SSL2 -+#if !defined(OPENSSL_NO_SSL2) && !defined(OSSL_110) - case TLS::SSL_v2: - ctx = SSL_CTX_new(SSLv2_client_method()); - break; -@@ -5429,8 +5661,8 @@ public: - STACK_OF(SSL_CIPHER) *sk = SSL_get_ciphers(ssl); - QStringList cipherList; - for(int i = 0; i < sk_SSL_CIPHER_num(sk); ++i) { -- SSL_CIPHER *thisCipher = sk_SSL_CIPHER_value(sk, i); -- cipherList += cipherIDtoString(version, thisCipher->id); -+ const SSL_CIPHER *thisCipher = sk_SSL_CIPHER_value(sk, i); -+ cipherList += cipherIDtoString(version, SSL_CIPHER_get_id(thisCipher)); - } - - SSL_free(ssl); -@@ -5807,13 +6039,15 @@ public: - { - SessionInfo sessInfo; - -- sessInfo.isCompressed = (0 != SSL_SESSION_get_compress_id(ssl->session)); -+ SSL_SESSION *session = SSL_get0_session(ssl); -+ sessInfo.isCompressed = (0 != SSL_SESSION_get_compress_id(session)); -+ int ssl_version = SSL_version(ssl); - -- if (ssl->version == TLS1_VERSION) -+ if (ssl_version == TLS1_VERSION) - sessInfo.version = TLS::TLS_v1; -- else if (ssl->version == SSL3_VERSION) -+ else if (ssl_version == SSL3_VERSION) - sessInfo.version = TLS::SSL_v3; -- else if (ssl->version == SSL2_VERSION) -+ else if (ssl_version == SSL2_VERSION) - sessInfo.version = TLS::SSL_v2; - else { - qDebug("unexpected version response"); -@@ -5821,7 +6055,7 @@ public: - } - - sessInfo.cipherSuite = cipherIDtoString( sessInfo.version, -- SSL_get_current_cipher(ssl)->id); -+ SSL_CIPHER_get_id(SSL_get_current_cipher(ssl))); - - sessInfo.cipherMaxBits = SSL_get_cipher_bits(ssl, &(sessInfo.cipherBits)); - -@@ -6393,7 +6627,7 @@ public: - for(int n = 0; n < nonroots.count(); ++n) - { - X509 *x = static_cast<MyCertContext *>(nonroots[n].context())->item.cert; -- CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509); -+ X509_up_ref(x); - sk_X509_push(other_certs, x); - } - -@@ -6435,7 +6669,7 @@ public: - - other_certs = sk_X509_new_null(); - X509 *x = static_cast<MyCertContext *>(target.context())->item.cert; -- CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509); -+ X509_up_ref(x); - sk_X509_push(other_certs, x); - - bi = BIO_new(BIO_s_mem()); -@@ -6498,7 +6732,7 @@ public: - for(int n = 0; n < untrusted_list.count(); ++n) - { - X509 *x = static_cast<MyCertContext *>(untrusted_list[n].context())->item.cert; -- CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509); -+ X509_up_ref(x); - sk_X509_push(other_certs, x); - } - -@@ -6749,14 +6983,27 @@ public: - opensslCipherContext(const EVP_CIPHER *algorithm, const int pad, Provider *p, const QString &type) : CipherContext(p, type) - { - m_cryptoAlgorithm = algorithm; -- EVP_CIPHER_CTX_init(&m_context); -+ m_context = EVP_CIPHER_CTX_new(); -+ EVP_CIPHER_CTX_init(m_context); - m_pad = pad; - m_type = type; - } - -+ opensslCipherContext(const opensslCipherContext &other) -+ : CipherContext(other) -+ { -+ m_cryptoAlgorithm = other.m_cryptoAlgorithm; -+ m_context = EVP_CIPHER_CTX_new(); -+ EVP_CIPHER_CTX_copy(m_context, other.m_context); -+ m_direction = other.m_direction; -+ m_pad = other.m_pad; -+ m_type = other.m_type; -+ } -+ - ~opensslCipherContext() - { -- EVP_CIPHER_CTX_cleanup(&m_context); -+ EVP_CIPHER_CTX_cleanup(m_context); -+ EVP_CIPHER_CTX_free(m_context); - } - - void setup(Direction dir, -@@ -6769,20 +7016,20 @@ public: - m_cryptoAlgorithm = EVP_des_ede(); - } - if (Encode == m_direction) { -- EVP_EncryptInit_ex(&m_context, m_cryptoAlgorithm, 0, 0, 0); -- EVP_CIPHER_CTX_set_key_length(&m_context, key.size()); -- EVP_EncryptInit_ex(&m_context, 0, 0, -+ EVP_EncryptInit_ex(m_context, m_cryptoAlgorithm, 0, 0, 0); -+ EVP_CIPHER_CTX_set_key_length(m_context, key.size()); -+ EVP_EncryptInit_ex(m_context, 0, 0, - (const unsigned char*)(key.data()), - (const unsigned char*)(iv.data())); - } else { -- EVP_DecryptInit_ex(&m_context, m_cryptoAlgorithm, 0, 0, 0); -- EVP_CIPHER_CTX_set_key_length(&m_context, key.size()); -- EVP_DecryptInit_ex(&m_context, 0, 0, -+ EVP_DecryptInit_ex(m_context, m_cryptoAlgorithm, 0, 0, 0); -+ EVP_CIPHER_CTX_set_key_length(m_context, key.size()); -+ EVP_DecryptInit_ex(m_context, 0, 0, - (const unsigned char*)(key.data()), - (const unsigned char*)(iv.data())); - } - -- EVP_CIPHER_CTX_set_padding(&m_context, m_pad); -+ EVP_CIPHER_CTX_set_padding(m_context, m_pad); - } - - Provider::Context *clone() const -@@ -6792,7 +7039,7 @@ public: - - int blockSize() const - { -- return EVP_CIPHER_CTX_block_size(&m_context); -+ return EVP_CIPHER_CTX_block_size(m_context); - } - - bool update(const SecureArray &in, SecureArray *out) -@@ -6805,7 +7052,7 @@ public: - out->resize(in.size()+blockSize()); - int resultLength; - if (Encode == m_direction) { -- if (0 == EVP_EncryptUpdate(&m_context, -+ if (0 == EVP_EncryptUpdate(m_context, - (unsigned char*)out->data(), - &resultLength, - (unsigned char*)in.data(), -@@ -6813,7 +7060,7 @@ public: - return false; - } - } else { -- if (0 == EVP_DecryptUpdate(&m_context, -+ if (0 == EVP_DecryptUpdate(m_context, - (unsigned char*)out->data(), - &resultLength, - (unsigned char*)in.data(), -@@ -6830,13 +7077,13 @@ public: - out->resize(blockSize()); - int resultLength; - if (Encode == m_direction) { -- if (0 == EVP_EncryptFinal_ex(&m_context, -+ if (0 == EVP_EncryptFinal_ex(m_context, - (unsigned char*)out->data(), - &resultLength)) { - return false; - } - } else { -- if (0 == EVP_DecryptFinal_ex(&m_context, -+ if (0 == EVP_DecryptFinal_ex(m_context, - (unsigned char*)out->data(), - &resultLength)) { - return false; -@@ -6871,7 +7118,7 @@ public: - - - protected: -- EVP_CIPHER_CTX m_context; -+ EVP_CIPHER_CTX *m_context; - const EVP_CIPHER *m_cryptoAlgorithm; - Direction m_direction; - int m_pad; -diff --git a/unittest/tls/tlsunittest.cpp b/unittest/tls/tlsunittest.cpp -index fb8fa10..5e88002 100644 ---- a/unittest/tls/tlsunittest.cpp -+++ b/unittest/tls/tlsunittest.cpp -@@ -60,15 +60,16 @@ void TLSUnitTest::testCipherList() - QCA::TLS *tls = new QCA::TLS(QCA::TLS::Stream, 0, "qca-ossl"); - QStringList cipherList = tls->supportedCipherSuites(QCA::TLS::TLS_v1); - QVERIFY( cipherList.contains("TLS_DHE_RSA_WITH_AES_256_CBC_SHA") ); -- QVERIFY( cipherList.contains("TLS_DHE_DSS_WITH_AES_256_CBC_SHA") ); - QVERIFY( cipherList.contains("TLS_RSA_WITH_AES_256_CBC_SHA") ); -- QVERIFY( cipherList.contains("TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA") ); -- QVERIFY( cipherList.contains("TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA") ); -- QVERIFY( cipherList.contains("TLS_RSA_WITH_3DES_EDE_CBC_SHA") ); - QVERIFY( cipherList.contains("TLS_DHE_RSA_WITH_AES_128_CBC_SHA") ); -- QVERIFY( cipherList.contains("TLS_DHE_DSS_WITH_AES_128_CBC_SHA") ); -- QVERIFY( cipherList.contains("TLS_RSA_WITH_AES_128_CBC_SHA") ); -- QVERIFY( cipherList.contains("TLS_RSA_WITH_RC4_128_SHA") ); -+ -+ // openSUSE TW OpenSSL 1.1 does not have this -+ // QVERIFY( cipherList.contains("TLS_DHE_DSS_WITH_AES_256_CBC_SHA") ); -+ // QVERIFY( cipherList.contains("TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA") ); -+ // QVERIFY( cipherList.contains("TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA") ); -+ // QVERIFY( cipherList.contains("TLS_RSA_WITH_3DES_EDE_CBC_SHA") ); -+ // QVERIFY( cipherList.contains("TLS_RSA_WITH_AES_128_CBC_SHA") ); -+ // QVERIFY( cipherList.contains("TLS_DHE_DSS_WITH_AES_128_CBC_SHA") ); - - // Fedora 22 has no TLS_RSA_WITH_RC4_128_MD5 - // QVERIFY( cipherList.contains("TLS_RSA_WITH_RC4_128_MD5") ); -@@ -87,17 +88,17 @@ void TLSUnitTest::testCipherList() - // QVERIFY( cipherList.contains("TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5") ); - // QVERIFY( cipherList.contains("TLS_RSA_EXPORT_WITH_RC4_40_MD5") ); - -- cipherList = tls->supportedCipherSuites(QCA::TLS::SSL_v3); -- QVERIFY( cipherList.contains("SSL_DHE_RSA_WITH_AES_256_CBC_SHA") ); -- QVERIFY( cipherList.contains("SSL_DHE_DSS_WITH_AES_256_CBC_SHA") ); -- QVERIFY( cipherList.contains("SSL_RSA_WITH_AES_256_CBC_SHA") ); -- QVERIFY( cipherList.contains("SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA") ); -- QVERIFY( cipherList.contains("SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA") ); -- QVERIFY( cipherList.contains("SSL_RSA_WITH_3DES_EDE_CBC_SHA") ); -- QVERIFY( cipherList.contains("SSL_DHE_RSA_WITH_AES_128_CBC_SHA") ); -- QVERIFY( cipherList.contains("SSL_DHE_DSS_WITH_AES_128_CBC_SHA") ); -- QVERIFY( cipherList.contains("SSL_RSA_WITH_AES_128_CBC_SHA") ); -- QVERIFY( cipherList.contains("SSL_RSA_WITH_RC4_128_SHA") ); -+ // OpenSSL 1.1 in openSUSE TW has it disabled by default -+ // cipherList = tls->supportedCipherSuites(QCA::TLS::SSL_v3); -+ // QVERIFY( cipherList.contains("SSL_DHE_RSA_WITH_AES_256_CBC_SHA") ); -+ // QVERIFY( cipherList.contains("SSL_DHE_DSS_WITH_AES_256_CBC_SHA") ); -+ // QVERIFY( cipherList.contains("SSL_RSA_WITH_AES_256_CBC_SHA") ); -+ // QVERIFY( cipherList.contains("SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA") ); -+ // QVERIFY( cipherList.contains("SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA") ); -+ // QVERIFY( cipherList.contains("SSL_RSA_WITH_3DES_EDE_CBC_SHA") ); -+ // QVERIFY( cipherList.contains("SSL_DHE_RSA_WITH_AES_128_CBC_SHA") ); -+ // QVERIFY( cipherList.contains("SSL_DHE_DSS_WITH_AES_128_CBC_SHA") ); -+ // QVERIFY( cipherList.contains("SSL_RSA_WITH_AES_128_CBC_SHA") ); - - // Fedora 22 has no SSL_RSA_WITH_RC4_128_MD5 - // QVERIFY( cipherList.contains("SSL_RSA_WITH_RC4_128_MD5") ); diff --git a/deps/qca-qt5/qca-qt5.SlackBuild b/deps/qca-qt5/qca-qt5.SlackBuild index 3519d31..3bbd1e8 100755 --- a/deps/qca-qt5/qca-qt5.SlackBuild +++ b/deps/qca-qt5/qca-qt5.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2015, 2016, 2017, 2018 Eric Hameleers, Eindhoven, NL +# Copyright 2015, 2016, 2017, 2018, 2019, 2020 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,11 +21,12 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=qca-qt5 SRCNAM=qca -VERSION=${VERSION:-2.1.3} -BUILD=${BUILD:-3} -NUMJOBS=${NUMJOBS:-" -j$(nproc) "} +VERSION=${VERSION:-2.3.1} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -38,6 +39,19 @@ if [ -z "$ARCH" ]; then export ARCH fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -52,29 +66,22 @@ elif [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" fi -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-${PKGNAM} - rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1 cd $SRCNAM-$VERSION || exit 1 -# Patch for openssl-1.1 compatibility: -cat $CWD/patches/qca_openssl11.patch | patch -p1 --verbose || exit 1 - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # Note: Slackware already has the qt4 build of this, -# it needs "-DQT4_BUILD=ON" as aditional cmake parameter. +# The qt4 support has been removed as of 2.3.0 . mkdir -p build cd build cmake \ diff --git a/deps/qrencode/.url b/deps/qrencode/.url index 17eab4d..46257ff 100644 --- a/deps/qrencode/.url +++ b/deps/qrencode/.url @@ -1 +1 @@ -http://fukuchi.org/works/qrencode/qrencode-3.4.4.tar.gz +http://fukuchi.org/works/qrencode/qrencode-4.0.2.tar.gz diff --git a/deps/qrencode/qrencode.SlackBuild b/deps/qrencode/qrencode.SlackBuild index acb351f..9f492f8 100755 --- a/deps/qrencode/qrencode.SlackBuild +++ b/deps/qrencode/qrencode.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2017 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2014, 2017 Eric Hameleers, Eindhoven, NL +# Copyright 2014, 2017, 2019 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -24,12 +24,14 @@ # ----------------------------------------------------------------------------- +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=qrencode -VERSION=${VERSION:-3.4.4} +VERSION=${VERSION:-4.0.2} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-" -j4 "} -CWD=$(pwd) +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -37,7 +39,7 @@ PKG=$TMP/package-$PKGNAM MARCH=$( uname -m ) if [ -z "$ARCH" ]; then case "$MARCH" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; armv7hl) export ARCH=$MARCH ;; armv6hl) export ARCH=$MARCH ;; arm*) export ARCH=arm ;; @@ -47,7 +49,7 @@ if [ -z "$ARCH" ]; then fi case "$ARCH" in - i486) SLKCFLAGS="-O2 -march=i486 -mtune=i686" + i?86) SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686" SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; x86_64) SLKCFLAGS="-O2 -fPIC" diff --git a/deps/qt-gstreamer/.url b/deps/qt-gstreamer/.url deleted file mode 100644 index a31a2c5..0000000 --- a/deps/qt-gstreamer/.url +++ /dev/null @@ -1 +0,0 @@ -http://gstreamer.freedesktop.org/src/qt-gstreamer/qt-gstreamer-1.2.0.tar.xz diff --git a/deps/qt-gstreamer/doinst.sh b/deps/qt-gstreamer/doinst.sh deleted file mode 100644 index aab1b9e..0000000 --- a/deps/qt-gstreamer/doinst.sh +++ /dev/null @@ -1,5 +0,0 @@ - -if [ -x /usr/bin/update-mime-database ]; then - /usr/bin/update-mime-database ./usr/share/mime >/dev/null 2>&1 -fi - diff --git a/deps/qt-gstreamer/patches/qt-gstreamer_find_gstconfig.patch b/deps/qt-gstreamer/patches/qt-gstreamer_find_gstconfig.patch deleted file mode 100644 index 7371a93..0000000 --- a/deps/qt-gstreamer/patches/qt-gstreamer_find_gstconfig.patch +++ /dev/null @@ -1,29 +0,0 @@ -Description: apply gstreamer pkg-config definitions - To ensure gstreamer builds correctly, pick up its cflags in FindGstreamer - and apply them to the build as definitions -Author: José Manuel SantamarÃa <panfaust@gmail.com> -Origin: vendor, https://lists.ubuntu.com/archives/kubuntu-devel/2015-August/009819.html -Forwarded: https://lists.ubuntu.com/archives/kubuntu-devel/2015-August/009819.html -Reviewed-by: Harald Sitter <sitter@kde.org> ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/cmake/modules/FindGStreamer.cmake -+++ b/cmake/modules/FindGStreamer.cmake -@@ -36,6 +36,7 @@ if (PKG_CONFIG_FOUND) - exec_program(${PKG_CONFIG_EXECUTABLE} - ARGS --variable pluginsdir gstreamer-${GSTREAMER_ABI_VERSION} - OUTPUT_VARIABLE PKG_GSTREAMER_PLUGIN_DIR) -+ set(GSTREAMER_DEFINITIONS ${PKG_GSTREAMER_CFLAGS}) - endif() - - find_library(GSTREAMER_LIBRARY ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -106,6 +106,7 @@ find_package(GObject) - macro_log_feature(GOBJECT_FOUND "GObject" "Required to build QtGLib" "http://www.gtk.org/" TRUE) - - set(CMAKE_REQUIRED_INCLUDES ${QTGSTREAMER_INCLUDES}) -+add_definitions(${GSTREAMER_DEFINITIONS}) - include(CheckCXXSourceCompiles) - check_cxx_source_compiles(" - #include <QtCore/QtGlobal> diff --git a/deps/qt-gstreamer/qt-gstreamer.SlackBuild b/deps/qt-gstreamer/qt-gstreamer.SlackBuild deleted file mode 100755 index 9fb80a2..0000000 --- a/deps/qt-gstreamer/qt-gstreamer.SlackBuild +++ /dev/null @@ -1,134 +0,0 @@ -#!/bin/sh - -# Copyright 2014, 2015 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2014, 2015, 2016, 2017 Eric Hameleers, Eindhoven, NL -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -PKGNAM=qt-gstreamer -VERSION=${VERSION:-1.2.0} -BUILD=${BUILD:-6} - -NUMJOBS=${NUMJOBS:--j7} - -# Automatically determine the architecture we're building on: -MARCH=$( uname -m ) -if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i586 ;; - armv7hl) export ARCH=$MARCH ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$MARCH ;; - esac -fi - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$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" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION || exit 1 - -# Find the gstreamer header files: -cat $CWD/patches/qt-gstreamer_find_gstconfig.patch \ - | patch -p1 --verbose || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -mkdir -p build -cd build - cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DQT_VERSION=4 \ - .. - make $NUMJOBS || make || exit 1 - make install DESTDIR=$PKG || exit 1 -cd - - -# Conditional build of Qt5 support: -if qtpaths-qt5 --qt-version 1>/dev/null 2>/dev/null ; then - mkdir -p build-qt5 - cd build-qt5 - cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DQT_VERSION=5 \ - .. - make $NUMJOBS || make || exit 1 - make install DESTDIR=$PKG || exit 1 - cd - -fi - -if [ -d $PKG/usr/man ]; then - gzip -9 $PKG/usr/man/man?/* -fi - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - COPYING HACKING NEWS README \ - $PKG/usr/doc/$PKGNAM-$VERSION - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/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 $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/qt-gstreamer/slack-desc b/deps/qt-gstreamer/slack-desc deleted file mode 100644 index 3ae6605..0000000 --- a/deps/qt-gstreamer/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler-----------------------------------------------------| -qt-gstreamer: qt-gstreamer (C++ bindings for gstreamer) -qt-gstreamer: -qt-gstreamer: QtGStreamer provides C++ bindings for GStreamer with a Qt-style API, -qt-gstreamer: plus some helper classes and elements for integrating GStreamer -qt-gstreamer: better in Qt applications. -qt-gstreamer: The goal of this module is to allow easy use of GStreamer for -qt-gstreamer: applications targetting MeeGo Mobile or the KDE desktop. -qt-gstreamer: -qt-gstreamer: Homepage: -qt-gstreamer: http://gstreamer.freedesktop.org/modules/qt-gstreamer.html -qt-gstreamer: diff --git a/deps/qt-gstreamer0/doinst.sh b/deps/qt-gstreamer0/doinst.sh deleted file mode 100644 index aab1b9e..0000000 --- a/deps/qt-gstreamer0/doinst.sh +++ /dev/null @@ -1,5 +0,0 @@ - -if [ -x /usr/bin/update-mime-database ]; then - /usr/bin/update-mime-database ./usr/share/mime >/dev/null 2>&1 -fi - diff --git a/deps/qt-gstreamer0/slack-desc b/deps/qt-gstreamer0/slack-desc deleted file mode 100644 index 16b3300..0000000 --- a/deps/qt-gstreamer0/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler-----------------------------------------------------| -qt-gstreamer0: qt-gstreamer0 (C++ bindings for gstreamer 0.x) -qt-gstreamer0: -qt-gstreamer0: QtGStreamer provides C++ bindings for GStreamer with a Qt-style API, -qt-gstreamer0: plus some helper classes and elements for integrating GStreamer -qt-gstreamer0: better in Qt applications. -qt-gstreamer0: The goal of this module is to allow easy use of GStreamer for -qt-gstreamer0: applications targetting MeeGo Mobile or the KDE desktop. -qt-gstreamer0: -qt-gstreamer0: Homepage: -qt-gstreamer0: http://gstreamer.freedesktop.org/modules/qt-gstreamer.html -qt-gstreamer0: diff --git a/deps/qt5-speech/.deps b/deps/qt5-speech/.deps deleted file mode 100644 index a2505db..0000000 --- a/deps/qt5-speech/.deps +++ /dev/null @@ -1,3 +0,0 @@ -flite -qt5 -speech-dispatcher diff --git a/deps/qt5-speech/.url b/deps/qt5-speech/.url deleted file mode 100644 index a7b90df..0000000 --- a/deps/qt5-speech/.url +++ /dev/null @@ -1 +0,0 @@ -https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtspeech-everywhere-src-5.12.1.tar.xz diff --git a/deps/qt5-speech/qt5-speech.SlackBuild b/deps/qt5-speech/qt5-speech.SlackBuild deleted file mode 100755 index 6f909a6..0000000 --- a/deps/qt5-speech/qt5-speech.SlackBuild +++ /dev/null @@ -1,128 +0,0 @@ -#!/bin/sh - -# Copyright 2019 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2019 Eric Hameleers, Eindhoven, NL -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -cd $(dirname $0) ; CWD=$(pwd) - -PKGNAM=qt5-speech -SRCVER=${SRCVER:-"5.12.1"} -VERSION=$(echo $SRCVER | tr - _) -BUILD=${BUILD:-1} - -NUMJOBS=${NUMJOBS:-" -j$(nproc) "} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - SLKLDFLAGS="" - SLKLDFLAGS="-L/usr/lib64" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -fi - -case "$ARCH" in - arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; - *) TARGET=$ARCH-slackware-linux ;; -esac - -TMP=${TMP:-/tmp} -PKG=$TMP/package-${PKGNAM} - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf qtspeech-everywhere-src-$SRCVER -echo "Extracting qtspeech-everywhere-src-$SRCVER.tar.xz" -tar xf $CWD/qtspeech-everywhere-src-$SRCVER.tar.xz || exit 1 -cd qtspeech-everywhere-src-$SRCVER || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -export CFLAGS="$SLKCFLAGS" -export CXXFLAGS="$SLKCFLAGS -fpermissive" -export OPENSOURCE_CXXFLAGS="$SLKCFLAGS -fpermissive" -export QTDIR="/usr/lib$LIBDIRSUFFIX/qt5" -export LD_LIBRARY_PATH="${QTDIR}/qtbase/lib:${QTDIR}/qttools/lib:${LD_LIBRARY_PATH}" - -mkdir build -cd build - qmake-qt5 .. - make ${NUMJOBS} || make || exit 1 - make install INSTALL_ROOT=$PKG || exit 1 -cd .. - -# Strip binaries the Slackware way: -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -# Fix the path in prl files: -find "$PKG/usr/lib${LIBDIRSUFFIX}" -type f -name '*.prl' \ - -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; - -# Add a documentation directory: -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - LICENSE* \ - $PKG/usr/doc/$PKGNAM-$VERSION -if [ -d $PKG/usr/lib${LIBDIRSUFFIX}/qt5/doc/html ]; then - ( cd $PKG/usr/doc/$PKGNAM-$VERSION - ln -sf /usr/lib${LIBDIRSUFFIX}/qt5/doc/html . - ) -fi - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/qt5-speech/slack-desc b/deps/qt5-speech/slack-desc deleted file mode 100644 index 16cc1d4..0000000 --- a/deps/qt5-speech/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------------------------------------------------------| -qt5-speech: qt5-speech (Qt module text to speech and speech recognition) -qt5-speech: -qt5-speech: QtSpeech is a Qt module to make text to speech and speech -qt5-speech: recognition easy. -qt5-speech: -qt5-speech: -qt5-speech: -qt5-speech: -qt5-speech: -qt5-speech: Homepage: https://www.qt.io/ -qt5-speech: diff --git a/deps/qt5-webkit/.url b/deps/qt5-webkit/.url deleted file mode 100644 index 43978c6..0000000 --- a/deps/qt5-webkit/.url +++ /dev/null @@ -1 +0,0 @@ -https://github.com/annulen/webkit/releases/download/qtwebkit-5.212.0-alpha2/qtwebkit-5.212.0-alpha2.tar.xz diff --git a/deps/qt5-webkit/patches/qt5-webkit.gcc7.patch b/deps/qt5-webkit/patches/qt5-webkit.gcc7.patch deleted file mode 100644 index bddb6fc..0000000 --- a/deps/qt5-webkit/patches/qt5-webkit.gcc7.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -u -r webkitgtk-2.16.5/Source/WTF/wtf/text/StringImpl.h webkitgtk-2.16.5-gcc7/Source/WTF/wtf/text/StringImpl.h ---- webkitgtk-2.16.5/Source/WTF/wtf/text/StringImpl.h 2017-02-20 17:20:15.000000000 +0100 -+++ webkitgtk-2.16.5-gcc7/Source/WTF/wtf/text/StringImpl.h 2017-06-27 13:13:57.801527350 +0200 -@@ -581,29 +581,7 @@ - // FIXME: Does this really belong in StringImpl? - template <typename T> static void copyChars(T* destination, const T* source, unsigned numCharacters) - { -- if (numCharacters == 1) { -- *destination = *source; -- return; -- } -- -- if (numCharacters <= s_copyCharsInlineCutOff) { -- unsigned i = 0; --#if (CPU(X86) || CPU(X86_64)) -- const unsigned charsPerInt = sizeof(uint32_t) / sizeof(T); -- -- if (numCharacters > charsPerInt) { -- unsigned stopCount = numCharacters & ~(charsPerInt - 1); -- -- const uint32_t* srcCharacters = reinterpret_cast<const uint32_t*>(source); -- uint32_t* destCharacters = reinterpret_cast<uint32_t*>(destination); -- for (unsigned j = 0; i < stopCount; i += charsPerInt, ++j) -- destCharacters[j] = srcCharacters[j]; -- } --#endif -- for (; i < numCharacters; ++i) -- destination[i] = source[i]; -- } else -- memcpy(destination, source, numCharacters * sizeof(T)); -+ memcpy(destination, source, numCharacters * sizeof(T)); - } - - ALWAYS_INLINE static void copyChars(UChar* destination, const LChar* source, unsigned numCharacters) diff --git a/deps/qt5-webkit/patches/qt5-webkit.icu59.patch b/deps/qt5-webkit/patches/qt5-webkit.icu59.patch deleted file mode 100644 index 3eb73b2..0000000 --- a/deps/qt5-webkit/patches/qt5-webkit.icu59.patch +++ /dev/null @@ -1,80 +0,0 @@ -Submitted by: DJ Lucas (dj_AT_linuxfromscratch_DOT_org) -Date: 2017-04-29 -Initial Package Version: 5.8.0 -Upstream Status: Unknown -Origin: https://bugreports.qt.io/browse/QTBUG-35971 -Description: Fixes build with icu-59. - -diff -Naurp qtwebkit-opensource-src-5.8.0-orig/Source/JavaScriptCore/API/JSStringRef.h qtwebkit-opensource-src-5.8.0/Source/JavaScriptCore/API/JSStringRef.h ---- qtwebkit-opensource-src-5.8.0-orig/Source/JavaScriptCore/API/JSStringRef.h 2016-12-10 10:32:34.000000000 -0600 -+++ qtwebkit-opensource-src-5.8.0/Source/JavaScriptCore/API/JSStringRef.h 2017-04-29 17:03:35.280465079 -0500 -@@ -32,6 +32,7 @@ - #include <stdbool.h> - #endif - #include <stddef.h> /* for size_t */ -+#include <uchar.h> - - #ifdef __cplusplus - extern "C" { -@@ -43,7 +44,7 @@ extern "C" { - @typedef JSChar - @abstract A Unicode character. - */ -- typedef unsigned short JSChar; -+ typedef char16_t JSChar; - #else - typedef wchar_t JSChar; - #endif -diff -Naurp qtwebkit-opensource-src-5.8.0-orig/Source/WTF/wtf/Compiler.h qtwebkit-opensource-src-5.8.0/Source/WTF/wtf/Compiler.h ---- qtwebkit-opensource-src-5.8.0-orig/Source/WTF/wtf/Compiler.h 2016-12-10 10:32:34.000000000 -0600 -+++ qtwebkit-opensource-src-5.8.0/Source/WTF/wtf/Compiler.h 2017-04-29 17:03:35.280465079 -0500 -@@ -61,6 +61,7 @@ - #define WTF_COMPILER_SUPPORTS_HAS_TRIVIAL_DESTRUCTOR __has_feature(has_trivial_destructor) - #define WTF_COMPILER_SUPPORTS_CXX_STRONG_ENUMS __has_feature(cxx_strong_enums) - #define WTF_COMPILER_SUPPORTS_CXX_REFERENCE_QUALIFIED_FUNCTIONS __has_feature(cxx_reference_qualified_functions) -+#define WTF_COMPILER_SUPPORTS_CXX_NEW_CHAR_TYPES !defined(_LIBCPP_HAS_NO_UNICODE_CHARS) - - #endif - -@@ -142,6 +143,7 @@ - #define WTF_COMPILER_SUPPORTS_CXX_DELETED_FUNCTIONS 1 - #endif - #if GCC_VERSION_AT_LEAST(4, 5, 0) -+#define WTF_COMPILER_SUPPORTS_CXX_NEW_CHAR_TYPES 1 - #define WTF_COMPILER_SUPPORTS_CXX_EXPLICIT_CONVERSIONS 1 - #endif - #if GCC_VERSION_AT_LEAST(4, 6, 0) -diff -Naurp qtwebkit-opensource-src-5.8.0-orig/Source/WTF/wtf/TypeTraits.h qtwebkit-opensource-src-5.8.0/Source/WTF/wtf/TypeTraits.h ---- qtwebkit-opensource-src-5.8.0-orig/Source/WTF/wtf/TypeTraits.h 2016-12-10 10:32:34.000000000 -0600 -+++ qtwebkit-opensource-src-5.8.0/Source/WTF/wtf/TypeTraits.h 2017-04-29 17:03:35.280465079 -0500 -@@ -75,6 +75,10 @@ namespace WTF { - #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED) - template<> struct IsInteger<wchar_t> { static const bool value = true; }; - #endif -+#if COMPILER_SUPPORTS(CXX_NEW_CHAR_TYPES) -+ template<> struct IsInteger<char16_t> { static const bool value = true; }; -+ template<> struct IsInteger<char32_t> { static const bool value = true; }; -+#endif - - template<typename T> struct IsFloatingPoint { static const bool value = false; }; - template<> struct IsFloatingPoint<float> { static const bool value = true; }; -diff -Naurp qtwebkit-opensource-src-5.8.0-orig/Source/WebKit2/Shared/API/c/WKString.h qtwebkit-opensource-src-5.8.0/Source/WebKit2/Shared/API/c/WKString.h ---- qtwebkit-opensource-src-5.8.0-orig/Source/WebKit2/Shared/API/c/WKString.h 2016-12-10 10:32:34.000000000 -0600 -+++ qtwebkit-opensource-src-5.8.0/Source/WebKit2/Shared/API/c/WKString.h 2017-04-29 17:03:35.280465079 -0500 -@@ -31,6 +31,7 @@ - #ifndef __cplusplus - #include <stdbool.h> - #endif -+#include <uchar.h> - - #ifdef __cplusplus - extern "C" { -@@ -38,7 +39,7 @@ extern "C" { - - #if !defined(WIN32) && !defined(_WIN32) \ - && !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */ -- typedef unsigned short WKChar; -+ typedef char16_t WKChar; - #else - typedef wchar_t WKChar; - #endif diff --git a/deps/qt5-webkit/patches/qt5-webkit.pthread.patch b/deps/qt5-webkit/patches/qt5-webkit.pthread.patch deleted file mode 100644 index 53d5439..0000000 --- a/deps/qt5-webkit/patches/qt5-webkit.pthread.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5f359baacdf92fabcece83f0a2b30f74c7c02a3c Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> -Date: Mon, 22 Feb 2016 10:57:32 +0100 -Subject: [PATCH] Fix linking with libpthread - -WebKit use libpthread directly but is depending on other qt modules -causing it to be linked against, which might break unless -lpthread -is last. Instead just add it explicitly after the static libraries. - -Change-Id: I2b95cff2c96373f8dce6f95052c4fccbe1982b33 -Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> -(cherry picked from commit 5dd4bb67cfce812fd7686e43616e2069f354a7df) -Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> ---- - Tools/qmake/mkspecs/features/default_post.prf | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf -index 67276b7..39bb3f7 100644 ---- a/Tools/qmake/mkspecs/features/default_post.prf -+++ b/Tools/qmake/mkspecs/features/default_post.prf -@@ -201,6 +201,7 @@ needToLink() { - linkAgainstLibrary($$library, $$eval(WEBKIT.$${library_identifier}.root_source_dir)) - LIBS += $$eval(WEBKIT.$${library_identifier}.dependent_libs) - } -+ posix:!darwin: LIBS += -lpthread - } - - creating_module { --- -2.7.1 - diff --git a/deps/qt5-webkit/qt5-webkit.SlackBuild b/deps/qt5-webkit/qt5-webkit.SlackBuild deleted file mode 100755 index b352f5c..0000000 --- a/deps/qt5-webkit/qt5-webkit.SlackBuild +++ /dev/null @@ -1,143 +0,0 @@ -#!/bin/sh - -# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# Derived from the qt5.SlackBuild - -# Modifications for qt5-webkit 5.6.0, 5.6.1, 5.7.0, 5.7.1, 5.9.0, 5.9.1, 5.212 2016, 2017, 2018, 2019 by Eric Hameleers, Eindhoven, NL - -PKGNAM=qt5-webkit -SRCVER=${SRCVER:-"5.212.0-alpha2"} -VERSION=$(echo $SRCVER | tr - _) -BUILD=${BUILD:-3} - -NUMJOBS=${NUMJOBS:-"-j$(nproc)"} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - SLKLDFLAGS="" - SLKLDFLAGS="-L/usr/lib64" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -fi - -case "$ARCH" in - arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; - *) TARGET=$ARCH-slackware-linux ;; -esac - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-${PKGNAM} - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf qtwebkit-$SRCVER -echo "Extracting qtwebkit-$SRCVER.tar.xz" -tar xf $CWD/qtwebkit-$SRCVER.tar.xz || exit 1 -cd qtwebkit-$SRCVER || exit 1 - -# Prevent crashes when compiled with gcc7: -cat $CWD/patches/qt5-webkit.gcc7.patch | patch -p1 --verbose || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Use -reduce-relocations only on i?86 and x86_64 architextures. -# https://bugreports.qt-project.org/browse/QTBUG-36129 -if echo $ARCH | grep -q '\(i.86\|x86_64\)' 2>/dev/null; then - RELOCATIONS="-reduce-relocations" -else - RELOCATIONS="" -fi - -export CFLAGS="$SLKCFLAGS" -export CXXFLAGS="$SLKCFLAGS -fpermissive" -export OPENSOURCE_CXXFLAGS="$SLKCFLAGS -fpermissive" -export QTDIR="/usr/lib$LIBDIRSUFFIX/qt5" -export LD_LIBRARY_PATH="${QTDIR}/qtbase/lib:${QTDIR}/qttools/lib:${LD_LIBRARY_PATH}" - -mkdir build -cd build - cmake .. \ - -DPORT=Qt \ - -DQt5_DIR=$QTDIR \ - -DCMAKE_BUILD_TYPE=Release - make ${NUMJOBS} || make || exit 1 - make install DESTDIR=$PKG || exit 1 -cd .. - -# Strip binaries the Slackware way: -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -# Fix the path in prl files: -find "$PKG/usr/lib${LIBDIRSUFFIX}" -type f -name '*.prl' \ - -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; - -# Add a documentation directory: -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - ChangeLog* VERSION \ - $PKG/usr/doc/$PKGNAM-$VERSION -if [ -d $PKG/usr/lib${LIBDIRSUFFIX}/qt5/doc/html ]; then - ( cd $PKG/usr/doc/$PKGNAM-$VERSION - ln -sf /usr/lib${LIBDIRSUFFIX}/qt5/doc/html . - ) -fi - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/qt5-webkit/slack-desc b/deps/qt5-webkit/slack-desc deleted file mode 100644 index baba7e8..0000000 --- a/deps/qt5-webkit/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------------------------------------------------------| -qt5-webkit: qt5-webkit (Qt based web browser engine) -qt5-webkit: -qt5-webkit: Qtwebkit is a Qt based web browser engine. -qt5-webkit: This package contains the Qt5 based version. -qt5-webkit: -qt5-webkit: Homepage: http://qt-project.org -qt5-webkit: -qt5-webkit: -qt5-webkit: -qt5-webkit: -qt5-webkit: diff --git a/deps/qt5/.deps b/deps/qt5/.deps deleted file mode 100644 index d1eaacd..0000000 --- a/deps/qt5/.deps +++ /dev/null @@ -1,2 +0,0 @@ -OpenAL -libxkbcommon diff --git a/deps/qt5/.url b/deps/qt5/.url deleted file mode 100644 index 91a8b0c..0000000 --- a/deps/qt5/.url +++ /dev/null @@ -1 +0,0 @@ -https://download.qt.io/official_releases/qt/5.12/5.12.1/single/qt-everywhere-src-5.12.1.tar.xz diff --git a/deps/qt5/doinst.sh b/deps/qt5/doinst.sh deleted file mode 100644 index 3e5691a..0000000 --- a/deps/qt5/doinst.sh +++ /dev/null @@ -1,9 +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 [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 - fi -fi diff --git a/deps/qt5/patches/platformplugin-install-path-fix.patch b/deps/qt5/patches/platformplugin-install-path-fix.patch deleted file mode 100644 index db9b33b..0000000 --- a/deps/qt5/patches/platformplugin-install-path-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -See https://bugs.webkit.org/show_bug.cgi?id=117077 - -diff -Naur qt-everywhere-opensource-src-5.0.2.orig/qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro qt-everywhere-opensource-src-5.0.2/qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro ---- qt-everywhere-opensource-src-5.0.2.orig/qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro 2013-04-09 00:11:38.000000000 +0000 -+++ qt-everywhere-opensource-src-5.0.2/qtwebkit/Source/WebKit/qt/examples/platformplugin/platformplugin.pro 2013-05-31 01:18:29.157175082 +0000 -@@ -20,7 +20,8 @@ - } - } - --DESTDIR = $$[QT_INSTALL_PLUGINS]/webkit -+target.path = $$[QT_INSTALL_PLUGINS]/webkit -+INSTALLS += target - - SOURCES += \ - WebPlugin.cpp \ diff --git a/deps/qt5/patches/qt5.alsa.patch b/deps/qt5/patches/qt5.alsa.patch deleted file mode 100644 index 892431b..0000000 --- a/deps/qt5/patches/qt5.alsa.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qt-everywhere-opensource-src-5.6.0/qtbase/config.tests/unix/alsa/alsatest.cpp.orig 2016-02-29 08:15:48.203031809 +0000 -+++ qt-everywhere-opensource-src-5.6.0/qtbase/config.tests/unix/alsa/alsatest.cpp 2016-02-29 08:16:39.712811962 +0000 -@@ -32,7 +32,7 @@ - ****************************************************************************/ - - #include <alsa/asoundlib.h> --#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10)) -+#if(!(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 10))) - #error "Alsa version found too old, require >= 1.0.10" - #endif - diff --git a/deps/qt5/patches/qt5.cr206850.patch b/deps/qt5/patches/qt5.cr206850.patch deleted file mode 100644 index 1fb71df..0000000 --- a/deps/qt5/patches/qt5.cr206850.patch +++ /dev/null @@ -1,43 +0,0 @@ -The latest MariaDB versions aren't caught properly by the checks in Qt, which -may cause a regression to appear (regression, because it was already fixed in -Qt by Dan Vratil): this manifests itself in Akonadi losing its connection to -the database if running for long periods of time. - -Until this is fixed in Qt, you may want to apply this patch in your packages: - -https://codereview.qt-project.org/#/c/206850/ - -From 64588c9bae92ef79f9ca5e87653ffb0962691d0d Mon Sep 17 00:00:00 2001 -From: Andy Shaw <andy.shaw@qt.io> -Date: Wed, 27 Sep 2017 09:23:10 +0200 -Subject: [PATCH] Extend the MariaDB define check to cover the later versions too - -Change-Id: Ide89b4e07feb116bf152cbf3f5630d313e8ba0f1 ---- - src/plugins/sqldrivers/mysql/qsql_mysql.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp -index 6e428fb..b2d3e85 100644 ---- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp -+++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp -@@ -1159,14 +1159,14 @@ static void qLibraryInit() - # endif // MYSQL_VERSION_ID - #endif // Q_NO_MYSQL_EMBEDDED - --#ifdef MARIADB_BASE_VERSION -+#if defined(MARIADB_BASE_VERSION) || defined(MARIADB_VERSION_ID) - qAddPostRoutine(mysql_server_end); - #endif - } - - static void qLibraryEnd() - { --#if !defined(MARIADB_BASE_VERSION) -+#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID) - # if !defined(Q_NO_MYSQL_EMBEDDED) - # if MYSQL_VERSION_ID > 40000 - # if (MYSQL_VERSION_ID >= 40110 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50003 --- -2.7.4 - diff --git a/deps/qt5/patches/qt5.delayed_highlight.patch b/deps/qt5/patches/qt5.delayed_highlight.patch deleted file mode 100644 index 201179b..0000000 --- a/deps/qt5/patches/qt5.delayed_highlight.patch +++ /dev/null @@ -1,72 +0,0 @@ -From f8f0f3eef1151c9377a5c76ccfa6432e930e1307 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= <marten.nordheim@qt.io> -Date: Mon, 14 Jan 2019 10:37:42 +0100 -Subject: QSyntaxHighlighter: cancel delayed highlight if done manually -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It was an implicit effect before which stopped working after -dec7961709c90f6977d2447f7fa6c6625af41cb2. Reintroduce it as some -projects used this side-effect as a way to abort the initial -highlighting. - -Change-Id: I5340ee9882a242bc8b5f7f843f1cfe793a65d357 -Reviewed-by: J?drzej Nowacki <jedrzej.nowacki@qt.io> ---- - src/gui/text/qsyntaxhighlighter.cpp | 1 + - .../qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp | 19 +++++++++++++++++++ - 2 files changed, 20 insertions(+) - -diff --git a/src/gui/text/qsyntaxhighlighter.cpp b/src/gui/text/qsyntaxhighlighter.cpp -index b09f8b565a..0e07b69868 100644 ---- a/src/gui/text/qsyntaxhighlighter.cpp -+++ b/src/gui/text/qsyntaxhighlighter.cpp -@@ -376,6 +376,7 @@ void QSyntaxHighlighter::rehighlight() - - QTextCursor cursor(d->doc); - d->rehighlight(cursor, QTextCursor::End); -+ d->rehighlightPending = false; // user manually did a full rehighlight - } - - /*! -diff --git a/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp b/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp -index 9d6ce78b24..c683ecd424 100644 ---- a/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp -+++ b/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp -@@ -82,6 +82,7 @@ private slots: - void preservePreeditArea(); - void task108530(); - void avoidUnnecessaryRehighlight(); -+ void avoidUnnecessaryDelayedRehighlight(); - void noContentsChangedDuringHighlight(); - void rehighlight(); - void rehighlightBlock(); -@@ -478,6 +479,24 @@ void tst_QSyntaxHighlighter::avoidUnnecessaryRehighlight() - QTRY_VERIFY(!hl->highlighted); - } - -+void tst_QSyntaxHighlighter::avoidUnnecessaryDelayedRehighlight() -+{ -+ // Having text in the document before creating the highlighter starts the delayed rehighlight -+ cursor.insertText("Hello World"); -+ -+ TestHighlighter *hl = new TestHighlighter(doc); -+ QVERIFY(!hl->highlighted); -+ -+ hl->rehighlight(); -+ QVERIFY(hl->highlighted); -+ -+ hl->highlighted = false; -+ // Process events, including delayed rehighlight emission -+ QCoreApplication::processEvents(); -+ // Should be cancelled and no extra rehighlight should be done -+ QVERIFY(!hl->highlighted); -+} -+ - void tst_QSyntaxHighlighter::noContentsChangedDuringHighlight() - { - QVector<QTextLayout::FormatRange> formats; --- -cgit v1.2.1 - diff --git a/deps/qt5/patches/qt5.glibc224.patch b/deps/qt5/patches/qt5.glibc224.patch deleted file mode 100644 index 773781a..0000000 --- a/deps/qt5/patches/qt5.glibc224.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b12ffcd411d4776f7120ccecb3be34344d930d2b Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> -Date: Tue, 9 Aug 2016 16:21:29 +0200 -Subject: Do not depend on Linux 4.5 - -Avoid using MADV_FREE that was only recently added to Linux. It will fail when -run on older Linux kernels. - -Change-Id: I9b0369fb31402f088b2327c12f70dd39f5e4c8c0 -Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> ---- - chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp -index 121b687..be7c3b9 100644 ---- a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp -+++ b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/PageAllocator.cpp -@@ -39,6 +39,11 @@ - - #include <sys/mman.h> - -+#if OS(LINUX) && defined(MADV_FREE) -+// Added in Linux 4.5, but we don't want to depend on 4.5 at runtime -+#undef MADV_FREE -+#endif -+ - #ifndef MADV_FREE - #define MADV_FREE MADV_DONTNEED - #endif --- -cgit v1.0-4-g1e03 - diff --git a/deps/qt5/patches/qt5.mysql.h.diff b/deps/qt5/patches/qt5.mysql.h.diff deleted file mode 100644 index f1cf11b..0000000 --- a/deps/qt5/patches/qt5.mysql.h.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- qt-everywhere-opensource-src-5.9.0/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql_p.h.orig 2017-05-26 14:43:31.000000000 +0200 -+++ qt-everywhere-opensource-src-5.9.0/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql_p.h 2017-06-17 22:11:34.211899826 +0200 -@@ -57,7 +57,7 @@ - #include <QtCore/qt_windows.h> - #endif - --#include <mysql.h> -+#include <mysql/mysql.h> - - #ifdef QT_PLUGIN - #define Q_EXPORT_SQLDRIVER_MYSQL diff --git a/deps/qt5/patches/qt5.private-includes.patch b/deps/qt5/patches/qt5.private-includes.patch deleted file mode 100644 index 3ef8ebe..0000000 --- a/deps/qt5/patches/qt5.private-includes.patch +++ /dev/null @@ -1,53 +0,0 @@ -# Taken from http://code.qt.io/cgit/qt/qtbase.git/patch/?id=67aa365d -# ------------------------------------------------------------------ - -From 67aa365d41ebfe082b4efcfd725e4d5f08be678c Mon Sep 17 00:00:00 2001 -From: Ulf Hermann <ulf.hermann@qt.io> -Date: Wed, 25 Apr 2018 12:48:21 +0200 -Subject: Do emit CMake declarations for existing private headers - -We need to make sure we don't emit CMake declarations for private -headers if those headers are absent. However, most of the time we have -private headers and should add them. - -Task-number: QTBUG-37417 -Change-Id: I639eb93d008de27928dedac540894af70c1883b9 -Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> ---- - mkspecs/features/create_cmake.prf | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 66acedef55..2ed708e085 100644 ---- a/mkspecs/features/create_cmake.prf -+++ b/mkspecs/features/create_cmake.prf -@@ -28,9 +28,13 @@ CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake - - CMAKE_MODULE_NAME = $$cmakeModuleName($${MODULE}) - -+!generated_privates { -+ isEmpty(SYNCQT.INJECTED_PRIVATE_HEADER_FILES):isEmpty(SYNCQT.PRIVATE_HEADER_FILES): \ -+ CMAKE_NO_PRIVATE_INCLUDES = true -+} -+ - split_incpath { - CMAKE_ADD_SOURCE_INCLUDE_DIRS = true -- CMAKE_NO_PRIVATE_INCLUDES = true # Don't add private includes in the build dir which don't exist - CMAKE_SOURCE_INCLUDES = \ - $$cmakeTargetPaths($$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/Qt$${CMAKE_MODULE_NAME}) - CMAKE_SOURCE_PRIVATE_INCLUDES = \ -@@ -53,10 +57,6 @@ contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*") { - CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True - } - --isEmpty(QT.$${MODULE}_private.includes)| \ -- !exists($$first(QT.$${MODULE}_private.includes)): \ -- CMAKE_NO_PRIVATE_INCLUDES = true -- - CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX]) - contains(CMAKE_LIB_DIR,"^\\.\\./.*") { - CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/ --- -cgit v1.1-6-g87c4 - - diff --git a/deps/qt5/patches/qt5.pulseaudio.diff b/deps/qt5/patches/qt5.pulseaudio.diff deleted file mode 100644 index 8d8f616..0000000 --- a/deps/qt5/patches/qt5.pulseaudio.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- qt-everywhere-opensource-src-5.4.0/qtwebengine/src/3rdparty/chromium/media/media.gyp.orig 2014-12-05 17:26:44.000000000 +0100 -+++ qt-everywhere-opensource-src-5.4.0/qtwebengine/src/3rdparty/chromium/media/media.gyp 2014-12-12 10:27:20.393735405 +0100 -@@ -29,7 +29,7 @@ - ['use_cras==1', { - 'use_pulseaudio%': 0, - }, { -- 'use_pulseaudio%': 1, -+ 'use_pulseaudio%': 0, - }], - ], - }, { - diff --git a/deps/qt5/patches/qt5.qlockfile-deadlock.patch b/deps/qt5/patches/qt5.qlockfile-deadlock.patch deleted file mode 100644 index e51d5ad..0000000 --- a/deps/qt5/patches/qt5.qlockfile-deadlock.patch +++ /dev/null @@ -1,116 +0,0 @@ -# Taken from: -# https://projects.archlinux.org/svntogit/packages.git/plain/trunk/qlockfile-deadlock.patch?h=packages/qt5 -# QTBUG-44771 -# ---------------------------------------------------------------------------- -From f58e882b7594c59b6050d3c87562fcf836d10f60 Mon Sep 17 00:00:00 2001 -From: Olivier Goffart <ogoffart@woboq.com> -Date: Tue, 14 Apr 2015 10:58:26 +0200 -Subject: QLockFile: fix deadlock when the lock file is corrupted - -[ChangeLog][QtCore][QLockFile] Fixed a deadlock when the lock file -is corrupted. - -Task-number: QTBUG-44771 -Change-Id: Ic490b09d70ff1cc1733b64949889a73720b2d0f3 -Reviewed-by: David Faure <david.faure@kdab.com> ---- - src/corelib/io/qlockfile_unix.cpp | 10 +++++----- - src/corelib/io/qlockfile_win.cpp | 22 +++++++++++----------- - tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp | 17 +++++++++++++++++ - 3 files changed, 33 insertions(+), 16 deletions(-) - -diff --git a/qtbase/src/corelib/io/qlockfile_unix.cpp b/qtbase/src/corelib/io/qlockfile_unix.cpp -index bf1015a..dc9f8f7 100644 ---- a/qtbase/src/corelib/io/qlockfile_unix.cpp -+++ b/qtbase/src/corelib/io/qlockfile_unix.cpp -@@ -181,11 +181,11 @@ bool QLockFilePrivate::isApparentlyStale() const - { - qint64 pid; - QString hostname, appname; -- if (!getLockInfo(&pid, &hostname, &appname)) -- return false; -- if (hostname.isEmpty() || hostname == QString::fromLocal8Bit(localHostName())) { -- if (::kill(pid, 0) == -1 && errno == ESRCH) -- return true; // PID doesn't exist anymore -+ if (getLockInfo(&pid, &hostname, &appname)) { -+ if (hostname.isEmpty() || hostname == QString::fromLocal8Bit(localHostName())) { -+ if (::kill(pid, 0) == -1 && errno == ESRCH) -+ return true; // PID doesn't exist anymore -+ } - } - const qint64 age = QFileInfo(fileName).lastModified().msecsTo(QDateTime::currentDateTime()); - return staleLockTime > 0 && age > staleLockTime; -diff --git a/qtbase/src/corelib/io/qlockfile_win.cpp b/qtbase/src/corelib/io/qlockfile_win.cpp -index f9f2909..3587c7b 100644 ---- a/qtbase/src/corelib/io/qlockfile_win.cpp -+++ b/qtbase/src/corelib/io/qlockfile_win.cpp -@@ -115,21 +115,21 @@ bool QLockFilePrivate::isApparentlyStale() const - { - qint64 pid; - QString hostname, appname; -- if (!getLockInfo(&pid, &hostname, &appname)) -- return false; - - // On WinRT there seems to be no way of obtaining information about other - // processes due to sandboxing - #ifndef Q_OS_WINRT -- if (hostname == QString::fromLocal8Bit(localHostName())) { -- HANDLE procHandle = ::OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid); -- if (!procHandle) -- return true; -- // We got a handle but check if process is still alive -- DWORD dwR = ::WaitForSingleObject(procHandle, 0); -- ::CloseHandle(procHandle); -- if (dwR == WAIT_TIMEOUT) -- return true; -+ if (getLockInfo(&pid, &hostname, &appname)) { -+ if (hostname == QString::fromLocal8Bit(localHostName())) { -+ HANDLE procHandle = ::OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid); -+ if (!procHandle) -+ return true; -+ // We got a handle but check if process is still alive -+ DWORD dwR = ::WaitForSingleObject(procHandle, 0); -+ ::CloseHandle(procHandle); -+ if (dwR == WAIT_TIMEOUT) -+ return true; -+ } - } - #endif // !Q_OS_WINRT - const qint64 age = QFileInfo(fileName).lastModified().msecsTo(QDateTime::currentDateTime()); -diff --git a/qtbase/tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp b/qtbase/tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp -index 77bef94..12bea67 100644 ---- a/qtbase/tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp -+++ b/qtbase/tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp -@@ -58,6 +58,7 @@ private slots: - void staleLongLockFromBusyProcess(); - void staleLockRace(); - void noPermissions(); -+ void corruptedLockFile(); - - public: - QString m_helperApp; -@@ -415,5 +416,21 @@ void tst_QLockFile::noPermissions() - QCOMPARE(int(lockFile.error()), int(QLockFile::PermissionError)); - } - -+void tst_QLockFile::corruptedLockFile() -+{ -+ const QString fileName = dir.path() + "/corruptedLockFile"; -+ -+ { -+ // Create a empty file. Typically the result of a computer crash or hard disk full. -+ QFile file(fileName); -+ QVERIFY(file.open(QFile::WriteOnly)); -+ } -+ -+ QLockFile secondLock(fileName); -+ secondLock.setStaleLockTime(100); -+ QVERIFY(secondLock.tryLock(10000)); -+ QCOMPARE(int(secondLock.error()), int(QLockFile::NoError)); -+} -+ - QTEST_MAIN(tst_QLockFile) - #include "tst_qlockfile.moc" --- -cgit v0.11.0 - diff --git a/deps/qt5/patches/qt5.qtbug-49061.patch b/deps/qt5/patches/qt5.qtbug-49061.patch deleted file mode 100644 index d006edb..0000000 --- a/deps/qt5/patches/qt5.qtbug-49061.patch +++ /dev/null @@ -1,80 +0,0 @@ -# -# https://github.com/qt/qtbase/commit/494376f9.patch -# -From 494376f980e96339b6f1eff7c41336ca4d853065 Mon Sep 17 00:00:00 2001 -From: Thiago Macieira <thiago.macieira@intel.com> -Date: Thu, 12 Nov 2015 10:14:51 -0800 -Subject: [PATCH] Stop unloading plugins in QPluginLoader and QFactoryLoader - -QPluginLoader hasn't unloaded in its destructor since Qt 5.0, but we -missed the equivalent code in QFactoryLoader (which bypasses -QPluginLoader). Besides, QPluginLoader::unload() was still doing -unloading, which it won't anymore. - -Not unloading plugins is Qt's policy, as decided during the 5.0 -development process and reaffirmed now in 5.6. This is due to static -data in plugins leaking out and remaining in use past the unloading of -the plugin, causing crashes. - -This does not affect QLibrary and QLibrary::unload(). Those are meant -for non-Qt loadable modules, so unloading them may be safe. - -Task-number: QTBUG-49061 -Discussed-on: http://lists.qt-project.org/pipermail/development/2015-November/023681.html -Change-Id: I461e9fc7199748faa187ffff1416070f138df8db -Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> -Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> ---- - src/corelib/plugin/qfactoryloader.cpp | 6 ++++-- - src/corelib/plugin/qpluginloader.cpp | 5 +++-- - 2 files changed, 7 insertions(+), 4 deletions(-) - -diff --git a/src/corelib/plugin/qfactoryloader.cpp b/src/corelib/plugin/qfactoryloader.cpp -index 53b38c3..c820d53 100644 ---- a/src/corelib/plugin/qfactoryloader.cpp -+++ b/src/corelib/plugin/qfactoryloader.cpp -@@ -203,10 +203,12 @@ void QFactoryLoader::update() - ++keyUsageCount; - } - } -- if (keyUsageCount || keys.isEmpty()) -+ if (keyUsageCount || keys.isEmpty()) { -+ library->setLoadHints(QLibrary::PreventUnloadHint); // once loaded, don't unload - d->libraryList += library; -- else -+ } else { - library->release(); -+ } - } - } - #else -diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp -index 62067c7..4752f69 100644 ---- a/src/corelib/plugin/qpluginloader.cpp -+++ b/src/corelib/plugin/qpluginloader.cpp -@@ -154,6 +154,7 @@ QPluginLoader::QPluginLoader(const QString &fileName, QObject *parent) - : QObject(parent), d(0), did_load(false) - { - setFileName(fileName); -+ setLoadHints(QLibrary::PreventUnloadHint); - } - - /*! -@@ -348,7 +349,7 @@ static QString locatePlugin(const QString& fileName) - void QPluginLoader::setFileName(const QString &fileName) - { - #if defined(QT_SHARED) -- QLibrary::LoadHints lh; -+ QLibrary::LoadHints lh = QLibrary::PreventUnloadHint; - if (d) { - lh = d->loadHints(); - d->release(); -@@ -394,7 +395,7 @@ QString QPluginLoader::errorString() const - \brief Give the load() function some hints on how it should behave. - - You can give hints on how the symbols in the plugin are -- resolved. By default, none of the hints are set. -+ resolved. By default since Qt 5.7, QLibrary::PreventUnloadHint is set. - - See the documentation of QLibrary::loadHints for a complete - description of how this property works. diff --git a/deps/qt5/patches/qt5.qtbug-49452.patch b/deps/qt5/patches/qt5.qtbug-49452.patch deleted file mode 100644 index 4549ff1..0000000 --- a/deps/qt5/patches/qt5.qtbug-49452.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 6f423555eba55ccdf7287071e10576bc1b687fd2 Mon Sep 17 00:00:00 2001 -From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> -Date: Mon, 1 Aug 2016 13:39:53 +0200 -Subject: [PATCH] REG: Fix unwanted cache flush in Freetype engine - -The Freetype cache was almost completely disabled by -134c6db8587a8ce156d4fa31ffa62605821851b2 because after that -change, the lockedAlphaMapForGlyph() function would no longer -cut off early for empty glyphs like spaces, but rather go -through all alpha map functions before it realized that there -was nothing to render. This would in turn invalidate the cache -for every empty glyph, causing all glyphs to be rerendered for -every isolated word. - -This change adds back a cut off. This is only needed in the -lockedAlphaMapForGlyph() function, since the superclass implementation -of the other alpha map functions already contains a cut off for -width/height == 0. - -[ChangeLog][Qt Gui][Text] Fixed a performance regression in Freetype -engine that was introduced in Qt 5.5. - -Change-Id: I381285939909e99cc5fb5f3497fecf9fa871f29a -Task-number: QTBUG-49452 -Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> ---- - src/gui/text/qfontengine_ft.cpp | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp -index 4de41df..7c878da 100644 ---- a/src/gui/text/qfontengine_ft.cpp -+++ b/src/gui/text/qfontengine_ft.cpp -@@ -1716,7 +1716,7 @@ glyph_metrics_t QFontEngineFT::alphaMapBoundingBox(glyph_t glyph, QFixed subPixe - - static inline QImage alphaMapFromGlyphData(QFontEngineFT::Glyph *glyph, QFontEngine::GlyphFormat glyphFormat) - { -- if (glyph == Q_NULLPTR) -+ if (glyph == Q_NULLPTR || glyph->height == 0 || glyph->width == 0) - return QImage(); - - QImage::Format format = QImage::Format_Invalid; -@@ -1764,11 +1764,15 @@ QImage *QFontEngineFT::lockedAlphaMapForGlyph(glyph_t glyphIndex, QFixed subPixe - - currentlyLockedAlphaMap = alphaMapFromGlyphData(glyph, neededFormat); - -+ const bool glyphHasGeometry = glyph != Q_NULLPTR && glyph->height != 0 && glyph->width != 0; - if (!cacheEnabled && glyph != &emptyGlyph) { - currentlyLockedAlphaMap = currentlyLockedAlphaMap.copy(); - delete glyph; - } - -+ if (!glyphHasGeometry) -+ return Q_NULLPTR; -+ - if (currentlyLockedAlphaMap.isNull()) - return QFontEngine::lockedAlphaMapForGlyph(glyphIndex, subPixelPosition, neededFormat, t, offset); - diff --git a/deps/qt5/patches/qt5.qtbug-51621.patch b/deps/qt5/patches/qt5.qtbug-51621.patch deleted file mode 100644 index 187a3d7..0000000 --- a/deps/qt5/patches/qt5.qtbug-51621.patch +++ /dev/null @@ -1,39 +0,0 @@ -build with explicitlib after all - -unlike speculated in 2fe363514, this is not a workaround at all: it -causes that libraries' public link interfaces (LIBS) are exported in the -first place. unlike with staticlib, this does not export LIBS_PRIVATE, -so it wouldn't even be a particularly effective workaround for rpath -brokenness anyway. - -the problem was pretty well hidden by the qt module system, which at the -level of libraries is pretty redundant with the .prl file handling, -which shows just how stupid the whole "design" is. - -unlike before, we now enable explicitlib for all libraries, not just qt -modules - we enable create_prl for all of them as well, after all. - -an immediate effect of this change is that it fixes linking on RaspPI: -the qtcore headers make the user code require linking libatomic, so we -must add it to our public link interface. - -Task-number: QTBUG-51621 -Change-Id: I5742c88694db8e8a9b79d17222dc6df2b38e5ab2 - -X-Git-Url: https://codereview.qt-project.org/gitweb?p=qt%2Fqtbase.git;a=blobdiff_plain;f=mkspecs%2Ffeatures%2Fqt_build_config.prf;h=b3081b960ec192c3421d7a1c2bd5a628f0ca8455;hp=518fd93f0457c6060721c38ad8b6a0286407e562;hb=268e7ee9778de79d2485bdd028721ec7adbc1324;hpb=495e8c205424253186bef47421de63534d23dd59 - -diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf -index 518fd93..b3081b9 100644 ---- a/mkspecs/features/qt_build_config.prf -+++ b/mkspecs/features/qt_build_config.prf -@@ -72,6 +72,10 @@ CONFIG += \ - # However, testcases should be still built with exceptions. - exceptions_off testcase_exceptions - -+# Under Windows, this is neither necessary (transitive deps are automatically -+# resolved), nor functional (.res files end up in .prl files and break things). -+unix: CONFIG += explicitlib -+ - - defineTest(qtBuildPart) { - bp = $$eval($$upper($$section(_QMAKE_CONF_, /, -2, -2))_BUILD_PARTS) diff --git a/deps/qt5/patches/qt5.qtbug-51648.patch b/deps/qt5/patches/qt5.qtbug-51648.patch deleted file mode 100644 index 279839b..0000000 --- a/deps/qt5/patches/qt5.qtbug-51648.patch +++ /dev/null @@ -1,88 +0,0 @@ -From b024fbe83863fc57364a52c717d5b43d654bdb5d Mon Sep 17 00:00:00 2001 -From: Weng Xuetian <wengxt@gmail.com> -Date: Sat, 5 Mar 2016 12:23:21 -0800 -Subject: [PATCH] QtDBus: clean up signal hooks and object tree in - closeConnection - -If a QObject is added or passed as receiver to QDBusConnection::connect() -and it is managed by Q_GLOBAL_STATIC or similar mechanism, it is -possible that when that its destructor is called after the dbus daemon -thread ends. In that case, QObject::destroyed connected via -Qt::BlockingQueuedConnection to QDBusConnectionPrivate will cause dead -lock since the thread is no longer processing events. - -Task-number: QTBUG-51648 -Change-Id: I1a1810a6d6d0234af0269d5f3fc1f54101bf1547 ---- - src/dbus/qdbusconnection_p.h | 1 + - src/dbus/qdbusintegrator.cpp | 28 +++++++++++++++++++++++++++- - 2 files changed, 28 insertions(+), 1 deletion(-) - -diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h -index c77daf7..565eb83 100644 ---- a/src/dbus/qdbusconnection_p.h -+++ b/src/dbus/qdbusconnection_p.h -@@ -254,6 +254,7 @@ private: - const QVector<int> &metaTypes, int slotIdx); - - SignalHookHash::Iterator removeSignalHookNoLock(SignalHookHash::Iterator it); -+ void disconnectObjectTree(ObjectTreeNode &node); - - bool isServiceRegisteredByThread(const QString &serviceName); - -diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp -index cd44861..a3cd47b 100644 ---- a/src/dbus/qdbusintegrator.cpp -+++ b/src/dbus/qdbusintegrator.cpp -@@ -1030,7 +1030,6 @@ QDBusConnectionPrivate::~QDBusConnectionPrivate() - qPrintable(name)); - - closeConnection(); -- rootNode.children.clear(); // free resources - qDeleteAll(cachedMetaObjects); - - if (mode == ClientMode || mode == PeerMode) { -@@ -1052,6 +1051,20 @@ QDBusConnectionPrivate::~QDBusConnectionPrivate() - } - } - -+void QDBusConnectionPrivate::disconnectObjectTree(QDBusConnectionPrivate::ObjectTreeNode &haystack) -+{ -+ QDBusConnectionPrivate::ObjectTreeNode::DataList::Iterator it = haystack.children.begin(); -+ -+ while (it != haystack.children.end()) { -+ disconnectObjectTree(*it); -+ it++; -+ } -+ -+ if (haystack.obj) { -+ haystack.obj->disconnect(this); -+ } -+} -+ - void QDBusConnectionPrivate::closeConnection() - { - QDBusWriteLocker locker(CloseConnectionAction, this); -@@ -1075,6 +1088,19 @@ void QDBusConnectionPrivate::closeConnection() - } - - qDeleteAll(pendingCalls); -+ -+ // clean up all signal hook and object tree, to avoid QObject::destroyed -+ // being activated to dbus daemon thread which already quits. -+ // dbus connection is already closed, so there is nothing we could do be clean -+ // up everything here. -+ SignalHookHash::iterator sit = signalHooks.begin(); -+ while (sit != signalHooks.end()) { -+ sit.value().obj->disconnect(this); -+ sit++; -+ } -+ -+ disconnectObjectTree(rootNode); -+ rootNode.children.clear(); // free resources - } - - void QDBusConnectionPrivate::checkThread() --- -2.7.1 - diff --git a/deps/qt5/patches/qt5.qtbug-51649.patch b/deps/qt5/patches/qt5.qtbug-51649.patch deleted file mode 100644 index 3b7cf9e..0000000 --- a/deps/qt5/patches/qt5.qtbug-51649.patch +++ /dev/null @@ -1,159 +0,0 @@ -From acde2e69df5dedc624674107596f276125e22864 Mon Sep 17 00:00:00 2001 -From: Weng Xuetian <wengxt@gmail.com> -Date: Thu, 3 Mar 2016 21:56:53 -0800 -Subject: [PATCH] QtDBus: finish all pending call with error if disconnected - -libdbus will send a local signal if connection gets disconnected. When -this happens, end all pending calls with QDBusError::Disconnected. - -Task-number: QTBUG-51649 -Change-Id: I5c7d2a468bb5da746d0c0e53e458c1e376f186a9 ---- - src/dbus/dbus_minimal_p.h | 2 ++ - src/dbus/qdbusintegrator.cpp | 26 +++++++++++++++++----- - src/dbus/qdbusutil_p.h | 6 +++++ - .../dbus/qdbusconnection/tst_qdbusconnection.cpp | 22 ++++++++++++++++++ - .../dbus/qdbusconnection/tst_qdbusconnection.h | 1 + - 5 files changed, 51 insertions(+), 6 deletions(-) - -diff --git a/src/dbus/dbus_minimal_p.h b/src/dbus/dbus_minimal_p.h -index f0a2954..8f25b24 100644 ---- a/src/dbus/dbus_minimal_p.h -+++ b/src/dbus/dbus_minimal_p.h -@@ -99,9 +99,11 @@ typedef dbus_uint32_t dbus_bool_t; - /* dbus-shared.h */ - #define DBUS_SERVICE_DBUS "org.freedesktop.DBus" - #define DBUS_PATH_DBUS "/org/freedesktop/DBus" -+#define DBUS_PATH_LOCAL "/org/freedesktop/DBus/Local" - #define DBUS_INTERFACE_DBUS "org.freedesktop.DBus" - #define DBUS_INTERFACE_INTROSPECTABLE "org.freedesktop.DBus.Introspectable" - #define DBUS_INTERFACE_PROPERTIES "org.freedesktop.DBus.Properties" -+#define DBUS_INTERFACE_LOCAL "org.freedesktop.DBus.Local" - - #define DBUS_NAME_FLAG_ALLOW_REPLACEMENT 0x1 /**< Allow another service to become the primary owner if requested */ - #define DBUS_NAME_FLAG_REPLACE_EXISTING 0x2 /**< Request to replace the current primary owner */ -diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp -index cd44861..320419f 100644 ---- a/src/dbus/qdbusintegrator.cpp -+++ b/src/dbus/qdbusintegrator.cpp -@@ -519,6 +519,14 @@ bool QDBusConnectionPrivate::handleMessage(const QDBusMessage &amsg) - switch (amsg.type()) { - case QDBusMessage::SignalMessage: - handleSignal(amsg); -+ // Check local disconnected signal from libdbus -+ if (amsg.interface() == QDBusUtil::dbusInterfaceLocal() -+ && amsg.path() == QDBusUtil::dbusPathLocal() -+ && amsg.member() == QDBusUtil::disconnected() -+ && !QDBusMessagePrivate::isLocal(amsg)) { -+ while (!pendingCalls.isEmpty()) -+ processFinishedCall(pendingCalls.first()); -+ } - // if there are any other filters in this DBusConnection, - // let them see the signal too - return false; -@@ -1767,10 +1775,16 @@ void QDBusConnectionPrivate::processFinishedCall(QDBusPendingCallPrivate *call) - - QDBusMessage &msg = call->replyMessage; - if (call->pending) { -- // decode the message -- DBusMessage *reply = q_dbus_pending_call_steal_reply(call->pending); -- msg = QDBusMessagePrivate::fromDBusMessage(reply, connection->capabilities); -- q_dbus_message_unref(reply); -+ // when processFinishedCall is called and pending call is not completed, -+ // it means we received disconnected signal from libdbus -+ if (q_dbus_pending_call_get_completed(call->pending)) { -+ // decode the message -+ DBusMessage *reply = q_dbus_pending_call_steal_reply(call->pending); -+ msg = QDBusMessagePrivate::fromDBusMessage(reply, connection->capabilities); -+ q_dbus_message_unref(reply); -+ } else { -+ msg = QDBusMessage::createError(QDBusError::Disconnected, QDBusUtil::disconnectedErrorMessage()); -+ } - } - qDBusDebug() << connection << "got message reply:" << msg; - -@@ -2070,8 +2084,8 @@ void QDBusConnectionPrivate::sendInternal(QDBusPendingCallPrivate *pcall, void * - pcall->pending = pending; - q_dbus_pending_call_set_notify(pending, qDBusResultReceived, pcall, 0); - -- // DBus won't notify us when a peer disconnects so we need to track these ourselves -- if (mode == QDBusConnectionPrivate::PeerMode) -+ // DBus won't notify us when a peer disconnects or server terminates so we need to track these ourselves -+ if (mode == QDBusConnectionPrivate::PeerMode || mode == QDBusConnectionPrivate::ClientMode) - pendingCalls.append(pcall); - - return; -diff --git a/src/dbus/qdbusutil_p.h b/src/dbus/qdbusutil_p.h -index 8f5ae92..ca70ff9 100644 ---- a/src/dbus/qdbusutil_p.h -+++ b/src/dbus/qdbusutil_p.h -@@ -155,6 +155,8 @@ namespace QDBusUtil - { return QStringLiteral(DBUS_SERVICE_DBUS); } - inline QString dbusPath() - { return QStringLiteral(DBUS_PATH_DBUS); } -+ inline QString dbusPathLocal() -+ { return QStringLiteral(DBUS_PATH_LOCAL); } - inline QString dbusInterface() - { - // it's the same string, but just be sure -@@ -165,8 +167,12 @@ namespace QDBusUtil - { return QStringLiteral(DBUS_INTERFACE_PROPERTIES); } - inline QString dbusInterfaceIntrospectable() - { return QStringLiteral(DBUS_INTERFACE_INTROSPECTABLE); } -+ inline QString dbusInterfaceLocal() -+ { return QStringLiteral(DBUS_INTERFACE_LOCAL); } - inline QString nameOwnerChanged() - { return QStringLiteral("NameOwnerChanged"); } -+ inline QString disconnected() -+ { return QStringLiteral("Disconnected"); } - inline QString disconnectedErrorMessage() - { return QStringLiteral("Not connected to D-Bus server"); } - } -diff --git a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp -index e91f87d..6c7e6b1 100644 ---- a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp -+++ b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp -@@ -1218,6 +1218,28 @@ void tst_QDBusConnection::callVirtualObjectLocal() - QCOMPARE(obj.replyArguments, subPathReply.arguments()); - } - -+void tst_QDBusConnection::pendingCallWhenDisconnected() -+{ -+ QDBusServer *server = new QDBusServer; -+ QDBusConnection con = QDBusConnection::connectToPeer(server->address(), "disconnect"); -+ QTestEventLoop::instance().enterLoop(2); -+ QVERIFY(!QTestEventLoop::instance().timeout()); -+ QVERIFY(con.isConnected()); -+ -+ delete server; -+ -+ // Make sure we call the method before we know it is disconnected. -+ QVERIFY(con.isConnected()); -+ QDBusMessage message = QDBusMessage::createMethodCall("", "/", QString(), "method"); -+ QDBusPendingCall reply = con.asyncCall(message); -+ -+ QTestEventLoop::instance().enterLoop(2); -+ QVERIFY(!con.isConnected()); -+ QVERIFY(reply.isFinished()); -+ QVERIFY(reply.isError()); -+ QVERIFY(reply.error().type() == QDBusError::Disconnected); -+} -+ - QString MyObject::path; - QString MyObjectWithoutInterface::path; - QString MyObjectWithoutInterface::interface; -diff --git a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h -index a53ba32..720e484 100644 ---- a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h -+++ b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h -@@ -121,6 +121,7 @@ private slots: - void registerVirtualObject(); - void callVirtualObject(); - void callVirtualObjectLocal(); -+ void pendingCallWhenDisconnected(); - - public: - QString serviceName() const { return "org.qtproject.Qt.Autotests.QDBusConnection"; } --- -2.7.1 - diff --git a/deps/qt5/patches/qt5.qtbug-51676.patch b/deps/qt5/patches/qt5.qtbug-51676.patch deleted file mode 100644 index 8672a21..0000000 --- a/deps/qt5/patches/qt5.qtbug-51676.patch +++ /dev/null @@ -1,126 +0,0 @@ -From 11c5e716b08b6b3c5a7c9fce96b0cde8624ec869 Mon Sep 17 00:00:00 2001 -From: Thiago Macieira <thiago.macieira@intel.com> -Date: Tue, 15 Mar 2016 11:00:20 -0700 -Subject: [PATCH] Fix QtDBus deadlock inside kded/kiod - -Whenever a message spy was installed, we failed to actually process -looped-back messages by queueing them for processing by the spy. That -had as a consequence that the caller got an error reply. Worse, since -the message had been queued, QtDBus would attempt to deliver it later. -Since that message had isLocal==true, bad things happened inside the -manager thread. - -The correct solution is not to queue the message for the filter. If the -message is local, then simply deliver directly, as we're still in the -user's thread. This used to be the behavior in Qt 5.5. - -Task-number: QTBUG-51676 -Change-Id: I1dc112894cde7121e8ce302ae51b438ade1ff612 ---- - src/dbus/qdbusintegrator.cpp | 42 ++++++++++++++++++++++++++++++++---------- - src/dbus/qdbusintegrator_p.h | 1 + - 2 files changed, 33 insertions(+), 10 deletions(-) - -diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp -index cd44861..478a2c4 100644 ---- a/src/dbus/qdbusintegrator.cpp -+++ b/src/dbus/qdbusintegrator.cpp -@@ -481,6 +481,11 @@ QDBusSpyCallEvent::~QDBusSpyCallEvent() - - void QDBusSpyCallEvent::placeMetaCall(QObject *) - { -+ invokeSpyHooks(msg, hooks, hookCount); -+} -+ -+inline void QDBusSpyCallEvent::invokeSpyHooks(const QDBusMessage &msg, const Hook *hooks, int hookCount) -+{ - // call the spy hook list - for (int i = 0; i < hookCount; ++i) - hooks[i](msg); -@@ -509,7 +514,12 @@ bool QDBusConnectionPrivate::handleMessage(const QDBusMessage &amsg) - { - if (!ref.load()) - return false; -- if (!dispatchEnabled && !QDBusMessagePrivate::isLocal(amsg)) { -+ -+ // local message are always delivered, regardless of filtering -+ // or whether the dispatcher is enabled -+ bool isLocal = QDBusMessagePrivate::isLocal(amsg); -+ -+ if (!dispatchEnabled && !isLocal) { - // queue messages only, we'll handle them later - qDBusDebug() << this << "delivery is suspended"; - pendingMessages << amsg; -@@ -523,13 +533,23 @@ bool QDBusConnectionPrivate::handleMessage(const QDBusMessage &amsg) - // let them see the signal too - return false; - case QDBusMessage::MethodCallMessage: -- // run it through the spy filters (if any) before the regular processing -+ // run it through the spy filters (if any) before the regular processing: -+ // a) if it's a local message, we're in the caller's thread, so invoke the filter directly -+ // b) if it's an external message, post to the main thread - if (Q_UNLIKELY(qDBusSpyHookList.exists()) && qApp) { - const QDBusSpyHookList &list = *qDBusSpyHookList; -- qDBusDebug() << this << "invoking message spies"; -- QCoreApplication::postEvent(qApp, new QDBusSpyCallEvent(this, QDBusConnection(this), -- amsg, list.constData(), list.size())); -- return true; -+ if (isLocal) { -+ Q_ASSERT(QThread::currentThread() != thread()); -+ qDBusDebug() << this << "invoking message spies directly"; -+ QDBusSpyCallEvent::invokeSpyHooks(amsg, list.constData(), list.size()); -+ } else { -+ qDBusDebug() << this << "invoking message spies via event"; -+ QCoreApplication::postEvent(qApp, new QDBusSpyCallEvent(this, QDBusConnection(this), -+ amsg, list.constData(), list.size())); -+ -+ // we'll be called back, so return -+ return true; -+ } - } - - handleObjectCall(amsg); -@@ -1451,9 +1471,9 @@ void QDBusConnectionPrivate::handleObjectCall(const QDBusMessage &msg) - // that means the dispatchLock mutex is locked - // must not call out to user code in that case - // -- // however, if the message is internal, handleMessage was called -- // directly and no lock is in place. We can therefore call out to -- // user code, if necessary -+ // however, if the message is internal, handleMessage was called directly -+ // (user's thread) and no lock is in place. We can therefore call out to -+ // user code, if necessary. - ObjectTreeNode result; - int usedLength; - QThread *objThread = 0; -@@ -1492,12 +1512,14 @@ void QDBusConnectionPrivate::handleObjectCall(const QDBusMessage &msg) - usedLength, msg)); - return; - } else if (objThread != QThread::currentThread()) { -- // synchronize with other thread -+ // looped-back message, targeting another thread: -+ // synchronize with it - postEventToThread(HandleObjectCallPostEventAction, result.obj, - new QDBusActivateObjectEvent(QDBusConnection(this), this, result, - usedLength, msg, &sem)); - semWait = true; - } else { -+ // looped-back message, targeting current thread - semWait = false; - } - } // release the lock -diff --git a/src/dbus/qdbusintegrator_p.h b/src/dbus/qdbusintegrator_p.h -index 2bbebdf..c0d9c22 100644 ---- a/src/dbus/qdbusintegrator_p.h -+++ b/src/dbus/qdbusintegrator_p.h -@@ -145,6 +145,7 @@ public: - {} - ~QDBusSpyCallEvent(); - void placeMetaCall(QObject *) Q_DECL_OVERRIDE; -+ static inline void invokeSpyHooks(const QDBusMessage &msg, const Hook *hooks, int hookCount); - - QDBusConnection conn; // keeps the refcount in QDBusConnectionPrivate up - QDBusMessage msg; --- -2.7.1 - diff --git a/deps/qt5/patches/qt5.qtbug-51890.patch b/deps/qt5/patches/qt5.qtbug-51890.patch deleted file mode 100644 index 51168b9..0000000 --- a/deps/qt5/patches/qt5.qtbug-51890.patch +++ /dev/null @@ -1,82 +0,0 @@ -QTBUG-51890: qtwebengine fails to build with system nss 3.23 -Patch obtained from: -https://github.com/qtproject/qtwebengine/commit/82900c7b96b2a6fb42fe3841df7685b820edd588.patch - -And modified to exclude the "Subproject commit" lines. - -# ---------------------------------------------------------------------------- - -From 82900c7b96b2a6fb42fe3841df7685b820edd588 Mon Sep 17 00:00:00 2001 -From: Kai Koehne <kai.koehne@theqtcompany.com> -Date: Thu, 24 Mar 2016 13:55:28 +0100 -Subject: [PATCH] Use system NSS only for certificate handling - -Compiling against NSS 3.23 fails with current Chromium. Also, with NSS -3.21 there are failures connecting to e.g. google.com. - -Fix this by adapting the setup endorsed by upstream Chromium: BoringSSL -is always used for cryptography, and NSS only for certificate handlng. - -Patches included in 3rdparty update: - -0a385bb [backport] Call EnsureNSSHttpIOInit in the chimera build. -0472123 Fix build against newer NSS -90c62c4 <third_party/libpng> [Backport] update to libpng 1.2.56 -34857b8 <third_party/libpng> [Backport] Stop large iCCP chunks causing delays and "Aw Snap!" - -Task-number: QTBUG-52193 -Task-number: QTBUG-51890 -Task-number: QTBUG-52068 -Change-Id: If8aaed9b9a09475c5ed0dfec64d31f45ce9670f5 -Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> ---- - src/3rdparty | 2 +- - src/core/config/linux.pri | 9 ++++++--- - tools/qmake/mkspecs/features/configure.prf | 4 ++-- - 3 files changed, 9 insertions(+), 6 deletions(-) - -#diff --git a/src/3rdparty b/src/3rdparty -#index 3b2b78c..0a385bb 160000 -#--- a/src/3rdparty -#+++ b/src/3rdparty -#@@ -1 +1 @@ -#-Subproject commit 3b2b78caa761db2b7b25dc51c3dae8316f595db1 -#+Subproject commit 0a385bb01d9cf060fae4c9d350ee98561654df96 -diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri -index 88c1a41..39eeb2a 100644 ---- a/src/core/config/linux.pri -+++ b/src/core/config/linux.pri -@@ -18,11 +18,14 @@ GYP_CONFIG += \ - use_gio=0 \ - use_gnome_keyring=0 \ - use_kerberos=0 \ -- use_pango=0 -+ use_pango=0 \ -+ use_openssl=1 - --!use?(nss) { -+use?(nss) { -+ GYP_CONFIG += use_nss_certs=1 \ -+ use_openssl_certs=0 -+} else { - GYP_CONFIG += use_nss_certs=0 \ -- use_openssl=1 \ - use_openssl_certs=1 - } - -diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf -index 4cb4600..953572d 100644 ---- a/tools/qmake/mkspecs/features/configure.prf -+++ b/tools/qmake/mkspecs/features/configure.prf -@@ -72,9 +72,9 @@ defineTest(runConfigure) { - defineTest(finalizeConfigure) { - linux { - use?(nss) { -- log("SSL............................... Using system NSS$${EOL}") -+ log("Certificate handling.............. Using system NSS$${EOL}") - } else { -- log("SSL............................... Using bundled BoringSSL$${EOL}") -+ log("Certificate handling.............. Using bundled BoringSSL$${EOL}") - } - use?(system_icu) { - packagesExist("icu-uc icu-i18n") { diff --git a/deps/qt5/patches/qt5.qtbug-51927.patch b/deps/qt5/patches/qt5.qtbug-51927.patch deleted file mode 100644 index d253dc1..0000000 --- a/deps/qt5/patches/qt5.qtbug-51927.patch +++ /dev/null @@ -1,185 +0,0 @@ -From 5149aa68eca6ede8836ec4f07a14d22d9da9b161 Mon Sep 17 00:00:00 2001 -From: Mitch Curtis <mitch.curtis@qt.io> -Date: Tue, 13 Sep 2016 12:42:12 +0200 -Subject: Fix crash on exit when using default property aliases with layouts - -The layout was being destroyed before the text, which meant that the -removeItemChangeListener() call never got hit. To ensure that the -listener is always removed, loop through each child in QQuickLayout's -destructor. - -This is a manual cherry-pick of -59c6c0e0b1b5b46747595a58e11311b7393d7e70. - -Task-number: QTBUG-51927 -Change-Id: I669f42beb8c3dd6b4b741cae0b16e017bb3409df -Reviewed-by: J-P Nurmi <jpnurmi@qt.io> ---- - src/imports/layouts/qquicklayout.cpp | 4 ++ - .../qquicklayouts/data/rowlayout/Container.qml | 55 ++++++++++++++++++++++ - .../qquicklayouts/data/rowlayout/ContainerUser.qml | 53 +++++++++++++++++++++ - .../quick/qquicklayouts/data/tst_rowlayout.qml | 12 +++++ - 4 files changed, 124 insertions(+) - create mode 100644 tests/auto/quick/qquicklayouts/data/rowlayout/Container.qml - create mode 100644 tests/auto/quick/qquicklayouts/data/rowlayout/ContainerUser.qml - -diff --git a/src/imports/layouts/qquicklayout.cpp b/src/imports/layouts/qquicklayout.cpp -index abc8f97..9914826 100644 ---- a/src/imports/layouts/qquicklayout.cpp -+++ b/src/imports/layouts/qquicklayout.cpp -@@ -698,6 +698,10 @@ QQuickLayout::QQuickLayout(QQuickLayoutPrivate &dd, QQuickItem *parent) - QQuickLayout::~QQuickLayout() - { - d_func()->m_isReady = false; -+ -+ const auto childItems = d_func()->childItems; -+ for (QQuickItem *child : childItems) -+ QQuickItemPrivate::get(child)->removeItemChangeListener(this, QQuickItemPrivate::SiblingOrder); - } - - QQuickLayoutAttached *QQuickLayout::qmlAttachedProperties(QObject *object) -diff --git a/tests/auto/quick/qquicklayouts/data/rowlayout/Container.qml b/tests/auto/quick/qquicklayouts/data/rowlayout/Container.qml -new file mode 100644 -index 0000000..22205c1 ---- /dev/null -+++ b/tests/auto/quick/qquicklayouts/data/rowlayout/Container.qml -@@ -0,0 +1,55 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2016 The Qt Company Ltd. -+** Contact: http://www.qt.io/licensing/ -+** -+** This file is part of the test suite of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:BSD$ -+** You may use this file under the terms of the BSD license as follows: -+** -+** "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. -+** * Redistributions in binary form must reproduce the above copyright -+** notice, this list of conditions and the following disclaimer in -+** the documentation and/or other materials provided with the -+** distribution. -+** * Neither the name of The Qt Company Ltd nor the names of its -+** contributors may be used to endorse or promote products derived -+** from this software without specific prior written permission. -+** -+** -+** 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." -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+import QtQuick 2.7 -+import QtQuick.Layouts 1.3 -+ -+Item { -+ objectName: "qtbug51927-window" -+ visible: true -+ -+ default property alias _contents: customContent.data -+ -+ RowLayout { -+ id: customContent -+ objectName: "qtbug51927-columnLayout" -+ anchors.fill: parent -+ } -+} -diff --git a/tests/auto/quick/qquicklayouts/data/rowlayout/ContainerUser.qml b/tests/auto/quick/qquicklayouts/data/rowlayout/ContainerUser.qml -new file mode 100644 -index 0000000..ff7ce62 ---- /dev/null -+++ b/tests/auto/quick/qquicklayouts/data/rowlayout/ContainerUser.qml -@@ -0,0 +1,53 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2016 The Qt Company Ltd. -+** Contact: http://www.qt.io/licensing/ -+** -+** This file is part of the test suite of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:BSD$ -+** You may use this file under the terms of the BSD license as follows: -+** -+** "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. -+** * Redistributions in binary form must reproduce the above copyright -+** notice, this list of conditions and the following disclaimer in -+** the documentation and/or other materials provided with the -+** distribution. -+** * Neither the name of The Qt Company Ltd nor the names of its -+** contributors may be used to endorse or promote products derived -+** from this software without specific prior written permission. -+** -+** -+** 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." -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+import QtQuick 2.6 -+import QtQuick.Window 2.2 -+ -+Container { -+ visible: true -+ -+ Text { -+ objectName: "qtbug51927-text" -+ text: qsTr("Hello World") -+ anchors.centerIn: parent -+ renderType: Text.QtRendering -+ } -+} -diff --git a/tests/auto/quick/qquicklayouts/data/tst_rowlayout.qml b/tests/auto/quick/qquicklayouts/data/tst_rowlayout.qml -index 33b8fd0..2d4e227 100644 ---- a/tests/auto/quick/qquicklayouts/data/tst_rowlayout.qml -+++ b/tests/auto/quick/qquicklayouts/data/tst_rowlayout.qml -@@ -926,5 +926,17 @@ Item { - waitForRendering(layout) - layout.destroy() - } -+ -+ -+ function test_defaultPropertyAliasCrash() { -+ var containerUserComponent = Qt.createComponent("rowlayout/ContainerUser.qml"); -+ compare(containerUserComponent.status, Component.Ready); -+ -+ var containerUser = containerUserComponent.createObject(testCase); -+ verify(containerUser); -+ -+ // Shouldn't crash. -+ containerUser.destroy(); -+ } - } - } --- -cgit v1.0-4-g1e03 - diff --git a/deps/qt5/patches/qt5.qtbug-53237.patch b/deps/qt5/patches/qt5.qtbug-53237.patch deleted file mode 100644 index c6d5739..0000000 --- a/deps/qt5/patches/qt5.qtbug-53237.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 8e889378115c69508b050a511621ac8e30ec4158 Mon Sep 17 00:00:00 2001 -From: Jesus Fernandez <jesus.fernandez@theqtcompany.com> -Date: Mon, 13 Jun 2016 19:09:15 +0200 -Subject: [PATCH] Fix UNSIGNED values in QMYSQL - -The unsigned flag in columns was ignored when creating the list of -bound values in a mysql table. So the result iteration with -QSqlQuery::next stops after the first wrong truncated value. - -[ChangeLog][QtSql] Fixed QSqlQuery::prepare value truncation error when -using UNSIGNED values in a MySQL database. - -Task-number: QTBUG-53969 -Task-number: QTBUG-53237 -Change-Id: I10d977993445f2794f1dd8c88b2e83517ef524f3 -Reviewed-by: Milian Wolff <milian.wolff@kdab.com> ---- - src/sql/drivers/mysql/qsql_mysql.cpp | 1 + - tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp | 39 +++++++++++++++++++++++ - 2 files changed, 40 insertions(+) - -diff --git a/src/sql/drivers/mysql/qsql_mysql.cpp b/src/sql/drivers/mysql/qsql_mysql.cpp -index 96bdcc4..55bf499 100644 ---- a/src/sql/drivers/mysql/qsql_mysql.cpp -+++ b/src/sql/drivers/mysql/qsql_mysql.cpp -@@ -387,6 +387,7 @@ bool QMYSQLResultPrivate::bindInValues() - bind->buffer_length = f.bufLength = fieldInfo->length + 1; - bind->is_null = &f.nullIndicator; - bind->length = &f.bufLength; -+ bind->is_unsigned = fieldInfo->flags & UNSIGNED_FLAG ? 1 : 0; - f.outField=field; - - ++i; -diff --git a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp -index bd553d5..f1c4333 100644 ---- a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp -+++ b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp -@@ -233,6 +233,9 @@ private slots: - void QTBUG_36211_data() { generic_data("QPSQL"); } - void QTBUG_36211(); - -+ void QTBUG_53969_data() { generic_data("QMYSQL"); } -+ void QTBUG_53969(); -+ - void sqlite_constraint_data() { generic_data("QSQLITE"); } - void sqlite_constraint(); - -@@ -3652,6 +3655,42 @@ void tst_QSqlQuery::QTBUG_36211() - } - } - -+void tst_QSqlQuery::QTBUG_53969() -+{ -+ QFETCH( QString, dbName ); -+ QVector<int> values = QVector<int>() << 10 << 20 << 127 << 128 << 1, tableValues; -+ QSqlDatabase db = QSqlDatabase::database( dbName ); -+ CHECK_DATABASE( db ); -+ tableValues.reserve(values.size()); -+ if (tst_Databases::getDatabaseType(db) == QSqlDriver::MySqlServer) { -+ const QString tableName(qTableName("bug53969", __FILE__, db)); -+ tst_Databases::safeDropTable( db, tableName ); -+ -+ QSqlQuery q(db); -+ QVERIFY_SQL(q, exec(QString("CREATE TABLE %1 (id INT AUTO_INCREMENT PRIMARY KEY, " -+ "test_number TINYINT(3) UNSIGNED)") -+ .arg(tableName))); -+ -+ QVERIFY_SQL(q, prepare("INSERT INTO " + tableName + " (test_number) VALUES (:value)")); -+ -+ QVector<int>::iterator begin = values.begin(), end = values.end(), it; -+ for (it = begin; it != end; ++it) { -+ q.bindValue(":value", *it); -+ QVERIFY_SQL(q, exec()); -+ } -+ -+ QVERIFY_SQL(q, prepare("SELECT test_number FROM " + tableName)); -+ QVERIFY_SQL(q, exec()); -+ -+ while (q.next()) { -+ bool ok; -+ tableValues.push_back(q.value(0).toUInt(&ok)); -+ QVERIFY(ok); -+ } -+ QCOMPARE(values, tableValues); -+ } -+} -+ - void tst_QSqlQuery::oraOCINumber() - { - QFETCH( QString, dbName ); diff --git a/deps/qt5/patches/qt5.qtbug-55583.patch b/deps/qt5/patches/qt5.qtbug-55583.patch deleted file mode 100644 index 804f538..0000000 --- a/deps/qt5/patches/qt5.qtbug-55583.patch +++ /dev/null @@ -1,41 +0,0 @@ -# -# https://github.com/qt/qtbase/commit/84ea00d4.patch -# -From 84ea00d47049d882f2fabf1446ec6c6eb5fe3038 Mon Sep 17 00:00:00 2001 -From: J-P Nurmi <jpnurmi@qt.io> -Date: Tue, 6 Dec 2016 16:30:31 +0100 -Subject: [PATCH] QGtk3Dialog: don't crash on Wayland - -Check if it's an X11 window before calling XSetTransientForHint(). -No transient parent will be set for GTK+ dialogs on Wayland. That -has to be implemented separately. - -Task-number: QTBUG-55583 -Change-Id: Iabc2a72681c8157bb2f2fe500892853aa397106b -Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> -Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> ---- - src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp b/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp -index ba5089a..699b058 100644 ---- a/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp -+++ b/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp -@@ -135,10 +135,12 @@ bool QGtk3Dialog::show(Qt::WindowFlags flags, Qt::WindowModality modality, QWind - - GdkWindow *gdkWindow = gtk_widget_get_window(gtkWidget); - if (parent) { -- GdkDisplay *gdkDisplay = gdk_window_get_display(gdkWindow); -- XSetTransientForHint(gdk_x11_display_get_xdisplay(gdkDisplay), -- gdk_x11_window_get_xid(gdkWindow), -- parent->winId()); -+ if (GDK_IS_X11_WINDOW(gdkWindow)) { -+ GdkDisplay *gdkDisplay = gdk_window_get_display(gdkWindow); -+ XSetTransientForHint(gdk_x11_display_get_xdisplay(gdkDisplay), -+ gdk_x11_window_get_xid(gdkWindow), -+ parent->winId()); -+ } - } - - if (modality != Qt::NonModal) { diff --git a/deps/qt5/patches/qt5.qtbug-60558.patch b/deps/qt5/patches/qt5.qtbug-60558.patch deleted file mode 100644 index 2d03920..0000000 --- a/deps/qt5/patches/qt5.qtbug-60558.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://github.com/qt/qtbase/commit/f45c6c18.patch - -From f45c6c180463ccb6620e1d273a264f14a1204a93 Mon Sep 17 00:00:00 2001 -From: Thiago Macieira <thiago.macieira@intel.com> -Date: Wed, 3 May 2017 14:08:50 -0700 -Subject: [PATCH] QInternal::unregisterCallback: don't crash on unregistering - during exit - -Task-number: QTBUG-60558 -Change-Id: Ica9894dc9b5e48278fd4fffd14bb34c6d98d2555 -Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> ---- - src/corelib/global/qglobal.cpp | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp -index c37503f3db..22fc20d47e 100644 ---- a/src/corelib/global/qglobal.cpp -+++ b/src/corelib/global/qglobal.cpp -@@ -3988,8 +3988,10 @@ bool QInternal::registerCallback(Callback cb, qInternalCallback callback) - bool QInternal::unregisterCallback(Callback cb, qInternalCallback callback) - { - if (cb >= 0 && cb < QInternal::LastCallback) { -- QInternal_CallBackTable *cbt = global_callback_table(); -- return (bool) cbt->callbacks[cb].removeAll(callback); -+ if (global_callback_table.exists()) { -+ QInternal_CallBackTable *cbt = global_callback_table(); -+ return (bool) cbt->callbacks[cb].removeAll(callback); -+ } - } - return false; - } diff --git a/deps/qt5/patches/qt5.qtbug-61140.patch b/deps/qt5/patches/qt5.qtbug-61140.patch deleted file mode 100644 index 17468a9..0000000 --- a/deps/qt5/patches/qt5.qtbug-61140.patch +++ /dev/null @@ -1,101 +0,0 @@ -https://github.com/qt/qtbase/commit/744fd39e.patch - -From 744fd39e66b0b44e65a2505d674fa1cda8b205a4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io> -Date: Fri, 2 Jun 2017 11:09:55 +0200 -Subject: [PATCH] xcb: Don't destroy foreign windows - -We can't rely on virtual dispatch in the destructor. - -Task-number: QTBUG-61140 -Change-Id: Ib1026caf126095778c24254775cb5a0bfecf3a38 -Reviewed-by: Fabian Vogt -Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io> ---- - src/plugins/platforms/xcb/qxcbintegration.cpp | 18 +----------------- - src/plugins/platforms/xcb/qxcbwindow.cpp | 16 ++++++++++------ - src/plugins/platforms/xcb/qxcbwindow.h | 12 ++++++++++++ - 3 files changed, 23 insertions(+), 23 deletions(-) - -diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp -index b414bee204..8e3ee20329 100644 ---- a/src/plugins/platforms/xcb/qxcbintegration.cpp -+++ b/src/plugins/platforms/xcb/qxcbintegration.cpp -@@ -214,25 +214,9 @@ QPlatformWindow *QXcbIntegration::createPlatformWindow(QWindow *window) const - return xcbWindow; - } - --class QXcbForeignWindow : public QXcbWindow --{ --public: -- QXcbForeignWindow(QWindow *window, WId nativeHandle) -- : QXcbWindow(window) { m_window = nativeHandle; } -- ~QXcbForeignWindow() {} -- bool isForeignWindow() const override { return true; } -- --protected: -- // No-ops -- void create() override {} -- void destroy() override {} --}; -- - QPlatformWindow *QXcbIntegration::createForeignWindow(QWindow *window, WId nativeHandle) const - { -- QXcbWindow *xcbWindow = new QXcbForeignWindow(window, nativeHandle); -- xcbWindow->create(); -- return xcbWindow; -+ return new QXcbForeignWindow(window, nativeHandle); - } - - #ifndef QT_NO_OPENGL -diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp -index 289d0720e7..d6c69d52ef 100644 ---- a/src/plugins/platforms/xcb/qxcbwindow.cpp -+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp -@@ -597,13 +597,17 @@ QXcbWindow::~QXcbWindow() - } - - destroy(); -+} - -- if (isForeignWindow()) { -- if (connection()->mouseGrabber() == this) -- connection()->setMouseGrabber(Q_NULLPTR); -- if (connection()->mousePressWindow() == this) -- connection()->setMousePressWindow(Q_NULLPTR); -- } -+QXcbForeignWindow::~QXcbForeignWindow() -+{ -+ // Clear window so that destroy() does not affect it -+ m_window = 0; -+ -+ if (connection()->mouseGrabber() == this) -+ connection()->setMouseGrabber(nullptr); -+ if (connection()->mousePressWindow() == this) -+ connection()->setMousePressWindow(nullptr); - } - - void QXcbWindow::destroy() -diff --git a/src/plugins/platforms/xcb/qxcbwindow.h b/src/plugins/platforms/xcb/qxcbwindow.h -index 56628094ee..f38343b6c2 100644 ---- a/src/plugins/platforms/xcb/qxcbwindow.h -+++ b/src/plugins/platforms/xcb/qxcbwindow.h -@@ -278,6 +278,18 @@ public Q_SLOTS: - xcb_cursor_t m_currentBitmapCursor = XCB_CURSOR_NONE; - }; - -+class QXcbForeignWindow : public QXcbWindow -+{ -+public: -+ QXcbForeignWindow(QWindow *window, WId nativeHandle) -+ : QXcbWindow(window) { m_window = nativeHandle; } -+ ~QXcbForeignWindow(); -+ bool isForeignWindow() const override { return true; } -+ -+protected: -+ void create() override {} // No-op -+}; -+ - QT_END_NAMESPACE - - Q_DECLARE_METATYPE(QXcbWindow*) diff --git a/deps/qt5/patches/qt5.qtbug-66103.patch b/deps/qt5/patches/qt5.qtbug-66103.patch deleted file mode 100644 index 62d1b30..0000000 --- a/deps/qt5/patches/qt5.qtbug-66103.patch +++ /dev/null @@ -1,172 +0,0 @@ -https://code.qt.io/cgit/qt/qtbase.git/patch/?id=4a7771f206d4b29be549d3827c36a46679d90de6 - -From 4a7771f206d4b29be549d3827c36a46679d90de6 Mon Sep 17 00:00:00 2001 -From: Eike Hein <hein@kde.org> -Date: Sun, 7 Jan 2018 13:02:01 +0900 -Subject: QSimpleDrag: Fix mouse release coords for delayed event transmission - -On platforms such as XCB, the drag cursor pixmap is shown via a window -(a QShapedPixmapWindow) under the cursor. - -The mouse button release event at the end of the drag is received in -this QXcbWindow, but intercepted by an event filter that QSimpleDrag -installs on the QApplication. It then resends it unmodified(!) after -the drag has ended and the drag pixmap window destroyed, causing it to -be delivered to the new top-level window. - -The local coordinates in the unmodified QMouseEvent are local to the -drag pixmap window and don't match the window it is delayed-transmitted -to. - -This ends up having fatal, user-visible effects particularly in Qt -Quick: QQuickWindow synthesizes a hover event once per frame using -the last received mouse coordinates, here: the release posted by -QSimpleDrag. This is done to update the hover event state for items -under the cursor when the mouse hasn't moved (e.g. QQuickMouseArea:: -containsMouse). The bogus event coordinates in the release event then -usually end up causing an item near the top-left of the QQuickWindow -to assume it is hovered (because drag pixmap windows tend to be small), -even when the mouse cursor is actually far away from it at the end of -the drag. - -This shows up e.g. in the Plasma 5 desktop, where dragging an icon -on the desktop will cause the icon at the top-left of the screen (if -any) to switch to hovered state, as the release coordinates on the -drag pixmap window (showing a dragged icon) fall into the geometry -of the top-left icon. - -QSimpleDrag contains a topLevelAt() function to find the top-level -window under the global cursor coordinates that is not the drag -pixmap window. This is used by the drop event delivery code. - -This patch uses this function to find the relevant top-level window, -then asks it to map the global cusor coordinates to its local -coordinate system, then synthesizes a new QMouseEvent with local -coordinates computed in this fashion. As a result the window now -gets a release event with coordinates that make sense and are -correct. - -Task-number: QTBUG-66103 -Change-Id: I04ebe6ccd4a991fdd4b540ff0227973ea8896a9d -Reviewed-by: Eike Hein <hein@kde.org> -Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> ---- - src/gui/kernel/qsimpledrag.cpp | 32 +++++++++++++++++++++++++++----- - src/gui/kernel/qsimpledrag_p.h | 6 +++--- - 2 files changed, 30 insertions(+), 8 deletions(-) - -diff --git a/src/gui/kernel/qsimpledrag.cpp b/src/gui/kernel/qsimpledrag.cpp -index a1e25dc53c..87d3ba5915 100644 ---- a/src/gui/kernel/qsimpledrag.cpp -+++ b/src/gui/kernel/qsimpledrag.cpp -@@ -58,6 +58,7 @@ - - #include <QtCore/QEventLoop> - #include <QtCore/QDebug> -+#include <QtCore/QLoggingCategory> - - #include <private/qguiapplication_p.h> - #include <private/qdnd_p.h> -@@ -69,6 +70,8 @@ QT_BEGIN_NAMESPACE - - #ifndef QT_NO_DRAGANDDROP - -+Q_LOGGING_CATEGORY(lcDnd, "qt.gui.dnd") -+ - static QWindow* topLevelAt(const QPoint &pos) - { - QWindowList list = QGuiApplication::topLevelWindows(); -@@ -94,10 +97,10 @@ static QWindow* topLevelAt(const QPoint &pos) - */ - - QBasicDrag::QBasicDrag() : -- m_restoreCursor(false), m_eventLoop(0), -+ m_current_window(nullptr), m_restoreCursor(false), m_eventLoop(nullptr), - m_executed_drop_action(Qt::IgnoreAction), m_can_drop(false), -- m_drag(0), m_drag_icon_window(0), m_useCompositing(true), -- m_screen(Q_NULLPTR) -+ m_drag(nullptr), m_drag_icon_window(nullptr), m_useCompositing(true), -+ m_screen(nullptr) - { - } - -@@ -161,6 +164,7 @@ bool QBasicDrag::eventFilter(QObject *o, QEvent *e) - return true; // Eat all mouse move events - } - case QEvent::MouseButtonRelease: -+ { - disableEventFilter(); - if (canDrop()) { - QPoint nativePosition = getNativeMousePos(e, m_drag_icon_window); -@@ -169,8 +173,25 @@ bool QBasicDrag::eventFilter(QObject *o, QEvent *e) - cancel(); - } - exitDndEventLoop(); -- QCoreApplication::postEvent(o, new QMouseEvent(*static_cast<QMouseEvent *>(e))); -+ -+ // If a QShapedPixmapWindow (drag feedback) is being dragged along, the -+ // mouse event's localPos() will be relative to that, which is useless. -+ // We want a position relative to the window where the drag ends, if possible (?). -+ // If there is no such window (belonging to this Qt application), -+ // make the event relative to the window where the drag started. (QTBUG-66103) -+ const QMouseEvent *release = static_cast<QMouseEvent *>(e); -+ const QWindow *releaseWindow = topLevelAt(release->globalPos()); -+ qCDebug(lcDnd) << "mouse released over" << releaseWindow << "after drag from" << m_current_window << "globalPos" << release->globalPos(); -+ if (!releaseWindow) -+ releaseWindow = m_current_window; -+ QPoint releaseWindowPos = (releaseWindow ? releaseWindow->mapFromGlobal(release->globalPos()) : release->globalPos()); -+ QMouseEvent *newRelease = new QMouseEvent(release->type(), -+ releaseWindowPos, releaseWindowPos, release->screenPos(), -+ release->button(), release->buttons(), -+ release->modifiers(), release->source()); -+ QCoreApplication::postEvent(o, newRelease); - return true; // defer mouse release events until drag event loop has returned -+ } - case QEvent::MouseButtonDblClick: - case QEvent::Wheel: - return true; -@@ -349,7 +370,7 @@ static inline QPoint fromNativeGlobalPixels(const QPoint &point) - into account. - */ - --QSimpleDrag::QSimpleDrag() : m_current_window(0) -+QSimpleDrag::QSimpleDrag() - { - } - -@@ -373,6 +394,7 @@ void QSimpleDrag::startDrag() - updateCursor(Qt::IgnoreAction); - } - setExecutedDropAction(Qt::IgnoreAction); -+ qCDebug(lcDnd) << "drag began from" << m_current_window<< "cursor pos" << QCursor::pos() << "can drop?" << canDrop(); - } - - void QSimpleDrag::cancel() -diff --git a/src/gui/kernel/qsimpledrag_p.h b/src/gui/kernel/qsimpledrag_p.h -index 0b8a0bc703..bbd7f7f4bb 100644 ---- a/src/gui/kernel/qsimpledrag_p.h -+++ b/src/gui/kernel/qsimpledrag_p.h -@@ -105,6 +105,9 @@ protected: - - QDrag *drag() const { return m_drag; } - -+protected: -+ QWindow *m_current_window; -+ - private: - void enableEventFilter(); - void disableEventFilter(); -@@ -132,9 +135,6 @@ protected: - virtual void cancel() Q_DECL_OVERRIDE; - virtual void move(const QPoint &globalPos) Q_DECL_OVERRIDE; - virtual void drop(const QPoint &globalPos) Q_DECL_OVERRIDE; -- --private: -- QWindow *m_current_window; - }; - - #endif // QT_NO_DRAGANDDROP --- -cgit v1.1-6-g87c4 - - diff --git a/deps/qt5/patches/qt5.qtbug-69310.patch b/deps/qt5/patches/qt5.qtbug-69310.patch deleted file mode 100644 index b924627..0000000 --- a/deps/qt5/patches/qt5.qtbug-69310.patch +++ /dev/null @@ -1,37 +0,0 @@ -From fcba9fa861574f33e1d2e54d8c8d6da8062927cd Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen <allan.jensen@qt.io> -Date: Wed, 23 Jan 2019 10:42:12 +0100 -Subject: Fix regression in QPlainTextEdit updating - -It was incorrectly counting a block having more than one line as having -changed visibility. - -Fixes: QTBUG-69310 -Change-Id: I502cda1d3e8a4efb1c14122353cc0a4731d8581c -Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> ---- - src/widgets/widgets/qplaintextedit.cpp | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/widgets/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp -index d6f6a364a8..57f2dec8f7 100644 ---- a/src/widgets/widgets/qplaintextedit.cpp -+++ b/src/widgets/widgets/qplaintextedit.cpp -@@ -312,10 +312,11 @@ void QPlainTextDocumentLayout::documentChanged(int from, int charsRemoved, int c - QTextBlock block = changeStartBlock; - do { - block.clearLayout(); -- const int lineCount = block.isVisible() ? 1 : 0; -- if (block.lineCount() != lineCount) { -+ if (block.isVisible() -+ ? (block.lineCount() == 0) -+ : (block.lineCount() > 0)) { - blockVisibilityChanged = true; -- block.setLineCount(lineCount); -+ block.setLineCount(block.isVisible() ? 1 : 0); - } - if (block == changeEndBlock) - break; --- -cgit v1.2.1 - diff --git a/deps/qt5/patches/qt5.webengine_gcc8.patch b/deps/qt5/patches/qt5.webengine_gcc8.patch deleted file mode 100644 index cf276bc..0000000 --- a/deps/qt5/patches/qt5.webengine_gcc8.patch +++ /dev/null @@ -1,26 +0,0 @@ -# Prevent these errors caused by using GCC8 -# (original patch taken from Fedora's chromium SRPM): -# -# make: *** [Makefile:1028: module-qtwebengine-make_first] Error 2 -# FAILED: obj/mojo/public/c/system/system/thunks.o -# ../../3rdparty/chromium/mojo/public/c/system/buffer.h:38:42: error: static assertion failed: int64_t has weird alignment -# ../../3rdparty/chromium/mojo/public/c/system/data_pipe.h:49:42: error: static assertion failed: int64_t has weird alignment -# ../../3rdparty/chromium/mojo/public/c/system/message_pipe.h:47:42: error: static assertion failed: int64_t has weird alignment -# ---- a/src/3rdparty/chromium/mojo/public/c/system/macros.h 2018-05-15 14:58:46.448912634 -0400 -+++ b/src/3rdparty/chromium/mojo/public/c/system/macros.h 2018-05-15 14:58:52.041784613 -0400 -@@ -18,7 +18,13 @@ - #endif - - // Like the C++11 |alignof| operator. --#if __cplusplus >= 201103L -+#if defined(__GNUC__) && __GNUC__ >= 8 -+// GCC 8 has changed the alignof operator to return the minimal alignment -+// required by the target ABI, instead of the preferred alignment. -+// This means that on 32-bit x86, it will return 4 instead of 8. -+// Use __alignof__ instead to avoid this. -+#define MOJO_ALIGNOF(type) __alignof__(type) -+#elif __cplusplus >= 201103L - #define MOJO_ALIGNOF(type) alignof(type) - #elif defined(__GNUC__) - #define MOJO_ALIGNOF(type) __alignof__(type) diff --git a/deps/qt5/patches/qt5.whandle.patch b/deps/qt5/patches/qt5.whandle.patch deleted file mode 100644 index 4428974..0000000 --- a/deps/qt5/patches/qt5.whandle.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Ulf Hermann <ulf.hermann@theqtcompany.com> -Date: Tue, 27 Oct 2015 14:25:42 +0000 (+0100) -Subject: WIP: Also do hide/show via WA_OutsideWSRange for native widgets -X-Git-Url: https://codereview.qt-project.org/gitweb?p=qt%2Fqtbase.git;a=commitdiff_plain;h=5ea44d1d516f0c68a6793279df5c1569ef9fadd2 - -WIP: Also do hide/show via WA_OutsideWSRange for native widgets - -Task-number: QTBUG-48321 -Change-Id: I78ef29975181ee22429c9bd4b11d96d9e68b7a9c ---- - -diff --git a/qtbase/src/widgets/kernel/qwidget.cpp b/qtbase/src/widgets/kernel/qwidget.cpp -index a006246..024005d 100644 ---- a/qtbase/src/widgets/kernel/qwidget.cpp -+++ b/qtbase/src/widgets/kernel/qwidget.cpp -@@ -7169,7 +7169,7 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove) - - bool needsShow = false; - -- if (q->isWindow()) { -+ if (q->isWindow() || q->windowHandle()) { - if (!(data.window_state & Qt::WindowFullScreen) && (w == 0 || h == 0)) { - q->setAttribute(Qt::WA_OutsideWSRange, true); - if (q->isVisible() && q->testAttribute(Qt::WA_Mapped)) diff --git a/deps/qt5/profile.d/qt5.csh b/deps/qt5/profile.d/qt5.csh deleted file mode 100644 index ec1ecd9..0000000 --- a/deps/qt5/profile.d/qt5.csh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/csh -# Environment path variables for the Qt package: -if ( ! $?QT5DIR ) then - # It's best to use the generic directory to avoid - # compiling in a version-containing path: - if ( -d /usr/lib@LIBDIRSUFFIX@/qt5 ) then - setenv QT5DIR /usr/lib@LIBDIRSUFFIX@/qt5 - else - # Find the newest Qt directory and set $QT5DIR to that: - foreach qtd ( /usr/lib@LIBDIRSUFFIX@/qt5-* ) - if ( -d $qtd ) then - setenv QT5DIR $qtd - endif - end - endif -endif -set path = ( $path $QT5DIR/bin ) diff --git a/deps/qt5/profile.d/qt5.sh b/deps/qt5/profile.d/qt5.sh deleted file mode 100644 index 8ee075e..0000000 --- a/deps/qt5/profile.d/qt5.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# Environment variables for the Qt package. -# -# It's best to use the generic directory to avoid -# compiling in a version-containing path: -if [ -d /usr/lib@LIBDIRSUFFIX@/qt5 ]; then - QT5DIR=/usr/lib@LIBDIRSUFFIX@/qt5 -else - # Find the newest Qt directory and set $QT5DIR to that: - for qtd in /usr/lib@LIBDIRSUFFIX@/qt5-* ; do - if [ -d $qtd ]; then - QT5DIR=$qtd - fi - done -fi -PATH="$PATH:$QT5DIR/bin" -export QT5DIR diff --git a/deps/qt5/qt5.SlackBuild b/deps/qt5/qt5.SlackBuild deleted file mode 100755 index d257bd0..0000000 --- a/deps/qt5/qt5.SlackBuild +++ /dev/null @@ -1,373 +0,0 @@ -#!/bin/sh - -# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# Merged some ideas from Alex Sarmardzic's script for qt4 at SlackBuilds.org -# ^^ Modified by Robby Workman <rworkman@slackware.com> for QT4 & KDE4 - -# We're using qt-copy instead of a released qt version, as this git release -# has at least one bugfix strongly recommended by the kde developers. - -# Obtained from: -# git clone git://gitorious.org/+kde-developers/qt/kde-qt.git -# git checkout origin/4.5.3-patched -# git checkout origin/4.6.0-stable-patched -# git checkout origin/4.6.1-patched -# git checkout origin/4.7.0-patched -# -# Alternate method (we don't use this): -# wget http://qt.gitorious.org/qt/kde-qt/archive-tarball/4.6.2-patched -# -# Modifications 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018,2019 Eric Hameleers, Eindhoven, NL -# qt 4.7.3, 4.7.4, 4.8.0, 4.8.1, 4.8.2, 4.8.4, are built from original nokia sources. -# -# Modifications for qt 5.2.0 2013 by Michael James, AU -# Modifications for qt 5.2.1 2014 by Eric Hameleers, Eindhoven, NL -# Modifications for qt 5.3.1 2014 by Eric Hameleers, Eindhoven, NL -# Modifications for qt 5.4.0 2015 by Eric Hameleers, Eindhoven, NL -# Modifications for qt 5.4.1 2015 by Eric Hameleers, Eindhoven, NL -# Modifications for qt 5.5.1 2015,2016 by Eric Hameleers, Eindhoven, NL -# Modifications for qt 5.6.0 2016 by Eric Hameleers, Eindhoven, NL -# Modifications for qt 5.6.1 2016 by Eric Hameleers, Eindhoven, NL -# Modifications for qt 5.7.0 2016 by Eric Hameleers, Eindhoven, NL -# Modifications for qt 5.7.1 2017 by Eric Hameleers, Eindhoven, NL -# Modifications for qt 5.9.0 2017 by Eric Hameleers, Eindhoven, NL -# Modifications for qt 5.9.1 2017 by Eric Hameleers, Eindhoven, NL -# Modifications for qt 5.9.2 2017 by Eric Hameleers, Eindhoven, NL -# Modifications for qt 5.9.3 2017 by Eric Hameleers, Eindhoven, NL -# Modifications for qt 5.9.4 2018 by Eric Hameleers, Eindhoven, NL -# Modifications for qt 5.9.5 2018 by Eric Hameleers, Eindhoven, NL -# Modifications for qt 5.9.6 2018 by Eric Hameleers, Eindhoven, NL -# Modifications for qt 5.11.0 2018 by Eric Hameleers, Eindhoven, NL -# Modifications for qt 5.11.1 2018 by Eric Hameleers, Eindhoven, NL -# Modifications for qt 5.11.2 2018 by Eric Hameleers, Eindhoven, NL -# Modifications for qt 5.11.3 2018 by Eric Hameleers, Eindhoven, NL -# Modifications for qt 5.12.1 2019 by Eric Hameleers, Eindhoven, NL - -cd $(dirname $0) ; CWD=$(pwd) - -PKGNAM=qt5 -VERSION=${VERSION:-5.12.1} -BUILD=${BUILD:-1} -PKGSRC=$(echo $VERSION |cut -d- -f1) -PKGVER=$(echo $VERSION |tr - _) - -NUMJOBS=${NUMJOBS:-"-j$(nproc)"} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PKGNAM-${PKGVER}-${ARCH}-${BUILD}.txz" - exit 0 -fi - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - SLKLDFLAGS="" - SLKLDFLAGS="-L/usr/lib64" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - # To prevent "qatomic_armv6.h error: output number 2 not directly addressable" - # More permanent solution is to patch gcc: - # http://bazaar.launchpad.net/~linaro-toolchain-dev/gcc-linaro/4.6/revision/106731 - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16 -fno-strict-volatile-bitfields" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -fi - -case "$ARCH" in - arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; - *) TARGET=$ARCH-slackware-linux ;; -esac - -TMP=${TMP:-/tmp} -PKG=$TMP/package-${PKGNAM} - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf qt-everywhere-src-$VERSION -echo "Extracting qt-everywhere-src-$VERSION.tar.xz" -tar xf $CWD/qt-everywhere-src-$VERSION.tar.xz || exit 1 -cd qt-everywhere-src-$PKGSRC || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Use -reduce-relocations only on i?86 and x86_64 architextures. -# https://bugreports.qt-project.org/browse/QTBUG-36129 -if echo $ARCH | grep -q '\(i.86\|x86_64\)' 2>/dev/null; then - RELOCATIONS="-reduce-relocations" -else - RELOCATIONS="" -fi - -# Fix path to mysql header: -cat $CWD/patches/qt5.mysql.h.diff | patch -p1 --verbose || exit 1 - -## Fix compilation error in chromium caused by gcc8: -#cd qtwebengine -# cat $CWD/patches/qt5.webengine_gcc8.patch | patch -p1 --verbose || exit 1 -#cd - 1>/dev/null - -# QSyntaxHighlighter: cancel delayed highlight if done manually: -cd qtbase - cat $CWD/patches/qt5.delayed_highlight.patch | patch -p1 --verbose || exit 1 -cd - 1>/dev/null - -# Fix regression in QPlainTextEdit updating (QTBUG-69310): -cd qtbase - cat $CWD/patches/qt5.qtbug-69310.patch | patch -p1 --verbose || exit 1 -cd - 1>/dev/null - -if ! pkg-config --exists libpulse 2>/dev/null ; then - # Forcibly disable pulseaudio in qtwebengine: - cat $CWD/patches/qt5.pulseaudio.diff | patch -p1 --verbose || exit 1 - # Disable pulseaudio in Qt5: - PACONF="-no-pulseaudio" -else - PACONF=" " -fi - -# Use our custom compiler and linker flags: -sed -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${SLKCFLAGS}|" \ - -i qtbase/mkspecs/common/gcc-base.conf || exit 1 -sed -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${SLKLDFLAGS}|" \ - -i qtbase/mkspecs/common/g++-unix.conf || exit 1 - -# All languages are now enabled by default in the virtual keyboard -# (required by Plasma 5.11): -#echo "CONFIG += lang-all" >> qtvirtualkeyboard/.qmake.conf - -export CFLAGS="$SLKCFLAGS" -export CXXFLAGS="$SLKCFLAGS" -export OPENSOURCE_CXXFLAGS="$SLKCFLAGS" -export QTDIR="${TMP}/qt-everywhere-src-${PKGSRC}" -export LD_LIBRARY_PATH="${QTDIR}/qtbase/lib:${QTDIR}/qttools/lib:${LD_LIBRARY_PATH}" -export QT_PLUGIN_PATH="${QTDIR}/qtbase/plugins" -./configure -v \ - -confirm-license \ - -opensource \ - -prefix /usr \ - -libdir /usr/lib${LIBDIRSUFFIX} \ - -bindir /usr/lib${LIBDIRSUFFIX}/qt5/bin \ - -sysconfdir /etc/xdg \ - -headerdir /usr/include/qt5 \ - -datadir /usr/share/qt5 \ - -archdatadir /usr/lib${LIBDIRSUFFIX}/qt5 \ - -docdir /usr/doc/qt5-$PKGVER \ - -examplesdir /usr/doc/qt5-$PKGVER/examples \ - -proprietary-codecs \ - -system-libpng \ - -system-libjpeg \ - -system-sqlite \ - -system-zlib \ - -plugin-sql-mysql \ - -plugin-sql-sqlite \ - -accessibility \ - -alsa \ - -dbus \ - -glib \ - -icu \ - -opengl \ - -openssl-linked \ - -optimized-qmake \ - -qpa xcb \ - -qt-harfbuzz \ - -verbose \ - -xcb \ - -nomake examples \ - -nomake tests \ - -no-separate-debug-info \ - -no-strip \ - -no-use-gold-linker \ - -webengine-proprietary-codecs \ - ${PACONF} \ - ${RELOCATIONS} \ - -no-pch \ - # No-precompiled-headers is ccache-friendly. - -# Sometimes a failure happens when parallelizing make. Try again if make fails, -# but make a failure the second time around (single threaded) a fatal error: -make $NUMJOBS || make || exit 1 -make install INSTALL_ROOT=$PKG || exit 1 - -# Strip binaries the Slackware way: -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -# Remove rpaths: -for file in $(find . | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : 2> /dev/null) ; do - if [ ! "$(patchelf --print-rpath $file 2> /dev/null)" = "" ]; then - patchelf --remove-rpath $file - fi -done - -# Don't ship .la files: -rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la - -# Fix internal linking for Qt5WebEngineCore.pc , -# thanks to Larry Hajali's SBo script: -sed -i \ - -e 's|-Wl,--start-group.* -Wl,--end-group||' \ - -e "s|-L${PWD}/qtwebengine/src/core/api/Release||" \ - $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/Qt5WebEngineCore.pc - -# Fix the path in prl files: -find "$PKG/usr/lib${LIBDIRSUFFIX}" -type f -name '*.prl' \ - -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; - -# Fix the qmake path in pri file: -sed -i "s,${QTDIR}/qtbase,/usr/lib${LIBDIRSUFFIX}/qt5," \ - $PKG/usr/lib${LIBDIRSUFFIX}/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri - -# Install symlinks to the Qt5 binaries in the $PATH: -mkdir -p $PKG/usr/bin -for FILE in $PKG/usr/lib${LIBDIRSUFFIX}/qt5/bin/* ; do - ln -s ../lib${LIBDIRSUFFIX}/qt5/bin/$(basename $FILE) $PKG/usr/bin/$(basename $FILE)-qt5 -done - -# Set the QT5DIR variable in the environment: -mkdir -p $PKG/etc/profile.d -sed -e "s,@LIBDIRSUFFIX@,${LIBDIRSUFFIX},g" $CWD/profile.d/$PKGNAM.sh \ - > $PKG/etc/profile.d/$PKGNAM.sh -sed -e "s,@LIBDIRSUFFIX@,${LIBDIRSUFFIX},g" $CWD/profile.d/$PKGNAM.csh \ - > $PKG/etc/profile.d/$PKGNAM.csh -chmod 0755 $PKG/etc/profile.d/* - -# Add menu entries for all those hidden but great Qt applications: -# Qt5 logo: -mkdir -p $PKG/usr/share/icons/hicolor/48x48/apps -convert qtdoc/doc/src/images/qt-logo.png -resize 48x48 $PKG/usr/share/icons/hicolor/48x48/apps/qt5-logo.png -# Assistant icons -install -p -m644 -D qttools/src/assistant/assistant/images/assistant.png $PKG/usr/share/icons/hicolor/32x32/apps/qt5-assistant.png -install -p -m644 -D qttools/src/assistant/assistant/images/assistant-128.png $PKG/usr/share/icons/hicolor/128x128/apps/qt5-assistant.png -# Designer icon -install -p -m644 -D qttools/src/designer/src/designer/images/designer.png $PKG/usr/share/icons/hicolor/128x128/apps/qt5-designer.png -# QDbusViewer icons -install -p -m644 qttools/src/qdbus/qdbusviewer/images/qdbusviewer.png $PKG/usr/share/icons/hicolor/32x32/apps/qt5-qdbusviewer.png -install -p -m644 qttools/src/qdbus/qdbusviewer/images/qdbusviewer-128.png $PKG/usr/share/icons/hicolor/128x128/apps/qt5-qdbusviewer.png -# Linguist icons -for icon in qttools/src/linguist/linguist/images/icons/linguist-*-32.png ; do - size=$(echo $(basename ${icon}) | cut -d- -f2) - install -p -m644 -D ${icon} $PKG/usr/share/icons/hicolor/${size}x${size}/apps/qt5-linguist.png -done - -# And the .desktop files too: -mkdir -p $PKG/usr/share/applications -cat <<EOF > $PKG/usr/share/applications/qt5-designer.desktop -[Desktop Entry] -Name=Qt5 Designer -GenericName=Interface Designer -Comment=Design GUIs for Qt5 applications -Exec=designer-qt5 -Icon=qt5-designer -MimeType=application/x-designer; -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Development; -EOF -cat <<EOF > $PKG/usr/share/applications/qt5-assistant.desktop -[Desktop Entry] -Name=Qt5 Assistant -Comment=Shows Qt5 documentation and examples -Exec=assistant-qt5 -Icon=qt5-assistant -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Development;Documentation; -EOF -cat <<EOF > $PKG/usr/share/applications/qt5-linguist.desktop -[Desktop Entry] -Name=Qt5 Linguist -Comment=Add translations to Qt5 applications -Exec=linguist-qt5 -Icon=qt5-linguist -MimeType=text/vnd.trolltech.linguist;application/x-linguist; -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Development; -EOF -cat <<EOF > $PKG/usr/share/applications/qt5-qdbusviewer.desktop -[Desktop Entry] -Name=Qt5 QDbusViewer -GenericName=Qt5 D-Bus Debugger -Comment=Debug D-Bus applications -Exec=qdbusviewer-qt5 -Icon=qt5-qdbusviewer -Terminal=false -Type=Application -Categories=Qt;Development;Debugger; -EOF - -# Add a documentation directory: -mkdir -p $PKG/usr/doc/$PKGNAM-$PKGVER -cp -a \ - README qtbase/{header*,LGPL_EXCEPTION.txt,LICENSE*} \ - $PKG/usr/doc/$PKGNAM-$PKGVER -if [ -d $PKG/usr/lib${LIBDIRSUFFIX}/qt5/doc/html ]; then - ( cd $PKG/usr/doc/$PKGNAM-$PKGVER - ln -sf /usr/lib${LIBDIRSUFFIX}/qt5/doc/html . - ) -fi - -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 $TMP/$PKGNAM-$PKGVER-$ARCH-$BUILD.txz - diff --git a/deps/qt5/slack-desc b/deps/qt5/slack-desc deleted file mode 100644 index 99abf5c..0000000 --- a/deps/qt5/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------------------------------------------------------| -qt5: qt5 (a multi-platform C++ graphical user interface toolkit) -qt5: -qt5: Qt is a cross-platform C++ application framework. Qt's primary feature -qt5: is its rich set of widgets that provide standard GUI functionality. -qt5: -qt5: Homepage: http://qt-project.org -qt5: -qt5: -qt5: -qt5: -qt5: diff --git a/deps/qtav/.url b/deps/qtav/.url index e35c34f..c496827 100644 --- a/deps/qtav/.url +++ b/deps/qtav/.url @@ -1 +1 @@ -https://github.com/wang-bin/QtAV/archive/v1.12.0.tar.gz +https://github.com/wang-bin/QtAV/archive/v1.13.0.tar.gz diff --git a/deps/qtav/qtav.SlackBuild b/deps/qtav/qtav.SlackBuild index f5138ca..7fc9398 100755 --- a/deps/qtav/qtav.SlackBuild +++ b/deps/qtav/qtav.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2017 Eric Hameleers, Eindhoven, NL +# Copyright 2017, 2019 Eric Hameleers, Eindhoven, NL # Copyright 2017 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # @@ -24,13 +24,15 @@ # ----------------------------------------------------------------------------- +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=qtav SRCNAM=QtAV -VERSION=${VERSION:-1.12.0} +VERSION=${VERSION:-1.13.0} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-" -j4 "} -CWD=$(pwd) +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -45,12 +47,20 @@ if [ -z "$ARCH" ]; then export ARCH fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" + SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686" SLKLDFLAGS="" LIBDIRSUFFIX="" elif [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" + SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686" SLKLDFLAGS="" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then @@ -76,7 +86,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1 cd $SRCNAM-$VERSION || exit 1 # Fix bogus permissions: diff --git a/deps/quazip/.url b/deps/quazip/.url new file mode 100644 index 0000000..861f9c4 --- /dev/null +++ b/deps/quazip/.url @@ -0,0 +1 @@ +https://github.com/stachenov/quazip/archive/v0.8.1.tar.gz diff --git a/deps/hyphen/hyphen.SlackBuild b/deps/quazip/quazip.SlackBuild index f04be49..662d7b3 100755 --- a/deps/hyphen/hyphen.SlackBuild +++ b/deps/quazip/quazip.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright 2018 Eric Hameleers, Eindhoven, NL -# Copyright 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2019 Eric Hameleers, Eindhoven, NL +# Copyright 2019 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -24,12 +24,11 @@ # ----------------------------------------------------------------------------- -cd $(dirname $0) ; CWD=$(pwd) - -PKGNAM=hyphen -VERSION=${VERSION:-2.8.8} +PKGNAM=quazip +VERSION=${VERSION:-0.8.1} BUILD=${BUILD:-1} +CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -44,14 +43,6 @@ if [ -z "$ARCH" ]; then export ARCH fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" - exit 0 -fi - if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686" SLKLDFLAGS="" @@ -91,20 +82,26 @@ find . \ -exec chmod 644 {} \; # Configure and compile: -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --disable-static \ - --build=$TARGET -make $NUMJOBS || exit 1 -make install DESTDIR=$PKG || exit 1 +mkdir -p build +cd build + cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + .. + make + make install DESTDIR=$PKG +cd .. # Add documentation: mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - AUTHORS COPYIN* ChangeLog INSTALL NEWS READM* THANKS TODO \ + CONTRIBUTING.md COPYING NEWS.txt README.md \ $PKG/usr/doc/$PKGNAM-$VERSION # Strip binaries: diff --git a/deps/quazip/slack-desc b/deps/quazip/slack-desc new file mode 100644 index 0000000..dc362f1 --- /dev/null +++ b/deps/quazip/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +quazip: quazip (C++ wrapper for the Gilles Vollant's ZIP/UNZIP C package) +quazip: +quazip: Minizip is a simple C library for creating, appending and reading +quazip: ZIP archives. One thing Qt can't do out-of-the-box is write and read +quazip: ZIP archives. +quazip: QuaZIP is a simple C++ wrapper around Minizip. With QuaZIP, both +quazip: ZIP files and files inside ZIP archives can be accessed with +quazip: QIODevice API. +quazip: +quazip: See also: https://stachenov.github.io/quazip/ +quazip: diff --git a/deps/rttr/.url b/deps/rttr/.url new file mode 100644 index 0000000..5ca30f6 --- /dev/null +++ b/deps/rttr/.url @@ -0,0 +1 @@ +http://www.rttr.org/releases/rttr-0.9.6-src.tar.gz diff --git a/deps/rttr/rttr.SlackBuild b/deps/rttr/rttr.SlackBuild new file mode 100755 index 0000000..c7cf8ad --- /dev/null +++ b/deps/rttr/rttr.SlackBuild @@ -0,0 +1,127 @@ +#!/bin/sh + +# Copyright 2019 Eric Hameleers, Eindhoven, NL +# Copyright 2019 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Permission to use, copy, modify, and distribute this software for +# any purpose with or without fee is hereby granted, provided that +# the above copyright notice and this permission notice appear in all +# copies. +# +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR +# 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. +# ----------------------------------------------------------------------------- + + +PKGNAM=rttr +VERSION=${VERSION:-0.9.6} +BUILD=${BUILD:-2} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +fi + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686" + SLKLDFLAGS="" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + SLKLDFLAGS="-L/usr/lib64" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + SLKLDFLAGS="" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + SLKLDFLAGS="" + LIBDIRSUFFIX="" +fi + +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION-src.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +# Fix incorrect file permissions after install, +# see https://github.com/rttrorg/rttr/pull/228: +sed -e 's/PERMISSIONS OWNER_READ//' \ + -i CMake/*.cmake doc/CMakeLists.txt + +# Fix bogus permissions: +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Configure and compile: +mkdir -p build +cd build + cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DBUILD_TESTS=OFF \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_UNIT_TESTS=OFF \ + -DBUILD_PACKAGE=OFF \ + .. + make + make install DESTDIR=$PKG +cd .. + +# Add documentation: +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + ChangeLog.md LICENSE.txt README.md \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# Strip binaries: +find $PKG | xargs file | grep -e "executable" -e "shared object" \ + | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Add a package description: +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +# Build the package: +cd $PKG +makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz + diff --git a/deps/rttr/slack-desc b/deps/rttr/slack-desc new file mode 100644 index 0000000..a08a9f7 --- /dev/null +++ b/deps/rttr/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +rttr: rttr (C++ Reflection library) +rttr: +rttr: RTTR stands for Run Time Type Reflection. It describes the ability +rttr: of a computer program to introspect and modify an object at runtime. +rttr: The goal of this project is to provide an easy and intuitive way +rttr: to use reflection in C++. +rttr: +rttr: +rttr: +rttr: See also: http://www.rttr.org/ +rttr: diff --git a/deps/sassc/sassc.SlackBuild b/deps/sassc/sassc.SlackBuild index 42e753c..eb190d9 100755 --- a/deps/sassc/sassc.SlackBuild +++ b/deps/sassc/sassc.SlackBuild @@ -92,7 +92,7 @@ CXXFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ --build=$TARGET || exit 1 make || exit 1 diff --git a/deps/sip/.url b/deps/sip/.url deleted file mode 100644 index 1970e74..0000000 --- a/deps/sip/.url +++ /dev/null @@ -1,2 +0,0 @@ -https://www.riverbankcomputing.com/static/Downloads/sip/sip-4.19.14.tar.gz - diff --git a/deps/sip/patches/PyQt4_sip_regression.patch b/deps/sip/patches/PyQt4_sip_regression.patch deleted file mode 100644 index e656ff4..0000000 --- a/deps/sip/patches/PyQt4_sip_regression.patch +++ /dev/null @@ -1,71 +0,0 @@ -# HG changeset patch -# User Phil Thompson <phil@riverbankcomputing.com> -# Date 1550579387 0 -# Node ID 7bd4d19479adc46c40e8d43629aaac871fae6cd7 -# Parent 4ab117a13343cd8d8f5804600936f445fb2d59ef -Fixed a code generation regression specific to PyQt4. - -diff -r 4ab117a13343 -r 7bd4d19479ad sipgen/gencode.c ---- a/sipgen/gencode.c Tue Feb 12 09:27:11 2019 +0000 -+++ b/sipgen/gencode.c Tue Feb 19 12:29:47 2019 +0000 -@@ -295,7 +295,7 @@ - static int emptyIfaceFile(sipSpec *pt, ifaceFileDef *iff); - static void declareLimitedAPI(int py_debug, moduleDef *mod, FILE *fp); - static int generatePluginSignalsTable(sipSpec *pt, classDef *cd, -- const char *pyqt_prefix, FILE *fp); -+ int pyqt_version, FILE *fp); - static int generatePyQt5ClassPlugin(sipSpec *pt, classDef *cd, FILE *fp); - static int generatePyQt4ClassPlugin(sipSpec *pt, classDef *cd, FILE *fp); - static void generateGlobalFunctionTableEntries(sipSpec *pt, moduleDef *mod, -@@ -15542,7 +15542,7 @@ - * Generate the PyQt4/5 signals table. - */ - static int generatePluginSignalsTable(sipSpec *pt, classDef *cd, -- const char *pyqt_prefix, FILE *fp) -+ int pyqt_version, FILE *fp) - { - int is_signals = FALSE; - -@@ -15586,8 +15586,8 @@ - "\n" - "\n" - "/* Define this type's signals. */\n" --"static const %sQtSignal signals_%C[] = {\n" -- , pyqt_prefix, classFQCName(cd)); -+"static const pyqt%dQtSignal signals_%C[] = {\n" -+ , pyqt_version, classFQCName(cd)); - } - - /* -@@ -15628,9 +15628,9 @@ - - if (is_signals) - prcode(fp, --" {SIP_NULLPTR, SIP_NULLPTR, SIP_NULLPTR, SIP_NULLPTR}\n" -+" {SIP_NULLPTR, SIP_NULLPTR, SIP_NULLPTR, %s}\n" - "};\n" -- ); -+ , (pyqt_version == 5 ? "SIP_NULLPTR" : "0")); - } - - return is_signals; -@@ -15643,7 +15643,7 @@ - */ - static int generatePyQt5ClassPlugin(sipSpec *pt, classDef *cd, FILE *fp) - { -- int is_signals = generatePluginSignalsTable(pt, cd, "pyqt5", fp); -+ int is_signals = generatePluginSignalsTable(pt, cd, 5, fp); - - prcode(fp, - "\n" -@@ -15696,7 +15696,7 @@ - */ - static int generatePyQt4ClassPlugin(sipSpec *pt, classDef *cd, FILE *fp) - { -- int is_signals = generatePluginSignalsTable(pt, cd, "pyqt4", fp); -+ int is_signals = generatePluginSignalsTable(pt, cd, 4, fp); - - prcode(fp, - "\n" - - diff --git a/deps/sip/sip.SlackBuild b/deps/sip/sip.SlackBuild deleted file mode 100755 index 38e620a..0000000 --- a/deps/sip/sip.SlackBuild +++ /dev/null @@ -1,184 +0,0 @@ -#!/bin/sh - -# Copyright 2008 Aleksandar Samardzic <asamardzic@gmail.com> -# Copyright 2008, 2009, 2010, 2011, 2017 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# Modified by Robby Workman <rworkman@slackware.com> -# Modified by Eric Hameleers <alien@slackware.com> - - -PKGNAM=sip -VERSION=${VERSION:-4.19.14} -BUILD=${BUILD:-2} - -NUMJOBS=${NUMJOBS:-" -j$(nproc) "} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" -else - SLKCFLAGS="-O2" -fi - -PYTHON2VER=$(python2 -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d. 2>/dev/null) -PYTHON2LIB=$( python2 -c 'from distutils.sysconfig import get_python_lib; print get_python_lib()' 2>/dev/null ) - -PYTHON3VER=$(python3 -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d. 2>/dev/null) -PYTHON3LIB=$( python3 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' 2>/dev/null ) - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION || exit 1 - -# Get PyQt4 to compile: -cat $CWD/patches/PyQt4_sip_regression.patch | patch -p1 --verbose || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -python2 configure.py \ - -b "/usr/bin" \ - -d "$PYTHON2LIB" \ - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - || exit 1 -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Add the PyQt4 private sip module: -make clean -python2 configure.py \ - --sip-module PyQt4.sip \ - --no-tools \ - -b "/usr/bin" \ - -d "$PYTHON2LIB" \ - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - || exit 1 -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Add the PyQt5 private sip module: -make clean -python2 configure.py \ - --sip-module PyQt5.sip \ - --no-tools \ - -b "/usr/bin" \ - -d "$PYTHON2LIB" \ - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - || exit 1 -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Rename to avoid a clash: -mv $PKG/usr/bin/sip $PKG/usr/bin/sip2 - -make clean - -python3 configure.py \ - -b "/usr/bin" \ - -d "$PYTHON3LIB" \ - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" || exit 1 -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Add the PyQt4 private sip module: -make clean -python3 configure.py \ - --sip-module PyQt4.sip \ - --no-tools \ - -b "/usr/bin" \ - -d "$PYTHON3LIB" \ - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" || exit 1 -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Add the PyQt5 private sip module: -make clean -python3 configure.py \ - --sip-module PyQt5.sip \ - --no-tools \ - -b "/usr/bin" \ - -d "$PYTHON3LIB" \ - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" || exit 1 -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Rename to avoid a clash: -mv $PKG/usr/bin/sip $PKG/usr/bin/sip3 - -# Create a symbolic link 'sip' pointing to the sip3 binary: -ln -s sip3 $PKG/usr/bin/sip - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - LICENSE* COPYING* ChangeLog NEWS README TODO doc/* \ - $PKG/usr/doc/$PKGNAM-$VERSION -chown -R root:root $PKG/usr/doc - -# If there's a ChangeLog, installing at least part of the recent history -# is useful, but don't let it get totally out of control: -if [ -r ChangeLog ]; then - DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) - cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog - touch -r ChangeLog $DOCSDIR/ChangeLog -fi - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$(echo $VERSION |tr - _)-$ARCH-$BUILD.txz - diff --git a/deps/sip/slack-desc b/deps/sip/slack-desc deleted file mode 100644 index d2fae24..0000000 --- a/deps/sip/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -sip: SIP (a tool for generating Python bindings) -sip: -sip: SIP is a tool that makes it very easy to create Python bindings for -sip: C and C++ libraries. It was originally developed to create PyQt, -sip: the Python bindings for the Qt toolkit, but can be used to create -sip: bindings for any C or C++ library. -sip: -sip: Homepage: http://www.riverbankcomputing.co.uk/software/sip/ -sip: -sip: -sip: diff --git a/deps/speech-dispatcher/speech-dispatcher.SlackBuild b/deps/speech-dispatcher/speech-dispatcher.SlackBuild index 483ce9e..21b5b13 100755 --- a/deps/speech-dispatcher/speech-dispatcher.SlackBuild +++ b/deps/speech-dispatcher/speech-dispatcher.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2019 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2019 Eric Hameleers, Eindhoven, NL +# Copyright 2019, 2020 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=speech-dispatcher VERSION=${VERSION:-0.8.8} -BUILD=${BUILD:-2} +BUILD=${BUILD:-5} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -95,19 +95,38 @@ CXXFLAGS="$SLKCFLAGS" \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ + --infodir=/usr/info \ --disable-static \ + --without-flite \ --build=$TARGET || exit 1 - #--without-flite \ make || exit 1 make install DESTDIR=$PKG || exit 1 +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + # Add documentation: mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ ANNOUNCE AUTHORS BUGS COPYING* README* TODO \ $PKG/usr/doc/$PKGNAM-$VERSION +# Compress info pages and remove the package's dir file: +if [ -d $PKG/usr/info ]; then + rm -f $PKG/usr/info/dir + gzip -9f $PKG/usr/info/*.info* +fi + +# Add this to the doinst.sh: +mkdir -p $PKG/install +cat <<EOT >> $PKG/install/doinst.sh +# Install info files: +for INFOFILE in usr/info/*.info.gz ; do + chroot . install-info /${INFOFILE} /usr/info/dir 2> /dev/null +done +EOT + # Strip binaries (if any): find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/deps/telepathy/farstream/.url b/deps/telepathy/farstream/.url deleted file mode 100644 index 41fe18e..0000000 --- a/deps/telepathy/farstream/.url +++ /dev/null @@ -1 +0,0 @@ -https://freedesktop.org/software/farstream/releases/farstream/farstream-0.2.8.tar.gz diff --git a/deps/telepathy/farstream/farstream.SlackBuild b/deps/telepathy/farstream/farstream.SlackBuild deleted file mode 100755 index b87f0eb..0000000 --- a/deps/telepathy/farstream/farstream.SlackBuild +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/sh - -# Copyright 2013 Heinz Wiesinger, Amsterdam, NL -# Copyright 2013 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# Modified 2015, 2018 by Eric Hameleers <alien@slackware.com> - -PKGNAM=farstream -VERSION=${VERSION:-0.2.8} -BUILD=${BUILD:-2} - -NUMJOBS=${NUMJOBS:-" -j$(nproc) "} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -case "$ARCH" in - i?86) SLKCFLAGS="-O2 -march=$ARCH -mtune=i686" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; - x86_64) SLKCFLAGS="-O2 -fPIC" - SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64" - ;; - armv7hl) SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - SLKLDFLAGS=""; LIBDIRSUFFIX="" - ;; - *) SLKCFLAGS=${SLKCFLAGS:-"O2"} - SLKLDFLAGS=${SLKLDFLAGS:-""}; LIBDIRSUFFIX=${LIBDIRSUFFIX:-""} - ;; -esac - -case "$ARCH" in - arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; - *) TARGET=$ARCH-slackware-linux ;; -esac - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --localstatedir=/var \ - --sysconfdir=/etc \ - --disable-static \ - --enable-introspection \ - --build=$TARGET - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - AUTHORS COPYING INSTALL NEWS README \ - $PKG/usr/doc/$PKGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/telepathy/farstream/slack-desc b/deps/telepathy/farstream/slack-desc deleted file mode 100755 index 6d4e936..0000000 --- a/deps/telepathy/farstream/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler----------------------------------------------------| -farstream: farstream (GStreamer modules for audio/video conferencing) -farstream: -farstream: The Farstream (formerly Farsight) project is an effort to create a -farstream: framework to deal with all known audio/video conferencing -farstream: protocols. On one side it offers a generic API that makes it -farstream: possible to write plugins for different streaming protocols, on the -farstream: other side it offers an API for clients to use those plugins. -farstream: -farstream: Homepage: http://www.freedesktop.org/wiki/Software/Farstream -farstream: -farstream: diff --git a/deps/telepathy/libaccounts-glib/.url b/deps/telepathy/libaccounts-glib/.url deleted file mode 100644 index 5430453..0000000 --- a/deps/telepathy/libaccounts-glib/.url +++ /dev/null @@ -1 +0,0 @@ -https://gitlab.com/accounts-sso/libaccounts-glib/repository/VERSION_1.23/archive.tar.gz diff --git a/deps/telepathy/libaccounts-glib/libaccounts-glib.SlackBuild b/deps/telepathy/libaccounts-glib/libaccounts-glib.SlackBuild deleted file mode 100755 index 09d2055..0000000 --- a/deps/telepathy/libaccounts-glib/libaccounts-glib.SlackBuild +++ /dev/null @@ -1,125 +0,0 @@ -#!/bin/sh - -# Copyright 2015, 2016, 2017, 2018 Eric Hameleers, Eindhoven, NL -# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -PKGNAM=libaccounts-glib -VERSION=${VERSION:-"1.23"} -BUILD=${BUILD:-3} - -NUMJOBS=${NUMJOBS:-" -j$(nproc) "} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - SLKLDFLAGS="-L/usr/lib64" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - SLKLDFLAGS="" - LIBDIRSUFFIX="64" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -fi - -case "$ARCH" in - arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; - *) TARGET=$ARCH-slackware-linux ;; -esac - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -if [ ! -x configure ]; then - # Or else the Makefile.in won't be created: - touch README - ./autogen.sh -fi - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --localstatedir=/var \ - --sysconfdir=/etc \ - --disable-gtk-doc \ - --disable-static \ - --build=$TARGET - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -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/$PKGNAM-$VERSION -cp -a \ - AUTHORS COPYING ChangeLog NEWS README.md \ - $PKG/usr/doc/$PKGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/telepathy/libaccounts-glib/slack-desc b/deps/telepathy/libaccounts-glib/slack-desc deleted file mode 100644 index cdff69d..0000000 --- a/deps/telepathy/libaccounts-glib/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -libaccounts-glib: libaccounts-glib (GLib client library for the accounts database) -libaccounts-glib: -libaccounts-glib: This project is a library for managing accounts which can be used -libaccounts-glib: from GLib applications. It is part of the accounts-sso project. -libaccounts-glib: -libaccounts-glib: -libaccounts-glib: -libaccounts-glib: -libaccounts-glib: -libaccounts-glib: Homepage: https://gitlab.com/accounts-sso/libaccounts-glib -libaccounts-glib: diff --git a/deps/telepathy/libaccounts-qt5/.url b/deps/telepathy/libaccounts-qt5/.url deleted file mode 100644 index 813b209..0000000 --- a/deps/telepathy/libaccounts-qt5/.url +++ /dev/null @@ -1,2 +0,0 @@ -https://gitlab.com/accounts-sso/libaccounts-qt/repository/VERSION_1.15/archive.tar.gz - diff --git a/deps/telepathy/libaccounts-qt5/libaccounts-qt5.SlackBuild b/deps/telepathy/libaccounts-qt5/libaccounts-qt5.SlackBuild deleted file mode 100755 index d942b30..0000000 --- a/deps/telepathy/libaccounts-qt5/libaccounts-qt5.SlackBuild +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/sh - -# Copyright 2015, 2016, 2017, 2018 Eric Hameleers, Eindhoven, NL -# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -PKGNAM=libaccounts-qt5 -SRCNAM=libaccounts-qt -VERSION=${VERSION:-"1.15"} -BUILD=${BUILD:-2} - -NUMJOBS=${NUMJOBS:-" -j$(nproc) "} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1 -cd $SRCNAM-$VERSION || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Fix a compilation error: -sed -i accounts-qt.pro \ - -e 's|SUBDIRS += Accounts tests|SUBDIRS += Accounts|' - -QTDIR=/usr/lib${LIBDIRSUFFIX}/qt5 \ -PATH=$QTDIR/bin:$PATH \ - qmake \ - PREFIX=/usr \ - LIBDIR=/usr/lib${LIBDIRSUFFIX} - -make $NUMJOBS || make || exit 1 -make install INSTALL_ROOT=$PKG || exit 1 - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - COPYING INSTALL NOTES README.md TODO \ - $PKG/usr/doc/$PKGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/telepathy/libaccounts-qt5/slack-desc b/deps/telepathy/libaccounts-qt5/slack-desc deleted file mode 100644 index 9b8125f..0000000 --- a/deps/telepathy/libaccounts-qt5/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -libaccounts-qt5: libaccounts-qt5 (Qt5 client library for the accounts database) -libaccounts-qt5: -libaccounts-qt5: This project is a library for managing accounts which can be used -libaccounts-qt5: from Qt5 applications. It is part of the accounts-sso project. -libaccounts-qt5: -libaccounts-qt5: -libaccounts-qt5: -libaccounts-qt5: -libaccounts-qt5: -libaccounts-qt5: Homepage: https://gitlab.com/accounts-sso/libaccounts-qt -libaccounts-qt5: diff --git a/deps/telepathy/libnice/.url b/deps/telepathy/libnice/.url deleted file mode 100644 index a6cbef3..0000000 --- a/deps/telepathy/libnice/.url +++ /dev/null @@ -1 +0,0 @@ -https://nice.freedesktop.org/releases/libnice-0.1.14.tar.gz diff --git a/deps/telepathy/libnice/libnice.SlackBuild b/deps/telepathy/libnice/libnice.SlackBuild deleted file mode 100755 index d8cbf09..0000000 --- a/deps/telepathy/libnice/libnice.SlackBuild +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/sh - -# Slackware build script for libnice - -# Copyright 2009 David Woodfall <dave@dawoodfall.net> -# Copyright 2013 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# Modified 2015, 2017, 2018 by Eric Hameleers <alien@slackware.com> - -PKGNAM=libnice -VERSION=${VERSION:-0.1.14} -BUILD=${BUILD:-2} - -NUMJOBS=${NUMJOBS:-" -j$(nproc) "} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - SLKLDFLAGS="-L/usr/lib64" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - SLKLDFLAGS="" - LIBDIRSUFFIX="64" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -fi - -case "$ARCH" in - arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; - *) TARGET=$ARCH-slackware-linux ;; -esac - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --localstatedir=/var \ - --sysconfdir=/etc \ - --build=$TARGET - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - AUTHORS ChangeLog NEWS COPYING INSTALL README COPYING.LGPL TODO COPYING.MPL \ - $PKG/usr/doc/$PKGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/telepathy/libnice/slack-desc b/deps/telepathy/libnice/slack-desc deleted file mode 100644 index b54c67b..0000000 --- a/deps/telepathy/libnice/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -libnice: libnice (The GLib ICE implementation) -libnice: -libnice: Libnice is an implementation of the IETF's draft Interactice -libnice: Connectivity Establishment standard (ICE). It provides GLib-based -libnice: library, libnice and GStreamer elements. ICE is useful for -libnice: applications that want to establish peer-to-peer UDP data streams. -libnice: It automates the process of traversing NATs and provides security -libnice: against some attacks. Existing standards that use ICE include -libnice: include Session Initiation Protocol (SIP) and XMPP Jingle. -libnice: -libnice: Homepage: http://nice.freedesktop.org diff --git a/deps/telepathy/libotr/.url b/deps/telepathy/libotr/.url deleted file mode 100644 index d538b2a..0000000 --- a/deps/telepathy/libotr/.url +++ /dev/null @@ -1 +0,0 @@ -https://otr.cypherpunks.ca/libotr-4.1.1.tar.gz diff --git a/deps/telepathy/libotr/libotr.SlackBuild b/deps/telepathy/libotr/libotr.SlackBuild deleted file mode 100755 index ba41322..0000000 --- a/deps/telepathy/libotr/libotr.SlackBuild +++ /dev/null @@ -1,125 +0,0 @@ -#!/bin/sh - -# Copyright 2015, 2018 Eric Hameleers, Eindhoven, NL -# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -PKGNAM=libotr -VERSION=${VERSION:-4.1.1} -BUILD=${BUILD:-2} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - SLKLDFLAGS="-L/usr/lib64" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - SLKLDFLAGS="" - LIBDIRSUFFIX="64" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -fi - -case "$ARCH" in - arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; - *) TARGET=$ARCH-slackware-linux ;; -esac - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION || exit 1 - -# Make sure ownerships and permissions are sane: -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -LDFLAGS="$SLKLDFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --localstatedir=/var \ - --sysconfdir=/etc \ - --disable-static \ - --build=$TARGET \ - || exit 1 - -# Build and install: -make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -# Strip binaries (if any): -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -# Compress man pages (if any): -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -# Add documentation: -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - README AUTHORS COPYING* ChangeLog NEWS UPGRADING Protocol-v3.html \ - $PKG/usr/doc/$PKGNAM-$VERSION - -# Add a package description: -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -# Build the package: -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/telepathy/libotr/slack-desc b/deps/telepathy/libotr/slack-desc deleted file mode 100644 index 5d21d54..0000000 --- a/deps/telepathy/libotr/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------------------------------------------------------| -libotr: libotr (Off The Record Messaging Library and Toolkit) -libotr: -libotr: OTR allows you to have private conversations over IM by providing: -libotr: - Encryption: No one else can read your instant messages. -libotr: - Authentication: You are sure the other side is who you think it is. -libotr: - Deniability: The messages you send do not have digital signatures -libotr: that are checkable by a third party. -libotr: - Perfect forward secrecy: If you lose control of your private keys, -libotr: no previous conversation is compromised. -libotr: -libotr: Homepage: https://otr.cypherpunks.ca/ diff --git a/deps/telepathy/libsignon-glib/.url b/deps/telepathy/libsignon-glib/.url deleted file mode 100644 index c9b5dce..0000000 --- a/deps/telepathy/libsignon-glib/.url +++ /dev/null @@ -1 +0,0 @@ -https://gitlab.com/accounts-sso/libsignon-glib/repository/VERSION_1.14/archive.tar.gz diff --git a/deps/telepathy/libsignon-glib/libsignon-glib.SlackBuild b/deps/telepathy/libsignon-glib/libsignon-glib.SlackBuild deleted file mode 100755 index 5be4ac2..0000000 --- a/deps/telepathy/libsignon-glib/libsignon-glib.SlackBuild +++ /dev/null @@ -1,121 +0,0 @@ -#!/bin/sh - -# Copyright 2015, 2016, 2017, 2018 Eric Hameleers, Eindhoven, NL -# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -PKGNAM=libsignon-glib -VERSION=${VERSION:-"1.14"} -BUILD=${BUILD:-2} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - SLKLDFLAGS="-L/usr/lib64" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - SLKLDFLAGS="" - LIBDIRSUFFIX="64" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -fi - -case "$ARCH" in - arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; - *) TARGET=$ARCH-slackware-linux ;; -esac - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PKGNAM-$VERSION* -tar xvf $CWD/$PKGNAM-$VERSION*.tar.?z* || exit 1 -cd $PKGNAM-$VERSION* || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -export CFLAGS="$SLKCFLAGS" -export CXXFLAGS="$SLKCFLAGS" -export LDFLAGS="$SLKLDFLAGS" - -if [ ! -x configure ]; then - ./autogen.sh -fi - -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --localstatedir=/var \ - --sysconfdir=/etc \ - --disable-python \ - --disable-static \ - --build=$TARGET - -# No parallel make: -make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - AUTHORS COPYING ChangeLog NEWS README \ - $PKG/usr/doc/$PKGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/telepathy/libsignon-glib/slack-desc b/deps/telepathy/libsignon-glib/slack-desc deleted file mode 100644 index cc395e0..0000000 --- a/deps/telepathy/libsignon-glib/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -libsignon-glib: libsignon-glib (GLib client library for managing SSO credentials) -libsignon-glib: -libsignon-glib: This project is a library for managing single signon credentials -libsignon-glib: which can be used from GLib applications. -libsignon-glib: It is effectively a GLib binding for the D-Bus API provided by -libsignon-glib: signond. It is part of the accounts-sso project. -libsignon-glib: -libsignon-glib: -libsignon-glib: -libsignon-glib: Homepage: https://gitlab.com/accounts-sso/libsignon-glib -libsignon-glib: diff --git a/deps/telepathy/signon-plugin-oauth2/.url b/deps/telepathy/signon-plugin-oauth2/.url deleted file mode 100644 index e49023b..0000000 --- a/deps/telepathy/signon-plugin-oauth2/.url +++ /dev/null @@ -1 +0,0 @@ -https://gitlab.com/accounts-sso/signon-plugin-oauth2/repository/VERSION_0.24/archive.tar.gz diff --git a/deps/telepathy/signon-plugin-oauth2/signon-plugin-oauth2.SlackBuild b/deps/telepathy/signon-plugin-oauth2/signon-plugin-oauth2.SlackBuild deleted file mode 100755 index d74b3ce..0000000 --- a/deps/telepathy/signon-plugin-oauth2/signon-plugin-oauth2.SlackBuild +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/sh - -# Copyright 2015, 2016, 2017, 2018 Eric Hameleers, Eindhoven, NL -# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -PKGNAM=signon-plugin-oauth2 -VERSION=${VERSION:-"0.24"} -BUILD=${BUILD:-2} - -NUMJOBS=${NUMJOBS:-" -j$(nproc) "} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION || exit 1 -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -QTDIR=/usr/lib${LIBDIRSUFFIX}/qt5 \ -PATH=$QTDIR/bin:$PATH \ - qmake \ - PREFIX=/usr \ - LIBDIR=/usr/lib${LIBDIRSUFFIX} - -make $NUMJOBS || make || exit 1 -make install INSTALL_ROOT=$PKG || exit 1 - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - COPYING README.md \ - $PKG/usr/doc/$PKGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/telepathy/signon-plugin-oauth2/slack-desc b/deps/telepathy/signon-plugin-oauth2/slack-desc deleted file mode 100644 index 14158ba..0000000 --- a/deps/telepathy/signon-plugin-oauth2/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler-------------------------------------------------------| -signon-plugin-oauth2: signon-plugin-oauth2 (OAuth plugins for Sign-On daemon) -signon-plugin-oauth2: -signon-plugin-oauth2: This package provides OAuth 1.0 and 2.0 authentication -signon-plugin-oauth2: plugin for the Sign-On daemon. -signon-plugin-oauth2: -signon-plugin-oauth2: -signon-plugin-oauth2: -signon-plugin-oauth2: -signon-plugin-oauth2: -signon-plugin-oauth2: Homepage: https://gitlab.com/accounts-sso/signon-plugin-oauth2 -signon-plugin-oauth2: diff --git a/deps/telepathy/signon-ui/.url b/deps/telepathy/signon-ui/.url deleted file mode 100644 index 9c68416..0000000 --- a/deps/telepathy/signon-ui/.url +++ /dev/null @@ -1 +0,0 @@ -https://gitlab.com/accounts-sso/signon-ui/repository/0.17+15.10.20150810-0ubuntu1/archive.tar.gz diff --git a/deps/telepathy/signon-ui/patches/signon-ui_qt5.patch b/deps/telepathy/signon-ui/patches/signon-ui_qt5.patch deleted file mode 100644 index 2035c1e..0000000 --- a/deps/telepathy/signon-ui/patches/signon-ui_qt5.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/src/request.cpp b/src/request.cpp -index 5556c79..4f51e8e 100644 ---- a/src/request.cpp -+++ b/src/request.cpp -@@ -81,9 +81,7 @@ public: - } - - private Q_SLOTS: --#if HAS_XEMBED - void onEmbedError(); --#endif - void onIndicatorCallFinished(QDBusPendingCallWatcher *watcher); - - private: -@@ -194,9 +192,9 @@ void RequestPrivate::setWidget(QWidget *widget) - #endif - } - --#if HAS_XEMBED - void RequestPrivate::onEmbedError() - { -+#if HAS_XEMBED - Q_Q(Request); - - QX11EmbedWidget *embed = qobject_cast<QX11EmbedWidget*>(sender()); -@@ -204,8 +202,8 @@ void RequestPrivate::onEmbedError() - - q->fail(SIGNON_UI_ERROR_EMBEDDING_FAILED, - QString("Embedding signon UI failed: %1").arg(embed->error())); --} - #endif -+} - - Accounts::Account *RequestPrivate::findAccount() - { diff --git a/deps/telepathy/signon-ui/signon-ui.SlackBuild b/deps/telepathy/signon-ui/signon-ui.SlackBuild deleted file mode 100755 index a8001ea..0000000 --- a/deps/telepathy/signon-ui/signon-ui.SlackBuild +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/sh - -# Copyright 2015, 2017, 2018 Eric Hameleers, Eindhoven, NL -# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -PKGNAM=signon-ui -SRCNAM=signon-ui -VERSION=${VERSION:-"0.17+15.10.20150810"} -BUILD=${BUILD:-5} - -NUMJOBS=${NUMJOBS:-" -j$(nproc) "} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf ${SRCNAM}-${VERSION} -tar xvf $CWD/${SRCNAM}_${VERSION}.orig.tar.?z* || exit 1 -cd ${SRCNAM}-${VERSION} || exit 1 - -# Make it compile against Qt5: -cat $CWD/patches/signon-ui_qt5.patch | patch -p1 --verbose || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -QTDIR=/usr/lib${LIBDIRSUFFIX}/qt5 \ -PATH=$QTDIR/bin:$PATH \ - qmake \ - PREFIX=/usr \ - LIBDIR=/usr/lib${LIBDIRSUFFIX} - -make $NUMJOBS || make || exit 1 -make install INSTALL_ROOT=$PKG || exit 1 - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - COPYING INSTALL NOTES README TODO \ - $PKG/usr/doc/$PKGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/telepathy/signon-ui/slack-desc b/deps/telepathy/signon-ui/slack-desc deleted file mode 100644 index 284ae56..0000000 --- a/deps/telepathy/signon-ui/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler-------------------------------------------------------| -signon-ui: signon-ui (online account sign-on user interface) -signon-ui: -signon-ui: Sign-on UI is the component responsible for handling the user -signon-ui: interactions which can happen during the login process of an -signon-ui: online account. -signon-ui: It can show password dialogs and dialogs with embedded web pages. -signon-ui: -signon-ui: -signon-ui: -signon-ui: Homepage: https://launchpad.net/online-accounts-signon-ui -signon-ui: diff --git a/deps/telepathy/signon/.url b/deps/telepathy/signon/.url deleted file mode 100644 index f2bc9fb..0000000 --- a/deps/telepathy/signon/.url +++ /dev/null @@ -1 +0,0 @@ -https://gitlab.com/accounts-sso/signond/repository/VERSION_8.59/archive.tar.gz diff --git a/deps/telepathy/signon/signon.SlackBuild b/deps/telepathy/signon/signon.SlackBuild deleted file mode 100755 index eac2930..0000000 --- a/deps/telepathy/signon/signon.SlackBuild +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/sh - -# Copyright 2015, 2016, 2017, 2018 Eric Hameleers, Eindhoven, NL -# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -PKGNAM=signon -SRCNAM=signond -VERSION=${VERSION:-"8.59"} -BUILD=${BUILD:-2} - -NUMJOBS=${NUMJOBS:-" -j$(nproc) "} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || AR -CH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1 -cd $SRCNAM-$VERSION || exit 1 -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -QTDIR=/usr/lib${LIBDIRSUFFIX}/qt5 \ -PATH=$QTDIR/bin:$PATH \ - qmake \ - PREFIX=/usr \ - LIBDIR=/usr/lib${LIBDIRSUFFIX} - -make $NUMJOBS || make || exit 1 -make install INSTALL_ROOT=$PKG || exit 1 - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a COPYING INSTALL NOTES README.md TODO \ - $PKG/usr/doc/$PKGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/telepathy/signon/slack-desc b/deps/telepathy/signon/slack-desc deleted file mode 100644 index 8ee4c02..0000000 --- a/deps/telepathy/signon/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler-------------------------------------------------------| -signon: signon (Qt Framework for credential storage and authentication service) -signon: -signon: The SignOn daemon is a D-Bus service which performs user authentication -signon: on 5 behalf of its clients. -signon: There are currently authentication plugins for OAuth 1.0 6 and 2.0, -signon: SASL, Digest-MD5, and plain username/password combination. -signon: -signon: -signon: -signon: Homepage: https://gitlab.com/accounts-sso/signond -signon: diff --git a/deps/telepathy/telegram-qt/.url b/deps/telepathy/telegram-qt/.url deleted file mode 100644 index f182d32..0000000 --- a/deps/telepathy/telegram-qt/.url +++ /dev/null @@ -1 +0,0 @@ -https://github.com/Kaffeine/telegram-qt/archive/telegram-qt-0.1.0.tar.gz diff --git a/deps/telepathy/telegram-qt/doinst.sh b/deps/telepathy/telegram-qt/doinst.sh deleted file mode 100644 index 6f09c59..0000000 --- a/deps/telepathy/telegram-qt/doinst.sh +++ /dev/null @@ -1,3 +0,0 @@ -# Flush D-Bus user/group information caches and trigger policy changes: -killall -HUP dbus-daemon 2>&1 - diff --git a/deps/telepathy/telegram-qt/slack-desc b/deps/telepathy/telegram-qt/slack-desc deleted file mode 100644 index 2187119..0000000 --- a/deps/telepathy/telegram-qt/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler-------------------------------------------------------| -telegram-qt: telegram-qt (Qt-based library for Telegram network) -telegram-qt: -telegram-qt: This package contains a Qt-based library for Telegram network. -telegram-qt: -telegram-qt: -telegram-qt: -telegram-qt: -telegram-qt: -telegram-qt: -telegram-qt: Homepage: https://github.com/Kaffeine/telegram-qt/ -telegram-qt: diff --git a/deps/telepathy/telegram-qt/telegram-qt.SlackBuild b/deps/telepathy/telegram-qt/telegram-qt.SlackBuild deleted file mode 100755 index 46ccae3..0000000 --- a/deps/telepathy/telegram-qt/telegram-qt.SlackBuild +++ /dev/null @@ -1,121 +0,0 @@ -#!/bin/sh - -# Copyright 2016, 2017, 2018 Eric Hameleers, Eindhoven, NL -# Copyright 2016 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -PKGNAM=telegram-qt -VERSION=${VERSION:-"0.1.0"} -BUILD=${BUILD:-3} - -NUMJOBS=${NUMJOBS:-" -j$(nproc) "} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -case "$ARCH" in - arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; - *) TARGET=$ARCH-slackware-linux ;; -esac - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf ${PKGNAM}*-${VERSION} -tar xvf $CWD/${PKGNAM}*-${VERSION}.tar.?z* || exit 1 -cd ${PKGNAM}*-${VERSION} || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -mkdir -p build -cd build - QTDIR=/usr/lib${LIBDIRSUFFIX}/qt5 \ - PATH=$QTDIR/bin:$PATH \ - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DENABLE_EXAMPLES=OFF \ - -DENABLE_TESTS=OFF \ - .. - make $NUMJOBS || make || exit 1 - make install DESTDIR=$PKG || exit 1 -cd .. - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -# Compress man pages (if any): -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/$PKGNAM-$VERSION -cp -a \ - AUTHORS COPYING ChangeLog NEWS README \ - $PKG/usr/doc/$PKGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/telepathy/telepathy-accounts-signon/.url b/deps/telepathy/telepathy-accounts-signon/.url deleted file mode 100644 index 9a0c0e1..0000000 --- a/deps/telepathy/telepathy-accounts-signon/.url +++ /dev/null @@ -1 +0,0 @@ -https://gitlab.com/accounts-sso/telepathy-accounts-signon/repository/archive.tar.gz?ref=1.0 diff --git a/deps/telepathy/telepathy-accounts-signon/slack-desc b/deps/telepathy/telepathy-accounts-signon/slack-desc deleted file mode 100644 index 50e217c..0000000 --- a/deps/telepathy/telepathy-accounts-signon/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler-------------------------------------------------------| -telepathy-accounts-signon: telepathy-accounts-signon (Telepathy providers for Sign-On) -telepathy-accounts-signon: -telepathy-accounts-signon: This package contains a mission control plugin for Telepathy, -telepathy-accounts-signon: integrating with libaccounts and libsignon -telepathy-accounts-signon: to provide IM accounts and authentication. -telepathy-accounts-signon: -telepathy-accounts-signon: -telepathy-accounts-signon: -telepathy-accounts-signon: -telepathy-accounts-signon: Homepage: https://gitlab.com/accounts-sso/telepathy-accounts-signon -telepathy-accounts-signon: diff --git a/deps/telepathy/telepathy-accounts-signon/telepathy-accounts-signon.SlackBuild b/deps/telepathy/telepathy-accounts-signon/telepathy-accounts-signon.SlackBuild deleted file mode 100755 index 5eef854..0000000 --- a/deps/telepathy/telepathy-accounts-signon/telepathy-accounts-signon.SlackBuild +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/sh - -# Copyright 2015, 2016, 2017, 2018 Eric Hameleers, Eindhoven, NL -# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -PKGNAM=telepathy-accounts-signon -VERSION=${VERSION:-"1.0"} -BUILD=${BUILD:-5} - -NUMJOBS=${NUMJOBS:-" -j$(nproc) "} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PKGNAM-${VERSION}* -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-${VERSION}* || exit 1 -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -QTDIR=/usr/lib${LIBDIRSUFFIX}/qt5 \ -PATH=$QTDIR/bin:$PATH \ - qmake \ - PREFIX=/usr \ - LIBDIR=/usr/lib${LIBDIRSUFFIX} - -make $NUMJOBS || make || exit 1 -make install INSTALL_ROOT=$PKG || exit 1 - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - COPYING* NOTES README \ - $PKG/usr/doc/$PKGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/telepathy/telepathy-farstream/.url b/deps/telepathy/telepathy-farstream/.url deleted file mode 100644 index 948ff63..0000000 --- a/deps/telepathy/telepathy-farstream/.url +++ /dev/null @@ -1 +0,0 @@ -http://telepathy.freedesktop.org/releases/telepathy-farstream/telepathy-farstream-0.6.2.tar.gz diff --git a/deps/telepathy/telepathy-farstream/slack-desc b/deps/telepathy/telepathy-farstream/slack-desc deleted file mode 100755 index cd19fe0..0000000 --- a/deps/telepathy/telepathy-farstream/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler----------------------------------------------------| -telepathy-farstream: telepathy-farstream (Telepathy bindings for farstream) -telepathy-farstream: -telepathy-farstream: Telepathy Farstream is a Telepathy client library that uses -telepathy-farstream: Farstream to handle Call channels. -telepathy-farstream: -telepathy-farstream: -telepathy-farstream: -telepathy-farstream: -telepathy-farstream: -telepathy-farstream: Homepage: http://telepathy.freedesktop.org/ -telepathy-farstream: diff --git a/deps/telepathy/telepathy-farstream/telepathy-farstream.SlackBuild b/deps/telepathy/telepathy-farstream/telepathy-farstream.SlackBuild deleted file mode 100755 index 6f891b6..0000000 --- a/deps/telepathy/telepathy-farstream/telepathy-farstream.SlackBuild +++ /dev/null @@ -1,120 +0,0 @@ -#!/bin/sh - -# Copyright 2013 Heinz Wiesinger, Amsterdam, NL -# Copyright 2013 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# Modified 2015, 2016, 2018 by Eric Hameleers <alien@slackware.com> - - -PKGNAM=telepathy-farstream -VERSION=${VERSION:-0.6.2} -BUILD=${BUILD:-4} - -NUMJOBS=${NUMJOBS:-" -j$(nproc) "} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - SLKLDFLAGS="-L/usr/lib64" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - SLKLDFLAGS="" - LIBDIRSUFFIX="64" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -fi - -case "$ARCH" in - arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; - *) TARGET=$ARCH-slackware-linux ;; -esac - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -LDFLAGS="$SLKLDFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --libexecdir=/usr/lib${LIBDIRSUFFIX}/telepathy \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --localstatedir=/var \ - --sysconfdir=/etc \ - --disable-static \ - --disable-python \ - --build=$TARGET - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - AUTHORS COPYING INSTALL NEWS README \ - $PKG/usr/doc/$PKGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/telepathy/telepathy-gabble/.url b/deps/telepathy/telepathy-gabble/.url deleted file mode 100644 index d5aa873..0000000 --- a/deps/telepathy/telepathy-gabble/.url +++ /dev/null @@ -1 +0,0 @@ -http://telepathy.freedesktop.org/releases/telepathy-gabble/telepathy-gabble-0.18.4.tar.gz diff --git a/deps/telepathy/telepathy-gabble/doinst.sh b/deps/telepathy/telepathy-gabble/doinst.sh deleted file mode 100644 index 6f09c59..0000000 --- a/deps/telepathy/telepathy-gabble/doinst.sh +++ /dev/null @@ -1,3 +0,0 @@ -# Flush D-Bus user/group information caches and trigger policy changes: -killall -HUP dbus-daemon 2>&1 - diff --git a/deps/telepathy/telepathy-gabble/slack-desc b/deps/telepathy/telepathy-gabble/slack-desc deleted file mode 100644 index c520bb2..0000000 --- a/deps/telepathy/telepathy-gabble/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler----------------------------------------------------| -telepathy-gabble: telepathy-gabble (Jabber/XMPP connection manager for Telepathy) -telepathy-gabble: -telepathy-gabble: Gabble is a Jabber/XMPP connection manager for the Telepathy -telepathy-gabble: framework, currently supporting: -telepathy-gabble: * single-user chats -telepathy-gabble: * multi-user chats -telepathy-gabble: * voice/video calling -telepathy-gabble: * file transfer -telepathy-gabble: with Jabber/XMPP and Google Talk interoperability. -telepathy-gabble: -telepathy-gabble: Homepage: http://telepathy.freedesktop.org/ diff --git a/deps/telepathy/telepathy-glib/.url b/deps/telepathy/telepathy-glib/.url deleted file mode 100644 index 1c9d8f1..0000000 --- a/deps/telepathy/telepathy-glib/.url +++ /dev/null @@ -1 +0,0 @@ -http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.24.1.tar.gz diff --git a/deps/telepathy/telepathy-glib/slack-desc b/deps/telepathy/telepathy-glib/slack-desc deleted file mode 100644 index 7178726..0000000 --- a/deps/telepathy/telepathy-glib/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler-------------------------------------------------------| -telepathy-glib: telepathy-glib (GObject bindings for Telepathy) -telepathy-glib: -telepathy-glib: Telepathy-GLib is a GObject-based C binding for Telepathy, -telepathy-glib: a unified framework for all forms of real time conversations, -telepathy-glib: including instant messaging, IRC, voice calls and video calls. -telepathy-glib: -telepathy-glib: -telepathy-glib: -telepathy-glib: -telepathy-glib: Homepage: http://telepathy.freedesktop.org/ -telepathy-glib: diff --git a/deps/telepathy/telepathy-glib/telepathy-glib.SlackBuild b/deps/telepathy/telepathy-glib/telepathy-glib.SlackBuild deleted file mode 100755 index 86aae36..0000000 --- a/deps/telepathy/telepathy-glib/telepathy-glib.SlackBuild +++ /dev/null @@ -1,111 +0,0 @@ -#!/bin/sh - -# Copyright 2015, 2016, 2017, 2018 Eric Hameleers, Eindhoven, NL -# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -PKGNAM=telepathy-glib -VERSION=${VERSION:-"0.24.1"} -BUILD=${BUILD:-5} - -NUMJOBS=${NUMJOBS:-" -j$(nproc) "} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -case "$ARCH" in - arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; - *) TARGET=$ARCH-slackware-linux ;; -esac - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION || exit 1 -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --libexecdir=/usr/lib${LIBDIRSUFFIX}/telepathy \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --localstatedir=/var \ - --sysconfdir=/etc \ - --disable-static \ - --build=$TARGET || exit 1 - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - AUTHORS COPYING ChangeLog INSTALL NEWS README \ - $PKG/usr/doc/$PKGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/telepathy/telepathy-haze/.url b/deps/telepathy/telepathy-haze/.url deleted file mode 100644 index efb0535..0000000 --- a/deps/telepathy/telepathy-haze/.url +++ /dev/null @@ -1 +0,0 @@ -http://telepathy.freedesktop.org/releases/telepathy-haze/telepathy-haze-0.8.0.tar.gz diff --git a/deps/telepathy/telepathy-haze/doinst.sh b/deps/telepathy/telepathy-haze/doinst.sh deleted file mode 100644 index 6f09c59..0000000 --- a/deps/telepathy/telepathy-haze/doinst.sh +++ /dev/null @@ -1,3 +0,0 @@ -# Flush D-Bus user/group information caches and trigger policy changes: -killall -HUP dbus-daemon 2>&1 - diff --git a/deps/telepathy/telepathy-haze/patches/telepathy-haze.libpurple.patch b/deps/telepathy/telepathy-haze/patches/telepathy-haze.libpurple.patch deleted file mode 100644 index c2aa0c3..0000000 --- a/deps/telepathy/telepathy-haze/patches/telepathy-haze.libpurple.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- telepathy-haze-0.8.0/src/media-stream.c.orig 2013-09-23 18:51:19.000000000 +0200 -+++ telepathy-haze-0.8.0/src/media-stream.c 2016-04-17 17:11:03.995364296 +0200 -@@ -1076,7 +1076,7 @@ - if (proto == TP_MEDIA_STREAM_BASE_PROTO_UDP) - protocol = PURPLE_MEDIA_NETWORK_PROTOCOL_UDP; - else if (proto == TP_MEDIA_STREAM_BASE_PROTO_TCP) -- protocol = PURPLE_MEDIA_NETWORK_PROTOCOL_TCP; -+ protocol = PURPLE_MEDIA_NETWORK_PROTOCOL_TCP_PASSIVE; - else - DEBUG ("Unknown network protocol"); - diff --git a/deps/telepathy/telepathy-haze/slack-desc b/deps/telepathy/telepathy-haze/slack-desc deleted file mode 100644 index e9e0de1..0000000 --- a/deps/telepathy/telepathy-haze/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler-------------------------------------------------------| -telepathy-haze: telepathy-haze (telepathy backend using libpurple protocols) -telepathy-haze: -telepathy-haze: Telepathy-haze is a backend for Telepathy which enables the -telepathy-haze: use of libpurple (Pidgin) protocols when configuring accounts. -telepathy-haze: -telepathy-haze: -telepathy-haze: -telepathy-haze: -telepathy-haze: -telepathy-haze: Homepage: http://telepathy.freedesktop.org/ -telepathy-haze: diff --git a/deps/telepathy/telepathy-haze/telepathy-haze.SlackBuild b/deps/telepathy/telepathy-haze/telepathy-haze.SlackBuild deleted file mode 100755 index 711faf7..0000000 --- a/deps/telepathy/telepathy-haze/telepathy-haze.SlackBuild +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/sh - -# Copyright 2015, 2018 Eric Hameleers, Eindhoven, NL -# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -PKGNAM=telepathy-haze -VERSION=${VERSION:-"0.8.0"} -BUILD=${BUILD:-3} - -NUMJOBS=${NUMJOBS:-" -j$(nproc) "} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -case "$ARCH" in - arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; - *) TARGET=$ARCH-slackware-linux ;; -esac - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION || exit 1 - -# libpurple changed protocol: -cat $CWD/patches/telepathy-haze.libpurple.patch | patch -p1 --verbose || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --libexecdir=/usr/lib${LIBDIRSUFFIX}/telepathy \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --localstatedir=/var \ - --sysconfdir=/etc \ - --disable-static \ - --build=$TARGET || exit 1 - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -# Compress man pages (if any): -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/$PKGNAM-$VERSION -cp -a \ - AUTHORS COPYING ChangeLog NEWS README \ - $PKG/usr/doc/$PKGNAM-$VERSION - -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 $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/telepathy/telepathy-logger-qt5/.url b/deps/telepathy/telepathy-logger-qt5/.url deleted file mode 100644 index 89f5718..0000000 --- a/deps/telepathy/telepathy-logger-qt5/.url +++ /dev/null @@ -1 +0,0 @@ -https://download.kde.org/stable/telepathy-logger-qt/17.08/src/telepathy-logger-qt-17.08.0.tar.xz diff --git a/deps/telepathy/telepathy-logger-qt5/slack-desc b/deps/telepathy/telepathy-logger-qt5/slack-desc deleted file mode 100755 index 8d9102e..0000000 --- a/deps/telepathy/telepathy-logger-qt5/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler----------------------------------------------------| -telepathy-logger-qt5: telepathy-logger-qt5 (Telepathy Logging for Qt5) -telepathy-logger-qt5: -telepathy-logger-qt5: Qt5 bindings for telepathy-logger. -telepathy-logger-qt5: -telepathy-logger-qt5: -telepathy-logger-qt5: -telepathy-logger-qt5: -telepathy-logger-qt5: -telepathy-logger-qt5: See also: -telepathy-logger-qt5: https://community.kde.org/Real-Time_Communication_and_Collaboration -telepathy-logger-qt5: diff --git a/deps/telepathy/telepathy-logger-qt5/telepathy-logger-qt5.SlackBuild b/deps/telepathy/telepathy-logger-qt5/telepathy-logger-qt5.SlackBuild deleted file mode 100755 index 6e24c42..0000000 --- a/deps/telepathy/telepathy-logger-qt5/telepathy-logger-qt5.SlackBuild +++ /dev/null @@ -1,115 +0,0 @@ -#!/bin/sh - -# Copyright 2013 Heinz Wiesinger, Amsterdam, NL -# Copyright 2013 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# Modified 2015, 2016, 2017, 2018 by Eric Hameleers <alien@slackware.com> - - -PKGNAM=telepathy-logger-qt5 -SRCNAM=telepathy-logger-qt -VERSION=${VERSION:-17.08.0} -BUILD=${BUILD:-2} - -NUMJOBS=${NUMJOBS:-" -j$(nproc) "} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - SLKLDFLAGS="-L/usr/lib64" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - SLKLDFLAGS="" - LIBDIRSUFFIX="64" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1 -cd $SRCNAM-$VERSION || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -mkdir -p build -cd build - QTDIR=/usr/lib${LIBDIRSUFFIX}/qt5 \ - PATH=$QTDIR/bin:$PATH \ - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - .. - make $NUMJOBS || make || exit 1 - make install DESTDIR=$PKG || exit 1 -cd .. - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - AUTHORS COPYING TODO \ - $PKG/usr/doc/$PKGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/telepathy/telepathy-logger/.url b/deps/telepathy/telepathy-logger/.url deleted file mode 100644 index e729ead..0000000 --- a/deps/telepathy/telepathy-logger/.url +++ /dev/null @@ -1 +0,0 @@ -http://telepathy.freedesktop.org/releases/telepathy-logger/telepathy-logger-0.8.2.tar.bz2 diff --git a/deps/telepathy/telepathy-logger/slack-desc b/deps/telepathy/telepathy-logger/slack-desc deleted file mode 100755 index 8f2e123..0000000 --- a/deps/telepathy/telepathy-logger/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler----------------------------------------------------| -telepathy-logger: telepathy-logger (Telepathy framework logging daemon) -telepathy-logger: -telepathy-logger: tp-logger is a headless Observer client that logs information -telepathy-logger: received by the Telepathy framework. It features pluggable backends -telepathy-logger: to log different sorts of messages, in different formats. -telepathy-logger: -telepathy-logger: -telepathy-logger: -telepathy-logger: -telepathy-logger: Homepage: http://telepathy.freedesktop.org/wiki/ -telepathy-logger: diff --git a/deps/telepathy/telepathy-logger/telepathy-logger.SlackBuild b/deps/telepathy/telepathy-logger/telepathy-logger.SlackBuild deleted file mode 100755 index 6492d55..0000000 --- a/deps/telepathy/telepathy-logger/telepathy-logger.SlackBuild +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/sh - -# Copyright 2013 Heinz Wiesinger, Amsterdam, NL -# Copyright 2013 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# Modified 2015, 2016, 2017, 2018 by Eric Hameleers <alien@slackware.com> - - -PKGNAM=telepathy-logger -VERSION=${VERSION:-0.8.2} -BUILD=${BUILD:-6} - -NUMJOBS=${NUMJOBS:-" -j$(nproc) "} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -case "$ARCH" in - arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; - *) TARGET=$ARCH-slackware-linux ;; -esac - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --disable-static \ - --enable-introspection \ - --build=$TARGET - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - AUTHORS COPYING INSTALL NEWS README \ - $PKG/usr/doc/$PKGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/telepathy/telepathy-mission-control/.url b/deps/telepathy/telepathy-mission-control/.url deleted file mode 100644 index 802a652..0000000 --- a/deps/telepathy/telepathy-mission-control/.url +++ /dev/null @@ -1 +0,0 @@ -http://telepathy.freedesktop.org/releases/telepathy-mission-control/telepathy-mission-control-5.16.4.tar.gz diff --git a/deps/telepathy/telepathy-mission-control/doinst.sh b/deps/telepathy/telepathy-mission-control/doinst.sh deleted file mode 100644 index 56b9e41..0000000 --- a/deps/telepathy/telepathy-mission-control/doinst.sh +++ /dev/null @@ -1,6 +0,0 @@ -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/deps/telepathy/telepathy-mission-control/slack-desc b/deps/telepathy/telepathy-mission-control/slack-desc deleted file mode 100644 index 9ff9612..0000000 --- a/deps/telepathy/telepathy-mission-control/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler-------------------------------------------------------| -telepathy-mission-control: telepathy-mission-control (abstraction library for Telepathy) -telepathy-mission-control: -telepathy-mission-control: This package contains a Telepathy component providing -telepathy-mission-control: abstraction of some of the details of connection managers. -telepathy-mission-control: -telepathy-mission-control: -telepathy-mission-control: -telepathy-mission-control: -telepathy-mission-control: -telepathy-mission-control: Homepage: http://telepathy.freedesktop.org/ -telepathy-mission-control: diff --git a/deps/telepathy/telepathy-mission-control/telepathy-mission-control.SlackBuild b/deps/telepathy/telepathy-mission-control/telepathy-mission-control.SlackBuild deleted file mode 100755 index e5fc3b6..0000000 --- a/deps/telepathy/telepathy-mission-control/telepathy-mission-control.SlackBuild +++ /dev/null @@ -1,118 +0,0 @@ -#!/bin/sh - -# Copyright 2015, 2016, 2017, 2018 Eric Hameleers, Eindhoven, NL -# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -PKGNAM=telepathy-mission-control -VERSION=${VERSION:-"5.16.4"} -BUILD=${BUILD:-3} - -NUMJOBS=${NUMJOBS:-" -j$(nproc) "} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || AR -CH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -case "$ARCH" in - arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; - *) TARGET=$ARCH-slackware-linux ;; -esac - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION || exit 1 -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --libexecdir=/usr/lib${LIBDIRSUFFIX}/telepathy \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --localstatedir=/var \ - --sysconfdir=/etc \ - --with-connectivity=nm \ - --enable-libaccounts-sso \ - --enable-upower \ - --disable-static \ - --disable-schemas-compile \ - --build=$TARGET || exit 1 - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -# Compress man pages (if any): -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/$PKGNAM-$VERSION -cp -a \ - AUTHORS COPYING ChangeLog INSTALL NEWS README \ - $PKG/usr/doc/$PKGNAM-$VERSION - -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 $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/telepathy/telepathy-morse/.url b/deps/telepathy/telepathy-morse/.url deleted file mode 100644 index 224a0b2..0000000 --- a/deps/telepathy/telepathy-morse/.url +++ /dev/null @@ -1 +0,0 @@ -https://github.com/TelepathyIM/telepathy-morse.git diff --git a/deps/telepathy/telepathy-morse/doinst.sh b/deps/telepathy/telepathy-morse/doinst.sh deleted file mode 100644 index 6f09c59..0000000 --- a/deps/telepathy/telepathy-morse/doinst.sh +++ /dev/null @@ -1,3 +0,0 @@ -# Flush D-Bus user/group information caches and trigger policy changes: -killall -HUP dbus-daemon 2>&1 - diff --git a/deps/telepathy/telepathy-morse/slack-desc b/deps/telepathy/telepathy-morse/slack-desc deleted file mode 100644 index 3c1d22b..0000000 --- a/deps/telepathy/telepathy-morse/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler-------------------------------------------------------| -telepathy-morse: telepathy-morse (Telegram connection manager for Telepathy) -telepathy-morse: -telepathy-morse: Morse is a Qt-based Telegram connection manager for -telepathy-morse: the Telepathy framework. -telepathy-morse: -telepathy-morse: -telepathy-morse: -telepathy-morse: -telepathy-morse: -telepathy-morse: Homepage: http://telepathy.freedesktop.org/ -telepathy-morse: diff --git a/deps/telepathy/telepathy-morse/telepathy-morse.SlackBuild b/deps/telepathy/telepathy-morse/telepathy-morse.SlackBuild deleted file mode 100755 index 1dbe103..0000000 --- a/deps/telepathy/telepathy-morse/telepathy-morse.SlackBuild +++ /dev/null @@ -1,121 +0,0 @@ -#!/bin/sh - -# Copyright 2016, 2017, 2018 Eric Hameleers, Eindhoven, NL -# Copyright 2016 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -PKGNAM=telepathy-morse -VERSION=${VERSION:-"9429155_20161107git"} -BUILD=${BUILD:-3} - -NUMJOBS=${NUMJOBS:-" -j$(nproc) "} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -case "$ARCH" in - arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; - *) TARGET=$ARCH-slackware-linux ;; -esac - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -mkdir -p build -cd build - QTDIR=/usr/lib${LIBDIRSUFFIX}/qt5 \ - PATH=$QTDIR/bin:$PATH \ - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DENABLE_EXAMPLES=OFF \ - -DENABLE_TESTS=OFF \ - .. - make $NUMJOBS || make || exit 1 - make install DESTDIR=$PKG || exit 1 -cd .. - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -# Compress man pages (if any): -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/$PKGNAM-$VERSION -cp -a \ - AUTHORS COPYING ChangeLog NEWS README \ - $PKG/usr/doc/$PKGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/telepathy/telepathy-qt5/.url b/deps/telepathy/telepathy-qt5/.url deleted file mode 100644 index fbfa203..0000000 --- a/deps/telepathy/telepathy-qt5/.url +++ /dev/null @@ -1 +0,0 @@ -http://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-0.9.7.tar.gz diff --git a/deps/telepathy/telepathy-qt5/patches/glibc-2.20.patch b/deps/telepathy/telepathy-qt5/patches/glibc-2.20.patch deleted file mode 100644 index 0366b0f..0000000 --- a/deps/telepathy/telepathy-qt5/patches/glibc-2.20.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2a460afdbd0cb39d8dcecaf6cea5ce9ce7d3216b Mon Sep 17 00:00:00 2001 -From: Niels Ole Salscheider <niels_ole@salscheider-online.de> -Date: Fri, 5 Jun 2015 12:47:13 +0200 -Subject: CMake: Fixed deprecated _BSD_SOURCE. - -Since glibc-2.20 _DEFAULT_SOURCE definition is also required. - -Reviewed-by: Alexandr Akulich - -diff --git a/cmake/modules/TelepathyDefaults.cmake b/cmake/modules/TelepathyDefaults.cmake -index d34b24d..dc98697 100644 ---- a/cmake/modules/TelepathyDefaults.cmake -+++ b/cmake/modules/TelepathyDefaults.cmake -@@ -108,7 +108,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) - endif(${NOT_RELEASE} EQUAL 1) - - if(CMAKE_SYSTEM_NAME MATCHES Linux) -- add_definitions(-D_BSD_SOURCE) -+ add_definitions(-D_BSD_SOURCE -D_DEFAULT_SOURCE) - endif(CMAKE_SYSTEM_NAME MATCHES Linux) - - # Compiler coverage --- -cgit v0.10.2 - diff --git a/deps/telepathy/telepathy-qt5/patches/gstreamer-1.0.patch b/deps/telepathy/telepathy-qt5/patches/gstreamer-1.0.patch deleted file mode 100644 index 403bb3e..0000000 --- a/deps/telepathy/telepathy-qt5/patches/gstreamer-1.0.patch +++ /dev/null @@ -1,106 +0,0 @@ -From c9ce33029e75c104b8a6f04098ba2aaa16df0c30 Mon Sep 17 00:00:00 2001 -From: Iain Lane <iain@orangesquash.org.uk> -Date: Fri, 31 Jul 2015 10:08:51 +0100 -Subject: [PATCH] Fix FindGstreamer.cmake to grab the include directories from - gstreamer's pcfile properly - -Resolves build failure with gstreamer shipped in some distros. ---- - TelepathyQt/Farstream/CMakeLists.txt | 2 +- - cmake/modules/FindGStreamer.cmake | 38 ++++++++++++++++++++---------------- - 2 files changed, 22 insertions(+), 18 deletions(-) - -diff --git a/TelepathyQt/Farstream/CMakeLists.txt b/TelepathyQt/Farstream/CMakeLists.txt -index 250bfdb..dd71430 100644 ---- a/TelepathyQt/Farstream/CMakeLists.txt -+++ b/TelepathyQt/Farstream/CMakeLists.txt -@@ -2,7 +2,7 @@ if(FARSTREAM_COMPONENTS_FOUND) - include_directories(${TELEPATHY_FARSTREAM_INCLUDE_DIR} - ${TELEPATHY_GLIB_INCLUDE_DIR} - ${FARSTREAM_INCLUDE_DIR} -- ${GSTREAMER_INCLUDE_DIR} -+ ${GSTREAMER_INCLUDE_DIRS} - ${GLIB2_INCLUDE_DIR} - ${LIBXML2_INCLUDE_DIR} - ${DBUS_INCLUDE_DIR}) -diff --git a/cmake/modules/FindGStreamer.cmake b/cmake/modules/FindGStreamer.cmake -index 63fb41c..25ce180 100644 ---- a/cmake/modules/FindGStreamer.cmake -+++ b/cmake/modules/FindGStreamer.cmake -@@ -2,7 +2,7 @@ - # Once done this will define - # - # GSTREAMER_FOUND - system has GStreamer --# GSTREAMER_INCLUDE_DIR - the GStreamer include directory -+# GSTREAMER_INCLUDE_DIRS - the GStreamer include directories - # GSTREAMER_LIBRARIES - the libraries needed to use GStreamer - # GSTREAMER_DEFINITIONS - Compiler switches required for using GStreamer - -@@ -13,12 +13,12 @@ - - # TODO: Other versions --> GSTREAMER_X_Y_FOUND (Example: GSTREAMER_0_8_FOUND and GSTREAMER_0_10_FOUND etc) - --IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) -+IF (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) - # in cache already - SET(GSTREAMER_FIND_QUIETLY TRUE) --ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) -+ELSE (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) - SET(GSTREAMER_FIND_QUIETLY FALSE) --ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) -+ENDIF (GSTREAMER_INCLUDE_DIRS AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) - - IF (NOT WIN32) - # use pkg-config to get the directories and then use these values -@@ -31,12 +31,16 @@ IF (NOT WIN32) - SET(GSTREAMER_DEFINITIONS ${PC_GSTREAMER_CFLAGS_OTHER}) - ENDIF (NOT WIN32) - --FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h -- PATHS -- ${PC_GSTREAMER_INCLUDEDIR} -- ${PC_GSTREAMER_INCLUDE_DIRS} -- PATH_SUFFIXES gstreamer-1.0 -- ) -+if (DEFINED PC_GSTREAMER_INCLUDE_DIRS) -+ SET(GSTREAMER_INCLUDE_DIRS ${PC_GSTREAMER_INCLUDE_DIRS}) -+ELSE (DEFINED PC_GSTREAMER_INCLUDE_DIRS) -+ FIND_PATH(GSTREAMER_INCLUDE_DIRS gst/gst.h -+ PATHS -+ ${PC_GSTREAMER_INCLUDEDIR} -+ ${PC_GSTREAMER_INCLUDE_DIRS} -+ PATH_SUFFIXES gstreamer-1.0 -+ ) -+ENDIF (DEFINED PC_GSTREAMER_INCLUDE_DIRS) - - FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0 - PATHS -@@ -51,11 +55,11 @@ FIND_LIBRARY(GSTREAMER_BASE_LIBRARY NAMES gstbase-1.0 - ) - - --IF (GSTREAMER_INCLUDE_DIR) -- #MESSAGE(STATUS "DEBUG: Found GStreamer include dir: ${GSTREAMER_INCLUDE_DIR}") --ELSE (GSTREAMER_INCLUDE_DIR) -- MESSAGE(STATUS "GStreamer: WARNING: include dir not found") --ENDIF (GSTREAMER_INCLUDE_DIR) -+IF (GSTREAMER_INCLUDE_DIRS) -+ #MESSAGE(STATUS "DEBUG: Found GStreamer include dir: ${GSTREAMER_INCLUDE_DIRS}") -+ELSE (GSTREAMER_INCLUDE_DIRS) -+ MESSAGE(STATUS "GStreamer: WARNING: include dirs not found") -+ENDIF (GSTREAMER_INCLUDE_DIRS) - - IF (GSTREAMER_LIBRARIES) - #MESSAGE(STATUS "DEBUG: Found GStreamer library: ${GSTREAMER_LIBRARIES}") -@@ -65,6 +69,6 @@ ENDIF (GSTREAMER_LIBRARIES) - - - INCLUDE(FindPackageHandleStandardArgs) --FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer DEFAULT_MSG GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIR GSTREAMER_BASE_LIBRARY) -+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer DEFAULT_MSG GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIRS GSTREAMER_BASE_LIBRARY) - --MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY) -+MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIRS GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY) --- -2.4.6 - diff --git a/deps/telepathy/telepathy-qt5/slack-desc b/deps/telepathy/telepathy-qt5/slack-desc deleted file mode 100755 index c88e8e9..0000000 --- a/deps/telepathy/telepathy-qt5/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler----------------------------------------------------| -telepathy-qt5: telepathy-qt5 (Qt5 bindings for Telepathy) -telepathy-qt5: -telepathy-qt5: This is a library for Qt5-based Telepathy clients. -telepathy-qt5: -telepathy-qt5: -telepathy-qt5: -telepathy-qt5: -telepathy-qt5: -telepathy-qt5: -telepathy-qt5: Homepage: http://telepathy.freedesktop.org/doc/telepathy-qt/ -telepathy-qt5: diff --git a/deps/telepathy/telepathy-qt5/telepathy-qt5.SlackBuild b/deps/telepathy/telepathy-qt5/telepathy-qt5.SlackBuild deleted file mode 100755 index 8426ca6..0000000 --- a/deps/telepathy/telepathy-qt5/telepathy-qt5.SlackBuild +++ /dev/null @@ -1,121 +0,0 @@ -#!/bin/sh - -# Copyright 2015, 2016, 2017, 2018 Eric Hameleers, Eindhoven, NL -# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -PKGNAM=telepathy-qt5 -SRCNAM=telepathy-qt -VERSION=${VERSION:-0.9.7} -BUILD=${BUILD:-3} - -NUMJOBS=${NUMJOBS:-" -j$(nproc) "} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - SLKLDFLAGS="-L/usr/lib64" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" - SLKLDFLAGS="" - LIBDIRSUFFIX="64" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - SLKLDFLAGS="" - LIBDIRSUFFIX="" -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1 -cd $SRCNAM-$VERSION || exit 1 - -## Compensate for the new glibc: -#cat $CWD/patches/glibc-2.20.patch | patch -p1 --verbose || exit 1 -## Compensate for the new gstreamer-1.0: -#cat $CWD/patches/gstreamer-1.0.patch | patch -p1 --verbose || exit 1 - -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -mkdir -p build -cd build - QTDIR=/usr/lib${LIBDIRSUFFIX}/qt5 \ - PATH=$QTDIR/bin:$PATH \ - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DDESIRED_QT_VERSION=5 \ - -DENABLE_EXAMPLES=OFF \ - -DENABLE_TESTS=OFF \ - .. - make $NUMJOBS || make || exit 1 - make install DESTDIR=$PKG || exit 1 -cd .. - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - AUTHORS COPYING NEWS README \ - $PKG/usr/doc/$PKGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/telepathy/telepathy.SlackBuild b/deps/telepathy/telepathy.SlackBuild deleted file mode 100755 index 21831ce..0000000 --- a/deps/telepathy/telepathy.SlackBuild +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh - -# Build (and install) all KDE Telepathy dependencies -# Modified from the KDE Slackware script by Eric Hameleers <alien@slackware.com> - -# Set initial variables: -CWD=$(pwd) -TMP=${TMP:-/tmp} - -# Set the config option variables if they are not already set: -[ -r ./telepathy.options ] && . ./telepathy.options - -# This avoids compiling a version number into KDE's .la files: -QTDIR=/usr/lib${LIBDIRSUFFIX}/qt5 ; export QTDIR - -ALLDEPS=" \ - libotr \ - libnice \ - farstream \ - libaccounts-glib \ - libaccounts-qt5 \ - signon \ - signon-plugin-oauth2 \ - signon-ui \ - libsignon-glib \ - telepathy-glib \ - telepathy-farstream \ - telepathy-haze \ - telepathy-gabble \ - telepathy-qt5 \ - telegram-qt \ - telepathy-morse \ - telepathy-logger \ - telepathy-logger-qt5 \ - telepathy-mission-control \ - telepathy-accounts-signon \ - " - -# Allow for specification of individual packages to be built: -if [ -z "$1" ]; then - MODQUEUE=$ALLDEPS -else - MODQUEUE=$* -fi - -for module in \ - $MODQUEUE ; -do - cd $module - ./$module.SlackBuild - if [ $? = 0 ]; then - # Yes, I will build with the fresh packages installed: - upgradepkg --install-new --reinstall ${TMP}/${module}-*.txz - # Keep MIME database current: - /usr/bin/update-mime-database /usr/share/mime 1> /dev/null 2> /dev/null & - rm -rf ${TMP}/package-${module} ${TMP}/${module}-$VERSION - else - echo "${module} failed to build." - exit 1 - fi - cd - ; -done - diff --git a/deps/updates.SlackBuild b/deps/updates.SlackBuild deleted file mode 100755 index a88bdc9..0000000 --- a/deps/updates.SlackBuild +++ /dev/null @@ -1,116 +0,0 @@ -#!/bin/sh - -# Build (and install) all KDE dependencies -# Modified from the KDE Slackware script by Eric Hameleers <alien@slackware.com> - -# Set initial variables: -CWD=$(pwd) -TMP=${TMP:-/tmp} - -# Set the config option variables if they are not already set: -[ -r ./alldeps.options ] && . ./alldeps.options - -# This avoids compiling a version number into KDE's .la files: -QTDIR=/usr/lib${LIBDIRSUFFIX}/qt ; export QTDIR - -ALLDEPS=" \ - extra-cmake-modules \ - ninja \ - sni-qt \ - SDL_sound \ - OpenAL \ - libwacom \ - libinput \ - libxkbcommon \ - wayland \ - hyphen \ - qt5 \ - qt5-webkit \ - qca-qt5 \ - libdbusmenu-qt5 \ - qt-gstreamer \ - phonon \ - phonon-gstreamer \ - python-enum34 \ - pyxdg \ - pcaudiolib \ - espeak-ng \ - dotconf \ - flite \ - speech-dispatcher \ - qt5-speech \ - sip \ - PyQt \ - PyQt5 \ - QScintilla \ - polkit-qt5-1 \ - grantlee \ - grantlee-qt4 \ - poppler \ - json-glib \ - libdbusmenu-gtk \ - libindicator \ - libappindicator \ - cfitsio \ - lmdb \ - libdmtx \ - qrencode \ - libproxy \ - telepathy \ - hack-font-ttf \ - noto-font-ttf \ - noto-cjk-font-ttf \ - gpgme \ - lensfun \ - opencv \ - dvdauthor \ - vid.stab \ - frei0r-plugins \ - mlt \ - cracklib \ - libpwquality \ - accountsservice \ - libburn \ - qtav \ - ddcutil \ - id3lib \ - cryptopp \ - cryfs \ - python3-random2 \ - perl-path-tiny \ - perl-template-toolkit \ - freecell-solver \ - drumstick \ - libsass \ - sassc \ - " - # Only needed when adding support for Wayland: - #elogind \ - # Not needed, conflicts with qt-gstreamer files - #qt-gstreamer0 \ - -# Allow for specification of individual packages to be built: -if [ -z "$1" ]; then - MODQUEUE=$ALLDEPS -else - MODQUEUE=$* -fi - -for module in \ - $MODQUEUE ; -do - cd $module - ./$module.SlackBuild - if [ $? = 0 ]; then - # Yes, I will build with the fresh packages installed: - upgradepkg --install-new --reinstall ${TMP}/${module}-*.txz - # Keep MIME database current: - /usr/bin/update-mime-database /usr/share/mime 1> /dev/null 2> /dev/null & - rm -rf ${TMP}/package-${module} ${TMP}/${module}-$VERSION - else - echo "${module} failed to build." - exit 1 - fi - cd - ; -done - diff --git a/deps/util-linux/adjtimex_1.29-2.2.diff b/deps/util-linux/adjtimex_1.29-2.2.diff new file mode 100644 index 0000000..62ac1db --- /dev/null +++ b/deps/util-linux/adjtimex_1.29-2.2.diff @@ -0,0 +1,6564 @@ +--- adjtimex-1.29.orig/adjtimex.lsm ++++ adjtimex-1.29/adjtimex.lsm +@@ -1,7 +1,7 @@ + Begin4 + Title: adjtimex - display or set the kernel time variables + Version: 1.29 +-Entered-date: 2010-04-16 ++Entered-date: 2010-05-26 + Description: Display or set the kernel time variables. + This program gives you raw access to the kernel time variables. For + a machine connected to the Internet, or equipped with a precision +--- adjtimex-1.29.orig/config.h ++++ adjtimex-1.29/config.h +@@ -0,0 +1,80 @@ ++/* config.h. Generated from config.h.in by configure. */ ++/* config.h.in. Generated from configure.in by autoheader. */ ++ ++/* Define to 1 if you have the `gettimeofday' function. */ ++#define HAVE_GETTIMEOFDAY 1 ++ ++/* Define to 1 if you have the <inttypes.h> header file. */ ++#define HAVE_INTTYPES_H 1 ++ ++/* Define to 1 if you have the <linux/rtc.h> header file. */ ++#define HAVE_LINUX_RTC_H 1 ++ ++/* Define to 1 if you have the <memory.h> header file. */ ++#define HAVE_MEMORY_H 1 ++ ++/* Define to 1 if you have the `mktime' function. */ ++#define HAVE_MKTIME 1 ++ ++/* Define to 1 if you have the `putenv' function. */ ++#define HAVE_PUTENV 1 ++ ++/* Define to 1 if you have the `select' function. */ ++#define HAVE_SELECT 1 ++ ++/* Define to 1 if you have the <stdint.h> header file. */ ++#define HAVE_STDINT_H 1 ++ ++/* Define to 1 if you have the <stdlib.h> header file. */ ++#define HAVE_STDLIB_H 1 ++ ++/* Define to 1 if you have the <strings.h> header file. */ ++#define HAVE_STRINGS_H 1 ++ ++/* Define to 1 if you have the <string.h> header file. */ ++#define HAVE_STRING_H 1 ++ ++/* Define to 1 if you have the <sys/stat.h> header file. */ ++#define HAVE_SYS_STAT_H 1 ++ ++/* Define to 1 if you have the <sys/time.h> header file. */ ++#define HAVE_SYS_TIME_H 1 ++ ++/* Define to 1 if you have the <sys/types.h> header file. */ ++#define HAVE_SYS_TYPES_H 1 ++ ++/* Define to 1 if you have the <unistd.h> header file. */ ++#define HAVE_UNISTD_H 1 ++ ++/* Define to the address where bug reports for this package should be sent. */ ++#define PACKAGE_BUGREPORT "" ++ ++/* Define to the full name of this package. */ ++#define PACKAGE_NAME "" ++ ++/* Define to the full name and version of this package. */ ++#define PACKAGE_STRING "" ++ ++/* Define to the one symbol short name of this package. */ ++#define PACKAGE_TARNAME "" ++ ++/* Define to the version of this package. */ ++#define PACKAGE_VERSION "" ++ ++/* Define to 1 if you have the ANSI C header files. */ ++#define STDC_HEADERS 1 ++ ++/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ ++#define TIME_WITH_SYS_TIME 1 ++ ++/* Define to 1 if your <sys/time.h> declares `struct tm'. */ ++/* #undef TM_IN_SYS_TIME */ ++ ++/* Define to empty if `const' does not conform to ANSI C. */ ++/* #undef const */ ++ ++/* Define to `__inline__' or `__inline' if that's what the C compiler ++ calls it, or to nothing if 'inline' is not supported under any name. */ ++#ifndef __cplusplus ++/* #undef inline */ ++#endif +--- adjtimex-1.29.orig/config.sub ++++ adjtimex-1.29/config.sub +@@ -0,0 +1,1760 @@ ++#! /bin/sh ++# Configuration validation subroutine script. ++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011 Free Software Foundation, Inc. ++ ++timestamp='2011-03-23' ++ ++# This file is (in principle) common to ALL GNU software. ++# The presence of a machine in this file suggests that SOME GNU software ++# can handle that machine. It does not imply ALL GNU software can. ++# ++# This file is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA ++# 02110-1301, USA. ++# ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. ++ ++ ++# Please send patches to <config-patches@gnu.org>. Submit a context ++# diff and a properly formatted GNU ChangeLog entry. ++# ++# Configuration subroutine to validate and canonicalize a configuration type. ++# Supply the specified configuration type as an argument. ++# If it is invalid, we print an error message on stderr and exit with code 1. ++# Otherwise, we print the canonical config type on stdout and succeed. ++ ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD ++ ++# This file is supposed to be the same for all GNU packages ++# and recognize all the CPU types, system types and aliases ++# that are meaningful with *any* GNU software. ++# Each package is responsible for reporting which valid configurations ++# it does not support. The user should be able to distinguish ++# a failure to support a valid configuration from a meaningless ++# configuration. ++ ++# The goal of this file is to map all the various variations of a given ++# machine specification into a single specification in the form: ++# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM ++# or in some cases, the newer four-part form: ++# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM ++# It is wrong to echo any other type of specification. ++ ++me=`echo "$0" | sed -e 's,.*/,,'` ++ ++usage="\ ++Usage: $0 [OPTION] CPU-MFR-OPSYS ++ $0 [OPTION] ALIAS ++ ++Canonicalize a configuration name. ++ ++Operation modes: ++ -h, --help print this help, then exit ++ -t, --time-stamp print date of last modification, then exit ++ -v, --version print version number, then exit ++ ++Report bugs and patches to <config-patches@gnu.org>." ++ ++version="\ ++GNU config.sub ($timestamp) ++ ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free ++Software Foundation, Inc. ++ ++This is free software; see the source for copying conditions. There is NO ++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." ++ ++help=" ++Try \`$me --help' for more information." ++ ++# Parse command line ++while test $# -gt 0 ; do ++ case $1 in ++ --time-stamp | --time* | -t ) ++ echo "$timestamp" ; exit ;; ++ --version | -v ) ++ echo "$version" ; exit ;; ++ --help | --h* | -h ) ++ echo "$usage"; exit ;; ++ -- ) # Stop option processing ++ shift; break ;; ++ - ) # Use stdin as input. ++ break ;; ++ -* ) ++ echo "$me: invalid option $1$help" ++ exit 1 ;; ++ ++ *local*) ++ # First pass through any local machine types. ++ echo $1 ++ exit ;; ++ ++ * ) ++ break ;; ++ esac ++done ++ ++case $# in ++ 0) echo "$me: missing argument$help" >&2 ++ exit 1;; ++ 1) ;; ++ *) echo "$me: too many arguments$help" >&2 ++ exit 1;; ++esac ++ ++# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). ++# Here we must recognize all the valid KERNEL-OS combinations. ++maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` ++case $maybe_os in ++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ ++ linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ ++ knetbsd*-gnu* | netbsd*-gnu* | \ ++ kopensolaris*-gnu* | \ ++ storm-chaos* | os2-emx* | rtmk-nova*) ++ os=-$maybe_os ++ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ++ ;; ++ *) ++ basic_machine=`echo $1 | sed 's/-[^-]*$//'` ++ if [ $basic_machine != $1 ] ++ then os=`echo $1 | sed 's/.*-/-/'` ++ else os=; fi ++ ;; ++esac ++ ++### Let's recognize common machines as not being operating systems so ++### that things like config.sub decstation-3100 work. We also ++### recognize some manufacturers as not being operating systems, so we ++### can provide default operating systems below. ++case $os in ++ -sun*os*) ++ # Prevent following clause from handling this invalid input. ++ ;; ++ -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ ++ -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ ++ -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ ++ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ ++ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ ++ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ ++ -apple | -axis | -knuth | -cray | -microblaze) ++ os= ++ basic_machine=$1 ++ ;; ++ -bluegene*) ++ os=-cnk ++ ;; ++ -sim | -cisco | -oki | -wec | -winbond) ++ os= ++ basic_machine=$1 ++ ;; ++ -scout) ++ ;; ++ -wrs) ++ os=-vxworks ++ basic_machine=$1 ++ ;; ++ -chorusos*) ++ os=-chorusos ++ basic_machine=$1 ++ ;; ++ -chorusrdb) ++ os=-chorusrdb ++ basic_machine=$1 ++ ;; ++ -hiux*) ++ os=-hiuxwe2 ++ ;; ++ -sco6) ++ os=-sco5v6 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -sco5) ++ os=-sco3.2v5 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -sco4) ++ os=-sco3.2v4 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -sco3.2.[4-9]*) ++ os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -sco3.2v[4-9]*) ++ # Don't forget version if it is 3.2v4 or newer. ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -sco5v6*) ++ # Don't forget version if it is 3.2v4 or newer. ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -sco*) ++ os=-sco3.2v2 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -udk*) ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -isc) ++ os=-isc2.2 ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -clix*) ++ basic_machine=clipper-intergraph ++ ;; ++ -isc*) ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ++ ;; ++ -lynx*) ++ os=-lynxos ++ ;; ++ -ptx*) ++ basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` ++ ;; ++ -windowsnt*) ++ os=`echo $os | sed -e 's/windowsnt/winnt/'` ++ ;; ++ -psos*) ++ os=-psos ++ ;; ++ -mint | -mint[0-9]*) ++ basic_machine=m68k-atari ++ os=-mint ++ ;; ++esac ++ ++# Decode aliases for certain CPU-COMPANY combinations. ++case $basic_machine in ++ # Recognize the basic CPU types without company name. ++ # Some are omitted here because they have special meanings below. ++ 1750a | 580 \ ++ | a29k \ ++ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ ++ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ ++ | am33_2.0 \ ++ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ ++ | bfin \ ++ | c4x | clipper \ ++ | d10v | d30v | dlx | dsp16xx \ ++ | fido | fr30 | frv \ ++ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ ++ | i370 | i860 | i960 | ia64 \ ++ | ip2k | iq2000 \ ++ | lm32 \ ++ | m32c | m32r | m32rle | m68000 | m68k | m88k \ ++ | maxq | mb | microblaze | mcore | mep | metag \ ++ | mips | mipsbe | mipseb | mipsel | mipsle \ ++ | mips16 \ ++ | mips64 | mips64el \ ++ | mips64octeon | mips64octeonel \ ++ | mips64orion | mips64orionel \ ++ | mips64r5900 | mips64r5900el \ ++ | mips64vr | mips64vrel \ ++ | mips64vr4100 | mips64vr4100el \ ++ | mips64vr4300 | mips64vr4300el \ ++ | mips64vr5000 | mips64vr5000el \ ++ | mips64vr5900 | mips64vr5900el \ ++ | mipsisa32 | mipsisa32el \ ++ | mipsisa32r2 | mipsisa32r2el \ ++ | mipsisa64 | mipsisa64el \ ++ | mipsisa64r2 | mipsisa64r2el \ ++ | mipsisa64sb1 | mipsisa64sb1el \ ++ | mipsisa64sr71k | mipsisa64sr71kel \ ++ | mipstx39 | mipstx39el \ ++ | mn10200 | mn10300 \ ++ | moxie \ ++ | mt \ ++ | msp430 \ ++ | nds32 | nds32le | nds32be \ ++ | nios | nios2 \ ++ | ns16k | ns32k \ ++ | open8 \ ++ | or32 \ ++ | pdp10 | pdp11 | pj | pjl \ ++ | powerpc | powerpc64 | powerpc64le | powerpcle \ ++ | pyramid \ ++ | rx \ ++ | score \ ++ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ ++ | sh64 | sh64le \ ++ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ ++ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ ++ | spu \ ++ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ ++ | ubicom32 \ ++ | v850 | v850e \ ++ | we32k \ ++ | x86 | xc16x | xstormy16 | xtensa \ ++ | z8k | z80) ++ basic_machine=$basic_machine-unknown ++ ;; ++ c54x) ++ basic_machine=tic54x-unknown ++ ;; ++ c55x) ++ basic_machine=tic55x-unknown ++ ;; ++ c6x) ++ basic_machine=tic6x-unknown ++ ;; ++ m6811 | m68hc11 | m6812 | m68hc12 | picochip) ++ # Motorola 68HC11/12. ++ basic_machine=$basic_machine-unknown ++ os=-none ++ ;; ++ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ++ ;; ++ ms1) ++ basic_machine=mt-unknown ++ ;; ++ ++ strongarm | thumb | xscale) ++ basic_machine=arm-unknown ++ ;; ++ ++ xscaleeb) ++ basic_machine=armeb-unknown ++ ;; ++ ++ xscaleel) ++ basic_machine=armel-unknown ++ ;; ++ ++ # We use `pc' rather than `unknown' ++ # because (1) that's what they normally are, and ++ # (2) the word "unknown" tends to confuse beginning users. ++ i*86 | x86_64) ++ basic_machine=$basic_machine-pc ++ ;; ++ # Object if more than one company name word. ++ *-*-*) ++ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 ++ exit 1 ++ ;; ++ # Recognize the basic CPU types with company name. ++ 580-* \ ++ | a29k-* \ ++ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ ++ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ ++ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ ++ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ ++ | avr-* | avr32-* \ ++ | bfin-* | bs2000-* \ ++ | c[123]* | c30-* | [cjt]90-* | c4x-* \ ++ | clipper-* | craynv-* | cydra-* \ ++ | d10v-* | d30v-* | dlx-* \ ++ | elxsi-* \ ++ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ ++ | h8300-* | h8500-* \ ++ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ ++ | i*86-* | i860-* | i960-* | ia64-* \ ++ | ip2k-* | iq2000-* \ ++ | lm32-* \ ++ | m32c-* | m32r-* | m32rle-* \ ++ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ ++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ ++ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ ++ | mips16-* \ ++ | mips64-* | mips64el-* \ ++ | mips64octeon-* | mips64octeonel-* \ ++ | mips64orion-* | mips64orionel-* \ ++ | mips64r5900-* | mips64r5900el-* \ ++ | mips64vr-* | mips64vrel-* \ ++ | mips64vr4100-* | mips64vr4100el-* \ ++ | mips64vr4300-* | mips64vr4300el-* \ ++ | mips64vr5000-* | mips64vr5000el-* \ ++ | mips64vr5900-* | mips64vr5900el-* \ ++ | mipsisa32-* | mipsisa32el-* \ ++ | mipsisa32r2-* | mipsisa32r2el-* \ ++ | mipsisa64-* | mipsisa64el-* \ ++ | mipsisa64r2-* | mipsisa64r2el-* \ ++ | mipsisa64sb1-* | mipsisa64sb1el-* \ ++ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ ++ | mipstx39-* | mipstx39el-* \ ++ | mmix-* \ ++ | mt-* \ ++ | msp430-* \ ++ | nds32-* | nds32le-* | nds32be-* \ ++ | nios-* | nios2-* \ ++ | none-* | np1-* | ns16k-* | ns32k-* \ ++ | open8-* \ ++ | orion-* \ ++ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ ++ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ ++ | pyramid-* \ ++ | romp-* | rs6000-* | rx-* \ ++ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ ++ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ ++ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ ++ | sparclite-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ ++ | tahoe-* \ ++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ ++ | tile-* | tilegx-* \ ++ | tron-* \ ++ | ubicom32-* \ ++ | v850-* | v850e-* | vax-* \ ++ | we32k-* \ ++ | x86-* | x86_64-* | xc16x-* | xps100-* \ ++ | xstormy16-* | xtensa*-* \ ++ | ymp-* \ ++ | z8k-* | z80-*) ++ ;; ++ # Recognize the basic CPU types without company name, with glob match. ++ xtensa*) ++ basic_machine=$basic_machine-unknown ++ ;; ++ # Recognize the various machine names and aliases which stand ++ # for a CPU type and a company and sometimes even an OS. ++ 386bsd) ++ basic_machine=i386-unknown ++ os=-bsd ++ ;; ++ 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) ++ basic_machine=m68000-att ++ ;; ++ 3b*) ++ basic_machine=we32k-att ++ ;; ++ a29khif) ++ basic_machine=a29k-amd ++ os=-udi ++ ;; ++ abacus) ++ basic_machine=abacus-unknown ++ ;; ++ adobe68k) ++ basic_machine=m68010-adobe ++ os=-scout ++ ;; ++ alliant | fx80) ++ basic_machine=fx80-alliant ++ ;; ++ altos | altos3068) ++ basic_machine=m68k-altos ++ ;; ++ am29k) ++ basic_machine=a29k-none ++ os=-bsd ++ ;; ++ amd64) ++ basic_machine=x86_64-pc ++ ;; ++ amd64-*) ++ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ amdahl) ++ basic_machine=580-amdahl ++ os=-sysv ++ ;; ++ amiga | amiga-*) ++ basic_machine=m68k-unknown ++ ;; ++ amigaos | amigados) ++ basic_machine=m68k-unknown ++ os=-amigaos ++ ;; ++ amigaunix | amix) ++ basic_machine=m68k-unknown ++ os=-sysv4 ++ ;; ++ apollo68) ++ basic_machine=m68k-apollo ++ os=-sysv ++ ;; ++ apollo68bsd) ++ basic_machine=m68k-apollo ++ os=-bsd ++ ;; ++ aros) ++ basic_machine=i386-pc ++ os=-aros ++ ;; ++ aux) ++ basic_machine=m68k-apple ++ os=-aux ++ ;; ++ balance) ++ basic_machine=ns32k-sequent ++ os=-dynix ++ ;; ++ blackfin) ++ basic_machine=bfin-unknown ++ os=-linux ++ ;; ++ blackfin-*) ++ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; ++ bluegene*) ++ basic_machine=powerpc-ibm ++ os=-cnk ++ ;; ++ c54x-*) ++ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c55x-*) ++ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c6x-*) ++ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ c90) ++ basic_machine=c90-cray ++ os=-unicos ++ ;; ++ cegcc) ++ basic_machine=arm-unknown ++ os=-cegcc ++ ;; ++ convex-c1) ++ basic_machine=c1-convex ++ os=-bsd ++ ;; ++ convex-c2) ++ basic_machine=c2-convex ++ os=-bsd ++ ;; ++ convex-c32) ++ basic_machine=c32-convex ++ os=-bsd ++ ;; ++ convex-c34) ++ basic_machine=c34-convex ++ os=-bsd ++ ;; ++ convex-c38) ++ basic_machine=c38-convex ++ os=-bsd ++ ;; ++ cray | j90) ++ basic_machine=j90-cray ++ os=-unicos ++ ;; ++ craynv) ++ basic_machine=craynv-cray ++ os=-unicosmp ++ ;; ++ cr16 | cr16-*) ++ basic_machine=cr16-unknown ++ os=-elf ++ ;; ++ crds | unos) ++ basic_machine=m68k-crds ++ ;; ++ crisv32 | crisv32-* | etraxfs*) ++ basic_machine=crisv32-axis ++ ;; ++ cris | cris-* | etrax*) ++ basic_machine=cris-axis ++ ;; ++ crx) ++ basic_machine=crx-unknown ++ os=-elf ++ ;; ++ da30 | da30-*) ++ basic_machine=m68k-da30 ++ ;; ++ decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) ++ basic_machine=mips-dec ++ ;; ++ decsystem10* | dec10*) ++ basic_machine=pdp10-dec ++ os=-tops10 ++ ;; ++ decsystem20* | dec20*) ++ basic_machine=pdp10-dec ++ os=-tops20 ++ ;; ++ delta | 3300 | motorola-3300 | motorola-delta \ ++ | 3300-motorola | delta-motorola) ++ basic_machine=m68k-motorola ++ ;; ++ delta88) ++ basic_machine=m88k-motorola ++ os=-sysv3 ++ ;; ++ dicos) ++ basic_machine=i686-pc ++ os=-dicos ++ ;; ++ djgpp) ++ basic_machine=i586-pc ++ os=-msdosdjgpp ++ ;; ++ dpx20 | dpx20-*) ++ basic_machine=rs6000-bull ++ os=-bosx ++ ;; ++ dpx2* | dpx2*-bull) ++ basic_machine=m68k-bull ++ os=-sysv3 ++ ;; ++ ebmon29k) ++ basic_machine=a29k-amd ++ os=-ebmon ++ ;; ++ elxsi) ++ basic_machine=elxsi-elxsi ++ os=-bsd ++ ;; ++ encore | umax | mmax) ++ basic_machine=ns32k-encore ++ ;; ++ es1800 | OSE68k | ose68k | ose | OSE) ++ basic_machine=m68k-ericsson ++ os=-ose ++ ;; ++ fx2800) ++ basic_machine=i860-alliant ++ ;; ++ genix) ++ basic_machine=ns32k-ns ++ ;; ++ gmicro) ++ basic_machine=tron-gmicro ++ os=-sysv ++ ;; ++ go32) ++ basic_machine=i386-pc ++ os=-go32 ++ ;; ++ h3050r* | hiux*) ++ basic_machine=hppa1.1-hitachi ++ os=-hiuxwe2 ++ ;; ++ h8300hms) ++ basic_machine=h8300-hitachi ++ os=-hms ++ ;; ++ h8300xray) ++ basic_machine=h8300-hitachi ++ os=-xray ++ ;; ++ h8500hms) ++ basic_machine=h8500-hitachi ++ os=-hms ++ ;; ++ harris) ++ basic_machine=m88k-harris ++ os=-sysv3 ++ ;; ++ hp300-*) ++ basic_machine=m68k-hp ++ ;; ++ hp300bsd) ++ basic_machine=m68k-hp ++ os=-bsd ++ ;; ++ hp300hpux) ++ basic_machine=m68k-hp ++ os=-hpux ++ ;; ++ hp3k9[0-9][0-9] | hp9[0-9][0-9]) ++ basic_machine=hppa1.0-hp ++ ;; ++ hp9k2[0-9][0-9] | hp9k31[0-9]) ++ basic_machine=m68000-hp ++ ;; ++ hp9k3[2-9][0-9]) ++ basic_machine=m68k-hp ++ ;; ++ hp9k6[0-9][0-9] | hp6[0-9][0-9]) ++ basic_machine=hppa1.0-hp ++ ;; ++ hp9k7[0-79][0-9] | hp7[0-79][0-9]) ++ basic_machine=hppa1.1-hp ++ ;; ++ hp9k78[0-9] | hp78[0-9]) ++ # FIXME: really hppa2.0-hp ++ basic_machine=hppa1.1-hp ++ ;; ++ hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) ++ # FIXME: really hppa2.0-hp ++ basic_machine=hppa1.1-hp ++ ;; ++ hp9k8[0-9][13679] | hp8[0-9][13679]) ++ basic_machine=hppa1.1-hp ++ ;; ++ hp9k8[0-9][0-9] | hp8[0-9][0-9]) ++ basic_machine=hppa1.0-hp ++ ;; ++ hppa-next) ++ os=-nextstep3 ++ ;; ++ hppaosf) ++ basic_machine=hppa1.1-hp ++ os=-osf ++ ;; ++ hppro) ++ basic_machine=hppa1.1-hp ++ os=-proelf ++ ;; ++ i370-ibm* | ibm*) ++ basic_machine=i370-ibm ++ ;; ++# I'm not sure what "Sysv32" means. Should this be sysv3.2? ++ i*86v32) ++ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` ++ os=-sysv32 ++ ;; ++ i*86v4*) ++ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` ++ os=-sysv4 ++ ;; ++ i*86v) ++ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` ++ os=-sysv ++ ;; ++ i*86sol2) ++ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` ++ os=-solaris2 ++ ;; ++ i386mach) ++ basic_machine=i386-mach ++ os=-mach ++ ;; ++ i386-vsta | vsta) ++ basic_machine=i386-unknown ++ os=-vsta ++ ;; ++ iris | iris4d) ++ basic_machine=mips-sgi ++ case $os in ++ -irix*) ++ ;; ++ *) ++ os=-irix4 ++ ;; ++ esac ++ ;; ++ isi68 | isi) ++ basic_machine=m68k-isi ++ os=-sysv ++ ;; ++ m68knommu) ++ basic_machine=m68k-unknown ++ os=-linux ++ ;; ++ m68knommu-*) ++ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; ++ m88k-omron*) ++ basic_machine=m88k-omron ++ ;; ++ magnum | m3230) ++ basic_machine=mips-mips ++ os=-sysv ++ ;; ++ merlin) ++ basic_machine=ns32k-utek ++ os=-sysv ++ ;; ++ microblaze) ++ basic_machine=microblaze-xilinx ++ ;; ++ mingw32) ++ basic_machine=i386-pc ++ os=-mingw32 ++ ;; ++ mingw32ce) ++ basic_machine=arm-unknown ++ os=-mingw32ce ++ ;; ++ miniframe) ++ basic_machine=m68000-convergent ++ ;; ++ *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) ++ basic_machine=m68k-atari ++ os=-mint ++ ;; ++ mips3*-*) ++ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ++ ;; ++ mips3*) ++ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ++ ;; ++ monitor) ++ basic_machine=m68k-rom68k ++ os=-coff ++ ;; ++ morphos) ++ basic_machine=powerpc-unknown ++ os=-morphos ++ ;; ++ msdos) ++ basic_machine=i386-pc ++ os=-msdos ++ ;; ++ ms1-*) ++ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ++ ;; ++ mvs) ++ basic_machine=i370-ibm ++ os=-mvs ++ ;; ++ ncr3000) ++ basic_machine=i486-ncr ++ os=-sysv4 ++ ;; ++ netbsd386) ++ basic_machine=i386-unknown ++ os=-netbsd ++ ;; ++ netwinder) ++ basic_machine=armv4l-rebel ++ os=-linux ++ ;; ++ news | news700 | news800 | news900) ++ basic_machine=m68k-sony ++ os=-newsos ++ ;; ++ news1000) ++ basic_machine=m68030-sony ++ os=-newsos ++ ;; ++ news-3600 | risc-news) ++ basic_machine=mips-sony ++ os=-newsos ++ ;; ++ necv70) ++ basic_machine=v70-nec ++ os=-sysv ++ ;; ++ next | m*-next ) ++ basic_machine=m68k-next ++ case $os in ++ -nextstep* ) ++ ;; ++ -ns2*) ++ os=-nextstep2 ++ ;; ++ *) ++ os=-nextstep3 ++ ;; ++ esac ++ ;; ++ nh3000) ++ basic_machine=m68k-harris ++ os=-cxux ++ ;; ++ nh[45]000) ++ basic_machine=m88k-harris ++ os=-cxux ++ ;; ++ nindy960) ++ basic_machine=i960-intel ++ os=-nindy ++ ;; ++ mon960) ++ basic_machine=i960-intel ++ os=-mon960 ++ ;; ++ nonstopux) ++ basic_machine=mips-compaq ++ os=-nonstopux ++ ;; ++ np1) ++ basic_machine=np1-gould ++ ;; ++ neo-tandem) ++ basic_machine=neo-tandem ++ ;; ++ nse-tandem) ++ basic_machine=nse-tandem ++ ;; ++ nsr-tandem) ++ basic_machine=nsr-tandem ++ ;; ++ op50n-* | op60c-*) ++ basic_machine=hppa1.1-oki ++ os=-proelf ++ ;; ++ openrisc | openrisc-*) ++ basic_machine=or32-unknown ++ ;; ++ os400) ++ basic_machine=powerpc-ibm ++ os=-os400 ++ ;; ++ OSE68000 | ose68000) ++ basic_machine=m68000-ericsson ++ os=-ose ++ ;; ++ os68k) ++ basic_machine=m68k-none ++ os=-os68k ++ ;; ++ pa-hitachi) ++ basic_machine=hppa1.1-hitachi ++ os=-hiuxwe2 ++ ;; ++ paragon) ++ basic_machine=i860-intel ++ os=-osf ++ ;; ++ parisc) ++ basic_machine=hppa-unknown ++ os=-linux ++ ;; ++ parisc-*) ++ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` ++ os=-linux ++ ;; ++ pbd) ++ basic_machine=sparc-tti ++ ;; ++ pbb) ++ basic_machine=m68k-tti ++ ;; ++ pc532 | pc532-*) ++ basic_machine=ns32k-pc532 ++ ;; ++ pc98) ++ basic_machine=i386-pc ++ ;; ++ pc98-*) ++ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ pentium | p5 | k5 | k6 | nexgen | viac3) ++ basic_machine=i586-pc ++ ;; ++ pentiumpro | p6 | 6x86 | athlon | athlon_*) ++ basic_machine=i686-pc ++ ;; ++ pentiumii | pentium2 | pentiumiii | pentium3) ++ basic_machine=i686-pc ++ ;; ++ pentium4) ++ basic_machine=i786-pc ++ ;; ++ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) ++ basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ pentiumpro-* | p6-* | 6x86-* | athlon-*) ++ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) ++ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ pentium4-*) ++ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ pn) ++ basic_machine=pn-gould ++ ;; ++ power) basic_machine=power-ibm ++ ;; ++ ppc | ppcbe) basic_machine=powerpc-unknown ++ ;; ++ ppc-* | ppcbe-*) ++ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ ppcle | powerpclittle | ppc-le | powerpc-little) ++ basic_machine=powerpcle-unknown ++ ;; ++ ppcle-* | powerpclittle-*) ++ basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ ppc64) basic_machine=powerpc64-unknown ++ ;; ++ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ ppc64le | powerpc64little | ppc64-le | powerpc64-little) ++ basic_machine=powerpc64le-unknown ++ ;; ++ ppc64le-* | powerpc64little-*) ++ basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ ps2) ++ basic_machine=i386-ibm ++ ;; ++ pw32) ++ basic_machine=i586-unknown ++ os=-pw32 ++ ;; ++ rdos) ++ basic_machine=i386-pc ++ os=-rdos ++ ;; ++ rom68k) ++ basic_machine=m68k-rom68k ++ os=-coff ++ ;; ++ rm[46]00) ++ basic_machine=mips-siemens ++ ;; ++ rtpc | rtpc-*) ++ basic_machine=romp-ibm ++ ;; ++ s390 | s390-*) ++ basic_machine=s390-ibm ++ ;; ++ s390x | s390x-*) ++ basic_machine=s390x-ibm ++ ;; ++ sa29200) ++ basic_machine=a29k-amd ++ os=-udi ++ ;; ++ sb1) ++ basic_machine=mipsisa64sb1-unknown ++ ;; ++ sb1el) ++ basic_machine=mipsisa64sb1el-unknown ++ ;; ++ sde) ++ basic_machine=mipsisa32-sde ++ os=-elf ++ ;; ++ sei) ++ basic_machine=mips-sei ++ os=-seiux ++ ;; ++ sequent) ++ basic_machine=i386-sequent ++ ;; ++ sh) ++ basic_machine=sh-hitachi ++ os=-hms ++ ;; ++ sh5el) ++ basic_machine=sh5le-unknown ++ ;; ++ sh64) ++ basic_machine=sh64-unknown ++ ;; ++ sparclite-wrs | simso-wrs) ++ basic_machine=sparclite-wrs ++ os=-vxworks ++ ;; ++ sps7) ++ basic_machine=m68k-bull ++ os=-sysv2 ++ ;; ++ spur) ++ basic_machine=spur-unknown ++ ;; ++ st2000) ++ basic_machine=m68k-tandem ++ ;; ++ stratus) ++ basic_machine=i860-stratus ++ os=-sysv4 ++ ;; ++ strongarm-* | thumb-*) ++ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ;; ++ sun2) ++ basic_machine=m68000-sun ++ ;; ++ sun2os3) ++ basic_machine=m68000-sun ++ os=-sunos3 ++ ;; ++ sun2os4) ++ basic_machine=m68000-sun ++ os=-sunos4 ++ ;; ++ sun3os3) ++ basic_machine=m68k-sun ++ os=-sunos3 ++ ;; ++ sun3os4) ++ basic_machine=m68k-sun ++ os=-sunos4 ++ ;; ++ sun4os3) ++ basic_machine=sparc-sun ++ os=-sunos3 ++ ;; ++ sun4os4) ++ basic_machine=sparc-sun ++ os=-sunos4 ++ ;; ++ sun4sol2) ++ basic_machine=sparc-sun ++ os=-solaris2 ++ ;; ++ sun3 | sun3-*) ++ basic_machine=m68k-sun ++ ;; ++ sun4) ++ basic_machine=sparc-sun ++ ;; ++ sun386 | sun386i | roadrunner) ++ basic_machine=i386-sun ++ ;; ++ sv1) ++ basic_machine=sv1-cray ++ os=-unicos ++ ;; ++ symmetry) ++ basic_machine=i386-sequent ++ os=-dynix ++ ;; ++ t3e) ++ basic_machine=alphaev5-cray ++ os=-unicos ++ ;; ++ t90) ++ basic_machine=t90-cray ++ os=-unicos ++ ;; ++ # This must be matched before tile*. ++ tilegx*) ++ basic_machine=tilegx-unknown ++ os=-linux-gnu ++ ;; ++ tile*) ++ basic_machine=tile-unknown ++ os=-linux-gnu ++ ;; ++ tx39) ++ basic_machine=mipstx39-unknown ++ ;; ++ tx39el) ++ basic_machine=mipstx39el-unknown ++ ;; ++ toad1) ++ basic_machine=pdp10-xkl ++ os=-tops20 ++ ;; ++ tower | tower-32) ++ basic_machine=m68k-ncr ++ ;; ++ tpf) ++ basic_machine=s390x-ibm ++ os=-tpf ++ ;; ++ udi29k) ++ basic_machine=a29k-amd ++ os=-udi ++ ;; ++ ultra3) ++ basic_machine=a29k-nyu ++ os=-sym1 ++ ;; ++ v810 | necv810) ++ basic_machine=v810-nec ++ os=-none ++ ;; ++ vaxv) ++ basic_machine=vax-dec ++ os=-sysv ++ ;; ++ vms) ++ basic_machine=vax-dec ++ os=-vms ++ ;; ++ vpp*|vx|vx-*) ++ basic_machine=f301-fujitsu ++ ;; ++ vxworks960) ++ basic_machine=i960-wrs ++ os=-vxworks ++ ;; ++ vxworks68) ++ basic_machine=m68k-wrs ++ os=-vxworks ++ ;; ++ vxworks29k) ++ basic_machine=a29k-wrs ++ os=-vxworks ++ ;; ++ w65*) ++ basic_machine=w65-wdc ++ os=-none ++ ;; ++ w89k-*) ++ basic_machine=hppa1.1-winbond ++ os=-proelf ++ ;; ++ xbox) ++ basic_machine=i686-pc ++ os=-mingw32 ++ ;; ++ xps | xps100) ++ basic_machine=xps100-honeywell ++ ;; ++ xscale-* | xscalee[bl]-*) ++ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` ++ ;; ++ ymp) ++ basic_machine=ymp-cray ++ os=-unicos ++ ;; ++ z8k-*-coff) ++ basic_machine=z8k-unknown ++ os=-sim ++ ;; ++ z80-*-coff) ++ basic_machine=z80-unknown ++ os=-sim ++ ;; ++ none) ++ basic_machine=none-none ++ os=-none ++ ;; ++ ++# Here we handle the default manufacturer of certain CPU types. It is in ++# some cases the only manufacturer, in others, it is the most popular. ++ w89k) ++ basic_machine=hppa1.1-winbond ++ ;; ++ op50n) ++ basic_machine=hppa1.1-oki ++ ;; ++ op60c) ++ basic_machine=hppa1.1-oki ++ ;; ++ romp) ++ basic_machine=romp-ibm ++ ;; ++ mmix) ++ basic_machine=mmix-knuth ++ ;; ++ rs6000) ++ basic_machine=rs6000-ibm ++ ;; ++ vax) ++ basic_machine=vax-dec ++ ;; ++ pdp10) ++ # there are many clones, so DEC is not a safe bet ++ basic_machine=pdp10-unknown ++ ;; ++ pdp11) ++ basic_machine=pdp11-dec ++ ;; ++ we32k) ++ basic_machine=we32k-att ++ ;; ++ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) ++ basic_machine=sh-unknown ++ ;; ++ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) ++ basic_machine=sparc-sun ++ ;; ++ cydra) ++ basic_machine=cydra-cydrome ++ ;; ++ orion) ++ basic_machine=orion-highlevel ++ ;; ++ orion105) ++ basic_machine=clipper-highlevel ++ ;; ++ mac | mpw | mac-mpw) ++ basic_machine=m68k-apple ++ ;; ++ pmac | pmac-mpw) ++ basic_machine=powerpc-apple ++ ;; ++ *-unknown) ++ # Make sure to match an already-canonicalized machine name. ++ ;; ++ *) ++ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 ++ exit 1 ++ ;; ++esac ++ ++# Here we canonicalize certain aliases for manufacturers. ++case $basic_machine in ++ *-digital*) ++ basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` ++ ;; ++ *-commodore*) ++ basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` ++ ;; ++ *) ++ ;; ++esac ++ ++# Decode manufacturer-specific aliases for certain operating systems. ++ ++if [ x"$os" != x"" ] ++then ++case $os in ++ # First match some system type aliases ++ # that might get confused with valid system types. ++ # -solaris* is a basic system type, with this one exception. ++ -auroraux) ++ os=-auroraux ++ ;; ++ -solaris1 | -solaris1.*) ++ os=`echo $os | sed -e 's|solaris1|sunos4|'` ++ ;; ++ -solaris) ++ os=-solaris2 ++ ;; ++ -svr4*) ++ os=-sysv4 ++ ;; ++ -unixware*) ++ os=-sysv4.2uw ++ ;; ++ -gnu/linux*) ++ os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ++ ;; ++ # First accept the basic system types. ++ # The portable systems comes first. ++ # Each alternative MUST END IN A *, to match a version number. ++ # -sysv* is not here because it comes later, after sysvr4. ++ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ ++ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ ++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ ++ | -sym* | -kopensolaris* \ ++ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ ++ | -aos* | -aros* \ ++ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ ++ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ ++ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ ++ | -openbsd* | -solidbsd* \ ++ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ ++ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ ++ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ ++ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ ++ | -chorusos* | -chorusrdb* | -cegcc* \ ++ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++ | -mingw32* | -linux-gnu* | -linux-android* \ ++ | -linux-newlib* | -linux-uclibc* \ ++ | -uxpv* | -beos* | -mpeix* | -udk* \ ++ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ ++ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ ++ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ ++ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ ++ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ ++ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ ++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) ++ # Remember, each alternative MUST END IN *, to match a version number. ++ ;; ++ -qnx*) ++ case $basic_machine in ++ x86-* | i*86-*) ++ ;; ++ *) ++ os=-nto$os ++ ;; ++ esac ++ ;; ++ -nto-qnx*) ++ ;; ++ -nto*) ++ os=`echo $os | sed -e 's|nto|nto-qnx|'` ++ ;; ++ -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ ++ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ ++ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ++ ;; ++ -mac*) ++ os=`echo $os | sed -e 's|mac|macos|'` ++ ;; ++ -linux-dietlibc) ++ os=-linux-dietlibc ++ ;; ++ -linux*) ++ os=`echo $os | sed -e 's|linux|linux-gnu|'` ++ ;; ++ -sunos5*) ++ os=`echo $os | sed -e 's|sunos5|solaris2|'` ++ ;; ++ -sunos6*) ++ os=`echo $os | sed -e 's|sunos6|solaris3|'` ++ ;; ++ -opened*) ++ os=-openedition ++ ;; ++ -os400*) ++ os=-os400 ++ ;; ++ -wince*) ++ os=-wince ++ ;; ++ -osfrose*) ++ os=-osfrose ++ ;; ++ -osf*) ++ os=-osf ++ ;; ++ -utek*) ++ os=-bsd ++ ;; ++ -dynix*) ++ os=-bsd ++ ;; ++ -acis*) ++ os=-aos ++ ;; ++ -atheos*) ++ os=-atheos ++ ;; ++ -syllable*) ++ os=-syllable ++ ;; ++ -386bsd) ++ os=-bsd ++ ;; ++ -ctix* | -uts*) ++ os=-sysv ++ ;; ++ -nova*) ++ os=-rtmk-nova ++ ;; ++ -ns2 ) ++ os=-nextstep2 ++ ;; ++ -nsk*) ++ os=-nsk ++ ;; ++ # Preserve the version number of sinix5. ++ -sinix5.*) ++ os=`echo $os | sed -e 's|sinix|sysv|'` ++ ;; ++ -sinix*) ++ os=-sysv4 ++ ;; ++ -tpf*) ++ os=-tpf ++ ;; ++ -triton*) ++ os=-sysv3 ++ ;; ++ -oss*) ++ os=-sysv3 ++ ;; ++ -svr4) ++ os=-sysv4 ++ ;; ++ -svr3) ++ os=-sysv3 ++ ;; ++ -sysvr4) ++ os=-sysv4 ++ ;; ++ # This must come after -sysvr4. ++ -sysv*) ++ ;; ++ -ose*) ++ os=-ose ++ ;; ++ -es1800*) ++ os=-ose ++ ;; ++ -xenix) ++ os=-xenix ++ ;; ++ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) ++ os=-mint ++ ;; ++ -aros*) ++ os=-aros ++ ;; ++ -kaos*) ++ os=-kaos ++ ;; ++ -zvmoe) ++ os=-zvmoe ++ ;; ++ -dicos*) ++ os=-dicos ++ ;; ++ -nacl*) ++ ;; ++ -none) ++ ;; ++ *) ++ # Get rid of the `-' at the beginning of $os. ++ os=`echo $os | sed 's/[^-]*-//'` ++ echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 ++ exit 1 ++ ;; ++esac ++else ++ ++# Here we handle the default operating systems that come with various machines. ++# The value should be what the vendor currently ships out the door with their ++# machine or put another way, the most popular os provided with the machine. ++ ++# Note that if you're going to try to match "-MANUFACTURER" here (say, ++# "-sun"), then you have to tell the case statement up towards the top ++# that MANUFACTURER isn't an operating system. Otherwise, code above ++# will signal an error saying that MANUFACTURER isn't an operating ++# system, and we'll never get to this point. ++ ++case $basic_machine in ++ score-*) ++ os=-elf ++ ;; ++ spu-*) ++ os=-elf ++ ;; ++ *-acorn) ++ os=-riscix1.2 ++ ;; ++ arm*-rebel) ++ os=-linux ++ ;; ++ arm*-semi) ++ os=-aout ++ ;; ++ c4x-* | tic4x-*) ++ os=-coff ++ ;; ++ tic54x-*) ++ os=-coff ++ ;; ++ tic55x-*) ++ os=-coff ++ ;; ++ tic6x-*) ++ os=-coff ++ ;; ++ # This must come before the *-dec entry. ++ pdp10-*) ++ os=-tops20 ++ ;; ++ pdp11-*) ++ os=-none ++ ;; ++ *-dec | vax-*) ++ os=-ultrix4.2 ++ ;; ++ m68*-apollo) ++ os=-domain ++ ;; ++ i386-sun) ++ os=-sunos4.0.2 ++ ;; ++ m68000-sun) ++ os=-sunos3 ++ # This also exists in the configure program, but was not the ++ # default. ++ # os=-sunos4 ++ ;; ++ m68*-cisco) ++ os=-aout ++ ;; ++ mep-*) ++ os=-elf ++ ;; ++ mips*-cisco) ++ os=-elf ++ ;; ++ mips*-*) ++ os=-elf ++ ;; ++ or32-*) ++ os=-coff ++ ;; ++ *-tti) # must be before sparc entry or we get the wrong os. ++ os=-sysv3 ++ ;; ++ sparc-* | *-sun) ++ os=-sunos4.1.1 ++ ;; ++ *-be) ++ os=-beos ++ ;; ++ *-haiku) ++ os=-haiku ++ ;; ++ *-ibm) ++ os=-aix ++ ;; ++ *-knuth) ++ os=-mmixware ++ ;; ++ *-wec) ++ os=-proelf ++ ;; ++ *-winbond) ++ os=-proelf ++ ;; ++ *-oki) ++ os=-proelf ++ ;; ++ *-hp) ++ os=-hpux ++ ;; ++ *-hitachi) ++ os=-hiux ++ ;; ++ i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) ++ os=-sysv ++ ;; ++ *-cbm) ++ os=-amigaos ++ ;; ++ *-dg) ++ os=-dgux ++ ;; ++ *-dolphin) ++ os=-sysv3 ++ ;; ++ m68k-ccur) ++ os=-rtu ++ ;; ++ m88k-omron*) ++ os=-luna ++ ;; ++ *-next ) ++ os=-nextstep ++ ;; ++ *-sequent) ++ os=-ptx ++ ;; ++ *-crds) ++ os=-unos ++ ;; ++ *-ns) ++ os=-genix ++ ;; ++ i370-*) ++ os=-mvs ++ ;; ++ *-next) ++ os=-nextstep3 ++ ;; ++ *-gould) ++ os=-sysv ++ ;; ++ *-highlevel) ++ os=-bsd ++ ;; ++ *-encore) ++ os=-bsd ++ ;; ++ *-sgi) ++ os=-irix ++ ;; ++ *-siemens) ++ os=-sysv4 ++ ;; ++ *-masscomp) ++ os=-rtu ++ ;; ++ f30[01]-fujitsu | f700-fujitsu) ++ os=-uxpv ++ ;; ++ *-rom68k) ++ os=-coff ++ ;; ++ *-*bug) ++ os=-coff ++ ;; ++ *-apple) ++ os=-macos ++ ;; ++ *-atari*) ++ os=-mint ++ ;; ++ *) ++ os=-none ++ ;; ++esac ++fi ++ ++# Here we handle the case where we know the os, and the CPU type, but not the ++# manufacturer. We pick the logical manufacturer. ++vendor=unknown ++case $basic_machine in ++ *-unknown) ++ case $os in ++ -riscix*) ++ vendor=acorn ++ ;; ++ -sunos*) ++ vendor=sun ++ ;; ++ -cnk*|-aix*) ++ vendor=ibm ++ ;; ++ -beos*) ++ vendor=be ++ ;; ++ -hpux*) ++ vendor=hp ++ ;; ++ -mpeix*) ++ vendor=hp ++ ;; ++ -hiux*) ++ vendor=hitachi ++ ;; ++ -unos*) ++ vendor=crds ++ ;; ++ -dgux*) ++ vendor=dg ++ ;; ++ -luna*) ++ vendor=omron ++ ;; ++ -genix*) ++ vendor=ns ++ ;; ++ -mvs* | -opened*) ++ vendor=ibm ++ ;; ++ -os400*) ++ vendor=ibm ++ ;; ++ -ptx*) ++ vendor=sequent ++ ;; ++ -tpf*) ++ vendor=ibm ++ ;; ++ -vxsim* | -vxworks* | -windiss*) ++ vendor=wrs ++ ;; ++ -aux*) ++ vendor=apple ++ ;; ++ -hms*) ++ vendor=hitachi ++ ;; ++ -mpw* | -macos*) ++ vendor=apple ++ ;; ++ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) ++ vendor=atari ++ ;; ++ -vos*) ++ vendor=stratus ++ ;; ++ esac ++ basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` ++ ;; ++esac ++ ++echo $basic_machine$os ++exit ++ ++# Local variables: ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "timestamp='" ++# time-stamp-format: "%:y-%02m-%02d" ++# time-stamp-end: "'" ++# End: +--- adjtimex-1.29.orig/Makefile ++++ adjtimex-1.29/Makefile +@@ -0,0 +1,78 @@ ++#### Start of system configuration section. -*-makefile-*- #### ++ srcdir = . ++VPATH = . ++ ++VERSION=1.29 ++ ++CFLAGS = -Wall -g -O2 -Wall ++prefix = /usr ++man1dir=${prefix}/share/man/man1 ++exec_prefix = ${prefix} ++bindir=/sbin ++datadir = ${datarootdir} ++datarootdir = ${prefix}/share ++ ++INSTALL=/usr/bin/install -c ++ ++ ++# Extension (not including `.') for the manual page filenames. ++manext = 8 ++# Where to put the manual pages. ++mandir = $(prefix)/share/man/man$(manext) ++ ++#### End of system configuration section. #### ++ ++SRC = adjtimex.c adjtimex.8 mat.c mat.h install-sh configure.in \ ++ configure Makefile.in config.h.in README README.ru adjtimex.lsm \ ++ adjtimex.lsm.in COPYING COPYRIGHT ChangeLog ++ ++all: adjtimex adjtimex.lsm Makefile ++ ++configure config.h.in: configure.in ++ autoconf ++ autoheader ++Makefile config.h: Makefile.in config.h.in ++ ./configure ++ ++adjtimex: adjtimex.c mat.o config.h Makefile ++ $(CC) $(CFLAGS) -I. -DVERSION=\"$(VERSION)\" -o adjtimex \ ++ adjtimex.c mat.o -lm ++ ++mat.o: mat.c ++ $(CC) $(CFLAGS) -c mat.c ++ ++install: all ++ $(INSTALL) -g bin -m 755 -o root adjtimex $(bindir)/adjtimex ++ $(INSTALL) -d -g root -m 755 -o root $(mandir) ++ -$(INSTALL) -g root -m 644 -o root $(srcdir)/adjtimex.8 \ ++ $(mandir)/adjtimex.$(manext) ++ ++uninstall: ++ rm -f $(bindir)/adjtimex $(mandir)/adjtimex.$(manext) ++ ++clean: ++ rm -f core *.o ++veryclean: clean ++ rm -f adjtimex ++ ++adjtimex.lsm: adjtimex.lsm.in Makefile ++ sed -e 's/@VERSION@/$(VERSION)/' \ ++ -e "s/@DATE@/`date +%Y-%m-%d`/" \ ++ adjtimex.lsm.in >adjtimex.lsm ++ ++shar: $(SRC) ++ distname=adjtimex-$(VERSION); \ ++ shar $(SRC) >$$distname.shar ++ ++dist: $(SRC) ++ distname=adjtimex-$(VERSION); \ ++ rm -fr $$distname; \ ++ mkdir $$distname; \ ++ for file in $(SRC); do \ ++ ln $$file $$distname/$$file \ ++ || { echo copying $$file instead; cp -p $$file $$distname/$$file;}; \ ++ done; \ ++ chmod -R a+rX $$distname; \ ++ tar -chz -f $$distname.tar.gz $$distname; \ ++ rm -fr $$distname ++ +--- adjtimex-1.29.orig/config.guess ++++ adjtimex-1.29/config.guess +@@ -0,0 +1,1517 @@ ++#! /bin/sh ++# Attempt to guess a canonical system name. ++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, ++# 2011 Free Software Foundation, Inc. ++ ++timestamp='2011-05-11' ++ ++# This file is free software; you can redistribute it and/or modify it ++# under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA ++# 02110-1301, USA. ++# ++# As a special exception to the GNU General Public License, if you ++# distribute this file as part of a program that contains a ++# configuration script generated by Autoconf, you may include it under ++# the same distribution terms that you use for the rest of that program. ++ ++ ++# Originally written by Per Bothner. Please send patches (context ++# diff format) to <config-patches@gnu.org> and include a ChangeLog ++# entry. ++# ++# This script attempts to guess a canonical system name similar to ++# config.sub. If it succeeds, it prints the system name on stdout, and ++# exits with 0. Otherwise, it exits with 1. ++# ++# You can get the latest version of this script from: ++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD ++ ++me=`echo "$0" | sed -e 's,.*/,,'` ++ ++usage="\ ++Usage: $0 [OPTION] ++ ++Output the configuration name of the system \`$me' is run on. ++ ++Operation modes: ++ -h, --help print this help, then exit ++ -t, --time-stamp print date of last modification, then exit ++ -v, --version print version number, then exit ++ ++Report bugs and patches to <config-patches@gnu.org>." ++ ++version="\ ++GNU config.guess ($timestamp) ++ ++Originally written by Per Bothner. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free ++Software Foundation, Inc. ++ ++This is free software; see the source for copying conditions. There is NO ++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." ++ ++help=" ++Try \`$me --help' for more information." ++ ++# Parse command line ++while test $# -gt 0 ; do ++ case $1 in ++ --time-stamp | --time* | -t ) ++ echo "$timestamp" ; exit ;; ++ --version | -v ) ++ echo "$version" ; exit ;; ++ --help | --h* | -h ) ++ echo "$usage"; exit ;; ++ -- ) # Stop option processing ++ shift; break ;; ++ - ) # Use stdin as input. ++ break ;; ++ -* ) ++ echo "$me: invalid option $1$help" >&2 ++ exit 1 ;; ++ * ) ++ break ;; ++ esac ++done ++ ++if test $# != 0; then ++ echo "$me: too many arguments$help" >&2 ++ exit 1 ++fi ++ ++trap 'exit 1' 1 2 15 ++ ++# CC_FOR_BUILD -- compiler used by this script. Note that the use of a ++# compiler to aid in system detection is discouraged as it requires ++# temporary files to be created and, as you can see below, it is a ++# headache to deal with in a portable fashion. ++ ++# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still ++# use `HOST_CC' if defined, but it is deprecated. ++ ++# Portable tmp directory creation inspired by the Autoconf team. ++ ++set_cc_for_build=' ++trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; ++trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; ++: ${TMPDIR=/tmp} ; ++ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || ++ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || ++ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || ++ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; ++dummy=$tmp/dummy ; ++tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; ++case $CC_FOR_BUILD,$HOST_CC,$CC in ++ ,,) echo "int x;" > $dummy.c ; ++ for c in cc gcc c89 c99 ; do ++ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then ++ CC_FOR_BUILD="$c"; break ; ++ fi ; ++ done ; ++ if test x"$CC_FOR_BUILD" = x ; then ++ CC_FOR_BUILD=no_compiler_found ; ++ fi ++ ;; ++ ,,*) CC_FOR_BUILD=$CC ;; ++ ,*,*) CC_FOR_BUILD=$HOST_CC ;; ++esac ; set_cc_for_build= ;' ++ ++# This is needed to find uname on a Pyramid OSx when run in the BSD universe. ++# (ghazi@noc.rutgers.edu 1994-08-24) ++if (test -f /.attbin/uname) >/dev/null 2>&1 ; then ++ PATH=$PATH:/.attbin ; export PATH ++fi ++ ++UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown ++UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown ++UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown ++UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown ++ ++# Note: order is significant - the case branches are not exclusive. ++ ++case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ++ *:NetBSD:*:*) ++ # NetBSD (nbsd) targets should (where applicable) match one or ++ # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, ++ # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently ++ # switched to ELF, *-*-netbsd* would select the old ++ # object file format. This provides both forward ++ # compatibility and a consistent mechanism for selecting the ++ # object file format. ++ # ++ # Note: NetBSD doesn't particularly care about the vendor ++ # portion of the name. We always set it to "unknown". ++ sysctl="sysctl -n hw.machine_arch" ++ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ ++ /usr/sbin/$sysctl 2>/dev/null || echo unknown)` ++ case "${UNAME_MACHINE_ARCH}" in ++ armeb) machine=armeb-unknown ;; ++ arm*) machine=arm-unknown ;; ++ sh3el) machine=shl-unknown ;; ++ sh3eb) machine=sh-unknown ;; ++ sh5el) machine=sh5le-unknown ;; ++ *) machine=${UNAME_MACHINE_ARCH}-unknown ;; ++ esac ++ # The Operating System including object format, if it has switched ++ # to ELF recently, or will in the future. ++ case "${UNAME_MACHINE_ARCH}" in ++ arm*|i386|m68k|ns32k|sh3*|sparc|vax) ++ eval $set_cc_for_build ++ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ELF__ ++ then ++ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). ++ # Return netbsd for either. FIX? ++ os=netbsd ++ else ++ os=netbsdelf ++ fi ++ ;; ++ *) ++ os=netbsd ++ ;; ++ esac ++ # The OS release ++ # Debian GNU/NetBSD machines have a different userland, and ++ # thus, need a distinct triplet. However, they do not need ++ # kernel version information, so it can be replaced with a ++ # suitable tag, in the style of linux-gnu. ++ case "${UNAME_VERSION}" in ++ Debian*) ++ release='-gnu' ++ ;; ++ *) ++ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` ++ ;; ++ esac ++ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: ++ # contains redundant information, the shorter form: ++ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. ++ echo "${machine}-${os}${release}" ++ exit ;; ++ *:OpenBSD:*:*) ++ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` ++ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} ++ exit ;; ++ *:ekkoBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} ++ exit ;; ++ *:SolidBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} ++ exit ;; ++ macppc:MirBSD:*:*) ++ echo powerpc-unknown-mirbsd${UNAME_RELEASE} ++ exit ;; ++ *:MirBSD:*:*) ++ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} ++ exit ;; ++ alpha:OSF1:*:*) ++ case $UNAME_RELEASE in ++ *4.0) ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ++ ;; ++ *5.*) ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ ;; ++ esac ++ # According to Compaq, /usr/sbin/psrinfo has been available on ++ # OSF/1 and Tru64 systems produced since 1995. I hope that ++ # covers most systems running today. This code pipes the CPU ++ # types through head -n 1, so we only detect the type of CPU 0. ++ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` ++ case "$ALPHA_CPU_TYPE" in ++ "EV4 (21064)") ++ UNAME_MACHINE="alpha" ;; ++ "EV4.5 (21064)") ++ UNAME_MACHINE="alpha" ;; ++ "LCA4 (21066/21068)") ++ UNAME_MACHINE="alpha" ;; ++ "EV5 (21164)") ++ UNAME_MACHINE="alphaev5" ;; ++ "EV5.6 (21164A)") ++ UNAME_MACHINE="alphaev56" ;; ++ "EV5.6 (21164PC)") ++ UNAME_MACHINE="alphapca56" ;; ++ "EV5.7 (21164PC)") ++ UNAME_MACHINE="alphapca57" ;; ++ "EV6 (21264)") ++ UNAME_MACHINE="alphaev6" ;; ++ "EV6.7 (21264A)") ++ UNAME_MACHINE="alphaev67" ;; ++ "EV6.8CB (21264C)") ++ UNAME_MACHINE="alphaev68" ;; ++ "EV6.8AL (21264B)") ++ UNAME_MACHINE="alphaev68" ;; ++ "EV6.8CX (21264D)") ++ UNAME_MACHINE="alphaev68" ;; ++ "EV6.9A (21264/EV69A)") ++ UNAME_MACHINE="alphaev69" ;; ++ "EV7 (21364)") ++ UNAME_MACHINE="alphaev7" ;; ++ "EV7.9 (21364A)") ++ UNAME_MACHINE="alphaev79" ;; ++ esac ++ # A Pn.n version is a patched version. ++ # A Vn.n version is a released version. ++ # A Tn.n version is a released field test version. ++ # A Xn.n version is an unreleased experimental baselevel. ++ # 1.2 uses "1.2" for uname -r. ++ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ++ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. ++ exitcode=$? ++ trap '' 0 ++ exit $exitcode ;; ++ Alpha\ *:Windows_NT*:*) ++ # How do we know it's Interix rather than the generic POSIX subsystem? ++ # Should we change UNAME_MACHINE based on the output of uname instead ++ # of the specific Alpha model? ++ echo alpha-pc-interix ++ exit ;; ++ 21064:Windows_NT:50:3) ++ echo alpha-dec-winnt3.5 ++ exit ;; ++ Amiga*:UNIX_System_V:4.0:*) ++ echo m68k-unknown-sysv4 ++ exit ;; ++ *:[Aa]miga[Oo][Ss]:*:*) ++ echo ${UNAME_MACHINE}-unknown-amigaos ++ exit ;; ++ *:[Mm]orph[Oo][Ss]:*:*) ++ echo ${UNAME_MACHINE}-unknown-morphos ++ exit ;; ++ *:OS/390:*:*) ++ echo i370-ibm-openedition ++ exit ;; ++ *:z/VM:*:*) ++ echo s390-ibm-zvmoe ++ exit ;; ++ *:OS400:*:*) ++ echo powerpc-ibm-os400 ++ exit ;; ++ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) ++ echo arm-acorn-riscix${UNAME_RELEASE} ++ exit ;; ++ arm:riscos:*:*|arm:RISCOS:*:*) ++ echo arm-unknown-riscos ++ exit ;; ++ SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) ++ echo hppa1.1-hitachi-hiuxmpp ++ exit ;; ++ Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) ++ # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. ++ if test "`(/bin/universe) 2>/dev/null`" = att ; then ++ echo pyramid-pyramid-sysv3 ++ else ++ echo pyramid-pyramid-bsd ++ fi ++ exit ;; ++ NILE*:*:*:dcosx) ++ echo pyramid-pyramid-svr4 ++ exit ;; ++ DRS?6000:unix:4.0:6*) ++ echo sparc-icl-nx6 ++ exit ;; ++ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) ++ case `/usr/bin/uname -p` in ++ sparc) echo sparc-icl-nx7; exit ;; ++ esac ;; ++ s390x:SunOS:*:*) ++ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; ++ sun4H:SunOS:5.*:*) ++ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; ++ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) ++ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; ++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) ++ echo i386-pc-auroraux${UNAME_RELEASE} ++ exit ;; ++ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) ++ eval $set_cc_for_build ++ SUN_ARCH="i386" ++ # If there is a compiler, see if it is configured for 64-bit objects. ++ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. ++ # This test works for both compilers. ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ SUN_ARCH="x86_64" ++ fi ++ fi ++ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; ++ sun4*:SunOS:6*:*) ++ # According to config.sub, this is the proper way to canonicalize ++ # SunOS6. Hard to guess exactly what SunOS6 will be like, but ++ # it's likely to be more like Solaris than SunOS4. ++ echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; ++ sun4*:SunOS:*:*) ++ case "`/usr/bin/arch -k`" in ++ Series*|S4*) ++ UNAME_RELEASE=`uname -v` ++ ;; ++ esac ++ # Japanese Language versions have a version number like `4.1.3-JL'. ++ echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` ++ exit ;; ++ sun3*:SunOS:*:*) ++ echo m68k-sun-sunos${UNAME_RELEASE} ++ exit ;; ++ sun*:*:4.2BSD:*) ++ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` ++ test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 ++ case "`/bin/arch`" in ++ sun3) ++ echo m68k-sun-sunos${UNAME_RELEASE} ++ ;; ++ sun4) ++ echo sparc-sun-sunos${UNAME_RELEASE} ++ ;; ++ esac ++ exit ;; ++ aushp:SunOS:*:*) ++ echo sparc-auspex-sunos${UNAME_RELEASE} ++ exit ;; ++ # The situation for MiNT is a little confusing. The machine name ++ # can be virtually everything (everything which is not ++ # "atarist" or "atariste" at least should have a processor ++ # > m68000). The system name ranges from "MiNT" over "FreeMiNT" ++ # to the lowercase version "mint" (or "freemint"). Finally ++ # the system name "TOS" denotes a system which is actually not ++ # MiNT. But MiNT is downward compatible to TOS, so this should ++ # be no problem. ++ atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) ++ echo m68k-atari-mint${UNAME_RELEASE} ++ exit ;; ++ atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) ++ echo m68k-atari-mint${UNAME_RELEASE} ++ exit ;; ++ *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) ++ echo m68k-atari-mint${UNAME_RELEASE} ++ exit ;; ++ milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) ++ echo m68k-milan-mint${UNAME_RELEASE} ++ exit ;; ++ hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) ++ echo m68k-hades-mint${UNAME_RELEASE} ++ exit ;; ++ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) ++ echo m68k-unknown-mint${UNAME_RELEASE} ++ exit ;; ++ m68k:machten:*:*) ++ echo m68k-apple-machten${UNAME_RELEASE} ++ exit ;; ++ powerpc:machten:*:*) ++ echo powerpc-apple-machten${UNAME_RELEASE} ++ exit ;; ++ RISC*:Mach:*:*) ++ echo mips-dec-mach_bsd4.3 ++ exit ;; ++ RISC*:ULTRIX:*:*) ++ echo mips-dec-ultrix${UNAME_RELEASE} ++ exit ;; ++ VAX*:ULTRIX*:*:*) ++ echo vax-dec-ultrix${UNAME_RELEASE} ++ exit ;; ++ 2020:CLIX:*:* | 2430:CLIX:*:*) ++ echo clipper-intergraph-clix${UNAME_RELEASE} ++ exit ;; ++ mips:*:*:UMIPS | mips:*:*:RISCos) ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++#ifdef __cplusplus ++#include <stdio.h> /* for printf() prototype */ ++ int main (int argc, char *argv[]) { ++#else ++ int main (argc, argv) int argc; char *argv[]; { ++#endif ++ #if defined (host_mips) && defined (MIPSEB) ++ #if defined (SYSTYPE_SYSV) ++ printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); ++ #endif ++ #if defined (SYSTYPE_SVR4) ++ printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); ++ #endif ++ #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) ++ printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); ++ #endif ++ #endif ++ exit (-1); ++ } ++EOF ++ $CC_FOR_BUILD -o $dummy $dummy.c && ++ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && ++ SYSTEM_NAME=`$dummy $dummyarg` && ++ { echo "$SYSTEM_NAME"; exit; } ++ echo mips-mips-riscos${UNAME_RELEASE} ++ exit ;; ++ Motorola:PowerMAX_OS:*:*) ++ echo powerpc-motorola-powermax ++ exit ;; ++ Motorola:*:4.3:PL8-*) ++ echo powerpc-harris-powermax ++ exit ;; ++ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) ++ echo powerpc-harris-powermax ++ exit ;; ++ Night_Hawk:Power_UNIX:*:*) ++ echo powerpc-harris-powerunix ++ exit ;; ++ m88k:CX/UX:7*:*) ++ echo m88k-harris-cxux7 ++ exit ;; ++ m88k:*:4*:R4*) ++ echo m88k-motorola-sysv4 ++ exit ;; ++ m88k:*:3*:R3*) ++ echo m88k-motorola-sysv3 ++ exit ;; ++ AViiON:dgux:*:*) ++ # DG/UX returns AViiON for all architectures ++ UNAME_PROCESSOR=`/usr/bin/uname -p` ++ if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] ++ then ++ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ ++ [ ${TARGET_BINARY_INTERFACE}x = x ] ++ then ++ echo m88k-dg-dgux${UNAME_RELEASE} ++ else ++ echo m88k-dg-dguxbcs${UNAME_RELEASE} ++ fi ++ else ++ echo i586-dg-dgux${UNAME_RELEASE} ++ fi ++ exit ;; ++ M88*:DolphinOS:*:*) # DolphinOS (SVR3) ++ echo m88k-dolphin-sysv3 ++ exit ;; ++ M88*:*:R3*:*) ++ # Delta 88k system running SVR3 ++ echo m88k-motorola-sysv3 ++ exit ;; ++ XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) ++ echo m88k-tektronix-sysv3 ++ exit ;; ++ Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) ++ echo m68k-tektronix-bsd ++ exit ;; ++ *:IRIX*:*:*) ++ echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` ++ exit ;; ++ ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. ++ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id ++ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' ++ i*86:AIX:*:*) ++ echo i386-ibm-aix ++ exit ;; ++ ia64:AIX:*:*) ++ if [ -x /usr/bin/oslevel ] ; then ++ IBM_REV=`/usr/bin/oslevel` ++ else ++ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} ++ fi ++ echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} ++ exit ;; ++ *:AIX:2:3) ++ if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #include <sys/systemcfg.h> ++ ++ main() ++ { ++ if (!__power_pc()) ++ exit(1); ++ puts("powerpc-ibm-aix3.2.5"); ++ exit(0); ++ } ++EOF ++ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` ++ then ++ echo "$SYSTEM_NAME" ++ else ++ echo rs6000-ibm-aix3.2.5 ++ fi ++ elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then ++ echo rs6000-ibm-aix3.2.4 ++ else ++ echo rs6000-ibm-aix3.2 ++ fi ++ exit ;; ++ *:AIX:*:[4567]) ++ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` ++ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then ++ IBM_ARCH=rs6000 ++ else ++ IBM_ARCH=powerpc ++ fi ++ if [ -x /usr/bin/oslevel ] ; then ++ IBM_REV=`/usr/bin/oslevel` ++ else ++ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} ++ fi ++ echo ${IBM_ARCH}-ibm-aix${IBM_REV} ++ exit ;; ++ *:AIX:*:*) ++ echo rs6000-ibm-aix ++ exit ;; ++ ibmrt:4.4BSD:*|romp-ibm:BSD:*) ++ echo romp-ibm-bsd4.4 ++ exit ;; ++ ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and ++ echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to ++ exit ;; # report: romp-ibm BSD 4.3 ++ *:BOSX:*:*) ++ echo rs6000-bull-bosx ++ exit ;; ++ DPX/2?00:B.O.S.:*:*) ++ echo m68k-bull-sysv3 ++ exit ;; ++ 9000/[34]??:4.3bsd:1.*:*) ++ echo m68k-hp-bsd ++ exit ;; ++ hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) ++ echo m68k-hp-bsd4.4 ++ exit ;; ++ 9000/[34678]??:HP-UX:*:*) ++ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` ++ case "${UNAME_MACHINE}" in ++ 9000/31? ) HP_ARCH=m68000 ;; ++ 9000/[34]?? ) HP_ARCH=m68k ;; ++ 9000/[678][0-9][0-9]) ++ if [ -x /usr/bin/getconf ]; then ++ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` ++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` ++ case "${sc_cpu_version}" in ++ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 ++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 ++ 532) # CPU_PA_RISC2_0 ++ case "${sc_kernel_bits}" in ++ 32) HP_ARCH="hppa2.0n" ;; ++ 64) HP_ARCH="hppa2.0w" ;; ++ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 ++ esac ;; ++ esac ++ fi ++ if [ "${HP_ARCH}" = "" ]; then ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ ++ #define _HPUX_SOURCE ++ #include <stdlib.h> ++ #include <unistd.h> ++ ++ int main () ++ { ++ #if defined(_SC_KERNEL_BITS) ++ long bits = sysconf(_SC_KERNEL_BITS); ++ #endif ++ long cpu = sysconf (_SC_CPU_VERSION); ++ ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ++ case CPU_PA_RISC2_0: ++ #if defined(_SC_KERNEL_BITS) ++ switch (bits) ++ { ++ case 64: puts ("hppa2.0w"); break; ++ case 32: puts ("hppa2.0n"); break; ++ default: puts ("hppa2.0"); break; ++ } break; ++ #else /* !defined(_SC_KERNEL_BITS) */ ++ puts ("hppa2.0"); break; ++ #endif ++ default: puts ("hppa1.0"); break; ++ } ++ exit (0); ++ } ++EOF ++ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` ++ test -z "$HP_ARCH" && HP_ARCH=hppa ++ fi ;; ++ esac ++ if [ ${HP_ARCH} = "hppa2.0w" ] ++ then ++ eval $set_cc_for_build ++ ++ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating ++ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler ++ # generating 64-bit code. GNU and HP use different nomenclature: ++ # ++ # $ CC_FOR_BUILD=cc ./config.guess ++ # => hppa2.0w-hp-hpux11.23 ++ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess ++ # => hppa64-hp-hpux11.23 ++ ++ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | ++ grep -q __LP64__ ++ then ++ HP_ARCH="hppa2.0w" ++ else ++ HP_ARCH="hppa64" ++ fi ++ fi ++ echo ${HP_ARCH}-hp-hpux${HPUX_REV} ++ exit ;; ++ ia64:HP-UX:*:*) ++ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` ++ echo ia64-hp-hpux${HPUX_REV} ++ exit ;; ++ 3050*:HI-UX:*:*) ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #include <unistd.h> ++ int ++ main () ++ { ++ long cpu = sysconf (_SC_CPU_VERSION); ++ /* The order matters, because CPU_IS_HP_MC68K erroneously returns ++ true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct ++ results, however. */ ++ if (CPU_IS_PA_RISC (cpu)) ++ { ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; ++ case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; ++ default: puts ("hppa-hitachi-hiuxwe2"); break; ++ } ++ } ++ else if (CPU_IS_HP_MC68K (cpu)) ++ puts ("m68k-hitachi-hiuxwe2"); ++ else puts ("unknown-hitachi-hiuxwe2"); ++ exit (0); ++ } ++EOF ++ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && ++ { echo "$SYSTEM_NAME"; exit; } ++ echo unknown-hitachi-hiuxwe2 ++ exit ;; ++ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) ++ echo hppa1.1-hp-bsd ++ exit ;; ++ 9000/8??:4.3bsd:*:*) ++ echo hppa1.0-hp-bsd ++ exit ;; ++ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) ++ echo hppa1.0-hp-mpeix ++ exit ;; ++ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) ++ echo hppa1.1-hp-osf ++ exit ;; ++ hp8??:OSF1:*:*) ++ echo hppa1.0-hp-osf ++ exit ;; ++ i*86:OSF1:*:*) ++ if [ -x /usr/sbin/sysversion ] ; then ++ echo ${UNAME_MACHINE}-unknown-osf1mk ++ else ++ echo ${UNAME_MACHINE}-unknown-osf1 ++ fi ++ exit ;; ++ parisc*:Lites*:*:*) ++ echo hppa1.1-hp-lites ++ exit ;; ++ C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) ++ echo c1-convex-bsd ++ exit ;; ++ C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) ++ if getsysinfo -f scalar_acc ++ then echo c32-convex-bsd ++ else echo c2-convex-bsd ++ fi ++ exit ;; ++ C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) ++ echo c34-convex-bsd ++ exit ;; ++ C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) ++ echo c38-convex-bsd ++ exit ;; ++ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) ++ echo c4-convex-bsd ++ exit ;; ++ CRAY*Y-MP:*:*:*) ++ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; ++ CRAY*[A-Z]90:*:*:*) ++ echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ ++ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ ++ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ ++ -e 's/\.[^.]*$/.X/' ++ exit ;; ++ CRAY*TS:*:*:*) ++ echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; ++ CRAY*T3E:*:*:*) ++ echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; ++ CRAY*SV1:*:*:*) ++ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; ++ *:UNICOS/mp:*:*) ++ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' ++ exit ;; ++ F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) ++ FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` ++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; ++ 5000:UNIX_System_V:4.*:*) ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` ++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; ++ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) ++ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} ++ exit ;; ++ sparc*:BSD/OS:*:*) ++ echo sparc-unknown-bsdi${UNAME_RELEASE} ++ exit ;; ++ *:BSD/OS:*:*) ++ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} ++ exit ;; ++ *:FreeBSD:*:*) ++ case ${UNAME_MACHINE} in ++ pc98) ++ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ amd64) ++ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ *) ++ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ esac ++ exit ;; ++ i*:CYGWIN*:*) ++ echo ${UNAME_MACHINE}-pc-cygwin ++ exit ;; ++ *:MINGW*:*) ++ echo ${UNAME_MACHINE}-pc-mingw32 ++ exit ;; ++ i*:windows32*:*) ++ # uname -m includes "-pc" on this system. ++ echo ${UNAME_MACHINE}-mingw32 ++ exit ;; ++ i*:PW*:*) ++ echo ${UNAME_MACHINE}-pc-pw32 ++ exit ;; ++ *:Interix*:*) ++ case ${UNAME_MACHINE} in ++ x86) ++ echo i586-pc-interix${UNAME_RELEASE} ++ exit ;; ++ authenticamd | genuineintel | EM64T) ++ echo x86_64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ IA64) ++ echo ia64-unknown-interix${UNAME_RELEASE} ++ exit ;; ++ esac ;; ++ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) ++ echo i${UNAME_MACHINE}-pc-mks ++ exit ;; ++ 8664:Windows_NT:*) ++ echo x86_64-pc-mks ++ exit ;; ++ i*:Windows_NT*:* | Pentium*:Windows_NT*:*) ++ # How do we know it's Interix rather than the generic POSIX subsystem? ++ # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we ++ # UNAME_MACHINE based on the output of uname instead of i386? ++ echo i586-pc-interix ++ exit ;; ++ i*:UWIN*:*) ++ echo ${UNAME_MACHINE}-pc-uwin ++ exit ;; ++ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) ++ echo x86_64-unknown-cygwin ++ exit ;; ++ p*:CYGWIN*:*) ++ echo powerpcle-unknown-cygwin ++ exit ;; ++ prep*:SunOS:5.*:*) ++ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` ++ exit ;; ++ *:GNU:*:*) ++ # the GNU system ++ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` ++ exit ;; ++ *:GNU/*:*:*) ++ # other systems with GNU libc and userland ++ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu ++ exit ;; ++ i*86:Minix:*:*) ++ echo ${UNAME_MACHINE}-pc-minix ++ exit ;; ++ alpha:Linux:*:*) ++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in ++ EV5) UNAME_MACHINE=alphaev5 ;; ++ EV56) UNAME_MACHINE=alphaev56 ;; ++ PCA56) UNAME_MACHINE=alphapca56 ;; ++ PCA57) UNAME_MACHINE=alphapca56 ;; ++ EV6) UNAME_MACHINE=alphaev6 ;; ++ EV67) UNAME_MACHINE=alphaev67 ;; ++ EV68*) UNAME_MACHINE=alphaev68 ;; ++ esac ++ objdump --private-headers /bin/sh | grep -q ld.so.1 ++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi ++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ++ exit ;; ++ arm*:Linux:*:*) ++ eval $set_cc_for_build ++ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_EABI__ ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ else ++ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ ++ | grep -q __ARM_PCS_VFP ++ then ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi ++ else ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf ++ fi ++ fi ++ exit ;; ++ avr32*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ cris:Linux:*:*) ++ echo cris-axis-linux-gnu ++ exit ;; ++ crisv32:Linux:*:*) ++ echo crisv32-axis-linux-gnu ++ exit ;; ++ frv:Linux:*:*) ++ echo frv-unknown-linux-gnu ++ exit ;; ++ i*86:Linux:*:*) ++ LIBC=gnu ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #ifdef __dietlibc__ ++ LIBC=dietlibc ++ #endif ++EOF ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` ++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" ++ exit ;; ++ ia64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ m32r*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ m68*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ mips:Linux:*:* | mips64:Linux:*:*) ++ eval $set_cc_for_build ++ sed 's/^ //' << EOF >$dummy.c ++ #undef CPU ++ #undef ${UNAME_MACHINE} ++ #undef ${UNAME_MACHINE}el ++ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) ++ CPU=${UNAME_MACHINE}el ++ #else ++ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) ++ CPU=${UNAME_MACHINE} ++ #else ++ CPU= ++ #endif ++ #endif ++EOF ++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` ++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ++ ;; ++ or32:Linux:*:*) ++ echo or32-unknown-linux-gnu ++ exit ;; ++ padre:Linux:*:*) ++ echo sparc-unknown-linux-gnu ++ exit ;; ++ parisc64:Linux:*:* | hppa64:Linux:*:*) ++ echo hppa64-unknown-linux-gnu ++ exit ;; ++ parisc:Linux:*:* | hppa:Linux:*:*) ++ # Look for CPU level ++ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in ++ PA7*) echo hppa1.1-unknown-linux-gnu ;; ++ PA8*) echo hppa2.0-unknown-linux-gnu ;; ++ *) echo hppa-unknown-linux-gnu ;; ++ esac ++ exit ;; ++ ppc64:Linux:*:*) ++ echo powerpc64-unknown-linux-gnu ++ exit ;; ++ ppc:Linux:*:*) ++ echo powerpc-unknown-linux-gnu ++ exit ;; ++ s390:Linux:*:* | s390x:Linux:*:*) ++ echo ${UNAME_MACHINE}-ibm-linux ++ exit ;; ++ sh64*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ sh*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ sparc:Linux:*:* | sparc64:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ tile*:Linux:*:*) ++ echo ${UNAME_MACHINE}-tilera-linux-gnu ++ exit ;; ++ vax:Linux:*:*) ++ echo ${UNAME_MACHINE}-dec-linux-gnu ++ exit ;; ++ x86_64:Linux:*:*) ++ echo x86_64-unknown-linux-gnu ++ exit ;; ++ xtensa*:Linux:*:*) ++ echo ${UNAME_MACHINE}-unknown-linux-gnu ++ exit ;; ++ i*86:DYNIX/ptx:4*:*) ++ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. ++ # earlier versions are messed up and put the nodename in both ++ # sysname and nodename. ++ echo i386-sequent-sysv4 ++ exit ;; ++ i*86:UNIX_SV:4.2MP:2.*) ++ # Unixware is an offshoot of SVR4, but it has its own version ++ # number series starting with 2... ++ # I am not positive that other SVR4 systems won't match this, ++ # I just have to hope. -- rms. ++ # Use sysv4.2uw... so that sysv4* matches it. ++ echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} ++ exit ;; ++ i*86:OS/2:*:*) ++ # If we were able to find `uname', then EMX Unix compatibility ++ # is probably installed. ++ echo ${UNAME_MACHINE}-pc-os2-emx ++ exit ;; ++ i*86:XTS-300:*:STOP) ++ echo ${UNAME_MACHINE}-unknown-stop ++ exit ;; ++ i*86:atheos:*:*) ++ echo ${UNAME_MACHINE}-unknown-atheos ++ exit ;; ++ i*86:syllable:*:*) ++ echo ${UNAME_MACHINE}-pc-syllable ++ exit ;; ++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) ++ echo i386-unknown-lynxos${UNAME_RELEASE} ++ exit ;; ++ i*86:*DOS:*:*) ++ echo ${UNAME_MACHINE}-pc-msdosdjgpp ++ exit ;; ++ i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) ++ UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` ++ if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then ++ echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} ++ else ++ echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} ++ fi ++ exit ;; ++ i*86:*:5:[678]*) ++ # UnixWare 7.x, OpenUNIX and OpenServer 6. ++ case `/bin/uname -X | grep "^Machine"` in ++ *486*) UNAME_MACHINE=i486 ;; ++ *Pentium) UNAME_MACHINE=i586 ;; ++ *Pent*|*Celeron) UNAME_MACHINE=i686 ;; ++ esac ++ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} ++ exit ;; ++ i*86:*:3.2:*) ++ if test -f /usr/options/cb.name; then ++ UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` ++ echo ${UNAME_MACHINE}-pc-isc$UNAME_REL ++ elif /bin/uname -X 2>/dev/null >/dev/null ; then ++ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` ++ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 ++ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ ++ && UNAME_MACHINE=i586 ++ (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ ++ && UNAME_MACHINE=i686 ++ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ ++ && UNAME_MACHINE=i686 ++ echo ${UNAME_MACHINE}-pc-sco$UNAME_REL ++ else ++ echo ${UNAME_MACHINE}-pc-sysv32 ++ fi ++ exit ;; ++ pc:*:*:*) ++ # Left here for compatibility: ++ # uname -m prints for DJGPP always 'pc', but it prints nothing about ++ # the processor, so we play safe by assuming i586. ++ # Note: whatever this is, it MUST be the same as what config.sub ++ # prints for the "djgpp" host, or else GDB configury will decide that ++ # this is a cross-build. ++ echo i586-pc-msdosdjgpp ++ exit ;; ++ Intel:Mach:3*:*) ++ echo i386-pc-mach3 ++ exit ;; ++ paragon:*:*:*) ++ echo i860-intel-osf1 ++ exit ;; ++ i860:*:4.*:*) # i860-SVR4 ++ if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then ++ echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 ++ else # Add other i860-SVR4 vendors below as they are discovered. ++ echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 ++ fi ++ exit ;; ++ mini*:CTIX:SYS*5:*) ++ # "miniframe" ++ echo m68010-convergent-sysv ++ exit ;; ++ mc68k:UNIX:SYSTEM5:3.51m) ++ echo m68k-convergent-sysv ++ exit ;; ++ M680?0:D-NIX:5.3:*) ++ echo m68k-diab-dnix ++ exit ;; ++ M68*:*:R3V[5678]*:*) ++ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; ++ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) ++ OS_REL='' ++ test -r /etc/.relid \ ++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; ++ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4; exit; } ;; ++ NCR*:*:4.2:* | MPRAS*:*:4.2:*) ++ OS_REL='.3' ++ test -r /etc/.relid \ ++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ++ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ ++ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; ++ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) ++ echo m68k-unknown-lynxos${UNAME_RELEASE} ++ exit ;; ++ mc68030:UNIX_System_V:4.*:*) ++ echo m68k-atari-sysv4 ++ exit ;; ++ TSUNAMI:LynxOS:2.*:*) ++ echo sparc-unknown-lynxos${UNAME_RELEASE} ++ exit ;; ++ rs6000:LynxOS:2.*:*) ++ echo rs6000-unknown-lynxos${UNAME_RELEASE} ++ exit ;; ++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) ++ echo powerpc-unknown-lynxos${UNAME_RELEASE} ++ exit ;; ++ SM[BE]S:UNIX_SV:*:*) ++ echo mips-dde-sysv${UNAME_RELEASE} ++ exit ;; ++ RM*:ReliantUNIX-*:*:*) ++ echo mips-sni-sysv4 ++ exit ;; ++ RM*:SINIX-*:*:*) ++ echo mips-sni-sysv4 ++ exit ;; ++ *:SINIX-*:*:*) ++ if uname -p 2>/dev/null >/dev/null ; then ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ echo ${UNAME_MACHINE}-sni-sysv4 ++ else ++ echo ns32k-sni-sysv ++ fi ++ exit ;; ++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ++ # says <Richard.M.Bartel@ccMail.Census.GOV> ++ echo i586-unisys-sysv4 ++ exit ;; ++ *:UNIX_System_V:4*:FTX*) ++ # From Gerald Hewes <hewes@openmarket.com>. ++ # How about differentiating between stratus architectures? -djm ++ echo hppa1.1-stratus-sysv4 ++ exit ;; ++ *:*:*:FTX*) ++ # From seanf@swdc.stratus.com. ++ echo i860-stratus-sysv4 ++ exit ;; ++ i*86:VOS:*:*) ++ # From Paul.Green@stratus.com. ++ echo ${UNAME_MACHINE}-stratus-vos ++ exit ;; ++ *:VOS:*:*) ++ # From Paul.Green@stratus.com. ++ echo hppa1.1-stratus-vos ++ exit ;; ++ mc68*:A/UX:*:*) ++ echo m68k-apple-aux${UNAME_RELEASE} ++ exit ;; ++ news*:NEWS-OS:6*:*) ++ echo mips-sony-newsos6 ++ exit ;; ++ R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) ++ if [ -d /usr/nec ]; then ++ echo mips-nec-sysv${UNAME_RELEASE} ++ else ++ echo mips-unknown-sysv${UNAME_RELEASE} ++ fi ++ exit ;; ++ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. ++ echo powerpc-be-beos ++ exit ;; ++ BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. ++ echo powerpc-apple-beos ++ exit ;; ++ BePC:BeOS:*:*) # BeOS running on Intel PC compatible. ++ echo i586-pc-beos ++ exit ;; ++ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. ++ echo i586-pc-haiku ++ exit ;; ++ SX-4:SUPER-UX:*:*) ++ echo sx4-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-5:SUPER-UX:*:*) ++ echo sx5-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-6:SUPER-UX:*:*) ++ echo sx6-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-7:SUPER-UX:*:*) ++ echo sx7-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-8:SUPER-UX:*:*) ++ echo sx8-nec-superux${UNAME_RELEASE} ++ exit ;; ++ SX-8R:SUPER-UX:*:*) ++ echo sx8r-nec-superux${UNAME_RELEASE} ++ exit ;; ++ Power*:Rhapsody:*:*) ++ echo powerpc-apple-rhapsody${UNAME_RELEASE} ++ exit ;; ++ *:Rhapsody:*:*) ++ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} ++ exit ;; ++ *:Darwin:*:*) ++ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown ++ case $UNAME_PROCESSOR in ++ i386) ++ eval $set_cc_for_build ++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then ++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ ++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ ++ grep IS_64BIT_ARCH >/dev/null ++ then ++ UNAME_PROCESSOR="x86_64" ++ fi ++ fi ;; ++ unknown) UNAME_PROCESSOR=powerpc ;; ++ esac ++ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} ++ exit ;; ++ *:procnto*:*:* | *:QNX:[0123456789]*:*) ++ UNAME_PROCESSOR=`uname -p` ++ if test "$UNAME_PROCESSOR" = "x86"; then ++ UNAME_PROCESSOR=i386 ++ UNAME_MACHINE=pc ++ fi ++ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} ++ exit ;; ++ *:QNX:*:4*) ++ echo i386-pc-qnx ++ exit ;; ++ NEO-?:NONSTOP_KERNEL:*:*) ++ echo neo-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ NSE-?:NONSTOP_KERNEL:*:*) ++ echo nse-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ NSR-?:NONSTOP_KERNEL:*:*) ++ echo nsr-tandem-nsk${UNAME_RELEASE} ++ exit ;; ++ *:NonStop-UX:*:*) ++ echo mips-compaq-nonstopux ++ exit ;; ++ BS2000:POSIX*:*:*) ++ echo bs2000-siemens-sysv ++ exit ;; ++ DS/*:UNIX_System_V:*:*) ++ echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} ++ exit ;; ++ *:Plan9:*:*) ++ # "uname -m" is not consistent, so use $cputype instead. 386 ++ # is converted to i386 for consistency with other x86 ++ # operating systems. ++ if test "$cputype" = "386"; then ++ UNAME_MACHINE=i386 ++ else ++ UNAME_MACHINE="$cputype" ++ fi ++ echo ${UNAME_MACHINE}-unknown-plan9 ++ exit ;; ++ *:TOPS-10:*:*) ++ echo pdp10-unknown-tops10 ++ exit ;; ++ *:TENEX:*:*) ++ echo pdp10-unknown-tenex ++ exit ;; ++ KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) ++ echo pdp10-dec-tops20 ++ exit ;; ++ XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) ++ echo pdp10-xkl-tops20 ++ exit ;; ++ *:TOPS-20:*:*) ++ echo pdp10-unknown-tops20 ++ exit ;; ++ *:ITS:*:*) ++ echo pdp10-unknown-its ++ exit ;; ++ SEI:*:*:SEIUX) ++ echo mips-sei-seiux${UNAME_RELEASE} ++ exit ;; ++ *:DragonFly:*:*) ++ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ++ exit ;; ++ *:*VMS:*:*) ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ case "${UNAME_MACHINE}" in ++ A*) echo alpha-dec-vms ; exit ;; ++ I*) echo ia64-dec-vms ; exit ;; ++ V*) echo vax-dec-vms ; exit ;; ++ esac ;; ++ *:XENIX:*:SysV) ++ echo i386-pc-xenix ++ exit ;; ++ i*86:skyos:*:*) ++ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' ++ exit ;; ++ i*86:rdos:*:*) ++ echo ${UNAME_MACHINE}-pc-rdos ++ exit ;; ++ i*86:AROS:*:*) ++ echo ${UNAME_MACHINE}-pc-aros ++ exit ;; ++esac ++ ++#echo '(No uname command or uname output not recognized.)' 1>&2 ++#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 ++ ++eval $set_cc_for_build ++cat >$dummy.c <<EOF ++#ifdef _SEQUENT_ ++# include <sys/types.h> ++# include <sys/utsname.h> ++#endif ++main () ++{ ++#if defined (sony) ++#if defined (MIPSEB) ++ /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, ++ I don't know.... */ ++ printf ("mips-sony-bsd\n"); exit (0); ++#else ++#include <sys/param.h> ++ printf ("m68k-sony-newsos%s\n", ++#ifdef NEWSOS4 ++ "4" ++#else ++ "" ++#endif ++ ); exit (0); ++#endif ++#endif ++ ++#if defined (__arm) && defined (__acorn) && defined (__unix) ++ printf ("arm-acorn-riscix\n"); exit (0); ++#endif ++ ++#if defined (hp300) && !defined (hpux) ++ printf ("m68k-hp-bsd\n"); exit (0); ++#endif ++ ++#if defined (NeXT) ++#if !defined (__ARCHITECTURE__) ++#define __ARCHITECTURE__ "m68k" ++#endif ++ int version; ++ version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; ++ if (version < 4) ++ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); ++ else ++ printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); ++ exit (0); ++#endif ++ ++#if defined (MULTIMAX) || defined (n16) ++#if defined (UMAXV) ++ printf ("ns32k-encore-sysv\n"); exit (0); ++#else ++#if defined (CMU) ++ printf ("ns32k-encore-mach\n"); exit (0); ++#else ++ printf ("ns32k-encore-bsd\n"); exit (0); ++#endif ++#endif ++#endif ++ ++#if defined (__386BSD__) ++ printf ("i386-pc-bsd\n"); exit (0); ++#endif ++ ++#if defined (sequent) ++#if defined (i386) ++ printf ("i386-sequent-dynix\n"); exit (0); ++#endif ++#if defined (ns32000) ++ printf ("ns32k-sequent-dynix\n"); exit (0); ++#endif ++#endif ++ ++#if defined (_SEQUENT_) ++ struct utsname un; ++ ++ uname(&un); ++ ++ if (strncmp(un.version, "V2", 2) == 0) { ++ printf ("i386-sequent-ptx2\n"); exit (0); ++ } ++ if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ ++ printf ("i386-sequent-ptx1\n"); exit (0); ++ } ++ printf ("i386-sequent-ptx\n"); exit (0); ++ ++#endif ++ ++#if defined (vax) ++# if !defined (ultrix) ++# include <sys/param.h> ++# if defined (BSD) ++# if BSD == 43 ++ printf ("vax-dec-bsd4.3\n"); exit (0); ++# else ++# if BSD == 199006 ++ printf ("vax-dec-bsd4.3reno\n"); exit (0); ++# else ++ printf ("vax-dec-bsd\n"); exit (0); ++# endif ++# endif ++# else ++ printf ("vax-dec-bsd\n"); exit (0); ++# endif ++# else ++ printf ("vax-dec-ultrix\n"); exit (0); ++# endif ++#endif ++ ++#if defined (alliant) && defined (i860) ++ printf ("i860-alliant-bsd\n"); exit (0); ++#endif ++ ++ exit (1); ++} ++EOF ++ ++$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && ++ { echo "$SYSTEM_NAME"; exit; } ++ ++# Apollos put the system type in the environment. ++ ++test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } ++ ++# Convex versions that predate uname can use getsysinfo(1) ++ ++if [ -x /usr/convex/getsysinfo ] ++then ++ case `getsysinfo -f cpu_type` in ++ c1*) ++ echo c1-convex-bsd ++ exit ;; ++ c2*) ++ if getsysinfo -f scalar_acc ++ then echo c32-convex-bsd ++ else echo c2-convex-bsd ++ fi ++ exit ;; ++ c34*) ++ echo c34-convex-bsd ++ exit ;; ++ c38*) ++ echo c38-convex-bsd ++ exit ;; ++ c4*) ++ echo c4-convex-bsd ++ exit ;; ++ esac ++fi ++ ++cat >&2 <<EOF ++$0: unable to guess system type ++ ++This script, last modified $timestamp, has failed to recognize ++the operating system you are using. It is advised that you ++download the most up to date version of the config scripts from ++ ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD ++and ++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD ++ ++If the version you run ($0) is already up to date, please ++send the following data and any information you think might be ++pertinent to <config-patches@gnu.org> in order to provide the needed ++information to handle your system. ++ ++config.guess timestamp = $timestamp ++ ++uname -m = `(uname -m) 2>/dev/null || echo unknown` ++uname -r = `(uname -r) 2>/dev/null || echo unknown` ++uname -s = `(uname -s) 2>/dev/null || echo unknown` ++uname -v = `(uname -v) 2>/dev/null || echo unknown` ++ ++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` ++/bin/uname -X = `(/bin/uname -X) 2>/dev/null` ++ ++hostinfo = `(hostinfo) 2>/dev/null` ++/bin/universe = `(/bin/universe) 2>/dev/null` ++/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` ++/bin/arch = `(/bin/arch) 2>/dev/null` ++/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` ++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` ++ ++UNAME_MACHINE = ${UNAME_MACHINE} ++UNAME_RELEASE = ${UNAME_RELEASE} ++UNAME_SYSTEM = ${UNAME_SYSTEM} ++UNAME_VERSION = ${UNAME_VERSION} ++EOF ++ ++exit 1 ++ ++# Local variables: ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "timestamp='" ++# time-stamp-format: "%:y-%02m-%02d" ++# time-stamp-end: "'" ++# End: +--- adjtimex-1.29.orig/debian/compat ++++ adjtimex-1.29/debian/compat +@@ -0,0 +1 @@ ++5 +--- adjtimex-1.29.orig/debian/changelog ++++ adjtimex-1.29/debian/changelog +@@ -0,0 +1,753 @@ ++adjtimex (1.29-2.2) unstable; urgency=low ++ ++ * Non-maintainer upload. ++ * Make the package multiarch-ready: add build-arch and build-indep ++ build targets ++ * Fix pending l10n issues. Debconf translations: ++ - Vietnamese (Clytie Siddall). Closes: #601529 ++ - Brazilian Portuguese (Flamarion Jorge). Closes: #610409 ++ - Dutch (Michiel Sikkes). Closes: #625744 ++ ++ -- Christian Perrier <bubulle@debian.org> Mon, 04 Jul 2011 07:06:43 +0200 ++ ++adjtimex (1.29-2.1) unstable; urgency=low ++ ++ * Non-maintainer upload. ++ * Fix pending l10n issues. Debconf translations: ++ - Czech (Martin Sin). Closes: #589289 ++ - BokmÃ¥l, Norwegian (Bjørn Steensrud). Closes: #600279 ++ ++ -- Christian Perrier <bubulle@debian.org> Tue, 19 Oct 2010 07:14:50 +0200 ++ ++adjtimex (1.29-2) unstable; urgency=low ++ ++ * debian/postinst: check conffile for corruption (Closes:Bug#571633, ++ thanks to Savvas Radevic <vicedar@gmail.com> for the idea, though I ++ chose a different implementation.) ++ ++ -- James R. Van Zandt <jrv@debian.org> Tue, 25 May 2010 20:49:21 -0400 ++ ++adjtimex (1.29-1) unstable; urgency=low ++ ++ * New upstream release: Document the --force-adjust ++ option. --force-adjust suppresses warning printouts. Relax sanity ++ check to +- 1 percent. ++ ++ * debian/adjtimexconfig: Use --force-adjust option, so adjustment is ++ applied even if system clock is way off. (Thanks to Santiago Vila ++ <sanvila@unex.es> for helping to diagnose the problem. ++ Closes:Bug#557949, #559882) ++ ++ * debian/adjtimex.init: fix LSB comment header: require $local_fs, start ++ in S ++ ++ -- James R. Van Zandt <jrv@debian.org> Fri, 16 Apr 2010 20:08:49 -0400 ++ ++adjtimex (1.28-4) unstable; urgency=low ++ ++ * Update debconf template translations: ++ Swedish (Thanks to Martin Bagge <brother@bsnet.se>, Closes:Bug#572579) ++ ++ -- James R. Van Zandt <jrv@debian.org> Wed, 17 Mar 2010 19:51:06 -0400 ++ ++adjtimex (1.28-3) unstable; urgency=low ++ ++ * Update debconf template translations: ++ Swedish (Thanks to Martin Bagge <brother@bsnet.se>, Closes:Bug#562932) ++ Russian (thanks to Yuri Kozlov <yuray@komyakino.ru>, Closes:Bug#563347) ++ Finnish (thanks to Esko =?UTF-8?Q?Araj=C3=A4rvi?= <edu@iki.fi>, ++ Closes:Bug#564508) ++ ++ * debian/control: bump standards version to 3.8.4 (no changes needed) ++ ++ -- James R. Van Zandt <jrv@debian.org> Mon, 08 Feb 2010 20:19:44 -0500 ++ ++adjtimex (1.28-2) unstable; urgency=low ++ ++ * Move Swedish and Russian template translations to the correct directory ++ (thanks to Martin Bagge <brother@bsnet.se> for pointing out the ++ problem). ++ ++ * debian/control: bump standards version to 3.8.3 (no changes needed) ++ ++ -- James R. Van Zandt <jrv@debian.org> Fri, 05 Feb 2010 21:42:54 -0500 ++ ++adjtimex (1.28-1) unstable; urgency=low ++ ++ * New upstream release: (compare): Correctly apply +-500 ppm sanity ++ check (Thanks to Jacques luder <j.luder@laposte.net>) ++ ++ * Update debconf template translations: ++ Swedish (thanks to: Martin Bagge <brother@bsnet.se>, ++ Closes:Bug#533567) ++ Russian (thanks to: Yuri Kozlov <yuray@komyakino.ru>, ++ Closes:Bug#532068) ++ ++ -- James R. Van Zandt <jrv@debian.org> Sat, 07 Nov 2009 11:59:29 -0500 ++ ++adjtimex (1.27.1-4) unstable; urgency=low ++ ++ * Update translations: ++ Japanese (thanks to: Hideki Yamane, henrich @ debian.or.jp. ++ Closes:Bug#538242) ++ Spanish (Thanks to Francisco Javier Cuadrado <fcocuadrado@gmail.com>, ++ Closes:Bug#538425) ++ ++ -- James R. Van Zandt <jrv@debian.org> Sun, 26 Jul 2009 17:36:16 -0400 ++ ++adjtimex (1.27.1-3) unstable; urgency=low ++ ++ * Update translations: ++ Japanese (thanks to: Hideki Yamane, henrich @ debian.or.jp. ++ Closes:Bug#525233) ++ Swedish (thanks to: Martin Bagge <brother@bsnet.se>. Closes:Bug#525924) ++ Spanish (thanks to: Francisco Javier Cuadrado <fcocuadrado@gmail.com>, ++ Closes:Bug#528621) ++ Russian (thanks to: Yuri Kozlov <yuray@komyakino.ru>, Closes:Bug#529047) ++ Czech (thanks to: Martin Sin <martin.sin@zshk.cz>, Closes:Bug#529652) ++ ++ -- James R. Van Zandt <jrv@debian.org> Tue, 26 May 2009 20:47:42 -0400 ++ ++adjtimex (1.27.1-2) unstable; urgency=low ++ ++ * Debconf templates and debian/control reviewed by the debian-l10n- ++ english team as part of the Smith review project. Closes: #519431 ++ * Update translation: ++ French (Closes:Bug#520986) ++ ++ -- James R. Van Zandt <jrv@debian.org> Wed, 20 May 2009 22:03:38 -0400 ++ ++adjtimex (1.27.1-1) unstable; urgency=low ++ ++ * New upstream release. Provide workaround if linux/rtc.h ++ is missing (Closes:#308864) ++ ++ * debian/rules: delete config temporaries, but not config.h.in ++ * debian/control: bump version to 3.8.1 (no changes needed) ++ ++ * Update translations: ++ Japanese (Thanks to: henrich@debian.or.jp [188] Closes:Bug#522188) ++ Czech (Thanks to: martin.sin@zshk.cz [219] Closes:Bug#522193) ++ Swedish (Thanks to: brother@bsnet.se [194] Closes:Bug#522979) ++ Basque (Thanks to: pi+debian@beobide.net [207] Closes:Bug#523079) ++ Italian (Thanks to: vinz65@gmail.com [197] Closes:Bug#523419) ++ Spanish (Thanks to: fcocuadrado@gmail.com [193] Closes:Bug#523915) ++ Russian (Thanks to: yuray@komyakino.ru [223] Closes:Bug#524069) ++ German (Thanks to: schanzi_@gmx.de [226] Closes:Bug#524224) ++ Portuguese (Thanks to: carloslisboa@gmail.com [170] Closes:Bug#524283) ++ Danish (Thanks to: debian@overbygaard.dk [209] Closes:Bug#524368) ++ Galician (Thanks to: mvillarino@gmail.com [216] Closes:Bug#524397) ++ ++ -- James R. Van Zandt <jrv@debian.org> Sat, 18 Apr 2009 16:35:22 -0400 ++ ++adjtimex (1.27-1) unstable; urgency=low ++ ++ * New upstream release. If using update interrupt, sanity check the ++ delay. Sometimes the status includes an update complete flag, but it ++ actually didn't wait. Fall back to another method of reading RTC ++ (closes:Bug#517732) Calculate RTC correction as PPM of RTC time ++ (Thanks to Alain Guibert, closes:Bug#308863). ++ ++ * debian/control: add ${misc:Depends} per lintian warning. ++ ++ -- James R. Van Zandt <jrv@debian.org> Sun, 22 Mar 2009 21:54:51 -0400 ++ ++adjtimex (1.26-2) unstable; urgency=low ++ ++ * debian/templates: Clarify wording: ask about running "when installed ++ or upgraded" not just "at installation time" (thanks to Uwe Storbeck ++ <uwe@ibr.ch> and Michael Meskes <meskes@debian.org>, ++ Closes:Bug#514987) ++ ++ * debian/postinst: don't prepend path to command running adjtimexconfig ++ to silence lintian complaint. (The package management system already ++ puts /usr/sbin in path, because that's where install-info is.) ++ ++ -- James R. Van Zandt <jrv@debian.org> Sat, 14 Feb 2009 11:46:24 -0500 ++ ++adjtimex (1.26-1) unstable; urgency=low ++ ++ * New upstream release. Fix a possible hang with the Intersil ISL1208, ++ one of those new non-PC-compatible RTCs. Cleanly exits with an error ++ message, instead of either hang or returning garbage. (Thanks to Alain ++ Guibert). ++ ++ * debian/control: bump Debian policy version to 3.8.0 (no changes needed) ++ ++ * debian/rules: use "filter" instead of "findstring" to parse ++ DEB_BUILD_OPTIONS. ++ ++ -- James R. Van Zandt <jrv@debian.org> Sun, 17 Aug 2008 17:52:14 -0400 ++ ++adjtimex (1.25-1) unstable; urgency=low ++ ++ * New upstream release. Set an alarm to avoid blocking even if /dev/rtc ++ never becomes readable, then fall back to busywait. New --nointerrupt ++ option to force busywait without first waiting for the interrupt ++ timeout (thanks to Alain Guibert). (closes:Bug#477637,Bug#474337). ++ Update man page (closes:Bug#435956). ++ ++ -- James R. Van Zandt <jrv@debian.org> Fri, 08 Aug 2008 19:43:38 -0400 ++ ++adjtimex (1.24-1) unstable; urgency=low ++ ++ * New upstream release ++ ++ * adjtimex.c: Reorganize cmos_read_time() to properly integrate the ++ fallback case for when /dev/rtc has no interrupts. Make this fallback ++ actually work. fixes partially(?) Debian bug #460065 (Thanks to Alain ++ Guibert <alguibert@free.fr>) (closes:Bug#471203) ++ ++ * (cmos_read_time): Fix Y2K bug: read century from byte 50, instead of ++ assuming we're in the range 1969-2068. ++ ++ * Implement second kind of busywait (busywait_second_change): when ++ /dev/rtc interrupt is not available, fallbacks to loops around ++ ioctl(RTC_RD_TIME) until the RTC second changes. Patch applies to ++ adjtimex 1.23 above first no-interrupt-fallback.patch fixes ++ partially(?) Debian bug #460065 (Thanks to: Alain Guibert ++ <alguibert@free.fr>) ++ ++ * (cmos_read_time) If /dev/rtc does not exist then automatically ++ fallback to /dev/rtc0, so it works even without symlink. (Thanks to: ++ Alain Guibert <alguibert@free.fr>) ++ ++ * adjtimex.c (main): fix typo in options handling (thanks to Miroslav ++ Lichvar <mlichvar@redhat.com>) ++ ++ * debian/control: bump Debian policy version to 3.7.3 (no changes needed) ++ ++ * debian/dirs: don't install empty directory /usr/bin ++ ++ -- James R. Van Zandt <jrv@debian.org> Fri, 04 Apr 2008 22:05:01 -0400 ++ ++adjtimex (1.23-1) unstable; urgency=low ++ ++ * New upstream release ++ ++ * adjtimex.c (compare): In case of absence of /etc/adjtime, do not fail, ++ and do not force users to manually create it with 0.0 ++ content. Instead, proceed assuming zero values (meaning RTC does not ++ drift). Also replace redundant code by a call to ++ get_cmos_adjustment(). README: Rewrite USAGE paragraph. Remove point ++ about creating zero adjfile. Document new behaviour without ++ adjfile. Remove reference to the long outdated clock(8). Update URL ++ for hwclock(8). (Thanks to Alain Guibert <alguibert@free.fr>, ++ closes:bug#445448) ++ ++ * adjtimex.c (busy_wait): timestamp more closely the RTC clock beat ++ (thanks to Alain Guibert <alguibert at free.fr>, see Debian ++ bug#443814). (usage): --directisa switch forces adjtimex to poll the ++ update-in-process (UIP) flag of the CMOS clock (thanks to Alain ++ Guibert <alguibert at free.fr>, closes:bug#443773). ++ ++ -- James R. Van Zandt <jrv@debian.org> Sat, 06 Oct 2007 21:57:04 -0400 ++ ++adjtimex (1.22-1) unstable; urgency=low ++ ++ * New upstream release: fix these bugs in ntpdate output ++ interpretation (closes:bug#438718): ++ adjtimex has a bug in evaluating the output of ntpdate, because ++ 1. it assumes ntpdate outputs "adjust time server", but ntpdate ++ may output "step time server" also ++ 2. it doesnt stop at last line but as soon as it has found "filter ++ offset:" lines, and because of this it will not find the "offset ..." ++ information in the last line. ++ ++ -- James R. Van Zandt <jrv@debian.org> Sun, 23 Sep 2007 12:51:52 -0400 ++ ++adjtimex (1.21.1-3) unstable; urgency=low ++ ++ * update German translation of debconf templates, thanks to Erik Schanze ++ <eriks@debian.org> and Helge Kreutzmann ++ <debian@helgefjell.de>(closes:#436080) ++ ++ * debian/rules don't ignore failure of "make distclean" ++ ++ * debian/adjtimex.init: make LSB compliant ++ ++ -- James R. Van Zandt <jrv@debian.org> Mon, 06 Aug 2007 21:39:47 -0400 ++ ++adjtimex (1.21.1-2) unstable; urgency=low ++ ++ * Update French translation of debconf templates, thanks to Christian ++ Perrier <bubulle@debian.org> (closes:Bug#403472) ++ ++ -- James R. Van Zandt <jrv@debian.org> Sun, 7 Jan 2007 18:10:32 -0500 ++ ++adjtimex (1.21.1-1) unstable; urgency=low ++ ++ * New upstream release. ++ ++ * adjtimex.c: don't declare adjtimex syscall (should already be getting ++ the declaration from sys/timex.h) Thanks to Andreas Jochens ++ <aj@andaco.de> (closes:#390989) ++ ++ -- James R. Van Zandt <jrv@debian.org> Sat, 7 Oct 2006 08:04:52 -0400 ++ ++adjtimex (1.21-2) unstable; urgency=low ++ ++ * Makefile: correct version number to 1.21 (error in importing upstream ++ sources) ++ ++ * debian/control: depend on po-debconf ++ ++ -- James R. Van Zandt <jrv@debian.org> Fri, 6 Oct 2006 20:41:00 -0400 ++ ++adjtimex (1.21-1) unstable; urgency=low ++ ++ * New upstream release. use /dev/rtc if available (closes:#196692). Use ++ heuristic to correct for DST changes or lacking --utc flag ++ (closes:#308396). check return code in probe_time() so if root ++ privileges are needed (e.g. "adjtimex -r") and lacking, command will ++ fail rather than printing bogus results. (closes:#364060) ++ ++ * debian/postinst: start with invoke-rc.d if available (closes:#367746) ++ ++ * debian/control: update to policy 3.7.2 ++ ++ -- James R. Van Zandt <jrv@debian.org> Sat, 20 May 2006 08:33:05 -0400 ++ ++adjtimex (1.20-7) unstable; urgency=low ++ ++ * debian/README.Debian: correct references to files, which are no longer ++ in /usr/doc/adjtimex (closes:#365761) ++ * debian/rules: declare debhelper compat level 5 ++ * debian/control: build-depends on debhelper ver 5 ++ ++ -- James R. Van Zandt <jrv@debian.org> Thu, 4 May 2006 21:54:33 -0400 ++ ++adjtimex (1.20-6) unstable; urgency=low ++ ++ * control: depend on debconf | debconf-2.0 (closes: #331733), update to ++ policy 3.6.2 ++ * debian/po/de.po: fix spelling error in German translation, thanks to ++ Philipp Meier <meier@meisterbohne.de> (closes: #279254) ++ * debian/po/sv.po: Swedish translation for debconf template, courtesy ++ of Daniel Nylander <yeager@lidkoping.net> (closes: #333124) ++ * debian/po: Add Portugese translation for debconf template, courtesy of ++ Miguel Figueiredo <elmig@debianpt.org> (closes: #336333) ++ * debian/po: Add Russian translation for debconf template, courtesy of ++ Yuri Kozlov <kozlov.y@gmail.com> (closes: #337967) ++ * debian/copyright: update FSF address. ++ ++ -- James R. Van Zandt <jrv@debian.org> Fri, 25 Nov 2005 21:04:08 -0500 ++ ++adjtimex (1.20-5) unstable; urgency=low ++ ++ * debian/po/vi.po: Vietnamese translation for debconf template, courtesy ++ of Clytie Siddall <clytie@riverland.net.au> (closes:Bug#307600) ++ ++ -- James R. Van Zandt <jrv@debian.org> Sat, 7 May 2005 11:58:47 -0400 ++ ++adjtimex (1.20-4) unstable; urgency=low ++ ++ * debian/po/cs.po: Czech translation for debconf template, courtesy of ++ Martin Å Ãn <martin.sin@seznam.cz> (closes:Bug#304377) ++ ++ -- James R. Van Zandt <jrv@debian.org> Mon, 25 Apr 2005 20:14:42 -0400 ++ ++adjtimex (1.20-3) unstable; urgency=low ++ ++ * debian/adjtimex.init: adjust printout to conform to Debian standard, ++ output error to stderr (Thanks to Thomas Hood, closes:bug#294824) ++ ++ -- James R. Van Zandt <jrv@debian.org> Sun, 13 Mar 2005 17:20:28 -0500 ++ ++adjtimex (1.20-2) unstable; urgency=low ++ ++ * debian/po/de.po: replace corrupted file (closes: #250250) ++ ++ -- James R. Van Zandt <jrv@debian.org> Mon, 20 Sep 2004 20:08:47 -0400 ++ ++adjtimex (1.20-1) unstable; urgency=low ++ ++ * New upstream release ++ ++ * adjtimex.c (compare): in "compare" or "adjust", return immediately ++ after printing last result, instead of sleeping an extra $interval ++ seconds. (Thanks to Alain Guibert <derogaton at oreka.com>, ++ closes:Bug#243652) ++ ++ * postinst: remove /etc/rcS.d/S20adjtimex link if configured not to run ++ at startup (thanks to Mario 'BitKoenig' Holbe, closes:Bug#267229) ++ ++ -- James R. Van Zandt <jrv@debian.org> Sun, 19 Sep 2004 12:41:37 -0400 ++ ++adjtimex (1.19-1) unstable; urgency=high ++ ++ * copyright: report upstream source address (closes:Bug#269691) ++ ++ * control: don't depend on either mawk or awk, since either works and ++ awk is required (closes:Bug#267228) ++ ++ * New upstream release ++ ++ * adjtimex.c (compare): Account for the current frequency value ++ when calculating the recommended frequency value. Simplify ++ calculation of recommended tick. (compare): print estimated system ++ error in ppm instead of obscure "second diff". ++ ++ * adjtimex.8: use 2^16 instead of the more obscure 1<<16. ++ ++ * adjtimex.c: revert to poll-wait instead of using /dev/rtc, because the ++ latter only provides time with one second precision and so gives ++ wildly inaccurate adjustments. (closes:Bug#269498,Bug#265839) ++ ++ -- James R. Van Zandt <jrv@debian.org> Sat, 11 Sep 2004 16:01:52 -0400 ++ ++adjtimex (1.18-1.1) unstable; urgency=medium ++ ++ * Non-maintainer upload prepared by Joshua Kwan and Ken Bloom. ++ * Applied patch from Jurij Smakov <jurij@wooyd.org> to #263401: ++ - Fixes the regular expression used to extract the baseline value ++ from the adjtimex output. Closes: #263401 ++ - Replaces non-POSIX compliant calls to ('tail -1') by the ++ POSIX-compliant ones ('tail -n 1') ++ - Cosmetic changes to the adjtimexconfig output, making it ++ consistent with the general Debian style. ++ * Add German debconf template translations (closes: #250250) ++ ++ -- Ken Bloom <kabloom@ucdavis.edu> Thu, 12 Aug 2004 23:34:33 -0700 ++ ++adjtimex (1.18-1) unstable; urgency=low ++ ++ * New upstream release ++ ++ * call reset_time_status() only when explicitly told to (thanks to Alain ++ Guibert <derogaton at oreka.com>, closes:bug#243031) ++ ++ * Add debconf translations for Japanese (closes:bug#223462), Danish ++ (closes:bug#239865), and Brazilian Portuguese (closes:bug#228281). ++ ++ -- James R. Van Zandt <jrv@debian.org> Sun, 11 Apr 2004 18:32:33 -0400 ++ ++adjtimex (1.17-1) unstable; urgency=low ++ ++ * New upstream release ++ ++ * control: compliant with Debian policy version 3.6.1 ++ ++ * es.po: decode "quoted-printable" encoding. ++ ++ * adjtimex.c: update email ++ (main): If adjtimex() returns an error, print HZ and legal ranges ++ for tick and freq. (thanks to Sami Farin <safari at iki.fi>) ++ (review): calculate reasonable tick and frequency when HZ != 100. ++ (cmos_init): use /dev/rtc when available (thanks to Richard ++ Henderson <rth at twiddle.net>). ++ ++ * adjtimex.c: --status switch sets clock status (courtesy of Alain ++ Guibert <derogaton at oreka.com>) (closes:bug#242732) ++ ++ * adjtimexconfig: set reasonable tick and frequency when HZ != ++ 100. (closes:Bug#241726) ++ ++ * adjtimex.c (longopt): fix spelling to match documentation: --esterror ++ and --maxerror (thanks to Alain Guibert) (fixes:Bug#241863) ++ ++ -- James R. Van Zandt <jrv@debian.org> Sat, 3 Apr 2004 21:13:09 -0500 ++ ++adjtimex (1.16-3) unstable; urgency=low ++ ++ * Dutch translation of gettext debconf templates (courtesy of Michiel Sikkes, closes:bug#215162) ++ ++ -- James R. Van Zandt <jrv@debian.org> Sun, 12 Oct 2003 17:33:55 -0400 ++ ++adjtimex (1.16-2) unstable; urgency=low ++ ++ * Polish translation of gettext debconf templates (courtesy of Bartosz ++ Zapalowski, closes:bug#208955) ++ ++ -- James R. Van Zandt <jrv@debian.org> Sun, 7 Sep 2003 16:26:30 -0400 ++ ++adjtimex (1.16-1) unstable; urgency=low ++ ++ * New upstream release (closes:Bug#204382)(closes:Bug#204377) ++ ++ -- James R. Van Zandt <jrv@vanzandt.mv.com> Sun, 24 Aug 2003 20:52:32 -0400 ++ ++adjtimex (1.15.1-2) unstable; urgency=low ++ ++ * gettext-based debconf templates (closes:bug#205788) ++ * French translation of gettext debconf templates (closes:Bug#206430) ++ * Spanish translation of gettext debconf templates (closes:Bug#197485) ++ ++ -- James R. Van Zandt <jrv@debian.org> Sun, 24 Aug 2003 18:01:56 -0400 ++ ++adjtimex (1.15.1-1) unstable; urgency=low ++ ++ * New upstream release. Add explicit newlines in multi-line help text ++ (closes:bug#194858) ++ ++ -- James R. Van Zandt <jrv@vanzandt.mv.com> Sat, 31 May 2003 20:53:14 -0400 ++ ++adjtimex (1.15-1) unstable; urgency=low ++ ++ * New upstream release. Now compiles on ia64 (closes:bug#141655). ++ ++ -- James R. Van Zandt <jrv@vanzandt.mv.com> Wed, 30 Apr 2003 19:38:11 -0400 ++ ++adjtimex (1.14-1) unstable; urgency=low ++ ++ * New Upstream Release. Expanded documentation (closes:bug#142967) ++ * convert to debhelper ++ * debian/control: depend on debconf ++ * debian/postinst: configure adjtimex to run on startup, and run ++ adjtimexconfig on installation, only if asked by sysadmin (via ++ debconf) (closes:bug#158047) ++ * debian/postrm: purge debconf db entry ++ * debian/adjtimexconfig: config file is now /etc/default/adjtimex ++ ++ -- James R. Van Zandt <jrv@debian.org> Sun, 27 Apr 2003 21:28:40 -0400 ++ ++adjtimex (1.13-1) unstable; urgency=low ++ ++ * New upstream release (closes:Bug#127483) ++ ++ -- James R. Van Zandt <jrv@debian.org> Sun, 6 Jan 2002 21:06:23 -0500 ++ ++adjtimex (1.12-3) unstable; urgency=low ++ ++ * New maintainer email (fix remaining references) ++ ++ -- James R. Van Zandt <jrv@debian.org> Sun, 9 Dec 2001 15:25:06 -0500 ++ ++adjtimex (1.12-2) unstable; urgency=low ++ ++ * New maintainer email ++ ++ -- James R. Van Zandt <jrv@debian.org> Sun, 9 Dec 2001 13:24:59 -0500 ++ ++adjtimex (1.12-1) unstable; urgency=low ++ ++ * New upstream release ++ * debian/control: move Build-Depends entry to source section ++ (closes:bug#91928). Policy version 3.5.2 ++ * debian/rules: by default, compile without -g option. Honor ++ DEB_BUILD_OPTIONS. ++ ++ -- James R. Van Zandt <jrv@vanzandt.mv.com> Wed, 22 Nov 2000 01:37:58 -0500 ++ ++adjtimex (1.11-3) unstable; urgency=low ++ ++ * adjtimexconfig: install new values in /etc/adjtimex.conf rather than ++ the startup script /etc/init.d/adjtimex (thanks to Zsolt Szabo ++ <szazs@mm.bme.hu>). ++ ++ -- James R. Van Zandt <jrv@vanzandt.mv.com> Sat, 30 Sep 2000 09:34:58 -0400 ++ ++adjtimex (1.11-2) unstable; urgency=low ++ ++ * build-depends on debmake ++ ++ -- James R. Van Zandt <jrv@vanzandt.mv.com> Sun, 3 Sep 2000 13:50:02 -0400 ++ ++adjtimex (1.11-1) unstable; urgency=low ++ ++ * /etc/init.d/adjtimex: restart|force-reload also run adjtimex ++ (closes:bug#69514), add comment explaining precedence of ++ /etc/adjtimex.conf ++ ++ * New upstream release ++ ++ -- James R. Van Zandt <jrv@vanzandt.mv.com> Mon, 28 Aug 2000 21:19:48 -0400 ++ ++adjtimex (1.10-1) frozen unstable; urgency=high ++ ++ * New upstream release - security fix: use popen() to recover output from ++ ntpdate, instead of an unsafe temporary file (thanks to Colin Phipps ++ <crp22@cam.ac.uk>) (closes:bug#56752) ++ ++ -- James R. Van Zandt <jrv@vanzandt.mv.com> Tue, 1 Feb 2000 21:29:03 -0500 ++ ++adjtimex (1.9-2) unstable; urgency=low ++ ++ * Suggest ntpdate (closes:bug#56751) ++ ++ -- James R. Van Zandt <jrv@vanzandt.mv.com> Mon, 31 Jan 2000 19:26:16 -0500 ++ ++adjtimex (1.9-1) unstable; urgency=low ++ ++ * New upstream release ++ * Removed pointer to /usr/doc/copyright/GPL ++ ++ -- James R. Van Zandt <jrv@vanzandt.mv.com> Mon, 3 Jan 2000 21:34:59 -0500 ++ ++adjtimex (1.8.1-1) unstable; urgency=low ++ ++ * New upstream release (closes:bug#52637) ++ ++ -- James R. Van Zandt <jrv@vanzandt.mv.com> Thu, 16 Dec 1999 20:13:43 -0500 ++ ++adjtimex (1.8-4) unstable; urgency=low ++ ++ * Change references from /usr/sbin/adjtimex to /sbin/adjtimex in ++ adjtimexconfig ++ ++ -- James R. Van Zandt <jrv@vanzandt.mv.com> Tue, 2 Nov 1999 20:21:48 -0500 ++ ++adjtimex (1.8-3) unstable; urgency=low ++ ++ * *Really* install binary into /sbin, so it is available ++ even if /usr is not mounted (closes:Bug#44399) ++ ++ -- James R. Van Zandt <jrv@vanzandt.mv.com> Sat, 30 Oct 1999 17:57:57 -0400 ++ ++adjtimex (1.8-2) unstable; urgency=low ++ ++ * Install compatibility symlink /usr/doc/adjtimex. ++ ++ -- James R. Van Zandt <jrv@vanzandt.mv.com> Sun, 24 Oct 1999 10:54:01 -0400 ++ ++adjtimex (1.8-1) unstable; urgency=low ++ ++ * New upstream release: Install binary into /sbin, so it is available ++ even if /usr is not mounted (closes:Bug#44399) ++ ++ -- James R. Van Zandt <jrv@vanzandt.mv.com> Mon, 6 Sep 1999 13:08:15 -0400 ++ ++adjtimex (1.7-2) unstable; urgency=low ++ ++ * Link against glibc2.1 ++ * Upgrade to FHS ++ * Include full license statement in copyright file ++ * Revise GPL reference in copyright file ++ ++ -- James R. Van Zandt <jrv@vanzandt.mv.com> Sat, 4 Sep 1999 12:04:34 -0400 ++ ++adjtimex (1.7-1) unstable; urgency=low ++ ++ * install configuration file in /etc/init.d rather than /etc/rc.boot ++ closes: #30120, #32436. ++ * New upstream release (incorporates Paul Slootman's alpha patch) ++ ++ -- James R. Van Zandt <jrv@vanzandt.mv.com> Sat, 28 Nov 1998 20:33:38 -0500 ++ ++adjtimex (1.6-2) unstable; urgency=low ++ ++ * corrected reference in man page: clock -> hwclock (Bug#27854) ++ ++ -- James R. Van Zandt <jrv@vanzandt.mv.com> Sat, 24 Oct 1998 14:40:45 -0400 ++ ++adjtimex (1.6-1.1) unstable; urgency=low ++ ++ * non-maintainer (binary-only) upload for Alpha ++ * changed architecture back to 'any'. Why should it be i386 only? ++ * don't use syscall1() to declare adjtimex() for Alpha ++ ++ -- Paul Slootman <paul@debian.org> Tue, 8 Sep 1998 20:42:52 +0200 ++ ++adjtimex (1.6-1) unstable; urgency=low ++ ++ * New upstream release: Default log file is "/var/log/clocks.log". ++ Create log file if it does not exist. (Bug#25834) ++ ++ -- James R. Van Zandt <jrv@vanzandt.mv.com> Sat, 22 Aug 1998 20:33:22 -0400 ++ ++adjtimex (1.5-3) unstable; urgency=low ++ ++ * architecture is i386 only ++ ++ -- James R. Van Zandt <jrv@vanzandt.mv.com> Mon, 29 Jun 1998 19:35:22 -0400 ++ ++adjtimex (1.5-2) unstable; urgency=low ++ ++ * eliminate question in postinst, by eliminating postinst entirely ++ (Bug#22288) ++ ++ -- James R. Van Zandt <jrv@vanzandt.mv.com> Sun, 7 Jun 1998 20:51:42 -0400 ++ ++adjtimex (1.5-1) frozen unstable; urgency=low ++ ++ * New upstream release. No functional changes, but adjtimex is now ++ covered by the GNU GPL. (Bug#21358) ++ ++ -- James R. Van Zandt <jrv@vanzandt.mv.com> Mon, 20 Apr 1998 21:38:53 -0400 ++ ++adjtimex (1.4-2) unstable; urgency=low ++ ++ * Ensure that changelog is compressed *before* calculating md5sum ++ (Bug#19266) ++ ++ -- James R. Van Zandt <jrv@vanzandt.mv.com> Sat, 14 Mar 1998 20:47:52 -0500 ++ ++adjtimex (1.4-1) unstable; urgency=low ++ ++ * New upstream release. Log times for long-term estimation of drifts. ++ ++ -- James R. Van Zandt <jrv@vanzandt.mv.com> Thu, 11 Dec 1997 21:48:01 -0500 ++ ++adjtimex (1.3-3) stable; urgency=medium ++ ++ * Moved temporary files from /tmp to /etc, to eliminate security ++ hole (bug #11610). ++ ++ -- Jim Van Zandt <jrv@vanzandt.mv.com> Sun, 3 Aug 1997 11:34:48 -0400 ++ ++adjtimex (1.3-2) stable; urgency=medium ++ ++ * Removed conflict with xntp, since ntpdate from the xntp package ++ is still compatible with adjtimex. ++ ++ -- Jim Van Zandt <jrv@vanzandt.mv.com> Wed, 12 Mar 1997 21:01:05 -0500 ++ ++adjtimex (1.3-1) unstable; urgency=HIGH ++ ++ * New upstream version: Previous version allows 2.0 kernel to reset ++ the CMOS clock periodically. Now using different method of ++ preventing this. ++ * New --compare switch to compare system and CMOS clocks (replacing ++ the separate program clockdiff) and suggest better values of time ++ parameters. New --adjust switch to actually install the suggested ++ values. GNU format long switches, including --help and --version. ++ * Revised conftimex to use --adjust switch instead of clockdiff. ++ * Renamed conftimex to adjtimexconfig per Debian recommendation. ++ * Added conftimex man page. ++ * Revised messages in postinst to better explain what is going on. ++ * Conflicts with xntp ++ * New maintainer ++ ++ -- Jim Van Zandt <jrv@vanzandt.mv.com> Sat, 1 Mar 1997 18:03:35 -0500 ++ ++adjtimex (1.2-5) unstable; urgency=LOW ++ ++ * New packaging format ++ * Corrected comment in /etc/rc.boot/adjtimex ++ * Corrected the installation of doc files ++ ++ -- Michael Meskes <meskes@debian.org> Wed, 18 Sep 1996 09:22:51 +0200 ++ ++Fri May 17 12:48:07 MET DST 1996 Michael Meskes (meskes@debian.org) ++ ++ adjtimex (1.2-1): ++ ++ * Added Debian Linux package maintenance system files. ++ ++Fri May 17 20:39:30 MET DST 1996 Michael Meskes (meskes@debian.org) ++ ++ adjtimex (1.2-2): ++ ++ * Corrected mode for /etc/rc.boot/adjtimex ++ ++ * Added conftimex script ++ ++ * Automatically configure system ++ ++Sun Jun 30 13:17:53 MET DST 1996 Michael Meskes (meskes@debian.org) ++ ++ adjtimex (1.2-3): ++ ++ * Corrected rules file for new naming scheme ++ ++ * Gzip manpage ++ ++ * Strip binaries ++ ++Tue Jul 2 10:01:35 MET DST 1996 Michael Meskes (meskes@debian.org) ++ ++ adjtimex (1.2-4): ++ ++ * Really say what we're doing in postinst (Bug#3474) ++ ++ +--- adjtimex-1.29.orig/debian/adjtimexconfig.8 ++++ adjtimex-1.29/debian/adjtimexconfig.8 +@@ -0,0 +1,41 @@ ++.\"{{{ Title Emacs major mode should be: -*- nroff -*- ++.TH ADJTIMEXCONFIG 8 "April 27, 2003" ++.\"}}} ++.\"{{{ Name ++.SH NAME ++adjtimexconfig \- find kernel clock variables and save for reboots ++.\"}}} ++.\"{{{ Synopsis ++.SH SYNOPSIS ++.ad l ++.\" commands only ++.B /sbin/adjtimexconfig ++.\"}}} ++.\"{{{ Config ++.SH DESCRIPTION ++This script uses \fBadjtimex\fP(8) to find values for the kernel ++variables \fBtick\fP and \fBfrequency\fP that will make the system ++clock approximately agree with the CMOS clock. It then saves these ++values in the configuration file \fI/etc/default/adjtimex\fP so the ++settings will be restored on every boot, when ++\fI/etc/init.d/adjtimex\fP runs. ++.P ++\fPadjtimexconfig\fP uses the drift rate recorded in ++\fI/etc/adjtime\fP to adjust the times it reads from the CMOS clock. ++If you find the CMOS clock has a systematic drift, read the ++\fBclock\fP(8) or \fBhwclock\fP(8) manual page, modify ++\fI/etc/adjtime\fP as required, and run \fBadjtimexconfig\fP again. ++.SH AUTHOR ++Michael Meskes <meskes@debian.org>. ++.\"}}} ++.\"{{{ ++.SH FILES ++.nf ++\fI/etc/default/adjtimex\fP ++\fI/etc/init.d/adjtimex\fP ++.fi ++.\"}}} ++.\"{{{ See also ++.SH "SEE ALSO" ++.BR adjtimex "(8), "clock "(8), "hwclock "(8), "ntpd (8) ++.\"}}} +--- adjtimex-1.29.orig/debian/adjust ++++ adjtimex-1.29/debian/adjust +@@ -0,0 +1,15 @@ ++ mode: 16384 ++ offset: 0 ++ frequency: 0 ++ maxerror: 0 ++ esterror: 0 ++ status: 0 ++time_constant: 0 ++ precision: 0 ++ tolerance: 0 ++ tick: 0 ++ raw time: 0s 0us = 0.000000 ++for this kernel: ++ USER_HZ = 100 (nominally 100 ticks per second) ++ 9000 <= tick <= 11000 ++ -33554432 <= frequency <= 33554432 +--- adjtimex-1.29.orig/debian/dirs ++++ adjtimex-1.29/debian/dirs +@@ -0,0 +1,3 @@ ++usr/sbin ++sbin ++usr/share/man/man8 +--- adjtimex-1.29.orig/debian/adjtimexconfig ++++ adjtimex-1.29/debian/adjtimexconfig +@@ -0,0 +1,67 @@ ++#!/bin/sh ++ ++conffile=/etc/default/adjtimex ++startfile=/etc/init.d/adjtimex ++ ++echo -n "Comparing clocks (this will take 70 sec)..." ++ ++# Get the parameters ++ ++/sbin/adjtimex --print --tick 0 >/etc/adj.adjust 2>/dev/null ++baseline=`awk '/<= tick/{print ($1+$NF)/2}' /etc/adj.adjust` ++hz=`awk '/USER_HZ/{print $3}' /etc/adj.adjust` ++/sbin/adjtimex --tick $baseline --frequency 0 ++/sbin/adjtimex --adjust --force-adjust >/etc/adj.adjust ++echo "done." ++ticks=`tail -n 1 /etc/adj.adjust|awk '{print $6}'` ++freq=`tail -n 1 /etc/adj.adjust|awk '{print $7}'` ++# cat /etc/adj.adjust ++# echo hz=$hz baseline=$baseline ticks=$ticks freq=$freq ++rm /etc/adj.adjust ++adjt=`awk "BEGIN{print (($ticks-$baseline)*$hz + $freq/65536.)*.0864}"` ++echo -n "Adjusting system time by ${adjt} sec/day to agree with CMOS clock..." ++ ++# Recreate /etc/adjtimex.conf if necessary ++ ++if [ -f $conffile ]; then ++# echo "using existing $conffile"; ++ true; ++else ++cat >$conffile <<EOF ++# $conffile - configuration file for adjtimex(8) ++# ++# you may adjust these values manually or by calling /usr/sbin/adjtimexconfig ++# ++# This file is sourced by $startfile ++# ++TICK=$TICK ++FREQ=$FREQ ++ ++EOF ++fi ++ ++# Reset values in $conffile ++ ++sed -e "s/^TICK=.*/TICK=$ticks/" \ ++ -e "s/^FREQ=.*/FREQ=$freq/" \ ++ $conffile >$conffile.TMP && \ ++ mv $conffile.TMP $conffile ++ ++# grep "TICK=" /etc/init.d/adjtimex | cut -d'#' -f1 > /etc/adj.tick ++# grep "FREQ=" /etc/init.d/adjtimex | cut -d'#' -f1 > /etc/adj.freq ++# ++# TICKLINE="`echo -n "TICK="$ticks" # old: "; cat /etc/adj.tick`" ++# FREQLINE="`echo -n "FREQ="$freq" # old: "; cat /etc/adj.freq`" ++# ++# cp /etc/init.d/adjtimex /etc/init.d/adjtimex.TMP ++# sed -e "s/^TICK=.*/$TICKLINE/" -e "s/^FREQ=.*/$FREQLINE/" \ ++# < /etc/init.d/adjtimex.TMP > /etc/init.d/adjtimex ++# ++# if [ -s /etc/init.d/adjtimex ] ++# then ++# rm -f /etc/init.d/adjtimex.TMP ++# fi ++# rm -f /etc/adj.tick /etc/adj.freq /etc/adj.adjust ++rm -f /etc/adj.adjust ++echo "done." ++ +--- adjtimex-1.29.orig/debian/postrm ++++ adjtimex-1.29/debian/postrm +@@ -0,0 +1,25 @@ ++#! /bin/sh -e ++ ++case "$1" in ++ purge) ++ rm -f /etc/adjtimex.conf /etc/default/adjtimex ++ update-rc.d adjtimex remove >/dev/null ++ if [ -e /usr/share/debconf/confmodule ]; then ++ # Source debconf library. ++ . /usr/share/debconf/confmodule ++ # Remove my changes to the db. ++echo "removing debconf db entries" ++ db_purge ++echo "removed debconf db entries" ++ fi ++ ;; ++ remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) ++ exit 0 ++ ;; ++ *) ++ echo "postrm called with unknown argument \`$1'" >&2 ++ exit 0 ++ ;; ++esac ++ ++#DEBHELPER# +--- adjtimex-1.29.orig/debian/control ++++ adjtimex-1.29/debian/control +@@ -0,0 +1,20 @@ ++Source: adjtimex ++Section: admin ++Priority: optional ++Maintainer: James R. Van Zandt <jrv@debian.org> ++Build-Depends: debhelper (>= 5), po-debconf ++Standards-Version: 3.8.4 ++ ++Package: adjtimex ++Architecture: any ++Depends: ${misc:Depends}, ${shlibs:Depends}, debconf | debconf-2.0 ++Suggests: ntpdate ++Description: kernel time variables configuration utility ++ This package provides a utility to manipulate the kernel time ++ variables. For a machine connected to the Internet, or equipped with ++ a precision oscillator or radio clock, the best way to keep the ++ system clock accurate is using NTP (Network Time Protocol). However, ++ for a standalone or intermittently connected machine, you may use ++ adjtimex instead to at least correct for systematic drift. It can ++ optionally adjust the system clock using the CMOS clock as a ++ reference, and can log times for long-term estimation of drift rates. +--- adjtimex-1.29.orig/debian/adjtimex.init ++++ adjtimex-1.29/debian/adjtimex.init +@@ -0,0 +1,45 @@ ++#!/bin/sh ++# ++# Run ADJTIMEX at startup. ++ ++### BEGIN INIT INFO ++# Provides: adjtimex ++# Required-Start: $local_fs ++# Required-Stop: ++# Should-Start: ++# Should-Stop: ++# Default-Start: S ++# Default-Stop: ++# Short-Description: set the kernel time variables ++# Description: set the kernel time variables ++### END INIT INFO ++ ++test -x /sbin/adjtimex || exit 0 ++ ++# default values ++TICK=10000 ++FREQ=0 ++ ++# values in $cfg take precedence over the values here ++cfg=/etc/default/adjtimex ++ ++if [ -f $cfg ]; then ++ . $cfg ++fi ++ ++case "$1" in ++ start|restart|force-reload) ++ echo -n "Regulating system clock..." ++ /sbin/adjtimex -tick "$TICK" -frequency "$FREQ" ++ echo "done." ++ ;; ++ stop|status) ++ ;; ++ *) ++ echo "/etc/init.d/adjtimex: unknown command $1" >&2 ++ echo "Usage: /etc/init.d/adjtimex {start|stop|restart|force-reload}" >&2 ++ exit 3 ++ ;; ++esac ++ ++exit 0 +--- adjtimex-1.29.orig/debian/copyright ++++ adjtimex-1.29/debian/copyright +@@ -0,0 +1,28 @@ ++This package was debianized by James R. Van Zandt jrv@debian.org on ++Thu, 11 Dec 1997 21:48:01 -0500. ++ ++This package was put together by Jim Van Zandt <jrv@debian.org>, ++who also maintains the program and therefore used the master sources. ++ ++Copyright: ++ ++adjtimex is Copyright (C) 1997 Steven S. Dick and James R. Van Zandt ++ ++ 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; version 2 dated June, ++ 1991, or any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ++ 02110-1301, USA. ++ ++On Debian GNU/Linux systems, the complete text of the GNU Public ++License can be found in `/usr/share/common-licenses/' ++ +--- adjtimex-1.29.orig/debian/templates ++++ adjtimex-1.29/debian/templates +@@ -0,0 +1,35 @@ ++# These templates have been reviewed by the debian-l10n-english ++# team ++# ++# If modifications/additions/rewording are needed, please ask ++# debian-l10n-english@lists.debian.org for advice. ++# ++# Even minor modifications require translation updates and such ++# changes should be coordinated with translators and reviewers. ++ ++Template: adjtimex/run_daemon ++Type: boolean ++Default: true ++_Description: Should adjtimex be run at installation and at every startup? ++ Running adjtimex at system startup will set the kernel time parameters to ++ the values in /etc/default/adjtimex. ++ . ++ You should not choose this option if you just want to ++ use adjtimex to inspect the current parameters. ++ ++Template: adjtimex/compare_rtc ++Type: boolean ++Default: true ++#flag:comment:2 ++# Translators: do not translate "tick" and "frequency" ++_Description: Run adjtimexconfig when adjtimex is installed or upgraded? ++ The adjtimexconfig script will use adjtimex to find values for the kernel ++ variables "tick" and "frequency" that will make the system clock approximately ++ agree with the hardware clock (also known as the CMOS clock). It then ++ saves these values in the configuration file /etc/default/adjtimex so the ++ settings will be restored on every boot, when /etc/init.d/adjtimex runs. ++ . ++ The script takes 70 seconds to run, so running it for every upgrade ++ may be a waste of time. Alternatively, you can run adjtimexconfig ++ manually when needed, or determine the kernel variables by using other ++ methods and set them manually in /etc/default/adjtimex. +--- adjtimex-1.29.orig/debian/docs ++++ adjtimex-1.29/debian/docs +@@ -0,0 +1,2 @@ ++README ++README.ru +--- adjtimex-1.29.orig/debian/config ++++ adjtimex-1.29/debian/config +@@ -0,0 +1,8 @@ ++#! /bin/sh -e ++ ++# Source debconf library. ++. /usr/share/debconf/confmodule ++ ++db_input medium adjtimex/run_daemon || true ++db_input medium adjtimex/compare_rtc || true ++db_go +--- adjtimex-1.29.orig/debian/rules ++++ adjtimex-1.29/debian/rules +@@ -0,0 +1,117 @@ ++#!/usr/bin/make -f ++# Sample debian/rules that uses debhelper. ++# GNU copyright 1997 to 1999 by Joey Hess. ++ ++# Uncomment this to turn on verbose mode. ++#export DH_VERBOSE=1 ++ ++# These are used for cross-compiling and for saving the configure script ++# from having to guess our platform (since we know it already) ++DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) ++DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) ++ ++ ++package=adjtimex ++ ++CFLAGS = -Wall -g ++INSTALL = install ++INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644 ++INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755 ++INSTALL_SCRIPT = $(INSTALL) -p -o root -g root -m 755 ++INSTALL_DIR = $(INSTALL) -p -d -o root -g root -m 755 ++ ++ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) ++CFLAGS += -O0 ++else ++CFLAGS += -O2 ++endif ++ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) ++INSTALL_PROGRAM += -s ++endif ++# parallel build isn't worth while ++ ++config.status: configure ++ dh_testdir ++ # configure the package. ++ ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info ++ touch config.h ++ ++build: build-arch build-indep ++ ++build-arch: build-stamp ++ ++build-indep: build-stamp ++ ++build-stamp: config.status ++ dh_testdir ++ ++ # compile the package. ++ $(MAKE) CFLAGS="$(CFLAGS)" ++ #/usr/bin/docbook-to-man debian/adjtimex.sgml > adjtimex.1 ++ ++ touch build-stamp ++ ++clean: ++ dh_testdir ++ dh_testroot ++ rm -f build-stamp ++ ++ # clean up after the build process. ++ debconf-updatepo ++ [ ! -f Makefile ] || $(MAKE) veryclean ++ rm -rf adjtimex *.o config.cache config.log config.status ++ -test -r /usr/share/misc/config.sub && \ ++ cp -f /usr/share/misc/config.sub config.sub ++ -test -r /usr/share/misc/config.guess && \ ++ cp -f /usr/share/misc/config.guess config.guess ++ ++ ++ dh_clean ++ ++install: build ++ dh_testdir ++ dh_testroot ++ dh_clean -k ++ dh_installdirs ++ ++ # install the package into debian/$(package). ++ $(INSTALL_PROGRAM) adjtimex $(CURDIR)/debian/$(package)/sbin ++ $(INSTALL_SCRIPT) debian/adjtimexconfig \ ++ $(CURDIR)/debian/$(package)/usr/sbin/adjtimexconfig ++ ++# Build architecture-independent files here. ++binary-indep: build install ++# We have nothing to do ++ ++# Build architecture-dependent files here. ++binary-arch: build install ++ dh_testdir ++ dh_testroot ++ dh_installdebconf ++ dh_installdocs ++ dh_installexamples ++ dh_installmenu ++# dh_installlogrotate ++# dh_installemacsen ++# dh_installpam ++# dh_installmime ++ dh_installinit -n ++ dh_installcron ++ dh_installman adjtimex.8 debian/adjtimexconfig.8 ++ dh_installinfo ++# dh_undocumented ++ dh_installchangelogs ChangeLog ++ dh_link ++ dh_strip ++ dh_compress ++ dh_fixperms ++# dh_makeshlibs ++ dh_installdeb ++# dh_perl ++ dh_shlibdeps ++ dh_gencontrol ++ dh_md5sums ++ dh_builddeb ++ ++binary: binary-indep binary-arch ++.PHONY: build clean binary-indep binary-arch binary install +--- adjtimex-1.29.orig/debian/postinst ++++ adjtimex-1.29/debian/postinst +@@ -0,0 +1,123 @@ ++#! /bin/sh ++ ++set -e ++ ++# Source debconf library. ++. /usr/share/debconf/confmodule ++ ++# old scripts ++oldfile=/etc/adjtimex.conf ++olderfile=/etc/rc.boot/adjtimex ++# new starting script ++startfile=/etc/init.d/adjtimex ++# new configuration file ++conffile=/etc/default/adjtimex ++ ++create_adjtimex_conf() ++{ ++ ++ TICK=10000 ++ FREQ=0 ++ ++ if [ -f $oldfile ]; then ++ TICK=`awk ' ++ BEGIN{tick=10000;} ++ /[ \t]*TICK[ \t]*=[ \t]*"?[0-9]+"?/ { ++ sub(/[ \t]*TICK[ \t]*=[ \t]*"?/,""); ++ tick=$0+0; ++ } ++ END {print tick;} ++ ' $oldfile` ++ ++ FREQ=`awk ' ++ BEGIN{freq=0;} ++ /[ \t]*FREQ[ \t]*=[ \t]*"?[0-9]+"?/ { ++ sub(/[ \t]*FREQ[ \t]*=[ \t]*"?/,""); ++ freq=$0+0; ++ } ++ END {print freq;} ++ ' $oldfile` ++ ++# echo "parameters from $oldfile: TICK=$TICK FREQ=$FREQ"; ++ else ++ if [ -f $olderfile ]; then ++ TICK=`awk ' ++ BEGIN{tick=10000;} ++ /[ \t]*TICK[ \t]*=[ \t]*"?[0-9]+"?/ { ++ sub(/[ \t]*TICK[ \t]*=[ \t]*"?/,""); ++ tick=$0+0; ++ } ++ END {print tick;} ++ ' $olderfile` ++ ++ FREQ=`awk ' ++ BEGIN{freq=0;} ++ /[ \t]*FREQ[ \t]*=[ \t]*"?[0-9]+"?/ { ++ sub(/[ \t]*FREQ[ \t]*=[ \t]*"?/,""); ++ freq=$0+0; ++ } ++ END {print freq;} ++ ' $olderfile` ++ ++# echo "parameters from $olderfile: TICK=$TICK FREQ=$FREQ"; ++ fi ++ fi ++ ++ if [ -f $conffile ]; then ++# echo "using existing $conffile"; ++ true; ++ else ++ if [ -d /etc/default ]; then true; else mkdir /etc/default; fi ++ cat >$conffile <<EOF ++# $conffile - configuration file for adjtimex(8) ++# ++# you may adjust these values manually or by calling /usr/sbin/adjtimexconfig ++# ++# This file is sourced by $startfile ++# ++TICK=$TICK ++FREQ=$FREQ ++ ++EOF ++ fi ++ ++ rm -f $oldfile $olderfile ++} ++ ++ ++case "$1" in ++ configure) ++ ++# A previous installation may have left a corrupt conffile. ++# The regexp matches only blank lines, comments, and integer assignments: ++ egrep -qv '^([:space:]*(#.*)?|[:space:]*[a-zA-Z][a-zA-Z0-9]*[:space:]*=[:space:]*[0-9]+[:space:]*)$' $conffile && rm -f $conffile ++ ++ create_adjtimex_conf ++ ++ db_get adjtimex/run_daemon ++ if [ "$RET" = "true" ]; then ++ update-rc.d adjtimex start 20 S . >/dev/null ++ ++ if which invoke-rc.d >/dev/null 2>&1; then ++ invoke-rc.d adjtimex start ++ else ++ /etc/init.d/adjtimex start ++ fi ++ fi ++ ++ db_get adjtimex/compare_rtc ++ if [ "$RET" = "true" ]; then ++ adjtimexconfig ++ fi ++ ++ ;; ++ abort-upgrade|abort-remove|abort-deconfigure) ++ exit 0 ++ ;; ++ *) ++ echo "postinst called with unknown argument \`$1'" >&2 ++ exit 0 ++ ;; ++esac ++ ++#DEBHELPER# +--- adjtimex-1.29.orig/debian/README.Debian ++++ adjtimex-1.29/debian/README.Debian +@@ -0,0 +1,21 @@ ++adjtimex for DEBIAN ++---------------------- ++ ++This is the Debian Linux prepackaged version of adjtimex. ++ ++This package was put together by Jim Van Zandt <jrv@debian.org>, ++who also maintains the program and therefore used the master sources. ++ ++further Information: ++ ++* adjtimex manpage ++* copying policy ++ /usr/share/doc/adjtimex/copyright ++ (or debian/copyright in the source package) ++* changelog for debian package ++ /usr/share/doc/adjtimex/changelog.Debian ++* adjtimex's README: ++ /usr/share/doc/adjtimex/README ++ ++ ++James R. Van Zandt <jrv@debian.org>, Sun, 7 Mar 1999 21:58:51 -0500 +--- adjtimex-1.29.orig/debian/po/fr.po ++++ adjtimex-1.29/debian/po/fr.po +@@ -0,0 +1,90 @@ ++# Translation of adjtimex debconf screen to French ++# Copyright (C) 2005-2009 Debian French l10n team <debian-l10n-french@lists.debian.org> ++# This file is distributed under the same license as the adjtimex package. ++# ++# Christian Perrier <bubulle@debian.org>, 2006, 2009. ++# Translators: ++msgid "" ++msgstr "" ++"Project-Id-Version: fr\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-03-17 07:45+0100\n" ++"Last-Translator: Christian Perrier <bubulle@debian.org>\n" ++"Language-Team: French <debian-l10n-french@lists.debian.org>\n" ++"Language: fr\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: KBabel 1.11.4\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "" ++"Faut-il lancer adjtimex lors de l'installation et à chaque démarrage du " ++"système ?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Adjtimex peut être lancé au démarrage du système afin de régler les " ++"paramètres d'horloge du noyau en fonction des valeurs contenues dans /etc/" ++"default/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Vous ne devriez pas choisir cette option si vous souhaitez simplement vous " ++"servir d'adjtimex pour consulter les paramètres actuels." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "" ++"Faut-il lancer adjtimexconfig lors de l'installation ou de la mise à jour ?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Le script adjtimexconfig utilise adjtimex afin de trouver les valeurs " ++"appropriées pour les variables du noyau concernant le battement (« tick ») " ++"et la fréquence d'horloge. Cela permettra à l'horloge du système d'être à " ++"peu près en accord avec l'horloge matérielle (parfois appelée « horloge " ++"CMOS »). Ces valeurs seront alors conservées dans le fichier de " ++"configuration /etc/default/adjtimex ce qui permettra de les restaurer à " ++"chaque démarrage quand /etc/init.d/adjtimex s'exécutera. " ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"La durée d'exécution du script est de 70 secondes, ce qui peut être vu comme " ++"une perte de temps au démarrage. Vous pouvez également utiliser " ++"adjtimexconfig vous-même plus tard ou déterminer les valeurs des variables " ++"du noyau d'une autre manière. Ces valeurs devront ensuite être placées dans /" ++"etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/it.po ++++ adjtimex-1.29/debian/po/it.po +@@ -0,0 +1,85 @@ ++# ITALIAN TRANSLATION OF ADJTIMEX'S.PO-DEBCONF FILE ++# COPYRIGHT (C) 2009 THE ADJTIMEX'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the adjtimex package. ++# ++# Vincenzo Campanella <vinz65@gmail.com>, 2009. ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.26-3\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-04-01 14:15+0200\n" ++"Last-Translator: Vincenzo Campanella <vinz65@gmail.com>\n" ++"Language-Team: Italian <tp@lists.linux.it>\n" ++"Language: it\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: KBabel 1.11.4\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "Eseguire adjtimex all'installazione e con ogni avvio del sistema?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"L'esecuzione di adjtimex all'avvio del sistema imposterà i parametri di " ++"tempo del kernel ai valori contenuti in «/etc/default/adjtimex»." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Non si dovrebbe scegliere questa opzione se si prevede di usare adjtimex " ++"solo per verificare i parametri attuali." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Eseguire adjtimexconfig quando adjtimex viene installato o aggiornato?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Lo script adjtimexconfig userà adjtimex per trovare i valori delle variabili " ++"del kernel «tick» e «frequency» per fare in modo che l'orario del sistema " ++"coincida approssimativamente a quello dell'orologio dell'hardware (anche " ++"conosciuto come orologio CMOS). Questi valori vengono poi salvati nel file " ++"di configurazione «/etc/default/adjtimex», in modo che le impostazioni " ++"vengano ripristinate a ogni avvio, quando «/etc/init.d/adjtimex» viene " ++"eseguito." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Lo script necessita di 70 secondi per essere eseguito, per cui lanciarlo a " ++"ogni aggiornamento potrebbe essere uno spreco di tempo. In alternativa è " ++"possibile eseguire manualmente adjtimexconfig quando è necessario, oppure " ++"determinare le variabili del kernel usando altri metodi e impostandole " ++"manualmente in «/etc/default/adjtimex»." +--- adjtimex-1.29.orig/debian/po/pt_BR.po ++++ adjtimex-1.29/debian/po/pt_BR.po +@@ -0,0 +1,96 @@ ++# ++# Translators, if you are not familiar with the PO format, gettext ++# documentation is worth reading, especially sections dedicated to ++# this format, e.g. by running: ++# info -n '(gettext)PO Files' ++# info -n '(gettext)Header Entry' ++# ++# Some information specific to po-debconf are available at ++# /usr/share/doc/po-debconf/README-trans ++# or http://www.debian.org/intl/l10n/po-debconf/README-trans ++# ++# Developers do not need to manually edit POT or PO files. ++# André LuÃs Lopes <andrelop@debian.org>, 2010. ++# Flamarion Jorge <jorge.flamarion@gmail.com>, 2010. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.29-2.1\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2010-11-11 22:16-0200\n" ++"Last-Translator: Flamarion Jorge <jorge.flamarion@gmail.com>\n" ++"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian." ++"org>\n" ++"Language: \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=2; plural=(n > 1);\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "O adjtimex deve ser executado na instalação e em cada inicialização?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Executar o adjtimex na inicialização do sistema configurará os parâmetros de " ++"tempo do kernel para os valores em /etc/default/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Você não deve escolher esta opção se você apenas quer usar o adjtimex para " ++"inspecionar os parâmetros atuais." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "" ++"Executar o adjtimexconfig quando o adjtimex for instalado ou atualizado?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"O script adjtimexconfig usará o adjtimex para encontrar valores para as " ++"variáveis \"tick\" e \"frequency\" do kernel, que farão o relógio do sistema " ++"o mais próximo do relógio do hardware (também conhecido como o relógio da " ++"CMOS). Ele então salva estes valores no arquivo de configuração /etc/default/" ++"adjtimex, assim as configurações serão restauradas a cada inicialização, " ++"quando o /etc/init.d/adjtimex executar." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"O script leva 70 segundos para rodar, portanto rodá-lo a cada atualização " ++"pode ser um desperdÃcio de tempo. Alternativamente, você pode executar o " ++"adjtimexconfig manualmente quando necessário, ou determinar as variáveis de " ++"kernel usando outros métodos e configurá-las manualmente em /etc/default/" ++"adjtimex." +--- adjtimex-1.29.orig/debian/po/templates.pot ++++ adjtimex-1.29/debian/po/templates.pot +@@ -0,0 +1,68 @@ ++# SOME DESCRIPTIVE TITLE. ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. ++# ++#, fuzzy ++msgid "" ++msgstr "" ++"Project-Id-Version: PACKAGE VERSION\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" ++"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" ++"Language-Team: LANGUAGE <LL@li.org>\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=CHARSET\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" +--- adjtimex-1.29.orig/debian/po/gl.po ++++ adjtimex-1.29/debian/po/gl.po +@@ -0,0 +1,85 @@ ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# ++# marce villarino <mvillarino@users.sourceforge.net>, 2009. ++msgid "" ++msgstr "" ++"Project-Id-Version: templates_[OK3397]\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-04-16 22:09+0200\n" ++"Last-Translator: marce villarino <mvillarino@users.sourceforge.net>\n" ++"Language-Team: Galician <proxecto@trasno.ent>\n" ++"Language: gl\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: Lokalize 0.2\n" ++"Plural-Forms: nplurals=2; plural=n != 1;\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "" ++"Debe executarse adjtimex durante a instalación e con cada inicio do sistema?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Se executa adjtimex durante o inicio do sistema axustará os parámetros de " ++"hora do núcleo cos valores que haxa en /etc/default/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Non deberÃa escoller esta opción se só desexa empregar adjtimex para " ++"inspeccionar os parámetros actuais." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Desexa executar adjtimexconfig se instala ou actualiza?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"O script adjtimexconfig empregará adjtimex para achar valores paras as " ++"variábeis do núcleo «tick» e «frequency» que fagan que o reloxo do sistema " ++"se corresponda aproximadamente co do hardware (o chamado reloxo da BIOS). " ++"Logo garda eses valores no ficheiro de configuración /etc/default/adjtimex " ++"de xeito que os valores se restauren en cada arranque, cando se executa /etc/" ++"init.d/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"O script tarda 70 segundos en executarse, pode que executalo cada vez que se " ++"actualice pode ser un desperdicio de tempo. En alternativa, pode executar " ++"adjtimexconfig manualmente cando o precise, ou determinar as variábeis do " ++"núcleo empregando outros métodos e axustalas manualmente en /etc/default/" ++"adjtimex." +--- adjtimex-1.29.orig/debian/po/vi.po ++++ adjtimex-1.29/debian/po/vi.po +@@ -0,0 +1,82 @@ ++# Vietnamese Translation for adjtimex. ++# Copyright © 2010 Free Software Foundation, Inc. ++# Clytie Siddall <clytie@riverland.net.au>, 2005-2010. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.29-2.1\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2010-10-27 14:39+1030\n" ++"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" ++"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n" ++"Language: vi\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=1; plural=0;\n" ++"X-Generator: LocFactoryEditor 1.8\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "adjtimex có nên chạy và o lúc cà i đặt và khi nà o khởi Ä‘á»™ng không?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Chạy adjtimex và o lúc khởi chạy hệ thống thì láºp các tham số thá»i gian của " ++"hạt nhân thà nh những giá trị trong táºp tin « /etc/default/adjtimex »." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Không nên báºt tuỳ chá»n nà y nếu bạn chỉ muốn sá» dụng adjtimex để kiểm tra " ++"những tham số hiện thá»i." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Chạy adjtimexconfig khi adjtimex được cà i đặt hay nâng cấp ?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Văn lệnh cấu hình adjtimexconfig thì sá» dụng adjtimex để tìm giá trị cho hai " ++"biến hạt nhân « tick » và « frequency », để là m cho đồng hồ hệ thống tÆ°Æ¡ng " ++"ứng xấp xỉ vá»›i đồng hồ phần cứng (cÅ©ng được gá»i nhÆ° là đồng hồ CMOS). Văn " ++"lệnh nà y lÆ°u các giá trị đó và o táºp tin cấu hình « /etc/default/adjtimex », " ++"để phục hồi thiết láºp khi nà o việc khởi Ä‘á»™ng chạy « /etc/init.d/adjtimex »." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Văn lệnh nà y chạy trong khoảng 70 giây thì có thể là bạn không muốn chạy nó " ++"và o má»—i lúc nâng cấp. Bạn cÅ©ng có thể chạy adjtimexconfig bằng tay khi cần " ++"thiết, hoặc quyết định những biến hạt nhân bằng phÆ°Æ¡ng pháp khác và láºp bằng " ++"tay trong táºp tin « /etc/default/adjtimex »." +--- adjtimex-1.29.orig/debian/po/fi.po ++++ adjtimex-1.29/debian/po/fi.po +@@ -0,0 +1,84 @@ ++# Copyright (C) 2009 ++# This file is distributed under the same license as the adjtimex package. ++# ++# Esko Arajärvi <edu@iki.fi>, 2010. ++msgid "" ++msgstr "" ++"Project-Id-Version: \n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2010-01-09 22:59+0200\n" ++"Last-Translator: Esko Arajärvi <edu@iki.fi>\n" ++"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n" ++"Language: fi\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: Lokalize 1.0\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "" ++"Tulisiko adjtimex ajaa asennuksen yhteydessä ja aina kun järjestelmä " ++"käynnistetään?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Jos adjtimex ajetaan käynnistettäessä järjestelmä, ytimen aikaparametrit " ++"asetetaan tiedostossa /etc/default/adjtimex annettuihin arvoihin." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Älä valitse tätä vaihtoehtoa, jos haluat käyttää adjtimexiä vain nykyisten " ++"parametriarvojen tarkasteluun." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Tulisiko adjtimexconfig ajaa, kun adjtimex asennetaan tai päivitetään?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Komentosarja adjtimexconfig etsii ohjelman adjtimex avulla ytimen " ++"muuttujille â€tick†ja â€frequency†arvot, joilla järjestelmän kello näyttää " ++"suunnilleen samaa kuin laitteiston kello (CMOS-kello). Se tallentaa nämä " ++"arvot asetustiedostoon /etc/default/adjtimex, jolloin ne palautetaan " ++"järjestelmän käynnistyessä, kun /etc/init.d/adjtimex ajetaan." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Komentosarjan ajaminen kestää 70 sekuntia, joten sen ajaminen jokaisen " ++"päivityksen yhteydessä saattaa olla ajanhukkaa. Voit vaihtoehtoisesti ajaa " ++"adjtimexconfigin käsin tarvittaessa tai määrittää ytimen muuttujien arvot " ++"muilla keinoin ja asettaa ne käsin tiedostoon /etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/pl.po ++++ adjtimex-1.29/debian/po/pl.po +@@ -0,0 +1,123 @@ ++# ++# Translators, if you are not familiar with the PO format, gettext ++# documentation is worth reading, especially sections dedicated to ++# this format, e.g. by running: ++# info -n '(gettext)PO Files' ++# info -n '(gettext)Header Entry' ++# ++# Some information specific to po-debconf are available at ++# /usr/share/doc/po-debconf/README-trans ++# or http://www.debian.org/intl/l10n/po-debconf/README-trans ++# ++# Developers do not need to manually edit POT or PO files. ++# ++#, fuzzy ++msgid "" ++msgstr "" ++"Project-Id-Version: PACKAGE VERSION\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" ++"Last-Translator: Bartosz Zapa³owski <zapal@debian.linux.org.pl>\n" ++"Language-Team: Polish Debian Documentation Project <pddp@debian.linux.org." ++"pl>\n" ++"Language: \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=iso-8859-2\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "" ++"Czy adjtimex ma byæ uruchomiany podczas instalacji i ka¿dego startu systemu?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++#, fuzzy ++#| msgid "" ++#| "adjtimex can run at system startup to set the kernel time parameters to " ++#| "the values in /etc/default/adjtimex. Don't accept if you just want to use " ++#| "adjtimex to inspect the current parameters." ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"adjtimex mo¿e byæ uruchamiany podczas ka¿dego uruchomienia systemu,by " ++"ustawiæ parametry czasu w j±drze na warto¶ci znajduj±ce siê w pliku/etc/" ++"default/adjtimex. Nie wyra¿aj zgody, je¶li chcesz u¿ywaæ adjtimextylko do " ++"sprawdzania aktualnych warto¶ci." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++#, fuzzy ++#| msgid "" ++#| "adjtimex can run at system startup to set the kernel time parameters to " ++#| "the values in /etc/default/adjtimex. Don't accept if you just want to use " ++#| "adjtimex to inspect the current parameters." ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"adjtimex mo¿e byæ uruchamiany podczas ka¿dego uruchomienia systemu,by " ++"ustawiæ parametry czasu w j±drze na warto¶ci znajduj±ce siê w pliku/etc/" ++"default/adjtimex. Nie wyra¿aj zgody, je¶li chcesz u¿ywaæ adjtimextylko do " ++"sprawdzania aktualnych warto¶ci." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++#, fuzzy ++#| msgid "Should adjtimexconfig be run at installation time?" ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Czy adjtimexconfig ma byæ uruchomiony podczas instalacji?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++#, fuzzy ++#| msgid "" ++#| "The adjtimexconfig script will use adjtimex to find values for the kernel " ++#| "variables tick and frequency that will make the system clock " ++#| "approximately agree with the hardware clock (also known as the CMOS " ++#| "clock). It then saves these values in the configuration file /etc/" ++#| "default/adjtimex so the settings will be restored on every boot, when /" ++#| "etc/init.d/adjtimex runs." ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Skrypt adjtimexconfig skorzysta z programu adjtimex do znalezienia " ++"takichwarto¶ci parametrów j±dra tick i frequency, ¿eby zegar systemowy by³ " ++"zbli¿onydo zegara sprzêtowego (zegara CMOS). Nastêpnie zapisze ustawienia w " ++"plikukonfiguracyjnym /etc/default/adjtimex, dziêki czemu warto¶ci te " ++"bêd±przywrócane przy ka¿dym starcie systemu w momencie wykonywania skryptu/" ++"etc/init.d/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++#, fuzzy ++#| msgid "" ++#| "The script takes 70 sec to run. Alternatively, you can run adjtimexconfig " ++#| "yourself at a later time, or determine the kernel variables one of " ++#| "several other ways (see the adjtimex man page) and install them in /etc/" ++#| "default/adjtimex." ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Skrypt bêdzie dzia³a³ przez 70 sekund. Mo¿esz te¿ uruchomiæ " ++"w³asnorêcznieadjtimexconfig w dowolnym czasie lub dobraæ paramterty j±dra w " ++"innysposób (zapoznaj siê ze stron± manuala adjtimex) i zapisaæ je w pliku/" ++"etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/ru.po ++++ adjtimex-1.29/debian/po/ru.po +@@ -0,0 +1,95 @@ ++# translation of adjtimex_1.28-1_ru.po to Russian ++# ++# Translators, if you are not familiar with the PO format, gettext ++# documentation is worth reading, especially sections dedicated to ++# this format, e.g. by running: ++# info -n '(gettext)PO Files' ++# info -n '(gettext)Header Entry' ++# Some information specific to po-debconf are available at ++# /usr/share/doc/po-debconf/README-trans ++# or http://www.debian.org/intl/l10n/po-debconf/README-trans# ++# Developers do not need to manually edit POT or PO files. ++# ++# Yuri Kozlov <kozlov.y@gmail.com>, 2005. ++# Yuri Kozlov <yuray@komyakino.ru>, 2009, 2010. ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.28-1\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2010-01-02 09:43+0300\n" ++"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" ++"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" ++"Language: ru\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: KBabel 1.11.4\n" ++"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" ++"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "ЗапуÑтить adjtimex ÑÐµÐ¹Ñ‡Ð°Ñ Ð¸ каждый раз при Ñтарте ÑиÑтемы?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"ЗапуÑк adjtimex при включении компьютера выполнит наÑтройку значений " ++"параметров времени Ñдра из файла /etc/default/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Ответьте отрицательно, еÑли проÑто хотите иÑпользовать adjtimex Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ " ++"текущих параметров." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "ЗапуÑкать adjtimexconfig при уÑтановке или обновлении adjtimex?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Сценарий adjtimexconfig иÑпользует adjtimex при поиÑке значений переменных " ++"Ñдра \"tick\" и \"frequency\", которые помогают ÑоглаÑовывать ÑиÑтемные чаÑÑ‹ " ++"Ñ Ð°Ð¿Ð¿Ð°Ñ€Ð°Ñ‚Ð½Ñ‹Ð¼Ð¸ чаÑами (так называемые чаÑÑ‹ CMOS). Затем он ÑохранÑет Ñти " ++"Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð² файл наÑтройки /etc/default/adjtimex Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы " ++"воÑÑтанавливать их Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ ÑÑ†ÐµÐ½Ð°Ñ€Ð¸Ñ /etc/init.d/adjtimex при каждом " ++"запуÑке ÑиÑтемы." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"ДлительноÑÑ‚ÑŒ работы ÑÑ†ÐµÐ½Ð°Ñ€Ð¸Ñ -- 70 Ñекунд, поÑтому при каждом обновлении " ++"будет Ñ‚Ð°ÐºÐ°Ñ Ð·Ð°Ð´ÐµÑ€Ð¶ÐºÐ° в работе. Ð’ качеÑтве альтернативы вы можете запуÑтить " ++"adjtimexconfig вручную позже, или определить переменные Ñдра одним из " ++"неÑкольких других ÑпоÑобов (Ñмотрите Ñправочную Ñтраницу по adjtimex) и " ++"Ñохранить их в файл /etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/ja.po ++++ adjtimex-1.29/debian/po/ja.po +@@ -0,0 +1,91 @@ ++#
++# Translators, if you are not familiar with the PO format, gettext
++# documentation is worth reading, especially sections dedicated to
++# this format, e.g. by running:
++# info -n '(gettext)PO Files'
++# info -n '(gettext)Header Entry'
++#
++# Some information specific to po-debconf are available at
++# /usr/share/doc/po-debconf/README-trans
++# or http://www.debian.org/intl/l10n/po-debconf/README-trans
++#
++# Developers do not need to manually edit POT or PO files.
++#
++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.27.1-3\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-07-24 18:05+0900\n" ++"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n" ++"Language-Team: Japanese <debian-japanese@lists.debian.org>\n" ++"Language: ja\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "adjtimex をインストール時ãŠã‚ˆã³æ¯Žå›žã®èµ·å‹•æ™‚ã«å‹•ä½œã•ã›ã¾ã™ã‹?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"システムã®èµ·å‹•æ™‚ã«ã‚«ãƒ¼ãƒãƒ«ã§ã®æ™‚é–“ã®ãƒ‘ラメータを /etc/default/adjtimex ã®å€¤ã«" ++"è¨å®šã™ã‚‹ã‚ˆã†ã« adjtimex を動作ã•ã›ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"システムã®èµ·å‹•æ™‚ã«ã‚«ãƒ¼ãƒãƒ«ã§ã®æ™‚é–“ã®ãƒ‘ラメータを /etc/default/adjtimex ã®å€¤ã«" ++"è¨å®šã™ã‚‹ã‚ˆã†ã« adjtimex を動作ã•ã›ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚" ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "" ++"adjtimexconfig ã‚’ adjtimex をインストールã€ã‚ã‚‹ã„ã¯ã‚¢ãƒƒãƒ—グレードã—ãŸæ™‚ã«å®Ÿè¡Œ" ++"ã—ã¾ã™ã‹?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"adjtimexconfig スクリプト㯠adjtimex を使用ã—ã¦ã€ã‚·ã‚¹ãƒ†ãƒ クãƒãƒƒã‚¯ã‚’ãƒãƒ¼ãƒ‰ã‚¦ã‚§" ++"アクãƒãƒƒã‚¯ (CMOS クãƒãƒƒã‚¯ã¨ã—ã¦ã‚‚知られã¦ã„ã¾ã™) ã¨ãŠãŠã‚ˆãåŒæœŸã™ã‚‹ã‚ˆã†ã«ã‚«ãƒ¼" ++"ãƒãƒ«å¤‰æ•°ã€Œtickã€ã¨ã€Œfrequencyã€ã«ä¸Žãˆã‚‹å€¤ã‚’見ã¤ã‘ã¾ã™ã€‚ãã—ã¦ã€ã“ã®å€¤ã‚’è¨å®š" ++"ファイル /etc/default/adjtimex ã«ä¿å˜ã™ã‚‹ã“ã¨ã§æ¯Žå›žèµ·å‹•æ™‚ã« /etc/init.d/" ++"adjtimex ãŒå‹•ä½œã™ã‚‹éš›ã«è¨å®šãŒå¾©å…ƒã•ã‚Œã¾ã™ã€‚" ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"スクリプトã¯å‹•ä½œã« 70 秒もã‹ã‹ã‚‹ã®ã§ã‚¢ãƒƒãƒ—グレードã®åº¦ã«æ¯Žå›žå®Ÿè¡Œã™ã‚‹ã®ã¯æ™‚é–“" ++"ã®ç„¡é§„ã§ã™ã€‚別解ã¨ã—ã¦ã¯ adjtimexconfig を後ã»ã©å®Ÿè¡Œã™ã‚‹ã€ã¾ãŸã¯ä»–ã®æ–¹æ³•ã§" ++"カーãƒãƒ«å¤‰æ•°ã‚’決ã‚ã¦ã€æ‰‹å‹•ã§ /etc/default/adjtimex ã¸ã®è¨å®šã‚’è¡Œã†ã€ãªã©ãŒå¯èƒ½" ++"ã§ã™ã€‚" +--- adjtimex-1.29.orig/debian/po/nb.po ++++ adjtimex-1.29/debian/po/nb.po +@@ -0,0 +1,82 @@ ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# ++# Bjørn Steensrud <bjornst@skogkatt.homelinux.org>, 2010. ++msgid "" ++msgstr "" ++"Project-Id-Version: \n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2010-10-15 14:50+0200\n" ++"Last-Translator: Bjørn Steensrud <bjornst@skogkatt.homelinux.org>\n" ++"Language-Team: Norwegian BokmÃ¥l <i18n-nb@lister.ping.uio.no>\n" ++"Language: \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: Lokalize 1.0\n" ++"Plural-Forms: nplurals=2; plural=n != 1;\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "Skal adjtimex kjøres ved installasjon og hver gang systemet startes?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Om adjtimex kjøres ved oppstart blir kjernens tidsparametre satt til " ++"verdiene i /etc/default/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Du bør ikke velge dette hvis du bare vil bruke adjtimex til Ã¥ se hva de " ++"gjeldende parametrene er." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Skal adjtimexconfig kjøres nÃ¥r adjtimex installeres eller oppgraderes?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Skriptet adjtimexconfig vil bruke adjtimex til Ã¥ finne verdier for kjerne- " ++"variablene «tick» og «frequency» som vil fÃ¥ systemklokka til Ã¥ gÃ¥ omtrent " ++"lik maskinklokka (ogsÃ¥ kalt CMOS-klokka). Deretter lagres disse verdiene i " ++"oppsettsfila /etc/default/adjtimex, slik at de blir tilbakestilt ved hver " ++"oppstart nÃ¥t /etc/init.d/adjtimex kjører." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Skriptet tar 70 sekunder Ã¥ kjøre, sÃ¥ det kan være bortkastet tid Ã¥ kjøre det " ++"ved hver oppgradering. Du kan ellers kjøre adjtimexconfig manuelt nÃ¥r det " ++"trengs, eller bestemme kjernevariablene pÃ¥ annen mÃ¥te og sette dem inn " ++"manuelt i /etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/sv.po ++++ adjtimex-1.29/debian/po/sv.po +@@ -0,0 +1,85 @@ ++# Translation of adjtimex debconf template to Swedish ++# Copyright (C) 2009 Martin Bagge <brother@bsnet.se> ++# This file is distributed under the same license as the adjtimex package. ++# ++# Martin Bagge <brother@bsnet.se>, 2009 ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.20-5\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2010-03-17 19:49-0400\n" ++"Last-Translator: Martin Bagge <brother@bsnet.se>\n" ++"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n" ++"Language: sv\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=utf-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Poedit-Language: Swedish\n" ++"X-Poedit-Country: Sweden\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "Ska adjtimex köras vid installation och vid varje uppstart?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"adjtimex kan köra vid systemets uppstart för att sätta kärntidsparametrar " ++"till värdena i /etc/default/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Aktivera inte denna funktion om du endast vill använda adjtime för att " ++"inspektera aktuella parameterar." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "" ++"Ska adjtimexconfig köras efter installation eller uppgradering av adjtimex?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Skriptet adjtimexconfig kommer att använda adjtimex för att hitta värden för " ++"kärnvariablerna \"tick\" och \"frequency\" som gör att systemklockan kommer " ++"överens med hÃ¥rdvaruklockan (ocksÃ¥ kallad CMOS-klockan). Den sparar sedan " ++"dessa värden i konfigurationsfilen /etc/default/adjtimex sÃ¥ att " ++"inställningarna kommer att användas vid varje uppstart, när /etc/init.d/" ++"adjtimex körs." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Skriptet tar 70 sekunder att köra vilket innebär att det kan vara slöseri " ++"med tid att köra vid varje uppgradering. Alternativt kan du köra " ++"adjtimexconfig själv när det behövs eller bestämma variabler för kärnan pÃ¥ " ++"andra sätt och ange dessa i /etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/POTFILES.in ++++ adjtimex-1.29/debian/po/POTFILES.in +@@ -0,0 +1 @@ ++[type: gettext/rfc822deb] templates +--- adjtimex-1.29.orig/debian/po/pt.po ++++ adjtimex-1.29/debian/po/pt.po +@@ -0,0 +1,83 @@ ++# 2005-10-27 - Marco Ferra <mferra@sdf.lonestar.org> (initial translation) ++# 2009, Carlos Lisboa <carloslisboa@gmail.com> ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.20-5\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-04-15 22:00+0100\n" ++"Last-Translator: Carlos Lisboa <carloslisboa@gmail.com>\n" ++"Language-Team: Portuguese <traduz@debianpt.org>\n" ++"Language: pt\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "" ++"Deve o adjtimex correr enquanto o instala e depois sempre que o sistema " ++"inicia?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Correr o adjtimex no arranque do sistema irá colocar os parâmetros de tempo " ++"do kernel para os valores em /etc/default/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Não deve escolher esta opção se apenas deseja usar o adjtimex para verificar " ++"os parâmetros actuais." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Correr o adjtimexconfig quando o adjtimex é instalado ou actualizado?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"O script adjtimexconfig irá usar adjtimex para encontrar valores para as " ++"variáveis do kernel \"tick\" e \"frequency\" que irão tornar o relógio do " ++"sistema em concordância com o relógio de hardware (também conhecido por " ++"relógio CMOS). Irá então guardar os valores no ficheiro de configuração /etc/" ++"default/adjtimex para que as configurações sejam restauradas em cada " ++"arranque, quando o /etc/init.d/adjtimex é corrido." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Este script demora 70 segundos a correr, podendo ser um desperdÃcio de tempo " ++"corrê-lo em cada actualização. Como alternativa, pode correr o " ++"adjtimexconfig manualmente quando necessário, ou determine as variáveis do " ++"kernel usando outro método e configure-as manualmente em /etc/default/" ++"adjtimex." +--- adjtimex-1.29.orig/debian/po/de.po ++++ adjtimex-1.29/debian/po/de.po +@@ -0,0 +1,96 @@ ++# translation of adjtimex_1.26-3_de.po to German ++# ++# Translators, if you are not familiar with the PO format, gettext ++# documentation is worth reading, especially sections dedicated to ++# this format, e.g. by running: ++# info -n '(gettext)PO Files' ++# info -n '(gettext)Header Entry' ++# Some information specific to po-debconf are available at ++# /usr/share/doc/po-debconf/README-trans ++# or http://www.debian.org/intl/l10n/po-debconf/README-trans# ++# Developers do not need to manually edit POT or PO files. ++# ++# Erik Schanze <eriks@debian.org>, 2004-2009. ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex_1.26-3_de\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-04-15 18:02+0200\n" ++"Last-Translator: Erik Schanze <eriks@debian.org>\n" ++"Language-Team: German <debian-l10n-german@lists.debian.org>\n" ++"Language: de\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: KBabel 1.11.4\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "" ++"Soll Adjtimex nach der Installation und bei jedem Hochfahren gestartet " ++"werden?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Wird Adjtimex beim Hochfahren des Systems gestartet, werden die " ++"Zeitparameter im Kernel auf die Werte in /etc/defaults/adjtimex gesetzt." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Stimmen Sie nicht zu, wenn Sie mit Adjtimex nur die aktuellen Parameter " ++"ermitteln wollen." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "" ++"Adjtimexconfig zur Installation oder Aktualisierung von Adjtimex aufrufen?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Das Skript »adjtimexconfig« nutzt Adjtimex, um die Werte der Kernelvariablen " ++"»tick« und »frequency« zu finden, damit die Systemuhr ungefähr mit der " ++"Rechneruhr (auch bekannt als CMOS-Uhr) übereinstimmt. Das Skript speichert " ++"diese Werte in der Konfigurationsdatei /etc/default/adjtimex, sodass die " ++"Einstellung bei jedem Systemstart wiederhergestellt wird, wenn /etc/init.d/" ++"adjtimex ausgeführt wird." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Das Skript benötigt 70 Sekunden, um durchzulaufen, es bei jeder " ++"Aktualisierung laufen zu lassen, dürfte Zeitverschwendung sein. Andererseits " ++"können Sie »adjtimexconfig« selbst bei Bedarf starten oder Sie finden die " ++"Kernelvariablen auf einem anderen Weg heraus (siehe Handbuchseite von " ++"Adjtimex) und speichern die Werte in der Datei /etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/eu.po ++++ adjtimex-1.29/debian/po/eu.po +@@ -0,0 +1,84 @@ ++# translation of adjtimex-eu.po to Euskara ++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the PACKAGE package. ++# ++# Piarres Beobide <pi@beobide.net>, 2009. ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex-eu\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-04-08 12:49+0200\n" ++"Last-Translator: Piarres Beobide <pi@beobide.net>\n" ++"Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n" ++"Language: \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: KBabel 1.11.4\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "Adjtimex instalazio eta abiarazte bakoitzean exekutatu behar al da?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Adjtimex sistema abiaraztean exekutatzean kernelaren denbora parametroak /" ++"etc/default/adjtimex-eko balioetara ezarriko dira." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Ez zenuke aukera hau aukeratu beharko adjtimex uneko parametroak begiratzeko " ++"bakarrik erabili nahi baduzu." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Adjtimexconfig exekutatu adjtimex instalatu edo bertsio-berritzean?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Adjtimexconfig script-ak adjtimex erabiliko du kerneleko \"tick\" eta " ++"\"frequency\" aldagaien balioa aurkitzeko honekin sistema erlojuak hardware " ++"erlojuarekin (CMOS ordularia bezala ere ezagutua) bat egingo du. Orduan " ++"balio hauek /etc/default/adjtimex konfigurazio fitxategian gordeko ditu Abio " ++"bakoitzean balio horiek berrezarri daitezen /etc/init.d/adjtimex " ++"exekutatzean." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Script-ak 70 segundu behar ditu exekutatzeko, beraz berau bertsio-berritze " ++"bakoitzean exekutatzea denbora galtze bat izan daiteke. Bestela behar " ++"duzunean adjtimexconfig eskuz konfiguratu dezakezu edo kernel aldagaiak " ++"beste metodo batez atzeman eta /etc/default/adjtimex fitxategian eskuz ipini " ++"ditzakezu." +--- adjtimex-1.29.orig/debian/po/da.po ++++ adjtimex-1.29/debian/po/da.po +@@ -0,0 +1,92 @@ ++# translation of adjtimex_1.16-1-da.po to Danish ++# translation of adjtimex_1.16-1_templates.po to Danish ++# ++# Translators, if you are not familiar with the PO format, gettext ++# documentation is worth reading, especially sections dedicated to ++# this format, e.g. by running: ++# info -n '(gettext)PO Files' ++# info -n '(gettext)Header Entry' ++# Some information specific to po-debconf are available at ++# /usr/share/doc/po-debconf/README-trans ++# or http://www.debian.org/intl/l10n/po-debconf/README-trans# ++# Developers do not need to manually edit POT or PO files. ++# Claus Hindsgaul <claus_h@image.dk>, 2004. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex_1.16-1-da\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-04-16 16:56+0200\n" ++"Last-Translator: Frank Damgaard <debian@overbygaard.dk>\n" ++"Language-Team: Danish\n" ++"Language: \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"X-Generator: KBabel 1.3.1\n" ++"Plural-Forms: nplurals=2; plural=(n != 1);\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "Skal adjtimex køres under installation og ved hver opstart?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Køres adjtimex under opstart af systemet, sættes kernens tidsparametre til " ++"værdierne i /etc/default/adjtimex. " ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Vælg ikke dette hvis du ønsker at bruge adjtimex til at gemmense de aktuelle " ++"parametre." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Skal adjtimexconfig køres ved installation eller opgradering?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Skriptet adjtimexconfig vil bruge adjtimex til at finde de værdier til " ++"kernevariablene \"tick\" og \"frequency\", der vil fÃ¥ systemuret til at " ++"passe med computerens indbyggede ur (CMOS-uret). Den gemmer derefter " ++"værdierne i opsætningsfilen /etc/default/edjtimex, sÃ¥ indstillingerne bliver " ++"sat under hver opstart, nÃ¥r skriptet /etC/init.d/adjtimex køres." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Det tager 70 sekunder at køre skriptet, sÃ¥ at køre skriptet ved hver " ++"opgradering kan være spild af tid. Alternativt kan du selv køre " ++"adjtimexconfig nÃ¥r der er behov, eller finde kernevariablene pÃ¥ en anden " ++"mÃ¥de og sætte dem manuelt i /etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/nl.po ++++ adjtimex-1.29/debian/po/nl.po +@@ -0,0 +1,86 @@ ++# Dutch translation of adjtimex debconf templates. ++# Copyright (C) 2003-2011 THE PACKAGE'S COPYRIGHT HOLDER ++# This file is distributed under the same license as the adjtimex package. ++# Michiel Sikkes <michiel@sikkes.xs4all.nl>, 2003. ++# Jeroen Schot <schot@a-eskwadraat.nl>, 2011. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex_1.29-2.1\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2011-05-05 17:49+0200\n" ++"Last-Translator: Michiel Sikkes <michiel@sikkes.xs4all.nl>\n" ++"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n" ++"Language: nl\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "" ++"Wilt u dat adjtimex bij de installatie en bij elke opstartprocedure gedraaid " ++"wordt?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Het draaien van adjtimex bij het opstarten van het systeem zal " ++"tijdparameters van de kernel instellen zoals gedefinieerd in /etc/default/" ++"adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Accepteer deze optie niet als u adjtimex alleen wilt gebruiken om de huidige " ++"parameters te bekijken." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "" ++"Wilt u dat adjtimexconfig bij het installeren en opwaarderen wordt gedraaid?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Het adjtimexconfig-script zal adjtimex gebruiken om de eigenschappen voor de " ++"kernelvariabelen \"tick\" en \"frequency\" te vinden. Dit zal er voor zorgen " ++"dat de systeemklok gelijk loopt met de hardware-klok (ook bekend onder de " ++"naam CMOS-klok). Deze eigenschappen worden opgeslagen in het " ++"configuratiebestand /etc/default/adjtimex, dus de instellingen worden bij " ++"elke systeemopstartprocedure hersteld als /etc/init.d/adjtimex draait." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"Het script doet er 70 seconden over om te draaien. Als alternatief kunt u " ++"adjtimexconfig later handmatig draaien, of de kernelvariabelen op een andere " ++"manier bepalen en deze zelf in /etc/default/adjtimex zetten." +--- adjtimex-1.29.orig/debian/po/cs.po ++++ adjtimex-1.29/debian/po/cs.po +@@ -0,0 +1,78 @@ ++# Czech translation of adjtimex templates ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.29-2\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2010-07-16 14:53+0200\n" ++"Last-Translator: Martin Sin <martin.sin@zshk.cz>\n" ++"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" ++"Language: cs\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=utf-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "Má být adjtimex spuÅ¡tÄ›n po instalaci a pÅ™i každém spuÅ¡tÄ›nà poÄÃtaÄe?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"SpuÅ¡tÄ›nà adjtimex pÅ™i startu poÄÃtaÄe nastavà Äasové parametry jádra na " ++"hodnoty uložené v /etc/default/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"Pokud chcete použÃvat adjtimex pouze ke zjiÅ¡tÄ›nà aktuálnÃch hodnot, pak tuto " ++"možnost nemusÃte použÃvat." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "Spustit adjtimexconfig po instalaci nebo aktualizaci adjtimex?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"Skript adjtimexconfig použije adjtimex k nalezenà hodnot „tick“ a " ++"„frequency“ jádra tak, že nastavà systémové hodiny pÅ™ibližnÄ› na hodnoty tÄ›ch " ++"hardwarových (také známých jako CMOS hodiny). Tyto hodnoty pak uložà do " ++"konfiguraÄnÃho souboru /etc/default/adjtimex, aby mohlo být nastavenà " ++"obnoveno pÅ™i každém startu, vždy pÅ™i spuÅ¡tÄ›nà /etc/init.d/adjtimex." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"SpuÅ¡tÄ›nà skriptu zabere 70 sekund, takže jeho spuÅ¡tÄ›nà pÅ™i každé aktualizaci " ++"může být ztrátou Äasu. VolitelnÄ› můžete adjtimexconfig spustit podle potÅ™eby " ++"také ruÄnÄ› nebo urÄit promÄ›nné jádra jinými způsoby a nastavit je ruÄnÄ› v " ++"souboru /etc/default/adjtimex." +--- adjtimex-1.29.orig/debian/po/es.po ++++ adjtimex-1.29/debian/po/es.po +@@ -0,0 +1,108 @@ ++# adjtimex po-debconf translation to Spanish ++# Copyright (C) 2009 Software in the Public Interest ++# This file is distributed under the same license as the adjtimex package. ++# ++# Changes: ++# - Initial translation ++# Vicente H. <vherrerv@supercable.es> ++# ++# - Updates ++# Francisco Javier Cuadrado <fcocuadrado@gmail.com>, 2009 ++# ++# Traductores, si no conocen el formato PO, merece la pena leer la ++# documentación de gettext, especialmente las secciones dedicadas a este ++# formato, por ejemplo ejecutando: ++# info -n '(gettext)PO Files' ++# info -n '(gettext)Header Entry' ++# ++# Equipo de traducción al español, por favor lean antes de traducir ++# los siguientes documentos: ++# ++# - El proyecto de traducción de Debian al español ++# http://www.debian.org/intl/spanish/coordinacion ++# especialmente las notas de traducción en ++# http://www.debian.org/intl/spanish/notas ++# ++# - La guÃa de traducción de po's de debconf: ++# /usr/share/doc/po-debconf/README-trans ++# o http://www.debian.org/intl/l10n/po-debconf/README-trans ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: adjtimex 1.27.1-3\n" ++"Report-Msgid-Bugs-To: adjtimex@packages.debian.org\n" ++"POT-Creation-Date: 2009-03-17 07:38+0100\n" ++"PO-Revision-Date: 2009-07-25 20:18+0100\n" ++"Last-Translator: Francisco Javier Cuadrado <fcocuadrado@gmail.com>\n" ++"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n" ++"Language: \n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "Should adjtimex be run at installation and at every startup?" ++msgstr "¿Se debe ejecutar adjtimex ahora y en cada arranque?" ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"Running adjtimex at system startup will set the kernel time parameters to " ++"the values in /etc/default/adjtimex." ++msgstr "" ++"Ejecutar adjtimex al inicio del sistema configurará los parámetros de tiempo " ++"del núcleo a los valores del archivo «/etc/default/adjtimex»." ++ ++#. Type: boolean ++#. Description ++#: ../templates:2001 ++msgid "" ++"You should not choose this option if you just want to use adjtimex to " ++"inspect the current parameters." ++msgstr "" ++"No deberÃa escoger esta opción si sólo quiere utilizar adjtimex para " ++"inspeccionar los parámetros actuales." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "Run adjtimexconfig when adjtimex is installed or upgraded?" ++msgstr "¿Desea ejecutar adjtimexconfig cuando adjtimex se instale o actualice?" ++ ++#. Type: boolean ++#. Description ++#. Translators: do not translate "tick" and "frequency" ++#: ../templates:3001 ++msgid "" ++"The adjtimexconfig script will use adjtimex to find values for the kernel " ++"variables \"tick\" and \"frequency\" that will make the system clock " ++"approximately agree with the hardware clock (also known as the CMOS clock). " ++"It then saves these values in the configuration file /etc/default/adjtimex " ++"so the settings will be restored on every boot, when /etc/init.d/adjtimex " ++"runs." ++msgstr "" ++"El script adjtimexconfig utilizará adjtimex para encontrar los valores de " ++"las variables «tick» y «frecuency» del núcleo que harán que el reloj del " ++"sistema concuerde aproximadamente con el reloj del hardware (también " ++"conocido como reloj CMOS). Entonces, se guardan estos valores en el archivo " ++"de configuración «/etc/default/adjtimex» de modo que los valores se " ++"restaurarán en cada arranque, cuando el script «/etc/init.d/adjtimex» se " ++"ejecute." ++ ++#. Type: boolean ++#. Description ++#: ../templates:3001 ++msgid "" ++"The script takes 70 seconds to run, so running it for every upgrade may be a " ++"waste of time. Alternatively, you can run adjtimexconfig manually when " ++"needed, or determine the kernel variables by using other methods and set " ++"them manually in /etc/default/adjtimex." ++msgstr "" ++"El script tarda 70 segundos para ejecutarse, por lo que ejecutarlo en cada " ++"actualización puede ser una pérdida de tiempo. De forma alternativa, puede " ++"ejecutar manualmente ajdtimexconfig cuando lo necesite, o determinar las " ++"variables del núcleo utilizando otros métodos e configurándolas en el " ++"archivo «/etc/default/adjtimex»." diff --git a/deps/util-linux/bsdstrings-util-linux_overflow.diff b/deps/util-linux/bsdstrings-util-linux_overflow.diff new file mode 100644 index 0000000..127ff9d --- /dev/null +++ b/deps/util-linux/bsdstrings-util-linux_overflow.diff @@ -0,0 +1,20 @@ +From db281fc97f1d665a61acabfd8d5933130996b29f Mon Sep 17 00:00:00 2001 +From: mancha <mancha1@zoho.com> +Date: Wed, 29 Oct 2014 +Subject: Heap overflow + +Fix heap-buffer-overflow in strings.c as bundled by util-linux +through version 2.9 and as shipped by Slackware Linux and +Slackware derivatives. + +--- a/strings.c ++++ b/strings.c +@@ -124,7 +124,7 @@ main(argc, argv) + if (minlen == -1) + minlen = DEF_LEN; + +- if (!(bfr = malloc((u_int)minlen))) { ++ if (!(bfr = malloc((u_int)minlen + 1))) { + (void)fprintf(stderr, "strings: %s\n", strerror(errno)); + exit(1); + } diff --git a/deps/util-linux/ddate.1 b/deps/util-linux/ddate.1 new file mode 100644 index 0000000..ec4ee81 --- /dev/null +++ b/deps/util-linux/ddate.1 @@ -0,0 +1,115 @@ +.\" All Rites Reversed. This file is in the PUBLIC DOMAIN. +.\" Kallisti. +.TH DDATE 1 "Bureaucracy 3161" "ddate" "Emperor Norton User Command" +.SH NAME +ddate \- convert Gregorian dates to Discordian dates +.SH SYNOPSIS +.B ddate +.RI [ \fB+\fPformat] +.RI [ date ] +.SH DESCRIPTION +.B ddate +prints the date in Discordian date format. +.PP +If called with no arguments, +.B ddate +will get the current system date, convert this to the Discordian +date format and print this on the standard output. Alternatively, a +Gregorian date may be specified on the command line, in the form of a numerical +day, month and year. +.PP +If a format string is specified, the Discordian date will be printed in +a format specified by the string. This mechanism works similarly to the +format string mechanism of +.B date(1), +only almost completely differently. The fields are: +.IP %A +Full name of the day of the week (i.e., Sweetmorn) +.IP %a +Abbreviated name of the day of the week (i.e., SM) +.IP %B +Full name of the season (i.e., Chaos) +.IP %b +Abbreviated name of the season (i.e., Chs) +.IP %d +Cardinal number of day in season (i.e., 23) +.IP %e +Ordinal number of day in season (i.e., 23rd) +.IP %H +Name of current Holyday, if any +.IP %N +Magic code to prevent rest of format from being printed unless today is +a Holyday. +.IP %n +Newline +.IP %t +Tab +.IP %X +Number of days remaining until X-Day. (Not valid if the SubGenius options +are not compiled in.) +.IP %{ +.IP %} +Used to enclose the part of the string which is to be replaced with the +words "St. Tib's Day" if the current day is St. Tib's Day. +.IP %\. +Try it and see. +.bp +.SH EXAMPLES +.nf +% ddate +.br +Sweetmorn, Bureaucracy 42, 3161 YOLD +.PP +% ddate +'Today is %{%A, the %e of %B%}, %Y. %N%nCelebrate %H' +.br +Today is Sweetmorn, the 42nd of Bureaucracy, 3161. +.PP +% ddate +"It's %{%A, the %e of %B%}, %Y. %N%nCelebrate %H" 26 9 1995 +.br +It's Prickle-Prickle, the 50th of Bureaucracy, 3161. +.br +Celebrate Bureflux +.PP +% ddate +"Today's %{%A, the %e of %B%}, %Y. %N%nCelebrate %H" 29 2 1996 +.br +Today's St. Tib's Day, 3162. +.br + +.SH BUGS + +.B ddate(1) +will produce undefined behavior if asked to produce the date for St. Tib's +day and its format string does not contain the St. Tib's Day delimiters +%{ and %}. + +.SH NOTE + +After `X-Day' passed without incident, the Church of the SubGenius +declared that it had got the year upside down - X-Day is actually in 8661 AD +rather than 1998 AD. Thus, the True X-Day is Cfn 40, 9827. + +.SH AUTHOR +.nh +Original program by Druel the Chaotic aka Jeremy Johnson (mpython@gnu.ai.mit.edu) +.br +Major rewrite by Lee H:. O:. Smith, KYTP, aka Andrew Bulhak (acb@dev.null.org) +.br +Gregorian B.C.E. dates fixed by Chaplain Nyan the Wiser, aka Dan Dart (ntw@dandart.co.uk) +.br +Five tons of flax. + +.SH DISTRIBUTION POLICY + +Public domain. All rites reversed. + +.SH SEE ALSO + +date(1), +.br +http://www.subgenius.com/ +.br +Malaclypse the Younger, +.I "Principia Discordia, Or How I Found Goddess And What I Did To Her When I Found Her" + +.SH AVAILABILITY +The ddate command is available from https://github.com/bo0ts/ddate. diff --git a/deps/util-linux/ddate.c b/deps/util-linux/ddate.c new file mode 100644 index 0000000..4c2a0f8 --- /dev/null +++ b/deps/util-linux/ddate.c @@ -0,0 +1,399 @@ +/* $ DVCS ID: $jer|,523/lhos,KYTP!41023161\b"?" <<= DO NOT DELETE! */ + +/* ddate.c .. converts boring normal dates to fun Discordian Date -><- + written the 65th day of The Aftermath in the Year of Our Lady of + Discord 3157 by Druel the Chaotic aka Jeremy Johnson aka + mpython@gnu.ai.mit.edu + 28 Sever St Apt #3 + Worcester MA 01609 + + and I'm not responsible if this program messes anything up (except your + mind, I'm responsible for that) + + (k) YOLD 3161 and all time before and after. + Reprint, reuse, and recycle what you wish. + This program is in the public domain. Distribute freely. Or not. + + Majorly hacked, extended and bogotified/debogotified on + Sweetmorn, Bureaucracy 42, 3161 YOLD, by Lee H:. O:. Smith, KYTP, + aka Andrew Bulhak, aka acb@dev.null.org + + Slightly hackled and crackled by a sweet firey stove on + Boomtime, the 53rd day of Bureaucracy in the YOLD 3179, + by Chaplain Nyan the Wiser, aka Dan Dart, aka ntw@dandart.co.uk + + and I'm not responsible if this program messes anything up (except your + mind, I'm responsible for that) (and that goes for me as well --lhos) + + Version history: + Bureflux 3161: First release of enhanced ddate with format strings + 59 Bcy, 3161: PRAISE_BOB and KILL_BOB options split, other minor + changes. + 53 Bcy, 3179: Fixed gregorian date conversions less than YOLD 1167 + + 1999-02-22 Arkadiusz Miskiewicz <misiek@pld.ORG.PL> + - added Native Language Support + + 2000-03-17 Burt Holzman <holzman+ddate@gmail.com> + - added range checks for dates + + 2014-06-07 William Woodruff <william@tuffbizz.com> + - removed gettext dependent locale code + + 15th of Confusion, 3180: + - call out adherents of the wrong fruit + + FIVE TONS OF FLAX +*/ + +/* configuration options VVVVV READ THIS!!! */ + +/* If you wish ddate(1) to print the date in the same format as Druel's + * original ddate when called in immediate mode, define OLD_IMMEDIATE_FMT + */ + +#define OLD_IMMEDIATE_FMT + +/* If you wish to use the US format for aneristic dates (m-d-y), as opposed to + * the Commonwealth format, define US_FORMAT. + */ + +/* #define US_FORMAT */ + +/* If you are ideologically, theologically or otherwise opposed to the + * Church of the SubGenius and do not wish your copy of ddate(1) to contain + * code for counting down to X-Day, undefine KILL_BOB */ + +#define KILL_BOB 13013 + +/* If you wish ddate(1) to contain SubGenius slogans, define PRAISE_BOB */ + +/*#define PRAISE_BOB 13013*/ + +#include <stdlib.h> +#include <string.h> +#include <time.h> +#include <stdio.h> + + +// work around includes and defines from formerly c.h +#ifndef ARRAY_SIZE +# define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr)) +#endif + +/* &a[0] degrades to a pointer: a different type from an array */ +# define __must_be_array(a) \ + BUILD_BUG_ON_ZERO(__builtin_types_compatible_p(__typeof__(a), __typeof__(&a[0]))) + +#define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); })) + +/* work around hacks for standalone package */ +#define PACKAGE "ddate" +#define PACKAGE_STRING "Stand Alone" + +#ifndef __GNUC__ +#define inline /* foo */ +#endif + +#ifdef KILL_BOB +int xday_countdown(int yday, int year); +#endif + + +/* string constants */ + +char *day_long[5] = { + "Sweetmorn", "Boomtime", "Pungenday", "Prickle-Prickle", "Setting Orange" +}; + +char *day_short[5] = {"SM","BT","PD","PP","SO"}; + +char *season_long[5] = { + "Chaos", "Discord", "Confusion", "Bureaucracy", "The Aftermath" +}; + +char *season_short[5] = {"Chs", "Dsc", "Cfn", "Bcy", "Afm"}; + +char *holyday[5][2] = { + { "Mungday", "Chaoflux" }, + { "Mojoday", "Discoflux" }, + { "Syaday", "Confuflux" }, + { "Zaraday", "Bureflux" }, + { "Maladay", "Afflux" } +}; + +struct disc_time { + int season; /* 0-4 */ + int day; /* 0-72 */ + int yday; /* 0-365 */ + int year; /* 3066- */ +}; + +char *excl[] = { + "Hail Eris!", "All Hail Discordia!", "Kallisti!", "Fnord.", "Or not.", + "Wibble.", "Pzat!", "P'tang!", "Frink!", +#ifdef PRAISE_BOB + "Slack!", "Praise \"Bob\"!", "Or kill me.", +#endif /* PRAISE_BOB */ + /* randomness, from the Net and other places. Feel free to add (after + checking with the relevant authorities, of course). */ + "Grudnuk demand sustenance!", "Keep the Lasagna flying!", + "You are what you see.", + "Or is it?", "This statement is false.", + "Lies and slander, sire!", "Hee hee hee!", +#if defined(linux) || defined (__linux__) || defined (__linux) + "Hail Eris, Hack Linux!", +#elif defined(__APPLE__) + "This Fruit is not the True Fruit of Discord.", +#endif + "" +}; + +char default_fmt[] = "%{%A, %B %d%}, %Y YOLD"; +char *default_immediate_fmt= +#ifdef OLD_IMMEDIATE_FMT +"Today is %{%A, the %e day of %B%} in the YOLD %Y%N%nCelebrate %H" +#else +default_fmt +#endif +; + +#define DY(y) (y+1166) + +static inline char *ending(int i) { + return i/10==1?"th":(i%10==1?"st":(i%10==2?"nd":(i%10==3?"rd":"th"))); +} + +static inline int leapp(int i) { + return (!(DY(i)%4))&&((DY(i)%100)||(!(DY(i)%400))); +} + +/* select a random string */ +static inline char *sel(char **strings, int num) { + return(strings[random()%num]); +} + +void print(struct disc_time,char **); /* old */ +void format(char *buf, const char* fmt, struct disc_time dt); +/* read a fortune file */ +int load_fortunes(char *fn, char *delim, char** result); + +struct disc_time convert(int,int); +struct disc_time makeday(int,int,int); + +int +main (int argc, char *argv[]) { + long t; + struct tm *eris; + int bob,raw; + struct disc_time hastur; + char schwa[23*17], *fnord=0; + int pi; + char *progname, *p; + + progname = argv[0]; + if ((p = strrchr(progname, '/')) != NULL) + progname = p+1; + + srandom(time(NULL)); + /* do args here */ + for(pi=1; pi<argc; pi++) { + switch(argv[pi][0]) { + case '+': fnord=argv[pi]+1; break; + case '-': + switch(argv[pi][1]) { + case 'V': + printf(("%s (%s)\n"), progname, PACKAGE_STRING); + default: goto usage; + } + default: goto thud; + } + } + + thud: + if (argc-pi==3){ + int moe=atoi(argv[pi]), larry=atoi(argv[pi+1]), curly=atoi(argv[pi+2]); + hastur=makeday( +#ifdef US_FORMAT + moe,larry, +#else + larry,moe, +#endif + curly); + if (hastur.season == -1) { + printf("Invalid date -- out of range\n"); + return -1; + } + fnord=fnord?fnord:default_fmt; + } else if (argc!=pi) { + usage: + fprintf(stderr,("usage: %s [+format] [day month year]\n"), argv[0]); + exit(1); + } else { + t= time(NULL); + eris=localtime(&t); + bob=eris->tm_yday; /* days since Jan 1. */ + raw=eris->tm_year; /* years since 1980 */ + hastur=convert(bob,raw); + fnord=fnord?fnord:default_immediate_fmt; + } + format(schwa, fnord, hastur); + printf("%s\n", schwa); + + return 0; +} + +void format(char *buf, const char* fmt, struct disc_time dt) +{ + int tib_start=-1, tib_end=0; + int i, fmtlen=strlen(fmt); + char *bufptr=buf; + +/* fprintf(stderr, "format(%p, \"%s\", dt)\n", buf, fmt);*/ + + /* first, find extents of St. Tib's Day area, if defined */ + for(i=0; i<fmtlen; i++) { + if(fmt[i]=='%') { + switch(fmt[i+1]) { + case 'A': + case 'a': + case 'd': + case 'e': + if(tib_start>0) tib_end=i+1; + else tib_start=i; + break; + case '{': tib_start=i; break; + case '}': tib_end=i+1; break; + } + } + } + + /* now do the formatting */ + buf[0]=0; + + for(i=0; i<fmtlen; i++) { + if((i==tib_start) && (dt.day==-1)) { + /* handle St. Tib's Day */ + strcpy(bufptr, ("St. Tib's Day")); + bufptr += strlen(bufptr); + i=tib_end; + } else { + if(fmt[i]=='%') { + char *wibble=0, snarf[23]; + switch(fmt[++i]) { + case 'A': wibble=day_long[dt.yday%5]; break; + case 'a': wibble=day_short[dt.yday%5]; break; + case 'B': wibble=season_long[dt.season]; break; + case 'b': wibble=season_short[dt.season]; break; + case 'd': sprintf(snarf, "%d", dt.day+1); wibble=snarf; break; + case 'e': sprintf(snarf, "%d%s", dt.day+1, ending(dt.day+1)); + wibble=snarf; break; + case 'H': if(dt.day==4||dt.day==49) + wibble=holyday[dt.season][dt.day==49]; break; + case 'N': if(dt.day!=4&&dt.day!=49) goto eschaton; break; + case 'n': *(bufptr++)='\n'; break; + case 't': *(bufptr++)='\t'; break; + + case 'Y': sprintf(snarf, "%d", dt.year); wibble=snarf; break; + case '.': wibble=sel(excl, ARRAY_SIZE(excl)); + break; +#ifdef KILL_BOB + case 'X': sprintf(snarf, "%d", + xday_countdown(dt.yday, dt.year)); + wibble = snarf; break; +#endif /* KILL_BOB */ + } + if(wibble) { +/* fprintf(stderr, "wibble = (%s)\n", wibble);*/ + strcpy(bufptr, wibble); bufptr+=strlen(wibble); + } + } else { + *(bufptr++) = fmt[i]; + } + } + } + eschaton: + *(bufptr)=0; +} + +struct disc_time makeday(int imonth,int iday,int iyear) /*i for input */ +{ + struct disc_time funkychickens; + + int cal[12] = { 31,28,31,30,31,30,31,31,30,31,30,31 }; + int dayspast=0; + + memset(&funkychickens,0,sizeof(funkychickens)); + /* basic range checks */ + if (imonth < 1 || imonth > 12 || iyear == 0) { + funkychickens.season = -1; + return funkychickens; + } + if (iday < 1 || iday > cal[imonth-1]) { + if (!(imonth == 2 && iday == 29 && iyear%4 == 0 && + (iyear%100 != 0 || iyear%400 == 0))) { + funkychickens.season = -1; + return funkychickens; + } + } + + imonth--; + /* note: gregorian year 0 doesn't exist so + * add one if user specifies a year less than 0 */ + funkychickens.year= iyear+1166 + ((0 > iyear)?1:0); + while(imonth>0) { dayspast+=cal[--imonth]; } + funkychickens.day=dayspast+iday-1; + funkychickens.season=0; + if((funkychickens.year%4)==2) { + if (funkychickens.day==59 && iday==29) funkychickens.day=-1; + } + funkychickens.yday=funkychickens.day; +/* note: EQUAL SIGN...hopefully that fixes it */ + while(funkychickens.day>=73) { + funkychickens.season++; + funkychickens.day-=73; + } + return funkychickens; +} + +struct disc_time convert(int nday, int nyear) +{ struct disc_time funkychickens; + + funkychickens.year = nyear+3066; + funkychickens.day=nday; + funkychickens.season=0; + if ((funkychickens.year%4)==2) + {if (funkychickens.day==59) + funkychickens.day=-1; + else if (funkychickens.day >59) + funkychickens.day-=1; + } + funkychickens.yday=funkychickens.day; + while (funkychickens.day>=73) + { funkychickens.season++; + funkychickens.day-=73; + } + return funkychickens; + + } + +#ifdef KILL_BOB + +/* Code for counting down to X-Day, X-Day being Cfn 40, 3164 + * + * After `X-Day' passed without incident, the CoSG declared that it had + * got the year upside down --- X-Day is actually in 8661 AD rather than + * 1998 AD. + * + * Thus, the True X-Day is Cfn 40, 9827. + * + */ + +int xday_countdown(int yday, int year) { + int r=(185-yday)+(((yday<59)&&(leapp(year)))?1:0); + while(year<9827) r+=(leapp(++year)?366:365); + while(year>9827) r-=(leapp(year--)?366:365); + return r; +} + +#endif diff --git a/deps/util-linux/doinst.sh b/deps/util-linux/doinst.sh new file mode 100644 index 0000000..8277c0e --- /dev/null +++ b/deps/util-linux/doinst.sh @@ -0,0 +1,33 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +# Keep same perms on rc.serial.new: +if [ -e etc/rc.d/rc.serial ]; then + cp -a etc/rc.d/rc.serial etc/rc.d/rc.serial.new.incoming + cat etc/rc.d/rc.serial.new > etc/rc.d/rc.serial.new.incoming + mv etc/rc.d/rc.serial.new.incoming etc/rc.d/rc.serial.new +fi + +config etc/rc.d/rc.serial.new +config etc/rc.d/rc.setterm.new +config etc/serial.conf.new + +for configfile in chfn.new chsh.new login.new runuser.new runuser-l.new su.new su-l.new ; do + if [ -r etc/pam.d/$configfile ]; then + config etc/pam.d/$configfile + fi +done + +if [ -r etc/default/su.new ]; then + config etc/default/su.new +fi diff --git a/deps/util-linux/pam.d-su/su b/deps/util-linux/pam.d-su/su new file mode 100644 index 0000000..c28a252 --- /dev/null +++ b/deps/util-linux/pam.d-su/su @@ -0,0 +1,11 @@ +#%PAM-1.0 +auth sufficient pam_rootok.so +# Uncomment the following line to implicitly trust users in the "wheel" group. +#auth sufficient pam_wheel.so trust use_uid +# Uncomment the following line to require a user to be in the "wheel" group. +#auth required pam_wheel.so use_uid +auth include system-auth +account include system-auth +password include system-auth +session include system-auth +session optional pam_xauth.so diff --git a/deps/util-linux/pam.d-su/su-l b/deps/util-linux/pam.d-su/su-l new file mode 100644 index 0000000..654dc24 --- /dev/null +++ b/deps/util-linux/pam.d-su/su-l @@ -0,0 +1,6 @@ +#%PAM-1.0 +auth include su +account include su +password include su +session optional pam_keyinit.so force revoke +session include su diff --git a/deps/util-linux/pam.d/chfn b/deps/util-linux/pam.d/chfn new file mode 100644 index 0000000..2dbc0aa --- /dev/null +++ b/deps/util-linux/pam.d/chfn @@ -0,0 +1,6 @@ +#%PAM-1.0 +auth sufficient pam_rootok.so +auth include system-auth +account include system-auth +password include system-auth +session include system-auth diff --git a/deps/util-linux/pam.d/chsh b/deps/util-linux/pam.d/chsh new file mode 100644 index 0000000..2dbc0aa --- /dev/null +++ b/deps/util-linux/pam.d/chsh @@ -0,0 +1,6 @@ +#%PAM-1.0 +auth sufficient pam_rootok.so +auth include system-auth +account include system-auth +password include system-auth +session include system-auth diff --git a/deps/util-linux/pam.d/login b/deps/util-linux/pam.d/login new file mode 100644 index 0000000..93923f9 --- /dev/null +++ b/deps/util-linux/pam.d/login @@ -0,0 +1,15 @@ +#%PAM-1.0 +auth required pam_securetty.so +# To set a limit on failed authentications, the pam_tally2 module +# can be enabled. See pam_tally2(8) for options. +#auth required pam_tally2.so deny=4 unlock_time=1200 +auth include system-auth +auth include postlogin +account required pam_nologin.so +account include system-auth +password include system-auth +session include system-auth +session include postlogin +session required pam_loginuid.so +-session optional pam_ck_connector.so nox11 +-session optional pam_elogind.so diff --git a/deps/util-linux/pam.d/runuser b/deps/util-linux/pam.d/runuser new file mode 100644 index 0000000..5344abf --- /dev/null +++ b/deps/util-linux/pam.d/runuser @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth sufficient pam_rootok.so +session optional pam_keyinit.so revoke +session required pam_limits.so +session required pam_unix.so diff --git a/deps/util-linux/pam.d/runuser-l b/deps/util-linux/pam.d/runuser-l new file mode 100644 index 0000000..5ba318a --- /dev/null +++ b/deps/util-linux/pam.d/runuser-l @@ -0,0 +1,4 @@ +#%PAM-1.0 +auth include runuser +session optional pam_keyinit.so force revoke +session include runuser diff --git a/deps/util-linux/rc.setterm b/deps/util-linux/rc.setterm new file mode 100644 index 0000000..b98b102 --- /dev/null +++ b/deps/util-linux/rc.setterm @@ -0,0 +1,13 @@ +#!/bin/sh +# +# This file provides the command line for the setterm utility to set the +# terminal attributes (primarily used for screen blanking and power +# management). + +# Screen blanks after 15 minutes idle time, and powers down in one hour +# if the kernel supports APM or ACPI power management (default setting): +/bin/setterm -blank 15 -powersave powerdown -powerdown 60 + +# Screen does not blank or use power management features: +#/bin/setterm -blank 0 -powersave off -powerdown 0 + diff --git a/deps/util-linux/scsi_ioctl.h b/deps/util-linux/scsi_ioctl.h new file mode 100644 index 0000000..edb9525 --- /dev/null +++ b/deps/util-linux/scsi_ioctl.h @@ -0,0 +1,48 @@ +#ifndef _SCSI_IOCTL_H +#define _SCSI_IOCTL_H + +#define SCSI_IOCTL_SEND_COMMAND 1 +#define SCSI_IOCTL_TEST_UNIT_READY 2 +#define SCSI_IOCTL_BENCHMARK_COMMAND 3 +#define SCSI_IOCTL_SYNC 4 /* Request synchronous parameters */ +#define SCSI_IOCTL_START_UNIT 5 +#define SCSI_IOCTL_STOP_UNIT 6 +/* The door lock/unlock constants are compatible with Sun constants for + the cdrom */ +#define SCSI_IOCTL_DOORLOCK 0x5380 /* lock the eject mechanism */ +#define SCSI_IOCTL_DOORUNLOCK 0x5381 /* unlock the mechanism */ + +#define SCSI_REMOVAL_PREVENT 1 +#define SCSI_REMOVAL_ALLOW 0 + +#ifdef __KERNEL__ + +struct scsi_device; + +/* + * Structures used for scsi_ioctl et al. + */ + +typedef struct scsi_ioctl_command { + unsigned int inlen; + unsigned int outlen; + unsigned char data[0]; +} Scsi_Ioctl_Command; + +typedef struct scsi_idlun { + __u32 dev_id; + __u32 host_unique_id; +} Scsi_Idlun; + +/* Fibre Channel WWN, port_id struct */ +typedef struct scsi_fctargaddress { + __u32 host_port_id; + unsigned char host_wwn[8]; // include NULL term. +} Scsi_FCTargAddress; + +extern int scsi_ioctl(struct scsi_device *, int, void __user *); +extern int scsi_nonblockable_ioctl(struct scsi_device *sdev, int cmd, + void __user *arg, struct file *filp); + +#endif /* __KERNEL__ */ +#endif /* _SCSI_IOCTL_H */ diff --git a/deps/util-linux/setserial-rc.serial.diff b/deps/util-linux/setserial-rc.serial.diff new file mode 100644 index 0000000..248d253 --- /dev/null +++ b/deps/util-linux/setserial-rc.serial.diff @@ -0,0 +1,49 @@ +--- ./rc.serial.orig Thu Jan 27 07:47:30 2000 ++++ ./rc.serial Sun May 13 13:27:57 2001 +@@ -14,8 +14,6 @@ + # XXXX For now, the autosave feature doesn't work if you are + # using the multiport feature; it doesn't save the multiport configuration + # (for now). Autosave also doesn't work for the hayes devices. +-# Will fix later... +-# + # + + RCLOCKFILE=/var/lock/subsys/serial +@@ -87,7 +85,7 @@ + mv /etc/.serial.conf.new /etc/serial.conf + echo "done." + fi +- if test -n $MODULE ; then ++ if test -n "$MODULE" ; then + module=`grep $MODULE_REGEXP /proc/modules | awk '{print $1}'` + if test -z "$module" ; then + echo "The $DRIVER_NAME driver is not loaded." +@@ -108,22 +106,22 @@ + # If not stop, it must be a start.... + # + +-if test -n $MODULE -a "$LOADED" != "yes" ; then +- if insmod -fm $MODULE $DRIVER_ARG \ +- > /tmp/$DRIVER.map 2> /tmp/$DRIVER.$$; then :; ++if test -n "$MODULE" -a "$LOADED" != "yes" ; then ++ if insmod -f $MODULE $DRIVER_ARG ; then ++ true + else + echo "Couldn't load $DRIVER_NAME driver." +- echo "See error logs in /tmp/$DRIVER.$$" + exit 1 + fi +- /bin/rm -f /tmp/$DRIVER.$$ + fi + + if test -f /etc/serial.conf ; then + if test -n ${SETSERIAL} ; then + grep -v ^# < /etc/serial.conf | while read device args + do +- ${SETSERIAL} -z $device $args ++ if [ ! "$device" = "" -a ! "$args" = "" ]; then ++ ${SETSERIAL} -z $device $args ++ fi + done + fi + else diff --git a/deps/util-linux/setserial-undef_TIOCGHAYESESP.diff b/deps/util-linux/setserial-undef_TIOCGHAYESESP.diff new file mode 100644 index 0000000..97f0784 --- /dev/null +++ b/deps/util-linux/setserial-undef_TIOCGHAYESESP.diff @@ -0,0 +1,13 @@ +diff -Nur setserial-2.17.orig/setserial.c setserial-2.17/setserial.c +--- setserial-2.17.orig/setserial.c 2000-01-27 09:40:52.000000000 -0600 ++++ setserial-2.17/setserial.c 2010-03-29 23:05:27.093878048 -0500 +@@ -26,6 +26,9 @@ + + #include "version.h" + ++/* http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=f53a2ade0bb9f2a81f473e6469155172a96b7c38 */ ++#undef TIOCGHAYESESP ++ + static char version_str[] = "setserial version " SETSERIAL_VERSION ", " + SETSERIAL_DATE; + diff --git a/deps/util-linux/slack-desc b/deps/util-linux/slack-desc new file mode 100644 index 0000000..2ddf351 --- /dev/null +++ b/deps/util-linux/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------| +util-linux: util-linux (a huge collection of essential utilities) +util-linux: +util-linux: The util-linux package is a huge collection of random utilities +util-linux: that are essential to run a Linux system. +util-linux: +util-linux: Homepage: https://www.kernel.org/pub/linux/utils/util-linux/ +util-linux: +util-linux: +util-linux: +util-linux: +util-linux: diff --git a/deps/util-linux/su.default b/deps/util-linux/su.default new file mode 100644 index 0000000..73fb50a --- /dev/null +++ b/deps/util-linux/su.default @@ -0,0 +1,3 @@ +# Ensure that ENV_SUPATH from /etc/login.defs is used for the $PATH when +# 'su' is used. Otherwise /sbin paths will be missing unless 'su -' is used. +ALWAYS_SET_PATH yes diff --git a/deps/util-linux/util-linux.SlackBuild b/deps/util-linux/util-linux.SlackBuild new file mode 100755 index 0000000..31eb6c1 --- /dev/null +++ b/deps/util-linux/util-linux.SlackBuild @@ -0,0 +1,381 @@ +#!/bin/bash + +# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2017, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Slackware build script for util-linux + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=util-linux +VERSION=${VERSION:-$(echo util-linux*.tar.xz | cut -d - -f 3 | rev | cut -f 3- -d . | rev)} +BUILD=${BUILD:-2} + +ADJTIMEXVERS=1.29 +SETSERIALVERS=2.17 +ZIPTOOLVERS=1.4.0 + +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i586 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-util-linux + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP || exit 1 +rm -rf util-linux-$VERSION +tar xvf $CWD/util-linux-$VERSION.tar.xz || exit 1 +cd util-linux-$VERSION || exit 1 +chown -R root.root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +# Choose correct options depending on whether PAM is installed: +if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then + LOGIN_OPTIONS="" + # By default, don't use the util-linux version of /bin/su: + SHIP_SU=${SHIP_SU:-NO} + # Add /etc/pam.d config files: + rm -rf $PKG/etc/pam.d + mkdir -p $PKG/etc/pam.d + for file in $CWD/pam.d/* ; do + cp -a ${file} $PKG/etc/pam.d/ + done + if [ "$SHIP_SU" = "YES" ]; then + # Add su default file to ensure using ENV_SUPATH with 'su': + mkdir -p $PKG/etc/default + cp -a $CWD/su.default $PKG/etc/default/su.new + chown root:root $PKG/etc/default/su.new + chmod 644 $PKG/etc/default/su.new + # Add su /etc/pam.d files: + cp -a $CWD/pam.d-su/* $PKG/etc/pam.d/ + fi + # Ensure correct perms/ownership on files in /etc/pam.d/: + chown root:root $PKG/etc/pam.d/* + chmod 644 $PKG/etc/pam.d/* + # Don't clobber existing config files: + find $PKG/etc/pam.d -type f -exec mv {} {}.new \; +else + # Don't use the util-linux version of /bin/su. + # It can't be built without PAM anyway. + SHIP_SU=NO + LOGIN_OPTIONS="--disable-login" +fi + +# Changing the fdisk -l output (this was done prior to util-linux-ng) broke +# our installation scripts, so we have changed the name of partition type +# 83 back to "Linux swap": +cat $CWD/util-linux.fdisk-no-solaris.diff | patch -p1 --verbose || exit 1 + +# Revert to the behavior of earlier versions of fdisk which did not list the +# /dev/ram* devices in 'fdisk -l' output: +cat $CWD/util-linux.do.not.list.ram.devices.diff | patch -p1 --verbose || exit 1 + +# This just call the configure script with $1 either being 2 for python2 +# or 3 for python3. +# +# The releasenotes say to use --runstatedir, but it doesn't work and the +# configure script fails. So we'll leave things using localstatedir, but +# check again later: +# +# --runstatedir=/run +configure_with_python(){ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --infodir=/usr/info \ + --docdir=/usr/doc/util-linux-$VERSION \ + --disable-static \ + --enable-agetty \ + --enable-kill \ + --disable-last \ + --enable-libmount-support-mtab \ + --enable-line \ + --enable-mesg \ + --enable-partx \ + --enable-pg \ + --enable-raw \ + --enable-rename \ + $LOGIN_OPTIONS \ + --enable-schedutils \ + --enable-wall \ + --enable-write \ + --enable-use-tty-group \ + --enable-libblkid \ + --enable-libmount \ + --enable-libuuid \ + --disable-uuidd \ + --with-python=$1 \ + --build=$ARCH-slackware-linux +} + +CFLAGS="$SLKCFLAGS" \ + configure_with_python 2 || exit 1 + +make $NUMJOBS || make || exit 1 +make install $NUMJOBS DESTDIR=$PKG || exit 1 + +# These need to be setuid root to work properly (only built for PAM): +if [ -r $PKG/usr/bin/chfn ]; then + chmod 4711 $PKG/usr/bin/chfn +fi +if [ -r $PKG/usr/bin/chsh ]; then + chmod 4711 $PKG/usr/bin/chsh +fi + +# Build python3 bindings for libmount: +make clean +CFLAGS="$SLKCFLAGS" \ + configure_with_python 3 || exit 1 +make $NUMJOBS \ + install-pylibmountexecLTLIBRARIES \ + install-pylibmountexecPYTHON \ + DESTDIR=$PKG || exit 1 + +# Remove all overlap with the shadow package, since --disable-login doesn't quite do that: +rm $PKG/sbin/nologin $PKG/usr/man/man8/nologin.8 $PKG/sbin/sulogin $PKG/usr/man/man8/sulogin.8 + +# If we aren't shipping su, remove the files: +if [ "$SHIP_SU" = "NO" ]; then + rm -f $PKG/bin/su + rm -f $PKG/usr/man/man1/su.1 + rm -f $PKG/usr/share/bash-completion/completions/su +fi + +# Move the libblkid, libfdisk, libmount, libsmartcols, and +# libuuid libraries to /lib${LIBSUFFIX}: +mkdir -p $PKG/lib${LIBDIRSUFFIX} +( cd $PKG/usr/lib${LIBDIRSUFFIX} + mv libblkid.so.1* $PKG/lib${LIBDIRSUFFIX} + mv libfdisk.so.1* $PKG/lib${LIBDIRSUFFIX} + mv libmount.so.1* $PKG/lib${LIBDIRSUFFIX} + mv libsmartcols.so.1* $PKG/lib${LIBDIRSUFFIX} + mv libuuid.so.1* $PKG/lib${LIBDIRSUFFIX} + rm -f libblkid.so libfdisk.so libmount.so libsmartcols.so libuuid.so + ln -sf ../../lib${LIBDIRSUFFIX}/libblkid.so.1 libblkid.so + ln -sf ../../lib${LIBDIRSUFFIX}/libfdisk.so.1 libfdisk.so + ln -sf ../../lib${LIBDIRSUFFIX}/libmount.so.1 libmount.so + ln -sf ../../lib${LIBDIRSUFFIX}/libsmartcols.so.1 libsmartcols.so + ln -sf ../../lib${LIBDIRSUFFIX}/libuuid.so.1 libuuid.so +) + +# Moving things around that have been in the same place +# for 15 years is, IMHO, not a wise idea AT ALL. +# If this had to be moved, some place out of /usr might +# have shown a grain of insight... +if [ -r $PKG/usr/sbin/fdformat ]; then + mkdir -p $PKG/usr/bin + mv $PKG/usr/sbin/fdformat $PKG/usr/bin/fdformat + # Now since stuff will start looking in this new place, + # we have no choice but to link these: + ( cd $PKG/usr/sbin + ln -sf ../bin/fdformat . + ) +fi + +# Add the rc.setterm init script to set default terminal attributes: +mkdir -p $PKG/etc/rc.d +cp -a $CWD/rc.setterm $PKG/etc/rc.d/rc.setterm.new +chown root:root $PKG/etc/rc.d/rc.setterm.new +chmod 755 $PKG/etc/rc.d/rc.setterm.new + +# ddate.{1,c} taken from https://github.com/bo0ts/ddate: +cp -a $CWD/ddate.? . +cc -O -o ddate ddate.c +cp -a ddate $PKG/usr/bin +cat ddate.1 > $PKG/usr/man/man1/ddate.1 +chown root:root $PKG/usr/bin/ddate + +# Build ziptool (install as jaztool to avoid conflict with libzip): +cd $TMP || exit 1 +rm -rf ziptool-$ZIPTOOLVERS +tar xvf $CWD/ziptool-$ZIPTOOLVERS.tar.xz || exit 1 +cd ziptool-$ZIPTOOLVERS || exit 1 +cat $CWD/ziptool-fix_build.patch | patch -p1 || exit 1 +mkdir scsi +cat $CWD/scsi_ioctl.h > scsi/scsi_ioctl.h +chown -R root:root . +make || exit 1 +strip ziptool +cat ziptool > $PKG/sbin/jaztool +chmod 0755 $PKG/sbin/jaztool +mkdir -p $PKG/usr/doc/ziptool-$ZIPTOOLVERS +cp -a README $PKG/usr/doc/ziptool-$ZIPTOOLVERS +chmod 644 $PKG/usr/doc/ziptool-$ZIPTOOLVERS/* +cat ziptool.1.gz > $PKG/usr/man/man1/jaztool.1.gz + +# Build bsdstrings +cd $TMP || exit 1 +rm -rf bsdstrings +tar xvf $CWD/bsdstrings.tar.gz || exit 1 +cd bsdstrings || exit 1 +cat $CWD/bsdstrings-util-linux_overflow.diff | patch -p1 --verbose || exit 1 +make || exit 1 +strip strings +cat strings > $PKG/usr/bin/strings-BSD +chmod 0755 $PKG/usr/bin/strings-BSD +cat strings.1 | gzip -9c > $PKG/usr/man/man1/strings-BSD.1.gz + +# Build adjtimex +cd $TMP || exit 1 +rm -rf adjtimex-$ADJTIMEXVERS +tar xvf $CWD/adjtimex_${ADJTIMEXVERS}.orig.tar.gz || exit 1 +cd adjtimex-$ADJTIMEXVERS || exit 1 +chown -R root:root . +cat $CWD/adjtimex_1.29-2.2.diff | patch -p1 || exit 1 +CFLAGS=-O2 ./configure --prefix=/usr || exit 1 +make || exit 1 +strip adjtimex +cat adjtimex > $PKG/sbin/adjtimex +chmod 0755 $PKG/sbin/adjtimex +cat adjtimex.8 | gzip -9c > $PKG/usr/man/man8/adjtimex.8.gz +mkdir -p $PKG/usr/doc/adjtimex-$ADJTIMEXVERS +cp -a COPYING COPYRIGHT README README.ru adjtimex.lsm \ + $PKG/usr/doc/adjtimex-$ADJTIMEXVERS + +# Build setserial +cd $TMP || exit 1 +rm -rf setserial-$SETSERIALVERS +tar xvf $CWD/setserial-$SETSERIALVERS.tar.gz || exit 1 +cd setserial-$SETSERIALVERS || exit 1 +chown -R root:root . +cat $CWD/setserial-rc.serial.diff | patch -E -p1 --verbose || exit 1 +cat $CWD/setserial-undef_TIOCGHAYESESP.diff | patch -E -p1 --verbose || exit 1 +# The original config.{guess,sub} do not work on x86_64 +cp -p /usr/share/libtool/build-aux/config.{guess,sub} . +./configure --prefix=/usr || exit 1 +make || exit 1 +strip setserial +cat setserial > $PKG/sbin/setserial +chmod 0755 $PKG/sbin/setserial +mkdir -p $PKG/etc/rc.d +cat rc.serial > $PKG/etc/rc.d/rc.serial.new +cat serial.conf > $PKG/etc/serial.conf.new +cat setserial.8 | gzip -9c > $PKG/usr/man/man8/setserial.8.gz + +# These have always traditionally been available before /usr +# might be mounted: +( cd $PKG/usr/bin + mv getopt setterm $PKG/bin + cd $PKG/usr/bin + ln -s ../../bin/getopt . + ln -s ../../bin/setterm . +) + +cd $TMP/util-linux-$VERSION # Go back home :) + +# Now let's add some important symlinks :) +( cd $PKG/sbin + ln -s ../bin/mount . + ln -s ../bin/umount . + #ln -s ziptool jaztool + ln -s hwclock clock + cd $PKG/usr/sbin + ln -s ../../sbin/cfdisk . + ln -s ../../sbin/ctrlaltdel . + ln -s ../../sbin/sfdisk . + cd $PKG/usr/bin + ln -s ../sbin/readprofile . + # tunelp was removed by upstream: + #ln -s ../sbin/tunelp . + ln -s ../../bin/more . + ln -s ../../sbin/raw . + cd $PKG/usr/man/man1 + #ln -s ziptool.1 jaztool.1 + cd $PKG/usr/man/man8 + ln -s hwclock.8 clock.8 +) + +find $PKG | xargs file | grep -e "executable" -e "shared object" \ + | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + +# Compress and if needed symlink the man pages: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# Compress info page and remove dir file +rm $PKG/usr/info/dir +gzip -9 $PKG/usr/info/* + +mkdir -p $PKG/usr/doc/util-linux-$VERSION +cp -a AUTHORS COPYING* DEPRECATED NEWS README* \ + Documentation/v${VERSION}-ReleaseNotes \ + Documentation/licenses/* Documentation/{TODO,*.txt} \ + $PKG/usr/doc/util-linux-$VERSION + +mkdir $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 $TMP/util-linux-$VERSION-$ARCH-$BUILD.txz + diff --git a/deps/util-linux/util-linux.do.not.list.ram.devices.diff b/deps/util-linux/util-linux.do.not.list.ram.devices.diff new file mode 100644 index 0000000..33a7430 --- /dev/null +++ b/deps/util-linux/util-linux.do.not.list.ram.devices.diff @@ -0,0 +1,13 @@ +--- ./disk-utils/fdisk-list.c.orig 2018-09-20 07:38:55.845404951 -0500 ++++ ./disk-utils/fdisk-list.c 2019-01-02 15:53:21.256868721 -0600 +@@ -337,6 +337,10 @@ + if (devno <= 0) + continue; + ++ /* Don't list /dev/ram* devices */ ++ if (strstr(line, "ram") && devno >= 256) ++ continue; ++ + if (sysfs_devno_is_dm_private(devno, NULL) || + sysfs_devno_is_wholedisk(devno) <= 0) + continue; diff --git a/deps/util-linux/util-linux.fdisk-no-solaris.diff b/deps/util-linux/util-linux.fdisk-no-solaris.diff new file mode 100644 index 0000000..a495ffa --- /dev/null +++ b/deps/util-linux/util-linux.fdisk-no-solaris.diff @@ -0,0 +1,12 @@ +diff -Nur util-linux-2.24.2.orig/include/pt-mbr-partnames.h util-linux-2.24.2/include/pt-mbr-partnames.h +--- util-linux-2.24.2.orig/include/pt-mbr-partnames.h 2014-04-24 02:37:04.352704164 -0500 ++++ util-linux-2.24.2/include/pt-mbr-partnames.h 2014-07-03 03:33:27.054574467 -0500 +@@ -49,7 +49,7 @@ + {0x75, N_("PC/IX")}, + {0x80, N_("Old Minix")}, /* Minix 1.4a and earlier */ + {0x81, N_("Minix / old Linux")},/* Minix 1.4b and later */ +- {0x82, N_("Linux swap / Solaris")}, ++ {0x82, N_("Linux swap")}, + {0x83, N_("Linux")}, + {0x84, N_("OS/2 hidden C: drive")}, + {0x85, N_("Linux extended")}, diff --git a/deps/util-linux/ziptool-fix_build.patch b/deps/util-linux/ziptool-fix_build.patch new file mode 100644 index 0000000..a2d3d51 --- /dev/null +++ b/deps/util-linux/ziptool-fix_build.patch @@ -0,0 +1,24 @@ +diff -Nur ziptool-1.4.0.orig/Makefile ziptool-1.4.0/Makefile +--- ziptool-1.4.0.orig/Makefile 2002-08-23 17:13:48.000000000 -0500 ++++ ziptool-1.4.0/Makefile 2009-02-09 16:33:12.913637302 -0600 +@@ -5,10 +5,6 @@ + # + CFLAGS = -O2 -g -Wall + +-# Path to linux kernel sources. +-# +-LINUX_SRC_DIR = /usr/src/linux +- + # Installation directories + # + INSTALL_BIN_DIR = /usr/bin +@@ -30,7 +26,7 @@ + cd $(INSTALL_MAN_DIR)/man1; ln -sf ziptool.1.gz jaztool.1.gz + + ziptool: ziptool.c +- cc $(CFLAGS) -I$(LINUX_SRC_DIR)/include -o ziptool ziptool.c ++ cc $(CFLAGS) -I. -o ziptool ziptool.c + + jaztool: ziptool.c +- cc $(CFLAGS) -I$(LINUX_SRC_DIR)/include -o jaztool ziptool.c ++ cc $(CFLAGS) -I. -o jaztool ziptool.c diff --git a/deps/wayland-protocols/.url b/deps/wayland-protocols/.url index 45e2e88..b501805 100644 --- a/deps/wayland-protocols/.url +++ b/deps/wayland-protocols/.url @@ -1,3 +1,3 @@ -https://wayland.freedesktop.org/releases/wayland-protocols-1.12.tar.xz -https://wayland.freedesktop.org/releases/wayland-protocols-1.12.tar.xz.sig +https://wayland.freedesktop.org/releases/wayland-protocols-1.18.tar.xz +https://wayland.freedesktop.org/releases/wayland-protocols-1.18.tar.xz.sig diff --git a/deps/wayland-protocols/wayland-protocols.SlackBuild b/deps/wayland-protocols/wayland-protocols.SlackBuild index 9e94b93..044da9f 100755 --- a/deps/wayland-protocols/wayland-protocols.SlackBuild +++ b/deps/wayland-protocols/wayland-protocols.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # Copyright 2017 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2017 Eric Hameleers, Eindhoven, NL +# Copyright 2017, 2019 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -22,14 +22,14 @@ # SUCH DAMAGE. # ----------------------------------------------------------------------------- +cd $(dirname $0) ; CWD=$(pwd) PKGNAM=wayland-protocols -VERSION=${VERSION:-1.12} +VERSION=${VERSION:-1.18} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -44,12 +44,17 @@ if [ -z "$ARCH" ]; then export ARCH fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX: if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" + SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" diff --git a/deps/wayland/.url b/deps/wayland/.url index f32621e..060b3d0 100644 --- a/deps/wayland/.url +++ b/deps/wayland/.url @@ -1,2 +1,2 @@ -https://wayland.freedesktop.org/releases/wayland-1.14.0.tar.xz +https://wayland.freedesktop.org/releases/wayland-1.17.0.tar.xz diff --git a/deps/wayland/wayland.SlackBuild b/deps/wayland/wayland.SlackBuild index 2563450..d1b51cd 100755 --- a/deps/wayland/wayland.SlackBuild +++ b/deps/wayland/wayland.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2015, 2017 Eric Hameleers, Eindhoven, NL +# Copyright 2015, 2017, 2019 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -24,10 +24,10 @@ PKGNAM=wayland -VERSION=${VERSION:-1.14.0} +VERSION=${VERSION:-1.17.0} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-" -j4 "} +NUMJOBS=${NUMJOBS:-"-j$(nproc)"} CWD=$(pwd) TMP=${TMP:-/tmp} @@ -36,7 +36,7 @@ PKG=$TMP/package-$PKGNAM # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -103,6 +103,9 @@ CXXFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + # Strip binaries: 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/deps/xorg-server/patches/0001-Always-install-vbe-and-int10-sdk-headers.patch b/deps/xorg-server/patches/0001-Always-install-vbe-and-int10-sdk-headers.patch new file mode 100644 index 0000000..c613eb8 --- /dev/null +++ b/deps/xorg-server/patches/0001-Always-install-vbe-and-int10-sdk-headers.patch @@ -0,0 +1,37 @@ +From e96a83d9b1b5a52a41213c7a4840dc96b4f5b06f Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Wed, 15 Aug 2012 12:35:21 -0400 +Subject: [PATCH] Always install vbe and int10 sdk headers + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- + hw/xfree86/Makefile.am | 12 ++---------- + 1 file changed, 2 insertions(+), 10 deletions(-) + +diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am +index b876b79..a170b58 100644 +--- a/hw/xfree86/Makefile.am ++++ b/hw/xfree86/Makefile.am +@@ -26,17 +26,9 @@ if VGAHW + VGAHW_SUBDIR = vgahw + endif + +-if VBE +-VBE_SUBDIR = vbe +-endif +- +-if INT10MODULE +-INT10_SUBDIR = int10 +-endif +- +-SUBDIRS = common ddc x86emu $(INT10_SUBDIR) os-support parser \ ++SUBDIRS = common ddc x86emu int10 os-support parser \ + ramdac $(VGAHW_SUBDIR) loader modes $(DRI_SUBDIR) \ +- $(DRI2_SUBDIR) . $(VBE_SUBDIR) i2c dixmods xkb \ ++ $(DRI2_SUBDIR) . vbe i2c dixmods xkb \ + fbdevhw shadowfb exa $(XF86UTILS_SUBDIR) doc man \ + $(GLAMOR_EGL_SUBDIR) drivers + +-- +2.13.6 + diff --git a/deps/xorg-server/patches/0001-autobind-GPUs-to-the-screen.patch b/deps/xorg-server/patches/0001-autobind-GPUs-to-the-screen.patch new file mode 100644 index 0000000..86b96a2 --- /dev/null +++ b/deps/xorg-server/patches/0001-autobind-GPUs-to-the-screen.patch @@ -0,0 +1,293 @@ +From 471289fa1dc359555ceed6302f7d9605ab6be3ea Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airlied@redhat.com> +Date: Mon, 2 Apr 2018 16:49:02 -0400 +Subject: [PATCH] autobind GPUs to the screen + +This is a modified version of a patch we've been carry-ing in Fedora and +RHEL for years now. This patch automatically adds secondary GPUs to the +master as output sink / offload source making e.g. the use of +slave-outputs just work, with requiring the user to manually run +"xrandr --setprovideroutputsource" before he can hookup an external +monitor to his hybrid graphics laptop. + +There is one problem with this patch, which is why it was not upstreamed +before. What to do when a secondary GPU gets detected really is a policy +decission (e.g. one may want to autobind PCI GPUs but not USB ones) and +as such should be under control of the Desktop Environment. + +Unconditionally adding autobinding support to the xserver will result +in races between the DE dealing with the hotplug of a secondary GPU +and the server itself dealing with it. + +However we've waited for years for any Desktop Environments to actually +start doing some sort of autoconfiguration of secondary GPUs and there +is still not a single DE dealing with this, so I believe that it is +time to upstream this now. + +To avoid potential future problems if any DEs get support for doing +secondary GPU configuration themselves, the new autobind functionality +is made optional. Since no DEs currently support doing this themselves it +is enabled by default. When DEs grow support for doing this themselves +they can disable the servers autobinding through the servers cmdline or a +xorg.conf snippet. + +Signed-off-by: Dave Airlie <airlied@gmail.com> +[hdegoede@redhat.com: Make configurable, fix with nvidia, submit upstream] +Signed-off-by: Hans de Goede <hdegoede@redhat.com> +--- + hw/xfree86/common/xf86Config.c | 19 +++++++++++++++++++ + hw/xfree86/common/xf86Globals.c | 2 ++ + hw/xfree86/common/xf86Init.c | 20 ++++++++++++++++++++ + hw/xfree86/common/xf86Priv.h | 1 + + hw/xfree86/common/xf86Privstr.h | 1 + + hw/xfree86/common/xf86platformBus.c | 4 ++++ + hw/xfree86/man/Xorg.man | 7 +++++++ + hw/xfree86/man/xorg.conf.man | 6 ++++++ + randr/randrstr.h | 3 +++ + randr/rrprovider.c | 22 ++++++++++++++++++++++ + 10 files changed, 85 insertions(+) + +diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c +index 2c1d335..d7d7c2e 100644 +--- a/hw/xfree86/common/xf86Config.c ++++ b/hw/xfree86/common/xf86Config.c +@@ -643,6 +643,7 @@ typedef enum { + FLAG_DRI2, + FLAG_USE_SIGIO, + FLAG_AUTO_ADD_GPU, ++ FLAG_AUTO_BIND_GPU, + FLAG_MAX_CLIENTS, + FLAG_IGLX, + FLAG_DEBUG, +@@ -699,6 +700,8 @@ static OptionInfoRec FlagOptions[] = { + {0}, FALSE}, + {FLAG_AUTO_ADD_GPU, "AutoAddGPU", OPTV_BOOLEAN, + {0}, FALSE}, ++ {FLAG_AUTO_BIND_GPU, "AutoBindGPU", OPTV_BOOLEAN, ++ {0}, FALSE}, + {FLAG_MAX_CLIENTS, "MaxClients", OPTV_INTEGER, + {0}, FALSE }, + {FLAG_IGLX, "IndirectGLX", OPTV_BOOLEAN, +@@ -779,6 +782,22 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts) + } + xf86Msg(from, "%sutomatically adding GPU devices\n", + xf86Info.autoAddGPU ? "A" : "Not a"); ++ ++ if (xf86AutoBindGPUDisabled) { ++ xf86Info.autoBindGPU = FALSE; ++ from = X_CMDLINE; ++ } ++ else if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_BIND_GPU)) { ++ xf86GetOptValBool(FlagOptions, FLAG_AUTO_BIND_GPU, ++ &xf86Info.autoBindGPU); ++ from = X_CONFIG; ++ } ++ else { ++ from = X_DEFAULT; ++ } ++ xf86Msg(from, "%sutomatically binding GPU devices\n", ++ xf86Info.autoBindGPU ? "A" : "Not a"); ++ + /* + * Set things up based on the config file information. Some of these + * settings may be overridden later when the command line options are +diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c +index e890f05..7b27b4c 100644 +--- a/hw/xfree86/common/xf86Globals.c ++++ b/hw/xfree86/common/xf86Globals.c +@@ -131,6 +131,7 @@ xf86InfoRec xf86Info = { + #else + .autoAddGPU = FALSE, + #endif ++ .autoBindGPU = TRUE, + }; + + const char *xf86ConfigFile = NULL; +@@ -191,6 +192,7 @@ Bool xf86FlipPixels = FALSE; + Gamma xf86Gamma = { 0.0, 0.0, 0.0 }; + + Bool xf86AllowMouseOpenFail = FALSE; ++Bool xf86AutoBindGPUDisabled = FALSE; + + #ifdef XF86VIDMODE + Bool xf86VidModeDisabled = FALSE; +diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c +index ea42ec9..ec255b6 100644 +--- a/hw/xfree86/common/xf86Init.c ++++ b/hw/xfree86/common/xf86Init.c +@@ -76,6 +76,7 @@ + #include "xf86DDC.h" + #include "xf86Xinput.h" + #include "xf86InPriv.h" ++#include "xf86Crtc.h" + #include "picturestr.h" + #include "randrstr.h" + #include "glxvndabi.h" +@@ -237,6 +238,19 @@ xf86PrivsElevated(void) + return PrivsElevated(); + } + ++static void ++xf86AutoConfigOutputDevices(void) ++{ ++ int i; ++ ++ if (!xf86Info.autoBindGPU) ++ return; ++ ++ for (i = 0; i < xf86NumGPUScreens; i++) ++ RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]), ++ xf86ScrnToScreen(xf86Screens[0])); ++} ++ + static void + TrapSignals(void) + { +@@ -770,6 +784,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv) + for (i = 0; i < xf86NumGPUScreens; i++) + AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen); + ++ xf86AutoConfigOutputDevices(); ++ + xf86VGAarbiterWrapFunctions(); + if (sigio_blocked) + input_unlock(); +@@ -1278,6 +1294,10 @@ ddxProcessArgument(int argc, char **argv, int i) + xf86Info.iglxFrom = X_CMDLINE; + return 0; + } ++ if (!strcmp(argv[i], "-noautoBindGPU")) { ++ xf86AutoBindGPUDisabled = TRUE; ++ return 1; ++ } + + /* OS-specific processing */ + return xf86ProcessArgument(argc, argv, i); +diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h +index 4fe2b5f..6566622 100644 +--- a/hw/xfree86/common/xf86Priv.h ++++ b/hw/xfree86/common/xf86Priv.h +@@ -46,6 +46,7 @@ + extern _X_EXPORT const char *xf86ConfigFile; + extern _X_EXPORT const char *xf86ConfigDir; + extern _X_EXPORT Bool xf86AllowMouseOpenFail; ++extern _X_EXPORT Bool xf86AutoBindGPUDisabled; + + #ifdef XF86VIDMODE + extern _X_EXPORT Bool xf86VidModeDisabled; +diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h +index 21c2e1f..6c71863 100644 +--- a/hw/xfree86/common/xf86Privstr.h ++++ b/hw/xfree86/common/xf86Privstr.h +@@ -98,6 +98,7 @@ typedef struct { + + Bool autoAddGPU; + const char *debug; ++ Bool autoBindGPU; + } xf86InfoRec, *xf86InfoPtr; + + /* ISC's cc can't handle ~ of UL constants, so explicitly type cast them. */ +diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c +index cef47da..913a324 100644 +--- a/hw/xfree86/common/xf86platformBus.c ++++ b/hw/xfree86/common/xf86platformBus.c +@@ -49,6 +49,7 @@ + #include "Pci.h" + #include "xf86platformBus.h" + #include "xf86Config.h" ++#include "xf86Crtc.h" + + #include "randrstr.h" + int platformSlotClaimed; +@@ -665,6 +666,9 @@ xf86platformAddDevice(int index) + } + /* attach unbound to 0 protocol screen */ + AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen); ++ if (xf86Info.autoBindGPU) ++ RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]), ++ xf86ScrnToScreen(xf86Screens[0])); + + RRResourcesChanged(xf86Screens[0]->pScreen); + RRTellChanged(xf86Screens[0]->pScreen); +diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man +index 13a9dc3..745f986 100644 +--- a/hw/xfree86/man/Xorg.man ++++ b/hw/xfree86/man/Xorg.man +@@ -283,6 +283,13 @@ is a comma separated list of directories to search for + server modules. This option is only available when the server is run + as root (i.e, with real-uid 0). + .TP 8 ++.B \-noautoBindGPU ++Disable automatically setting secondary GPUs up as output sinks and offload ++sources. This is equivalent to setting the ++.B AutoBindGPU ++xorg.conf(__filemansuffix__) file option. To ++.B false. ++.TP 8 + .B \-nosilk + Disable Silken Mouse support. + .TP 8 +diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man +index 9589262..8d51e06 100644 +--- a/hw/xfree86/man/xorg.conf.man ++++ b/hw/xfree86/man/xorg.conf.man +@@ -672,6 +672,12 @@ Enabled by default. + If this option is disabled, then no GPU devices will be added from the udev + backend. Enabled by default. (May need to be disabled to setup Xinerama). + .TP 7 ++.BI "Option \*qAutoBindGPU\*q \*q" boolean \*q ++If enabled then secondary GPUs will be automatically set up as output-sinks and ++offload-sources. Making e.g. laptop outputs connected only to the secondary ++GPU directly available for use without needing to run ++"xrandr --setprovideroutputsource". Enabled by default. ++.TP 7 + .BI "Option \*qLog\*q \*q" string \*q + This option controls whether the log is flushed and/or synced to disk after + each message. +diff --git a/randr/randrstr.h b/randr/randrstr.h +index f94174b..092d726 100644 +--- a/randr/randrstr.h ++++ b/randr/randrstr.h +@@ -1039,6 +1039,9 @@ RRProviderLookup(XID id, RRProviderPtr *provider_p); + extern _X_EXPORT void + RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider); + ++extern _X_EXPORT void ++RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen); ++ + /* rrproviderproperty.c */ + + extern _X_EXPORT void +diff --git a/randr/rrprovider.c b/randr/rrprovider.c +index e4bc2bf..e04c18f 100644 +--- a/randr/rrprovider.c ++++ b/randr/rrprovider.c +@@ -485,3 +485,25 @@ RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider) + + WriteEventsToClient(client, 1, (xEvent *) &pe); + } ++ ++void ++RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen) ++{ ++ rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen); ++ rrScrPrivPtr masterPriv = rrGetScrPriv(masterScreen); ++ RRProviderPtr provider = pScrPriv->provider; ++ RRProviderPtr master_provider = masterPriv->provider; ++ ++ if (!provider || !master_provider) ++ return; ++ ++ if ((provider->capabilities & RR_Capability_SinkOutput) && ++ (master_provider->capabilities & RR_Capability_SourceOutput)) { ++ pScrPriv->rrProviderSetOutputSource(pScreen, provider, master_provider); ++ RRInitPrimeSyncProps(pScreen); ++ } ++ ++ if ((provider->capabilities & RR_Capability_SourceOffload) && ++ (master_provider->capabilities & RR_Capability_SinkOffload)) ++ pScrPriv->rrProviderSetOffloadSink(pScreen, provider, master_provider); ++} +-- +2.16.2 + diff --git a/deps/xorg-server/patches/0001-xfree86-use-modesetting-driver-by-default-on-GeForce.patch b/deps/xorg-server/patches/0001-xfree86-use-modesetting-driver-by-default-on-GeForce.patch new file mode 100644 index 0000000..87b2877 --- /dev/null +++ b/deps/xorg-server/patches/0001-xfree86-use-modesetting-driver-by-default-on-GeForce.patch @@ -0,0 +1,47 @@ +From aa2f34d80ef3118eae0cce73b610c36cdcb978fe Mon Sep 17 00:00:00 2001 +From: Ben Skeggs <bskeggs@redhat.com> +Date: Sat, 22 Apr 2017 02:26:28 +1000 +Subject: [PATCH xserver] xfree86: use modesetting driver by default on GeForce + 8 and newer + +Signed-off-by: Ben Skeggs <bskeggs@redhat.com> +--- + hw/xfree86/common/xf86pciBus.c | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +--- ./hw/xfree86/common/xf86pciBus.c.orig 2019-02-26 13:28:50.000000000 -0600 ++++ ./hw/xfree86/common/xf86pciBus.c 2019-02-26 17:16:04.131096857 -0600 +@@ -37,6 +37,7 @@ + #include <unistd.h> + #include <X11/X.h> + #include <pciaccess.h> ++#include <xf86drm.h> + #include "os.h" + #include "Pci.h" + #include "xf86.h" +@@ -1191,6 +1192,25 @@ + int idx = 0; + + #if defined(__linux__) || defined(__NetBSD__) ++ char busid[32]; ++ int fd; ++ ++ snprintf(busid, sizeof(busid), "pci:%04x:%02x:%02x.%d", ++ dev->domain, dev->bus, dev->dev, dev->func); ++ ++ /* 'modesetting' is preferred for GeForce 8 and newer GPUs */ ++ fd = drmOpenWithType("nouveau", busid, DRM_NODE_RENDER); ++ if (fd >= 0) { ++ uint64_t args[] = { 11 /* NOUVEAU_GETPARAM_CHIPSET_ID */, 0 }; ++ int ret = drmCommandWriteRead(fd, 0 /* DRM_NOUVEAU_GETPARAM */, ++ &args, sizeof(args)); ++ drmClose(fd); ++ if (ret == 0) { ++ if (args[1] == 0x050 || args[1] >= 0x80) ++ break; ++ } ++ } ++ + driverList[idx++] = "nouveau"; + #endif + driverList[idx++] = "nv"; diff --git a/deps/xorg-server/patches/fix-nouveau-segfault.diff b/deps/xorg-server/patches/fix-nouveau-segfault.diff new file mode 100644 index 0000000..db66956 --- /dev/null +++ b/deps/xorg-server/patches/fix-nouveau-segfault.diff @@ -0,0 +1,12 @@ +--- ./render/mipict.c.orig 2018-05-10 11:32:37.000000000 -0500 ++++ ./render/mipict.c 2018-05-30 00:01:50.648530333 -0500 +@@ -394,6 +394,9 @@ + CARD32 r, g, b, a; + miIndexedPtr pIndexed; + ++ if(! format) ++ *pixel = (color->alpha >> 8 << 24) | (color->red >> 8 << 16) | (color->green & 0xff00) | (color->blue >> 8); ++ else + switch (format->type) { + case PictTypeDirect: + r = color->red >> (16 - Ones(format->direct.redMask)); diff --git a/deps/xorg-server/xorg-server.SlackBuild b/deps/xorg-server/xorg-server.SlackBuild index dc96755..5163675 100755 --- a/deps/xorg-server/xorg-server.SlackBuild +++ b/deps/xorg-server/xorg-server.SlackBuild @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2007-2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2007-2020 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -22,12 +22,12 @@ # ----------------------------------------------------------------------------- # Condensed from the modular x11.SlackBuild -# 2016, 2017, 2018 by Eric Hameleers <alien@slackware.com> +# 2016, 2017, 2018, 2020 by Eric Hameleers <alien@slackware.com> # Note: this package contains _all_ X servers. Not just Xorg, but also: # Xnest, Xephyr, Xvfb, Xwayland. PKGNAM=xorg-server -VERSION=${VERSION:-1.19.6} +VERSION=${VERSION:-1.20.8} BUILD=${BUILD:-2} cd $(dirname $0) ; CWD=$(pwd) @@ -86,16 +86,34 @@ tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 cd $PKGNAM-$VERSION || exit 1 # Apply patches: +# We've used this one forever. cat $CWD/patches/x11.startwithblackscreen.diff | patch -p1 --verbose || exit 1 +# Without this patch, combo mouse/keyboard (such as Logitech through unified +# receiver) may be unable to set the desired keyboard layout. cat $CWD/patches/xorg-server.combo.mouse.keyboard.layout.patch | patch -p1 --verbose || exit 1 +# Fix a segfault in xorg-server-1.20.0. Odds are good this will be fixed in +# the next xorg-server and will no longer apply then. +cat $CWD/patches/fix-nouveau-segfault.diff | patch -p1 --verbose || exit 1 +# From Fedora Rawhide 2018/7 +# (possibly useful, doesn't seem like it will hurt anything): +cat $CWD/patches/0001-Always-install-vbe-and-int10-sdk-headers.patch | patch -p1 --verbose || exit 1 +# From Fedora Rawhide 2018/7, looks like many other distributions have added +# this patch for a long time. Keep an eye out for newer versions though, and +# revisit this if any DE begin to manage secondary GPUs (although none do yet): +cat $CWD/patches/0001-autobind-GPUs-to-the-screen.patch | patch -p1 --verbose || exit 1 +# The upstream nouveau developers recommend this. On newer nvidia cards it works +# better to use the generic modesetting ddx rather than nouveau. +# Reference: https://bugs.freedesktop.org/show_bug.cgi?id=94844 +# Added here 2018/7. +cat $CWD/patches/0001-xfree86-use-modesetting-driver-by-default-on-GeForce.patch | patch -p1 --verbose || exit 1 # Make sure ownerships and permissions are sane: chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # Servers to build: BUILD_SERVERS=" \ @@ -106,14 +124,10 @@ BUILD_SERVERS=" \ --enable-glamor \ --enable-kdrive \ --enable-xephyr \ - --enable-xfbdev \ --enable-xwayland \ --enable-config-udev \ - --enable-kdrive-evdev \ - --enable-kdrive-kbd \ - --enable-kdrive-mouse \ --disable-config-hal \ - --disable-systemd-logind" + --enable-systemd-logind" #MESA_VERSION=${MESA_VERSION:-7.5} # unused in 1.7+ @@ -225,7 +239,7 @@ rmdir $PKG/var 2>/dev/null # While I hate to have X11 take over another generic-sounding # piece of prime filesystem real estate, this symlink will -# direct (for now) proprietary X drivers into the corrent +# direct (for now) proprietary X drivers into the correct # location: ( cd $PKG/usr/lib${LIBDIRSUFFIX} |