From f34d0a044fb0c6aa01288a660941429941134065 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 6 Feb 2024 08:17:04 -0800 Subject: [PATCH 1/5] libdex: update to 0.4.3. --- srcpkgs/libdex/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libdex/template b/srcpkgs/libdex/template index 5340766d9276ee..b57d4db9793458 100644 --- a/srcpkgs/libdex/template +++ b/srcpkgs/libdex/template @@ -1,6 +1,6 @@ # Template file for 'libdex' pkgname=libdex -version=0.2.0 +version=0.4.3 revision=1 build_style=meson build_helper=gir @@ -18,7 +18,7 @@ license="LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/libdex" changelog="https://gitlab.gnome.org/GNOME/libdex/-/raw/main/NEWS" distfiles="${GNOME_SITE}/libdex/${version%.*}/libdex-${version}.tar.xz" -checksum=a0f7566260971a1e4aeb53a07d95c806091257b8789d6fad9931dba872c5070d +checksum=adead71f660e1e44f182c037a48ae528540c028445c1b6715d1ea3a5cac64580 # Package build options build_options="gir vala gtk_doc" From 07aab064447ad0e7282c297b836ca0b7a61171a8 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 6 Feb 2024 08:18:49 -0800 Subject: [PATCH 2/5] libpanel: update to 1.4.1. --- srcpkgs/libpanel/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libpanel/template b/srcpkgs/libpanel/template index eed1b9c4605ced..25b611cd969fd3 100644 --- a/srcpkgs/libpanel/template +++ b/srcpkgs/libpanel/template @@ -1,6 +1,6 @@ # Template file for 'libpanel' pkgname=libpanel -version=1.2.0 +version=1.4.1 revision=1 build_style=meson build_helper="gir" @@ -12,7 +12,7 @@ license="LGPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/libpanel" changelog="https://gitlab.gnome.org/GNOME/libpanel/-/raw/main/NEWS" distfiles="${GNOME_SITE}/libpanel/${version%.*}/libpanel-${version}.tar.xz" -checksum=d9055bbbab9625f3f5ce6d1fd7132eb6ea34a6ba07a87e9938901fb8b31581e2 +checksum=98410d00e734857ecdf33b9a20dd7b0fb38d8b6d31d4369bafc1c67392abb9de pre_build() { # help gi-docgen find gi files on cross From fa442707fc6c01d3ae535be73b6c58fdd1a911d8 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 6 Feb 2024 08:22:12 -0800 Subject: [PATCH 3/5] sysprof: update to 45.1. --- common/shlibs | 3 +-- .../sysprof/patches/musl-missing-include.patch | 13 +++++++++++++ srcpkgs/sysprof/template | 16 ++++++++-------- 3 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 srcpkgs/sysprof/patches/musl-missing-include.patch diff --git a/common/shlibs b/common/shlibs index 27effd372a4cf6..66000ae05edf49 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3049,8 +3049,7 @@ libgutenprint.so.9 gutenprint-5.3.3_1 libunbound.so.8 libunbound-1.13.1_2 libmirage.so.11 libmirage-3.1.0_1 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1 -libsysprof-4.so sysprof-3.37.90_1 -libsysprof-ui-5.so sysprof-3.46.0_1 +libsysprof-6.so.6 sysprof-45.1_1 libvala-0.56.so.0 libvala-0.56.0_1 libvaladoc-0.56.so.0 libvaladoc-0.56.0_1 libvalaccodegen.so libvala-0.44.0_1 diff --git a/srcpkgs/sysprof/patches/musl-missing-include.patch b/srcpkgs/sysprof/patches/musl-missing-include.patch new file mode 100644 index 00000000000000..6160428eef8e1c --- /dev/null +++ b/srcpkgs/sysprof/patches/musl-missing-include.patch @@ -0,0 +1,13 @@ +Fix build for gcc 14 and musl + +diff -rup src/libsysprof/sysprof-elf-loader.c.orig src/libsysprof/sysprof-elf-loader.c +--- a/src/libsysprof/sysprof-elf-loader.c ++++ b/src/libsysprof/sysprof-elf-loader.c +@@ -22,6 +22,7 @@ + + #include + #include ++#include + + #include "sysprof-elf-private.h" + #include "sysprof-elf-loader-private.h" diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template index 0a40abfb42b741..54ba30226cdecf 100644 --- a/srcpkgs/sysprof/template +++ b/srcpkgs/sysprof/template @@ -1,20 +1,20 @@ # Template file for 'sysprof' pkgname=sysprof -version=3.46.0 -revision=2 +version=45.1 +revision=1 build_style=meson -configure_args="-Dgtk=true -Dsystemdunitdir=/usr/lib/systemd" -hostmakedepends="gettext pkg-config itstool glib-devel desktop-file-utils - gtk-update-icon-cache" -makedepends="gtk4-devel libdazzle-devel polkit-devel glib-devel elogind-devel - json-glib-devel libunwind-devel libadwaita-devel" +configure_args="-Dgtk=true -Dsystemdunitdir=/usr/lib/systemd -Db_lto=false" +hostmakedepends="gettext pkg-config glib-devel desktop-file-utils + gtk-update-icon-cache itstool" +makedepends="gtk4-devel libadwaita-devel libdex-devel + json-glib-devel libpanel-devel polkit-devel libunwind-devel" short_desc="System-wide profiler for Linux" maintainer="Enno Boland " license="GPL-2.0-or-later, GPL-3.0-or-later" homepage="https://gitlab.gnome.org/GNOME/sysprof" changelog="https://gitlab.gnome.org/GNOME/sysprof/-/raw/master/NEWS" distfiles="${GNOME_SITE}/sysprof/${version%.*}/sysprof-${version}.tar.xz" -checksum=3e430d578150a8dd0b075b17d2fcc1ba704d42880262f0cc651f33e493be4071 +checksum=323bb9d585613d60c439460331450011f2b90b3d5272625bd858da4c19df2cf9 # for ITS rules if [ "$CROSS_BUILD" ]; then From cdfe09f532145389d5dfac6a093dccc8a6a561f2 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 6 Feb 2024 08:57:31 -0800 Subject: [PATCH 4/5] New package: libpeas2-2.0.1 --- common/shlibs | 1 + srcpkgs/libpeas2-devel | 1 + srcpkgs/libpeas2/template | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 120000 srcpkgs/libpeas2-devel create mode 100644 srcpkgs/libpeas2/template diff --git a/common/shlibs b/common/shlibs index 66000ae05edf49..2c69f9b246666d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -808,6 +808,7 @@ libXss.so.1 libXScrnSaver-1.1.3_1 libyelp.so.0 yelp-3.36.0_1 libpeas-1.0.so.0 libpeas-1.0.0_2 libpeas-gtk-1.0.so.0 libpeas-1.0.0_2 +libpeas-2.so.0 libpeas2-2.0.1_1 libtotem.so.0 libtotem-3.6.2_1 libclutter-1.0.so.0 clutter-1.14.0_1 libavfs.so.0 libavfs-1.0.5_1 diff --git a/srcpkgs/libpeas2-devel b/srcpkgs/libpeas2-devel new file mode 120000 index 00000000000000..537db7e8dbf344 --- /dev/null +++ b/srcpkgs/libpeas2-devel @@ -0,0 +1 @@ +libpeas2 \ No newline at end of file diff --git a/srcpkgs/libpeas2/template b/srcpkgs/libpeas2/template new file mode 100644 index 00000000000000..1c0c9080a417a2 --- /dev/null +++ b/srcpkgs/libpeas2/template @@ -0,0 +1,38 @@ +# Template file for 'libpeas2' +pkgname=libpeas2 +version=2.0.1 +revision=1 +build_style=meson +build_helper="gir" +configure_args="-Dgtk_doc=true -Dvapi=true" +hostmakedepends="pkg-config gettext glib-devel python3 lua51 lua51-lgi gi-docgen" +makedepends="vala-devel python3-gobject-devel lua51-devel gjs-devel" +depends="python3-gobject hicolor-icon-theme" +checkdepends="xvfb-run" +short_desc="Gobject-based plugins engine" +maintainer="Enno Boland " +license="LGPL-2.1-or-later" +homepage="https://wiki.gnome.org/Projects/Libpeas" +changelog="https://gitlab.gnome.org/GNOME/libpeas/-/raw/master/NEWS" +distfiles="${GNOME_SITE}/libpeas/${version%.*}/libpeas-${version}.tar.xz" +checksum=9ddc1d51f38663da4df52163051b7b2cea3a242cfaee9f5a7e140f0784c8aa77 +make_check_pre="xvfb-run" + +post_patch() { + # libpeas2 checks for lua51.pc or lua-5.1.pc but Void uses lua5.1.pc + vsed -e "s/dependency('lua51'/dependency('lua5.1'/" -i meson.build +} + +libpeas2-devel_package() { + depends="libglib-devel libgirepository-devel + ${sourcepkg}-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + vmove usr/share/gir-1.0 + vmove usr/share/vala + vmove usr/share/doc + } +} From 406d875d018a270b2fdd3d69d7b9d3b2a9b9e1b9 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 6 Feb 2024 09:53:38 -0800 Subject: [PATCH 5/5] gnome-builder: update to 45.0. --- srcpkgs/gnome-builder/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template index d96f503b458cb0..bb54ba632f495c 100644 --- a/srcpkgs/gnome-builder/template +++ b/srcpkgs/gnome-builder/template @@ -1,7 +1,7 @@ # Template file for 'gnome-builder' pkgname=gnome-builder -version=44.1 -revision=6 +version=45.0 +revision=1 build_style=meson build_helper=qemu configure_args="-Dhelp=true -Dnetwork_tests=false" @@ -9,7 +9,7 @@ hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-intro mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext llvm17" makedepends="llvm17-devel cairo-devel clang enchant2-devel flatpak-devel gtksourceview5-devel gtk4-devel json-glib-devel jsonrpc-glib-devel - libgit2-glib-devel libglib-devel libostree-devel libpeas-devel + libgit2-glib-devel libglib-devel libostree-devel libpeas2-devel libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkitgtk60-devel libadwaita-devel pcre2-devel libgit2-devel gobject-introspection python3-gobject-devel sysprof-devel libportal-gtk4-devel @@ -23,5 +23,5 @@ license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Builder" changelog="https://gitlab.gnome.org/GNOME/gnome-builder/-/raw/gnome-builder-44/NEWS" distfiles="${GNOME_SITE}/gnome-builder/${version%.*}/gnome-builder-${version}.tar.xz" -checksum=f939a7f95b4b6e1d04bd8db4be9ca0b67b2aa765b86c63f4df23fdb3a7edcf3e +checksum=242da02593293d456ea24108a45934730a1e316d8dc5b18d9df0e864db7ba596 make_check_pre="xvfb-run"