diff options
Diffstat (limited to 'source')
24 files changed, 78 insertions, 119 deletions
diff --git a/source/d/gcc/gcc.SlackBuild b/source/d/gcc/gcc.SlackBuild index 3cf15f75..a3ca1c9b 100755 --- a/source/d/gcc/gcc.SlackBuild +++ b/source/d/gcc/gcc.SlackBuild @@ -57,7 +57,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gcc SRCVER=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} VERSION=$(echo $SRCVER | cut -f 1 -d _) -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} # How many jobs to run in parallel: NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -436,6 +436,7 @@ mkdir -p $PKG2/usr/doc/gcc-${VERSION}/libstdc++-v3 ln -sf gcc-$VERSION gcc ln -sf g++ c++ ln -sf gcc cc + ln -sf gcc-$VERSION ${TARGET}-cc ln -sf gcc-$VERSION ${TARGET}-gcc ln -sf gcc-$VERSION ${TARGET}-gcc-$VERSION ln -sf gcc-ar ${TARGET}-gcc-ar diff --git a/source/d/libtool/libtool.SlackBuild b/source/d/libtool/libtool.SlackBuild index ef6cfc45..a42ffd12 100755 --- a/source/d/libtool/libtool.SlackBuild +++ b/source/d/libtool/libtool.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libtool VERSION=${VERSION:-$(echo libtool-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-16} +BUILD=${BUILD:-17} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt index 9b5fbb61..bd58b89b 100644 --- a/source/installer/ChangeLog.txt +++ b/source/installer/ChangeLog.txt @@ -1,3 +1,6 @@ +Sat Apr 10 18:46:46 UTC 2021 + setup: update size estimate of a complete installation to 15+ GB. ++--------------------------+ Tue Mar 9 19:09:33 UTC 2021 Update /etc/nsswitch.conf from the etc package. +--------------------------+ diff --git a/source/installer/sources/initrd/usr/lib/setup/setup b/source/installer/sources/initrd/usr/lib/setup/setup index 54334477..07972314 100755 --- a/source/installer/sources/initrd/usr/lib/setup/setup +++ b/source/installer/sources/initrd/usr/lib/setup/setup @@ -206,7 +206,7 @@ Otherwise, you can pick packages from menus \ using 'expert' or 'menu' mode. Which type of prompting would you like \ to use?" \ 20 76 7 \ - "full" "Install everything (9+ GB of software, RECOMMENDED!)" \ + "full" "Install everything (15+ GB of software, RECOMMENDED!)" \ "terse" "Like 'full', but display one line per package during install" \ "menu" "Choose individual packages from interactive menus" \ "expert" "This is actually the same as the \"menu\" option" \ diff --git a/source/k/kernel-configs/config-generic-5.10.28 b/source/k/kernel-configs/config-generic-5.10.29 index 72b76187..76aaf81f 100644 --- a/source/k/kernel-configs/config-generic-5.10.28 +++ b/source/k/kernel-configs/config-generic-5.10.29 @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.28 Kernel Configuration +# Linux/x86 5.10.29 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.3.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=100200 +CONFIG_GCC_VERSION=100300 CONFIG_LD_VERSION=236010000 CONFIG_CLANG_VERSION=0 CONFIG_LLD_VERSION=0 diff --git a/source/k/kernel-configs/config-generic-5.10.28.x64 b/source/k/kernel-configs/config-generic-5.10.29.x64 index 1feaea54..d98afcf5 100644 --- a/source/k/kernel-configs/config-generic-5.10.28.x64 +++ b/source/k/kernel-configs/config-generic-5.10.29.x64 @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.28 Kernel Configuration +# Linux/x86 5.10.29 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.3.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=100200 +CONFIG_GCC_VERSION=100300 CONFIG_LD_VERSION=236010000 CONFIG_CLANG_VERSION=0 CONFIG_LLD_VERSION=0 @@ -7576,7 +7576,7 @@ CONFIG_DMA_VIRTUAL_CHANNELS=m CONFIG_DMA_ACPI=y CONFIG_ALTERA_MSGDMA=m CONFIG_INTEL_IDMA64=m -CONFIG_INTEL_IDXD=m +# CONFIG_INTEL_IDXD is not set CONFIG_INTEL_IOATDMA=m CONFIG_PLX_DMA=m # CONFIG_XILINX_ZYNQMP_DPDMA is not set diff --git a/source/k/kernel-configs/config-generic-smp-5.10.28-smp b/source/k/kernel-configs/config-generic-smp-5.10.29-smp index 23146264..82502178 100644 --- a/source/k/kernel-configs/config-generic-smp-5.10.28-smp +++ b/source/k/kernel-configs/config-generic-smp-5.10.29-smp @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.28 Kernel Configuration +# Linux/x86 5.10.29 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.3.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=100200 +CONFIG_GCC_VERSION=100300 CONFIG_LD_VERSION=236010000 CONFIG_CLANG_VERSION=0 CONFIG_LLD_VERSION=0 diff --git a/source/k/kernel-configs/config-huge-5.10.28 b/source/k/kernel-configs/config-huge-5.10.29 index 590d5f01..5a4097a5 100644 --- a/source/k/kernel-configs/config-huge-5.10.28 +++ b/source/k/kernel-configs/config-huge-5.10.29 @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.28 Kernel Configuration +# Linux/x86 5.10.29 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.3.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=100200 +CONFIG_GCC_VERSION=100300 CONFIG_LD_VERSION=236010000 CONFIG_CLANG_VERSION=0 CONFIG_LLD_VERSION=0 diff --git a/source/k/kernel-configs/config-huge-5.10.28.x64 b/source/k/kernel-configs/config-huge-5.10.29.x64 index bd25d935..db6eece0 100644 --- a/source/k/kernel-configs/config-huge-5.10.28.x64 +++ b/source/k/kernel-configs/config-huge-5.10.29.x64 @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.28 Kernel Configuration +# Linux/x86 5.10.29 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.3.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=100200 +CONFIG_GCC_VERSION=100300 CONFIG_LD_VERSION=236010000 CONFIG_CLANG_VERSION=0 CONFIG_LLD_VERSION=0 @@ -7576,7 +7576,7 @@ CONFIG_DMA_VIRTUAL_CHANNELS=m CONFIG_DMA_ACPI=y CONFIG_ALTERA_MSGDMA=m CONFIG_INTEL_IDMA64=m -CONFIG_INTEL_IDXD=m +# CONFIG_INTEL_IDXD is not set CONFIG_INTEL_IOATDMA=m CONFIG_PLX_DMA=m # CONFIG_XILINX_ZYNQMP_DPDMA is not set diff --git a/source/k/kernel-configs/config-huge-smp-5.10.28-smp b/source/k/kernel-configs/config-huge-smp-5.10.29-smp index 7d03223a..737b60f5 100644 --- a/source/k/kernel-configs/config-huge-smp-5.10.28-smp +++ b/source/k/kernel-configs/config-huge-smp-5.10.29-smp @@ -1,10 +1,10 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.28 Kernel Configuration +# Linux/x86 5.10.29 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.3.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=100200 +CONFIG_GCC_VERSION=100300 CONFIG_LD_VERSION=236010000 CONFIG_CLANG_VERSION=0 CONFIG_LLD_VERSION=0 diff --git a/source/kde/kde/build/kfilemetadata b/source/kde/kde/build/kfilemetadata index 0cfbf088..d00491fd 100644 --- a/source/kde/kde/build/kfilemetadata +++ b/source/kde/kde/build/kfilemetadata @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kservice b/source/kde/kde/build/kservice index 0cfbf088..d00491fd 100644 --- a/source/kde/kde/build/kservice +++ b/source/kde/kde/build/kservice @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/plasma-wayland-protocols b/source/kde/kde/build/plasma-wayland-protocols index 00750edc..d00491fd 100644 --- a/source/kde/kde/build/plasma-wayland-protocols +++ b/source/kde/kde/build/plasma-wayland-protocols @@ -1 +1 @@ -3 +1 diff --git a/source/l/ffmpeg/ffmpeg.SlackBuild b/source/l/ffmpeg/ffmpeg.SlackBuild index 6ede2d33..f4a443e4 100755 --- a/source/l/ffmpeg/ffmpeg.SlackBuild +++ b/source/l/ffmpeg/ffmpeg.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ffmpeg VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -79,11 +79,12 @@ fi # Unfortunately ffmpeg's configure doesn't support --enable-feature=yes # syntax, so we have to do it the complicated way :/ # Additional optional (autodetected) dependencies are: -# - jack-audio-connection-kit +# - bzip2 # - libva # - libvdpau # - libX11 # - libxcb +# - nvdec/nvenc # - sdl2 # - xz # - zlib @@ -91,21 +92,16 @@ fi libx264="" ; [ "${X264:-no}" != "no" ] && libx264="--enable-libx264" libcelt="" ; [ "${CELT:-no}" != "no" ] && libcelt="--enable-libcelt" libdc1394="" ; [ "${DC1394:-no}" != "no" ] && libdc1394="--enable-libdc1394" -libfrei0r="" ; [ "${FREI0R:-no}" != "no" ] && libfrei0r="--enable-frei0r" libgsm="" ; [ "${GSM:-no}" != "no" ] && libgsm="--enable-libgsm" librtmp="" ; [ "${RTMP:-no}" != "no" ] && librtmp="--enable-librtmp" -libspeex="" ; [ "${SPEEX:-yes}" != "no" ] && libspeex="--enable-libspeex" libxvid="" ; [ "${XVID:-no}" != "no" ] && libxvid="--enable-libxvid" libass="" ; [ "${ASS:-no}" != "no" ] && libass="--enable-libass" -libopenal="" ; [ "${OPENAL:-no}" != "no" ] && libopenal="--enable-openal" libiec61883=""; [ "${IEC61883:-no}" != "no" ] && libiec61883="--enable-libiec61883" libilbc="" ; [ "${ILBC:-no}" != "no" ] && libilbc="--enable-libilbc" libmodplug="" ; [ "${MODPLUG:-no}" != "no" ] && libmodplug="--enable-libmodplug" -libopus="" ; [ "${OPUS:-yes}" != "no" ] && libopus="--enable-libopus" libtwolame="" ; [ "${TWOLAME:-no}" != "no" ] && libtwolame="--enable-libtwolame" ladspa="" ; [ "${LADSPA:-no}" != "no" ] && ladspa="--enable-ladspa" libflite="" ; [ "${FLITE:-no}" != "no" ] && libflite="--enable-libflite" -libvidstab="" ; [ "${VIDSTAB:-no}" != "no" ] && libvidstab="--enable-libvidstab" libx265="" ; [ "${X265:-no}" != "no" ] && libx265="--enable-libx265" libzvbi="" ; [ "${ZVBI:-no}" != "no" ] && libzvbi="--enable-libzvbi" libopencv="" ; [ "${OPENCV:-no}" != "no" ] && libopencv="--enable-libopencv" @@ -113,11 +109,19 @@ libgme="" ; [ "${GME:-no}" != "no" ] && libgme="--enable-libgme" libsnappy="" ; [ "${SNAPPY:-no}" != "no" ] && libsnappy="--enable-libsnappy" libzmq="" ; [ "${ZMQ:-no}" != "no" ] && libzmq="--enable-libzmq" libbs2b="" ; [ "${BS2B:-no}" != "no" ] && libbs2b="--enable-libbs2b" -libebur128="" ; [ "${EBUR128:-no}" != "no" ] && libebur128="--enable-libebur128" rubberband="" ; [ "${RUBBERBAND:-no}" != "no" ] && rubberband="--enable-librubberband" tesseract="" ; [ "${TESSERACT:-no}" != "no" ] && tesseract="--enable-libtesseract" -netcdf="" ; [ "${NETCDF:-no}" != "no" ] && netcdf="--enable-netcdf" +libjack="" ; [ "${JACK:-no}" != "no" ] && libjack="--enable-libjack" +libaom="" ; [ "${AOM:-no}" != "no" ] && libaom="--enable-libaom" +lv2="" ; [ "${LV2:-no}" != "no" ] && lv2="--enable-lv2" +libdav1d="" ; [ "${DAV1D:-no}" != "no" ] && libdav1d="--enable-libdav1d" +rabbitmq="" ; [ "${RABBITMQ:-no}" != "no" ] && rabbitmq="--enable-librabbitmq" +libcodec2="" ; [ "${CODEC2:-no}" != "no" ] && libcodec2="--enable-libcodec2" +libsoxr="" ; [ "${SOXR:-no}" != "no" ] && libsoxr="--enable-libsoxr" +libsrt="" ; [ "${SRT:-no}" != "no" ] && libsrt="--enable-libsrt" +libzimg="" ; [ "${ZIMG:-no}" != "no" ] && libsrt="--enable-libzimg" chromaprint="" ; [ "${CHROMAPRINT:-no}" != "no" ] && chromaprint="--enable-chromaprint" +vapoursynth="" ; [ "${VAPOURSYNTH:-no}" != "no" ] && vapoursynth="--enable-vapoursynth" opencore_amr="" ; [ "${OPENCORE:-no}" != "no" ] && \ opencore_amr="--enable-libopencore-amrnb --enable-libopencore-amrwb" fdk="" ; [ "${FDK_AAC:-no}" != "no" ] && \ @@ -127,6 +131,9 @@ ssl="" ; [ "${OPENSSL:-no}" != "no" ] && \ decklink="" ; [ "${DECKLINK:-no}" != "no" ] && \ { decklink="--enable-decklink" ; \ SLKCFLAGS="$SLKCFLAGS -I/usr/include/decklink" ; } +vulkan="" ; [ "${VULKAN:-no}" != "no" ] && librsvg="--enable-vulkan" +libglslang="" ; [ "${GLSLANG:-no}" != "no" ] && libglslang="--enable-libglslang" +liblensfun="" ; [ "${LENSFUN:-no}" != "no" ] && liblensfun="--enable-liblensfun" # Default enabled features: fontconfig="" ; [ "${FONTCONFIG:-yes}" != "no" ] && fontconfig="--enable-libfontconfig" @@ -148,7 +155,14 @@ opengl="" ; [ "${OPENGL:-yes}" != "no" ] && opengl="--enable-opengl" openjpeg="" ; [ "${JP2:-yes}" != "no" ] && openjpeg="--enable-libopenjpeg" pulse="" ; [ "${PULSEAUDIO:-yes}" != "no" ] && pulse="--enable-libpulse" samba="" ; [ "${SAMBA:-yes}" != "no" ] && samba="--enable-libsmbclient" -wavpack="" ; [ "${WAVPACK:-yes}" != "no" ] && wavpack="--enable-libwavpack" +libfrei0r="" ; [ "${FREI0R:-yes}" != "no" ] && libfrei0r="--enable-frei0r" +libspeex="" ; [ "${SPEEX:-yes}" != "no" ] && libspeex="--enable-libspeex" +libopenal="" ; [ "${OPENAL:-yes}" != "no" ] && libopenal="--enable-openal" +libopus="" ; [ "${OPUS:-yes}" != "no" ] && libopus="--enable-libopus" +libvidstab="" ; [ "${VIDSTAB:-yes}" != "no" ] && libvidstab="--enable-libvidstab" +libxml2="" ; [ "${LIBXML2:-yes}" != "no" ] && libxml2="--enable-libxml2" +librsvg="" ; [ "${LIBRSVG:-yes}" != "no" ] && librsvg="--enable-librsvg" +libdrm="" ; [ "${LIBDRM:-yes}" != "no" ] && libdrm="--enable-libdrm" # No default patent encumbered features: aac="" ; [ "${AAC:-no}" = "no" ] && aac="--disable-encoder=aac" @@ -203,7 +217,6 @@ CXXFLAGS="$SLKCFLAGS" \ $libcdio \ $libcelt \ $libdc1394 \ - $libebur128 \ $libflite \ $libfrei0r \ $libgme \ @@ -231,7 +244,6 @@ CXXFLAGS="$SLKCFLAGS" \ $libzmq \ $libzvbi \ $mp3lame \ - $netcdf \ $opencl \ $opencore_amr \ $opengl \ @@ -241,7 +253,22 @@ CXXFLAGS="$SLKCFLAGS" \ $samba \ $ssl \ $tesseract \ - $wavpack || exit 1 + $liblensfun \ + $libxml2 \ + $librsvg \ + $vulkan \ + $libjack \ + $libglslang \ + $libdrm \ + $libaom \ + $lv2 \ + $libdav1d \ + $rabbitmq \ + $libcodec2 \ + $libsoxr \ + $libsrt \ + $libzimg \ + $vapoursynth || exit 1 make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/l/fuse3/fuse3.SlackBuild b/source/l/fuse3/fuse3.SlackBuild index 2b5e3ab4..c2f8557e 100755 --- a/source/l/fuse3/fuse3.SlackBuild +++ b/source/l/fuse3/fuse3.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=fuse3 SRCNAM=fuse VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/mlt/mlt-opencv.patch b/source/l/mlt/mlt-opencv.patch deleted file mode 100644 index bd486a73..00000000 --- a/source/l/mlt/mlt-opencv.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -aurN mlt-6.24.1/src/modules/opencv/filter_opencv_tracker.cpp mlt-6.24.1.mod/src/modules/opencv/filter_opencv_tracker.cpp ---- mlt-6.24.1/src/modules/opencv/filter_opencv_tracker.cpp 2021-01-05 19:15:52.000000000 +0100 -+++ mlt-6.24.1.mod/src/modules/opencv/filter_opencv_tracker.cpp 2021-01-13 10:29:26.314403046 +0100 -@@ -25,7 +25,11 @@ - typedef struct - { - cv::Ptr<cv::Tracker> tracker; -- cv::Rect2d boundingBox; -+#if CV_VERSION_MAJOR < 4 && CV_VERSION_MINOR < 5 -+ cv::Rect2d boundingBox; -+#else -+ cv::Rect boundingBox; -+#endif - char * algo; - mlt_rect startRect; - bool initialized; -@@ -138,7 +142,7 @@ - { - data->tracker = cv::TrackerKCF::create(); - } --#if CV_VERSION_MAJOR > 3 || (CV_VERSION_MAJOR == 3 && CV_VERSION_MINOR >= 4 && CV_VERSION_REVISION >= 2) -+#if (CV_VERSION_MAJOR > 3 && CV_VERSION_MAJOR < 4 && CV_VERSION_MINOR < 5) || (CV_VERSION_MAJOR == 3 && CV_VERSION_MINOR >= 4 && CV_VERSION_REVISION >= 2) - else if ( !strcmp(data->algo, "CSRT" ) ) - { - data->tracker = cv::TrackerCSRT::create(); -@@ -152,6 +156,7 @@ - { - data->tracker = cv::TrackerMIL::create(); - } -+#if CV_VERSION_MAJOR < 4 && CV_VERSION_MINOR < 5 - else if ( !strcmp(data->algo, "TLD" ) ) - { - data->tracker = cv::TrackerTLD::create(); -@@ -160,6 +165,7 @@ - { - data->tracker = cv::TrackerBoosting::create(); - } -+#endif // CV_VERSION_MAJOR < 4 && CV_VERSION_MINOR < 5 - #else - if ( data->algo == NULL || !strcmp(data->algo, "" ) ) - { -@@ -224,7 +230,12 @@ - if ( data->boundingBox.height <1 ) { - data->boundingBox.height = 50; - } -- if ( data->tracker->init( cvFrame, data->boundingBox ) ) { -+#if CV_VERSION_MAJOR < 4 && CV_VERSION_MINOR < 5 -+ if ( data->tracker->init( cvFrame, data->boundingBox ) ) { -+#else -+ { -+ data->tracker->init( cvFrame, data->boundingBox ); -+#endif - data->initialized = true; - data->analyze = true; - data->last_position = position - 1; diff --git a/source/l/mlt/mlt.SlackBuild b/source/l/mlt/mlt.SlackBuild index dfb422c7..59182265 100755 --- a/source/l/mlt/mlt.SlackBuild +++ b/source/l/mlt/mlt.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mlt VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -88,9 +88,6 @@ find . \ PYTHONSITEPKG=$(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") -# Fix compatibility with newer opencv: -zcat $CWD/mlt-opencv.patch.gz | patch -p1 --verbose || exit 1 - # Configure, build, and install: if [ ! -r configure ]; then if [ -x ./autogen.sh ]; then diff --git a/source/n/dnsmasq/dnsmasq.SlackBuild b/source/n/dnsmasq/dnsmasq.SlackBuild index 329ca627..29a79927 100755 --- a/source/n/dnsmasq/dnsmasq.SlackBuild +++ b/source/n/dnsmasq/dnsmasq.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=dnsmasq VERSION=${VERSION:-$(echo dnsmasq-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} EXTRA_BUILD_OPTS=${EXTRA_BUILD_OPTS:-"-DHAVE_DNSSEC -DHAVE_DBUS -DHAVE_LIBIDN2 -DHAVE_CONNTRACK"} diff --git a/source/n/irssi/irssi.SlackBuild b/source/n/irssi/irssi.SlackBuild index 0c38923b..db34640d 100755 --- a/source/n/irssi/irssi.SlackBuild +++ b/source/n/irssi/irssi.SlackBuild @@ -28,7 +28,7 @@ PKG=$TMP/package-irssi VERSION=${VERSION:-$(echo irssi-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} DIRCD=${VERSION} -BUILD=${BUILD:-6} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -78,9 +78,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# Fix crtl-space killing input with recent glib: -zcat $CWD/irssi.ctrl-space.diff.gz | patch -p1 --verbose || exit 1 - CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/source/n/irssi/irssi.ctrl-space.diff b/source/n/irssi/irssi.ctrl-space.diff deleted file mode 100644 index 01b1eab5..00000000 --- a/source/n/irssi/irssi.ctrl-space.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur irssi-1.2.2/src/fe-text/term-terminfo.c irssi-1.2.2.patched/src/fe-text/term-terminfo.c ---- irssi-1.2.2/src/fe-text/term-terminfo.c 2019-08-29 09:48:46.000000000 -0400 -+++ irssi-1.2.2.patched/src/fe-text/term-terminfo.c 2020-04-26 04:15:02.007493067 -0400 -@@ -673,6 +673,7 @@ - static int input_utf8(const unsigned char *buffer, int size, unichar *result) - { - unichar c = g_utf8_get_char_validated((char *)buffer, size); -+ if(*buffer == '\0') c = (unichar)-1; - - switch (c) { - case (unichar)-1: diff --git a/source/n/postfix/postfix.SlackBuild b/source/n/postfix/postfix.SlackBuild index aa8c7ffa..b3cbf888 100755 --- a/source/n/postfix/postfix.SlackBuild +++ b/source/n/postfix/postfix.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=postfix VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/xfce/exo/exo.url b/source/xfce/exo/exo.url index 4700fa40..e7187feb 100644 --- a/source/xfce/exo/exo.url +++ b/source/xfce/exo/exo.url @@ -1 +1 @@ -http://archive.xfce.org:/src/xfce/exo/4.16/exo-4.16.1.tar.bz2 +http://archive.xfce.org:/src/xfce/exo/4.16/exo-4.16.2.tar.bz2 diff --git a/source/xfce/xfce4-settings/xfce4-settings.SlackBuild b/source/xfce/xfce4-settings/xfce4-settings.SlackBuild index 90e5e5d7..290916b5 100755 --- a/source/xfce/xfce4-settings/xfce4-settings.SlackBuild +++ b/source/xfce/xfce4-settings/xfce4-settings.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xfce4-settings VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) diff --git a/source/xfce/xfce4-settings/xfce4-settings.url b/source/xfce/xfce4-settings/xfce4-settings.url index 317e2181..cac17cc8 100644 --- a/source/xfce/xfce4-settings/xfce4-settings.url +++ b/source/xfce/xfce4-settings/xfce4-settings.url @@ -1 +1 @@ -http://archive.xfce.org/src/xfce/xfce4-settings/4.12/xfce4-settings-4.12.4.tar.bz2 +http://archive.xfce.org/src/xfce/xfce4-settings/4.16/xfce4-settings-4.16.1.tar.bz2 |