From 245a0f44b7c0f8fddb24188fa27262e230f52c87 Mon Sep 17 00:00:00 2001 From: Michal Vasilek 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 " @@ -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 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 +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 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 " 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 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 - - #ifdef CUTTER_ENABLE_KSYNTAXHIGHLIGHTING --# include --# include --# include -+# include -+# include -+# include - #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 -+# include - - 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 -+# include - - 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 " 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 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 " +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 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 " @@ -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 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 -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 " -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