From 042d423ade675bb35a5fe3031a070c42f0f56924 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 17 Mar 2024 21:27:04 -0700 Subject: [PATCH 1/4] New package: magpie-0.9.3 --- common/shlibs | 4 +++ srcpkgs/magpie-devel | 1 + srcpkgs/magpie/patches/fixudev.patch | 16 ++++++++++ srcpkgs/magpie/template | 48 ++++++++++++++++++++++++++++ 4 files changed, 69 insertions(+) create mode 120000 srcpkgs/magpie-devel create mode 100644 srcpkgs/magpie/patches/fixudev.patch create mode 100644 srcpkgs/magpie/template diff --git a/common/shlibs b/common/shlibs index 1b554f23bcfe12..44db299f50298d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3857,6 +3857,10 @@ libraven.so.0 budgie-desktop-10.5.1_1 libbudgie-private.so.0 budgie-desktop-10.5.1_1 libbudgietheme.so.0 budgie-desktop-10.5.1_1 libbudgie-plugin.so.0 budgie-desktop-10.5.1_1 +libmagpie-0.so.0 magpie-0.9.3_1 +libmagpie-clutter-0.so.0 magpie-0.9.3_1 +libmagpie-cogl-0.so.0 magpie-0.9.3_1 +libmagpie-cogl-pango-0.so.0 magpie-0.9.3_1 libslirp.so.0 libslirp-4.2.0_1 libqpdf.so.29 libqpdf-11.0.0_1 libstk-4.6.1.so libstk-4.6.1_1 diff --git a/srcpkgs/magpie-devel b/srcpkgs/magpie-devel new file mode 120000 index 00000000000000..5e7a181f818529 --- /dev/null +++ b/srcpkgs/magpie-devel @@ -0,0 +1 @@ +magpie \ No newline at end of file diff --git a/srcpkgs/magpie/patches/fixudev.patch b/srcpkgs/magpie/patches/fixudev.patch new file mode 100644 index 00000000000000..93753ae0dbf323 --- /dev/null +++ b/srcpkgs/magpie/patches/fixudev.patch @@ -0,0 +1,16 @@ +Apparently the version limit is only required for systemd udev, it works +just fine with our version of eudev. + +diff --git meson.build meson.build +index dc210e6..6e080ca 100644 +--- a/meson.build ++++ b/meson.build +@@ -168,7 +168,7 @@ endif + + have_libgudev = get_option('udev') + if have_libgudev +- libudev_dep = dependency('libudev', version: udev_req) ++ libudev_dep = dependency('libudev') + gudev_dep = dependency('gudev-1.0', version: gudev_req) + endif + diff --git a/srcpkgs/magpie/template b/srcpkgs/magpie/template new file mode 100644 index 00000000000000..515fa2989f28b2 --- /dev/null +++ b/srcpkgs/magpie/template @@ -0,0 +1,48 @@ +# Template file for 'magpie' +pkgname=magpie +version=0.9.3 +revision=1 +build_helper="gir" +build_style=meson +configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true + -Dprofiler=false -Dintrospection=true" +hostmakedepends="gettext glib-devel pkg-config zenity xorg-server" +makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel + json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel + libinput-devel MesaLib-devel pipewire-devel startup-notification-devel gtk+3-devel + gnome-settings-daemon-devel libgudev-devel libwacom-devel" +depends="gsettings-desktop-schemas desktop-file-utils" +short_desc="X11 window manager and compositor library for Budgie Desktop" +maintainer="Orphaned " +license="GPL-2.0-or-later" +homepage="https://github.com/BuddiesOfBudgie/magpie" +distfiles="https://github.com/BuddiesOfBudgie/magpie/releases/download/v${version}/magpie-${version}.tar.xz" +checksum=99060cefe4684be05daf8e82b414b78d15cbe2c723993db902681ab4017bbbe9 +shlib_provides="libmagpie-clutter-0.so libmagpie-cogl-0.so + libmagpie-cogl-pango-0.so" +make_check=no # needs a full graphical session + +# Upstream keeps pulling generated headers even though it can cause race +# conditions in meson/ninja +pre_build() { + ninja ${makejobs} -C build src/meta-dbus-display-config.h +} + +post_install() { + # modify the pkg-config files to respect ${pc_sysrootdir} for variables that are + # meant to be called with 'pkg-config --variable' + vsed -e 's|^girdir.*|girdir=${pc_sysrootdir}/${libdir}/magpie-0|g' \ + -i ${DESTDIR}/usr/lib/pkgconfig/libmagpie-0.pc +} + +magpie-devel_package() { + depends="gtk+3-devel graphene-devel clutter-devel + libX11-devel libXtst-devel magpie-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/magpie-0/*.gir" + vmove "usr/lib/*.so" + } +} From 28dd0eda852c8c66659c3c9cc59b7a28b63f7cbf Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 17 Mar 2024 21:27:32 -0700 Subject: [PATCH 2/4] budgie-desktop: update to 10.8.2. --- srcpkgs/budgie-desktop/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template index 7bd1793b6f119e..74d5d0eb7e7b1e 100644 --- a/srcpkgs/budgie-desktop/template +++ b/srcpkgs/budgie-desktop/template @@ -1,14 +1,14 @@ # Template file for 'budgie-desktop' pkgname=budgie-desktop -version=10.7.2 -revision=3 +version=10.8.2 +revision=1 build_style=meson build_helper=gir configure_args="-Dwith-gtk-doc=false -Duse-old-zenity=true" hostmakedepends="pkg-config intltool vala glib-devel gobject-introspection sassc budgie-screensaver zenity" makedepends="alsa-lib-devel libcanberra-devel libgee-devel libnotify-devel - accountsservice-devel libpeas-devel libwnck-devel mutter-devel ibus-devel + accountsservice-devel libpeas-devel libwnck-devel magpie-devel ibus-devel gnome-desktop-devel pulseaudio-devel upower-devel gtk+3-devel polkit-devel gnome-bluetooth1-devel gnome-menus-devel gnome-settings-daemon-devel vala libupower-glib3 libuuid-devel" @@ -19,7 +19,7 @@ maintainer="Orphaned " license="GPL-2.0-only, LGPL-2.1-only" homepage="https://github.com/BuddiesOfBudgie/budgie-desktop" distfiles="https://github.com/BuddiesOfBudgie/budgie-desktop/releases/download/v${version}/budgie-desktop-v${version}.tar.xz" -checksum=cce9ebe21b4bba4886bb2a227d739b7340c35085f08c132d3d8ae6b6621ba7b4 +checksum=a8f88a253a787bb51f122923456103b1dfd4b880c3c6be6cb08e6c70624f9673 budgie-desktop-devel_package() { short_desc+=" - development files" From 74cb56fa98d53bf457c34d115eb40b19989be5e6 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 17 Mar 2024 21:28:08 -0700 Subject: [PATCH 3/4] budgie-control-center: update to 1.4.0. --- .../budgie-control-center/patches/gcc14.patch | 65 +++++++++++++++++++ srcpkgs/budgie-control-center/template | 8 +-- 2 files changed, 69 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/budgie-control-center/patches/gcc14.patch diff --git a/srcpkgs/budgie-control-center/patches/gcc14.patch b/srcpkgs/budgie-control-center/patches/gcc14.patch new file mode 100644 index 00000000000000..893bbf13273fdd --- /dev/null +++ b/srcpkgs/budgie-control-center/patches/gcc14.patch @@ -0,0 +1,65 @@ +From 5d486ad2af74a6b5f643819f1000cb8388eba43d Mon Sep 17 00:00:00 2001 +From: Joshua Strobl +Date: Sat, 16 Mar 2024 16:44:46 +0200 +Subject: [PATCH] fix: FTBFS with incompatible-pointer-types + +--- + meson.build | 3 ++- + panels/display/cc-display-panel.c | 2 +- + panels/display/cc-display-settings.c | 2 +- + panels/sound/cc-sound-panel.c | 2 +- + 4 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/meson.build b/meson.build +index d0744aa89..c8dde2c2b 100644 +--- a/meson.build ++++ b/meson.build +@@ -77,7 +77,8 @@ if get_option('buildtype').contains('debug') + '-Wmissing-prototypes', + '-Wnested-externs', + '-Wno-strict-aliasing', +- '-Wno-sign-compare' ++ '-Wno-sign-compare', ++ '-Wno-incompatible-pointer-types' + ] + + common_flags += cc.get_supported_arguments(test_cflags) +diff --git a/panels/display/cc-display-panel.c b/panels/display/cc-display-panel.c +index 07ac4f291..61a6dab84 100644 +--- a/panels/display/cc-display-panel.c ++++ b/panels/display/cc-display-panel.c +@@ -959,7 +959,7 @@ set_current_output (CcDisplayPanel *panel, + if (cc_has_fractional_key()) + { + lockdown=cc_display_config_get_fractional_scaling (panel->current_config); +- gtk_widget_set_sensitive(panel->automatic_screen_lock_switch, !lockdown); ++ gtk_widget_set_sensitive(GTK_WIDGET (panel->automatic_screen_lock_switch), !lockdown); + } + } + +diff --git a/panels/display/cc-display-settings.c b/panels/display/cc-display-settings.c +index 406e7fe7c..0cf1369b4 100644 +--- a/panels/display/cc-display-settings.c ++++ b/panels/display/cc-display-settings.c +@@ -450,7 +450,7 @@ cc_display_settings_rebuild_ui (CcDisplaySettings *self) + cc_display_config_get_fractional_scaling (self->config)); + + gtk_switch_set_active (GTK_SWITCH (self->scale_fractional_switch), cc_display_config_get_fractional_scaling (self->config)); +- gtk_widget_set_visible(self->scale_fractional_row, cc_has_fractional_key()); ++ gtk_widget_set_visible(GTK_WIDGET (self->scale_fractional_row), cc_has_fractional_key()); + + gtk_widget_set_visible (self->underscanning_row, + cc_display_monitor_supports_underscanning (self->selected_output) && +diff --git a/panels/sound/cc-sound-panel.c b/panels/sound/cc-sound-panel.c +index c447bbf9a..75291d547 100644 +--- a/panels/sound/cc-sound-panel.c ++++ b/panels/sound/cc-sound-panel.c +@@ -300,7 +300,7 @@ cc_sound_panel_init (CcSoundPanel *self) + G_CONNECT_SWAPPED); + allow_amplified_changed_cb (self); + +- gtk_widget_set_visible(self->budgie_output_listbox, TRUE); ++ gtk_widget_set_visible(GTK_WIDGET (self->budgie_output_listbox), TRUE); + gtk_widget_set_visible(GTK_WIDGET (self->output_volume_slider), FALSE); + g_settings_bind (self->sound_settings, "allow-volume-overdrive", + self->allow_amplify_switch, "active", G_SETTINGS_BIND_DEFAULT); diff --git a/srcpkgs/budgie-control-center/template b/srcpkgs/budgie-control-center/template index 28210562f587ca..fb3bd06b5d65c0 100644 --- a/srcpkgs/budgie-control-center/template +++ b/srcpkgs/budgie-control-center/template @@ -1,13 +1,13 @@ # Template file for 'budgie-control-center' pkgname=budgie-control-center -version=1.2.0 -revision=2 +version=1.4.0 +revision=1 build_style=meson hostmakedepends="glib-devel gsettings-desktop-schemas-devel gettext pkg-config polkit python3 libxml2" makedepends="ModemManager-devel NetworkManager-devel accountsservice-devel colord-devel colord-gtk-devel gnome-bluetooth1-devel gnome-desktop-devel - gnome-online-accounts-devel gnome-settings-daemon-devel ibus-devel + gnome-settings-daemon-devel ibus-devel libgtop-devel libhandy1-devel libpwquality-devel mit-krb5-devel libnma-devel polkit-devel pulseaudio-devel samba-devel upower-devel libxml2-devel libX11-devel libXi-devel libepoxy-devel gdk-pixbuf-devel gtk+3-devel @@ -20,7 +20,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://github.com/BuddiesOfBudgie/budgie-control-center" distfiles="https://github.com/BuddiesOfBudgie/budgie-control-center/releases/download/v${version}/budgie-control-center-${version}.tar.xz" -checksum=b72ee32b914795107e3c65b21128cac984e8920aa2e1b2ecc4f6c8fd67be9cc2 +checksum=120d760b6c1190e937cc7f3b3c50227682960123ff0bccfe3ff4902785550d82 budgie-control-center-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From 3ae6d77914a3ca6330406a4f5996e0baadebea47 Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sun, 17 Mar 2024 21:28:47 -0700 Subject: [PATCH 4/4] budgie-desktop-view: update to 1.3. --- .../patches/no-require-git.patch | 15 --------------- srcpkgs/budgie-desktop-view/template | 4 ++-- 2 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 srcpkgs/budgie-desktop-view/patches/no-require-git.patch diff --git a/srcpkgs/budgie-desktop-view/patches/no-require-git.patch b/srcpkgs/budgie-desktop-view/patches/no-require-git.patch deleted file mode 100644 index 1d95048366ba0d..00000000000000 --- a/srcpkgs/budgie-desktop-view/patches/no-require-git.patch +++ /dev/null @@ -1,15 +0,0 @@ -check: true causes run_command (which will error with chroot-git) to fail - -reverts part of be1a8e62cfe70af0b0dd97a08271d177d0c2b1d3 - ---- a/meson.build -+++ b/meson.build -@@ -43,7 +43,7 @@ - package_version = meson.project_version() - - if git.found() -- git_version = run_command('git', ['rev-parse', 'HEAD'], check: true) -+ git_version = run_command('git', ['rev-parse', 'HEAD']) - if git_version.returncode() == 0 - package_version += ' (git-'+git_version.stdout().strip()+')' - endif diff --git a/srcpkgs/budgie-desktop-view/template b/srcpkgs/budgie-desktop-view/template index 723bd69f5f1e1d..ab90a0d3de5a85 100644 --- a/srcpkgs/budgie-desktop-view/template +++ b/srcpkgs/budgie-desktop-view/template @@ -1,6 +1,6 @@ # Template file for 'budgie-desktop-view' pkgname=budgie-desktop-view -version=1.2.1 +version=1.3 revision=1 build_style=meson hostmakedepends="pkg-config intltool vala glib-devel" @@ -10,4 +10,4 @@ maintainer="Orphaned " license="Apache-2.0" homepage="https://github.com/BuddiesOfBudgie/budgie-desktop-view" distfiles="https://github.com/BuddiesOfBudgie/budgie-desktop-view/releases/download/v${version}/budgie-desktop-view-v${version}.tar.xz" -checksum=045d5ed7586fc26bbee82df31369b5ddbe30b5f0d7f11486210f3e14ccbfd536 +checksum=acf47e478fa6df75308c1a553668d236a484bd5fb1b60deba4b7744de0445411