9 files changed, 7 insertions, 39 deletions
diff --git a/source/d/meson/meson.SlackBuild b/source/d/meson/meson.SlackBuild
index eaa4b8074..381933778 100755
--- a/source/d/meson/meson.SlackBuild
+++ b/source/d/meson/meson.SlackBuild
@@ -53,9 +53,6 @@ rm -rf $PKGNAM-$VERSION
 tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
 cd $PKGNAM-$VERSION || exit 1
 
-# Fix regression in 0.48.0:
-zcat $CWD/meson.dont.exit.1.if.builddir.is.already.configured.patch.gz | 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 \
diff --git a/source/d/meson/meson.dont.exit.1.if.builddir.is.already.configured.patch b/source/d/meson/meson.dont.exit.1.if.builddir.is.already.configured.patch
deleted file mode 100644
index 37bbec2cd..000000000
--- a/source/d/meson/meson.dont.exit.1.if.builddir.is.already.configured.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 2f0285c7ef3a3dab71e8d6f4df92ef978470c553 Mon Sep 17 00:00:00 2001
-From: Xavier Claessens <xavier.claessens@collabora.com>
-Date: Mon, 24 Sep 2018 09:24:38 -0400
-Subject: [PATCH] Return code 0 when builddir is already configured
-
-This is a regression in Meson 0.48.0, commit 674ae46, Meson used to
-exit(0) when running setup command in a builddir already configured.
-Changing to exit(1) breaks some build tools that does "meson builddir
-&& ninja -C builddir".
-
-Closes #4247.
----
- mesonbuild/mesonmain.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py
-index cd925e51f2..dfad2e7848 100644
---- a/mesonbuild/mesonmain.py
-+++ b/mesonbuild/mesonmain.py
-@@ -113,7 +113,7 @@ def validate_dirs(self, dir1, dir2, reconfigure):
-                       '\nIf build failures persist, manually wipe your build directory to clear any\n'
-                       'stored system data.\n'
-                       '\nTo change option values, run "meson configure" instead.')
--                sys.exit(1)
-+                sys.exit(0)
-         else:
-             if reconfigure:
-                 print('Directory does not contain a valid build tree:\n{}'.format(build_dir))
-
diff --git a/source/d/meson/meson.url b/source/d/meson/meson.url
index 4f96597b8..2103d2ee5 100644
--- a/source/d/meson/meson.url
+++ b/source/d/meson/meson.url
@@ -1 +1 @@
-https://github.com/mesonbuild/meson/releases/download/0.48.0/meson-0.48.0.tar.gz
+https://github.com/mesonbuild/meson/releases/download/0.48.1/meson-0.48.1.tar.gz
diff --git a/source/k/kernel-configs/config-generic-4.14.77 b/source/k/kernel-configs/config-generic-4.14.78
index 3bb87290e..ab5ad3008 100644
--- a/source/k/kernel-configs/config-generic-4.14.77
+++ b/source/k/kernel-configs/config-generic-4.14.78
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.77 Kernel Configuration
+# Linux/x86 4.14.78 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
diff --git a/source/k/kernel-configs/config-generic-4.14.77.x64 b/source/k/kernel-configs/config-generic-4.14.78.x64
index d31f3c126..c38895c37 100644
--- a/source/k/kernel-configs/config-generic-4.14.77.x64
+++ b/source/k/kernel-configs/config-generic-4.14.78.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.77 Kernel Configuration
+# Linux/x86 4.14.78 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
diff --git a/source/k/kernel-configs/config-generic-smp-4.14.77-smp b/source/k/kernel-configs/config-generic-smp-4.14.78-smp
index 9c321d0f4..c92e7d3db 100644
--- a/source/k/kernel-configs/config-generic-smp-4.14.77-smp
+++ b/source/k/kernel-configs/config-generic-smp-4.14.78-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.77 Kernel Configuration
+# Linux/x86 4.14.78 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
diff --git a/source/k/kernel-configs/config-huge-4.14.77 b/source/k/kernel-configs/config-huge-4.14.78
index 804a505be..8e749a65c 100644
--- a/source/k/kernel-configs/config-huge-4.14.77
+++ b/source/k/kernel-configs/config-huge-4.14.78
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.77 Kernel Configuration
+# Linux/x86 4.14.78 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
diff --git a/source/k/kernel-configs/config-huge-4.14.77.x64 b/source/k/kernel-configs/config-huge-4.14.78.x64
index adc076f27..b94730c87 100644
--- a/source/k/kernel-configs/config-huge-4.14.77.x64
+++ b/source/k/kernel-configs/config-huge-4.14.78.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.77 Kernel Configuration
+# Linux/x86 4.14.78 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
diff --git a/source/k/kernel-configs/config-huge-smp-4.14.77-smp b/source/k/kernel-configs/config-huge-smp-4.14.78-smp
index bd54de98b..85caee348 100644
--- a/source/k/kernel-configs/config-huge-smp-4.14.77-smp
+++ b/source/k/kernel-configs/config-huge-smp-4.14.78-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.77 Kernel Configuration
+# Linux/x86 4.14.78 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y