summaryrefslogtreecommitdiffstats
path: root/source/d
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2023-10-21 18:59:54 +0000
committer Eric Hameleers <alien@slackware.com>2023-10-21 21:28:16 +0200
commit5a10543d8a851bab06277ee526f61659653e14ab (patch)
treeebeeaeca33ed75c0a3d87d246fbe479a4ff10d52 /source/d
parent4404603d89e268d756adb687fd03e2a37055a9c9 (diff)
downloadcurrent-5a10543d8a851bab06277ee526f61659653e14ab.tar.gz
current-5a10543d8a851bab06277ee526f61659653e14ab.tar.xz
Sat Oct 21 18:59:54 UTC 202320231021185954
a/btrfs-progs-6.5.3-x86_64-1.txz: Upgraded. d/meson-1.2.3-x86_64-1.txz: Upgraded. d/subversion-1.14.2-x86_64-6.txz: Rebuilt. Recompiled against utf8proc-2.9.0. l/nodejs-20.8.1-x86_64-1.txz: Upgraded. Stick with the (future) LTS release to avoid compatibility issues. Thanks to gildbg. l/utf8proc-2.9.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. n/irssi-1.4.5-x86_64-2.txz: Rebuilt. Recompiled against utf8proc-2.9.0. xap/gnuplot-5.4.10-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/d')
-rw-r--r--source/d/meson/9d1d4ae746ce39d1916dfe71fd6dcc5fce27e828.patch142
-rwxr-xr-xsource/d/meson/meson.SlackBuild4
-rwxr-xr-xsource/d/subversion/subversion.SlackBuild2
3 files changed, 2 insertions, 146 deletions
diff --git a/source/d/meson/9d1d4ae746ce39d1916dfe71fd6dcc5fce27e828.patch b/source/d/meson/9d1d4ae746ce39d1916dfe71fd6dcc5fce27e828.patch
deleted file mode 100644
index 34fa9d8d6..000000000
--- a/source/d/meson/9d1d4ae746ce39d1916dfe71fd6dcc5fce27e828.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From 9d1d4ae746ce39d1916dfe71fd6dcc5fce27e828 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Tue, 3 Oct 2023 16:52:56 +0100
-Subject: [PATCH 7/7] Revert "rust: apply global, project, and environment C
- args to bindgen"
-
-This reverts commit 36210f64f22dc10d324db76bb1a7988c9cd5b14e.
-
-This ended up not doing what was intended - see https://github.com/mesonbuild/meson/issues/12065#issuecomment-1742263677.
-
-Bug: https://bugs.gentoo.org/914989
-Bug: https://bugs.gentoo.org/915014
-Signed-off-by: Sam James <sam@gentoo.org>
----
- mesonbuild/modules/rust.py | 6 ------
- test cases/rust/12 bindgen/meson.build | 18 ------------------
- .../rust/12 bindgen/src/global-project.h | 10 ----------
- test cases/rust/12 bindgen/src/global.c | 5 -----
- test cases/rust/12 bindgen/src/global.rs | 14 --------------
- test cases/rust/12 bindgen/test.json | 5 +----
- 6 files changed, 1 insertion(+), 57 deletions(-)
- delete mode 100644 test cases/rust/12 bindgen/src/global-project.h
- delete mode 100644 test cases/rust/12 bindgen/src/global.c
- delete mode 100644 test cases/rust/12 bindgen/src/global.rs
-
-diff --git a/mesonbuild/modules/rust.py b/mesonbuild/modules/rust.py
-index e6e5c633f..3514412e6 100644
---- a/mesonbuild/modules/rust.py
-+++ b/mesonbuild/modules/rust.py
-@@ -232,12 +232,6 @@ class RustModule(ExtensionModule):
- elif isinstance(s, CustomTarget):
- depends.append(s)
-
-- clang_args.extend(state.global_args.get('c', []))
-- clang_args.extend(state.project_args.get('c', []))
-- cargs = state.get_option('args', state.subproject, lang='c')
-- assert isinstance(cargs, list), 'for mypy'
-- clang_args.extend(cargs)
--
- if self._bindgen_bin is None:
- self._bindgen_bin = state.find_program('bindgen')
-
-diff --git a/test cases/rust/12 bindgen/meson.build b/test cases/rust/12 bindgen/meson.build
-index e7cb5f3db..c05cc0631 100644
---- a/test cases/rust/12 bindgen/meson.build
-+++ b/test cases/rust/12 bindgen/meson.build
-@@ -8,9 +8,6 @@ if not prog_bindgen.found()
- error('MESON_SKIP_TEST bindgen not found')
- endif
-
--add_project_arguments('-DPROJECT_ARG', language : 'c')
--add_global_arguments('-DGLOBAL_ARG', language : 'c')
--
- # This seems to happen on windows when libclang.dll is not in path or is not
- # valid. We must try to process a header file for this to work.
- #
-@@ -84,18 +81,3 @@ test('generated header', rust_bin2)
-
- subdir('sub')
- subdir('dependencies')
--
--gp = rust.bindgen(
-- input : 'src/global-project.h',
-- output : 'global-project.rs',
--)
--
--gp_lib = static_library('gp_lib', 'src/global.c')
--
--gp_exe = executable(
-- 'gp_exe',
-- structured_sources(['src/global.rs', gp]),
-- link_with : gp_lib,
--)
--
--test('global and project arguments', gp_exe)
-diff --git a/test cases/rust/12 bindgen/src/global-project.h b/test cases/rust/12 bindgen/src/global-project.h
-deleted file mode 100644
-index 6084e8ed6..000000000
---- a/test cases/rust/12 bindgen/src/global-project.h
-+++ /dev/null
-@@ -1,10 +0,0 @@
--#ifndef GLOBAL_ARG
--char * success(void);
--#endif
--#ifndef PROJECT_ARG
--char * success(void);
--#endif
--#ifndef CMD_ARG
--char * success(void);
--#endif
--int success(void);
-diff --git a/test cases/rust/12 bindgen/src/global.c b/test cases/rust/12 bindgen/src/global.c
-deleted file mode 100644
-index 10f6676f7..000000000
---- a/test cases/rust/12 bindgen/src/global.c
-+++ /dev/null
-@@ -1,5 +0,0 @@
--#include "src/global-project.h"
--
--int success(void) {
-- return 0;
--}
-diff --git a/test cases/rust/12 bindgen/src/global.rs b/test cases/rust/12 bindgen/src/global.rs
-deleted file mode 100644
-index 4b70b1ecc..000000000
---- a/test cases/rust/12 bindgen/src/global.rs
-+++ /dev/null
-@@ -1,14 +0,0 @@
--// SPDX-license-identifer: Apache-2.0
--// Copyright © 2023 Intel Corporation
--
--#![allow(non_upper_case_globals)]
--#![allow(non_camel_case_types)]
--#![allow(non_snake_case)]
--
--include!("global-project.rs");
--
--fn main() {
-- unsafe {
-- std::process::exit(success());
-- };
--}
-diff --git a/test cases/rust/12 bindgen/test.json b/test cases/rust/12 bindgen/test.json
-index b3a758562..f94ee85f9 100644
---- a/test cases/rust/12 bindgen/test.json
-+++ b/test cases/rust/12 bindgen/test.json
-@@ -1,10 +1,7 @@
- {
-- "env": {
-- "CFLAGS": "-DCMD_ARG"
-- },
- "stdout": [
- {
-- "line": "test cases/rust/12 bindgen/meson.build:30: WARNING: Project targets '>= 0.63' but uses feature introduced in '1.0.0': \"rust.bindgen\" keyword argument \"include_directories\" of type array[str]."
-+ "line": "test cases/rust/12 bindgen/meson.build:27: WARNING: Project targets '>= 0.63' but uses feature introduced in '1.0.0': \"rust.bindgen\" keyword argument \"include_directories\" of type array[str]."
- }
- ]
- }
---
-2.42.0
-
-
diff --git a/source/d/meson/meson.SlackBuild b/source/d/meson/meson.SlackBuild
index 25d08985a..6e0faba19 100755
--- a/source/d/meson/meson.SlackBuild
+++ b/source/d/meson/meson.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=meson
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -60,8 +60,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
-cat $CWD/9d1d4ae746ce39d1916dfe71fd6dcc5fce27e828.patch | patch -p1 --verbose || exit 1
-
python3 setup.py install --root=$PKG || exit 1
mv $PKG/usr/share/man $PKG/usr/
diff --git a/source/d/subversion/subversion.SlackBuild b/source/d/subversion/subversion.SlackBuild
index a297f08b8..d600c2235 100755
--- a/source/d/subversion/subversion.SlackBuild
+++ b/source/d/subversion/subversion.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=subversion
VERSION=${VERSION:-$(echo subversion-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-6}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then