summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rw-r--r--source/k/kernel-configs/config-generic-5.4.2 (renamed from source/k/kernel-configs/config-generic-5.4.1)2
-rw-r--r--source/k/kernel-configs/config-generic-5.4.2.x64 (renamed from source/k/kernel-configs/config-generic-5.4.1.x64)2
-rw-r--r--source/k/kernel-configs/config-generic-smp-5.4.2-smp (renamed from source/k/kernel-configs/config-generic-smp-5.4.1-smp)2
-rw-r--r--source/k/kernel-configs/config-huge-5.4.2 (renamed from source/k/kernel-configs/config-huge-5.4.1)2
-rw-r--r--source/k/kernel-configs/config-huge-5.4.2.x64 (renamed from source/k/kernel-configs/config-huge-5.4.1.x64)2
-rw-r--r--source/k/kernel-configs/config-huge-smp-5.4.2-smp (renamed from source/k/kernel-configs/config-huge-smp-5.4.1-smp)2
-rwxr-xr-xsource/l/libcdio-paranoia/libcdio-paranoia.SlackBuild2
-rw-r--r--source/xap/mozilla-thunderbird/firefox.node.py.patch46
-rwxr-xr-xsource/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild3
9 files changed, 7 insertions, 56 deletions
diff --git a/source/k/kernel-configs/config-generic-5.4.1 b/source/k/kernel-configs/config-generic-5.4.2
index 8d54c71c..eb1b3040 100644
--- a/source/k/kernel-configs/config-generic-5.4.1
+++ b/source/k/kernel-configs/config-generic-5.4.2
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.1 Kernel Configuration
+# Linux/x86 5.4.2 Kernel Configuration
#
#
diff --git a/source/k/kernel-configs/config-generic-5.4.1.x64 b/source/k/kernel-configs/config-generic-5.4.2.x64
index 992f166e..46a8d360 100644
--- a/source/k/kernel-configs/config-generic-5.4.1.x64
+++ b/source/k/kernel-configs/config-generic-5.4.2.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.1 Kernel Configuration
+# Linux/x86 5.4.2 Kernel Configuration
#
#
diff --git a/source/k/kernel-configs/config-generic-smp-5.4.1-smp b/source/k/kernel-configs/config-generic-smp-5.4.2-smp
index f4e0af96..93ab8f47 100644
--- a/source/k/kernel-configs/config-generic-smp-5.4.1-smp
+++ b/source/k/kernel-configs/config-generic-smp-5.4.2-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.1 Kernel Configuration
+# Linux/x86 5.4.2 Kernel Configuration
#
#
diff --git a/source/k/kernel-configs/config-huge-5.4.1 b/source/k/kernel-configs/config-huge-5.4.2
index f5252849..7c913f71 100644
--- a/source/k/kernel-configs/config-huge-5.4.1
+++ b/source/k/kernel-configs/config-huge-5.4.2
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.1 Kernel Configuration
+# Linux/x86 5.4.2 Kernel Configuration
#
#
diff --git a/source/k/kernel-configs/config-huge-5.4.1.x64 b/source/k/kernel-configs/config-huge-5.4.2.x64
index 31eb848f..bd72eb38 100644
--- a/source/k/kernel-configs/config-huge-5.4.1.x64
+++ b/source/k/kernel-configs/config-huge-5.4.2.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.1 Kernel Configuration
+# Linux/x86 5.4.2 Kernel Configuration
#
#
diff --git a/source/k/kernel-configs/config-huge-smp-5.4.1-smp b/source/k/kernel-configs/config-huge-smp-5.4.2-smp
index 60da0237..199765cb 100644
--- a/source/k/kernel-configs/config-huge-smp-5.4.1-smp
+++ b/source/k/kernel-configs/config-huge-smp-5.4.2-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.1 Kernel Configuration
+# Linux/x86 5.4.2 Kernel Configuration
#
#
diff --git a/source/l/libcdio-paranoia/libcdio-paranoia.SlackBuild b/source/l/libcdio-paranoia/libcdio-paranoia.SlackBuild
index 97e59e8f..cdad8429 100755
--- a/source/l/libcdio-paranoia/libcdio-paranoia.SlackBuild
+++ b/source/l/libcdio-paranoia/libcdio-paranoia.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libcdio-paranoia
VERSION=${VERSION:-$(echo $PKGNAM-*.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/xap/mozilla-thunderbird/firefox.node.py.patch b/source/xap/mozilla-thunderbird/firefox.node.py.patch
deleted file mode 100644
index 11e2b843..00000000
--- a/source/xap/mozilla-thunderbird/firefox.node.py.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-
-diff --git a/python/mozbuild/mozbuild/action/node.py b/python/mozbuild/mozbuild/action/node.py
---- a/python/mozbuild/mozbuild/action/node.py
-+++ b/python/mozbuild/mozbuild/action/node.py
-@@ -47,24 +47,35 @@ def execute_node_cmd(node_cmd_list):
- printed to stderr instead.
- """
-
- try:
- printable_cmd = ' '.join(pipes.quote(arg) for arg in node_cmd_list)
- print('Executing "{}"'.format(printable_cmd), file=sys.stderr)
- sys.stderr.flush()
-
-- output = subprocess.check_output(node_cmd_list)
-+ # We need to redirect stderr to a pipe because
-+ # https://github.com/nodejs/node/issues/14752 causes issues with make.
-+ proc = subprocess.Popen(
-+ node_cmd_list, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-+
-+ stdout, stderr = proc.communicate()
-+ retcode = proc.wait()
-+
-+ if retcode != 0:
-+ print(stderr, file=sys.stderr)
-+ sys.stderr.flush()
-+ sys.exit(retcode)
-
- # Process the node script output
- #
- # XXX Starting with an empty list means that node scripts can
- # (intentionally or inadvertently) remove deps. Do we want this?
- deps = []
-- for line in output.splitlines():
-+ for line in stdout.splitlines():
- if 'dep:' in line:
- deps.append(line.replace('dep:', ''))
- else:
- print(line, file=sys.stderr)
- sys.stderr.flush()
-
- return set(deps)
-
-
-
-
-
diff --git a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
index ef593e77..7c8bf81e 100755
--- a/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
+++ b/source/xap/mozilla-thunderbird/mozilla-thunderbird.SlackBuild
@@ -180,9 +180,6 @@ zcat $CWD/tb.ui.scrollToClick.diff.gz | patch -p1 --verbose || exit 1
zcat $CWD/unbreakdocs.diff.gz | patch -p1 --verbose || exit 1
zcat $CWD/thunderbird-rust-1.39.x.patch.gz | patch -p0 --verbose || exit 1
-# Fix a build failure caused by node.js:
-zcat $CWD/firefox.node.py.patch.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