* [PR PATCH] meson: update to 0.63.1.
@ 2022-09-02 20:47 paper42
2022-09-02 21:13 ` [PR REVIEW] " eli-schwartz
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: paper42 @ 2022-09-02 20:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1271 bytes --]
There is a new pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages meson-0.63
https://github.com/void-linux/void-packages/pull/39071
meson: update to 0.63.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
depends on #39070 and #38957
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39071.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-meson-0.63-39071.patch --]
[-- Type: text/x-diff, Size: 20303 bytes --]
From 48d6d309c4b1ba02161ea27faabc52e67107616b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 6 Aug 2022 18:23:29 +0200
Subject: [PATCH 1/7] meson: update to 0.63.1.
---
srcpkgs/meson/patches/10702.patch | 59 -------------------------------
srcpkgs/meson/template | 8 ++---
2 files changed, 4 insertions(+), 63 deletions(-)
delete mode 100644 srcpkgs/meson/patches/10702.patch
diff --git a/srcpkgs/meson/patches/10702.patch b/srcpkgs/meson/patches/10702.patch
deleted file mode 100644
index 7ab15ebbc007..000000000000
--- a/srcpkgs/meson/patches/10702.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 869b95d0c2a854d73db0fceb7d0dbee9dc88cf46 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz@archlinux.org>
-Date: Tue, 16 Aug 2022 22:42:53 -0400
-Subject: [PATCH] minstall: do not trample install_mode by rpath fixer
-
-install_mode can include the setuid bit, which has the special property
-(mentioned in the set_mode logic for minstall itself) of needing to come
-last, because it "will get wiped by chmod" (or at least chown).
-
-In fact, it's not just chown that wipes setuid, but other changes as
-well, such as the file contents. This is not an issue for install_data /
-custom_target, but for compiled outputs, we run depfixer to handle
-rpaths. This may or may not cause edits to the binary, depending on
-whether we have a build rpath to wipe, or an install rpath to add. (We
-also may run `strip`, but that external program already has its own mode
-restoration logic.)
-
-Fix this by switching the order of operations around, so that setting
-the permissions happens last.
-
-Fixes https://github.com/void-linux/void-packages/issues/38682
----
- mesonbuild/minstall.py | 3 ++-
- test cases/common/190 install_mode/meson.build | 1 +
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
-index 551f909c80d..a810ccbbd40 100644
---- a/mesonbuild/minstall.py
-+++ b/mesonbuild/minstall.py
-@@ -693,7 +693,6 @@ def install_targets(self, d: InstallData, dm: DirMaker, destdir: str, fullprefix
- raise MesonException(f'File {fname!r} could not be found')
- elif os.path.isfile(fname):
- file_copied = self.do_copyfile(fname, outname, makedirs=(dm, outdir))
-- self.set_mode(outname, install_mode, d.install_umask)
- if should_strip and d.strip_bin is not None:
- if fname.endswith('.jar'):
- self.log('Not stripping jar target: {}'.format(os.path.basename(fname)))
-@@ -723,6 +722,8 @@ def install_targets(self, d: InstallData, dm: DirMaker, destdir: str, fullprefix
- pass
- else:
- raise
-+ # file mode needs to be set last, after strip/depfixer editing
-+ self.set_mode(outname, install_mode, d.install_umask)
-
- def rebuild_all(wd: str) -> bool:
- if not (Path(wd) / 'build.ninja').is_file():
-diff --git a/test cases/common/190 install_mode/meson.build b/test cases/common/190 install_mode/meson.build
-index cae1e91aba3..e877ba75757 100644
---- a/test cases/common/190 install_mode/meson.build
-+++ b/test cases/common/190 install_mode/meson.build
-@@ -51,6 +51,7 @@ install_man('foo.1',
- executable('trivialprog',
- sources : 'trivial.c',
- install : true,
-+ build_rpath: meson.current_build_dir(),
- install_mode : ['rwxr-sr-x', 'root', 'root'])
-
- # test install_mode in static_library
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index d3243fe16052..3cec0fc58d54 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,12 +1,12 @@
# Template file for 'meson'
pkgname=meson
-version=0.62.2
-revision=2
+version=0.63.1
+revision=1
build_style=python3-module
hostmakedepends="python3-devel python3-setuptools"
depends="ninja python3-setuptools"
checkdepends="glib-devel gobject-introspection ninja
- gcc-objc++ clang qt5-devel cmake llvm git pkg-config vala python-devel
+ gcc-objc++ clang qt5-devel cmake llvm git pkg-config vala python3-devel
cross-arm-linux-gnueabihf"
short_desc="Super fast build system"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -14,7 +14,7 @@ license="Apache-2.0"
homepage="https://mesonbuild.com"
changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=a7669e4c4110b06b743d57cc5d6432591a6677ef2402139fe4f3d42ac13380b0
+checksum=06fe13297213d6ff0121c5d5aab25a56ef938ffec57414ed6086fda272cb65e9
# XXX: sanitizers aren't available on musl
if [ "$XBPS_TARGET_LIBC" = glibc ]; then
From b9b2bfe55d614b51588eed0906eacc81f1eb6f23 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 6 Aug 2022 18:23:26 +0200
Subject: [PATCH 2/7] budgie-desktop: fix build with meson 0.63
---
.../budgie-desktop/patches/meson-0.63.patch | 33 +++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 srcpkgs/budgie-desktop/patches/meson-0.63.patch
diff --git a/srcpkgs/budgie-desktop/patches/meson-0.63.patch b/srcpkgs/budgie-desktop/patches/meson-0.63.patch
new file mode 100644
index 000000000000..07b36c8dda55
--- /dev/null
+++ b/srcpkgs/budgie-desktop/patches/meson-0.63.patch
@@ -0,0 +1,33 @@
+From 078ee1b05436adc67ba6175345ebdfd5c0463195 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Mon, 20 Jun 2022 19:59:35 -0400
+Subject: [PATCH] fix broken C std for gvc subproject
+
+Historically, Meson didn't know how to set c_std for a subproject at
+all. Meson 0.63.0 adds support for this, so the default_options kwarg to
+subproject now begins to respect this.
+
+budgie-desktop uses c11, but artificially sets c89 for the gvc
+submodule. However, this does not actually work... the build then errors
+out when trying to build
+subprojects/gvc/test-audio-device-selection.p/test-audio-device-selection.c.o
+
+Remove the faulty argument.
+
+Fixes regression in commit 3d6d71c167dd9742cd072e7e6a3453c23ebb2658.
+---
+ meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 763d5a1b..3c52b8f5 100644
+--- a/meson.build
++++ b/meson.build
+@@ -130,7 +130,6 @@ with_polkit = get_option('with-polkit')
+ # Get gvc built before we do anything
+ gvc = subproject('gvc',
+ default_options: [
+- 'c_std=c89',
+ 'static=false',
+ 'pkglibdir=@0@'.format(rpath_libdir),
+ 'package_name=' + meson.project_name(),
From 4267c7ef28b6ba25a3f27018fa702a49b2c5358f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 28 Aug 2022 06:26:11 -0400
Subject: [PATCH 3/7] rizin: update to 0.4.0.
---
common/shlibs | 50 ++++++++++++++++++++++--------------------
srcpkgs/rizin/template | 9 +++++---
2 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 21a43eac0a7d..af208b7ceb33 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4123,30 +4123,32 @@ mod_spatialite.so.7 libspatialite-5.0.1_1
libSvtAv1Enc.so.1 libsvt-av1-1.0.0_1
libSvtAv1Dec.so.0 libsvt-av1-0.9.0_1
libyascreen.so.0 yascreen-1.86_1
-librz_bp.so.0.3.4 rizin-0.3.4_1
-librz_reg.so.0.3.4 rizin-0.3.4_1
-librz_debug.so.0.3.4 rizin-0.3.4_1
-librz_hash.so.0.3.4 rizin-0.3.4_1
-librz_config.so.0.3.4 rizin-0.3.4_1
-librz_parse.so.0.3.4 rizin-0.3.4_1
-librz_asm.so.0.3.4 rizin-0.3.4_1
-librz_type.so.0.3.4 rizin-0.3.4_1
-librz_socket.so.0.3.4 rizin-0.3.4_1
-librz_egg.so.0.3.4 rizin-0.3.4_1
-librz_core.so.0.3.4 rizin-0.3.4_1
-librz_diff.so.0.3.4 rizin-0.3.4_1
-librz_main.so.0.3.4 rizin-0.3.4_1
-librz_cons.so.0.3.4 rizin-0.3.4_1
-librz_crypto.so.0.3.4 rizin-0.3.4_1
-librz_analysis.so.0.3.4 rizin-0.3.4_1
-librz_syscall.so.0.3.4 rizin-0.3.4_1
-librz_io.so.0.3.4 rizin-0.3.4_1
-librz_flag.so.0.3.4 rizin-0.3.4_1
-librz_magic.so.0.3.4 rizin-0.3.4_1
-librz_util.so.0.3.4 rizin-0.3.4_1
-librz_lang.so.0.3.4 rizin-0.3.4_1
-librz_search.so.0.3.4 rizin-0.3.4_1
-librz_bin.so.0.3.4 rizin-0.3.4_1
+librz_analysis.so.0.4 rizin-0.4.0_1
+librz_asm.so.0.4 rizin-0.4.0_1
+librz_bin.so.0.4 rizin-0.4.0_1
+librz_bp.so.0.4 rizin-0.4.0_1
+librz_config.so.0.4 rizin-0.4.0_1
+librz_cons.so.0.4 rizin-0.4.0_1
+librz_core.so.0.4 rizin-0.4.0_1
+librz_crypto.so.0.4 rizin-0.4.0_1
+librz_debug.so.0.4 rizin-0.4.0_1
+librz_demangler.so.0.4 rizin-0.4.0_1
+librz_diff.so.0.4 rizin-0.4.0_1
+librz_egg.so.0.4 rizin-0.4.0_1
+librz_flag.so.0.4 rizin-0.4.0_1
+librz_hash.so.0.4 rizin-0.4.0_1
+librz_io.so.0.4 rizin-0.4.0_1
+librz_lang.so.0.4 rizin-0.4.0_1
+librz_magic.so.0.4 rizin-0.4.0_1
+librz_main.so.0.4 rizin-0.4.0_1
+librz_parse.so.0.4 rizin-0.4.0_1
+librz_reg.so.0.4 rizin-0.4.0_1
+librz_search.so.0.4 rizin-0.4.0_1
+librz_sign.so.0.4 rizin-0.4.0_1
+librz_socket.so.0.4 rizin-0.4.0_1
+librz_syscall.so.0.4 rizin-0.4.0_1
+librz_type.so.0.4 rizin-0.4.0_1
+librz_util.so.0.4 rizin-0.4.0_1
libaravis-0.8.so.0 libaravis-0.8.21_1
libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1
libnvme.so.1 libnvme-1.0_1
diff --git a/srcpkgs/rizin/template b/srcpkgs/rizin/template
index 40c2dffeb9ae..8c2e0711086d 100644
--- a/srcpkgs/rizin/template
+++ b/srcpkgs/rizin/template
@@ -1,13 +1,13 @@
# Template file for 'rizin'
pkgname=rizin
-version=0.3.4
+version=0.4.0
revision=1
wrksrc="${pkgname}-v${version}"
build_style=meson
configure_args="-D use_sys_capstone=enabled -D use_capstone_version=v4
-D use_sys_magic=enabled -D use_sys_libzip=enabled -D use_sys_zlib=enabled
-D use_sys_lz4=enabled -D use_sys_xxhash=enabled -D use_sys_openssl=enabled
- -D use_sys_tree_sitter=enabled -D use_libuv=true -D use_webui=true -D local=disabled"
+ -D use_sys_tree_sitter=enabled -D use_libuv=true -D local=disabled"
hostmakedepends="pkg-config"
makedepends="capstone-devel libzip-devel zlib-devel liblz4-devel xxHash-devel libuv-devel
tree-sitter-devel file-devel openssl-devel"
@@ -16,7 +16,9 @@ maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
license="LGPL-3.0-only"
homepage="https://github.com/rizinorg/rizin"
distfiles="https://github.com/rizinorg/${pkgname}/releases/download/v${version}/${pkgname}-src-v${version}.tar.xz"
-checksum=eea49b396387c09d19705aab02a617cdb15682fca67f101ff2b27eef94a710e9
+checksum=09eba8684fe813cf42a716b59a86d3d65afce013d7e8b275e145e849d3366b5a
+# requires some external files, not clear where they come from
+make_check=no
rizin-devel_package() {
@@ -26,5 +28,6 @@ rizin-devel_package() {
vmove "usr/lib/*.so"
vmove usr/include/librz
vmove usr/lib/pkgconfig
+ vmove usr/lib/cmake
}
}
From ecbb62600a5378654a77b53eb11607ed3ba07e44 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 28 Aug 2022 06:27:02 -0400
Subject: [PATCH 4/7] cutter: update to 2.1.0.
---
srcpkgs/cutter-devel | 1 +
.../cutter/patches/ksyntaxhighlighting.patch | 43 -------------------
srcpkgs/cutter/template | 22 +++++++---
3 files changed, 16 insertions(+), 50 deletions(-)
create mode 120000 srcpkgs/cutter-devel
delete mode 100644 srcpkgs/cutter/patches/ksyntaxhighlighting.patch
diff --git a/srcpkgs/cutter-devel b/srcpkgs/cutter-devel
new file mode 120000
index 000000000000..834ab3347b6f
--- /dev/null
+++ b/srcpkgs/cutter-devel
@@ -0,0 +1 @@
+cutter
\ No newline at end of file
diff --git a/srcpkgs/cutter/patches/ksyntaxhighlighting.patch b/srcpkgs/cutter/patches/ksyntaxhighlighting.patch
deleted file mode 100644
index 461a3dec9d58..000000000000
--- a/srcpkgs/cutter/patches/ksyntaxhighlighting.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/src/common/Configuration.cpp b/src/common/Configuration.cpp
-index 3c309e83..47019165 100644
---- a/src/common/Configuration.cpp
-+++ b/src/common/Configuration.cpp
-@@ -7,9 +7,9 @@
- #include <QApplication>
-
- #ifdef CUTTER_ENABLE_KSYNTAXHIGHLIGHTING
--# include <KSyntaxHighlighting/repository.h>
--# include <KSyntaxHighlighting/theme.h>
--# include <KSyntaxHighlighting/definition.h>
-+# include <repository.h>
-+# include <theme.h>
-+# include <definition.h>
- #endif
-
- #include "common/ColorThemeWorker.h"
-diff --git a/src/common/SyntaxHighlighter.cpp b/src/common/SyntaxHighlighter.cpp
-index 64a2038e..eebb59f9 100644
---- a/src/common/SyntaxHighlighter.cpp
-+++ b/src/common/SyntaxHighlighter.cpp
-@@ -5,7 +5,7 @@
-
- # include "Configuration.h"
-
--# include <KSyntaxHighlighting/theme.h>
-+# include <theme.h>
-
- SyntaxHighlighter::SyntaxHighlighter(QTextDocument *document)
- : KSyntaxHighlighting::SyntaxHighlighter(document)
-diff --git a/src/common/SyntaxHighlighter.h b/src/common/SyntaxHighlighter.h
-index b9e88970..a21b4ec2 100644
---- a/src/common/SyntaxHighlighter.h
-+++ b/src/common/SyntaxHighlighter.h
-@@ -10,7 +10,7 @@
-
- #ifdef CUTTER_ENABLE_KSYNTAXHIGHLIGHTING
-
--# include <KSyntaxHighlighting/syntaxhighlighter.h>
-+# include <syntaxhighlighter.h>
-
- class SyntaxHighlighter : public KSyntaxHighlighting::SyntaxHighlighter
- {
diff --git a/srcpkgs/cutter/template b/srcpkgs/cutter/template
index a2d6ca506827..c5b5c53045cb 100644
--- a/srcpkgs/cutter/template
+++ b/srcpkgs/cutter/template
@@ -1,10 +1,10 @@
# Template file for 'cutter'
pkgname=cutter
-version=2.0.5
+version=2.1.0
revision=1
-_translations_commit="974298653ba71b958e1b6c83f6011f5fefff6236"
+_translations_commit="67f5c654523d22c7843811e5aa852a01742f6f12"
build_style=cmake
-configure_args="-DCUTTER_EXTRA_PLUGIN_DIRS=/usr/lib/rizin/Cutter/plugins
+configure_args="-DCUTTER_EXTRA_PLUGIN_DIRS=/usr/lib/rizin/cutter/plugins
-DCUTTER_ENABLE_PYTHON=ON -DCUTTER_ENABLE_PYTHON_BINDINGS=OFF
-DCUTTER_ENABLE_GRAPHVIZ=ON -DCUTTER_ENABLE_KSYNTAXHIGHLIGHTING=ON
-DCUTTER_USE_BUNDLED_RIZIN=OFF -DCUTTER_USE_ADDITIONAL_RIZIN_PATHS=OFF
@@ -17,13 +17,21 @@ short_desc="GUI for radare2 written in C++ and QT"
maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
license="GPL-3.0-only"
homepage="https://cutter.re"
-distfiles="https://github.com/rizinorg/${pkgname}/archive/refs/tags/v${version}.tar.gz
+distfiles="https://github.com/rizinorg/cutter/archive/refs/tags/v${version}.tar.gz
https://github.com/rizinorg/cutter-translations/archive/${_translations_commit}.tar.gz"
-checksum="c206cc72443b989b7306cbc1ec5c85206a5feb5e7dc8621fe4f03876b9e447ab
- 9a9d42769c1e9364dfc694968b05994d02ea840813a33b16ca6a6cbe80c90069"
-
+checksum="60aacead1604c2dc8afad4239732ad10d5882ab38828e695c0f53d1e134c2a5c
+ 12a06a7f977cf7c6d28e1d466cb9e421edb2d26c36e838d02292e5e45bc326c5"
post_extract() {
rmdir src/translations
mv "${XBPS_BUILDDIR}/cutter-translations-${_translations_commit}" "src/translations"
}
+
+cutter-devel_package() {
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ }
+}
From 2546256543497e20b2d6ccf8e7b4aecc4bf50187 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 28 Aug 2022 06:27:23 -0400
Subject: [PATCH 5/7] New package: rz-ghidra-0.4.0
---
srcpkgs/rz-ghidra/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/rz-ghidra/template
diff --git a/srcpkgs/rz-ghidra/template b/srcpkgs/rz-ghidra/template
new file mode 100644
index 000000000000..c2bded70007b
--- /dev/null
+++ b/srcpkgs/rz-ghidra/template
@@ -0,0 +1,17 @@
+# Template file for 'rz-ghidra'
+pkgname=rz-ghidra
+version=0.4.0
+revision=1
+wrksrc="$pkgname"
+build_style=cmake
+configure_args="-DCUTTER_INSTALL_PLUGDIR=/usr/lib/rizin/cutter/plugins/native
+ -DBUILD_CUTTER_PLUGIN=ON"
+hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
+makedepends="cutter-devel rizin-devel"
+short_desc="Deep ghidra decompiler and sleigh disassembler integration for rizin"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/rizinorg/rz-ghidra"
+distfiles="https://github.com/rizinorg/rz-ghidra/releases/download/v${version}/rz-ghidra-src-v${version}.tar.gz"
+checksum=6b8a6d1259699115e70f1f7d27de26c57fc19338d2d3e517460e35bb5f39eb55
+nocross="https://github.com/rizinorg/rz-ghidra/issues/298"
From caafcaca3bdba73b0e3bfd73ae3c5e9ea1c22ca0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 2 Sep 2022 22:34:30 +0200
Subject: [PATCH 6/7] gnome: remove gnome-books from apps
gnome-books is archived
---
srcpkgs/gnome/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 7f17687741ce..31535e9971c6 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
version=42.0
-revision=2
+revision=3
build_style=meta
short_desc="GNOME meta-package for Void Linux"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -46,7 +46,6 @@ _apps_depends="
evolution>=3.44.0
ghex>=${version}
gitg>=41
- gnome-books>=40.0
gnome-boxes>=${version}
gnome-builder>=${version}
gnome-calculator>=${version}
From 88abdd3ab6da1f5f2bb905f9c0ca1c0188491d3a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 2 Sep 2022 22:35:05 +0200
Subject: [PATCH 7/7] gnome-books: remove package
archived upstream, doesn't build with meson 0.63
---
srcpkgs/gnome-books/patches/meson-0.61.patch | 33 --------------------
srcpkgs/gnome-books/template | 18 -----------
srcpkgs/removed-packages/template | 1 +
3 files changed, 1 insertion(+), 51 deletions(-)
delete mode 100644 srcpkgs/gnome-books/patches/meson-0.61.patch
delete mode 100644 srcpkgs/gnome-books/template
diff --git a/srcpkgs/gnome-books/patches/meson-0.61.patch b/srcpkgs/gnome-books/patches/meson-0.61.patch
deleted file mode 100644
index 0e6ba9befd96..000000000000
--- a/srcpkgs/gnome-books/patches/meson-0.61.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 2663dcdaaaa71f067a4c2d0005eecc0fdf940bf5 Mon Sep 17 00:00:00 2001
-From: Michal Vasilek <michal@vasilek.cz>
-Date: Wed, 9 Mar 2022 17:46:00 +0100
-Subject: [PATCH] meson: remove positional args from i18n.merge_file
-
-This causes the build to fail with meson 0.61+
----
- data/meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index bc6edfb4..5061554d 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -54,7 +54,6 @@ sources += gnome.compile_resources(
- appdata = 'org.gnome.Books.appdata.xml'
-
- appdata_file = i18n.merge_file(
-- appdata,
- input: appdata + '.in',
- output: appdata,
- po_dir: po_dir,
-@@ -74,7 +73,6 @@ if appstream_util.found()
- desktop = 'org.gnome.Books.desktop'
-
- desktop_file = i18n.merge_file(
-- desktop,
- type: 'desktop',
- input: desktop + '.in',
- output: desktop,
---
-2.35.1
-
diff --git a/srcpkgs/gnome-books/template b/srcpkgs/gnome-books/template
deleted file mode 100644
index f03b170589b4..000000000000
--- a/srcpkgs/gnome-books/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'gnome-books'
-pkgname=gnome-books
-version=40.0
-revision=2
-build_helper="gir"
-build_style=meson
-hostmakedepends="pkg-config vala glib-devel librsvg docbook-xsl libxslt
- gettext appstream-glib desktop-file-utils"
-makedepends="gjs-devel gtk+3-devel libglib-devel webkit2gtk-devel
- gnome-desktop-devel evince-devel libgepub-devel tracker3-devel"
-depends="gjs libgepub libtracker3"
-short_desc="E-book manager application for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://wiki.gnome.org/Apps/Books"
-changelog="https://gitlab.gnome.org/GNOME/gnome-books/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=85e56f4e4a5e91fb615c18f32a29c4e672faf885d68959571a10c5262aa28130
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 9c847ea1672c..5167b39dc07d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -104,6 +104,7 @@ replaces="
gmpc-devel<=11.8.16_3
gmpc<=11.8.16_3
gnac<=0.2.4.1_4
+ gnome-books<=40.0_2
gnome-doc-utils<=0.20.10_9
gnome-documents<=3.34.0_2
gnome-games<=40.0_1
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR REVIEW] meson: update to 0.63.1.
2022-09-02 20:47 [PR PATCH] meson: update to 0.63.1 paper42
@ 2022-09-02 21:13 ` eli-schwartz
2022-09-02 21:17 ` [PR PATCH] [Updated] " paper42
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: eli-schwartz @ 2022-09-02 21:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 470 bytes --]
New review comment by eli-schwartz on void-packages repository
https://github.com/void-linux/void-packages/pull/39071#discussion_r962018281
Comment:
This patch was introduced after Meson 0.63.1 was released, and is a backport of https://github.com/mesonbuild/meson/pull/10702 which is milestoned for 0.63.2
We do plan to have a .2 release soon (it's even queued for tagging, but some macOS CI job mysteriously doesn't have a test dependency despite installing it).
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] meson: update to 0.63.1.
2022-09-02 20:47 [PR PATCH] meson: update to 0.63.1 paper42
2022-09-02 21:13 ` [PR REVIEW] " eli-schwartz
@ 2022-09-02 21:17 ` paper42
2022-09-02 21:17 ` [PR REVIEW] " paper42
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: paper42 @ 2022-09-02 21:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1276 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages meson-0.63
https://github.com/void-linux/void-packages/pull/39071
meson: update to 0.63.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
depends on #39070 and #38957
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39071.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-meson-0.63-39071.patch --]
[-- Type: text/x-diff, Size: 17536 bytes --]
From 245a0f44b7c0f8fddb24188fa27262e230f52c87 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 6 Aug 2022 18:23:29 +0200
Subject: [PATCH 1/7] meson: update to 0.63.1.
---
...tall-do-not-trample-install_mode-by-rpath-fixer.patch} | 0
srcpkgs/meson/template | 8 ++++----
2 files changed, 4 insertions(+), 4 deletions(-)
rename srcpkgs/meson/patches/{10702.patch => 0001-minstall-do-not-trample-install_mode-by-rpath-fixer.patch} (100%)
diff --git a/srcpkgs/meson/patches/10702.patch b/srcpkgs/meson/patches/0001-minstall-do-not-trample-install_mode-by-rpath-fixer.patch
similarity index 100%
rename from srcpkgs/meson/patches/10702.patch
rename to srcpkgs/meson/patches/0001-minstall-do-not-trample-install_mode-by-rpath-fixer.patch
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index d3243fe16052..3cec0fc58d54 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,12 +1,12 @@
# Template file for 'meson'
pkgname=meson
-version=0.62.2
-revision=2
+version=0.63.1
+revision=1
build_style=python3-module
hostmakedepends="python3-devel python3-setuptools"
depends="ninja python3-setuptools"
checkdepends="glib-devel gobject-introspection ninja
- gcc-objc++ clang qt5-devel cmake llvm git pkg-config vala python-devel
+ gcc-objc++ clang qt5-devel cmake llvm git pkg-config vala python3-devel
cross-arm-linux-gnueabihf"
short_desc="Super fast build system"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -14,7 +14,7 @@ license="Apache-2.0"
homepage="https://mesonbuild.com"
changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=a7669e4c4110b06b743d57cc5d6432591a6677ef2402139fe4f3d42ac13380b0
+checksum=06fe13297213d6ff0121c5d5aab25a56ef938ffec57414ed6086fda272cb65e9
# XXX: sanitizers aren't available on musl
if [ "$XBPS_TARGET_LIBC" = glibc ]; then
From da6e38a2b16729d5fc2a848d5c25decfac19bddd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 6 Aug 2022 18:23:26 +0200
Subject: [PATCH 2/7] budgie-desktop: fix build with meson 0.63
---
.../budgie-desktop/patches/meson-0.63.patch | 33 +++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 srcpkgs/budgie-desktop/patches/meson-0.63.patch
diff --git a/srcpkgs/budgie-desktop/patches/meson-0.63.patch b/srcpkgs/budgie-desktop/patches/meson-0.63.patch
new file mode 100644
index 000000000000..07b36c8dda55
--- /dev/null
+++ b/srcpkgs/budgie-desktop/patches/meson-0.63.patch
@@ -0,0 +1,33 @@
+From 078ee1b05436adc67ba6175345ebdfd5c0463195 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Mon, 20 Jun 2022 19:59:35 -0400
+Subject: [PATCH] fix broken C std for gvc subproject
+
+Historically, Meson didn't know how to set c_std for a subproject at
+all. Meson 0.63.0 adds support for this, so the default_options kwarg to
+subproject now begins to respect this.
+
+budgie-desktop uses c11, but artificially sets c89 for the gvc
+submodule. However, this does not actually work... the build then errors
+out when trying to build
+subprojects/gvc/test-audio-device-selection.p/test-audio-device-selection.c.o
+
+Remove the faulty argument.
+
+Fixes regression in commit 3d6d71c167dd9742cd072e7e6a3453c23ebb2658.
+---
+ meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 763d5a1b..3c52b8f5 100644
+--- a/meson.build
++++ b/meson.build
+@@ -130,7 +130,6 @@ with_polkit = get_option('with-polkit')
+ # Get gvc built before we do anything
+ gvc = subproject('gvc',
+ default_options: [
+- 'c_std=c89',
+ 'static=false',
+ 'pkglibdir=@0@'.format(rpath_libdir),
+ 'package_name=' + meson.project_name(),
From e6f1519fa26b7f06e383690b5d7c3990c9e2a2bc Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 28 Aug 2022 06:26:11 -0400
Subject: [PATCH 3/7] rizin: update to 0.4.0.
---
common/shlibs | 50 ++++++++++++++++++++++--------------------
srcpkgs/rizin/template | 9 +++++---
2 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 21a43eac0a7d..af208b7ceb33 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4123,30 +4123,32 @@ mod_spatialite.so.7 libspatialite-5.0.1_1
libSvtAv1Enc.so.1 libsvt-av1-1.0.0_1
libSvtAv1Dec.so.0 libsvt-av1-0.9.0_1
libyascreen.so.0 yascreen-1.86_1
-librz_bp.so.0.3.4 rizin-0.3.4_1
-librz_reg.so.0.3.4 rizin-0.3.4_1
-librz_debug.so.0.3.4 rizin-0.3.4_1
-librz_hash.so.0.3.4 rizin-0.3.4_1
-librz_config.so.0.3.4 rizin-0.3.4_1
-librz_parse.so.0.3.4 rizin-0.3.4_1
-librz_asm.so.0.3.4 rizin-0.3.4_1
-librz_type.so.0.3.4 rizin-0.3.4_1
-librz_socket.so.0.3.4 rizin-0.3.4_1
-librz_egg.so.0.3.4 rizin-0.3.4_1
-librz_core.so.0.3.4 rizin-0.3.4_1
-librz_diff.so.0.3.4 rizin-0.3.4_1
-librz_main.so.0.3.4 rizin-0.3.4_1
-librz_cons.so.0.3.4 rizin-0.3.4_1
-librz_crypto.so.0.3.4 rizin-0.3.4_1
-librz_analysis.so.0.3.4 rizin-0.3.4_1
-librz_syscall.so.0.3.4 rizin-0.3.4_1
-librz_io.so.0.3.4 rizin-0.3.4_1
-librz_flag.so.0.3.4 rizin-0.3.4_1
-librz_magic.so.0.3.4 rizin-0.3.4_1
-librz_util.so.0.3.4 rizin-0.3.4_1
-librz_lang.so.0.3.4 rizin-0.3.4_1
-librz_search.so.0.3.4 rizin-0.3.4_1
-librz_bin.so.0.3.4 rizin-0.3.4_1
+librz_analysis.so.0.4 rizin-0.4.0_1
+librz_asm.so.0.4 rizin-0.4.0_1
+librz_bin.so.0.4 rizin-0.4.0_1
+librz_bp.so.0.4 rizin-0.4.0_1
+librz_config.so.0.4 rizin-0.4.0_1
+librz_cons.so.0.4 rizin-0.4.0_1
+librz_core.so.0.4 rizin-0.4.0_1
+librz_crypto.so.0.4 rizin-0.4.0_1
+librz_debug.so.0.4 rizin-0.4.0_1
+librz_demangler.so.0.4 rizin-0.4.0_1
+librz_diff.so.0.4 rizin-0.4.0_1
+librz_egg.so.0.4 rizin-0.4.0_1
+librz_flag.so.0.4 rizin-0.4.0_1
+librz_hash.so.0.4 rizin-0.4.0_1
+librz_io.so.0.4 rizin-0.4.0_1
+librz_lang.so.0.4 rizin-0.4.0_1
+librz_magic.so.0.4 rizin-0.4.0_1
+librz_main.so.0.4 rizin-0.4.0_1
+librz_parse.so.0.4 rizin-0.4.0_1
+librz_reg.so.0.4 rizin-0.4.0_1
+librz_search.so.0.4 rizin-0.4.0_1
+librz_sign.so.0.4 rizin-0.4.0_1
+librz_socket.so.0.4 rizin-0.4.0_1
+librz_syscall.so.0.4 rizin-0.4.0_1
+librz_type.so.0.4 rizin-0.4.0_1
+librz_util.so.0.4 rizin-0.4.0_1
libaravis-0.8.so.0 libaravis-0.8.21_1
libLimeSuite.so.20.10-1 LimeSuite-20.10.0_1
libnvme.so.1 libnvme-1.0_1
diff --git a/srcpkgs/rizin/template b/srcpkgs/rizin/template
index 40c2dffeb9ae..8c2e0711086d 100644
--- a/srcpkgs/rizin/template
+++ b/srcpkgs/rizin/template
@@ -1,13 +1,13 @@
# Template file for 'rizin'
pkgname=rizin
-version=0.3.4
+version=0.4.0
revision=1
wrksrc="${pkgname}-v${version}"
build_style=meson
configure_args="-D use_sys_capstone=enabled -D use_capstone_version=v4
-D use_sys_magic=enabled -D use_sys_libzip=enabled -D use_sys_zlib=enabled
-D use_sys_lz4=enabled -D use_sys_xxhash=enabled -D use_sys_openssl=enabled
- -D use_sys_tree_sitter=enabled -D use_libuv=true -D use_webui=true -D local=disabled"
+ -D use_sys_tree_sitter=enabled -D use_libuv=true -D local=disabled"
hostmakedepends="pkg-config"
makedepends="capstone-devel libzip-devel zlib-devel liblz4-devel xxHash-devel libuv-devel
tree-sitter-devel file-devel openssl-devel"
@@ -16,7 +16,9 @@ maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
license="LGPL-3.0-only"
homepage="https://github.com/rizinorg/rizin"
distfiles="https://github.com/rizinorg/${pkgname}/releases/download/v${version}/${pkgname}-src-v${version}.tar.xz"
-checksum=eea49b396387c09d19705aab02a617cdb15682fca67f101ff2b27eef94a710e9
+checksum=09eba8684fe813cf42a716b59a86d3d65afce013d7e8b275e145e849d3366b5a
+# requires some external files, not clear where they come from
+make_check=no
rizin-devel_package() {
@@ -26,5 +28,6 @@ rizin-devel_package() {
vmove "usr/lib/*.so"
vmove usr/include/librz
vmove usr/lib/pkgconfig
+ vmove usr/lib/cmake
}
}
From dd473200ff7df28fadeddf2fe9003575de7098ef Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 28 Aug 2022 06:27:02 -0400
Subject: [PATCH 4/7] cutter: update to 2.1.0.
---
srcpkgs/cutter-devel | 1 +
.../cutter/patches/ksyntaxhighlighting.patch | 43 -------------------
srcpkgs/cutter/template | 22 +++++++---
3 files changed, 16 insertions(+), 50 deletions(-)
create mode 120000 srcpkgs/cutter-devel
delete mode 100644 srcpkgs/cutter/patches/ksyntaxhighlighting.patch
diff --git a/srcpkgs/cutter-devel b/srcpkgs/cutter-devel
new file mode 120000
index 000000000000..834ab3347b6f
--- /dev/null
+++ b/srcpkgs/cutter-devel
@@ -0,0 +1 @@
+cutter
\ No newline at end of file
diff --git a/srcpkgs/cutter/patches/ksyntaxhighlighting.patch b/srcpkgs/cutter/patches/ksyntaxhighlighting.patch
deleted file mode 100644
index 461a3dec9d58..000000000000
--- a/srcpkgs/cutter/patches/ksyntaxhighlighting.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/src/common/Configuration.cpp b/src/common/Configuration.cpp
-index 3c309e83..47019165 100644
---- a/src/common/Configuration.cpp
-+++ b/src/common/Configuration.cpp
-@@ -7,9 +7,9 @@
- #include <QApplication>
-
- #ifdef CUTTER_ENABLE_KSYNTAXHIGHLIGHTING
--# include <KSyntaxHighlighting/repository.h>
--# include <KSyntaxHighlighting/theme.h>
--# include <KSyntaxHighlighting/definition.h>
-+# include <repository.h>
-+# include <theme.h>
-+# include <definition.h>
- #endif
-
- #include "common/ColorThemeWorker.h"
-diff --git a/src/common/SyntaxHighlighter.cpp b/src/common/SyntaxHighlighter.cpp
-index 64a2038e..eebb59f9 100644
---- a/src/common/SyntaxHighlighter.cpp
-+++ b/src/common/SyntaxHighlighter.cpp
-@@ -5,7 +5,7 @@
-
- # include "Configuration.h"
-
--# include <KSyntaxHighlighting/theme.h>
-+# include <theme.h>
-
- SyntaxHighlighter::SyntaxHighlighter(QTextDocument *document)
- : KSyntaxHighlighting::SyntaxHighlighter(document)
-diff --git a/src/common/SyntaxHighlighter.h b/src/common/SyntaxHighlighter.h
-index b9e88970..a21b4ec2 100644
---- a/src/common/SyntaxHighlighter.h
-+++ b/src/common/SyntaxHighlighter.h
-@@ -10,7 +10,7 @@
-
- #ifdef CUTTER_ENABLE_KSYNTAXHIGHLIGHTING
-
--# include <KSyntaxHighlighting/syntaxhighlighter.h>
-+# include <syntaxhighlighter.h>
-
- class SyntaxHighlighter : public KSyntaxHighlighting::SyntaxHighlighter
- {
diff --git a/srcpkgs/cutter/template b/srcpkgs/cutter/template
index a2d6ca506827..c5b5c53045cb 100644
--- a/srcpkgs/cutter/template
+++ b/srcpkgs/cutter/template
@@ -1,10 +1,10 @@
# Template file for 'cutter'
pkgname=cutter
-version=2.0.5
+version=2.1.0
revision=1
-_translations_commit="974298653ba71b958e1b6c83f6011f5fefff6236"
+_translations_commit="67f5c654523d22c7843811e5aa852a01742f6f12"
build_style=cmake
-configure_args="-DCUTTER_EXTRA_PLUGIN_DIRS=/usr/lib/rizin/Cutter/plugins
+configure_args="-DCUTTER_EXTRA_PLUGIN_DIRS=/usr/lib/rizin/cutter/plugins
-DCUTTER_ENABLE_PYTHON=ON -DCUTTER_ENABLE_PYTHON_BINDINGS=OFF
-DCUTTER_ENABLE_GRAPHVIZ=ON -DCUTTER_ENABLE_KSYNTAXHIGHLIGHTING=ON
-DCUTTER_USE_BUNDLED_RIZIN=OFF -DCUTTER_USE_ADDITIONAL_RIZIN_PATHS=OFF
@@ -17,13 +17,21 @@ short_desc="GUI for radare2 written in C++ and QT"
maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
license="GPL-3.0-only"
homepage="https://cutter.re"
-distfiles="https://github.com/rizinorg/${pkgname}/archive/refs/tags/v${version}.tar.gz
+distfiles="https://github.com/rizinorg/cutter/archive/refs/tags/v${version}.tar.gz
https://github.com/rizinorg/cutter-translations/archive/${_translations_commit}.tar.gz"
-checksum="c206cc72443b989b7306cbc1ec5c85206a5feb5e7dc8621fe4f03876b9e447ab
- 9a9d42769c1e9364dfc694968b05994d02ea840813a33b16ca6a6cbe80c90069"
-
+checksum="60aacead1604c2dc8afad4239732ad10d5882ab38828e695c0f53d1e134c2a5c
+ 12a06a7f977cf7c6d28e1d466cb9e421edb2d26c36e838d02292e5e45bc326c5"
post_extract() {
rmdir src/translations
mv "${XBPS_BUILDDIR}/cutter-translations-${_translations_commit}" "src/translations"
}
+
+cutter-devel_package() {
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ }
+}
From 0f84c4b9f456d21a8f75c3fe94d39a10593320fe Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 28 Aug 2022 06:27:23 -0400
Subject: [PATCH 5/7] New package: rz-ghidra-0.4.0
---
srcpkgs/rz-ghidra/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/rz-ghidra/template
diff --git a/srcpkgs/rz-ghidra/template b/srcpkgs/rz-ghidra/template
new file mode 100644
index 000000000000..c2bded70007b
--- /dev/null
+++ b/srcpkgs/rz-ghidra/template
@@ -0,0 +1,17 @@
+# Template file for 'rz-ghidra'
+pkgname=rz-ghidra
+version=0.4.0
+revision=1
+wrksrc="$pkgname"
+build_style=cmake
+configure_args="-DCUTTER_INSTALL_PLUGDIR=/usr/lib/rizin/cutter/plugins/native
+ -DBUILD_CUTTER_PLUGIN=ON"
+hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
+makedepends="cutter-devel rizin-devel"
+short_desc="Deep ghidra decompiler and sleigh disassembler integration for rizin"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/rizinorg/rz-ghidra"
+distfiles="https://github.com/rizinorg/rz-ghidra/releases/download/v${version}/rz-ghidra-src-v${version}.tar.gz"
+checksum=6b8a6d1259699115e70f1f7d27de26c57fc19338d2d3e517460e35bb5f39eb55
+nocross="https://github.com/rizinorg/rz-ghidra/issues/298"
From 4cbe65433129075739ed1f5e18c0ee0a49a20c17 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 2 Sep 2022 22:34:30 +0200
Subject: [PATCH 6/7] gnome: remove gnome-books from apps
gnome-books is archived
---
srcpkgs/gnome/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template
index 7f17687741ce..31535e9971c6 100644
--- a/srcpkgs/gnome/template
+++ b/srcpkgs/gnome/template
@@ -1,7 +1,7 @@
# Template file for 'gnome'
pkgname=gnome
version=42.0
-revision=2
+revision=3
build_style=meta
short_desc="GNOME meta-package for Void Linux"
maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -46,7 +46,6 @@ _apps_depends="
evolution>=3.44.0
ghex>=${version}
gitg>=41
- gnome-books>=40.0
gnome-boxes>=${version}
gnome-builder>=${version}
gnome-calculator>=${version}
From 4245ab6d35a42b621ec476f0b3fe3b0d20a9acca Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 2 Sep 2022 22:35:05 +0200
Subject: [PATCH 7/7] gnome-books: remove package
archived upstream, doesn't build with meson 0.63
---
srcpkgs/gnome-books/patches/meson-0.61.patch | 33 --------------------
srcpkgs/gnome-books/template | 18 -----------
srcpkgs/removed-packages/template | 1 +
3 files changed, 1 insertion(+), 51 deletions(-)
delete mode 100644 srcpkgs/gnome-books/patches/meson-0.61.patch
delete mode 100644 srcpkgs/gnome-books/template
diff --git a/srcpkgs/gnome-books/patches/meson-0.61.patch b/srcpkgs/gnome-books/patches/meson-0.61.patch
deleted file mode 100644
index 0e6ba9befd96..000000000000
--- a/srcpkgs/gnome-books/patches/meson-0.61.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 2663dcdaaaa71f067a4c2d0005eecc0fdf940bf5 Mon Sep 17 00:00:00 2001
-From: Michal Vasilek <michal@vasilek.cz>
-Date: Wed, 9 Mar 2022 17:46:00 +0100
-Subject: [PATCH] meson: remove positional args from i18n.merge_file
-
-This causes the build to fail with meson 0.61+
----
- data/meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index bc6edfb4..5061554d 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -54,7 +54,6 @@ sources += gnome.compile_resources(
- appdata = 'org.gnome.Books.appdata.xml'
-
- appdata_file = i18n.merge_file(
-- appdata,
- input: appdata + '.in',
- output: appdata,
- po_dir: po_dir,
-@@ -74,7 +73,6 @@ if appstream_util.found()
- desktop = 'org.gnome.Books.desktop'
-
- desktop_file = i18n.merge_file(
-- desktop,
- type: 'desktop',
- input: desktop + '.in',
- output: desktop,
---
-2.35.1
-
diff --git a/srcpkgs/gnome-books/template b/srcpkgs/gnome-books/template
deleted file mode 100644
index f03b170589b4..000000000000
--- a/srcpkgs/gnome-books/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'gnome-books'
-pkgname=gnome-books
-version=40.0
-revision=2
-build_helper="gir"
-build_style=meson
-hostmakedepends="pkg-config vala glib-devel librsvg docbook-xsl libxslt
- gettext appstream-glib desktop-file-utils"
-makedepends="gjs-devel gtk+3-devel libglib-devel webkit2gtk-devel
- gnome-desktop-devel evince-devel libgepub-devel tracker3-devel"
-depends="gjs libgepub libtracker3"
-short_desc="E-book manager application for GNOME"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="https://wiki.gnome.org/Apps/Books"
-changelog="https://gitlab.gnome.org/GNOME/gnome-books/-/raw/master/NEWS"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=85e56f4e4a5e91fb615c18f32a29c4e672faf885d68959571a10c5262aa28130
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 9c847ea1672c..5167b39dc07d 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -104,6 +104,7 @@ replaces="
gmpc-devel<=11.8.16_3
gmpc<=11.8.16_3
gnac<=0.2.4.1_4
+ gnome-books<=40.0_2
gnome-doc-utils<=0.20.10_9
gnome-documents<=3.34.0_2
gnome-games<=40.0_1
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR REVIEW] meson: update to 0.63.1.
2022-09-02 20:47 [PR PATCH] meson: update to 0.63.1 paper42
2022-09-02 21:13 ` [PR REVIEW] " eli-schwartz
2022-09-02 21:17 ` [PR PATCH] [Updated] " paper42
@ 2022-09-02 21:17 ` paper42
2022-09-03 18:22 ` [PR PATCH] [Updated] " paper42
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: paper42 @ 2022-09-02 21:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 152 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/39071#discussion_r962020015
Comment:
fixed
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] meson: update to 0.63.1.
2022-09-02 20:47 [PR PATCH] meson: update to 0.63.1 paper42
` (2 preceding siblings ...)
2022-09-02 21:17 ` [PR REVIEW] " paper42
@ 2022-09-03 18:22 ` paper42
2022-09-03 20:35 ` paper42
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: paper42 @ 2022-09-03 18:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1321 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages meson-0.63
https://github.com/void-linux/void-packages/pull/39071
meson: update to 0.63.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
depends on #39070 and #38957
tilix build is broken, .2 should fix this
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39071.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-meson-0.63-39071.patch --]
[-- Type: text/x-diff, Size: 3890 bytes --]
From f3a2570e64af275a1b91d5e7ba353063284b6bd8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 6 Aug 2022 18:23:29 +0200
Subject: [PATCH 1/2] meson: update to 0.63.1.
---
...tall-do-not-trample-install_mode-by-rpath-fixer.patch} | 0
srcpkgs/meson/template | 8 ++++----
2 files changed, 4 insertions(+), 4 deletions(-)
rename srcpkgs/meson/patches/{10702.patch => 0001-minstall-do-not-trample-install_mode-by-rpath-fixer.patch} (100%)
diff --git a/srcpkgs/meson/patches/10702.patch b/srcpkgs/meson/patches/0001-minstall-do-not-trample-install_mode-by-rpath-fixer.patch
similarity index 100%
rename from srcpkgs/meson/patches/10702.patch
rename to srcpkgs/meson/patches/0001-minstall-do-not-trample-install_mode-by-rpath-fixer.patch
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index d3243fe16052..3cec0fc58d54 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,12 +1,12 @@
# Template file for 'meson'
pkgname=meson
-version=0.62.2
-revision=2
+version=0.63.1
+revision=1
build_style=python3-module
hostmakedepends="python3-devel python3-setuptools"
depends="ninja python3-setuptools"
checkdepends="glib-devel gobject-introspection ninja
- gcc-objc++ clang qt5-devel cmake llvm git pkg-config vala python-devel
+ gcc-objc++ clang qt5-devel cmake llvm git pkg-config vala python3-devel
cross-arm-linux-gnueabihf"
short_desc="Super fast build system"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -14,7 +14,7 @@ license="Apache-2.0"
homepage="https://mesonbuild.com"
changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=a7669e4c4110b06b743d57cc5d6432591a6677ef2402139fe4f3d42ac13380b0
+checksum=06fe13297213d6ff0121c5d5aab25a56ef938ffec57414ed6086fda272cb65e9
# XXX: sanitizers aren't available on musl
if [ "$XBPS_TARGET_LIBC" = glibc ]; then
From 531ace7551f9adc736fae7a41b8aeca1e1aed48a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 6 Aug 2022 18:23:26 +0200
Subject: [PATCH 2/2] budgie-desktop: fix build with meson 0.63
---
.../budgie-desktop/patches/meson-0.63.patch | 33 +++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 srcpkgs/budgie-desktop/patches/meson-0.63.patch
diff --git a/srcpkgs/budgie-desktop/patches/meson-0.63.patch b/srcpkgs/budgie-desktop/patches/meson-0.63.patch
new file mode 100644
index 000000000000..07b36c8dda55
--- /dev/null
+++ b/srcpkgs/budgie-desktop/patches/meson-0.63.patch
@@ -0,0 +1,33 @@
+From 078ee1b05436adc67ba6175345ebdfd5c0463195 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Mon, 20 Jun 2022 19:59:35 -0400
+Subject: [PATCH] fix broken C std for gvc subproject
+
+Historically, Meson didn't know how to set c_std for a subproject at
+all. Meson 0.63.0 adds support for this, so the default_options kwarg to
+subproject now begins to respect this.
+
+budgie-desktop uses c11, but artificially sets c89 for the gvc
+submodule. However, this does not actually work... the build then errors
+out when trying to build
+subprojects/gvc/test-audio-device-selection.p/test-audio-device-selection.c.o
+
+Remove the faulty argument.
+
+Fixes regression in commit 3d6d71c167dd9742cd072e7e6a3453c23ebb2658.
+---
+ meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 763d5a1b..3c52b8f5 100644
+--- a/meson.build
++++ b/meson.build
+@@ -130,7 +130,6 @@ with_polkit = get_option('with-polkit')
+ # Get gvc built before we do anything
+ gvc = subproject('gvc',
+ default_options: [
+- 'c_std=c89',
+ 'static=false',
+ 'pkglibdir=@0@'.format(rpath_libdir),
+ 'package_name=' + meson.project_name(),
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] meson: update to 0.63.1.
2022-09-02 20:47 [PR PATCH] meson: update to 0.63.1 paper42
` (3 preceding siblings ...)
2022-09-03 18:22 ` [PR PATCH] [Updated] " paper42
@ 2022-09-03 20:35 ` paper42
2022-09-03 20:36 ` paper42
2022-09-03 20:37 ` [PR PATCH] [Merged]: " paper42
6 siblings, 0 replies; 8+ messages in thread
From: paper42 @ 2022-09-03 20:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1321 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages meson-0.63
https://github.com/void-linux/void-packages/pull/39071
meson: update to 0.63.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
depends on #39070 and #38957
tilix build is broken, .2 should fix this
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39071.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-meson-0.63-39071.patch --]
[-- Type: text/x-diff, Size: 6657 bytes --]
From 1ed2aa4456e961f28b38187dc9af3908120816d6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 6 Aug 2022 18:23:29 +0200
Subject: [PATCH 1/2] meson: update to 0.63.2.
---
srcpkgs/meson/patches/10702.patch | 59 -------------------------------
srcpkgs/meson/template | 8 ++---
2 files changed, 4 insertions(+), 63 deletions(-)
delete mode 100644 srcpkgs/meson/patches/10702.patch
diff --git a/srcpkgs/meson/patches/10702.patch b/srcpkgs/meson/patches/10702.patch
deleted file mode 100644
index 7ab15ebbc007..000000000000
--- a/srcpkgs/meson/patches/10702.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 869b95d0c2a854d73db0fceb7d0dbee9dc88cf46 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz@archlinux.org>
-Date: Tue, 16 Aug 2022 22:42:53 -0400
-Subject: [PATCH] minstall: do not trample install_mode by rpath fixer
-
-install_mode can include the setuid bit, which has the special property
-(mentioned in the set_mode logic for minstall itself) of needing to come
-last, because it "will get wiped by chmod" (or at least chown).
-
-In fact, it's not just chown that wipes setuid, but other changes as
-well, such as the file contents. This is not an issue for install_data /
-custom_target, but for compiled outputs, we run depfixer to handle
-rpaths. This may or may not cause edits to the binary, depending on
-whether we have a build rpath to wipe, or an install rpath to add. (We
-also may run `strip`, but that external program already has its own mode
-restoration logic.)
-
-Fix this by switching the order of operations around, so that setting
-the permissions happens last.
-
-Fixes https://github.com/void-linux/void-packages/issues/38682
----
- mesonbuild/minstall.py | 3 ++-
- test cases/common/190 install_mode/meson.build | 1 +
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
-index 551f909c80d..a810ccbbd40 100644
---- a/mesonbuild/minstall.py
-+++ b/mesonbuild/minstall.py
-@@ -693,7 +693,6 @@ def install_targets(self, d: InstallData, dm: DirMaker, destdir: str, fullprefix
- raise MesonException(f'File {fname!r} could not be found')
- elif os.path.isfile(fname):
- file_copied = self.do_copyfile(fname, outname, makedirs=(dm, outdir))
-- self.set_mode(outname, install_mode, d.install_umask)
- if should_strip and d.strip_bin is not None:
- if fname.endswith('.jar'):
- self.log('Not stripping jar target: {}'.format(os.path.basename(fname)))
-@@ -723,6 +722,8 @@ def install_targets(self, d: InstallData, dm: DirMaker, destdir: str, fullprefix
- pass
- else:
- raise
-+ # file mode needs to be set last, after strip/depfixer editing
-+ self.set_mode(outname, install_mode, d.install_umask)
-
- def rebuild_all(wd: str) -> bool:
- if not (Path(wd) / 'build.ninja').is_file():
-diff --git a/test cases/common/190 install_mode/meson.build b/test cases/common/190 install_mode/meson.build
-index cae1e91aba3..e877ba75757 100644
---- a/test cases/common/190 install_mode/meson.build
-+++ b/test cases/common/190 install_mode/meson.build
-@@ -51,6 +51,7 @@ install_man('foo.1',
- executable('trivialprog',
- sources : 'trivial.c',
- install : true,
-+ build_rpath: meson.current_build_dir(),
- install_mode : ['rwxr-sr-x', 'root', 'root'])
-
- # test install_mode in static_library
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index d3243fe16052..aea31234fd19 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,12 +1,12 @@
# Template file for 'meson'
pkgname=meson
-version=0.62.2
-revision=2
+version=0.63.2
+revision=1
build_style=python3-module
hostmakedepends="python3-devel python3-setuptools"
depends="ninja python3-setuptools"
checkdepends="glib-devel gobject-introspection ninja
- gcc-objc++ clang qt5-devel cmake llvm git pkg-config vala python-devel
+ gcc-objc++ clang qt5-devel cmake llvm git pkg-config vala python3-devel
cross-arm-linux-gnueabihf"
short_desc="Super fast build system"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -14,7 +14,7 @@ license="Apache-2.0"
homepage="https://mesonbuild.com"
changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=a7669e4c4110b06b743d57cc5d6432591a6677ef2402139fe4f3d42ac13380b0
+checksum=16222f17ef76be0542c91c07994f9676ae879f46fc21c0c786a21ef2cb518bbf
# XXX: sanitizers aren't available on musl
if [ "$XBPS_TARGET_LIBC" = glibc ]; then
From b600ca6ee2d885b9079be655d970978367c381de Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 6 Aug 2022 18:23:26 +0200
Subject: [PATCH 2/2] budgie-desktop: fix build with meson 0.63
---
.../budgie-desktop/patches/meson-0.63.patch | 33 +++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 srcpkgs/budgie-desktop/patches/meson-0.63.patch
diff --git a/srcpkgs/budgie-desktop/patches/meson-0.63.patch b/srcpkgs/budgie-desktop/patches/meson-0.63.patch
new file mode 100644
index 000000000000..07b36c8dda55
--- /dev/null
+++ b/srcpkgs/budgie-desktop/patches/meson-0.63.patch
@@ -0,0 +1,33 @@
+From 078ee1b05436adc67ba6175345ebdfd5c0463195 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Mon, 20 Jun 2022 19:59:35 -0400
+Subject: [PATCH] fix broken C std for gvc subproject
+
+Historically, Meson didn't know how to set c_std for a subproject at
+all. Meson 0.63.0 adds support for this, so the default_options kwarg to
+subproject now begins to respect this.
+
+budgie-desktop uses c11, but artificially sets c89 for the gvc
+submodule. However, this does not actually work... the build then errors
+out when trying to build
+subprojects/gvc/test-audio-device-selection.p/test-audio-device-selection.c.o
+
+Remove the faulty argument.
+
+Fixes regression in commit 3d6d71c167dd9742cd072e7e6a3453c23ebb2658.
+---
+ meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 763d5a1b..3c52b8f5 100644
+--- a/meson.build
++++ b/meson.build
+@@ -130,7 +130,6 @@ with_polkit = get_option('with-polkit')
+ # Get gvc built before we do anything
+ gvc = subproject('gvc',
+ default_options: [
+- 'c_std=c89',
+ 'static=false',
+ 'pkglibdir=@0@'.format(rpath_libdir),
+ 'package_name=' + meson.project_name(),
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] meson: update to 0.63.1.
2022-09-02 20:47 [PR PATCH] meson: update to 0.63.1 paper42
` (4 preceding siblings ...)
2022-09-03 20:35 ` paper42
@ 2022-09-03 20:36 ` paper42
2022-09-03 20:37 ` [PR PATCH] [Merged]: " paper42
6 siblings, 0 replies; 8+ messages in thread
From: paper42 @ 2022-09-03 20:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1321 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages meson-0.63
https://github.com/void-linux/void-packages/pull/39071
meson: update to 0.63.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
depends on #39070 and #38957
tilix build is broken, .2 should fix this
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39071.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-meson-0.63-39071.patch --]
[-- Type: text/x-diff, Size: 6657 bytes --]
From dd36cc5d4c1d71a368df6a2a4f791ecbb286e78a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 6 Aug 2022 18:23:29 +0200
Subject: [PATCH 1/2] meson: update to 0.63.2.
---
srcpkgs/meson/patches/10702.patch | 59 -------------------------------
srcpkgs/meson/template | 8 ++---
2 files changed, 4 insertions(+), 63 deletions(-)
delete mode 100644 srcpkgs/meson/patches/10702.patch
diff --git a/srcpkgs/meson/patches/10702.patch b/srcpkgs/meson/patches/10702.patch
deleted file mode 100644
index 7ab15ebbc007..000000000000
--- a/srcpkgs/meson/patches/10702.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 869b95d0c2a854d73db0fceb7d0dbee9dc88cf46 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz@archlinux.org>
-Date: Tue, 16 Aug 2022 22:42:53 -0400
-Subject: [PATCH] minstall: do not trample install_mode by rpath fixer
-
-install_mode can include the setuid bit, which has the special property
-(mentioned in the set_mode logic for minstall itself) of needing to come
-last, because it "will get wiped by chmod" (or at least chown).
-
-In fact, it's not just chown that wipes setuid, but other changes as
-well, such as the file contents. This is not an issue for install_data /
-custom_target, but for compiled outputs, we run depfixer to handle
-rpaths. This may or may not cause edits to the binary, depending on
-whether we have a build rpath to wipe, or an install rpath to add. (We
-also may run `strip`, but that external program already has its own mode
-restoration logic.)
-
-Fix this by switching the order of operations around, so that setting
-the permissions happens last.
-
-Fixes https://github.com/void-linux/void-packages/issues/38682
----
- mesonbuild/minstall.py | 3 ++-
- test cases/common/190 install_mode/meson.build | 1 +
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py
-index 551f909c80d..a810ccbbd40 100644
---- a/mesonbuild/minstall.py
-+++ b/mesonbuild/minstall.py
-@@ -693,7 +693,6 @@ def install_targets(self, d: InstallData, dm: DirMaker, destdir: str, fullprefix
- raise MesonException(f'File {fname!r} could not be found')
- elif os.path.isfile(fname):
- file_copied = self.do_copyfile(fname, outname, makedirs=(dm, outdir))
-- self.set_mode(outname, install_mode, d.install_umask)
- if should_strip and d.strip_bin is not None:
- if fname.endswith('.jar'):
- self.log('Not stripping jar target: {}'.format(os.path.basename(fname)))
-@@ -723,6 +722,8 @@ def install_targets(self, d: InstallData, dm: DirMaker, destdir: str, fullprefix
- pass
- else:
- raise
-+ # file mode needs to be set last, after strip/depfixer editing
-+ self.set_mode(outname, install_mode, d.install_umask)
-
- def rebuild_all(wd: str) -> bool:
- if not (Path(wd) / 'build.ninja').is_file():
-diff --git a/test cases/common/190 install_mode/meson.build b/test cases/common/190 install_mode/meson.build
-index cae1e91aba3..e877ba75757 100644
---- a/test cases/common/190 install_mode/meson.build
-+++ b/test cases/common/190 install_mode/meson.build
-@@ -51,6 +51,7 @@ install_man('foo.1',
- executable('trivialprog',
- sources : 'trivial.c',
- install : true,
-+ build_rpath: meson.current_build_dir(),
- install_mode : ['rwxr-sr-x', 'root', 'root'])
-
- # test install_mode in static_library
diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template
index d3243fe16052..aea31234fd19 100644
--- a/srcpkgs/meson/template
+++ b/srcpkgs/meson/template
@@ -1,12 +1,12 @@
# Template file for 'meson'
pkgname=meson
-version=0.62.2
-revision=2
+version=0.63.2
+revision=1
build_style=python3-module
hostmakedepends="python3-devel python3-setuptools"
depends="ninja python3-setuptools"
checkdepends="glib-devel gobject-introspection ninja
- gcc-objc++ clang qt5-devel cmake llvm git pkg-config vala python-devel
+ gcc-objc++ clang qt5-devel cmake llvm git pkg-config vala python3-devel
cross-arm-linux-gnueabihf"
short_desc="Super fast build system"
maintainer="Michal Vasilek <michal@vasilek.cz>"
@@ -14,7 +14,7 @@ license="Apache-2.0"
homepage="https://mesonbuild.com"
changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md"
distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz"
-checksum=a7669e4c4110b06b743d57cc5d6432591a6677ef2402139fe4f3d42ac13380b0
+checksum=16222f17ef76be0542c91c07994f9676ae879f46fc21c0c786a21ef2cb518bbf
# XXX: sanitizers aren't available on musl
if [ "$XBPS_TARGET_LIBC" = glibc ]; then
From c3c8a6645230a1357704b75b342d1b0f6fb27e36 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 6 Aug 2022 18:23:26 +0200
Subject: [PATCH 2/2] budgie-desktop: fix build with meson 0.63
---
.../budgie-desktop/patches/meson-0.63.patch | 33 +++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 srcpkgs/budgie-desktop/patches/meson-0.63.patch
diff --git a/srcpkgs/budgie-desktop/patches/meson-0.63.patch b/srcpkgs/budgie-desktop/patches/meson-0.63.patch
new file mode 100644
index 000000000000..07b36c8dda55
--- /dev/null
+++ b/srcpkgs/budgie-desktop/patches/meson-0.63.patch
@@ -0,0 +1,33 @@
+From 078ee1b05436adc67ba6175345ebdfd5c0463195 Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Mon, 20 Jun 2022 19:59:35 -0400
+Subject: [PATCH] fix broken C std for gvc subproject
+
+Historically, Meson didn't know how to set c_std for a subproject at
+all. Meson 0.63.0 adds support for this, so the default_options kwarg to
+subproject now begins to respect this.
+
+budgie-desktop uses c11, but artificially sets c89 for the gvc
+submodule. However, this does not actually work... the build then errors
+out when trying to build
+subprojects/gvc/test-audio-device-selection.p/test-audio-device-selection.c.o
+
+Remove the faulty argument.
+
+Fixes regression in commit 3d6d71c167dd9742cd072e7e6a3453c23ebb2658.
+---
+ meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 763d5a1b..3c52b8f5 100644
+--- a/meson.build
++++ b/meson.build
+@@ -130,7 +130,6 @@ with_polkit = get_option('with-polkit')
+ # Get gvc built before we do anything
+ gvc = subproject('gvc',
+ default_options: [
+- 'c_std=c89',
+ 'static=false',
+ 'pkglibdir=@0@'.format(rpath_libdir),
+ 'package_name=' + meson.project_name(),
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Merged]: meson: update to 0.63.1.
2022-09-02 20:47 [PR PATCH] meson: update to 0.63.1 paper42
` (5 preceding siblings ...)
2022-09-03 20:36 ` paper42
@ 2022-09-03 20:37 ` paper42
6 siblings, 0 replies; 8+ messages in thread
From: paper42 @ 2022-09-03 20:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1166 bytes --]
There's a merged pull request on the void-packages repository
meson: update to 0.63.1.
https://github.com/void-linux/void-packages/pull/39071
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
depends on #39070 and #38957
~~tilix build is broken, .2 should fix this~~
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-09-03 20:37 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-02 20:47 [PR PATCH] meson: update to 0.63.1 paper42
2022-09-02 21:13 ` [PR REVIEW] " eli-schwartz
2022-09-02 21:17 ` [PR PATCH] [Updated] " paper42
2022-09-02 21:17 ` [PR REVIEW] " paper42
2022-09-03 18:22 ` [PR PATCH] [Updated] " paper42
2022-09-03 20:35 ` paper42
2022-09-03 20:36 ` paper42
2022-09-03 20:37 ` [PR PATCH] [Merged]: " paper42
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).