summaryrefslogtreecommitdiffstats
path: root/source/d
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2022-11-08 22:21:43 +0000
committer Eric Hameleers <alien@slackware.com>2022-11-09 07:00:18 +0100
commit458c6cc7f8c05cd766aaa02b9468e25a234741d1 (patch)
tree2565a72f03c5a93658fc44b8c053cbe06222d7b1 /source/d
parente0d8e24a7a1e7d6749c7d4b8af834b657fbe3cad (diff)
downloadcurrent-458c6cc7f8c05cd766aaa02b9468e25a234741d1.tar.gz
current-458c6cc7f8c05cd766aaa02b9468e25a234741d1.tar.xz
Tue Nov 8 22:21:43 UTC 202220221108222143
a/bash-5.2.009-x86_64-1.txz: Upgraded. a/glibc-zoneinfo-2022f-noarch-1.txz: Upgraded. a/sed-4.9-x86_64-1.txz: Upgraded. ap/mariadb-10.6.11-x86_64-1.txz: Upgraded. This is a bugfix release. For more information, see: https://mariadb.com/kb/en/mariadb-10-6-11-release-notes d/ccache-4.7.3-x86_64-1.txz: Upgraded. d/meson-0.64.0-x86_64-1.txz: Upgraded. d/patchelf-0.17.0-x86_64-1.txz: Upgraded. kde/bluedevil-5.26.3-x86_64-1.txz: Upgraded. kde/breeze-5.26.3-x86_64-1.txz: Upgraded. kde/breeze-grub-5.26.3-x86_64-1.txz: Upgraded. kde/breeze-gtk-5.26.3-x86_64-1.txz: Upgraded. kde/drkonqi-5.26.3-x86_64-1.txz: Upgraded. kde/kactivitymanagerd-5.26.3-x86_64-1.txz: Upgraded. kde/kde-cli-tools-5.26.3-x86_64-1.txz: Upgraded. kde/kde-gtk-config-5.26.3-x86_64-1.txz: Upgraded. kde/kdecoration-5.26.3-x86_64-1.txz: Upgraded. kde/kdeplasma-addons-5.26.3-x86_64-1.txz: Upgraded. kde/kgamma5-5.26.3-x86_64-1.txz: Upgraded. kde/khotkeys-5.26.3-x86_64-1.txz: Upgraded. kde/kinfocenter-5.26.3-x86_64-1.txz: Upgraded. kde/kmenuedit-5.26.3-x86_64-1.txz: Upgraded. kde/kpipewire-5.26.3-x86_64-1.txz: Upgraded. kde/kscreen-5.26.3-x86_64-1.txz: Upgraded. kde/kscreenlocker-5.26.3-x86_64-1.txz: Upgraded. kde/ksshaskpass-5.26.3-x86_64-1.txz: Upgraded. kde/ksystemstats-5.26.3-x86_64-1.txz: Upgraded. kde/kwallet-pam-5.26.3-x86_64-1.txz: Upgraded. kde/kwayland-integration-5.26.3-x86_64-1.txz: Upgraded. kde/kwin-5.26.3-x86_64-1.txz: Upgraded. kde/kwrited-5.26.3-x86_64-1.txz: Upgraded. kde/layer-shell-qt-5.26.3-x86_64-1.txz: Upgraded. kde/libkscreen-5.26.3-x86_64-1.txz: Upgraded. kde/libksysguard-5.26.3-x86_64-1.txz: Upgraded. kde/milou-5.26.3-x86_64-1.txz: Upgraded. kde/oxygen-5.26.3-x86_64-1.txz: Upgraded. kde/oxygen-sounds-5.26.3-x86_64-1.txz: Upgraded. kde/plasma-browser-integration-5.26.3-x86_64-1.txz: Upgraded. kde/plasma-desktop-5.26.3-x86_64-1.txz: Upgraded. kde/plasma-disks-5.26.3-x86_64-1.txz: Upgraded. kde/plasma-firewall-5.26.3-x86_64-1.txz: Upgraded. kde/plasma-integration-5.26.3-x86_64-1.txz: Upgraded. kde/plasma-nm-5.26.3-x86_64-1.txz: Upgraded. kde/plasma-pa-5.26.3-x86_64-1.txz: Upgraded. kde/plasma-sdk-5.26.3-x86_64-1.txz: Upgraded. kde/plasma-systemmonitor-5.26.3-x86_64-1.txz: Upgraded. kde/plasma-vault-5.26.3-x86_64-1.txz: Upgraded. kde/plasma-workspace-5.26.3-x86_64-1.txz: Upgraded. kde/plasma-workspace-wallpapers-5.26.3-x86_64-1.txz: Upgraded. kde/polkit-kde-agent-1-5.26.3-x86_64-1.txz: Upgraded. kde/powerdevil-5.26.3-x86_64-1.txz: Upgraded. kde/qqc2-breeze-style-5.26.3-x86_64-1.txz: Upgraded. kde/sddm-kcm-5.26.3-x86_64-1.txz: Upgraded. kde/systemsettings-5.26.3-x86_64-1.txz: Upgraded. kde/xdg-desktop-portal-kde-5.26.3-x86_64-1.txz: Upgraded. l/Imath-3.1.6-x86_64-1.txz: Upgraded. l/imagemagick-7.1.0_52-x86_64-1.txz: Upgraded. l/libspectre-0.2.11-x86_64-1.txz: Upgraded. n/mutt-2.2.8-x86_64-1.txz: Upgraded. x/mesa-22.2.3-x86_64-1.txz: Upgraded. x/wayland-protocols-1.28-noarch-1.txz: Upgraded.
Diffstat (limited to 'source/d')
-rw-r--r--source/d/meson/39bb5e07eab736b525abfc66eb5ad0dd626aedc6.patch39
-rwxr-xr-xsource/d/meson/meson.SlackBuild5
-rw-r--r--source/d/meson/meson.import.copy.diff10
3 files changed, 0 insertions, 54 deletions
diff --git a/source/d/meson/39bb5e07eab736b525abfc66eb5ad0dd626aedc6.patch b/source/d/meson/39bb5e07eab736b525abfc66eb5ad0dd626aedc6.patch
deleted file mode 100644
index 0dab0d1e7..000000000
--- a/source/d/meson/39bb5e07eab736b525abfc66eb5ad0dd626aedc6.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 39bb5e07eab736b525abfc66eb5ad0dd626aedc6 Mon Sep 17 00:00:00 2001
-From: Xavier Claessens <xavier.claessens@collabora.com>
-Date: Tue, 11 May 2021 09:18:47 -0400
-Subject: [PATCH] install_scripts: Restore @SOURCE_ROOT@ and @BUILD_ROOT@
- replacements
-
-They are not documented for add_install_script() public API, but gnome
-module relies on it internally.
-
-Fixes: #8744
----
- mesonbuild/backend/backends.py | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
-index ee5f4463a5..ac6d5f0669 100644
---- a/mesonbuild/backend/backends.py
-+++ b/mesonbuild/backend/backends.py
-@@ -1429,7 +1429,19 @@ def generate_target_install(self, d: InstallData) -> None:
- d.targets.append(i)
-
- def generate_custom_install_script(self, d: InstallData) -> None:
-- d.install_scripts = self.build.install_scripts
-+ result: T.List[ExecutableSerialisation] = []
-+ srcdir = self.environment.get_source_dir()
-+ builddir = self.environment.get_build_dir()
-+ for i in self.build.install_scripts:
-+ fixed_args = []
-+ for a in i.cmd_args:
-+ a = a.replace('@SOURCE_ROOT@', srcdir)
-+ a = a.replace('@BUILD_ROOT@', builddir)
-+ fixed_args.append(a)
-+ es = copy.copy(i)
-+ es.cmd_args = fixed_args
-+ result.append(es)
-+ d.install_scripts = result
-
- def generate_header_install(self, d: InstallData) -> None:
- incroot = self.environment.get_includedir()
diff --git a/source/d/meson/meson.SlackBuild b/source/d/meson/meson.SlackBuild
index 1da694352..6e0faba19 100755
--- a/source/d/meson/meson.SlackBuild
+++ b/source/d/meson/meson.SlackBuild
@@ -53,11 +53,6 @@ rm -rf $PKGNAM-$VERSION
tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
cd $PKGNAM-$VERSION || exit 1
-# Upstream fix for GNOME projects build failures:
-zcat $CWD/39bb5e07eab736b525abfc66eb5ad0dd626aedc6.patch.gz | patch -p1 --verbose || exit 1
-# Needs this as well:
-zcat $CWD/meson.import.copy.diff.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.import.copy.diff b/source/d/meson/meson.import.copy.diff
deleted file mode 100644
index d199130df..000000000
--- a/source/d/meson/meson.import.copy.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./mesonbuild/backend/backends.py.orig 2021-04-27 01:50:21.000000000 -0500
-+++ ./mesonbuild/backend/backends.py 2021-05-11 13:55:37.317838468 -0500
-@@ -23,6 +23,7 @@
- import re
- import typing as T
- import hashlib
-+import copy
-
- from .. import build
- from .. import dependencies