summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rwxr-xr-xsource/ap/dmidecode/dmidecode.SlackBuild2
-rwxr-xr-xsource/ap/vim/vim-gvim.SlackBuild2
-rwxr-xr-xsource/ap/vim/vim.SlackBuild2
-rw-r--r--source/installer/ChangeLog.txt3
-rwxr-xr-xsource/installer/build_installer.sh4
-rw-r--r--source/k/kernel-configs/config-generic-5.18.8 (renamed from source/k/kernel-configs/config-generic-5.18.7)3
-rw-r--r--source/k/kernel-configs/config-generic-5.18.8.x64 (renamed from source/k/kernel-configs/config-generic-5.18.7.x64)3
-rw-r--r--source/k/kernel-configs/config-generic-smp-5.18.8-smp (renamed from source/k/kernel-configs/config-generic-smp-5.18.7-smp)3
-rw-r--r--source/k/kernel-configs/config-huge-5.18.8 (renamed from source/k/kernel-configs/config-huge-5.18.7)3
-rw-r--r--source/k/kernel-configs/config-huge-5.18.8.x64 (renamed from source/k/kernel-configs/config-huge-5.18.7.x64)3
-rw-r--r--source/k/kernel-configs/config-huge-smp-5.18.8-smp (renamed from source/k/kernel-configs/config-huge-smp-5.18.7-smp)3
-rw-r--r--source/xap/mozilla-thunderbird/double_t.x86.diff13
-rwxr-xr-xsource/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild14
13 files changed, 46 insertions, 12 deletions
diff --git a/source/ap/dmidecode/dmidecode.SlackBuild b/source/ap/dmidecode/dmidecode.SlackBuild
index 4a5a5cf1..eafc26ca 100755
--- a/source/ap/dmidecode/dmidecode.SlackBuild
+++ b/source/ap/dmidecode/dmidecode.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=dmidecode
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/ap/vim/vim-gvim.SlackBuild b/source/ap/vim/vim-gvim.SlackBuild
index 1cfc9a19..9307e18e 100755
--- a/source/ap/vim/vim-gvim.SlackBuild
+++ b/source/ap/vim/vim-gvim.SlackBuild
@@ -30,7 +30,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=vim-gvim
-VIMBRANCH=8.2
+VIMBRANCH=9.0
VERSION=$(echo vim-${VIMBRANCH}*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
BUILD=${BUILD:-1}
diff --git a/source/ap/vim/vim.SlackBuild b/source/ap/vim/vim.SlackBuild
index 64ad16bb..503f5cf6 100755
--- a/source/ap/vim/vim.SlackBuild
+++ b/source/ap/vim/vim.SlackBuild
@@ -23,7 +23,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=vim
-VIMBRANCH=8.2
+VIMBRANCH=9.0
CTAGSVER=5.8
BUILD=${BUILD:-1}
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt
index de91c0c4..3b32fc69 100644
--- a/source/installer/ChangeLog.txt
+++ b/source/installer/ChangeLog.txt
@@ -1,3 +1,6 @@
+Wed Jun 29 19:13:25 UTC 2022
+ Added smartctl, smartctl.8, and dmidecode.8.
++--------------------------+
Tue Jun 14 08:08:08 UTC 2022
Added liblz4 for fsck.f2fs. Thanks to Brent Earl.
+--------------------------+
diff --git a/source/installer/build_installer.sh b/source/installer/build_installer.sh
index 14856a42..44d613cf 100755
--- a/source/installer/build_installer.sh
+++ b/source/installer/build_installer.sh
@@ -941,6 +941,7 @@ a/procps-ng \
a/reiserfsprogs \
a/sed \
a/shadow \
+a/smartmontools \
a/sysfsutils \
a/syslinux \
a/tar \
@@ -1211,6 +1212,7 @@ cp --remove-destination -fa${VERBOSE1} ${EXTRA_PKGS_USRSBIN} \
dmidecode \
mount.cifs \
sm-notify \
+ smartctl \
sparsify \
umount.cifs \
zerofree \
@@ -2305,6 +2307,8 @@ if [ -d usr/man ]; then
man1/plzip.1.bz2 \
man1/neofetch.1.bz2 \
man1/nvme.1.bz2 \
+ man8/dmidecode.8.bz2 \
+ man8/smartctl.8.bz2 \
; do
mkdir -p man/$(dirname $manpage)
cp -a man.full/$manpage man/$manpage
diff --git a/source/k/kernel-configs/config-generic-5.18.7 b/source/k/kernel-configs/config-generic-5.18.8
index 89a8fdbe..291b25c6 100644
--- a/source/k/kernel-configs/config-generic-5.18.7
+++ b/source/k/kernel-configs/config-generic-5.18.8
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.18.7 Kernel Configuration
+# Linux/x86 5.18.8 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
CONFIG_CC_IS_GCC=y
@@ -7738,6 +7738,7 @@ CONFIG_TYPEC_TCPCI=m
CONFIG_TYPEC_RT1711H=m
CONFIG_TYPEC_TCPCI_MAXIM=m
CONFIG_TYPEC_FUSB302=m
+CONFIG_TYPEC_WCOVE=m
CONFIG_TYPEC_UCSI=m
CONFIG_UCSI_CCG=m
CONFIG_UCSI_ACPI=m
diff --git a/source/k/kernel-configs/config-generic-5.18.7.x64 b/source/k/kernel-configs/config-generic-5.18.8.x64
index 0e63d068..21c86457 100644
--- a/source/k/kernel-configs/config-generic-5.18.7.x64
+++ b/source/k/kernel-configs/config-generic-5.18.8.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.18.7 Kernel Configuration
+# Linux/x86 5.18.8 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
CONFIG_CC_IS_GCC=y
@@ -7701,6 +7701,7 @@ CONFIG_TYPEC_TCPCI=m
CONFIG_TYPEC_RT1711H=m
CONFIG_TYPEC_TCPCI_MAXIM=m
CONFIG_TYPEC_FUSB302=m
+CONFIG_TYPEC_WCOVE=m
CONFIG_TYPEC_UCSI=m
CONFIG_UCSI_CCG=m
CONFIG_UCSI_ACPI=m
diff --git a/source/k/kernel-configs/config-generic-smp-5.18.7-smp b/source/k/kernel-configs/config-generic-smp-5.18.8-smp
index 2694c2b2..557a698d 100644
--- a/source/k/kernel-configs/config-generic-smp-5.18.7-smp
+++ b/source/k/kernel-configs/config-generic-smp-5.18.8-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.18.7 Kernel Configuration
+# Linux/x86 5.18.8 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
CONFIG_CC_IS_GCC=y
@@ -7780,6 +7780,7 @@ CONFIG_TYPEC_TCPCI=m
CONFIG_TYPEC_RT1711H=m
CONFIG_TYPEC_TCPCI_MAXIM=m
CONFIG_TYPEC_FUSB302=m
+CONFIG_TYPEC_WCOVE=m
CONFIG_TYPEC_UCSI=m
CONFIG_UCSI_CCG=m
CONFIG_UCSI_ACPI=m
diff --git a/source/k/kernel-configs/config-huge-5.18.7 b/source/k/kernel-configs/config-huge-5.18.8
index 403dabcb..6acc395a 100644
--- a/source/k/kernel-configs/config-huge-5.18.7
+++ b/source/k/kernel-configs/config-huge-5.18.8
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.18.7 Kernel Configuration
+# Linux/x86 5.18.8 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
CONFIG_CC_IS_GCC=y
@@ -7738,6 +7738,7 @@ CONFIG_TYPEC_TCPCI=m
CONFIG_TYPEC_RT1711H=m
CONFIG_TYPEC_TCPCI_MAXIM=m
CONFIG_TYPEC_FUSB302=m
+CONFIG_TYPEC_WCOVE=m
CONFIG_TYPEC_UCSI=m
CONFIG_UCSI_CCG=m
CONFIG_UCSI_ACPI=m
diff --git a/source/k/kernel-configs/config-huge-5.18.7.x64 b/source/k/kernel-configs/config-huge-5.18.8.x64
index 005a8d22..a67a8fe8 100644
--- a/source/k/kernel-configs/config-huge-5.18.7.x64
+++ b/source/k/kernel-configs/config-huge-5.18.8.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.18.7 Kernel Configuration
+# Linux/x86 5.18.8 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
CONFIG_CC_IS_GCC=y
@@ -7701,6 +7701,7 @@ CONFIG_TYPEC_TCPCI=m
CONFIG_TYPEC_RT1711H=m
CONFIG_TYPEC_TCPCI_MAXIM=m
CONFIG_TYPEC_FUSB302=m
+CONFIG_TYPEC_WCOVE=m
CONFIG_TYPEC_UCSI=m
CONFIG_UCSI_CCG=m
CONFIG_UCSI_ACPI=m
diff --git a/source/k/kernel-configs/config-huge-smp-5.18.7-smp b/source/k/kernel-configs/config-huge-smp-5.18.8-smp
index 61f1f8c8..53514773 100644
--- a/source/k/kernel-configs/config-huge-smp-5.18.7-smp
+++ b/source/k/kernel-configs/config-huge-smp-5.18.8-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.18.7 Kernel Configuration
+# Linux/x86 5.18.8 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
CONFIG_CC_IS_GCC=y
@@ -7780,6 +7780,7 @@ CONFIG_TYPEC_TCPCI=m
CONFIG_TYPEC_RT1711H=m
CONFIG_TYPEC_TCPCI_MAXIM=m
CONFIG_TYPEC_FUSB302=m
+CONFIG_TYPEC_WCOVE=m
CONFIG_TYPEC_UCSI=m
CONFIG_UCSI_CCG=m
CONFIG_UCSI_ACPI=m
diff --git a/source/xap/mozilla-thunderbird/double_t.x86.diff b/source/xap/mozilla-thunderbird/double_t.x86.diff
new file mode 100644
index 00000000..12f04c37
--- /dev/null
+++ b/source/xap/mozilla-thunderbird/double_t.x86.diff
@@ -0,0 +1,13 @@
+--- ./modules/fdlibm/src/math_private.h.orig 2022-06-27 21:04:57.000000000 -0500
++++ ./modules/fdlibm/src/math_private.h 2022-06-30 13:41:46.761170878 -0500
+@@ -30,8 +30,8 @@
+ * Adapted from https://github.com/freebsd/freebsd-src/search?q=__double_t
+ */
+
+-typedef double __double_t;
+-typedef __double_t double_t;
++typedef long double __double_t;
++typedef long double double_t;
+
+ /*
+ * The original fdlibm code used statements like:
diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
index 7762dd91..1c8b3032 100755
--- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
+++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2011, 2012, 2014, 2016, 2017, 2018, 2019, 2020, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2014, 2016, 2017, 2018, 2019, 2020, 2021, 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -107,8 +107,8 @@ else
fi
# Choose a compiler (gcc/g++ or clang/clang++):
-export CC=${CC:-clang}
-export CXX=${CXX:-clang++}
+export CC=${CC:-gcc}
+export CXX=${CXX:-g++}
# Set linker to use:
if [ "$CC" = "clang" -a "$(which lld 2> /dev/null)" = "/usr/bin/lld" ]; then
@@ -172,6 +172,11 @@ zcat $CWD/tb.ui.scrollToClick.diff.gz | patch -p1 --verbose || exit 1
# Bypass a test that fails the build:
zcat $CWD/gkrust.a.no.networking.check.diff.gz | patch -p1 --verbose || exit 1
+# Fix header mismatch on x86:
+if [ "$ARCH" = "i686" ]; then
+ zcat $CWD/double_t.x86.diff.gz | patch -p1 --verbose || exit 1
+fi
+
# Fetch localization, if requested:
if [ ! -z $MOZLOCALIZE ]; then
LOC_TAG="THUNDERBIRD_$( echo $VERSION | tr \. _ )_RELEASE"
@@ -205,6 +210,9 @@ OPTIONS="\
--with-system-nss \
--with-system-nspr \
--enable-alsa \
+ --with-unsigned-addon-scopes=app,system \
+ --without-wasm-sandboxed-libraries \
+ --allow-addon-sideload \
--enable-application=comm/mail \
--enable-default-toolkit=cairo-gtk3-wayland \
--enable-linker=$LINKER \