From ef8b78100dc2f4655c7c2b14a71d8371458575c7 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 6 Feb 2024 08:17:04 -0800 Subject: [PATCH 1/6] libdex: update to 0.4.3. --- srcpkgs/libdex/template | 4 ++-- srcpkgs/libdex/update | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/libdex/update 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" diff --git a/srcpkgs/libdex/update b/srcpkgs/libdex/update new file mode 100644 index 00000000000000..01a3b44828ddd2 --- /dev/null +++ b/srcpkgs/libdex/update @@ -0,0 +1,2 @@ +# ignore unstable beta/rc releases +ignore="?.[3579].*" From 887c9ce48aedd7c35460f0ca6e059e6178ae44cc Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 6 Feb 2024 08:18:49 -0800 Subject: [PATCH 2/6] libpanel: update to 1.4.1. --- srcpkgs/libpanel/template | 4 ++-- srcpkgs/libpanel/update | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/libpanel/update 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 diff --git a/srcpkgs/libpanel/update b/srcpkgs/libpanel/update new file mode 100644 index 00000000000000..01a3b44828ddd2 --- /dev/null +++ b/srcpkgs/libpanel/update @@ -0,0 +1,2 @@ +# ignore unstable beta/rc releases +ignore="?.[3579].*" From eda73b9fc6b90e886b609e8792410a4421d69f9f Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 6 Feb 2024 08:22:12 -0800 Subject: [PATCH 3/6] sysprof: update to 45.2. --- common/shlibs | 3 +- srcpkgs/libsysprof | 1 + srcpkgs/sysprof-cli | 1 + .../patches/musl-missing-include.patch | 13 ++++++ srcpkgs/sysprof/template | 45 ++++++++++++++----- 5 files changed, 50 insertions(+), 13 deletions(-) create mode 120000 srcpkgs/libsysprof create mode 120000 srcpkgs/sysprof-cli create mode 100644 srcpkgs/sysprof/patches/musl-missing-include.patch diff --git a/common/shlibs b/common/shlibs index 27effd372a4cf6..ee46014399bd41 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 libsysprof-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/libsysprof b/srcpkgs/libsysprof new file mode 120000 index 00000000000000..b36b72f12d0933 --- /dev/null +++ b/srcpkgs/libsysprof @@ -0,0 +1 @@ +sysprof \ No newline at end of file diff --git a/srcpkgs/sysprof-cli b/srcpkgs/sysprof-cli new file mode 120000 index 00000000000000..b36b72f12d0933 --- /dev/null +++ b/srcpkgs/sysprof-cli @@ -0,0 +1 @@ +sysprof \ No newline at end of file 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..77ffa22cb6f4f2 100644 --- a/srcpkgs/sysprof/template +++ b/srcpkgs/sysprof/template @@ -1,25 +1,47 @@ # Template file for 'sysprof' pkgname=sysprof -version=3.46.0 -revision=2 +version=45.2 +revision=1 build_style=meson -configure_args="-Dgtk=true -Dsystemdunitdir=/usr/lib/systemd" +configure_args="-Dgtk=true -Dsystemdunitdir=/usr/lib/systemd -Db_lto=false" 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" + polkit-devel gtk4-update-icon-cache" +makedepends="gtk4-devel libadwaita-devel libdex-devel + json-glib-devel libpanel-devel polkit-devel libunwind-devel" +depends="sysprof-cli" 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=29e0dc15eac46da09146f9c9f11cbd05f230403f9a01e9164eeb0907c4420c8d -# for ITS rules -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" polkit-devel" -fi +sysprof-cli_package() { + # turbostat is necessary for recording power usage + # but it is only avaliable on x86 + case "$XBPS_TARGET_MACHINE" in + i686*|x86_64*) + depends="turbostat" + esac + short_desc+=" - command line utilities" + pkg_install() { + vmove "usr/bin/sysprof-*" + vmove usr/libexec + vmove usr/share/dbus-1/system-services/org.gnome.Sysprof3.service + vmove usr/share/dbus-1/system.d/org.gnome.Sysprof3.conf + vmove usr/share/polkit-1/actions/org.gnome.sysprof3.policy + vmove usr/lib/systemd/sysprof3.service + } +} + +libsysprof_package() { + short_desc+=" - runtime libraries and plugins" + pkg_install() { + vmove "usr/lib/libsysprof-6.so.*" + vmove "usr/lib/libsysprof-*-6.so" + } +} sysprof-devel_package() { depends="${sourcepkg}>=${version}_${revision} libglib-devel @@ -28,6 +50,7 @@ sysprof-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig + vmove usr/lib/libsysprof-6.so vmove "usr/lib/*.a" } } From ac8be3f3023ad2e69da6087dc7a4f0f9e44147f7 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 6 Feb 2024 08:57:31 -0800 Subject: [PATCH 4/6] New package: libpeas2-2.0.1 --- common/shlibs | 1 + srcpkgs/libpeas2-devel | 1 + srcpkgs/libpeas2/template | 39 +++++++++++++++++++++++++++++++++++++++ srcpkgs/libpeas2/update | 1 + 4 files changed, 42 insertions(+) create mode 120000 srcpkgs/libpeas2-devel create mode 100644 srcpkgs/libpeas2/template create mode 100644 srcpkgs/libpeas2/update diff --git a/common/shlibs b/common/shlibs index ee46014399bd41..29b10e8ccef2b5 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..84d8b99454c0cd --- /dev/null +++ b/srcpkgs/libpeas2/template @@ -0,0 +1,39 @@ +# 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 vala" +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 + } +} diff --git a/srcpkgs/libpeas2/update b/srcpkgs/libpeas2/update new file mode 100644 index 00000000000000..b6c2df50417c2e --- /dev/null +++ b/srcpkgs/libpeas2/update @@ -0,0 +1 @@ +pkgname=libpeas From 6d63d18ad22d4188f97e74c674ec4feeff11479e Mon Sep 17 00:00:00 2001 From: oreo639 Date: Tue, 6 Feb 2024 09:53:38 -0800 Subject: [PATCH 5/6] gnome-builder: update to 45.0. --- .../patches/fix-gtk4-4.12.5.patch | 28 +++++++++++++++++++ srcpkgs/gnome-builder/template | 8 +++--- 2 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/gnome-builder/patches/fix-gtk4-4.12.5.patch diff --git a/srcpkgs/gnome-builder/patches/fix-gtk4-4.12.5.patch b/srcpkgs/gnome-builder/patches/fix-gtk4-4.12.5.patch new file mode 100644 index 00000000000000..40d7114ffc428e --- /dev/null +++ b/srcpkgs/gnome-builder/patches/fix-gtk4-4.12.5.patch @@ -0,0 +1,28 @@ +See: https://gitlab.gnome.org/GNOME/gnome-builder/-/issues/2160 + +From 7aaaecefc2ea8a37eaeae8b4d726d119d4eb8fa3 Mon Sep 17 00:00:00 2001 +From: Christian Hergert +Date: Mon, 15 Jan 2024 11:54:38 -0800 +Subject: [PATCH] libide/tweaks: remove autoptr cleanup + +This is not needed now with recent GTK changes merged this morning. +--- + src/libide/tweaks/ide-tweaks-window.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/libide/tweaks/ide-tweaks-window.c b/src/libide/tweaks/ide-tweaks-window.c +index f2553a396e..dcb55bb351 100644 +--- a/src/libide/tweaks/ide-tweaks-window.c ++++ b/src/libide/tweaks/ide-tweaks-window.c +@@ -32,8 +32,6 @@ + #include "ide-tweaks-panel-list-private.h" + #include "ide-tweaks-window.h" + +-G_DEFINE_AUTOPTR_CLEANUP_FUNC (GtkStackPage, g_object_unref) +- + struct _IdeTweaksWindow + { + AdwWindow parent_instance; +-- +GitLab + 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" From 240711d36d4d9e9ecdf8977fa1f8a1586c3edd2e Mon Sep 17 00:00:00 2001 From: oreo639 Date: Mon, 4 Mar 2024 18:36:56 -0800 Subject: [PATCH 6/6] libpeas: ignore 2.x and 1.99.x series for update-check --- srcpkgs/libpeas/update | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 srcpkgs/libpeas/update diff --git a/srcpkgs/libpeas/update b/srcpkgs/libpeas/update new file mode 100644 index 00000000000000..970bfb33ce53be --- /dev/null +++ b/srcpkgs/libpeas/update @@ -0,0 +1,2 @@ +# ignore libpeas2 and 1.99 unstable series +ignore="?.99.* 2.*"