diff options
Diffstat (limited to 'x11')
109 files changed, 2511 insertions, 604 deletions
diff --git a/x11/Makefile b/x11/Makefile index 5cbec6dae5f1..0addc97e569f 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -34,6 +34,7 @@ SUBDIR += budgie SUBDIR += budgie-desktop SUBDIR += budgie-screensaver + SUBDIR += budgie-session SUBDIR += cde SUBDIR += cde-devel SUBDIR += chayang @@ -301,6 +302,12 @@ SUBDIR += nvidia-driver-390 SUBDIR += nvidia-driver-470 SUBDIR += nvidia-driver-devel + SUBDIR += nvidia-kmod + SUBDIR += nvidia-kmod-304 + SUBDIR += nvidia-kmod-340 + SUBDIR += nvidia-kmod-390 + SUBDIR += nvidia-kmod-470 + SUBDIR += nvidia-kmod-devel SUBDIR += nvidia-settings SUBDIR += nvidia-xconfig SUBDIR += nwg-bar diff --git a/x11/alacarte/Makefile b/x11/alacarte/Makefile index 7baab882384e..dbe5272cf112 100644 --- a/x11/alacarte/Makefile +++ b/x11/alacarte/Makefile @@ -1,5 +1,5 @@ PORTNAME= alacarte -PORTVERSION= 3.56.0 +PORTVERSION= 3.58.0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome diff --git a/x11/alacarte/distinfo b/x11/alacarte/distinfo index fdd3aac5e073..b21a70bffc7a 100644 --- a/x11/alacarte/distinfo +++ b/x11/alacarte/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745748379 -SHA256 (gnome/alacarte-3.56.0.tar.xz) = 28e974ac44f4e55bb563b4ca7e93fdb319b744d837e4f02e5238adb71a661321 -SIZE (gnome/alacarte-3.56.0.tar.xz) = 261904 +TIMESTAMP = 1758635982 +SHA256 (gnome/alacarte-3.58.0.tar.xz) = 3f4eb9370a9cd97547ec2f182d091f59315eea5ed335cc8243d4df2354862d52 +SIZE (gnome/alacarte-3.58.0.tar.xz) = 263796 diff --git a/x11/alacarte/pkg-plist b/x11/alacarte/pkg-plist index 4df121e7c600..aebf73ce584d 100644 --- a/x11/alacarte/pkg-plist +++ b/x11/alacarte/pkg-plist @@ -38,6 +38,7 @@ share/locale/an/LC_MESSAGES/alacarte.mo share/locale/ar/LC_MESSAGES/alacarte.mo share/locale/as/LC_MESSAGES/alacarte.mo share/locale/ast/LC_MESSAGES/alacarte.mo +share/locale/az/LC_MESSAGES/alacarte.mo share/locale/be/LC_MESSAGES/alacarte.mo share/locale/be@latin/LC_MESSAGES/alacarte.mo share/locale/bem/LC_MESSAGES/alacarte.mo diff --git a/x11/budgie-desktop/Makefile b/x11/budgie-desktop/Makefile index 84b91c11fbcc..6e36739534e8 100644 --- a/x11/budgie-desktop/Makefile +++ b/x11/budgie-desktop/Makefile @@ -1,7 +1,6 @@ PORTNAME= budgie-desktop -DISTVERSION= 10.8.2 -PORTREVISION= 7 DISTVERSIONPREFIX= v +DISTVERSION= 10.9.3 CATEGORIES= x11 budgie MASTER_SITES= BUDGIE @@ -9,13 +8,15 @@ MAINTAINER= duchateau.olivier@gmail.com COMMENT= Modern and familiar desktop environment WWW= https://github.com/BuddiesOfBudgie/budgie-desktop -LICENSE_COMB= multi -LICENSE= GPLv2 LGPL21 +LICENSE= GPLv2 LGPL21 +LICENSE_COMB= multi +LICENSE_FILE_GPLv2= ${WRKSRC}/LICENSE +LICENSE_FILE_LGPL21= ${WRKSRC}/LICENSE.LGPL2.1 BUILD_DEPENDS= gnome-settings-daemon>0:sysutils/gnome-settings-daemon \ gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas \ sassc:textproc/sassc \ - zenity>0:x11/zenity + zenity:x11/zenity LIB_DEPENDS= libpolkit-gobject-1.so:sysutils/polkit \ libpeas-1.0.so:devel/libpeas1 \ libuuid.so:misc/libuuid \ @@ -28,27 +29,30 @@ LIB_DEPENDS= libpolkit-gobject-1.so:sysutils/polkit \ libibus-1.0.so:textproc/ibus \ libcanberra.so:audio/libcanberra \ libcanberra-gtk3.so:audio/libcanberra-gtk3 \ - libgee-0.8.so:devel/libgee + libgee-0.8.so:devel/libgee \ + libgudev-1.0.so:devel/libgudev RUN_DEPENDS= gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas \ - gnome-session>0:x11/gnome-session \ + budgie-session>0:x11/budgie-session \ consolekit2>0:sysutils/consolekit2 \ - zenity>0:x11/zenity \ - xdotool>0:x11/xdotool + zenity:x11/zenity \ + xdotool:x11/xdotool \ + matcha-gtk-themes>0:x11-themes/matcha-gtk-themes \ + xdg-desktop-portal-gtk>0:x11/xdg-desktop-portal-gtk -USES= budgie gettext gnome gstreamer meson pkgconfig tar:xz \ - vala:build xorg +USES= budgie gettext-tools gnome gstreamer meson pkgconfig \ + tar:xz vala:build xfce xorg USE_BUDGIE= libmagpie screensaver:build USE_GNOME= cairo gdkpixbuf glib20 gnomedesktop3 gnomemenus3 \ - gtk30 intltool introspection libwnck3 + gtk30 intltool:build introspection libwnck3 USE_GSTREAMER= libgstreamer -USE_XORG= x11 xcomposite +USE_XFCE= windowing +USE_XORG= x11 xext xfixes xi xorgproto MESON_ARGS= -Dwith-gtk-doc=false \ -Dwith-bluetooth=false \ - -Dwith-hibernate=false \ - -Dwith-libuuid-time-safe=false + -Dwith-hibernate=false -# If zenity >= 3.90 → build against Gtk4 (new API) +# As long as x11/gtk30 is required, we depend of x11/zenity MESON_ARGS+= -Duse-old-zenity=true GLIB_SCHEMAS= 20_buddiesofbudgie.budgie-desktop.notifications.gschema.override \ @@ -70,9 +74,10 @@ GLIB_SCHEMAS= 20_buddiesofbudgie.budgie-desktop.notifications.gschema.override \ org.buddiesofbudgie.budgie-desktop.raven.widget.SoundOutput.gschema.xml \ org.buddiesofbudgie.budgie-desktop.raven.widget.UsageMonitor.gschema.xml \ org.buddiesofbudgie.budgie-desktop.screenshot.gschema.xml \ + org.buddiesofbudgie.settings-daemon.plugins.media-keys.gschema.xml \ 25_org.buddiesofbudgie-default-settings.gschema.override -NO_SHLIB_REQUIRES_GLOB= libmagpie-clutter-0.so.0 libmagpie-cogl-0.so.0 +NO_SHLIB_REQUIRES_GLOB= libmagpie-clutter-* libmagpie-cogl-* .include <bsd.port.options.mk> diff --git a/x11/budgie-desktop/distinfo b/x11/budgie-desktop/distinfo index 504322517353..def5651d1448 100644 --- a/x11/budgie-desktop/distinfo +++ b/x11/budgie-desktop/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1697701076 -SHA256 (budgie/budgie-desktop-v10.8.2.tar.xz) = a8f88a253a787bb51f122923456103b1dfd4b880c3c6be6cb08e6c70624f9673 -SIZE (budgie/budgie-desktop-v10.8.2.tar.xz) = 3185304 +TIMESTAMP = 1757339341 +SHA256 (budgie/budgie-desktop-v10.9.3.tar.xz) = 959f27e0a4d1c61c4d4ddc41dff7c417b1408c8cc628a434b4151f3c3a0437b1 +SIZE (budgie/budgie-desktop-v10.9.3.tar.xz) = 2418792 diff --git a/x11/budgie-desktop/files/25_org.buddiesofbudgie-default-settings.gschema.override b/x11/budgie-desktop/files/25_org.buddiesofbudgie-default-settings.gschema.override index bc1c026255b8..b83618d981ec 100644 --- a/x11/budgie-desktop/files/25_org.buddiesofbudgie-default-settings.gschema.override +++ b/x11/budgie-desktop/files/25_org.buddiesofbudgie-default-settings.gschema.override @@ -7,12 +7,12 @@ menu-icon='budgie-menu-symbolic' [org.gnome.desktop.interface:Budgie] cursor-theme='Adwaita' -gtk-theme='Qogir-Dark' +gtk-theme='Matcha-sea' icon-theme='Tela' color-scheme='prefer-dark' [org.gnome.desktop.wm.preferences:Budgie] -theme='Qogir-Dark' +theme='Matcha-sea' [org.gnome.desktop.screensaver] lock-enabled=false @@ -30,6 +30,3 @@ default-zoom-level='small' [org.freedesktop.ibus.panel:Budgie] show-icon-on-systray=true - -[org.gnome.desktop.background:Budgie] -show-desktop-icons=true diff --git a/x11/budgie-desktop/files/patch-data_budgie-portals.conf b/x11/budgie-desktop/files/patch-data_budgie-portals.conf new file mode 100644 index 000000000000..52d6329174c4 --- /dev/null +++ b/x11/budgie-desktop/files/patch-data_budgie-portals.conf @@ -0,0 +1,7 @@ +--- data/budgie-portals.conf.orig 2025-09-07 12:35:19 UTC ++++ data/budgie-portals.conf +@@ -1,3 +1,3 @@ + [preferred] + # Use xdg-desktop-portal-gtk for every portal interface +-default=gtk ++default=gtk; diff --git a/x11/budgie-desktop/files/patch-data_meson.build b/x11/budgie-desktop/files/patch-data_meson.build index 126e475b7604..44d43f1cf286 100644 --- a/x11/budgie-desktop/files/patch-data_meson.build +++ b/x11/budgie-desktop/files/patch-data_meson.build @@ -1,19 +1,15 @@ ---- data/meson.build.orig 2023-09-30 15:44:12 UTC +--- data/meson.build.orig 2025-09-07 12:35:19 UTC +++ data/meson.build -@@ -16,7 +16,13 @@ install_data( +@@ -16,6 +16,12 @@ install_data( install_dir: join_paths(datadir, 'budgie') ) --install_data( -- 'budgie-portals.conf', -- install_dir: join_paths(datadir, 'xdg-desktop-portal') +# Our own settings -+install_data('25_org.buddiesofbudgie-default-settings.gschema.override', ++install_data( ++ '25_org.buddiesofbudgie-default-settings.gschema.override', + install_dir: join_paths(datadir, 'glib-2.0', 'schemas') - ) ++) + -+# It requires, x11/xdg-desktop-portal-gtk > 1.17.x -+#install_data( -+# 'budgie-portals.conf', -+# install_dir: join_paths(datadir, 'xdg-desktop-portal') -+#) + install_data( + 'budgie-portals.conf', + install_dir: join_paths(datadir, 'xdg-desktop-portal') diff --git a/x11/budgie-desktop/files/patch-meson.build b/x11/budgie-desktop/files/patch-meson.build index dc7bc1e0d710..dea6cb444129 100644 --- a/x11/budgie-desktop/files/patch-meson.build +++ b/x11/budgie-desktop/files/patch-meson.build @@ -1,19 +1,18 @@ ---- meson.build.orig 2023-09-30 15:44:12 UTC +--- meson.build.orig 2025-09-07 12:35:19 UTC +++ meson.build -@@ -67,12 +67,6 @@ cdata = configuration_data() - # Inspired by https://github.com/GNOME/recipes/blob/master/meson.build +@@ -81,11 +81,6 @@ ci = get_option('ci') package_version = meson.project_version() --if fs.exists('.git') + ci = get_option('ci') +-if fs.exists('.git') and ci == false - git = find_program('git') - git_version = run_command('git', ['rev-parse', 'HEAD'], check: true) - package_version += ' (git-'+git_version.stdout().strip()+')' -endif -- + cdata.set_quoted('PACKAGE_VERSION', package_version) - # Make gettext work -@@ -154,7 +148,7 @@ if xdg_appdir == '' +@@ -164,7 +159,7 @@ if xdg_appdir == '' if with_stateless == true xdg_appdir = join_paths(datadir, 'xdg', 'autostart') else diff --git a/x11/budgie-desktop/files/patch-src_appindexer_Application.vala b/x11/budgie-desktop/files/patch-src_appindexer_Application.vala index e6bc6fc53faa..e5e1ceb6558b 100644 --- a/x11/budgie-desktop/files/patch-src_appindexer_Application.vala +++ b/x11/budgie-desktop/files/patch-src_appindexer_Application.vala @@ -1,6 +1,6 @@ ---- src/appindexer/Application.vala.orig 2023-01-29 15:27:27 UTC +--- src/appindexer/Application.vala.orig 2025-09-07 12:35:19 UTC +++ src/appindexer/Application.vala -@@ -41,8 +41,6 @@ namespace Budgie { +@@ -42,8 +42,6 @@ namespace Budgie { */ public signal void launch_failed(string startup_notify_id); @@ -9,7 +9,7 @@ /** * Create a new application from a `DesktopAppInfo`. */ -@@ -71,7 +69,6 @@ namespace Budgie { +@@ -73,7 +71,6 @@ namespace Budgie { } construct { @@ -17,7 +17,7 @@ } /** -@@ -125,9 +122,6 @@ namespace Budgie { +@@ -127,9 +124,6 @@ namespace Budgie { context.launch_failed.connect((startup_id) => { this.launch_failed(startup_id); }); diff --git a/x11/budgie-desktop/files/patch-src_appindexer_meson.build b/x11/budgie-desktop/files/patch-src_appindexer_meson.build index c9116d193f12..b0e69c03e439 100644 --- a/x11/budgie-desktop/files/patch-src_appindexer_meson.build +++ b/x11/budgie-desktop/files/patch-src_appindexer_meson.build @@ -1,6 +1,6 @@ ---- src/appindexer/meson.build.orig 2023-01-29 15:27:27 UTC +--- src/appindexer/meson.build.orig 2025-09-07 12:35:19 UTC +++ src/appindexer/meson.build -@@ -2,8 +2,7 @@ appindexer_sources = [ +@@ -4,8 +4,7 @@ appindexer_sources = [ 'AppIndex.vala', 'Application.vala', 'Category.vala', diff --git a/x11/budgie-desktop/files/patch-src_daemon_bsd_meson.build b/x11/budgie-desktop/files/patch-src_daemon_bsd_meson.build new file mode 100644 index 000000000000..17c7a17d98bc --- /dev/null +++ b/x11/budgie-desktop/files/patch-src_daemon_bsd_meson.build @@ -0,0 +1,11 @@ +--- src/daemon/bsd/meson.build.orig 2025-09-07 12:35:19 UTC ++++ src/daemon/bsd/meson.build +@@ -200,7 +200,7 @@ endif + endif + + # Rfkill +-enable_rfkill = true #get_option('rfkill') ++enable_rfkill = false #get_option('rfkill') + assert(enable_rfkill or not host_is_linux, 'rfkill is not optional on Linux platforms') + if enable_rfkill + assert(cc.has_header('linux/rfkill.h'), 'rfkill support requested but RFKill headers not found') diff --git a/x11/budgie-desktop/files/patch-src_daemon_bsd_plugins_power_gsd-power-manager.c b/x11/budgie-desktop/files/patch-src_daemon_bsd_plugins_power_gsd-power-manager.c new file mode 100644 index 000000000000..42e9b5f46ea2 --- /dev/null +++ b/x11/budgie-desktop/files/patch-src_daemon_bsd_plugins_power_gsd-power-manager.c @@ -0,0 +1,60 @@ +--- src/daemon/bsd/plugins/power/gsd-power-manager.c.orig 2025-09-07 12:35:19 UTC ++++ src/daemon/bsd/plugins/power/gsd-power-manager.c +@@ -75,9 +75,9 @@ + #define GSD_POWER_MANAGER_NOTIFY_TIMEOUT_SHORT 10 * 1000 /* ms */ + #define GSD_POWER_MANAGER_NOTIFY_TIMEOUT_LONG 30 * 1000 /* ms */ + +-#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" +-#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1" +-#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager" ++#define CK_DBUS_NAME "org.freedesktop.ConsoleKit" ++#define CK_DBUS_PATH "/org/freedesktop/ConsoleKit/Manager" ++#define CK_DBUS_INTERFACE "org.freedesktop.ConsoleKit.Manager" + + /* Time between notifying the user about a critical action and the action itself in UPower. */ + #define GSD_ACTION_DELAY 20 +@@ -1151,7 +1151,7 @@ action_poweroff (GsdPowerManager *manager) + action_poweroff (GsdPowerManager *manager) + { + if (manager->logind_proxy == NULL) { +- g_warning ("no systemd support"); ++ g_warning ("no ConsoleKit support"); + return; + } + g_dbus_proxy_call (manager->logind_proxy, +@@ -1168,7 +1168,7 @@ action_suspend (GsdPowerManager *manager) + action_suspend (GsdPowerManager *manager) + { + if (manager->logind_proxy == NULL) { +- g_warning ("no systemd support"); ++ g_warning ("no ConsoleKit support"); + return; + } + g_dbus_proxy_call (manager->logind_proxy, +@@ -1185,7 +1185,7 @@ action_hibernate (GsdPowerManager *manager) + action_hibernate (GsdPowerManager *manager) + { + if (manager->logind_proxy == NULL) { +- g_warning ("no systemd support"); ++ g_warning ("no ConsoleKit support"); + return; + } + g_dbus_proxy_call (manager->logind_proxy, +@@ -2951,13 +2951,13 @@ gsd_power_manager_initable_init (GInitable *initab + g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, + 0, + NULL, +- SYSTEMD_DBUS_NAME, +- SYSTEMD_DBUS_PATH, +- SYSTEMD_DBUS_INTERFACE, ++ CK_DBUS_NAME, ++ CK_DBUS_PATH, ++ CK_DBUS_INTERFACE, + NULL, + error); + if (manager->logind_proxy == NULL) { +- g_debug ("No systemd (logind) support, disabling plugin"); ++ g_debug ("No ConsoleKit support, disabling plugin"); + return FALSE; + } + } diff --git a/x11/budgie-desktop/files/patch-src_lib_animation.vala b/x11/budgie-desktop/files/patch-src_lib_animation.vala deleted file mode 100644 index 48676a0bb202..000000000000 --- a/x11/budgie-desktop/files/patch-src_lib_animation.vala +++ /dev/null @@ -1,10 +0,0 @@ ---- src/lib/animation.vala.orig 2025-03-22 02:16:00 UTC -+++ src/lib/animation.vala -@@ -27,7 +27,6 @@ namespace Budgie { - * Utility to struct to enable easier animations - * Inspired by Clutter. - */ -- [Compact] - public class Animation : GLib.Object { - public int64 start_time; /**<Start time (microseconds) of animation */ - public int64 length; /**<Length of animation in microseconds */ diff --git a/x11/budgie-desktop/files/patch-src_panel_applets_icon-tasklist_animation.vala b/x11/budgie-desktop/files/patch-src_panel_applets_icon-tasklist_animation.vala deleted file mode 100644 index 32a6baed199e..000000000000 --- a/x11/budgie-desktop/files/patch-src_panel_applets_icon-tasklist_animation.vala +++ /dev/null @@ -1,10 +0,0 @@ ---- src/panel/applets/icon-tasklist/animation.vala.orig 2025-03-22 02:28:21 UTC -+++ src/panel/applets/icon-tasklist/animation.vala -@@ -27,7 +27,6 @@ namespace BudgieTaskList { - * Utility to struct to enable easier animations - * Inspired by Clutter. - */ -- [Compact] - public class Animation : GLib.Object { - public int64 start_time; /**<Start time (microseconds) of animation */ - public int64 length; /**<Length of animation in microseconds */ diff --git a/x11/budgie-desktop/files/patch-src_panel_applets_status_StatusApplet.vala b/x11/budgie-desktop/files/patch-src_panel_applets_status_StatusApplet.vala deleted file mode 100644 index e875f4a20943..000000000000 --- a/x11/budgie-desktop/files/patch-src_panel_applets_status_StatusApplet.vala +++ /dev/null @@ -1,30 +0,0 @@ ---- src/panel/applets/status/StatusApplet.vala.orig 2023-01-29 15:27:27 UTC -+++ src/panel/applets/status/StatusApplet.vala -@@ -30,7 +30,6 @@ public class StatusSettings : Gtk.Grid { - public class StatusApplet : Budgie.Applet { - public string uuid { public set; public get; } - protected Gtk.Box widget; -- protected BluetoothIndicator blue; - protected SoundIndicator sound; - protected PowerIndicator power; - protected Gtk.EventBox? wrap; -@@ -84,11 +83,6 @@ public class StatusApplet : Budgie.Applet { - /* Hook up the popovers */ - this.setup_popover(power.ebox, power.popover); - this.setup_popover(sound.ebox, sound.popover); -- -- blue = new BluetoothIndicator(); -- widget.pack_start(blue, false, false, 0); -- blue.show_all(); -- this.setup_popover(blue.ebox, blue.popover); - } - - public override void panel_position_changed(Budgie.PanelPosition position) { -@@ -104,7 +98,6 @@ public class StatusApplet : Budgie.Applet { - this.manager = manager; - manager.register_popover(power.ebox, power.popover); - manager.register_popover(sound.ebox, sound.popover); -- manager.register_popover(blue.ebox, blue.popover); - } - - public override bool supports_settings() { diff --git a/x11/budgie-desktop/files/patch-src_panel_applets_status_meson.build b/x11/budgie-desktop/files/patch-src_panel_applets_status_meson.build deleted file mode 100644 index c5d796dba6e7..000000000000 --- a/x11/budgie-desktop/files/patch-src_panel_applets_status_meson.build +++ /dev/null @@ -1,10 +0,0 @@ ---- src/panel/applets/status/meson.build.orig 2023-01-29 15:27:27 UTC -+++ src/panel/applets/status/meson.build -@@ -19,7 +19,6 @@ applet_status_resources = gnome.compile_resources( - ) - - applet_status_sources = [ -- 'BluetoothIndicator.vala', - 'StatusApplet.vala', - 'PowerIndicator.vala', - 'SoundIndicator.vala', diff --git a/x11/budgie-desktop/files/patch-src_panel_manager.vala b/x11/budgie-desktop/files/patch-src_panel_manager.vala deleted file mode 100644 index c2f4f48a6075..000000000000 --- a/x11/budgie-desktop/files/patch-src_panel_manager.vala +++ /dev/null @@ -1,10 +0,0 @@ ---- src/panel/manager.vala.orig 2025-03-22 02:20:18 UTC -+++ src/panel/manager.vala -@@ -23,7 +23,6 @@ namespace Budgie { - /** - * Available slots - */ -- [Compact] - class Screen : GLib.Object { - public PanelPosition slots; - public Gdk.Rectangle area; diff --git a/x11/budgie-desktop/files/patch-src_panel_settings_themes.vala b/x11/budgie-desktop/files/patch-src_panel_settings_themes.vala deleted file mode 100644 index cda0e865699c..000000000000 --- a/x11/budgie-desktop/files/patch-src_panel_settings_themes.vala +++ /dev/null @@ -1,10 +0,0 @@ ---- src/panel/settings/themes.vala.orig 2025-03-22 02:24:35 UTC -+++ src/panel/settings/themes.vala -@@ -15,7 +15,6 @@ public enum ThemeType { - CURSOR_THEME - } - --[Compact] - class ThemeInfo : GLib.Object { - private ThemeType theme_type; - private List<string> paths; diff --git a/x11/budgie-desktop/files/patch-src_session_budgie-desktop.in b/x11/budgie-desktop/files/patch-src_session_budgie-desktop.in deleted file mode 100644 index f08d93ec6928..000000000000 --- a/x11/budgie-desktop/files/patch-src_session_budgie-desktop.in +++ /dev/null @@ -1,8 +0,0 @@ ---- src/session/budgie-desktop.in.orig 2023-01-29 15:27:27 UTC -+++ src/session/budgie-desktop.in -@@ -13,4 +13,4 @@ if [ -z $XDG_CURRENT_DESKTOP ]; then - export XDG_CURRENT_DESKTOP - fi - --exec gnome-session --builtin --session=org.buddiesofbudgie.BudgieDesktop $* -+exec gnome-session --builtin --disable-acceleration-check --session=org.buddiesofbudgie.BudgieDesktop $* diff --git a/x11/budgie-desktop/files/patch-src_session_meson.build b/x11/budgie-desktop/files/patch-src_session_meson.build index 40480f6b9e07..fe2302cb2e61 100644 --- a/x11/budgie-desktop/files/patch-src_session_meson.build +++ b/x11/budgie-desktop/files/patch-src_session_meson.build @@ -1,38 +1,24 @@ ---- src/session/meson.build.orig 2023-01-29 15:27:27 UTC +--- src/session/meson.build.orig 2025-09-07 12:35:19 UTC +++ src/session/meson.build -@@ -11,19 +11,15 @@ gnome_session_components = [ - - gnome_session_324_components = [ - 'org.gnome.SettingsDaemon.A11ySettings', -- 'org.gnome.SettingsDaemon.Color', -- 'org.gnome.SettingsDaemon.Datetime', - 'org.gnome.SettingsDaemon.Housekeeping', - 'org.gnome.SettingsDaemon.Keyboard', - 'org.gnome.SettingsDaemon.MediaKeys', - 'org.gnome.SettingsDaemon.Power', - 'org.gnome.SettingsDaemon.PrintNotifications', -- 'org.gnome.SettingsDaemon.Rfkill', - 'org.gnome.SettingsDaemon.ScreensaverProxy', - 'org.gnome.SettingsDaemon.Sharing', - 'org.gnome.SettingsDaemon.Smartcard', - 'org.gnome.SettingsDaemon.Sound', -- 'org.gnome.SettingsDaemon.Wacom', - 'org.gnome.SettingsDaemon.XSettings', - ] - -@@ -113,15 +109,6 @@ custom_target('desktop-file-xsession', - install_dir : join_paths(datadir, 'xsessions'), - ) - -- --# Merge + install nm-applet --custom_target('desktop-file-nm-applet', -- input : 'budgie-desktop-nm-applet.desktop.in', -- output : 'org.buddiesofbudgie.BudgieDesktopNmApplet.desktop', -- command : [intltool, '--desktop-style', podir, '@INPUT@', '@OUTPUT@'], +@@ -9,11 +9,8 @@ budgie_session_324_components = [ + budgie_session_324_components = [ + 'org.buddiesofbudgie.SettingsDaemon.A11ySettings', + 'org.buddiesofbudgie.SettingsDaemon.Color', +- 'org.buddiesofbudgie.SettingsDaemon.Datetime', +- 'org.buddiesofbudgie.SettingsDaemon.Housekeeping', + 'org.buddiesofbudgie.SettingsDaemon.Keyboard', + 'org.buddiesofbudgie.SettingsDaemon.PrintNotifications', +- 'org.buddiesofbudgie.SettingsDaemon.Rfkill', + 'org.buddiesofbudgie.SettingsDaemon.ScreensaverProxy', + 'org.buddiesofbudgie.SettingsDaemon.Sharing', + 'org.buddiesofbudgie.SettingsDaemon.Smartcard', +@@ -114,8 +111,7 @@ custom_target('desktop-file-nm-applet', + input : 'budgie-desktop-nm-applet.desktop.in', + output : 'org.buddiesofbudgie.BudgieDesktopNmApplet.desktop', + command : [intltool, '--desktop-style', podir, '@INPUT@', '@OUTPUT@'], - install : true, - install_dir : xdg_appdir, --) ++ install : false, + ) # Write the budgie-desktop-screensaver.in file from the appropriate .in.in - if with_gnome_screensaver == true diff --git a/x11/budgie-desktop/files/patch-update-libxfce4windowing-vapi.patch b/x11/budgie-desktop/files/patch-update-libxfce4windowing-vapi.patch new file mode 100644 index 000000000000..303e8ac3914a --- /dev/null +++ b/x11/budgie-desktop/files/patch-update-libxfce4windowing-vapi.patch @@ -0,0 +1,893 @@ +Based on https://github.com/BuddiesOfBudgie/budgie-desktop/pull/722 + +--- src/daemon/tabswitcher.vala.orig 2025-09-07 12:35:19 UTC ++++ src/daemon/tabswitcher.vala +@@ -12,7 +12,7 @@ using Gtk; + + using Gdk; + using Gtk; +-using libxfce4windowing; ++using Xfw; + + namespace Budgie { + public const string SHOW_ALL_WINDOWS_KEY = "show-all-windows-tabswitcher"; +@@ -47,18 +47,18 @@ namespace Budgie { + public class TabSwitcherWidget : Gtk.FlowBoxChild { + private Gtk.Image image; + private uint64 activation_timestamp; +- private libxfce4windowing.Application? application; ++ private Xfw.Application? application; + private DesktopAppInfo? info; + public string id; + public string title; + +- public unowned libxfce4windowing.Window? window = null; ++ public unowned Xfw.Window? window = null; + + public signal void closed(TabSwitcherWidget widget); +- public signal void window_activated(libxfce4windowing.Window window); ++ public signal void window_activated(Xfw.Window window); + public signal void workspace_changed(); + +- public TabSwitcherWidget(Budgie.AppSystem app_system, libxfce4windowing.Window? win) { ++ public TabSwitcherWidget(Budgie.AppSystem app_system, Xfw.Window? win) { + Object(); + window = win; + ulong uid = (ulong) window.x11_get_xid(); +@@ -68,7 +68,7 @@ namespace Budgie { + application = win.get_application(); + + // Running under X11 +- if (libxfce4windowing.windowing_get() == libxfce4windowing.Windowing.X11) { ++ if (Xfw.windowing_get() == Xfw.Windowing.X11) { + info = app_system.query_window_by_xid((ulong)uid); + } + +@@ -82,8 +82,8 @@ namespace Budgie { + + window.state_changed.connect((changed_mask, new_state) => { + if ( +- (libxfce4windowing.WindowState.ACTIVE in changed_mask) && +- (libxfce4windowing.WindowState.ACTIVE in new_state) ++ (Xfw.WindowState.ACTIVE in changed_mask) && ++ (Xfw.WindowState.ACTIVE in new_state) + ) { + activation_timestamp = get_time(); + window_activated(window); +@@ -127,11 +127,11 @@ namespace Budgie { + [GtkChild] + private unowned Label window_title; + +- private libxfce4windowing.Workspace? active_workspace = null; +- private unowned libxfce4windowing.WorkspaceGroup? workspace_group = null; ++ private Xfw.Workspace? active_workspace = null; ++ private unowned Xfw.WorkspaceGroup? workspace_group = null; + private Gdk.Screen? default_screen; +- private libxfce4windowing.Screen xfce_screen; +- private unowned libxfce4windowing.WorkspaceManager workspace_manager; ++ private Xfw.Screen xfce_screen; ++ private unowned Xfw.WorkspaceManager workspace_manager; + private Budgie.AppSystem? app_system = null; + + private Gdk.Monitor primary_monitor; +@@ -163,7 +163,7 @@ namespace Budgie { + + default_screen = Gdk.Screen.get_default(); + +- xfce_screen = libxfce4windowing.Screen.get_default(); ++ xfce_screen = Xfw.Screen.get_default(); + + xfce_screen.get_windows().foreach(add_window); + xfce_screen.window_opened.connect(add_window); +@@ -212,7 +212,7 @@ namespace Budgie { + window_box.invalidate_filter(); // Re-filter + } + +- private void add_window(libxfce4windowing.Window window) { ++ private void add_window(Xfw.Window window) { + if (window.is_skip_pager() || window.is_skip_tasklist()) return; + + var window_widget = new TabSwitcherWidget(app_system, window); +@@ -333,7 +333,7 @@ namespace Budgie { + update_sizing(); + } + +- private void set_window_as_activated(libxfce4windowing.Window window) { ++ private void set_window_as_activated(Xfw.Window window) { + string id = ((ulong) window.x11_get_xid()).to_string(); + unowned List<string> entries = recency.find_custom(id, strcmp); + recency.remove_link(entries); +@@ -356,15 +356,15 @@ namespace Budgie { + move_switcher(); + } + +- private bool window_on_active_workspace(libxfce4windowing.Window window) { +- unowned libxfce4windowing.Workspace? win_workspace = window.get_workspace(); // Get workspace ++ private bool window_on_active_workspace(Xfw.Window window) { ++ unowned Xfw.Workspace? win_workspace = window.get_workspace(); // Get workspace + if (active_workspace == null || win_workspace == null) return true; + return win_workspace.get_id() == active_workspace.get_id(); + } + + /* Switch focus to the item with the xid */ + public void focus_item(bool backwards) { +- unowned libxfce4windowing.Window? active_window = xfce_screen.get_active_window(); ++ unowned Xfw.Window? active_window = xfce_screen.get_active_window(); + TabSwitcherWidget? widget = active_window != null ? ids.get(((ulong) active_window.x11_get_xid()).to_string()) : null; + + // Visible, each input should cycle to previous / next +--- src/panel/applets/show-desktop/ShowDesktopApplet.vala.orig 2025-09-07 12:35:19 UTC ++++ src/panel/applets/show-desktop/ShowDesktopApplet.vala +@@ -18,7 +18,7 @@ public class ShowDesktopApplet : Budgie.Applet { + public class ShowDesktopApplet : Budgie.Applet { + protected Gtk.ToggleButton widget; + protected Gtk.Image img; +- private libxfce4windowing.Screen xfce_screen; ++ private Xfw.Screen xfce_screen; + + public ShowDesktopApplet() { + widget = new Gtk.ToggleButton(); +@@ -28,7 +28,7 @@ public class ShowDesktopApplet : Budgie.Applet { + widget.add(img); + widget.set_tooltip_text(_("Toggle the desktop")); + +- xfce_screen = libxfce4windowing.Screen.get_default(); ++ xfce_screen = Xfw.Screen.get_default(); + + xfce_screen.window_opened.connect((window) => { + if (window.is_skip_pager() || window.is_skip_tasklist()) return; +@@ -48,7 +48,7 @@ public class ShowDesktopApplet : Budgie.Applet { + try { + window.set_minimized(!showing_desktop); + } catch (Error e) { +- // Note: This is intentionally set to debug instead of warning because libxfce4windowing will create noise otherwise ++ // Note: This is intentionally set to debug instead of warning because Xfw will create noise otherwise + // Unminimize operations can end up being noisy when they fail due to the window not yet reporting the capability to support CAN_MINIMIZE + // https://gitlab.xfce.org/xfce/libxfce4windowing/-/blob/main/libxfce4windowing/xfw-window-x11.c#L363 + debug("Failed to change state of window \"%s\": %s", window.get_name(), e.message); +--- src/panel/applets/workspaces/WindowIcon.vala.orig 2025-09-07 12:35:19 UTC ++++ src/panel/applets/workspaces/WindowIcon.vala +@@ -13,9 +13,9 @@ namespace Workspaces { + public const int WORKSPACE_ICON_SIZE = 16; + + public class WindowIcon : Gtk.Button { +- private libxfce4windowing.Window window; ++ private Xfw.Window window; + +- public WindowIcon(libxfce4windowing.Window window) { ++ public WindowIcon(Xfw.Window window) { + this.window = window; + + this.set_relief(Gtk.ReliefStyle.NONE); +--- src/panel/applets/workspaces/WorkspaceItem.vala.orig 2025-09-07 12:35:19 UTC ++++ src/panel/applets/workspaces/WorkspaceItem.vala +@@ -15,7 +15,7 @@ namespace Workspaces { + }; + + public class WorkspaceItem : Gtk.EventBox { +- private libxfce4windowing.Workspace workspace; ++ private Xfw.Workspace workspace; + private Budgie.Popover popover; + private Gtk.Stack popover_stack; + private Gtk.FlowBox rest_of_the_icons; +@@ -25,7 +25,7 @@ namespace Workspaces { + private Gtk.Allocation real_alloc; + private float size_multiplier; + +- public WorkspaceItem(libxfce4windowing.Workspace space, float multiplier) { ++ public WorkspaceItem(Xfw.Workspace space, float multiplier) { + this.get_style_context().add_class("workspace-item"); + this.workspace = space; + this.size_multiplier = multiplier; +@@ -178,7 +178,7 @@ namespace Workspaces { + + if (data != null) { + try { +- foreach (libxfce4windowing.Window window in WorkspacesApplet.xfce_screen.get_windows()) { ++ foreach (Xfw.Window window in WorkspacesApplet.xfce_screen.get_windows()) { + if (window.x11_get_xid() == *data) { + window.move_to_workspace(this.workspace); + dnd_success = true; +@@ -193,7 +193,7 @@ namespace Workspaces { + Gtk.drag_finish(context, dnd_success, true, time); + } + +- public void update_windows(List<weak libxfce4windowing.Window> window_list) { ++ public void update_windows(List<weak Xfw.Window> window_list) { + int num_columns = (real_alloc.width - 4) / 20; + int num_rows = (real_alloc.height - 4) / 20; + +@@ -322,7 +322,7 @@ namespace Workspaces { + real_alloc.height = (int) (height * 2 * size_multiplier); + } + +- public libxfce4windowing.Workspace get_workspace() { ++ public Xfw.Workspace get_workspace() { + return workspace; + } + } +--- src/panel/applets/workspaces/WorkspacesApplet.vala.orig 2025-09-07 12:35:19 UTC ++++ src/panel/applets/workspaces/WorkspacesApplet.vala +@@ -57,7 +57,7 @@ namespace Workspaces { + private int size_change = 0; + private bool updating = false; + private ulong[] connections = {}; +- private HashTable<unowned libxfce4windowing.Window, ulong> window_connections; ++ private HashTable<unowned Xfw.Window, ulong> window_connections; + private List<int> dynamically_created_workspaces; + private Settings settings; + private AddButtonVisibility button_visibility = AddButtonVisibility.ALWAYS; +@@ -68,9 +68,9 @@ namespace Workspaces { + public static Budgie.PanelPosition panel_position = Budgie.PanelPosition.BOTTOM; + public static int panel_size = 0; + public static unowned Budgie.PopoverManager? manager = null; +- public static libxfce4windowing.Screen xfce_screen; +- public static libxfce4windowing.WorkspaceManager workspace_manager; +- public static libxfce4windowing.WorkspaceGroup workspace_group; ++ public static Xfw.Screen xfce_screen; ++ public static Xfw.WorkspaceManager workspace_manager; ++ public static Xfw.WorkspaceGroup workspace_group; + public static bool dragging = false; + + private int64 last_scroll_time = 0; +@@ -92,13 +92,13 @@ namespace Workspaces { + settings = this.get_applet_settings(uuid); + settings.changed.connect(on_settings_change); + +- xfce_screen = libxfce4windowing.Screen.get_default(); ++ xfce_screen = Xfw.Screen.get_default(); + workspace_manager = xfce_screen.get_workspace_manager(); + + workspace_group = workspace_manager.list_workspace_groups().nth_data(0); + + dynamically_created_workspaces = new List<int>(); +- window_connections = new HashTable<unowned libxfce4windowing.Window, ulong>(str_hash, str_equal); ++ window_connections = new HashTable<unowned Xfw.Window, ulong>(str_hash, str_equal); + + Bus.watch_name(BusType.SESSION, "org.budgie_desktop.BudgieWM", BusNameWatcherFlags.NONE, + has_wm, lost_wm); +@@ -205,9 +205,9 @@ namespace Workspaces { + return Gdk.EVENT_STOP; + } + +- unowned libxfce4windowing.Workspace current = workspace_group.get_active_workspace(); +- unowned libxfce4windowing.Workspace? next = current.get_neighbor( +- (down) ? libxfce4windowing.Direction.RIGHT : libxfce4windowing.Direction.DOWN ++ unowned Xfw.Workspace current = workspace_group.get_active_workspace(); ++ unowned Xfw.Workspace? next = current.get_neighbor( ++ (down) ? Xfw.Direction.RIGHT : Xfw.Direction.DOWN + ); + + if (next != null) { +@@ -243,12 +243,12 @@ namespace Workspaces { + } + + private void populate_workspaces() { +- foreach (libxfce4windowing.Workspace workspace in workspace_group.list_workspaces()) { ++ foreach (Xfw.Workspace workspace in workspace_group.list_workspaces()) { + workspace_added(workspace); + } + this.connect_signals(); + this.queue_resize(); +- foreach (libxfce4windowing.Window window in xfce_screen.get_windows()) { ++ foreach (Xfw.Window window in xfce_screen.get_windows()) { + window_opened(window); + } + } +@@ -303,7 +303,7 @@ namespace Workspaces { + }); + } + +- private void workspace_added(libxfce4windowing.Workspace space) { ++ private void workspace_added(Xfw.Workspace space) { + WorkspaceItem item = new WorkspaceItem(space, item_size_multiplier); + var _workspace = workspace_group.get_active_workspace(); + if (_workspace != null && _workspace == space) { +@@ -325,7 +325,7 @@ namespace Workspaces { + } + } + +- private void workspace_removed(libxfce4windowing.Workspace space) { ++ private void workspace_removed(Xfw.Workspace space) { + foreach (var widget in workspaces_layout.get_children()) { + Gtk.Revealer revealer = widget as Gtk.Revealer; + WorkspaceItem item = revealer.get_child() as WorkspaceItem; +@@ -343,8 +343,8 @@ namespace Workspaces { + add_button_revealer.set_reveal_child(true); + } + +- private void window_opened(libxfce4windowing.Window window) { +- if (window.get_window_type() != libxfce4windowing.WindowType.NORMAL) { ++ private void window_opened(Xfw.Window window) { ++ if (window.get_window_type() != Xfw.WindowType.NORMAL) { + return; + } + +@@ -359,7 +359,7 @@ namespace Workspaces { + window_connections.set(window, conn); + } + +- private void window_closed(libxfce4windowing.Window window) { ++ private void window_closed(Xfw.Window window) { + if (window_connections.contains(window)) { + ulong conn = window_connections.get(window); + if (SignalHandler.is_connected(window, conn)) { +@@ -401,8 +401,8 @@ namespace Workspaces { + return; + } + +- libxfce4windowing.Window? window = null; +- foreach (libxfce4windowing.Window win in xfce_screen.get_windows()) { ++ Xfw.Window? window = null; ++ foreach (Xfw.Window win in xfce_screen.get_windows()) { + if (win.x11_get_xid() == *data) { + window = win; + break; +@@ -420,7 +420,7 @@ namespace Workspaces { + if (index != -1) { // Successfully added workspace + dynamically_created_workspaces.append(index); + Timeout.add(50, () => { +- libxfce4windowing.Workspace? workspace = get_workspace_by_index(index); ++ Xfw.Workspace? workspace = get_workspace_by_index(index); + try { + if (workspace != null) window.move_to_workspace(workspace); + } catch (Error e) { +@@ -525,11 +525,11 @@ namespace Workspaces { + foreach (Gtk.Widget widget in workspaces_layout.get_children()) { + Gtk.Revealer revealer = widget as Gtk.Revealer; + WorkspaceItem item = revealer.get_child() as WorkspaceItem; +- List<unowned libxfce4windowing.Window> windows = xfce_screen.get_windows_stacked().copy(); ++ List<unowned Xfw.Window> windows = xfce_screen.get_windows_stacked().copy(); + windows.reverse(); +- List<unowned libxfce4windowing.Window> window_list = new List<unowned libxfce4windowing.Window>(); ++ List<unowned Xfw.Window> window_list = new List<unowned Xfw.Window>(); + windows.foreach((window) => { +- if (window.get_workspace() == item.get_workspace() && !window.is_skip_tasklist() && !window.is_skip_pager() && window.get_window_type() == libxfce4windowing.WindowType.NORMAL) { ++ if (window.get_workspace() == item.get_workspace() && !window.is_skip_tasklist() && !window.is_skip_pager() && window.get_window_type() == Xfw.WindowType.NORMAL) { + window_list.append(window); + } + }); +@@ -570,8 +570,8 @@ namespace Workspaces { + } + } + +- private libxfce4windowing.Workspace? get_workspace_by_index(uint num) { +- unowned GLib.List<libxfce4windowing.Workspace>? workspaces = workspace_group.list_workspaces(); ++ private Xfw.Workspace? get_workspace_by_index(uint num) { ++ unowned GLib.List<Xfw.Workspace>? workspaces = workspace_group.list_workspaces(); + return workspaces.nth_data(num); + } + } +--- vapi/libxfce4windowing-0.vapi.orig 2025-09-07 12:35:19 UTC ++++ vapi/libxfce4windowing-0.vapi +@@ -1,8 +1,8 @@ + /* libxfce4windowing-0.vapi generated by vapigen, do not modify. */ + +-[CCode (cprefix = "libxfce4windowing", gir_namespace = "Libxfce4windowing", gir_version = "0.0", lower_case_cprefix = "libxfce4windowing_")] +-namespace libxfce4windowing { +- [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cname = "XfwApplication", type_id = "xfw_application_get_type ()")] ++[CCode (cprefix = "Xfw", gir_namespace = "Libxfce4windowing", gir_version = "0.0", lower_case_cprefix = "libxfce4windowing_")] ++namespace Xfw { ++ [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", type_id = "xfw_application_get_type ()")] + public abstract class Application : GLib.Object { + [CCode (has_construct_function = false)] + protected Application (); +@@ -15,13 +15,13 @@ namespace libxfce4windowing { + [CCode (cname = "xfw_application_get_icon")] + public unowned Gdk.Pixbuf? get_icon (int size, int scale); + [CCode (cname = "xfw_application_get_instance")] +- public unowned libxfce4windowing.ApplicationInstance? get_instance (libxfce4windowing.Window window); ++ public unowned Xfw.ApplicationInstance? get_instance (Xfw.Window window); + [CCode (cname = "xfw_application_get_instances")] +- public unowned GLib.List<libxfce4windowing.ApplicationInstance>? get_instances (); ++ public unowned GLib.List<Xfw.ApplicationInstance>? get_instances (); + [CCode (cname = "xfw_application_get_name")] + public unowned string get_name (); + [CCode (cname = "xfw_application_get_windows")] +- public unowned GLib.List<libxfce4windowing.Window> get_windows (); ++ public unowned GLib.List<Xfw.Window> get_windows (); + [CCode (cname = "xfw_application_icon_is_fallback")] + [Version (since = "4.19.1")] + public bool icon_is_fallback (); +@@ -31,14 +31,14 @@ namespace libxfce4windowing { + [NoAccessorMethod] + public GLib.Icon gicon { owned get; } + [NoAccessorMethod] +- public void* instances { get; } ++ public GLib.List<Xfw.ApplicationInstance> instances { owned get; } + [NoAccessorMethod] + public string name { owned get; } + [NoAccessorMethod] +- public void* windows { get; } ++ public GLib.List<Xfw.Window> windows { owned get; } + public signal void icon_changed (); + } +- [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cname = "XfwApplicationInstance", has_type_id = false)] ++ [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", has_type_id = false)] + [Compact] + public class ApplicationInstance { + [CCode (cname = "xfw_application_instance_get_name")] +@@ -49,9 +49,9 @@ namespace libxfce4windowing { + public int get_pid (); + [CCode (cname = "xfw_application_instance_get_windows")] + [Version (since = "4.19.1")] +- public unowned GLib.List<libxfce4windowing.Window> get_windows (); ++ public unowned GLib.List<Xfw.Window> get_windows (); + } +- [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cname = "XfwMonitor", type_id = "xfw_monitor_get_type ()")] ++ [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", type_id = "xfw_monitor_get_type ()")] + public abstract class Monitor : GLib.Object { + [CCode (has_construct_function = false)] + protected Monitor (); +@@ -96,10 +96,10 @@ namespace libxfce4windowing { + public unowned string? get_serial (); + [CCode (cname = "xfw_monitor_get_subpixel")] + [Version (since = "4.19.4")] +- public libxfce4windowing.MonitorSubpixel get_subpixel (); ++ public Xfw.MonitorSubpixel get_subpixel (); + [CCode (cname = "xfw_monitor_get_transform")] + [Version (since = "4.19.4")] +- public libxfce4windowing.MonitorTransform get_transform (); ++ public Xfw.MonitorTransform get_transform (); + [CCode (cname = "xfw_monitor_get_workarea")] + [Version (since = "4.19.4")] + public Gdk.Rectangle get_workarea (); +@@ -146,64 +146,64 @@ namespace libxfce4windowing { + public string serial { owned get; } + [NoAccessorMethod] + [Version (since = "4.19.4")] +- public libxfce4windowing.MonitorSubpixel subpixel { get; } ++ public Xfw.MonitorSubpixel subpixel { get; } + [NoAccessorMethod] +- public libxfce4windowing.MonitorTransform transform { get; } ++ public Xfw.MonitorTransform transform { get; } + [NoAccessorMethod] + [Version (since = "4.19.4")] + public uint width_mm { get; } + [NoAccessorMethod] + public Gdk.Rectangle workarea { owned get; } + } +- [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cname = "XfwScreen", type_id = "xfw_screen_get_type ()")] ++ [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", type_id = "xfw_screen_get_type ()")] + public abstract class Screen : GLib.Object { + [CCode (has_construct_function = false)] + protected Screen (); + [CCode (cname = "xfw_screen_get_active_window")] +- public unowned libxfce4windowing.Window? get_active_window (); ++ public unowned Xfw.Window? get_active_window (); + [CCode (cname = "xfw_screen_get_default")] +- public static libxfce4windowing.Screen get_default (); ++ public static Xfw.Screen get_default (); + [CCode (cname = "xfw_screen_get_monitors")] + [Version (since = "4.19.4")] +- public unowned GLib.List<libxfce4windowing.Monitor>? get_monitors (); ++ public unowned GLib.List<Xfw.Monitor>? get_monitors (); + [CCode (cname = "xfw_screen_get_primary_monitor")] + [Version (since = "4.19.4")] +- public unowned libxfce4windowing.Monitor? get_primary_monitor (); ++ public unowned Xfw.Monitor? get_primary_monitor (); + [CCode (cname = "xfw_screen_get_seats")] +- public unowned GLib.List<libxfce4windowing.Seat>? get_seats (); ++ public unowned GLib.List<Xfw.Seat>? get_seats (); + [CCode (cname = "xfw_screen_get_show_desktop")] + public bool get_show_desktop (); + [CCode (cname = "xfw_screen_get_windows")] +- public unowned GLib.List<libxfce4windowing.Window>? get_windows (); ++ public unowned GLib.List<Xfw.Window>? get_windows (); + [CCode (cname = "xfw_screen_get_windows_stacked")] +- public unowned GLib.List<libxfce4windowing.Window>? get_windows_stacked (); ++ public unowned GLib.List<Xfw.Window>? get_windows_stacked (); + [CCode (cname = "xfw_screen_get_workspace_manager")] +- public unowned libxfce4windowing.WorkspaceManager get_workspace_manager (); ++ public unowned Xfw.WorkspaceManager get_workspace_manager (); + [CCode (cname = "xfw_screen_set_show_desktop")] + public void set_show_desktop (bool show); + [NoAccessorMethod] +- public libxfce4windowing.Window active_window { owned get; } ++ public Xfw.Window active_window { owned get; } + [NoAccessorMethod] + public Gdk.Screen gdk_screen { owned get; construct; } + [NoAccessorMethod] + public bool show_desktop { get; set; } + [NoAccessorMethod] +- public libxfce4windowing.WorkspaceManager workspace_manager { owned get; } +- public signal void active_window_changed (libxfce4windowing.Window window); ++ public Xfw.WorkspaceManager workspace_manager { owned get; } ++ public signal void active_window_changed (Xfw.Window window); + [Version (since = "4.19.4")] +- public signal void monitor_added (libxfce4windowing.Monitor monitor); ++ public signal void monitor_added (Xfw.Monitor monitor); + [Version (since = "4.19.4")] +- public signal void monitor_removed (libxfce4windowing.Monitor monitor); ++ public signal void monitor_removed (Xfw.Monitor monitor); + [Version (since = "4.19.4")] + public signal void monitors_changed (); +- public signal void seat_added (libxfce4windowing.Seat seat); +- public signal void seat_removed (libxfce4windowing.Seat seat); +- public signal void window_closed (libxfce4windowing.Window window); ++ public signal void seat_added (Xfw.Seat seat); ++ public signal void seat_removed (Xfw.Seat seat); ++ public signal void window_closed (Xfw.Window window); + public signal void window_manager_changed (); +- public signal void window_opened (libxfce4windowing.Window window); ++ public signal void window_opened (Xfw.Window window); + public signal void window_stacking_changed (); + } +- [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cname = "XfwSeat", type_id = "xfw_seat_get_type ()")] ++ [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", type_id = "xfw_seat_get_type ()")] + public class Seat : GLib.Object { + [CCode (has_construct_function = false)] + protected Seat (); +@@ -212,18 +212,18 @@ namespace libxfce4windowing { + [NoAccessorMethod] + public string name { owned get; construct; } + } +- [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cname = "XfwWindow", type_id = "xfw_window_get_type ()")] ++ [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", type_id = "xfw_window_get_type ()")] + public abstract class Window : GLib.Object { + [CCode (has_construct_function = false)] + protected Window (); + [CCode (cname = "xfw_window_activate")] +- public bool activate (libxfce4windowing.Seat? seat, uint64 event_timestamp) throws GLib.Error; ++ public bool activate (Xfw.Seat seat, uint64 event_timestamp) throws GLib.Error; + [CCode (cname = "xfw_window_close")] + public bool close (uint64 event_timestamp) throws GLib.Error; + [CCode (cname = "xfw_window_get_application")] +- public unowned libxfce4windowing.Application get_application (); ++ public unowned Xfw.Application get_application (); + [CCode (cname = "xfw_window_get_capabilities")] +- public libxfce4windowing.WindowCapabilities get_capabilities (); ++ public Xfw.WindowCapabilities get_capabilities (); + [CCode (array_length = false, array_null_terminated = true, cname = "xfw_window_get_class_ids")] + [Version (since = "4.19.3")] + public unowned string[] get_class_ids (); +@@ -235,17 +235,17 @@ namespace libxfce4windowing { + [CCode (cname = "xfw_window_get_icon")] + public unowned Gdk.Pixbuf? get_icon (int size, int scale); + [CCode (cname = "xfw_window_get_monitors")] +- public unowned GLib.List<libxfce4windowing.Monitor>? get_monitors (); ++ public unowned GLib.List<Xfw.Monitor>? get_monitors (); + [CCode (cname = "xfw_window_get_name")] + public unowned string? get_name (); + [CCode (cname = "xfw_window_get_screen")] +- public unowned libxfce4windowing.Screen get_screen (); ++ public unowned Xfw.Screen get_screen (); + [CCode (cname = "xfw_window_get_state")] +- public libxfce4windowing.WindowState get_state (); ++ public Xfw.WindowState get_state (); + [CCode (cname = "xfw_window_get_window_type")] +- public libxfce4windowing.WindowType get_window_type (); ++ public Xfw.WindowType get_window_type (); + [CCode (cname = "xfw_window_get_workspace")] +- public unowned libxfce4windowing.Workspace? get_workspace (); ++ public unowned Xfw.Workspace? get_workspace (); + [CCode (cname = "xfw_window_icon_is_fallback")] + [Version (since = "4.19.1")] + public bool icon_is_fallback (); +@@ -258,13 +258,13 @@ namespace libxfce4windowing { + [CCode (cname = "xfw_window_is_fullscreen")] + public bool is_fullscreen (); + [CCode (cname = "xfw_window_is_in_viewport")] +- public bool is_in_viewport (libxfce4windowing.Workspace workspace); ++ public bool is_in_viewport (Xfw.Workspace workspace); + [CCode (cname = "xfw_window_is_maximized")] + public bool is_maximized (); + [CCode (cname = "xfw_window_is_minimized")] + public bool is_minimized (); + [CCode (cname = "xfw_window_is_on_workspace")] +- public bool is_on_workspace (libxfce4windowing.Workspace workspace); ++ public bool is_on_workspace (Xfw.Workspace workspace); + [CCode (cname = "xfw_window_is_pinned")] + public bool is_pinned (); + [CCode (cname = "xfw_window_is_shaded")] +@@ -276,7 +276,7 @@ namespace libxfce4windowing { + [CCode (cname = "xfw_window_is_urgent")] + public bool is_urgent (); + [CCode (cname = "xfw_window_move_to_workspace")] +- public bool move_to_workspace (libxfce4windowing.Workspace workspace) throws GLib.Error; ++ public bool move_to_workspace (Xfw.Workspace workspace) throws GLib.Error; + [CCode (cname = "xfw_window_set_above")] + public bool set_above (bool is_above) throws GLib.Error; + [CCode (cname = "xfw_window_set_below")] +@@ -304,11 +304,12 @@ namespace libxfce4windowing { + [CCode (cname = "xfw_window_start_resize")] + public bool start_resize () throws GLib.Error; + [CCode (cname = "xfw_window_x11_get_xid")] ++ [Version (since = "4.19.3")] + public X.Window x11_get_xid (); + [NoAccessorMethod] +- public libxfce4windowing.Application application { owned get; } ++ public Xfw.Application application { owned get; } + [NoAccessorMethod] +- public libxfce4windowing.WindowCapabilities capabilities { get; } ++ public Xfw.WindowCapabilities capabilities { get; } + [CCode (array_length = false, array_null_terminated = true)] + [NoAccessorMethod] + [Version (since = "4.19.3")] +@@ -316,48 +317,48 @@ namespace libxfce4windowing { + [NoAccessorMethod] + public GLib.Icon gicon { owned get; } + [NoAccessorMethod] +- public void* monitors { get; } ++ public GLib.List<Xfw.Monitor> monitors { owned get; } + [NoAccessorMethod] + public string name { owned get; } + [NoAccessorMethod] +- public libxfce4windowing.Screen screen { owned get; construct; } ++ public Xfw.Screen screen { owned get; construct; } + [NoAccessorMethod] +- public libxfce4windowing.WindowState state { get; } ++ public Xfw.WindowState state { get; } + [NoAccessorMethod] +- public libxfce4windowing.WindowType type { get; } ++ public Xfw.WindowType type { get; } + [NoAccessorMethod] +- public libxfce4windowing.Workspace workspace { owned get; } +- public signal void capabilities_changed (libxfce4windowing.WindowCapabilities changed_mask, libxfce4windowing.WindowCapabilities new_state); ++ public Xfw.Workspace workspace { owned get; } ++ public signal void capabilities_changed (Xfw.WindowCapabilities changed_mask, Xfw.WindowCapabilities new_state); + [Version (since = "4.19.3")] + public signal void class_changed (); + public signal void closed (); + public signal void geometry_changed (); + public signal void icon_changed (); + public signal void name_changed (); +- public signal void state_changed (libxfce4windowing.WindowState changed_mask, libxfce4windowing.WindowState new_state); +- public signal void type_changed (libxfce4windowing.WindowType old_type); ++ public signal void state_changed (Xfw.WindowState changed_mask, Xfw.WindowState new_state); ++ public signal void type_changed (Xfw.WindowType old_type); + public signal void workspace_changed (); + } +- [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cname = "XfwWorkspaceGroupInterface", has_type_id = false)] ++ [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", has_type_id = false)] + [Compact] + public class WorkspaceGroupInterface { + } +- [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cname = "XfwWorkspaceInterface", has_type_id = false)] ++ [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", has_type_id = false)] + [Compact] + public class WorkspaceInterface { + } +- [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cname = "XfwWorkspaceManagerInterface", has_type_id = false)] ++ [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", has_type_id = false)] + [Compact] + public class WorkspaceManagerInterface { + } +- [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cname = "XfwWorkspace", type_id = "xfw_workspace_get_type ()")] ++ [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", type_id = "xfw_workspace_get_type ()")] + public interface Workspace : GLib.Object { + [CCode (cname = "xfw_workspace_activate")] + public bool activate () throws GLib.Error; + [CCode (cname = "xfw_workspace_assign_to_workspace_group")] +- public bool assign_to_workspace_group (libxfce4windowing.WorkspaceGroup group) throws GLib.Error; ++ public bool assign_to_workspace_group (Xfw.WorkspaceGroup group) throws GLib.Error; + [CCode (cname = "xfw_workspace_get_capabilities")] +- public libxfce4windowing.WorkspaceCapabilities get_capabilities (); ++ public Xfw.WorkspaceCapabilities get_capabilities (); + [CCode (cname = "xfw_workspace_get_geometry")] + public unowned Gdk.Rectangle? get_geometry (); + [CCode (cname = "xfw_workspace_get_id")] +@@ -369,19 +370,19 @@ namespace libxfce4windowing { + [CCode (cname = "xfw_workspace_get_name")] + public unowned string get_name (); + [CCode (cname = "xfw_workspace_get_neighbor")] +- public unowned libxfce4windowing.Workspace? get_neighbor (libxfce4windowing.Direction direction); ++ public unowned Xfw.Workspace? get_neighbor (Xfw.Direction direction); + [CCode (cname = "xfw_workspace_get_number")] + public uint get_number (); + [CCode (cname = "xfw_workspace_get_state")] +- public libxfce4windowing.WorkspaceState get_state (); ++ public Xfw.WorkspaceState get_state (); + [CCode (cname = "xfw_workspace_get_workspace_group")] +- public unowned libxfce4windowing.WorkspaceGroup? get_workspace_group (); ++ public unowned Xfw.WorkspaceGroup? get_workspace_group (); + [CCode (cname = "xfw_workspace_remove")] + public bool remove () throws GLib.Error; + [NoAccessorMethod] +- public abstract libxfce4windowing.WorkspaceCapabilities capabilities { get; set construct; } ++ public abstract Xfw.WorkspaceCapabilities capabilities { get; set construct; } + [NoAccessorMethod] +- public abstract libxfce4windowing.WorkspaceGroup group { owned get; } ++ public abstract Xfw.WorkspaceGroup group { owned get; } + [NoAccessorMethod] + public abstract string id { owned get; } + [NoAccessorMethod] +@@ -393,78 +394,78 @@ namespace libxfce4windowing { + [NoAccessorMethod] + public abstract uint number { get; construct; } + [NoAccessorMethod] +- public abstract libxfce4windowing.WorkspaceState state { get; set construct; } +- public signal void capabilities_changed (libxfce4windowing.WorkspaceCapabilities changed_mask, libxfce4windowing.WorkspaceCapabilities new_capabilities); +- public signal void group_changed (libxfce4windowing.WorkspaceGroup previous_group); ++ public abstract Xfw.WorkspaceState state { get; set construct; } ++ public signal void capabilities_changed (Xfw.WorkspaceCapabilities changed_mask, Xfw.WorkspaceCapabilities new_capabilities); ++ public signal void group_changed (Xfw.WorkspaceGroup previous_group); + public signal void name_changed (); +- public signal void state_changed (libxfce4windowing.WorkspaceState changed_mask, libxfce4windowing.WorkspaceState new_state); ++ public signal void state_changed (Xfw.WorkspaceState changed_mask, Xfw.WorkspaceState new_state); + } +- [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cname = "XfwWorkspaceGroup", type_id = "xfw_workspace_group_get_type ()")] ++ [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", type_id = "xfw_workspace_group_get_type ()")] + public interface WorkspaceGroup : GLib.Object { + [CCode (cname = "xfw_workspace_group_create_workspace")] + public bool create_workspace (string name) throws GLib.Error; + [CCode (cname = "xfw_workspace_group_get_active_workspace")] +- public unowned libxfce4windowing.Workspace? get_active_workspace (); ++ public unowned Xfw.Workspace? get_active_workspace (); + [CCode (cname = "xfw_workspace_group_get_capabilities")] +- public libxfce4windowing.WorkspaceGroupCapabilities get_capabilities (); ++ public Xfw.WorkspaceGroupCapabilities get_capabilities (); + [CCode (cname = "xfw_workspace_group_get_monitors")] +- public unowned GLib.List<libxfce4windowing.Monitor>? get_monitors (); ++ public unowned GLib.List<Xfw.Monitor>? get_monitors (); + [CCode (cname = "xfw_workspace_group_get_workspace_count")] + public uint get_workspace_count (); + [CCode (cname = "xfw_workspace_group_get_workspace_manager")] +- public unowned libxfce4windowing.WorkspaceManager get_workspace_manager (); ++ public unowned Xfw.WorkspaceManager get_workspace_manager (); + [CCode (cname = "xfw_workspace_group_list_workspaces")] +- public unowned GLib.List<libxfce4windowing.Workspace>? list_workspaces (); ++ public unowned GLib.List<Xfw.Workspace>? list_workspaces (); + [CCode (cname = "xfw_workspace_group_move_viewport")] + public bool move_viewport (int x, int y) throws GLib.Error; + [CCode (cname = "xfw_workspace_group_set_layout")] + public bool set_layout (int rows, int columns) throws GLib.Error; + [NoAccessorMethod] +- public abstract libxfce4windowing.Workspace active_workspace { owned get; } ++ public abstract Xfw.Workspace active_workspace { owned get; } + [NoAccessorMethod] +- public abstract void* monitors { get; } ++ public abstract GLib.List<Xfw.Monitor> monitors { owned get; } + [NoAccessorMethod] +- public abstract libxfce4windowing.Screen screen { owned get; construct; } ++ public abstract Xfw.Screen screen { owned get; construct; } + [NoAccessorMethod] +- public abstract libxfce4windowing.WorkspaceManager workspace_manager { owned get; construct; } ++ public abstract Xfw.WorkspaceManager workspace_manager { owned get; construct; } + [NoAccessorMethod] +- public abstract void* workspaces { get; } +- public signal void active_workspace_changed (libxfce4windowing.Workspace? previously_active_workspace); +- public signal void capabilities_changed (libxfce4windowing.WorkspaceGroupCapabilities changed_mask, libxfce4windowing.WorkspaceGroupCapabilities new_capabilities); +- public signal void monitor_added (libxfce4windowing.Monitor monitor); +- public signal void monitor_removed (libxfce4windowing.Monitor monitor); ++ public abstract GLib.List<Xfw.Workspace> workspaces { owned get; } ++ public signal void active_workspace_changed (Xfw.Workspace? previously_active_workspace); ++ public signal void capabilities_changed (Xfw.WorkspaceGroupCapabilities changed_mask, Xfw.WorkspaceGroupCapabilities new_capabilities); ++ public signal void monitor_added (Xfw.Monitor monitor); ++ public signal void monitor_removed (Xfw.Monitor monitor); + public signal void monitors_changed (); + public signal void viewports_changed (); +- public signal void workspace_added (libxfce4windowing.Workspace workspace); +- public signal void workspace_removed (libxfce4windowing.Workspace workspace); ++ public signal void workspace_added (Xfw.Workspace workspace); ++ public signal void workspace_removed (Xfw.Workspace workspace); + } +- [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cname = "XfwWorkspaceManager", type_id = "xfw_workspace_manager_get_type ()")] ++ [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", type_id = "xfw_workspace_manager_get_type ()")] + public interface WorkspaceManager : GLib.Object { + [CCode (cname = "xfw_workspace_manager_list_workspace_groups")] +- public unowned GLib.List<libxfce4windowing.WorkspaceGroup>? list_workspace_groups (); ++ public unowned GLib.List<Xfw.WorkspaceGroup>? list_workspace_groups (); + [CCode (cname = "xfw_workspace_manager_list_workspaces")] +- public unowned GLib.List<libxfce4windowing.Workspace>? list_workspaces (); ++ public unowned GLib.List<Xfw.Workspace>? list_workspaces (); + [NoAccessorMethod] +- public abstract libxfce4windowing.Screen screen { owned get; construct; } +- public signal void workspace_created (libxfce4windowing.Workspace workspace); +- public signal void workspace_destroyed (libxfce4windowing.Workspace workspace); +- public signal void workspace_group_created (libxfce4windowing.WorkspaceGroup group); +- public signal void workspace_group_destroyed (libxfce4windowing.WorkspaceGroup group); ++ public abstract Xfw.Screen screen { owned get; construct; } ++ public signal void workspace_created (Xfw.Workspace workspace); ++ public signal void workspace_destroyed (Xfw.Workspace workspace); ++ public signal void workspace_group_created (Xfw.WorkspaceGroup group); ++ public signal void workspace_group_destroyed (Xfw.WorkspaceGroup group); + } +- [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cname = "XfwClientType", cprefix = "XFW_CLIENT_TYPE_", has_type_id = false)] ++ [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cprefix = "XFW_CLIENT_TYPE_", has_type_id = false)] + [Version (since = "4.19.3")] + public enum ClientType { + APPLICATION, + PAGER + } +- [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cname = "XfwDirection", cprefix = "XFW_DIRECTION_", type_id = "xfw_direction_get_type ()")] ++ [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cprefix = "XFW_DIRECTION_", type_id = "xfw_direction_get_type ()")] + public enum Direction { + UP, + DOWN, + LEFT, + RIGHT + } +- [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cname = "XfwMonitorSubpixel", cprefix = "XFW_MONITOR_SUBPIXEL_", type_id = "xfw_monitor_subpixel_get_type ()")] ++ [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cprefix = "XFW_MONITOR_SUBPIXEL_", type_id = "xfw_monitor_subpixel_get_type ()")] + [Version (since = "4.19.4")] + public enum MonitorSubpixel { + UNKNOWN, +@@ -474,7 +475,7 @@ namespace libxfce4windowing { + VRGB, + VBGR + } +- [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cname = "XfwMonitorTransform", cprefix = "XFW_MONITOR_TRANSFORM_", type_id = "xfw_monitor_transform_get_type ()")] ++ [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cprefix = "XFW_MONITOR_TRANSFORM_", type_id = "xfw_monitor_transform_get_type ()")] + [Version (since = "4.19.4")] + public enum MonitorTransform { + NORMAL, +@@ -486,7 +487,7 @@ namespace libxfce4windowing { + FLIPPED_180, + FLIPPED_270 + } +- [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cname = "XfwWindowCapabilities", cprefix = "XFW_WINDOW_CAPABILITIES_", type_id = "xfw_window_capabilities_get_type ()")] ++ [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cprefix = "XFW_WINDOW_CAPABILITIES_", type_id = "xfw_window_capabilities_get_type ()")] + [Flags] + public enum WindowCapabilities { + NONE, +@@ -506,7 +507,7 @@ namespace libxfce4windowing { + CAN_UNPLACE_BELOW, + CAN_CHANGE_WORKSPACE + } +- [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cname = "XfwWindowState", cprefix = "XFW_WINDOW_STATE_", type_id = "xfw_window_state_get_type ()")] ++ [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cprefix = "XFW_WINDOW_STATE_", type_id = "xfw_window_state_get_type ()")] + [Flags] + public enum WindowState { + NONE, +@@ -522,7 +523,7 @@ namespace libxfce4windowing { + BELOW, + URGENT + } +- [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cname = "XfwWindowType", cprefix = "XFW_WINDOW_TYPE_", type_id = "xfw_window_type_get_type ()")] ++ [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cprefix = "XFW_WINDOW_TYPE_", type_id = "xfw_window_type_get_type ()")] + public enum WindowType { + NORMAL, + DESKTOP, +@@ -533,20 +534,20 @@ namespace libxfce4windowing { + UTILITY, + SPLASHSCREEN + } +- [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cname = "XfwWindowing", cprefix = "XFW_WINDOWING_", has_type_id = false)] ++ [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cprefix = "XFW_WINDOWING_", has_type_id = false)] + public enum Windowing { + UNKNOWN, + X11, + WAYLAND + } +- [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cname = "XfwWorkspaceCapabilities", cprefix = "XFW_WORKSPACE_CAPABILITIES_", type_id = "xfw_workspace_capabilities_get_type ()")] ++ [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cprefix = "XFW_WORKSPACE_CAPABILITIES_", type_id = "xfw_workspace_capabilities_get_type ()")] + [Flags] + public enum WorkspaceCapabilities { + NONE, + ACTIVATE, + REMOVE + } +- [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cname = "XfwWorkspaceGroupCapabilities", cprefix = "XFW_WORKSPACE_GROUP_CAPABILITIES_", type_id = "xfw_workspace_group_capabilities_get_type ()")] ++ [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cprefix = "XFW_WORKSPACE_GROUP_CAPABILITIES_", type_id = "xfw_workspace_group_capabilities_get_type ()")] + [Flags] + public enum WorkspaceGroupCapabilities { + NONE, +@@ -554,7 +555,7 @@ namespace libxfce4windowing { + MOVE_VIEWPORT, + SET_LAYOUT + } +- [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cname = "XfwWorkspaceState", cprefix = "XFW_WORKSPACE_STATE_", type_id = "xfw_workspace_state_get_type ()")] ++ [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cprefix = "XFW_WORKSPACE_STATE_", type_id = "xfw_workspace_state_get_type ()")] + [Flags] + public enum WorkspaceState { + NONE, +@@ -563,7 +564,7 @@ namespace libxfce4windowing { + HIDDEN, + VIRTUAL + } +- [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cname = "XfwError", cprefix = "XFW_ERROR_", has_type_id = false)] ++ [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cprefix = "XFW_ERROR_", has_type_id = false)] + public errordomain Error { + UNSUPPORTED, + INTERNAL +@@ -580,7 +581,7 @@ namespace libxfce4windowing { + public static GLib.Quark error_quark (); + [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cname = "xfw_set_client_type")] + [Version (since = "4.19.3")] +- public static void set_client_type (libxfce4windowing.ClientType client_type); ++ public static void set_client_type (Xfw.ClientType client_type); + [CCode (cheader_filename = "libxfce4windowing/libxfce4windowing.h", cname = "xfw_windowing_get")] +- public static libxfce4windowing.Windowing windowing_get (); ++ public static Xfw.Windowing windowing_get (); + } diff --git a/x11/budgie-desktop/pkg-plist b/x11/budgie-desktop/pkg-plist index 9ba2a9f7a9ae..eb40847779d1 100644 --- a/x11/budgie-desktop/pkg-plist +++ b/x11/budgie-desktop/pkg-plist @@ -7,6 +7,21 @@ bin/budgie-wm bin/org.buddiesofbudgie.BudgieScreenshot etc/xdg/autostart/org.buddiesofbudgie.BudgieDesktopScreensaver.desktop etc/xdg/autostart/org.buddiesofbudgie.BudgiePowerDialog.desktop +etc/xdg/autostart/org.buddiesofbudgie.SettingsDaemon.A11ySettings.desktop +etc/xdg/autostart/org.buddiesofbudgie.SettingsDaemon.Color.desktop +etc/xdg/autostart/org.buddiesofbudgie.SettingsDaemon.DiskUtilityNotify.desktop +etc/xdg/autostart/org.buddiesofbudgie.SettingsDaemon.Keyboard.desktop +etc/xdg/autostart/org.buddiesofbudgie.SettingsDaemon.MediaKeys.desktop +etc/xdg/autostart/org.buddiesofbudgie.SettingsDaemon.Power.desktop +etc/xdg/autostart/org.buddiesofbudgie.SettingsDaemon.PrintNotifications.desktop +etc/xdg/autostart/org.buddiesofbudgie.SettingsDaemon.ScreensaverProxy.desktop +etc/xdg/autostart/org.buddiesofbudgie.SettingsDaemon.Sharing.desktop +etc/xdg/autostart/org.buddiesofbudgie.SettingsDaemon.Smartcard.desktop +etc/xdg/autostart/org.buddiesofbudgie.SettingsDaemon.Sound.desktop +etc/xdg/autostart/org.buddiesofbudgie.SettingsDaemon.UsbProtection.desktop +etc/xdg/autostart/org.buddiesofbudgie.SettingsDaemon.Wacom.desktop +etc/xdg/autostart/org.buddiesofbudgie.SettingsDaemon.Wwan.desktop +etc/xdg/autostart/org.buddiesofbudgie.SettingsDaemon.XSettings.desktop include/budgie-desktop/applet-info.h include/budgie-desktop/applet.h include/budgie-desktop/budgie-enums.h @@ -17,6 +32,8 @@ include/budgie-desktop/popover.h include/budgie-desktop/raven-plugin.h include/budgie-desktop/raven-widget.h include/budgie-desktop/theme.h +include/budgie-settings-daemon-48/budgie-settings-daemon/gsd-enums.h +lib/budgie-desktop/libbsd.so lib/budgie-desktop/libgvc.so %%BUDGIE_PLUGINSDIR%%/org.budgie-desktop.applet.budgie-menu/BudgieMenu.plugin %%BUDGIE_PLUGINSDIR%%/org.budgie-desktop.applet.budgie-menu/libbudgiemenuapplet.so @@ -88,16 +105,12 @@ lib/libraven.so.0 lib/libraven.so.0.0.0 libdata/pkgconfig/budgie-1.0.pc libdata/pkgconfig/budgie-raven-plugin-1.0.pc +libdata/pkgconfig/budgie-settings-daemon.pc libdata/pkgconfig/budgie-theme-1.0.pc +libexec/bsd-media-keys +libexec/bsd-power libexec/budgie-desktop/budgie-polkit-dialog libexec/budgie-desktop/budgie-power-dialog -share/man/man1/budgie-daemon.1.gz -share/man/man1/budgie-desktop-settings.1.gz -share/man/man1/budgie-desktop.1.gz -share/man/man1/budgie-panel.1.gz -share/man/man1/budgie-run-dialog.1.gz -share/man/man1/budgie-wm.1.gz -share/man/man1/org.buddiesofbudgie.BudgieScreenshot.1.gz share/applications/org.buddiesofbudgie.BudgieDaemon.desktop share/applications/org.buddiesofbudgie.BudgieDesktopSettings.desktop share/applications/org.buddiesofbudgie.BudgiePanel.desktop @@ -116,7 +129,7 @@ share/icons/hicolor/scalable/actions/pane-hide-symbolic.svg share/icons/hicolor/scalable/actions/pane-show-symbolic.svg share/icons/hicolor/scalable/actions/system-hibernate-symbolic.svg share/icons/hicolor/scalable/actions/system-log-out-symbolic.svg -share/icons/hicolor/scalable/actions/system-restart-symbolic.svg +share/icons/hicolor/scalable/actions/system-reboot-symbolic.svg share/icons/hicolor/scalable/actions/system-suspend-symbolic.svg share/icons/hicolor/scalable/apps/budgie-desktop-symbolic.svg share/icons/hicolor/scalable/apps/clock-applet-symbolic.svg @@ -211,8 +224,17 @@ share/locale/vi_VN/LC_MESSAGES/budgie-desktop.mo share/locale/zh/LC_MESSAGES/budgie-desktop.mo share/locale/zh_HK/LC_MESSAGES/budgie-desktop.mo share/locale/zh_TW/LC_MESSAGES/budgie-desktop.mo +share/man/man1/budgie-daemon.1.gz +share/man/man1/budgie-desktop-settings.1.gz +share/man/man1/budgie-desktop.1.gz +share/man/man1/budgie-panel.1.gz +share/man/man1/budgie-run-dialog.1.gz +share/man/man1/budgie-wm.1.gz +share/man/man1/org.buddiesofbudgie.BudgieScreenshot.1.gz +share/man/man1/org.buddiesofbudgie.sendto.1.gz share/vala/vapi/budgie-1.0.deps share/vala/vapi/budgie-1.0.vapi share/vala/vapi/budgie-raven-plugin-1.0.deps share/vala/vapi/budgie-raven-plugin-1.0.vapi +share/xdg-desktop-portal/budgie-portals.conf share/xsessions/budgie-desktop.desktop diff --git a/x11/budgie-session/Makefile b/x11/budgie-session/Makefile new file mode 100644 index 000000000000..01a204c5b50a --- /dev/null +++ b/x11/budgie-session/Makefile @@ -0,0 +1,32 @@ +PORTNAME= budgie-session +DISTVERSIONPREFIX= v +DISTVERSION= 0.9.1 +CATEGORIES= x11 budgie +MASTER_SITES= BUDGIE + +MAINTAINER= duchateau.olivier@gmail.com +COMMENT= Session manager for the Budgie desktop +WWW= https://github.com/BuddiesOfBudgie/budgie-session + +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING + +BUILD_DEPENDS= xmlto:textproc/xmlto +LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib \ + libdbus-glib-1.so:devel/dbus-glib \ + libepoxy.so:graphics/libepoxy +RUN_DEPENDS= consolekit2>0:sysutils/consolekit2 + +USES= budgie compiler:c11 gettext-tools gl gnome localbase:ldflags \ + meson pkgconfig python:build shebangfix tar:xz xorg +USE_GL= egl gl glesv2 +USE_GNOME= gnomedesktop3 glib20 gtk30 libxslt:build +GLIB_SCHEMAS= org.buddiesofbudgie.SessionManager.gschema.xml +USE_XORG= ice sm x11 xcomposite xtrans +SHEBANG_FILES= meson_post_install.py + +MESON_ARGS= -Dsystemd=false \ + -Dsystemd_journal=false \ + -Dconsolekit=true + +.include <bsd.port.mk> diff --git a/x11/budgie-session/distinfo b/x11/budgie-session/distinfo new file mode 100644 index 000000000000..f7d0671db819 --- /dev/null +++ b/x11/budgie-session/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1706544619 +SHA256 (budgie/budgie-session-v0.9.1.tar.xz) = be6e72e49164d1e799f4e25ab3df0f5ccee4720b4ee121aa03cc40b43e0977fa +SIZE (budgie/budgie-session-v0.9.1.tar.xz) = 486072 diff --git a/x11/budgie-session/files/patch-gnome-session_gsm-app.c b/x11/budgie-session/files/patch-gnome-session_gsm-app.c new file mode 100644 index 000000000000..e8d2b71bdf7f --- /dev/null +++ b/x11/budgie-session/files/patch-gnome-session_gsm-app.c @@ -0,0 +1,18 @@ +Work around for the https://bugzilla.gnome.org/show_bug.cgi?id=739424 bug + +Reduces the time gnome-session will consider application, like gnome-shell, +crashes to be fatal. And drop the user back to the login screen. +This will hopefully allow gnome-shell to restart after triggering the bug +above. + +--- gnome-session/gsm-app.c.orig 2024-01-04 21:31:40 UTC ++++ gnome-session/gsm-app.c +@@ -28,7 +28,7 @@ + #include "org.gnome.SessionManager.App.h" + + /* If a component crashes twice within a minute, we count that as a fatal error */ +-#define _GSM_APP_RESPAWN_RATELIMIT_SECONDS 60 ++#define _GSM_APP_RESPAWN_RATELIMIT_SECONDS 3 + + typedef struct + { diff --git a/x11/budgie-session/pkg-descr b/x11/budgie-session/pkg-descr new file mode 100644 index 000000000000..1a15fc0d487e --- /dev/null +++ b/x11/budgie-session/pkg-descr @@ -0,0 +1,2 @@ +This provides session management for the Budgie desktop, and +provides the tools used to start the desktop. diff --git a/x11/budgie-session/pkg-plist b/x11/budgie-session/pkg-plist new file mode 100644 index 000000000000..5fb2bda2aa29 --- /dev/null +++ b/x11/budgie-session/pkg-plist @@ -0,0 +1,125 @@ +bin/budgie-session +bin/budgie-session-inhibit +bin/budgie-session-quit +libexec/budgie-session-binary +libexec/budgie-session-check-accelerated +libexec/budgie-session-check-accelerated-gl-helper +libexec/budgie-session-check-accelerated-gles-helper +libexec/budgie-session-failed +%%DATADIR%%/hardware-compatibility +share/locale/ab/LC_MESSAGES/budgie-session-0.mo +share/locale/af/LC_MESSAGES/budgie-session-0.mo +share/locale/am/LC_MESSAGES/budgie-session-0.mo +share/locale/an/LC_MESSAGES/budgie-session-0.mo +share/locale/ar/LC_MESSAGES/budgie-session-0.mo +share/locale/as/LC_MESSAGES/budgie-session-0.mo +share/locale/ast/LC_MESSAGES/budgie-session-0.mo +share/locale/az/LC_MESSAGES/budgie-session-0.mo +share/locale/be/LC_MESSAGES/budgie-session-0.mo +share/locale/be@latin/LC_MESSAGES/budgie-session-0.mo +share/locale/bg/LC_MESSAGES/budgie-session-0.mo +share/locale/bn/LC_MESSAGES/budgie-session-0.mo +share/locale/bn_IN/LC_MESSAGES/budgie-session-0.mo +share/locale/br/LC_MESSAGES/budgie-session-0.mo +share/locale/bs/LC_MESSAGES/budgie-session-0.mo +share/locale/ca/LC_MESSAGES/budgie-session-0.mo +share/locale/ca@valencia/LC_MESSAGES/budgie-session-0.mo +share/locale/ckb/LC_MESSAGES/budgie-session-0.mo +share/locale/crh/LC_MESSAGES/budgie-session-0.mo +share/locale/cs/LC_MESSAGES/budgie-session-0.mo +share/locale/csb/LC_MESSAGES/budgie-session-0.mo +share/locale/cy/LC_MESSAGES/budgie-session-0.mo +share/locale/da/LC_MESSAGES/budgie-session-0.mo +share/locale/de/LC_MESSAGES/budgie-session-0.mo +share/locale/dz/LC_MESSAGES/budgie-session-0.mo +share/locale/el/LC_MESSAGES/budgie-session-0.mo +share/locale/en@shaw/LC_MESSAGES/budgie-session-0.mo +share/locale/en_CA/LC_MESSAGES/budgie-session-0.mo +share/locale/en_GB/LC_MESSAGES/budgie-session-0.mo +share/locale/eo/LC_MESSAGES/budgie-session-0.mo +share/locale/es/LC_MESSAGES/budgie-session-0.mo +share/locale/et/LC_MESSAGES/budgie-session-0.mo +share/locale/eu/LC_MESSAGES/budgie-session-0.mo +share/locale/fa/LC_MESSAGES/budgie-session-0.mo +share/locale/fi/LC_MESSAGES/budgie-session-0.mo +share/locale/fr/LC_MESSAGES/budgie-session-0.mo +share/locale/fur/LC_MESSAGES/budgie-session-0.mo +share/locale/fy/LC_MESSAGES/budgie-session-0.mo +share/locale/ga/LC_MESSAGES/budgie-session-0.mo +share/locale/gd/LC_MESSAGES/budgie-session-0.mo +share/locale/gl/LC_MESSAGES/budgie-session-0.mo +share/locale/gu/LC_MESSAGES/budgie-session-0.mo +share/locale/ha/LC_MESSAGES/budgie-session-0.mo +share/locale/he/LC_MESSAGES/budgie-session-0.mo +share/locale/hi/LC_MESSAGES/budgie-session-0.mo +share/locale/hr/LC_MESSAGES/budgie-session-0.mo +share/locale/hu/LC_MESSAGES/budgie-session-0.mo +share/locale/hy/LC_MESSAGES/budgie-session-0.mo +share/locale/id/LC_MESSAGES/budgie-session-0.mo +share/locale/ie/LC_MESSAGES/budgie-session-0.mo +share/locale/ig/LC_MESSAGES/budgie-session-0.mo +share/locale/is/LC_MESSAGES/budgie-session-0.mo +share/locale/it/LC_MESSAGES/budgie-session-0.mo +share/locale/ja/LC_MESSAGES/budgie-session-0.mo +share/locale/ka/LC_MESSAGES/budgie-session-0.mo +share/locale/kab/LC_MESSAGES/budgie-session-0.mo +share/locale/kk/LC_MESSAGES/budgie-session-0.mo +share/locale/km/LC_MESSAGES/budgie-session-0.mo +share/locale/kn/LC_MESSAGES/budgie-session-0.mo +share/locale/ko/LC_MESSAGES/budgie-session-0.mo +share/locale/ku/LC_MESSAGES/budgie-session-0.mo +share/locale/lt/LC_MESSAGES/budgie-session-0.mo +share/locale/lv/LC_MESSAGES/budgie-session-0.mo +share/locale/mai/LC_MESSAGES/budgie-session-0.mo +share/locale/mg/LC_MESSAGES/budgie-session-0.mo +share/locale/mi/LC_MESSAGES/budgie-session-0.mo +share/locale/mjw/LC_MESSAGES/budgie-session-0.mo +share/locale/mk/LC_MESSAGES/budgie-session-0.mo +share/locale/ml/LC_MESSAGES/budgie-session-0.mo +share/locale/mn/LC_MESSAGES/budgie-session-0.mo +share/locale/mr/LC_MESSAGES/budgie-session-0.mo +share/locale/ms/LC_MESSAGES/budgie-session-0.mo +share/locale/nb/LC_MESSAGES/budgie-session-0.mo +share/locale/nds/LC_MESSAGES/budgie-session-0.mo +share/locale/ne/LC_MESSAGES/budgie-session-0.mo +share/locale/nl/LC_MESSAGES/budgie-session-0.mo +share/locale/nn/LC_MESSAGES/budgie-session-0.mo +share/locale/nso/LC_MESSAGES/budgie-session-0.mo +share/locale/oc/LC_MESSAGES/budgie-session-0.mo +share/locale/or/LC_MESSAGES/budgie-session-0.mo +share/locale/pa/LC_MESSAGES/budgie-session-0.mo +share/locale/pl/LC_MESSAGES/budgie-session-0.mo +share/locale/ps/LC_MESSAGES/budgie-session-0.mo +share/locale/pt/LC_MESSAGES/budgie-session-0.mo +share/locale/pt_BR/LC_MESSAGES/budgie-session-0.mo +share/locale/ro/LC_MESSAGES/budgie-session-0.mo +share/locale/ru/LC_MESSAGES/budgie-session-0.mo +share/locale/rw/LC_MESSAGES/budgie-session-0.mo +share/locale/si/LC_MESSAGES/budgie-session-0.mo +share/locale/sk/LC_MESSAGES/budgie-session-0.mo +share/locale/sl/LC_MESSAGES/budgie-session-0.mo +share/locale/sq/LC_MESSAGES/budgie-session-0.mo +share/locale/sr/LC_MESSAGES/budgie-session-0.mo +share/locale/sr@latin/LC_MESSAGES/budgie-session-0.mo +share/locale/sv/LC_MESSAGES/budgie-session-0.mo +share/locale/ta/LC_MESSAGES/budgie-session-0.mo +share/locale/te/LC_MESSAGES/budgie-session-0.mo +share/locale/tg/LC_MESSAGES/budgie-session-0.mo +share/locale/th/LC_MESSAGES/budgie-session-0.mo +share/locale/tk/LC_MESSAGES/budgie-session-0.mo +share/locale/tr/LC_MESSAGES/budgie-session-0.mo +share/locale/ug/LC_MESSAGES/budgie-session-0.mo +share/locale/uk/LC_MESSAGES/budgie-session-0.mo +share/locale/uz/LC_MESSAGES/budgie-session-0.mo +share/locale/uz@cyrillic/LC_MESSAGES/budgie-session-0.mo +share/locale/vi/LC_MESSAGES/budgie-session-0.mo +share/locale/wa/LC_MESSAGES/budgie-session-0.mo +share/locale/xh/LC_MESSAGES/budgie-session-0.mo +share/locale/yo/LC_MESSAGES/budgie-session-0.mo +share/locale/zh_CN/LC_MESSAGES/budgie-session-0.mo +share/locale/zh_HK/LC_MESSAGES/budgie-session-0.mo +share/locale/zh_TW/LC_MESSAGES/budgie-session-0.mo +share/locale/zu/LC_MESSAGES/budgie-session-0.mo +share/man/man1/budgie-session-inhibit.1.gz +share/man/man1/budgie-session-quit.1.gz +share/man/man1/budgie-session.1.gz diff --git a/x11/budgie/Makefile b/x11/budgie/Makefile index 4902cbd47d9a..088b5e7c8297 100644 --- a/x11/budgie/Makefile +++ b/x11/budgie/Makefile @@ -1,15 +1,14 @@ PORTNAME= budgie -PORTVERSION= 10.8 +PORTVERSION= 10.9 CATEGORIES= x11 budgie MAINTAINER= duchateau.olivier@gmail.com COMMENT= Meta-port for the Budgie Desktop Environment -WWW= https://blog.buddiesofbudgie.org/ +WWW= https://buddiesofbudgie.org/ -RUN_DEPENDS= budgie-desktop>0:x11/budgie-desktop \ +RUN_DEPENDS= budgie-desktop:x11/budgie-desktop \ budgie-desktop-view>0:deskutils/budgie-desktop-view \ - budgie-control-center>0:sysutils/budgie-control-center \ - qogir-gtk-themes>0:x11-themes/qogir-gtk-themes \ + budgie-control-center:sysutils/budgie-control-center \ adwaita-icon-theme>0:x11-themes/adwaita-icon-theme \ tela-icon-theme>0:x11-themes/tela-icon-theme \ xdg-user-dirs>0:devel/xdg-user-dirs @@ -26,14 +25,12 @@ USES= metaport OPTIONS_DEFINE= EXAMPLES OPTIONS_SUB= yes -EXAMPLES_SUB_FILES= pkg-message xinitrc xprofile +EXAMPLES_SUB_FILES= pkg-message xprofile pre-install-EXAMPLES-on: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} post-install-EXAMPLES-on: -.for f in xinitrc xprofile - ${INSTALL_SCRIPT} ${WRKDIR}/${f} ${STAGEDIR}${EXAMPLESDIR} -.endfor + ${INSTALL_SCRIPT} ${WRKDIR}/xprofile ${STAGEDIR}${EXAMPLESDIR} .include <bsd.port.mk> diff --git a/x11/budgie/files/pkg-message.in b/x11/budgie/files/pkg-message.in index 352d3b0622f7..82d7f9947fda 100644 --- a/x11/budgie/files/pkg-message.in +++ b/x11/budgie/files/pkg-message.in @@ -1,13 +1,16 @@ [ { type: install message: <<EOM -Copy 'xprofile' into your home directory: +In order to launch your session. Copy 'xprofile' into your home directory: cp %%EXAMPLESDIR%%/xprofile ~/.xprofile -More information, https://codeberg.org/olivierd/freebsd-ports-budgie/wiki +Create or edit /var/db/AccountsService/users/YOURLOGIN file: + [User] + Language=fr_FR.UTF-8 # e.g. for French users + Session=budgie-desktop + SystemAccount=false -If you want to launch new session from a console (without login manager) - cp %%EXAMPLESDIR%%/xinitrc ~/.xinitrc +Replace YOURLOGIN by your login. EOM } ] diff --git a/x11/budgie/files/xinitrc.in b/x11/budgie/files/xinitrc.in deleted file mode 100644 index 105933e55bd4..000000000000 --- a/x11/budgie/files/xinitrc.in +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# -# Use only .xinitrc script from a console (startx or xdm). -# - -#export LC_CTYPE="fr_FR.UTF-8" -#export LANG="fr_FR.UTF-8" - -[ -f $HOME/.xprofile ] && . $HOME/.xprofile - -# -#%%PREFIX%%/libexec/gvfsd-trash & -exec ck-launch-session gnome-session --builtin --disable-acceleration-check --session=org.buddiesofbudgie.BudgieDesktop diff --git a/x11/budgie/files/xprofile.in b/x11/budgie/files/xprofile.in index 665e94b1329c..01a953228194 100644 --- a/x11/budgie/files/xprofile.in +++ b/x11/budgie/files/xprofile.in @@ -1,31 +1,24 @@ #!/bin/sh -# Use the Xorg backend -if test "x$GDK_BACKEND" = "x"; then - GDK_BACKEND="x11" +# Set $XDG_RUNTIME_DIR (comment, if use with x11/gdm) +_version=$(sysctl kern.osreldate | awk -F " " '{printf("%s", $2);}') +if [ ${_version} -gt 1401000 ]; then + _user_id=$(id -un) + if [ -d "/var/run/xdg/${_user_id}" ]; then + XDG_RUNTIME_DIR="/var/run/xdg/${_user_id}" + fi +else + _user_id=$(id -u) + if [ -d "/var/run/user/${_user_id}" ]; then + XDG_RUNTIME_DIR="/var/run/user/${_user_id}" + fi fi -export XDG_SESSION_TYPE +export XDG_RUNTIME_DIR -# Set $XDG_MENU_PREFIX -if test "x$XDG_MENU_PREFIX" = "x" ; then - XDG_MENU_PREFIX="gnome-" +# Set environment variables for D-Bus session services +if command -v dbus-update-activation-environment >/dev/null 2>&1 ; then + dbus-update-activation-environment --all fi -export XDG_MENU_PREFIX - -# Set $DESKTOP_SESSION -if test "x$DESKTOP_SESSION" = "x" ; then - DESKTOP_SESSION="budgie-desktop" -fi -export DESKTOP_SESSION - -# Set $XDG_CURRENT_DESKTOP -if test "x$XDG_CURRENT_DESKTOP" = "x" ; then - XDG_CURRENT_DESKTOP="Budgie:GNOME" -fi -export XDG_CURRENT_DESKTOP - -# Suppress warning about accessibility bus -#export NO_AT_BRIDGE=1 # Set $XDG_CONFIG_DIRS if test "x$XDG_CONFIG_DIRS" = "x" ; then @@ -69,14 +62,17 @@ if test "x$XDG_STATE_HOME" = "x" ; then fi [ -d "$XDG_STATE_HOME" ] || mkdir -p "$XDG_STATE_HOME" -# Unlock gnome-keyring +# Unlock gnome-keyring daemon if test -n "$DESKTOP_SESSION" ; then - # If .xinitrc is used, uncomment the next line + SSH_AUTH_SOCK="${XDG_RUNTIME_DIR}/keyring" + + # Uncomment, if gnome-keyring daemon is not started automatically + # by XDG desktop portal backend #eval $(gnome-keyring-daemon --start --components=pkc11,secrets,ssh) export SSH_AUTH_SOCK fi -# Set up XDG user directores. See +# Set up XDG user directories (devel/xdg-user-dirs) # https://freedesktop.org/wiki/Software/xdg-user-dirs if command -v xdg-user-dirs-update >/dev/null 2>&1 ; then xdg-user-dirs-update diff --git a/x11/budgie/pkg-plist b/x11/budgie/pkg-plist index 2cf4e3624959..fa017c0001ef 100644 --- a/x11/budgie/pkg-plist +++ b/x11/budgie/pkg-plist @@ -1,2 +1 @@ -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xinitrc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/xprofile diff --git a/x11/damask/Makefile b/x11/damask/Makefile index 9418227c25e1..3c6be5d747d6 100644 --- a/x11/damask/Makefile +++ b/x11/damask/Makefile @@ -1,6 +1,6 @@ PORTNAME= damask DISTVERSIONPREFIX= v -DISTVERSION= 0.2.1 +DISTVERSION= 0.2.2 CATEGORIES= x11 gnome MAINTAINER= tagattie@FreeBSD.org diff --git a/x11/damask/distinfo b/x11/damask/distinfo index d6dbb1420458..1cd1c33100ff 100644 --- a/x11/damask/distinfo +++ b/x11/damask/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1706075781 -SHA256 (damask-v0.2.1.tar.bz2) = f7ec9b34edf0ae1b3a5df82a4cfad7b7a0baa12b89221f9e518a95dde6fa5331 -SIZE (damask-v0.2.1.tar.bz2) = 297023 +TIMESTAMP = 1758607350 +SHA256 (damask-v0.2.2.tar.bz2) = e10409d162fa8f0860c5c7f9ac2100d748451e03fe4e5991da97e225dab24c0d +SIZE (damask-v0.2.2.tar.bz2) = 564991 diff --git a/x11/damask/pkg-plist b/x11/damask/pkg-plist index 4e91fe19385a..318cb87506a3 100644 --- a/x11/damask/pkg-plist +++ b/x11/damask/pkg-plist @@ -3,7 +3,10 @@ share/applications/app.drey.Damask.desktop share/icons/hicolor/scalable/apps/app.drey.Damask.svg share/icons/hicolor/symbolic/apps/app.drey.Damask-symbolic.svg share/locale/ar/LC_MESSAGES/damask.mo +share/locale/bg/LC_MESSAGES/damask.mo share/locale/de/LC_MESSAGES/damask.mo +share/locale/es/LC_MESSAGES/damask.mo +share/locale/fi/LC_MESSAGES/damask.mo share/locale/fr/LC_MESSAGES/damask.mo share/locale/nl/LC_MESSAGES/damask.mo share/locale/ru/LC_MESSAGES/damask.mo diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index d712d3d86011..a1e8f92eb0bd 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -1,6 +1,5 @@ PORTNAME= gnome-applets -PORTVERSION= 3.56.0 -PORTREVISION= 2 +PORTVERSION= 3.58.0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome @@ -11,7 +10,7 @@ WWW= https://gitlab.gnome.org/GNOME/gnome-applets LICENSE= GPLv2 -BUILD_DEPENDS= adwaita-icon-theme>=46.0:x11-themes/adwaita-icon-theme \ +BUILD_DEPENDS= adwaita-icon-theme>0:x11-themes/adwaita-icon-theme \ xorgproto>0:x11/xorgproto \ itstool>0:textproc/itstool LIB_DEPENDS= libgnome-panel.so:x11/gnome-panel \ @@ -22,7 +21,7 @@ LIB_DEPENDS= libgnome-panel.so:x11/gnome-panel \ libgucharmap_2_90.so:deskutils/gucharmap \ libpcre2-8.so:devel/pcre2 \ libpolkit-gobject-1.so:sysutils/polkit -RUN_DEPENDS= adwaita-icon-theme>=46.0:x11-themes/adwaita-icon-theme +RUN_DEPENDS= adwaita-icon-theme>0:x11-themes/adwaita-icon-theme USES= gettext gmake gnome iconv libtool pkgconfig tar:xz xorg GNU_CONFIGURE= yes diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo index 8f9ffb89e381..5d393ce99840 100644 --- a/x11/gnome-applets/distinfo +++ b/x11/gnome-applets/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745753607 -SHA256 (gnome/gnome-applets-3.56.0.tar.xz) = fa17aedc955add981aa2e43b4c071353f686bbd1eec1d717a890a735320ad171 -SIZE (gnome/gnome-applets-3.56.0.tar.xz) = 9064320 +TIMESTAMP = 1759065947 +SHA256 (gnome/gnome-applets-3.58.0.tar.xz) = e61edb71344dcd5daa6e7175dfbb274a758be8b58452773569bb35645b85a238 +SIZE (gnome/gnome-applets-3.58.0.tar.xz) = 9077168 diff --git a/x11/gnome-flashback/Makefile b/x11/gnome-flashback/Makefile index d33dcd5dd7c3..529e6fe64d9a 100644 --- a/x11/gnome-flashback/Makefile +++ b/x11/gnome-flashback/Makefile @@ -1,6 +1,5 @@ PORTNAME= gnome-flashback -PORTVERSION= 3.56.0 -PORTREVISION= 1 +PORTVERSION= 3.58.0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome @@ -27,15 +26,13 @@ LIB_DEPENDS= libgnome-panel.so:x11/gnome-panel \ libharfbuzz.so:print/harfbuzz RUN_DEPENDS= xkeyboard-config>0:x11/xkeyboard-config \ gnome-session>0:x11/gnome-session \ - metacity>0:x11-wm/metacity \ + metacity:x11-wm/metacity \ gnome-applets>0:x11/gnome-applets \ - tecla>0:x11/tecla \ - alacarte>0:x11/alacarte \ - gedit>0:editors/gedit \ - sushi>0:x11-fm/sushi \ - nautilus>0:x11-fm/nautilus \ - gnome-terminal>0:x11/gnome-terminal \ - xdg-user-dirs-gtk>0:x11/xdg-user-dirs-gtk \ + tecla:x11/tecla \ + alacarte:x11/alacarte \ + nautilus:x11-fm/nautilus \ + gnome-terminal:x11/gnome-terminal \ + xdg-user-dirs-gtk-update:x11/xdg-user-dirs-gtk \ cantarell-fonts>0:x11-fonts/cantarell-fonts \ source-code-pro-ttf>0:x11-fonts/source-code-pro-ttf @@ -65,10 +62,14 @@ GLIB_SCHEMAS= 00_gnome-flashback.gschema.override \ org.gnome.gnome-flashback.system-indicators.input-sources.gschema.xml post-extract: - ${CP} ${FILESDIR}/gf-consolekit-* \ +# Add support for ConsoleKit + @${CP} ${FILESDIR}/gf-consolekit-* \ ${WRKSRC}/dbus/ - ${CP} ${FILESDIR}/org.freedesktop.ConsoleKit* \ + @${CP} ${FILESDIR}/org.freedesktop.ConsoleKit* \ ${WRKSRC}/dbus/ +# Re-add XDG autostart .desktop files removed for systemd service + @${CP} ${FILESDIR}/*.desktop.in.in \ + ${WRKSRC}/data/autostart/ post-patch: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${LOCALBASE}|" \ diff --git a/x11/gnome-flashback/distinfo b/x11/gnome-flashback/distinfo index b1455e262c45..16b06a1e2024 100644 --- a/x11/gnome-flashback/distinfo +++ b/x11/gnome-flashback/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745754419 -SHA256 (gnome/gnome-flashback-3.56.0.tar.xz) = 2d0fa22f373db080eaef0e5693b9628cde844f25633d5a90313b049dd9529260 -SIZE (gnome/gnome-flashback-3.56.0.tar.xz) = 912964 +TIMESTAMP = 1759067196 +SHA256 (gnome/gnome-flashback-3.58.0.tar.xz) = aaa23e7042477e741f24279b468b9d20af4ec195ee43b3d312cdaaf84d98c321 +SIZE (gnome/gnome-flashback-3.58.0.tar.xz) = 911468 diff --git a/x11/gnome-flashback/files/gnome-flashback-clipboard.desktop.in.in b/x11/gnome-flashback/files/gnome-flashback-clipboard.desktop.in.in new file mode 100644 index 000000000000..90a8b63b48ee --- /dev/null +++ b/x11/gnome-flashback/files/gnome-flashback-clipboard.desktop.in.in @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Name=Clipboard (GNOME Flashback) +Exec=@libexecdir@/gnome-flashback-clipboard +AutostartCondition=GSettings org.gnome.gnome-flashback clipboard +OnlyShowIn=GNOME-Flashback; +NoDisplay=true +X-GNOME-Autostart-Phase=Initialization +X-GNOME-Autostart-Notify=true +X-GNOME-AutoRestart=true diff --git a/x11/gnome-flashback/files/gnome-flashback-idle-monitor.desktop.in.in b/x11/gnome-flashback/files/gnome-flashback-idle-monitor.desktop.in.in new file mode 100644 index 000000000000..5ef9f67458f3 --- /dev/null +++ b/x11/gnome-flashback/files/gnome-flashback-idle-monitor.desktop.in.in @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Name=Idle Monitor (GNOME Flashback) +Exec=@libexecdir@/gnome-flashback-idle-monitor +AutostartCondition=GSettings org.gnome.gnome-flashback idle-monitor +OnlyShowIn=GNOME-Flashback; +NoDisplay=true +X-GNOME-Autostart-Phase=Initialization +X-GNOME-Autostart-Notify=true +X-GNOME-AutoRestart=true diff --git a/x11/gnome-flashback/files/gnome-flashback-media-keys.desktop.in.in b/x11/gnome-flashback/files/gnome-flashback-media-keys.desktop.in.in new file mode 100644 index 000000000000..495de16ecea7 --- /dev/null +++ b/x11/gnome-flashback/files/gnome-flashback-media-keys.desktop.in.in @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=MediaKeys (GNOME Flashback) +Exec=@libexecdir@/gnome-flashback-media-keys +OnlyShowIn=GNOME-Flashback; +NoDisplay=true +X-GNOME-Autostart-Phase=Initialization +X-GNOME-Autostart-Notify=true +X-GNOME-AutoRestart=true diff --git a/x11/gnome-flashback/files/gnome-flashback-polkit.desktop.in.in b/x11/gnome-flashback/files/gnome-flashback-polkit.desktop.in.in new file mode 100644 index 000000000000..f3592d358f19 --- /dev/null +++ b/x11/gnome-flashback/files/gnome-flashback-polkit.desktop.in.in @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Name=Polkit (GNOME Flashback) +Exec=@libexecdir@/gnome-flashback-polkit +AutostartCondition=GSettings org.gnome.gnome-flashback polkit +OnlyShowIn=GNOME-Flashback; +NoDisplay=true +X-GNOME-Autostart-Phase=Initialization +X-GNOME-Autostart-Notify=true +X-GNOME-AutoRestart=true diff --git a/x11/gnome-flashback/files/patch-configure b/x11/gnome-flashback/files/patch-configure index b85f90c525e5..c6183cc45ba7 100644 --- a/x11/gnome-flashback/files/patch-configure +++ b/x11/gnome-flashback/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2023-08-12 06:58:51 UTC +--- configure.orig 2025-09-28 09:53:08 UTC +++ configure -@@ -19785,7 +19785,7 @@ pkg_failed=no +@@ -21416,7 +21416,7 @@ pkg_failed=no gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gtk+-3.0 >= $GTK_REQUIRED @@ -9,7 +9,7 @@ x11 " >&5 printf %s "checking for -@@ -19794,7 +19794,7 @@ printf %s "checking for +@@ -21425,7 +21425,7 @@ printf %s "checking for gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gtk+-3.0 >= $GTK_REQUIRED @@ -18,7 +18,7 @@ x11 ... " >&6; } -@@ -19808,7 +19808,7 @@ if test -n "$DESKTOP_CFLAGS"; then +@@ -21439,7 +21439,7 @@ if test -n "$DESKTOP_CFLAGS"; then gio-unix-2.0 >= \$GLIB_REQUIRED gnome-desktop-3.0 >= \$LIBGNOME_DESKTOP_REQUIRED gtk+-3.0 >= \$GTK_REQUIRED @@ -27,7 +27,7 @@ x11 \""; } >&5 ($PKG_CONFIG --exists --print-errors " -@@ -19817,7 +19817,7 @@ if test -n "$DESKTOP_CFLAGS"; then +@@ -21448,7 +21448,7 @@ if test -n "$DESKTOP_CFLAGS"; then gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gtk+-3.0 >= $GTK_REQUIRED @@ -36,7 +36,7 @@ x11 ") 2>&5 ac_status=$? -@@ -19829,7 +19829,7 @@ if test -n "$DESKTOP_CFLAGS"; then +@@ -21460,7 +21460,7 @@ if test -n "$DESKTOP_CFLAGS"; then gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gtk+-3.0 >= $GTK_REQUIRED @@ -45,7 +45,7 @@ x11 " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes -@@ -19849,7 +19849,7 @@ if test -n "$DESKTOP_LIBS"; then +@@ -21480,7 +21480,7 @@ if test -n "$DESKTOP_LIBS"; then gio-unix-2.0 >= \$GLIB_REQUIRED gnome-desktop-3.0 >= \$LIBGNOME_DESKTOP_REQUIRED gtk+-3.0 >= \$GTK_REQUIRED @@ -54,7 +54,7 @@ x11 \""; } >&5 ($PKG_CONFIG --exists --print-errors " -@@ -19858,7 +19858,7 @@ if test -n "$DESKTOP_LIBS"; then +@@ -21489,7 +21489,7 @@ if test -n "$DESKTOP_LIBS"; then gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gtk+-3.0 >= $GTK_REQUIRED @@ -63,7 +63,7 @@ x11 ") 2>&5 ac_status=$? -@@ -19870,7 +19870,7 @@ if test -n "$DESKTOP_LIBS"; then +@@ -21501,7 +21501,7 @@ if test -n "$DESKTOP_LIBS"; then gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gtk+-3.0 >= $GTK_REQUIRED @@ -72,7 +72,7 @@ x11 " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes -@@ -19899,7 +19899,7 @@ fi +@@ -21530,7 +21530,7 @@ fi gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gtk+-3.0 >= $GTK_REQUIRED @@ -81,7 +81,7 @@ x11 " 2>&1` else -@@ -19909,7 +19909,7 @@ fi +@@ -21540,7 +21540,7 @@ fi gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gtk+-3.0 >= $GTK_REQUIRED @@ -90,7 +90,7 @@ x11 " 2>&1` fi -@@ -19922,7 +19922,7 @@ fi +@@ -21553,7 +21553,7 @@ fi gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gtk+-3.0 >= $GTK_REQUIRED @@ -99,7 +99,7 @@ x11 ) were not met: -@@ -21277,7 +21277,7 @@ pkg_failed=no +@@ -22908,7 +22908,7 @@ pkg_failed=no glib-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gtk+-3.0 >= $GTK_REQUIRED @@ -108,7 +108,7 @@ xxf86vm >= $XXF86VM_REQUIRED " >&5 printf %s "checking for -@@ -21286,7 +21286,7 @@ printf %s "checking for +@@ -22917,7 +22917,7 @@ printf %s "checking for glib-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gtk+-3.0 >= $GTK_REQUIRED @@ -117,7 +117,7 @@ xxf86vm >= $XXF86VM_REQUIRED ... " >&6; } -@@ -21296,20 +21296,22 @@ if test -n "$SCREENSAVER_CFLAGS"; then +@@ -22927,11 +22927,12 @@ if test -n "$SCREENSAVER_CFLAGS"; then if test -n "$PKG_CONFIG" && \ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gdm @@ -131,9 +131,7 @@ xxf86vm >= \$XXF86VM_REQUIRED \""; } >&5 ($PKG_CONFIG --exists --print-errors " - gdm -+ gio-2.0 >= $GLIB_REQUIRED - gio-unix-2.0 >= $GLIB_REQUIRED +@@ -22940,7 +22941,7 @@ if test -n "$SCREENSAVER_CFLAGS"; then glib-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gtk+-3.0 >= $GTK_REQUIRED @@ -142,7 +140,7 @@ xxf86vm >= $XXF86VM_REQUIRED ") 2>&5 ac_status=$? -@@ -21317,11 +21319,12 @@ if test -n "$SCREENSAVER_CFLAGS"; then +@@ -22948,11 +22949,12 @@ if test -n "$SCREENSAVER_CFLAGS"; then test $ac_status = 0; }; then pkg_cv_SCREENSAVER_CFLAGS=`$PKG_CONFIG --cflags " gdm @@ -156,7 +154,7 @@ xxf86vm >= $XXF86VM_REQUIRED " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes -@@ -21337,20 +21340,22 @@ if test -n "$SCREENSAVER_LIBS"; then +@@ -22968,11 +22970,12 @@ if test -n "$SCREENSAVER_LIBS"; then if test -n "$PKG_CONFIG" && \ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gdm @@ -170,9 +168,7 @@ xxf86vm >= \$XXF86VM_REQUIRED \""; } >&5 ($PKG_CONFIG --exists --print-errors " - gdm -+ gio-2.0 >= $GLIB_REQUIRED - gio-unix-2.0 >= $GLIB_REQUIRED +@@ -22981,7 +22984,7 @@ if test -n "$SCREENSAVER_LIBS"; then glib-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gtk+-3.0 >= $GTK_REQUIRED @@ -181,7 +177,7 @@ xxf86vm >= $XXF86VM_REQUIRED ") 2>&5 ac_status=$? -@@ -21358,11 +21363,12 @@ if test -n "$SCREENSAVER_LIBS"; then +@@ -22989,11 +22992,12 @@ if test -n "$SCREENSAVER_LIBS"; then test $ac_status = 0; }; then pkg_cv_SCREENSAVER_LIBS=`$PKG_CONFIG --libs " gdm @@ -195,7 +191,7 @@ xxf86vm >= $XXF86VM_REQUIRED " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes -@@ -21387,21 +21393,23 @@ fi +@@ -23018,21 +23022,23 @@ fi if test $_pkg_short_errors_supported = yes; then SCREENSAVER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " gdm @@ -221,7 +217,7 @@ xxf86vm >= $XXF86VM_REQUIRED " 2>&1` fi -@@ -21410,11 +21418,12 @@ fi +@@ -23041,11 +23047,12 @@ fi as_fn_error $? "Package requirements ( gdm @@ -235,23 +231,3 @@ xxf86vm >= $XXF86VM_REQUIRED ) were not met: -@@ -22631,19 +22640,15 @@ fi - REQUIRED_COMPNENTS_GSD=" \ - org.gnome.SettingsDaemon.A11ySettings \ - org.gnome.SettingsDaemon.Color \ -- org.gnome.SettingsDaemon.Datetime \ - org.gnome.SettingsDaemon.Housekeeping \ - org.gnome.SettingsDaemon.Keyboard \ - org.gnome.SettingsDaemon.MediaKeys \ - org.gnome.SettingsDaemon.Power \ - org.gnome.SettingsDaemon.PrintNotifications \ -- org.gnome.SettingsDaemon.Rfkill \ - org.gnome.SettingsDaemon.ScreensaverProxy \ - org.gnome.SettingsDaemon.Sharing \ - org.gnome.SettingsDaemon.Smartcard \ - org.gnome.SettingsDaemon.Sound \ -- org.gnome.SettingsDaemon.UsbProtection \ -- org.gnome.SettingsDaemon.Wacom \ - org.gnome.SettingsDaemon.XSettings \ - " - diff --git a/x11/gnome-flashback/files/patch-data_autostart_Makefile.in b/x11/gnome-flashback/files/patch-data_autostart_Makefile.in index 38dc99041736..5e643e7180d1 100644 --- a/x11/gnome-flashback/files/patch-data_autostart_Makefile.in +++ b/x11/gnome-flashback/files/patch-data_autostart_Makefile.in @@ -1,26 +1,37 @@ ---- data/autostart/Makefile.in.orig 2023-08-12 06:58:52 UTC +--- data/autostart/Makefile.in.orig 2025-09-28 09:53:09 UTC +++ data/autostart/Makefile.in -@@ -386,7 +386,6 @@ autostart_DATA = \ - gnome-flashback-clipboard.desktop \ - gnome-flashback-idle-monitor.desktop \ - gnome-flashback-media-keys.desktop \ +@@ -388,18 +388,31 @@ autostart_DATA = \ + autostartdir = $(sysconfdir)/xdg/autostart + autostart_DATA = \ + gnome-flashback-geoclue-demo-agent.desktop \ - gnome-flashback-nm-applet.desktop \ - gnome-flashback-polkit.desktop \ ++ gnome-flashback-clipboard.desktop \ ++ gnome-flashback-idle-monitor.desktop \ ++ gnome-flashback-media-keys.desktop \ ++ gnome-flashback-polkit.desktop \ $(NULL) -@@ -394,7 +393,6 @@ EXTRA_DIST = \ - gnome-flashback-clipboard.desktop.in.in \ - gnome-flashback-idle-monitor.desktop.in.in \ - gnome-flashback-media-keys.desktop.in.in \ + EXTRA_DIST = \ + gnome-flashback-geoclue-demo-agent.desktop.in.in \ - gnome-flashback-nm-applet.desktop.in \ - gnome-flashback-polkit.desktop.in.in \ ++ gnome-flashback-clipboard.desktop.in.in \ ++ gnome-flashback-idle-monitor.desktop.in.in \ ++ gnome-flashback-media.desktop.in.in \ ++ gnome-flashback-polkit.desktop.in.in \ $(NULL) -@@ -405,7 +403,6 @@ CLEANFILES = \ - gnome-flashback-idle-monitor.desktop \ - gnome-flashback-media-keys.desktop.in \ - gnome-flashback-media-keys.desktop \ + CLEANFILES = \ + gnome-flashback-geoclue-demo-agent.desktop.in \ + gnome-flashback-geoclue-demo-agent.desktop \ - gnome-flashback-nm-applet.desktop \ - gnome-flashback-polkit.desktop.in \ - gnome-flashback-polkit.desktop \ ++ gnome-flashback-clipboard.desktop.in \ ++ gnome-flashback-clipboard.desktop \ ++ gnome-flashback-idle-monitor.desktop.in \ ++ gnome-flashback-idle-monitor.desktop \ ++ gnome-flashback-media-keys.desktop.in \ ++ gnome-flashback-media-keys.desktop \ ++ gnome-flashback-polkit.desktop.in \ ++ gnome-flashback-polkit.desktop \ $(NULL) + + all: all-am diff --git a/x11/gnome-flashback/files/patch-data_schemas_org.gnome.gnome-flashback.gschema.xml b/x11/gnome-flashback/files/patch-data_schemas_org.gnome.gnome-flashback.gschema.xml new file mode 100644 index 000000000000..52afd4c4f1c3 --- /dev/null +++ b/x11/gnome-flashback/files/patch-data_schemas_org.gnome.gnome-flashback.gschema.xml @@ -0,0 +1,53 @@ +Revert: https://gitlab.gnome.org/GNOME/gnome-flashback/-/commit/5f4aa0d8 + +From 5f4aa0d89e1f2022ebc9c59d9a2171b00643f847 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels@gmail.com> +Date: Sun, 28 Sep 2025 11:45:53 +0300 +Subject: [PATCH] schemas: remove no longer needed settings + +These was used to start/stop services by GNOME Session. Related +services now are started by systemd and these settings are no +longer used. + +https://gitlab.gnome.org/GNOME/gnome-flashback/-/issues/103 + +--- data/schemas/org.gnome.gnome-flashback.gschema.xml.orig 2025-09-28 09:52:06 UTC ++++ data/schemas/org.gnome.gnome-flashback.gschema.xml +@@ -17,6 +17,11 @@ + <description>If set to true, then GNOME Flashback application will be used to automount removable media.</description> + </key> + ++ <key name="clipboard" type="b"> ++ <default>true</default> ++ <summary>Clipboard</summary> ++ </key> ++ + <key name="desktop" type="b"> + <default>true</default> + <summary>Desktop</summary> +@@ -28,6 +33,12 @@ + <description>If set to true, then GNOME Flashback application will be used to show the end session dialog.</description> + </key> + ++ <key name="idle-monitor" type="b"> ++ <default>true</default> ++ <summary>Idle monitor</summary> ++ <description>If set to true, then GNOME Flashback application will be used for user activity monitoring.</description> ++ </key> ++ + <key name="input-settings" type="b"> + <default>true</default> + <summary>Input settings</summary> +@@ -43,6 +54,12 @@ + <default>true</default> + <summary>Notification daemon</summary> + <description>If set to true, then GNOME Flashback application will be used to manage notifications.</description> ++ </key> ++ ++ <key name="polkit" type="b"> ++ <default>true</default> ++ <summary>Authentication agent for polkit</summary> ++ <description>This is the same authentication agent that was provided by PolicyKit-gnome.</description> + </key> + + <key name="root-background" type="b"> diff --git a/x11/gnome-flashback/files/patch-data_sessions_Makefile.am b/x11/gnome-flashback/files/patch-data_sessions_Makefile.am new file mode 100644 index 000000000000..f27d522d357c --- /dev/null +++ b/x11/gnome-flashback/files/patch-data_sessions_Makefile.am @@ -0,0 +1,54 @@ +--- data/sessions/Makefile.am.orig 2025-09-28 09:52:06 UTC ++++ data/sessions/Makefile.am +@@ -1,8 +1,43 @@ NULL = + NULL = + ++required_components_gsd = \ ++ org.gnome.SettingsDaemon.A11ySettings \ ++ org.gnome.SettingsDaemon.Color \ ++ org.gnome.SettingsDaemon.Keyboard \ ++ org.gnome.SettingsDaemon.MediaKeys \ ++ org.gnome.SettingsDaemon.Power \ ++ org.gnome.SettingsDaemon.PrintNotifications \ ++ org.gnome.SettingsDaemon.ScreensaverProxy \ ++ org.gnome.SettingsDaemon.Sharing \ ++ org.gnome.SettingsDaemon.Smartcard \ ++ org.gnome.SettingsDaemon.Sound \ ++ org.gnome.SettingsDaemon.XSettings \ ++ $(NULL) ++ ++required_components_common = \ ++ gnome-flashback \ ++ gnome-panel \ ++ $(NULL) ++ ++required_components_compiz = \ ++ compiz \ ++ $(required_components_common) \ ++ $(required_components_gsd) \ ++ $(NULL) ++ ++required_components_metacity = \ ++ metacity \ ++ $(required_components_common) \ ++ $(required_components_gsd) \ ++ $(NULL) ++ ++space = $(NULL) $(NULL) ++compiz = $(subst $(space),;,$(strip $(required_components_compiz))) ++metacity = $(subst $(space),;,$(strip $(required_components_metacity))) + gnome-flashback-metacity.session: Makefile.am gnome-flashback.session.in + $(AM_V_GEN) sed \ + -e 's,[@]NAME[@],Metacity,g' \ ++ -e 's,[@]REQUIRED_COMPONENTS[@],$(metacity),g' \ + < $(srcdir)/gnome-flashback.session.in > $@ + + sessions = \ +@@ -13,6 +48,7 @@ gnome-flashback-compiz.session: Makefile.am gnome-flas + gnome-flashback-compiz.session: Makefile.am gnome-flashback.session.in + $(AM_V_GEN) sed \ + -e 's,[@]NAME[@],Compiz,g' \ ++ -e 's,[@]REQUIRED_COMPONENTS[@],$(compiz),g' \ + < $(srcdir)/gnome-flashback.session.in > $@ + + sessions += \ diff --git a/x11/gnome-flashback/files/patch-data_sessions_Makefile.in b/x11/gnome-flashback/files/patch-data_sessions_Makefile.in new file mode 100644 index 000000000000..7bf1e6d68ad2 --- /dev/null +++ b/x11/gnome-flashback/files/patch-data_sessions_Makefile.in @@ -0,0 +1,57 @@ +--- data/sessions/Makefile.in.orig 2025-09-28 09:53:09 UTC ++++ data/sessions/Makefile.in +@@ -389,6 +389,40 @@ NULL = + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + NULL = ++required_components_gsd = \ ++ org.gnome.SettingsDaemon.A11ySettings \ ++ org.gnome.SettingsDaemon.Color \ ++ org.gnome.SettingsDaemon.Keyboard \ ++ org.gnome.SettingsDaemon.MediaKeys \ ++ org.gnome.SettingsDaemon.Power \ ++ org.gnome.SettingsDaemon.PrintNotifications \ ++ org.gnome.SettingsDaemon.ScreensaverProxy \ ++ org.gnome.SettingsDaemon.Sharing \ ++ org.gnome.SettingsDaemon.Smartcard \ ++ org.gnome.SettingsDaemon.Sound \ ++ org.gnome.SettingsDaemon.XSettings \ ++ $(NULL) ++ ++required_components_common = \ ++ gnome-flashback \ ++ gnome-panel \ ++ $(NULL) ++ ++required_components_compiz = \ ++ compiz \ ++ $(required_components_common) \ ++ $(required_components_gsd) \ ++ $(NULL) ++ ++required_components_metacity = \ ++ metacity \ ++ $(required_components_common) \ ++ $(required_components_gsd) \ ++ $(NULL) ++ ++space = $(NULL) $(NULL) ++compiz = $(subst $(space),;,$(strip $(required_components_compiz))) ++metacity = $(subst $(space),;,$(strip $(required_components_metacity))) + sessions = gnome-flashback-metacity.session $(NULL) $(am__append_1) + sessiondir = $(datadir)/gnome-session/sessions + session_DATA = $(sessions) +@@ -622,11 +656,13 @@ gnome-flashback-metacity.session: Makefile.am gnome-fl + gnome-flashback-metacity.session: Makefile.am gnome-flashback.session.in + $(AM_V_GEN) sed \ + -e 's,[@]NAME[@],Metacity,g' \ ++ -e 's,[@]REQUIRED_COMPONENTS[@],$(metacity),g' \ + < $(srcdir)/gnome-flashback.session.in > $@ + + @WITH_COMPIZ_SESSION_TRUE@gnome-flashback-compiz.session: Makefile.am gnome-flashback.session.in + @WITH_COMPIZ_SESSION_TRUE@ $(AM_V_GEN) sed \ + @WITH_COMPIZ_SESSION_TRUE@ -e 's,[@]NAME[@],Compiz,g' \ ++@WITH_COMPIZ_SESSION_TRUE@ -e 's,[@]REQUIRED_COMPONENTS[@],$(compiz),g' \ + @WITH_COMPIZ_SESSION_TRUE@ < $(srcdir)/gnome-flashback.session.in > $@ + + -include $(top_srcdir)/git.mk diff --git a/x11/gnome-flashback/files/patch-data_sessions_gnome-flashback.session.in b/x11/gnome-flashback/files/patch-data_sessions_gnome-flashback.session.in new file mode 100644 index 000000000000..2652defb3dd8 --- /dev/null +++ b/x11/gnome-flashback/files/patch-data_sessions_gnome-flashback.session.in @@ -0,0 +1,6 @@ +--- data/sessions/gnome-flashback.session.in.orig 2025-09-28 09:52:06 UTC ++++ data/sessions/gnome-flashback.session.in +@@ -1,2 +1,3 @@ Name=GNOME Flashback (@NAME@) + [GNOME Session] + Name=GNOME Flashback (@NAME@) ++RequiredComponents=@REQUIRED_COMPONENTS@; diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile index acc58fbd9762..2b6cd6eef5bf 100644 --- a/x11/gnome-menus/Makefile +++ b/x11/gnome-menus/Makefile @@ -1,18 +1,17 @@ PORTNAME= gnome-menus -PORTVERSION= 3.36.0 +PORTVERSION= 3.38.1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Implementation of the FreeDesktop Desktop Menu Spec -WWW= https://www.freedesktop.org/Standards/menu-spec +WWW= https://gitlab.gnome.org/GNOME/gnome-menus LICENSE= GPLv2 USES= gettext gmake gnome libtool localbase pathfix pkgconfig python tar:xz -USE_GNOME= glib20 gnomeprefix intlhack \ - introspection:build +USE_GNOME= glib20 gnomeprefix introspection:build GNU_CONFIGURE= yes USE_LDCONFIG= yes INSTALL_TARGET= install-strip diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo index 147f94393c5b..309170509934 100644 --- a/x11/gnome-menus/distinfo +++ b/x11/gnome-menus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1601469678 -SHA256 (gnome/gnome-menus-3.36.0.tar.xz) = d9348f38bde956fc32753b28c1cde19c175bfdbf1f4d5b06003b3aa09153bb1f -SIZE (gnome/gnome-menus-3.36.0.tar.xz) = 502324 +TIMESTAMP = 1758895711 +SHA256 (gnome/gnome-menus-3.38.1.tar.xz) = 1198a91cdbdcfb232df94e71ef5427617d26029e327be3f860c3b0921c448118 +SIZE (gnome/gnome-menus-3.38.1.tar.xz) = 471464 diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist index 24f753ccc77f..a365f1716371 100644 --- a/x11/gnome-menus/pkg-plist +++ b/x11/gnome-menus/pkg-plist @@ -23,6 +23,7 @@ share/desktop-directories/X-GNOME-SystemSettings.directory share/desktop-directories/X-GNOME-Utilities.directory share/desktop-directories/X-GNOME-WebApplications.directory share/gir-1.0/GMenu-3.0.gir +share/locale/ab/LC_MESSAGES/gnome-menus.mo share/locale/af/LC_MESSAGES/gnome-menus.mo share/locale/ak/LC_MESSAGES/gnome-menus.mo share/locale/an/LC_MESSAGES/gnome-menus.mo @@ -74,6 +75,7 @@ share/locale/hu/LC_MESSAGES/gnome-menus.mo share/locale/hy/LC_MESSAGES/gnome-menus.mo share/locale/ia/LC_MESSAGES/gnome-menus.mo share/locale/id/LC_MESSAGES/gnome-menus.mo +share/locale/ie/LC_MESSAGES/gnome-menus.mo share/locale/ig/LC_MESSAGES/gnome-menus.mo share/locale/io/LC_MESSAGES/gnome-menus.mo share/locale/is/LC_MESSAGES/gnome-menus.mo @@ -99,6 +101,7 @@ share/locale/ml/LC_MESSAGES/gnome-menus.mo share/locale/mn/LC_MESSAGES/gnome-menus.mo share/locale/mr/LC_MESSAGES/gnome-menus.mo share/locale/ms/LC_MESSAGES/gnome-menus.mo +share/locale/my/LC_MESSAGES/gnome-menus.mo share/locale/nb/LC_MESSAGES/gnome-menus.mo share/locale/nds/LC_MESSAGES/gnome-menus.mo share/locale/ne/LC_MESSAGES/gnome-menus.mo @@ -129,6 +132,7 @@ share/locale/th/LC_MESSAGES/gnome-menus.mo share/locale/tr/LC_MESSAGES/gnome-menus.mo share/locale/ug/LC_MESSAGES/gnome-menus.mo share/locale/uk/LC_MESSAGES/gnome-menus.mo +share/locale/uz/LC_MESSAGES/gnome-menus.mo share/locale/uz@cyrillic/LC_MESSAGES/gnome-menus.mo share/locale/vi/LC_MESSAGES/gnome-menus.mo share/locale/xh/LC_MESSAGES/gnome-menus.mo diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 8b84642957c8..3815c08465a3 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -1,6 +1,5 @@ PORTNAME= gnome-panel -PORTVERSION= 3.56.0 -PORTREVISION= 2 +PORTVERSION= 3.58.1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome @@ -51,9 +50,9 @@ GLIB_SCHEMAS= org.gnome.gnome-panel.applet.clock.gschema.xml \ org.gnome.gnome-panel.toplevel.gschema.xml post-extract: - ${CP} ${FILESDIR}/gp-consolekit-manager-gen.* \ + @${CP} ${FILESDIR}/gp-consolekit-manager-gen.* \ ${WRKSRC}/modules/menu/ - ${CP} ${FILESDIR}/org.freedesktop.ConsoleKit.Manager.xml \ + @${CP} ${FILESDIR}/org.freedesktop.ConsoleKit.Manager.xml \ ${WRKSRC}/modules/menu/ .include <bsd.port.mk> diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo index b6a51f065344..b16f97e8e4c7 100644 --- a/x11/gnome-panel/distinfo +++ b/x11/gnome-panel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745750191 -SHA256 (gnome/gnome-panel-3.56.0.tar.xz) = 528a6d67dd84edae6c80a5ee656f84fbd942f3b371d60f97a2db6065cf4fd170 -SIZE (gnome/gnome-panel-3.56.0.tar.xz) = 2973688 +TIMESTAMP = 1759077710 +SHA256 (gnome/gnome-panel-3.58.1.tar.xz) = 7e8bca43a81a134c666b3a78baf2affb0c5d30efb1bca653887fc41b31dd5e64 +SIZE (gnome/gnome-panel-3.58.1.tar.xz) = 2977916 diff --git a/x11/gnome-panel/files/patch-gnome-panel_Makefile.in b/x11/gnome-panel/files/patch-gnome-panel_Makefile.in new file mode 100644 index 000000000000..84293ed83c8e --- /dev/null +++ b/x11/gnome-panel/files/patch-gnome-panel_Makefile.in @@ -0,0 +1,126 @@ +--- gnome-panel/Makefile.in.orig 2025-09-28 14:17:59 UTC ++++ gnome-panel/Makefile.in +@@ -125,8 +125,7 @@ am__EXEEXT_1 = + CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = + am__EXEEXT_1 = +-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" \ +- "$(DESTDIR)$(systemduserdir)" ++am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" + PROGRAMS = $(bin_PROGRAMS) + am__objects_1 = + am__objects_2 = gnome_panel-gp-add-applet-window.$(OBJEXT) \ +@@ -271,7 +270,7 @@ am__uninstall_files_from_dir = { \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \ + } +-DATA = $(desktop_DATA) $(systemduser_DATA) ++DATA = $(desktop_DATA) + am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) + # Read a list of newline-separated strings from the standard input, + # and print each of them once, without duplicates. Input order is +@@ -602,22 +601,16 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop + desktopdir = $(datadir)/applications + desktop_in_files = gnome-panel.desktop.in + desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) +-service_in_files = gnome-panel.service.in +-service_files = $(service_in_files:.service.in=.service) +-systemduserdir = $(SYSTEMD_USER_UNIT_DIR) +-systemduser_DATA = $(service_files) + EXTRA_DIST = \ + $(ui_FILES) \ + panel.gresource.xml \ + $(desktop_in_files) \ +- $(service_in_files) \ + $(NULL) + + CLEANFILES = \ + $(BUILT_SOURCES) \ + $(sys_DATA) \ + $(desktop_DATA) \ +- $(service_files) \ + $(NULL) + + all: $(BUILT_SOURCES) +@@ -1228,28 +1221,7 @@ uninstall-desktopDATA: + @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir) +-install-systemduserDATA: $(systemduser_DATA) +- @$(NORMAL_INSTALL) +- @list='$(systemduser_DATA)'; test -n "$(systemduserdir)" || list=; \ +- if test -n "$$list"; then \ +- echo " $(MKDIR_P) '$(DESTDIR)$(systemduserdir)'"; \ +- $(MKDIR_P) "$(DESTDIR)$(systemduserdir)" || exit 1; \ +- fi; \ +- for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- echo "$$d$$p"; \ +- done | $(am__base_list) | \ +- while read files; do \ +- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(systemduserdir)'"; \ +- $(INSTALL_DATA) $$files "$(DESTDIR)$(systemduserdir)" || exit $$?; \ +- done + +-uninstall-systemduserDATA: +- @$(NORMAL_UNINSTALL) +- @list='$(systemduser_DATA)'; test -n "$(systemduserdir)" || list=; \ +- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ +- dir='$(DESTDIR)$(systemduserdir)'; $(am__uninstall_files_from_dir) +- + ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique + tags: tags-am +@@ -1339,7 +1311,7 @@ installdirs: + $(MAKE) $(AM_MAKEFLAGS) check-am + all-am: Makefile $(PROGRAMS) $(DATA) + installdirs: +- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(systemduserdir)"; do \ ++ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done + install: $(BUILT_SOURCES) +@@ -1428,7 +1400,7 @@ info-am: + + info-am: + +-install-data-am: install-desktopDATA install-systemduserDATA ++install-data-am: install-desktopDATA + + install-dvi: install-dvi-am + +@@ -1504,8 +1476,7 @@ ps-am: + + ps-am: + +-uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA \ +- uninstall-systemduserDATA ++uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA + + .MAKE: all check install install-am install-exec install-strip + +@@ -1518,12 +1489,12 @@ uninstall-am: uninstall-binPROGRAMS uninstall-desktopD + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ +- install-strip install-systemduserDATA installcheck \ ++ install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \ +- uninstall-desktopDATA uninstall-systemduserDATA ++ uninstall-desktopDATA + + .PRECIOUS: Makefile + +@@ -1565,9 +1536,6 @@ panel-resources.h: panel.gresource.xml $(shell $(GLIB_ + %.desktop: %.desktop.in + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -o $@-t \ + -d $(top_srcdir)/po && mv $@-t $@ +- +-%.service: %.service.in +- $(AM_V_GEN) sed -e 's,[@]bindir[@],$(bindir),g' < $< > $@ + + -include $(top_srcdir)/git.mk + diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile index c5af563ce075..23d188fea9e7 100644 --- a/x11/gnome-terminal/Makefile +++ b/x11/gnome-terminal/Makefile @@ -1,5 +1,5 @@ PORTNAME= gnome-terminal -DISTVERSION= 3.56.2 +DISTVERSION= 3.56.3 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo index b4babcf92cfa..0aea78dc222c 100644 --- a/x11/gnome-terminal/distinfo +++ b/x11/gnome-terminal/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1751409847 -SHA256 (gnome/gnome-terminal-3.56.2.tar.xz) = 235bc09dfa34cc5f1e95122e9bf60203a84daf861cfacf7e4496c5f548239978 -SIZE (gnome/gnome-terminal-3.56.2.tar.xz) = 2007732 +TIMESTAMP = 1758615854 +SHA256 (gnome/gnome-terminal-3.56.3.tar.xz) = c3cc4906c7f34859ee873809a69d004f59204164d214b55331f44a1aa5d8b777 +SIZE (gnome/gnome-terminal-3.56.3.tar.xz) = 2019400 diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist index a1d4833eced9..db6c42a0a620 100644 --- a/x11/gnome-terminal/pkg-plist +++ b/x11/gnome-terminal/pkg-plist @@ -103,6 +103,7 @@ share/locale/th/LC_MESSAGES/gnome-terminal.mo share/locale/tr/LC_MESSAGES/gnome-terminal.mo share/locale/ug/LC_MESSAGES/gnome-terminal.mo share/locale/uk/LC_MESSAGES/gnome-terminal.mo +share/locale/uz/LC_MESSAGES/gnome-terminal.mo share/locale/vi/LC_MESSAGES/gnome-terminal.mo share/locale/wa/LC_MESSAGES/gnome-terminal.mo share/locale/xh/LC_MESSAGES/gnome-terminal.mo diff --git a/x11/hyprls/Makefile b/x11/hyprls/Makefile index 0bbe3f6d224e..df07a50f2c31 100644 --- a/x11/hyprls/Makefile +++ b/x11/hyprls/Makefile @@ -1,6 +1,6 @@ PORTNAME= hyprls DISTVERSIONPREFIX= v -DISTVERSION= 0.8.0 +DISTVERSION= 0.9.1 CATEGORIES= x11 wayland MAINTAINER= tagattie@FreeBSD.org @@ -10,10 +10,10 @@ WWW= https://gwen.works/hyprls LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -USES= go:modules +USES= go:1.25,modules USE_GITHUB= nodefault -GH_TUPLE= hyprwm:hyprland-wiki:e0ea9da1f78890ead3233cc26e6f5fd3ffc91517:hyprland_wiki/hyprland-wiki +GH_TUPLE= hyprwm:hyprland-wiki:6c123a2f295b6b1846511587df0b68616dff1a47:hyprland_wiki/hyprland-wiki GO_MODULE= github.com/hyprland-community/hyprls GO_TARGET= ./cmd/hyprls diff --git a/x11/hyprls/distinfo b/x11/hyprls/distinfo index 0d9487d6fd5e..295f6a4ce55c 100644 --- a/x11/hyprls/distinfo +++ b/x11/hyprls/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1754980071 -SHA256 (go/x11_hyprls/hyprls-v0.8.0/v0.8.0.mod) = 143097be73aea79fff95679f4a779a0ea6049dd01408d329ef35ce315dfc345d -SIZE (go/x11_hyprls/hyprls-v0.8.0/v0.8.0.mod) = 903 -SHA256 (go/x11_hyprls/hyprls-v0.8.0/v0.8.0.zip) = 4f56e2291aa1e52a038db3e9c32eaaf3155734ecaff74c3b664decf11df6595b -SIZE (go/x11_hyprls/hyprls-v0.8.0/v0.8.0.zip) = 1898699 -SHA256 (go/x11_hyprls/hyprls-v0.8.0/hyprwm-hyprland-wiki-e0ea9da1f78890ead3233cc26e6f5fd3ffc91517_GH0.tar.gz) = bb14bcd9574676deeb115c5aec521440b5c631472efc1bfb504641d26a5c46a6 -SIZE (go/x11_hyprls/hyprls-v0.8.0/hyprwm-hyprland-wiki-e0ea9da1f78890ead3233cc26e6f5fd3ffc91517_GH0.tar.gz) = 415554 +TIMESTAMP = 1758445157 +SHA256 (go/x11_hyprls/hyprls-v0.9.1/v0.9.1.mod) = 245e17a069d23e2e4a1f07f92685ea7f755ac2f7b517f8da801b4f38cc398b9c +SIZE (go/x11_hyprls/hyprls-v0.9.1/v0.9.1.mod) = 906 +SHA256 (go/x11_hyprls/hyprls-v0.9.1/v0.9.1.zip) = 2d07cf48c1b26a4e125e8912d779fe2fab835e32c97b14717288d179c03457fb +SIZE (go/x11_hyprls/hyprls-v0.9.1/v0.9.1.zip) = 1902059 +SHA256 (go/x11_hyprls/hyprls-v0.9.1/hyprwm-hyprland-wiki-6c123a2f295b6b1846511587df0b68616dff1a47_GH0.tar.gz) = 80a8da05f86590b2af38ca1c35f06cb950ca5bb03c17e8fb54bd473048f5c73a +SIZE (go/x11_hyprls/hyprls-v0.9.1/hyprwm-hyprland-wiki-6c123a2f295b6b1846511587df0b68616dff1a47_GH0.tar.gz) = 409680 diff --git a/x11/hyprviz/Makefile b/x11/hyprviz/Makefile index b3ff6975c435..61bef9831577 100644 --- a/x11/hyprviz/Makefile +++ b/x11/hyprviz/Makefile @@ -1,6 +1,6 @@ PORTNAME= hyprviz DISTVERSIONPREFIX= v -DISTVERSION= 0.5.2 +DISTVERSION= 0.6.1 CATEGORIES= x11 wayland MAINTAINER= tagattie@FreeBSD.org @@ -23,6 +23,10 @@ PORTDOCS= readme.md OPTIONS_DEFINE= DOCS +post-patch: + @${REINPLACE_CMD} -e 's|/usr/share|${DATADIR:H}|' \ + ${WRKSRC}/src/system_info.rs + post-install: ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR} diff --git a/x11/hyprviz/Makefile.crates b/x11/hyprviz/Makefile.crates index 89903c9bef5d..671eaf9047b9 100644 --- a/x11/hyprviz/Makefile.crates +++ b/x11/hyprviz/Makefile.crates @@ -2,9 +2,12 @@ CARGO_CRATES= autocfg-1.4.0 \ bitflags-2.9.1 \ cairo-rs-0.21.0 \ cairo-sys-rs-0.21.0 \ + cc-1.2.37 \ cfg-expr-0.17.0 \ + cfg-if-1.0.3 \ equivalent-1.0.1 \ field-offset-0.3.6 \ + find-msvc-tools-0.1.1 \ futures-channel-0.3.31 \ futures-core-0.3.31 \ futures-executor-0.3.31 \ @@ -16,7 +19,8 @@ CARGO_CRATES= autocfg-1.4.0 \ gdk-pixbuf-sys-0.21.0 \ gdk4-0.10.0 \ gdk4-sys-0.10.0 \ - gio-0.21.1 \ + getrandom-0.2.16 \ + gio-0.21.2 \ gio-sys-0.21.0 \ glib-0.21.0 \ glib-macros-0.21.0 \ @@ -35,8 +39,10 @@ CARGO_CRATES= autocfg-1.4.0 \ indexmap-2.6.0 \ itoa-1.0.11 \ libc-0.2.175 \ + log-0.4.28 \ memchr-2.7.5 \ memoffset-0.9.1 \ + minreq-2.14.1 \ pango-0.21.0 \ pango-sys-0.21.0 \ pin-project-lite-0.2.14 \ @@ -45,13 +51,19 @@ CARGO_CRATES= autocfg-1.4.0 \ proc-macro-crate-3.3.0 \ proc-macro2-1.0.95 \ quote-1.0.37 \ + ring-0.17.14 \ rustc_version-0.4.1 \ + rustls-0.21.12 \ + rustls-webpki-0.101.7 \ ryu-1.0.18 \ + sct-0.7.1 \ semver-1.0.23 \ - serde-1.0.219 \ - serde_derive-1.0.219 \ - serde_json-1.0.143 \ + serde-1.0.226 \ + serde_core-1.0.226 \ + serde_derive-1.0.226 \ + serde_json-1.0.145 \ serde_spanned-0.6.9 \ + shlex-1.3.0 \ slab-0.4.9 \ smallvec-1.15.1 \ syn-2.0.104 \ @@ -61,8 +73,12 @@ CARGO_CRATES= autocfg-1.4.0 \ toml_datetime-0.6.11 \ toml_edit-0.22.27 \ unicode-ident-1.0.13 \ + untrusted-0.9.0 \ version-compare-0.2.0 \ + wasi-0.11.1+wasi-snapshot-preview1 \ + webpki-roots-0.25.4 \ windows-sys-0.52.0 \ + windows-sys-0.59.0 \ windows-targets-0.52.6 \ windows_aarch64_gnullvm-0.52.6 \ windows_aarch64_msvc-0.52.6 \ diff --git a/x11/hyprviz/distinfo b/x11/hyprviz/distinfo index c7605557471f..acb565679689 100644 --- a/x11/hyprviz/distinfo +++ b/x11/hyprviz/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1757902725 +TIMESTAMP = 1758662911 SHA256 (rust/crates/autocfg-1.4.0.crate) = ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26 SIZE (rust/crates/autocfg-1.4.0.crate) = 17712 SHA256 (rust/crates/bitflags-2.9.1.crate) = 1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967 @@ -7,12 +7,18 @@ SHA256 (rust/crates/cairo-rs-0.21.0.crate) = f6466a563dea2e99f59f6ffbb749fd0bdf7 SIZE (rust/crates/cairo-rs-0.21.0.crate) = 58331 SHA256 (rust/crates/cairo-sys-rs-0.21.0.crate) = cab7e9f13c802625aad1ad2b4ae3989f4ce9339ff388f335a6f109f9338705e2 SIZE (rust/crates/cairo-sys-rs-0.21.0.crate) = 14489 +SHA256 (rust/crates/cc-1.2.37.crate) = 65193589c6404eb80b450d618eaf9a2cafaaafd57ecce47370519ef674a7bd44 +SIZE (rust/crates/cc-1.2.37.crate) = 90111 SHA256 (rust/crates/cfg-expr-0.17.0.crate) = d0890061c4d3223e7267f3bad2ec40b997d64faac1c2815a4a9d95018e2b9e9c SIZE (rust/crates/cfg-expr-0.17.0.crate) = 43509 +SHA256 (rust/crates/cfg-if-1.0.3.crate) = 2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9 +SIZE (rust/crates/cfg-if-1.0.3.crate) = 8719 SHA256 (rust/crates/equivalent-1.0.1.crate) = 5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5 SIZE (rust/crates/equivalent-1.0.1.crate) = 6615 SHA256 (rust/crates/field-offset-0.3.6.crate) = 38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f SIZE (rust/crates/field-offset-0.3.6.crate) = 10032 +SHA256 (rust/crates/find-msvc-tools-0.1.1.crate) = 7fd99930f64d146689264c637b5af2f0233a933bef0d8570e2526bf9e083192d +SIZE (rust/crates/find-msvc-tools-0.1.1.crate) = 30228 SHA256 (rust/crates/futures-channel-0.3.31.crate) = 2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10 SIZE (rust/crates/futures-channel-0.3.31.crate) = 31971 SHA256 (rust/crates/futures-core-0.3.31.crate) = 05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e @@ -35,8 +41,10 @@ SHA256 (rust/crates/gdk4-0.10.0.crate) = 0a67b064d2f35e649232455c7724f56f977555d SIZE (rust/crates/gdk4-0.10.0.crate) = 101740 SHA256 (rust/crates/gdk4-sys-0.10.0.crate) = 2edbda0d879eb85317bdb49a3da591ed70a804a10776e358ef416be38c6db2c5 SIZE (rust/crates/gdk4-sys-0.10.0.crate) = 76442 -SHA256 (rust/crates/gio-0.21.1.crate) = 52b5e3f390d01b79e30da451dd00e27cd1ac2de81658e3abf6c1fc3229b24c5f -SIZE (rust/crates/gio-0.21.1.crate) = 228292 +SHA256 (rust/crates/getrandom-0.2.16.crate) = 335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592 +SIZE (rust/crates/getrandom-0.2.16.crate) = 40163 +SHA256 (rust/crates/gio-0.21.2.crate) = ed68efc12b748a771be2dccc49480d8584004382967c98323245fc3c38b74a42 +SIZE (rust/crates/gio-0.21.2.crate) = 228596 SHA256 (rust/crates/gio-sys-0.21.0.crate) = 2c8130f5810a839d74afc3a929c34a700bf194972bb034f2ecfe639682dd13cc SIZE (rust/crates/gio-sys-0.21.0.crate) = 87114 SHA256 (rust/crates/glib-0.21.0.crate) = 690e8bcf8a819b5911d6ae79879226191d01253a4f602748072603defd5b9553 @@ -73,10 +81,14 @@ SHA256 (rust/crates/itoa-1.0.11.crate) = 49f1f14873335454500d59611f1cf4a4b0f786f SIZE (rust/crates/itoa-1.0.11.crate) = 10563 SHA256 (rust/crates/libc-0.2.175.crate) = 6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543 SIZE (rust/crates/libc-0.2.175.crate) = 788728 +SHA256 (rust/crates/log-0.4.28.crate) = 34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432 +SIZE (rust/crates/log-0.4.28.crate) = 51131 SHA256 (rust/crates/memchr-2.7.5.crate) = 32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0 SIZE (rust/crates/memchr-2.7.5.crate) = 97603 SHA256 (rust/crates/memoffset-0.9.1.crate) = 488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a SIZE (rust/crates/memoffset-0.9.1.crate) = 9032 +SHA256 (rust/crates/minreq-2.14.1.crate) = 05015102dad0f7d61691ca347e9d9d9006685a64aefb3d79eecf62665de2153d +SIZE (rust/crates/minreq-2.14.1.crate) = 43501 SHA256 (rust/crates/pango-0.21.0.crate) = 2d4803f086c4f49163c31ac14db162112a22401c116435080e4be8678c507d61 SIZE (rust/crates/pango-0.21.0.crate) = 49637 SHA256 (rust/crates/pango-sys-0.21.0.crate) = 66872b3cfd328ad6d1a4f89ebd5357119bd4c592a4ddbb8f6bc2386f8ce7b898 @@ -93,20 +105,32 @@ SHA256 (rust/crates/proc-macro2-1.0.95.crate) = 02b3e5e68a3a1a02aad3ec490a98007c SIZE (rust/crates/proc-macro2-1.0.95.crate) = 51820 SHA256 (rust/crates/quote-1.0.37.crate) = b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af SIZE (rust/crates/quote-1.0.37.crate) = 28558 +SHA256 (rust/crates/ring-0.17.14.crate) = a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7 +SIZE (rust/crates/ring-0.17.14.crate) = 1502610 SHA256 (rust/crates/rustc_version-0.4.1.crate) = cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92 SIZE (rust/crates/rustc_version-0.4.1.crate) = 12245 +SHA256 (rust/crates/rustls-0.21.12.crate) = 3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e +SIZE (rust/crates/rustls-0.21.12.crate) = 285674 +SHA256 (rust/crates/rustls-webpki-0.101.7.crate) = 8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765 +SIZE (rust/crates/rustls-webpki-0.101.7.crate) = 168808 SHA256 (rust/crates/ryu-1.0.18.crate) = f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f SIZE (rust/crates/ryu-1.0.18.crate) = 47713 +SHA256 (rust/crates/sct-0.7.1.crate) = da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414 +SIZE (rust/crates/sct-0.7.1.crate) = 27501 SHA256 (rust/crates/semver-1.0.23.crate) = 61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b SIZE (rust/crates/semver-1.0.23.crate) = 30622 -SHA256 (rust/crates/serde-1.0.219.crate) = 5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6 -SIZE (rust/crates/serde-1.0.219.crate) = 78983 -SHA256 (rust/crates/serde_derive-1.0.219.crate) = 5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00 -SIZE (rust/crates/serde_derive-1.0.219.crate) = 57798 -SHA256 (rust/crates/serde_json-1.0.143.crate) = d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a -SIZE (rust/crates/serde_json-1.0.143.crate) = 155342 +SHA256 (rust/crates/serde-1.0.226.crate) = 0dca6411025b24b60bfa7ec1fe1f8e710ac09782dca409ee8237ba74b51295fd +SIZE (rust/crates/serde-1.0.226.crate) = 28484 +SHA256 (rust/crates/serde_core-1.0.226.crate) = ba2ba63999edb9dac981fb34b3e5c0d111a69b0924e253ed29d83f7c99e966a4 +SIZE (rust/crates/serde_core-1.0.226.crate) = 63014 +SHA256 (rust/crates/serde_derive-1.0.226.crate) = 8db53ae22f34573731bafa1db20f04027b2d25e02d8205921b569171699cdb33 +SIZE (rust/crates/serde_derive-1.0.226.crate) = 58702 +SHA256 (rust/crates/serde_json-1.0.145.crate) = 402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c +SIZE (rust/crates/serde_json-1.0.145.crate) = 155748 SHA256 (rust/crates/serde_spanned-0.6.9.crate) = bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3 SIZE (rust/crates/serde_spanned-0.6.9.crate) = 10210 +SHA256 (rust/crates/shlex-1.3.0.crate) = 0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64 +SIZE (rust/crates/shlex-1.3.0.crate) = 18713 SHA256 (rust/crates/slab-0.4.9.crate) = 8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67 SIZE (rust/crates/slab-0.4.9.crate) = 17108 SHA256 (rust/crates/smallvec-1.15.1.crate) = 67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03 @@ -125,10 +149,18 @@ SHA256 (rust/crates/toml_edit-0.22.27.crate) = 41fe8c660ae4257887cf66394862d21db SIZE (rust/crates/toml_edit-0.22.27.crate) = 78602 SHA256 (rust/crates/unicode-ident-1.0.13.crate) = e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe SIZE (rust/crates/unicode-ident-1.0.13.crate) = 43279 +SHA256 (rust/crates/untrusted-0.9.0.crate) = 8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1 +SIZE (rust/crates/untrusted-0.9.0.crate) = 14447 SHA256 (rust/crates/version-compare-0.2.0.crate) = 852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b SIZE (rust/crates/version-compare-0.2.0.crate) = 13942 +SHA256 (rust/crates/wasi-0.11.1+wasi-snapshot-preview1.crate) = ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b +SIZE (rust/crates/wasi-0.11.1+wasi-snapshot-preview1.crate) = 28477 +SHA256 (rust/crates/webpki-roots-0.25.4.crate) = 5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1 +SIZE (rust/crates/webpki-roots-0.25.4.crate) = 253559 SHA256 (rust/crates/windows-sys-0.52.0.crate) = 282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d SIZE (rust/crates/windows-sys-0.52.0.crate) = 2576877 +SHA256 (rust/crates/windows-sys-0.59.0.crate) = 1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b +SIZE (rust/crates/windows-sys-0.59.0.crate) = 2387323 SHA256 (rust/crates/windows-targets-0.52.6.crate) = 9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973 SIZE (rust/crates/windows-targets-0.52.6.crate) = 6403 SHA256 (rust/crates/windows_aarch64_gnullvm-0.52.6.crate) = 32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3 @@ -149,5 +181,5 @@ SHA256 (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 589f6da84c646204747d1270 SIZE (rust/crates/windows_x86_64_msvc-0.52.6.crate) = 832564 SHA256 (rust/crates/winnow-0.7.12.crate) = f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95 SIZE (rust/crates/winnow-0.7.12.crate) = 174403 -SHA256 (timasoft-hyprviz-v0.5.2_GH0.tar.gz) = 10911f67fc8c75495fe5fddc940217aad8dff06e1d862b80790e484a67968e62 -SIZE (timasoft-hyprviz-v0.5.2_GH0.tar.gz) = 607433 +SHA256 (timasoft-hyprviz-v0.6.1_GH0.tar.gz) = 630159338b6bad39c8e87be5e0f61d96d732d8b8ab1f30df2f502c7c6c6feb8e +SIZE (timasoft-hyprviz-v0.6.1_GH0.tar.gz) = 616534 diff --git a/x11/kitty/Makefile b/x11/kitty/Makefile index b30f68bad1dc..700609891d0b 100644 --- a/x11/kitty/Makefile +++ b/x11/kitty/Makefile @@ -1,7 +1,7 @@ PORTNAME= kitty DISTVERSIONPREFIX= v -DISTVERSION= 0.42.1 -PORTREVISION= 3 +DISTVERSION= 0.43.1 +PORTREVISION= 0 CATEGORIES= x11 wayland MAINTAINER= nivit@FreeBSD.org @@ -36,9 +36,10 @@ LIB_DEPENDS= libcairo.so:graphics/cairo \ libwayland-cursor.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon \ libxxhash.so:devel/xxhash +RUN_DEPENDS= nerd-fonts>=3.1.1:x11-fonts/nerd-fonts USES= compiler:c11 cpe desktop-file-utils gettext-runtime gl gmake \ - go:1.24,modules magick pkgconfig python shebangfix ssl tar:xz \ + go:modules magick pkgconfig python shebangfix ssl tar:xz \ terminfo xorg CPE_VENDOR= kitty_project diff --git a/x11/kitty/distinfo b/x11/kitty/distinfo index afe7fb8d0a81..985d0595b2ee 100644 --- a/x11/kitty/distinfo +++ b/x11/kitty/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1749805387 -SHA256 (go/x11_kitty/kitty-v0.42.1/v0.42.1.mod) = 26d99beac179dc5f3577bbacd241f4990d531c677c02c252277666e92d8a5df1 -SIZE (go/x11_kitty/kitty-v0.42.1/v0.42.1.mod) = 1281 -SHA256 (go/x11_kitty/kitty-v0.42.1/v0.42.1.zip) = 61183c0dfb0f4e4c0a439bfd4d6ee11717b55b9ff4d8c32da4f051b6a4ae94d7 -SIZE (go/x11_kitty/kitty-v0.42.1/v0.42.1.zip) = 10214652 +TIMESTAMP = 1759327438 +SHA256 (go/x11_kitty/kitty-v0.43.1/v0.43.1.mod) = 74f045a7b152e70c700141dd166b72ff7361f5b546fa5ca495ab7e131c1cd6fc +SIZE (go/x11_kitty/kitty-v0.43.1/v0.43.1.mod) = 1430 +SHA256 (go/x11_kitty/kitty-v0.43.1/v0.43.1.zip) = 9224460f3e0997b6a154d1c35e68c2bc6d2b78b040216893324a17b3205b49d8 +SIZE (go/x11_kitty/kitty-v0.43.1/v0.43.1.zip) = 10284629 diff --git a/x11/kitty/pkg-plist b/x11/kitty/pkg-plist index 6eccfd56b8c8..6160865c7a5a 100644 --- a/x11/kitty/pkg-plist +++ b/x11/kitty/pkg-plist @@ -18,7 +18,7 @@ share/applications/kitty.desktop %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_actions_1745a1bd.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_binary_478594b0.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_build_e554a463.png -%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_changelog_bb1bec17.png +%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_changelog_dd5dbc1b.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_clipboard_673291d1.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_color-stack_b2e66ffc.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_conf_6d817f14.png @@ -30,6 +30,7 @@ share/applications/kitty.desktop %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_generated_launch_2c8ae1a7.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_generated_matching_f5ed7c14.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_generated_rc_4121b4bb.png +%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_generated_save-as-session_b77c65fc.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_generated_ssh-copy_26aa9e71.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_glossary_e93f6fff.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_graphics-protocol_96eb2627.png @@ -39,9 +40,11 @@ share/applications/kitty.desktop %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_invocation_05c40da8.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_keyboard-protocol_37967379.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_kittens_broadcast_4dfe59be.png +%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_kittens_choose-files_08a7d242.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_kittens_choose-fonts_14869f23.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_kittens_clipboard_93006611.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_kittens_custom_264d6309.png +%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_kittens_desktop-ui_4b8fd2af.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_kittens_developing-builtin-kittens_70cf5f2d.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_kittens_diff_56ec1326.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_kittens_hints_cf0d0da9.png @@ -62,6 +65,7 @@ share/applications/kitty.desktop %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_mapping_aea5afa6.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_marks_66066db1.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_misc-protocol_baba0cc2.png +%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_multiple-cursors-protocol_49ab6a61.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_open_actions_b5f13270.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_overview_249bd848.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_performance_fb7e6752.png @@ -73,6 +77,7 @@ share/applications/kitty.desktop %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_quickstart_9d1a56df.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_rc_protocol_ea1138ef.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_remote-control_7371e6b3.png +%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_sessions_7cc12e6e.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_shell-integration_4b2a7549.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_support_daeae705.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_text-sizing-protocol_974e580e.png @@ -97,6 +102,7 @@ share/applications/kitty.desktop %%PORTDOCS%%%%DOCSDIR%%/_sources/generated/launch.rst.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/generated/matching.rst.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/generated/rc.rst.txt +%%PORTDOCS%%%%DOCSDIR%%/_sources/generated/save-as-session.rst.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/generated/ssh-copy.rst.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/glossary.rst.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/graphics-protocol.rst.txt @@ -106,9 +112,11 @@ share/applications/kitty.desktop %%PORTDOCS%%%%DOCSDIR%%/_sources/invocation.rst.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/keyboard-protocol.rst.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/kittens/broadcast.rst.txt +%%PORTDOCS%%%%DOCSDIR%%/_sources/kittens/choose-files.rst.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/kittens/choose-fonts.rst.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/kittens/clipboard.rst.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/kittens/custom.rst.txt +%%PORTDOCS%%%%DOCSDIR%%/_sources/kittens/desktop-ui.rst.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/kittens/developing-builtin-kittens.rst.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/kittens/diff.rst.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/kittens/hints.rst.txt @@ -129,6 +137,7 @@ share/applications/kitty.desktop %%PORTDOCS%%%%DOCSDIR%%/_sources/mapping.rst.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/marks.rst.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/misc-protocol.rst.txt +%%PORTDOCS%%%%DOCSDIR%%/_sources/multiple-cursors-protocol.rst.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/open_actions.rst.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/overview.rst.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/performance.rst.txt @@ -140,6 +149,7 @@ share/applications/kitty.desktop %%PORTDOCS%%%%DOCSDIR%%/_sources/quickstart.rst.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/rc_protocol.rst.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/remote-control.rst.txt +%%PORTDOCS%%%%DOCSDIR%%/_sources/sessions.rst.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/shell-integration.rst.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/support.rst.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/text-sizing-protocol.rst.txt @@ -199,6 +209,7 @@ share/applications/kitty.desktop %%PORTDOCS%%%%DOCSDIR%%/generated/launch.html %%PORTDOCS%%%%DOCSDIR%%/generated/matching.html %%PORTDOCS%%%%DOCSDIR%%/generated/rc.html +%%PORTDOCS%%%%DOCSDIR%%/generated/save-as-session.html %%PORTDOCS%%%%DOCSDIR%%/generated/ssh-copy.html %%PORTDOCS%%%%DOCSDIR%%/genindex.html %%PORTDOCS%%%%DOCSDIR%%/glossary.html @@ -209,9 +220,11 @@ share/applications/kitty.desktop %%PORTDOCS%%%%DOCSDIR%%/invocation.html %%PORTDOCS%%%%DOCSDIR%%/keyboard-protocol.html %%PORTDOCS%%%%DOCSDIR%%/kittens/broadcast.html +%%PORTDOCS%%%%DOCSDIR%%/kittens/choose-files.html %%PORTDOCS%%%%DOCSDIR%%/kittens/choose-fonts.html %%PORTDOCS%%%%DOCSDIR%%/kittens/clipboard.html %%PORTDOCS%%%%DOCSDIR%%/kittens/custom.html +%%PORTDOCS%%%%DOCSDIR%%/kittens/desktop-ui.html %%PORTDOCS%%%%DOCSDIR%%/kittens/developing-builtin-kittens.html %%PORTDOCS%%%%DOCSDIR%%/kittens/diff.html %%PORTDOCS%%%%DOCSDIR%%/kittens/hints.html @@ -232,6 +245,7 @@ share/applications/kitty.desktop %%PORTDOCS%%%%DOCSDIR%%/mapping.html %%PORTDOCS%%%%DOCSDIR%%/marks.html %%PORTDOCS%%%%DOCSDIR%%/misc-protocol.html +%%PORTDOCS%%%%DOCSDIR%%/multiple-cursors-protocol.html %%PORTDOCS%%%%DOCSDIR%%/objects.inv %%PORTDOCS%%%%DOCSDIR%%/open_actions.html %%PORTDOCS%%%%DOCSDIR%%/overview.html @@ -246,6 +260,7 @@ share/applications/kitty.desktop %%PORTDOCS%%%%DOCSDIR%%/remote-control.html %%PORTDOCS%%%%DOCSDIR%%/search.html %%PORTDOCS%%%%DOCSDIR%%/searchindex.js +%%PORTDOCS%%%%DOCSDIR%%/sessions.html %%PORTDOCS%%%%DOCSDIR%%/shell-integration.html %%PORTDOCS%%%%DOCSDIR%%/support.html %%PORTDOCS%%%%DOCSDIR%%/text-sizing-protocol.html @@ -281,6 +296,14 @@ share/icons/hicolor/scalable/apps/kitty.svg %%DATADIR%%/kittens/broadcast/__pycache__/main%%PYTHON_TAG%%.opt-2.pyc %%DATADIR%%/kittens/broadcast/__pycache__/main%%PYTHON_TAG%%.pyc %%DATADIR%%/kittens/broadcast/main.py +%%DATADIR%%/kittens/choose_files/__init__.py +%%DATADIR%%/kittens/choose_files/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc +%%DATADIR%%/kittens/choose_files/__pycache__/__init__%%PYTHON_TAG%%.opt-2.pyc +%%DATADIR%%/kittens/choose_files/__pycache__/__init__%%PYTHON_TAG%%.pyc +%%DATADIR%%/kittens/choose_files/__pycache__/main%%PYTHON_TAG%%.opt-1.pyc +%%DATADIR%%/kittens/choose_files/__pycache__/main%%PYTHON_TAG%%.opt-2.pyc +%%DATADIR%%/kittens/choose_files/__pycache__/main%%PYTHON_TAG%%.pyc +%%DATADIR%%/kittens/choose_files/main.py %%DATADIR%%/kittens/choose_fonts/__init__.py %%DATADIR%%/kittens/choose_fonts/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc %%DATADIR%%/kittens/choose_fonts/__pycache__/__init__%%PYTHON_TAG%%.opt-2.pyc @@ -301,6 +324,14 @@ share/icons/hicolor/scalable/apps/kitty.svg %%DATADIR%%/kittens/clipboard/__pycache__/main%%PYTHON_TAG%%.opt-2.pyc %%DATADIR%%/kittens/clipboard/__pycache__/main%%PYTHON_TAG%%.pyc %%DATADIR%%/kittens/clipboard/main.py +%%DATADIR%%/kittens/desktop_ui/__init__.py +%%DATADIR%%/kittens/desktop_ui/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc +%%DATADIR%%/kittens/desktop_ui/__pycache__/__init__%%PYTHON_TAG%%.opt-2.pyc +%%DATADIR%%/kittens/desktop_ui/__pycache__/__init__%%PYTHON_TAG%%.pyc +%%DATADIR%%/kittens/desktop_ui/__pycache__/main%%PYTHON_TAG%%.opt-1.pyc +%%DATADIR%%/kittens/desktop_ui/__pycache__/main%%PYTHON_TAG%%.opt-2.pyc +%%DATADIR%%/kittens/desktop_ui/__pycache__/main%%PYTHON_TAG%%.pyc +%%DATADIR%%/kittens/desktop_ui/main.py %%DATADIR%%/kittens/diff/__init__.py %%DATADIR%%/kittens/diff/__pycache__/__init__%%PYTHON_TAG%%.opt-1.pyc %%DATADIR%%/kittens/diff/__pycache__/__init__%%PYTHON_TAG%%.opt-2.pyc @@ -640,6 +671,9 @@ share/icons/hicolor/scalable/apps/kitty.svg %%DATADIR%%/kitty/bash.py %%DATADIR%%/kitty/bgimage_fragment.glsl %%DATADIR%%/kitty/bgimage_vertex.glsl +%%DATADIR%%/kitty/blit_common.glsl +%%DATADIR%%/kitty/blit_fragment.glsl +%%DATADIR%%/kitty/blit_vertex.glsl %%DATADIR%%/kitty/border_fragment.glsl %%DATADIR%%/kitty/border_vertex.glsl %%DATADIR%%/kitty/borders.py @@ -942,6 +976,8 @@ share/icons/hicolor/scalable/apps/kitty.svg %%DATADIR%%/kitty/remote_control.py %%DATADIR%%/kitty/render_cache.py %%DATADIR%%/kitty/rgb.py +%%DATADIR%%/kitty/rounded_rect_fragment.glsl +%%DATADIR%%/kitty/rounded_rect_vertex.glsl %%DATADIR%%/kitty/search_query_parser.py %%DATADIR%%/kitty/session.py %%DATADIR%%/kitty/shaders.py @@ -959,6 +995,7 @@ share/icons/hicolor/scalable/apps/kitty.svg %%DATADIR%%/kitty/types.py %%DATADIR%%/kitty/typing_compat.py %%DATADIR%%/kitty/update_check.py +%%DATADIR%%/kitty/utils.glsl %%DATADIR%%/kitty/utils.py %%DATADIR%%/kitty/window.py %%DATADIR%%/kitty/window_list.py diff --git a/x11/nvidia-driver-304/Makefile b/x11/nvidia-driver-304/Makefile index 737adc80c52f..c1119a49d546 100644 --- a/x11/nvidia-driver-304/Makefile +++ b/x11/nvidia-driver-304/Makefile @@ -1,6 +1,6 @@ DISTVERSION= 304.137 # Explicitly set PORTREVISION as it can be overridden by the master port -PORTREVISION= 10 +PORTREVISION= 11 MASTERDIR= ${.CURDIR}/../nvidia-driver PKGNAMESUFFIX= -304 diff --git a/x11/nvidia-driver-340/Makefile b/x11/nvidia-driver-340/Makefile index adeee49ab528..3ea1d49eea69 100644 --- a/x11/nvidia-driver-340/Makefile +++ b/x11/nvidia-driver-340/Makefile @@ -1,6 +1,6 @@ DISTVERSION= 340.108 # Explicitly set PORTREVISION as it can be overridden by the master port -PORTREVISION= 4 +PORTREVISION= 5 MASTERDIR= ${.CURDIR}/../nvidia-driver PKGNAMESUFFIX= -340 diff --git a/x11/nvidia-driver-390/Makefile b/x11/nvidia-driver-390/Makefile index b3fa58bc3212..eadfa4276cf4 100644 --- a/x11/nvidia-driver-390/Makefile +++ b/x11/nvidia-driver-390/Makefile @@ -1,6 +1,6 @@ DISTVERSION= 390.157 # Explicitly set PORTREVISION as it can be overridden by the master port -PORTREVISION= 0 +PORTREVISION= 1 MASTERDIR= ${.CURDIR}/../nvidia-driver PKGNAMESUFFIX= -390 diff --git a/x11/nvidia-driver-470/Makefile b/x11/nvidia-driver-470/Makefile index 6f1f8c865b7d..d49b3e056507 100644 --- a/x11/nvidia-driver-470/Makefile +++ b/x11/nvidia-driver-470/Makefile @@ -1,6 +1,6 @@ DISTVERSION= 470.256.02 # Explicitly set PORTREVISION as it can be overridden by the master port -PORTREVISION= 1 +PORTREVISION= 2 MASTERDIR= ${.CURDIR}/../nvidia-driver PKGNAMESUFFIX= -470 diff --git a/x11/nvidia-driver-devel/Makefile b/x11/nvidia-driver-devel/Makefile index 71f2eab631d2..3577eb57d30d 100644 --- a/x11/nvidia-driver-devel/Makefile +++ b/x11/nvidia-driver-devel/Makefile @@ -1,6 +1,6 @@ DISTVERSION?= 580.82.07 # Explicitly set PORTREVISION as it can be overridden by the master port -PORTREVISION= 0 +PORTREVISION= 1 MASTERDIR= ${.CURDIR}/../nvidia-driver PKGNAMESUFFIX= -devel diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index ad87c00eb3fd..8255931553fd 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -14,7 +14,7 @@ PORTNAME?= nvidia-driver DISTVERSION?= ${NVIDIA_DISTVERSION} # Always try to set PORTREVISION as it can be overridden by the slave ports -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11 MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION} DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION} @@ -46,11 +46,14 @@ PATCH_DEPENDS= gsed:textproc/gsed BUILD_DEPENDS= pkg-config:devel/pkgconf LIB_DEPENDS= libOpenGL.so:graphics/libglvnd .endif + +RUN_DEPENDS= ${KMODDIR}/nvidia.ko:x11/nvidia-kmod${PKGNAMESUFFIX} + .if ${NVVERSION} >= 415.013 LIB_DEPENDS+= libnvidia-egl-wayland.so:graphics/egl-wayland .endif -USES= kmod uidfix xorg +USES= uidfix xorg .if ${NVVERSION} >= 470.04201 USES+= tar:xz .endif @@ -76,21 +79,6 @@ SUB_FILES= pkg-message .if !defined(LIBGLDIR) SUB_FILES+= nvidia.conf .endif -SUB_PATCHES= extra-patch-src-Makefile \ - extra-patch-src-nv-freebsd.h -.if ${NVVERSION} < 510.03901 -SUB_PATCHES+= extra-patch-src-nvidia_dev.c \ - extra-patch-src-nvidia_pci.c -.endif -.if ${NVVERSION} < 470.25602 || ${NVVERSION} >= 480.00000 && ${NVVERSION} < 530.03002 -SUB_PATCHES+= extra-patch-src-nvidia_subr.c -.endif - -# Temporarily disable GSP firmware as it is known to cause -# issues with suspend/resume -.if ${NVVERSION} >= 565.00000 -SUB_PATCHES+= extra-gsp-patch-src-common-inc-nv_firmware_registry.h -.endif DOCSDIR= ${PREFIX}/share/doc/NVIDIA_GLX-1.0 MODULESDIR= lib/xorg/modules @@ -103,49 +91,7 @@ SUB_LIST+= NVGL="" SUB_LIST+= NVGL="\# " .endif -.if ${NVVERSION} < 355.006 -NVSRC= . -.else -NVSRC= nvidia -.endif - -.if ${NVVERSION} < 358.009 -SUB_LIST+= KLDNAME=nvidia -.else -SUB_LIST+= KLDNAME=nvidia-modeset -.endif - -.if ${NVVERSION} >= 530.03002 && ${NVVERSION} < 545.00 -SUB_PATCHES += extra-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c -.endif -.if ${NVVERSION} < 460.039 -. if ${NVVERSION} >= 358.009 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c -. endif -SUB_PATCHES+= extra-patch-src-nvidia_ctl.c \ - extra-patch-src-nvidia_linux.c -.elif ${NVVERSION} < 510.03901 -EXTRA_PATCHES+= ${FILESDIR}/460-patch-src-nvidia-nvidia_ctl.c \ - ${FILESDIR}/460-patch-src-nvidia-nvidia_linux.c \ - ${FILESDIR}/460-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c -.endif -.if ${NVVERSION} < 470.04201 -SUB_PATCHES+= extra-patch-src-nv-misc.h -.endif - -OPTIONS_DEFINE= ACPI_PM LINUX WBINVD DOCS -OPTIONS_DEFINE_i386= PAE -OPTIONS_DEFAULT= ACPI_PM LINUX - -ACPI_PM_DESC= ACPI Power Management support -LINUX_DESC= Linux compatibility support -PAE_DESC= Physical Address Extensions support -WBINVD_DESC= Flush CPU caches directly with WBINVD - -.if ${NVVERSION} < 310.014 -OPTIONS_DEFINE+= FREEBSD_AGP -FREEBSD_AGP_DESC= Use FreeBSD AGP GART driver -.endif +OPTIONS_DEFINE= DOCS PLIST_SUB+= MODULESDIR=${MODULESDIR} .if ${NVVERSION} < 410.057 @@ -160,9 +106,6 @@ PLIST_FILES+= lib/libnvidia-wayland-client.so.${DISTVERSION} .endif CONFLICTS_INSTALL+= nvidia-driver* -.if ${PORTNAME} != nvidia-secondary-driver -CONFLICTS_INSTALL+= nvidia-secondary-driver -.endif .include <bsd.port.pre.mk> @@ -175,46 +118,15 @@ EXTRA_PATCHES+= ${WRKDIR}/${p} .endfor post-patch: .SILENT +# Patch only needed for non-kmod + ${REINPLACE_CMD} -e '/SUBDIR=\tsrc \\/d' -e 's/\tlib/SUBDIR=\tlib/' \ + ${WRKSRC}/Makefile + ${REINPLACE_CMD} -e '/\.if exists(firmware)/,/\.endif/d' \ + ${WRKSRC}/Makefile + .if ${NVVERSION} >= 390 ${REINPLACE_CMD} -e 's|/man/man1|/share/man/man1|' ${WRKSRC}/nvml/man/Makefile .endif -# We should support -CURRENT: kill the check (first #if __FreeBSD_version) - linenum=$$(${SED} -ne '/^#if __FreeBSD_version/ { = ; q ; }' \ - ${WRKSRC}/src/${NVSRC}/nv-freebsd.h) ; ${REINPLACE_CMD} \ - -e "$$linenum,+2d" ${WRKSRC}/src/${NVSRC}/nv-freebsd.h -# Adjust Linux headers #include's after FreeBSD src r246085 - ${REINPLACE_CMD} -E '/#include "machine\/\.\.\/linux(32)?\/linux.h"/ \ - { x ; s/.*/#include "machine\/..\/..\/compat\/linux\/linux_ioctl.h"/ ; H ; x ; }' \ - ${WRKSRC}/src/${NVSRC}/nvidia_linux.c -# Fix bogus memset() call - ${REINPLACE_CMD} -e '/memset/s/sizeof(ci/sizeof(*ci/' \ - ${WRKSRC}/src/${NVSRC}/nvidia_subr.c -# Chase `sys/capability.h' rename to `sys/capsicum.h' in FreeBSD src r263232 - ${REINPLACE_CMD} -e 's:sys/capability\.h:sys/capsicum.h:' \ - ${WRKSRC}/src/${NVSRC}/nv-freebsd.h -.if ${NVVERSION} >= 358.009 - ${REINPLACE_CMD} -e 's:sys/capability\.h:sys/capsicum.h:' \ - ${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c -.endif -# KPI of kmem_alloc_contig(),kmem_free() changed in FreeBSD src r338143,r338318 -.if ${NVVERSION} < 530.03002 - ${REINPLACE_CMD} \ - -e 's/kmem_alloc_contig(kmem_arena, /kmem_alloc_contig(/' \ - -e 's/kmem_free(kmem_arena, /kmem_free(/' \ - ${WRKSRC}/src/${NVSRC}/nvidia_subr.c -.endif -# Pull the right header after FreeBSD src r347984 -.if ${NVVERSION} >= 358.009 - ${REINPLACE_CMD} -e '/^#include/s:lock\.h:mutex.h:' \ - ${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c -.endif -# After src df38ada2931f, `sys/module.h' must be included after `sys/param.h' -.if ${NVVERSION} >= 358.009 - @${REINPLACE_CMD} -e '/^#include <sys\/param\.h>/d; \ - /^#include <sys\/module\.h>/ { x; \ - s:^:#include <sys/param.h>:; G; }' \ - ${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c -.endif # Disable installation of Linux libraries (provided by the corresponding # `x11/linux-nvidia-libs' port or its slaves) ${REINPLACE_CMD} -e 's/exists(\/.*/& \&\& 0/' \ @@ -262,74 +174,16 @@ post-patch: .SILENT gsed ${REINPLACE_ARGS} -E "s,/etc/egl/egl_external_platform\.d.{$$padding},${EGL_JSON_PATH}\x00," \ ${WRKSRC}/obj/libEGL_nvidia.so.0 .endif -# Unbreak the build against -Werror,-Wunused-but-set-variable CFLAGS -.if ${NVVERSION} < 450.51 - ${REINPLACE_CMD} -e '/void nvidia_dev_dtor/,+8s,.*status.*,,' \ - ${WRKSRC}/src/${NVSRC}/nvidia_dev.c -.endif # Move symlinks under PREFIX .if ${NVVERSION} >= 525.08902 ${REINPLACE_CMD} -e '/ln/s/$${LOCALBASE}\/lib/../' \ -e '/LIBDIR/!s/$${LOCALBASE}/$${DESTDIR}$${PREFIX}/' \ ${WRKSRC}/lib/libnvidia-allocator/Makefile .endif -# After src 2a99dd30dfaa, DRIVER_MODULE should not include nvidia_devclass -.if ${OSVERSION} >= 1400058 - ${REINPLACE_CMD} -e '/^DRIVER_MODULE/s/, nvidia_devclass//' \ - ${WRKSRC}/src/${NVSRC}/nvidia_pci.c -.endif -# Catch up with pmap_unmapdev() and kmem_*() changes in 14-CURRENT -.if ${OSVERSION} >= 1400070 && (${NVVERSION} < 470.25602 || ${NVVERSION} >= 480.00000 && ${NVVERSION} < 530.03002) - ${REINPLACE_CMD} -e '/pmap_unmapdev/s,(vm_offset_t),,' \ - ${WRKSRC}/src/${NVSRC}/nvidia_os.c - ${REINPLACE_CMD} -e '/vm_offset_t virtual_address/s,vm_offset_t ,char *,' \ - ${WRKSRC}/src/${NVSRC}/nv-freebsd.h - ${REINPLACE_CMD} -e '/vm_offset_t address;/s,vm_offset_t ,void *,' \ - ${WRKSRC}/src/${NVSRC}/nvidia_subr.c -.endif -# Fix a K&R prototype -.if ${NVVERSION:R} >= 390 - ${REINPLACE_CMD} -e '/nvlink_allocLock/s,(),(void),' \ - ${WRKSRC}/src/${NVSRC}/nvlink_freebsd.c -.endif -# Finally, process OPTIONS -.if ${PORT_OPTIONS:MFREEBSD_AGP} - ${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \ - ${WRKSRC}/src/${NVSRC}/nv-freebsd.h -.endif -.if ${PORT_OPTIONS:MACPI_PM} - ${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_ACPI_PM)/define \1/' \ - ${WRKSRC}/src/${NVSRC}/nv-freebsd.h -.endif -.if ! ${PORT_OPTIONS:MLINUX} - ${REINPLACE_CMD} -E 's/define (NV_SUPPORT_LINUX_COMPAT)/undef \1/' \ - ${WRKSRC}/src/${NVSRC}/nv-freebsd.h -. if ${NVVERSION} >= 358.009 - ${REINPLACE_CMD} -E 's/define (NVKMS_SUPPORT_LINUX_COMPAT)/undef \1/' \ - ${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c -. endif -.endif -.if ${PORT_OPTIONS:MPAE} - ${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_PAE)/define \1/' \ - ${WRKSRC}/src/${NVSRC}/nv-freebsd.h -.endif -.if ${PORT_OPTIONS:MWBINVD} - ${REINPLACE_CMD} -E 's/undef (NV_USE_WBINVD)/define \1/' \ - ${WRKSRC}/src/${NVSRC}/nv-freebsd.h -.endif # Conditionally install documentation (but you generally want it) .if ! ${PORT_OPTIONS:MDOCS} ${REINPLACE_CMD} -E 's/(x11).*/\1/ ; /doc/d' ${WRKSRC}/Makefile .endif -# DMAP_MIN_ADDRESS and DMAP_MAX_ADDRESS is deleted from src at commit -# 4dd828c80828637452a8a4e07a64e294c82e5d8b on main branch. -# Note that there are about 10 days of broken window, as the commit -# does not have corresponding version bump. -.if ${OSVERSION} >= 1500051 - ${REINPLACE_CMD} -e 's/DMAP_MIN_ADDRESS/kva_layout.dmap_low/' \ - -e 's/DMAP_MAX_ADDRESS/kva_layout.dmap_high/' \ - ${WRKSRC}/src/${NVSRC}/nvidia_subr.c -.endif pre-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${MODULESDIR}/drivers \ @@ -359,9 +213,6 @@ post-install: .SILENT .if ${NVVERSION} < 352.009 ${REINPLACE_CMD} -E '/(lib)?nvidia-(debugdump|smi|ml)/d' ${TMPPLIST} .endif -.if ${NVVERSION} < 358.009 - ${REINPLACE_CMD} -e '/nvidia-modeset\.ko/d' ${TMPPLIST} -.endif .if ${NVVERSION} < 410.057 ${REINPLACE_CMD} -E '/lib(EGL|GLESv[12].*)_nvidia/d ; \ /lib(GLX|GLdispatch|OpenGL)/d ; \ @@ -393,10 +244,6 @@ post-install: .SILENT .if ${NVVERSION} < 545.000 ${REINPLACE_CMD} -e '/libnvidia-gpucomp\.so/d' ${TMPPLIST} .endif -.if ${NVVERSION} < 560.02803 - ${REINPLACE_CMD} -e '/nvidia_gsp_ga10x_fw\.ko/d' ${TMPPLIST} - ${REINPLACE_CMD} -e '/nvidia_gsp_tu10x_fw\.ko/d' ${TMPPLIST} -.endif .if ${NVVERSION} < 410.057 # Rename some libraries and install a libmap file to resolve conflict with diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist index 4c244c172570..d2b2e337a6f4 100644 --- a/x11/nvidia-driver/pkg-plist +++ b/x11/nvidia-driver/pkg-plist @@ -100,7 +100,3 @@ share/vulkan/implicit_layer.d/nvidia_layers.json %%EXTENSIONSDIR%%/libglx.so.1 %%MODULESDIR%%/extensions/libglxserver_nvidia.so %%MODULESDIR%%/extensions/libglxserver_nvidia.so.1 -/%%KMODDIR%%/nvidia.ko -/%%KMODDIR%%/nvidia-modeset.ko -/%%KMODDIR%%/nvidia_gsp_ga10x_fw.ko -/%%KMODDIR%%/nvidia_gsp_tu10x_fw.ko diff --git a/x11/nvidia-kmod-304/Makefile b/x11/nvidia-kmod-304/Makefile new file mode 100644 index 000000000000..76f6b4bc4af5 --- /dev/null +++ b/x11/nvidia-kmod-304/Makefile @@ -0,0 +1,8 @@ +DISTVERSION= 304.137 +# Explicitly set PORTREVISION as it can be overridden by the master port +PORTREVISION= 0 + +MASTERDIR= ${.CURDIR}/../nvidia-kmod +PKGNAMESUFFIX= -304 + +.include "${MASTERDIR}/Makefile" diff --git a/x11/nvidia-kmod-340/Makefile b/x11/nvidia-kmod-340/Makefile new file mode 100644 index 000000000000..874e5e234d03 --- /dev/null +++ b/x11/nvidia-kmod-340/Makefile @@ -0,0 +1,8 @@ +DISTVERSION= 340.108 +# Explicitly set PORTREVISION as it can be overridden by the master port +PORTREVISION= 0 + +MASTERDIR= ${.CURDIR}/../nvidia-kmod +PKGNAMESUFFIX= -340 + +.include "${MASTERDIR}/Makefile" diff --git a/x11/nvidia-kmod-390/Makefile b/x11/nvidia-kmod-390/Makefile new file mode 100644 index 000000000000..2e4db1f9b735 --- /dev/null +++ b/x11/nvidia-kmod-390/Makefile @@ -0,0 +1,8 @@ +DISTVERSION= 390.157 +# Explicitly set PORTREVISION as it can be overridden by the master port +PORTREVISION= 0 + +MASTERDIR= ${.CURDIR}/../nvidia-kmod +PKGNAMESUFFIX= -390 + +.include "${MASTERDIR}/Makefile" diff --git a/x11/nvidia-kmod-470/Makefile b/x11/nvidia-kmod-470/Makefile new file mode 100644 index 000000000000..fa5651187a45 --- /dev/null +++ b/x11/nvidia-kmod-470/Makefile @@ -0,0 +1,8 @@ +DISTVERSION= 470.256.02 +# Explicitly set PORTREVISION as it can be overridden by the master port +PORTREVISION= 0 + +MASTERDIR= ${.CURDIR}/../nvidia-kmod +PKGNAMESUFFIX= -470 + +.include "${MASTERDIR}/Makefile" diff --git a/x11/nvidia-kmod-devel/Makefile b/x11/nvidia-kmod-devel/Makefile new file mode 100644 index 000000000000..7798cba99767 --- /dev/null +++ b/x11/nvidia-kmod-devel/Makefile @@ -0,0 +1,8 @@ +DISTVERSION?= 580.82.07 +# Explicitly set PORTREVISION as it can be overridden by the master port +PORTREVISION= 0 + +MASTERDIR= ${.CURDIR}/../nvidia-kmod +PKGNAMESUFFIX= -devel + +.include "${MASTERDIR}/Makefile" diff --git a/x11/nvidia-kmod/Makefile b/x11/nvidia-kmod/Makefile new file mode 100644 index 000000000000..983ec63c0c2f --- /dev/null +++ b/x11/nvidia-kmod/Makefile @@ -0,0 +1,243 @@ +# For those wondering why this port is not under `x11-drivers' category, +# have a look at https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=121930. +# +# Starting with version 1.0-7667, NVidia has dropped support for numerous +# "legacy" GPUs. Consult NVidia README (the Appendix) to find out whether +# you need to use legacy driver version and install one of corresponding +# slave ports instead (`x11/nvidia-driver-470', `x11/nvidia-driver-390', +# `x11/nvidia-driver-340', or `x11/nvidia-driver-304'). +# +# To simplify testing of new feature branches and beta driver versions, +# the port aims to support building against arbitrary DISTVERSION, i.e. +# ``make DISTVERSION=xxx.yy.zz -DNO_CHECKSUM'' should typically work. + +PORTNAME?= nvidia-kmod +DISTVERSION?= ${NVIDIA_DISTVERSION} +# Always try to set PORTREVISION as it can be overridden by the slave ports +PORTREVISION?= 0 +CATEGORIES= x11 +MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION} +DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} + +MAINTAINER?= x11@FreeBSD.org +COMMENT?= kmod part of NVidia graphics card binary drivers for hardware OpenGL rendering +WWW= https://www.nvidia.com/object/unix.html + +LICENSE_FILE= ${WRKSRC}/doc/license.txt +.include "${.CURDIR}/../nvidia-driver/Makefile.version" +.include "${.CURDIR}/../nvidia-driver/Makefile.common" + +# the package provides lib32 versions of the libraries, which then depends +# themselves in non existing lib32 libraries, so we don't want the package +# to end up depending on non existing libraries +NO_SHLIB_REQUIRES_GLOB=*:32 + +# Choose proper distinfo file using PKGNAMESUFFIX for slave ports. +DISTINFO_FILE= ${.CURDIR}/../nvidia-driver${PKGNAMESUFFIX}/distinfo + +# Share patches with main part of ports +FILESDIR= ${.CURDIR}/../nvidia-driver/files +PATCHDIR= ${FILESDIR} + +USES= kmod uidfix +.if ${NVVERSION} >= 470.04201 +USES+= tar:xz +.endif +USE_LDCONFIG= yes + +PIE_UNSAFE= yes + +MAKE_ENV= DEBUG_FLAGS=${DEBUG_FLAGS} +SUB_FILES= pkg-message +SUB_PATCHES= extra-patch-src-Makefile \ + extra-patch-src-nv-freebsd.h +.if ${NVVERSION} < 510.03901 +SUB_PATCHES+= extra-patch-src-nvidia_dev.c \ + extra-patch-src-nvidia_pci.c +.endif +.if ${NVVERSION} < 470.25602 || ${NVVERSION} >= 480.00000 && ${NVVERSION} < 530.03002 +SUB_PATCHES+= extra-patch-src-nvidia_subr.c +.endif + +# Temporarily disable GSP firmware as it is known to cause +# issues with suspend/resume +.if ${NVVERSION} >= 565.00000 +SUB_PATCHES+= extra-gsp-patch-src-common-inc-nv_firmware_registry.h +.endif + +.if ${NVVERSION} < 355.006 +NVSRC= . +.else +NVSRC= nvidia +.endif + +.if ${NVVERSION} < 358.009 +SUB_LIST+= KLDNAME=nvidia +.else +SUB_LIST+= KLDNAME=nvidia-modeset +.endif + +.if ${NVVERSION} >= 530.03002 && ${NVVERSION} < 545.00 +SUB_PATCHES += extra-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c +.endif +.if ${NVVERSION} < 460.039 +. if ${NVVERSION} >= 358.009 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c +. endif +SUB_PATCHES+= extra-patch-src-nvidia_ctl.c \ + extra-patch-src-nvidia_linux.c +.elif ${NVVERSION} < 510.03901 +EXTRA_PATCHES+= ${FILESDIR}/460-patch-src-nvidia-nvidia_ctl.c \ + ${FILESDIR}/460-patch-src-nvidia-nvidia_linux.c \ + ${FILESDIR}/460-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c +.endif +.if ${NVVERSION} < 470.04201 +SUB_PATCHES+= extra-patch-src-nv-misc.h +.endif + +OPTIONS_DEFINE= ACPI_PM LINUX WBINVD +OPTIONS_DEFINE_i386= PAE +OPTIONS_DEFAULT= ACPI_PM LINUX + +ACPI_PM_DESC= ACPI Power Management support +LINUX_DESC= Linux compatibility support +PAE_DESC= Physical Address Extensions support +WBINVD_DESC= Flush CPU caches directly with WBINVD + +.if ${NVVERSION} < 310.014 +OPTIONS_DEFINE+= FREEBSD_AGP +FREEBSD_AGP_DESC= Use FreeBSD AGP GART driver +.endif + +CONFLICTS_INSTALL+= nvidia-kmod* + +.include <bsd.port.pre.mk> + +pre-patch: +.for p in ${SUB_PATCHES} + @${SED} 's/%%NVSRC%%/${NVSRC}/g' ${PATCHDIR}/${p}.in > ${WRKDIR}/${p} +.endfor +.for p in ${SUB_PATCHES} +EXTRA_PATCHES+= ${WRKDIR}/${p} +.endfor + +post-patch: .SILENT +# Patch only needed for kmod + ${REINPLACE_CMD} -e 's/SUBDIR=\tsrc \\/SUBDIR=\tsrc/' -e '/lib/,/doc/d' \ + ${WRKSRC}/Makefile + ${REINPLACE_CMD} -e '/\.if exists(nvml)/,/\.endif/d' \ + ${WRKSRC}/Makefile + +# We should support -CURRENT: kill the check (first #if __FreeBSD_version) + linenum=$$(${SED} -ne '/^#if __FreeBSD_version/ { = ; q ; }' \ + ${WRKSRC}/src/${NVSRC}/nv-freebsd.h) ; ${REINPLACE_CMD} \ + -e "$$linenum,+2d" ${WRKSRC}/src/${NVSRC}/nv-freebsd.h +# Adjust Linux headers #include's after FreeBSD src r246085 + ${REINPLACE_CMD} -E '/#include "machine\/\.\.\/linux(32)?\/linux.h"/ \ + { x ; s/.*/#include "machine\/..\/..\/compat\/linux\/linux_ioctl.h"/ ; H ; x ; }' \ + ${WRKSRC}/src/${NVSRC}/nvidia_linux.c +# Fix bogus memset() call + ${REINPLACE_CMD} -e '/memset/s/sizeof(ci/sizeof(*ci/' \ + ${WRKSRC}/src/${NVSRC}/nvidia_subr.c +# Chase `sys/capability.h' rename to `sys/capsicum.h' in FreeBSD src r263232 + ${REINPLACE_CMD} -e 's:sys/capability\.h:sys/capsicum.h:' \ + ${WRKSRC}/src/${NVSRC}/nv-freebsd.h +.if ${NVVERSION} >= 358.009 + ${REINPLACE_CMD} -e 's:sys/capability\.h:sys/capsicum.h:' \ + ${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c +.endif +# KPI of kmem_alloc_contig(),kmem_free() changed in FreeBSD src r338143,r338318 +.if ${NVVERSION} < 530.03002 + ${REINPLACE_CMD} \ + -e 's/kmem_alloc_contig(kmem_arena, /kmem_alloc_contig(/' \ + -e 's/kmem_free(kmem_arena, /kmem_free(/' \ + ${WRKSRC}/src/${NVSRC}/nvidia_subr.c +.endif +# Pull the right header after FreeBSD src r347984 +.if ${NVVERSION} >= 358.009 + ${REINPLACE_CMD} -e '/^#include/s:lock\.h:mutex.h:' \ + ${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c +.endif +# After src df38ada2931f, `sys/module.h' must be included after `sys/param.h' +.if ${NVVERSION} >= 358.009 + @${REINPLACE_CMD} -e '/^#include <sys\/param\.h>/d; \ + /^#include <sys\/module\.h>/ { x; \ + s:^:#include <sys/param.h>:; G; }' \ + ${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c +.endif +# Do not execute afterinstall target (prevent automatic module registration +# and "smart" installation of conflicting files heuristics) + ${REINPLACE_CMD} -e 's/afterinstall/&_dontexecute/' ${WRKSRC}/Makefile + ${REINPLACE_CMD} -e 's/beforeinstall/&_dontexecute/' \ + ${WRKSRC}/lib/Makefile ${WRKSRC}/src/${NVSRC}/Makefile +# Unbreak the build against -Werror,-Wunused-but-set-variable CFLAGS +.if ${NVVERSION} < 450.51 + ${REINPLACE_CMD} -e '/void nvidia_dev_dtor/,+8s,.*status.*,,' \ + ${WRKSRC}/src/${NVSRC}/nvidia_dev.c +.endif +# After src 2a99dd30dfaa, DRIVER_MODULE should not include nvidia_devclass +.if ${OSVERSION} >= 1400058 + ${REINPLACE_CMD} -e '/^DRIVER_MODULE/s/, nvidia_devclass//' \ + ${WRKSRC}/src/${NVSRC}/nvidia_pci.c +.endif +# Catch up with pmap_unmapdev() and kmem_*() changes in 14-CURRENT +.if ${OSVERSION} >= 1400070 && (${NVVERSION} < 470.25602 || ${NVVERSION} >= 480.00000 && ${NVVERSION} < 530.03002) + ${REINPLACE_CMD} -e '/pmap_unmapdev/s,(vm_offset_t),,' \ + ${WRKSRC}/src/${NVSRC}/nvidia_os.c + ${REINPLACE_CMD} -e '/vm_offset_t virtual_address/s,vm_offset_t ,char *,' \ + ${WRKSRC}/src/${NVSRC}/nv-freebsd.h + ${REINPLACE_CMD} -e '/vm_offset_t address;/s,vm_offset_t ,void *,' \ + ${WRKSRC}/src/${NVSRC}/nvidia_subr.c +.endif +# Fix a K&R prototype +.if ${NVVERSION:R} >= 390 + ${REINPLACE_CMD} -e '/nvlink_allocLock/s,(),(void),' \ + ${WRKSRC}/src/${NVSRC}/nvlink_freebsd.c +.endif +# Finally, process OPTIONS +.if ${PORT_OPTIONS:MFREEBSD_AGP} + ${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \ + ${WRKSRC}/src/${NVSRC}/nv-freebsd.h +.endif +.if ${PORT_OPTIONS:MACPI_PM} + ${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_ACPI_PM)/define \1/' \ + ${WRKSRC}/src/${NVSRC}/nv-freebsd.h +.endif +.if ! ${PORT_OPTIONS:MLINUX} + ${REINPLACE_CMD} -E 's/define (NV_SUPPORT_LINUX_COMPAT)/undef \1/' \ + ${WRKSRC}/src/${NVSRC}/nv-freebsd.h +. if ${NVVERSION} >= 358.009 + ${REINPLACE_CMD} -E 's/define (NVKMS_SUPPORT_LINUX_COMPAT)/undef \1/' \ + ${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c +. endif +.endif +.if ${PORT_OPTIONS:MPAE} + ${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_PAE)/define \1/' \ + ${WRKSRC}/src/${NVSRC}/nv-freebsd.h +.endif +.if ${PORT_OPTIONS:MWBINVD} + ${REINPLACE_CMD} -E 's/undef (NV_USE_WBINVD)/define \1/' \ + ${WRKSRC}/src/${NVSRC}/nv-freebsd.h +.endif +# DMAP_MIN_ADDRESS and DMAP_MAX_ADDRESS is deleted from src at commit +# 4dd828c80828637452a8a4e07a64e294c82e5d8b on main branch. +# Note that there are about 10 days of broken window, as the commit +# does not have corresponding version bump. +.if ${OSVERSION} >= 1500051 + ${REINPLACE_CMD} -e 's/DMAP_MIN_ADDRESS/kva_layout.dmap_low/' \ + -e 's/DMAP_MAX_ADDRESS/kva_layout.dmap_high/' \ + ${WRKSRC}/src/${NVSRC}/nvidia_subr.c +.endif + +post-install: .SILENT +# pkg-plist is already overbloated, so use these hacks instead of PLIST_SUB's +.if ${NVVERSION} < 358.009 + ${REINPLACE_CMD} -e '/nvidia-modeset\.ko/d' ${TMPPLIST} +.endif +.if ${NVVERSION} < 560.02803 + ${REINPLACE_CMD} -e '/nvidia_gsp_ga10x_fw\.ko/d' ${TMPPLIST} + ${REINPLACE_CMD} -e '/nvidia_gsp_tu10x_fw\.ko/d' ${TMPPLIST} +.endif + +.include <bsd.port.post.mk> diff --git a/x11/nvidia-kmod/pkg-descr b/x11/nvidia-kmod/pkg-descr new file mode 100644 index 000000000000..82219fab2cae --- /dev/null +++ b/x11/nvidia-kmod/pkg-descr @@ -0,0 +1,3 @@ +These are the official NVidia binary drivers for hardware OpenGL rendering +in X11, using the GLX extensions. +This port is the kmods-only part. diff --git a/x11/nvidia-kmod/pkg-plist b/x11/nvidia-kmod/pkg-plist new file mode 100644 index 000000000000..f48a97e7c1f3 --- /dev/null +++ b/x11/nvidia-kmod/pkg-plist @@ -0,0 +1,4 @@ +/%%KMODDIR%%/nvidia.ko +/%%KMODDIR%%/nvidia-modeset.ko +/%%KMODDIR%%/nvidia_gsp_ga10x_fw.ko +/%%KMODDIR%%/nvidia_gsp_tu10x_fw.ko diff --git a/x11/plank/Makefile b/x11/plank/Makefile index e15395c3de0e..969addbd50fd 100644 --- a/x11/plank/Makefile +++ b/x11/plank/Makefile @@ -1,5 +1,5 @@ PORTNAME= plank -DISTVERSION= 0.11.149 +DISTVERSION= 0.11.151 CATEGORIES= x11 MAINTAINER= daniel@shafer.cc @@ -35,6 +35,7 @@ DBUSMENU_MESON_YES= enable-dbusmenu post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${WRKSRC}/docklets/Separator/SeparatorDockItem.vala \ ${WRKSRC}/lib/Factories/ItemFactory.vala .include <bsd.port.mk> diff --git a/x11/plank/distinfo b/x11/plank/distinfo index 0aa2e428ea3a..1c6940476125 100644 --- a/x11/plank/distinfo +++ b/x11/plank/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1757420136 -SHA256 (zquestz-plank-reloaded-0.11.149_GH0.tar.gz) = 0526af75adde1b57fd583dcbc73be507c4f18e30104ca86be1a2d9aec3060e7e -SIZE (zquestz-plank-reloaded-0.11.149_GH0.tar.gz) = 665188 +TIMESTAMP = 1758546125 +SHA256 (zquestz-plank-reloaded-0.11.151_GH0.tar.gz) = 1c7434ada03151f5bda2ceb6f0efc1a74eea03e8f641d4549e680488bd1fc2b5 +SIZE (zquestz-plank-reloaded-0.11.151_GH0.tar.gz) = 671898 diff --git a/x11/plank/files/patch-docklets_Separator_SeparatorDockItem.vala b/x11/plank/files/patch-docklets_Separator_SeparatorDockItem.vala new file mode 100644 index 000000000000..bd347b8c77df --- /dev/null +++ b/x11/plank/files/patch-docklets_Separator_SeparatorDockItem.vala @@ -0,0 +1,13 @@ +--- docklets/Separator/SeparatorDockItem.vala.orig 2025-09-17 00:18:24 UTC ++++ docklets/Separator/SeparatorDockItem.vala +@@ -252,8 +252,8 @@ namespace Docky { + ); + + string[] icon_paths = { +- "/usr/share/icons", +- "/usr/share/pixmaps", ++ "%%LOCALBASE%%/share/icons", ++ "%%LOCALBASE%%/share/pixmaps", + GLib.Environment.get_home_dir () + "/.local/share/icons" + }; + diff --git a/x11/plank/files/patch-lib_Services_Environment.vala b/x11/plank/files/patch-lib_Services_Environment.vala new file mode 100644 index 000000000000..27722a36008f --- /dev/null +++ b/x11/plank/files/patch-lib_Services_Environment.vala @@ -0,0 +1,31 @@ +Add support for x11/budgie and fix x11/gnome-flashback, +x11/gnome-shell-extensions + +--- lib/Services/Environment.vala.orig 2025-09-17 00:18:24 UTC ++++ lib/Services/Environment.vala +@@ -56,6 +56,7 @@ namespace Plank { + PANTHEON = 1 << 11, + DDE = 1 << 12, + ENDLESS = 1 << 13, ++ BUDGIE = 1 << 14, + OLD = 1 << 24, + UBUNTU = 1 << 25; + +@@ -66,7 +67,8 @@ namespace Plank { + case "gnome": result = XdgSessionDesktop.GNOME; break; + case "gnome-xorg": result = XdgSessionDesktop.GNOME; break; + case "gnome-classic": result = XdgSessionDesktop.GNOME; break; +- case "gnome-flashback": result = XdgSessionDesktop.GNOME; break; ++ case "gnome-classic-xorg": result = XdgSessionDesktop.GNOME; break; ++ case "gnome-flashback-metacity": result = XdgSessionDesktop.GNOME; break; + case "ubuntu": result = XdgSessionDesktop.UBUNTU; break; + case "ubuntu-xorg": result = XdgSessionDesktop.UBUNTU; break; + case "kde": result = XdgSessionDesktop.KDE; break; +@@ -83,6 +85,7 @@ namespace Plank { + case "cinnamon": result = XdgSessionDesktop.CINNAMON; break; + case "pantheon": result = XdgSessionDesktop.PANTHEON; break; + case "dde": result = XdgSessionDesktop.DDE; break; ++ case "budgie": result = XdgSessionDesktop.BUDGIE; break; + case "endless": result = XdgSessionDesktop.ENDLESS; break; + case "old": result = XdgSessionDesktop.OLD; break; + default: result = XdgSessionDesktop.UNKNOWN; break; diff --git a/x11/plasma-wayland-protocols/Makefile b/x11/plasma-wayland-protocols/Makefile index aaa112709b5f..a11aa0f2f59c 100644 --- a/x11/plasma-wayland-protocols/Makefile +++ b/x11/plasma-wayland-protocols/Makefile @@ -1,5 +1,5 @@ PORTNAME= plasma-wayland-protocols -DISTVERSION= 1.18.0 +DISTVERSION= 1.19.0 CATEGORIES= x11 kde MASTER_SITES= KDE/stable/${PORTNAME}/ diff --git a/x11/plasma-wayland-protocols/distinfo b/x11/plasma-wayland-protocols/distinfo index a9c0792905d8..a6571f42f459 100644 --- a/x11/plasma-wayland-protocols/distinfo +++ b/x11/plasma-wayland-protocols/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1747300866 -SHA256 (plasma-wayland-protocols-1.18.0.tar.xz) = 2567472671ad5d989f88b51baef9dd59353a5e7c3f2ed7e6b989755cb9004233 -SIZE (plasma-wayland-protocols-1.18.0.tar.xz) = 47596 +TIMESTAMP = 1758282555 +SHA256 (plasma-wayland-protocols-1.19.0.tar.xz) = 45679fe7a63c414f2c81793a62528fae6ccee584b6965719d7f9fc6dd48ba846 +SIZE (plasma-wayland-protocols-1.19.0.tar.xz) = 47784 diff --git a/x11/plasma6-plasma-workspace/Makefile b/x11/plasma6-plasma-workspace/Makefile index 387b059c2d47..b1caa84b7c1a 100644 --- a/x11/plasma6-plasma-workspace/Makefile +++ b/x11/plasma6-plasma-workspace/Makefile @@ -1,6 +1,9 @@ PORTNAME= plasma-workspace DISTVERSION= ${KDE_PLASMA_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde kde-plasma +PATCH_SITES= https://invent.kde.org/plasma/plasma-workspace/-/commit/ +PATCHFILES= 30273fb2afcc6e304951c8895bb17d38255fed39.patch:-p1 COMMENT= KDE Plasma Workspace MAINTAINER= kde@FreeBSD.org diff --git a/x11/plasma6-plasma-workspace/distinfo b/x11/plasma6-plasma-workspace/distinfo index ab316caa3012..3bd349bc5b13 100644 --- a/x11/plasma6-plasma-workspace/distinfo +++ b/x11/plasma6-plasma-workspace/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1757499265 +TIMESTAMP = 1758787727 SHA256 (KDE/plasma/6.4.5/plasma-workspace-6.4.5.tar.xz) = 19999ebf3574f539145ba7074019b88d51f2ca952d121394daf6af2e632910fb SIZE (KDE/plasma/6.4.5/plasma-workspace-6.4.5.tar.xz) = 20834364 +SHA256 (KDE/plasma/6.4.5/30273fb2afcc6e304951c8895bb17d38255fed39.patch) = 7d7e2b2fba62c60e6f3ce32f6b2b21524733235f41bf78ea82484183fc2856a4 +SIZE (KDE/plasma/6.4.5/30273fb2afcc6e304951c8895bb17d38255fed39.patch) = 2282 diff --git a/x11/py-waypaper/Makefile b/x11/py-waypaper/Makefile index 10578bcf1e35..de3f9ab6ba1a 100644 --- a/x11/py-waypaper/Makefile +++ b/x11/py-waypaper/Makefile @@ -1,6 +1,6 @@ PORTNAME= waypaper -DISTVERSION= 2.6 -PORTREVISION= 1 +DISTVERSION= 2.7 +PORTREVISION= 0 CATEGORIES= x11 python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -19,6 +19,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>=10.4.0:graphics/py-pillow@${PY_FLAVO ${PYTHON_PKGNAMEPREFIX}imageio>=2.36.0:graphics/py-imageio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}imageio-ffmpeg>=0.5.1:graphics/py-imageio-ffmpeg@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}screeninfo>=0.8.1:x11/py-screeninfo@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}platformdirs>=4.4.0:devel/py-platformdirs@${PY_FLAVOR} \ feh:graphics/feh \ swaybg:x11/swaybg diff --git a/x11/py-waypaper/distinfo b/x11/py-waypaper/distinfo index d6d052550c50..424be2a24a18 100644 --- a/x11/py-waypaper/distinfo +++ b/x11/py-waypaper/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1748189559 -SHA256 (waypaper-2.6.tar.gz) = fdbf92200606026bf6f42ffff13ea608c0e5621f611a19be062466f96658ba85 -SIZE (waypaper-2.6.tar.gz) = 48645 +TIMESTAMP = 1759052386 +SHA256 (waypaper-2.7.tar.gz) = 2fcc539999ce40efc8442b880aaca2f815cf947c002b9686edd19734601edfc5 +SIZE (waypaper-2.7.tar.gz) = 50829 diff --git a/x11/py-waypaper/pkg-descr b/x11/py-waypaper/pkg-descr index 966327b96590..a77889d00b57 100644 --- a/x11/py-waypaper/pkg-descr +++ b/x11/py-waypaper/pkg-descr @@ -7,8 +7,8 @@ Features - Vim keys - Support for GIF animations (with swww or mpvpaper) - Support for videos (with mpvpaper) - - Support for multiple monitors (with swww or swaybg or hyprpaper or mpvpaper) - - Works on Wayland (with swww or swaybg or hyprpaper or wallutils or mpvpaper) + - Support for multiple monitors (with swww, swaybg, hyprpaper or mpvpaper) + - Works on Wayland (with swww, swaybg, hyprpaper, wallutils or mpvpaper) - Works on Xorg (with feh or wallutils) - Restores wallpaper at launch of your WM - Caching for fast loading diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile index 3d82c83bf462..209e0b4deeab 100644 --- a/x11/rxvt-unicode/Makefile +++ b/x11/rxvt-unicode/Makefile @@ -1,6 +1,6 @@ PORTNAME= rxvt-unicode PORTVERSION= 9.31 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= http://dist.schmorp.de/rxvt-unicode/%SUBDIR%/ MASTER_SITE_SUBDIR= . Attic diff --git a/x11/rxvt-unicode/files/patch-src__command.C b/x11/rxvt-unicode/files/patch-src__command.C index 25c7d46e46c5..745b72161791 100644 --- a/x11/rxvt-unicode/files/patch-src__command.C +++ b/x11/rxvt-unicode/files/patch-src__command.C @@ -17,4 +17,222 @@ +#endif break; } + +@@ -3044,8 +3044,13 @@ rxvt_term::process_csi_seq () + tt_printf ("%-.250s\012", rs[Rs_display_name]); + break; + case 8: /* unofficial extension */ +- process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, CHAR_ST); // char * cast verified +- break; ++ { ++ string_term st; ++ st.v[0] = CHAR_ST; ++ st.v[1] = '\0'; ++ process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified ++ break; ++ } + } + break; + +@@ -3240,7 +3245,7 @@ char * + * ends_how is terminator used. returned input must be free()'d + */ + char * +-rxvt_term::get_to_st (unicode_t &ends_how) ++rxvt_term::get_to_st (string_term &st) + { + unicode_t ch; + bool seen_esc = false; +@@ -3279,7 +3284,11 @@ rxvt_term::get_to_st (unicode_t &ends_how) + + string[n++] = '\0'; + +- ends_how = (ch == 0x5c ? C0_ESC : ch); ++ n = 0; ++ if (ch == 0x5c) ++ st.v[n++] = C0_ESC; ++ st.v[n++] = ch; ++ st.v[n] = '\0'; + + return rxvt_wcstombs (string); + } +@@ -3295,8 +3304,8 @@ rxvt_term::process_dcs_seq () + * Not handled yet + */ + +- unicode_t eh; +- char *s = get_to_st (eh); ++ string_term st; ++ char *s = get_to_st (st); + if (s) + free (s); + +@@ -3318,12 +3327,12 @@ rxvt_term::process_osc_seq () + + if (ch == ';') + { +- unicode_t eh; +- char *s = get_to_st (eh); ++ string_term st; ++ char *s = get_to_st (st); + + if (s) + { +- process_xterm_seq (arg, s, eh); ++ process_xterm_seq (arg, s, st); + free (s); + } + } +@@ -3433,7 +3442,7 @@ void + } + + void +-rxvt_term::process_color_seq (int report, int color, const char *str, char resp) ++rxvt_term::process_color_seq (int report, int color, const char *str, string_term &st) + { + if (str[0] == '?' && !str[1]) + { +@@ -3449,9 +3458,9 @@ rxvt_term::process_color_seq (int report, int color, c + snprintf (rgba_str, sizeof (rgba_str), "rgb:%04x/%04x/%04x", c.r, c.g, c.b); + + if (IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) +- tt_printf ("\033]%d;%d;%s%c", report, color - minCOLOR, rgba_str, resp); ++ tt_printf ("\033]%d;%d;%s%s", report, color - minCOLOR, rgba_str, st.v); + else +- tt_printf ("\033]%d;%s%c", report, rgba_str, resp); ++ tt_printf ("\033]%d;%s%s", report, rgba_str, st.v); + } + else + set_window_color (color, str); +@@ -3461,7 +3470,7 @@ void + * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) + */ + void +-rxvt_term::process_xterm_seq (int op, char *str, char resp) ++rxvt_term::process_xterm_seq (int op, char *str, string_term &st) + { + int color; + char *buf, *name; +@@ -3506,7 +3515,7 @@ rxvt_term::process_xterm_seq (int op, char *str, char + && actual_format == 8) + str = (const char *)(value); + +- tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp); ++ tt_printf ("\033]%d;%s%s", op, option (Opt_insecure) ? str : "", st.v); + + XFree (value); + } +@@ -3540,49 +3549,49 @@ rxvt_term::process_xterm_seq (int op, char *str, char + if ((buf = strchr (name, ';')) != NULL) + *buf++ = '\0'; + +- process_color_seq (op, color, name, resp); ++ process_color_seq (op, color, name, st); + } + break; + case Rxvt_restoreFG: + case XTerm_Color00: +- process_color_seq (op, Color_fg, str, resp); ++ process_color_seq (op, Color_fg, str, st); + break; + case Rxvt_restoreBG: + case XTerm_Color01: +- process_color_seq (op, Color_bg, str, resp); ++ process_color_seq (op, Color_bg, str, st); + break; + #ifndef NO_CURSORCOLOR + case XTerm_Color_cursor: +- process_color_seq (op, Color_cursor, str, resp); ++ process_color_seq (op, Color_cursor, str, st); + break; + #endif + case XTerm_Color_pointer_fg: +- process_color_seq (op, Color_pointer_fg, str, resp); ++ process_color_seq (op, Color_pointer_fg, str, st); + break; + case XTerm_Color_pointer_bg: +- process_color_seq (op, Color_pointer_bg, str, resp); ++ process_color_seq (op, Color_pointer_bg, str, st); + break; + #ifdef OPTION_HC + case XTerm_Color_HC: +- process_color_seq (op, Color_HC, str, resp); ++ process_color_seq (op, Color_HC, str, st); + break; + case XTerm_Color_HTC: +- process_color_seq (op, Color_HTC, str, resp); ++ process_color_seq (op, Color_HTC, str, st); + break; + #endif + #ifndef NO_BOLD_UNDERLINE_REVERSE + case URxvt_Color_BD: +- process_color_seq (op, Color_BD, str, resp); ++ process_color_seq (op, Color_BD, str, st); + break; + case URxvt_Color_UL: +- process_color_seq (op, Color_UL, str, resp); ++ process_color_seq (op, Color_UL, str, st); + break; + case URxvt_Color_IT: +- process_color_seq (op, Color_IT, str, resp); ++ process_color_seq (op, Color_IT, str, st); + break; + #endif + case URxvt_Color_border: +- process_color_seq (op, Color_border, str, resp); ++ process_color_seq (op, Color_border, str, st); + break; + + case XTerm_logfile: +@@ -3610,10 +3619,10 @@ rxvt_term::process_xterm_seq (int op, char *str, char + case URxvt_boldItalicFont: + #endif + if (query) +- tt_printf ("\33]%d;%-.250s%c", saveop, ++ tt_printf ("\33]%d;%-.250s%s", saveop, + option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc + ? fontset[op - URxvt_font]->fontdesc : "", +- resp); ++ st.v); + else + { + const char *&res = rs[Rs_font + (op - URxvt_font)]; +@@ -3626,23 +3635,23 @@ rxvt_term::process_xterm_seq (int op, char *str, char + + case URxvt_version: + if (query) +- tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", ++ tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s", + op, + rs[Rs_name], VERSION[0], VERSION[2], +- resp); ++ st.v); + break; + + #if !ENABLE_MINIMAL + case URxvt_cellinfo: + if (query) +- tt_printf ("\33]%d;%d;%d;%d%c", saveop, ++ tt_printf ("\33]%d;%d;%d;%d%s", saveop, + fwidth, fheight, fbase, +- resp); ++ st.v); + break; + + case URxvt_locale: + if (query) +- tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp); ++ tt_printf ("\33]%d;%-.250s%s", op, option (Opt_insecure) ? locale : "", st.v); + else + { + set_locale (str); +@@ -3667,7 +3676,7 @@ rxvt_term::process_xterm_seq (int op, char *str, char + + #if ENABLE_PERL + case URxvt_perl: +- HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END)); ++ HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR, st.v, DT_END)); + break; + #endif + } diff --git a/x11/rxvt-unicode/files/patch-src__rxvt.h b/x11/rxvt-unicode/files/patch-src__rxvt.h new file mode 100644 index 000000000000..12a3b61316cf --- /dev/null +++ b/x11/rxvt-unicode/files/patch-src__rxvt.h @@ -0,0 +1,30 @@ +--- src/rxvt.h.orig 2021-11-21 23:29:22 UTC ++++ src/rxvt.h +@@ -399,6 +399,12 @@ enum { + C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB, + C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1, + }; ++ ++struct string_term ++{ ++ unsigned char v[3]; ++}; ++ + #define CHAR_ST 0x9c /* 0234 */ + + /* +@@ -1366,11 +1372,11 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_s + void process_escape_seq (); + void process_csi_seq (); + void process_window_ops (const int *args, unsigned int nargs); +- char *get_to_st (unicode_t &ends_how); ++ char *get_to_st (string_term &st); + void process_dcs_seq (); + void process_osc_seq (); +- void process_color_seq (int report, int color, const char *str, char resp); +- void process_xterm_seq (int op, char *str, char resp); ++ void process_color_seq (int report, int color, const char *str, string_term &st); ++ void process_xterm_seq (int op, char *str, string_term &st); + unsigned int map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a); + int privcases (int mode, unsigned long bit); + void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); diff --git a/x11/stalonetray/Makefile b/x11/stalonetray/Makefile index 93526080f64d..81b6ff9053e8 100644 --- a/x11/stalonetray/Makefile +++ b/x11/stalonetray/Makefile @@ -1,27 +1,25 @@ PORTNAME= stalonetray -DISTVERSIONPREFIX= v -DISTVERSION= 0.8.5 -PORTREVISION= 1 +DISTVERSION= 0.9.0 CATEGORIES= x11 MAINTAINER= uzsolt@FreeBSD.org COMMENT= STAnd-aLONE system tray -WWW= https://kolbusa.github.io/stalonetray/ +WWW= https://d3adb5.github.io/stalonetray/ LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= docbook-xsl>0:textproc/docbook-xsl \ libxslt>0:textproc/libxslt USES= autoreconf gmake xorg USE_GITHUB= yes -GH_ACCOUNT= kolbusa -USE_XORG= sm ice x11 xpm +GH_ACCOUNT= d3adb5 +USE_XORG= ice sm x11 xpm GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share -CONFIGURE_ARGS= --disable-native-kde \ - --disable-debug +CONFIGURE_ARGS= --disable-debug \ + --disable-native-kde post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} diff --git a/x11/stalonetray/distinfo b/x11/stalonetray/distinfo index 75cd5d21e955..7a7dc233cda9 100644 --- a/x11/stalonetray/distinfo +++ b/x11/stalonetray/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1679173485 -SHA256 (kolbusa-stalonetray-v0.8.5_GH0.tar.gz) = b66ef676d4fcffbcb0980adc7842786e7050381e06ab2c99275f04cc98d39497 -SIZE (kolbusa-stalonetray-v0.8.5_GH0.tar.gz) = 102899 +TIMESTAMP = 1758894001 +SHA256 (d3adb5-stalonetray-0.9.0_GH0.tar.gz) = 17cd2bf2212355473007c456eb2df9774b54ed08277fd141d6cc59512c873240 +SIZE (d3adb5-stalonetray-0.9.0_GH0.tar.gz) = 106605 diff --git a/x11/swww/Makefile b/x11/swww/Makefile index b1462e884eb1..96fdda4d298f 100644 --- a/x11/swww/Makefile +++ b/x11/swww/Makefile @@ -1,6 +1,6 @@ PORTNAME= swww DISTVERSIONPREFIX= v -DISTVERSION= 0.11.1 +DISTVERSION= 0.11.2 PORTREVISION= 0 CATEGORIES= x11 diff --git a/x11/swww/Makefile.crates b/x11/swww/Makefile.crates index a35498dd3062..98582df424f4 100644 --- a/x11/swww/Makefile.crates +++ b/x11/swww/Makefile.crates @@ -150,8 +150,8 @@ CARGO_CRATES= adler2-2.0.1 \ version-compare-0.2.0 \ version_check-0.9.5 \ wait-timeout-0.2.1 \ - waybackend-0.6.0 \ - waybackend-scanner-0.6.0 \ + waybackend-0.6.2 \ + waybackend-scanner-0.6.2 \ weezl-0.1.10 \ windows-link-0.1.3 \ windows-link-0.2.0 \ diff --git a/x11/swww/distinfo b/x11/swww/distinfo index 325abf693955..bed5fa3ce6d0 100644 --- a/x11/swww/distinfo +++ b/x11/swww/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1758361103 +TIMESTAMP = 1758534850 SHA256 (rust/crates/adler2-2.0.1.crate) = 320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa SIZE (rust/crates/adler2-2.0.1.crate) = 13366 SHA256 (rust/crates/ahash-0.8.12.crate) = 5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75 @@ -303,10 +303,10 @@ SHA256 (rust/crates/version_check-0.9.5.crate) = 0b928f33d975fc6ad9f86c8f283853a SIZE (rust/crates/version_check-0.9.5.crate) = 15554 SHA256 (rust/crates/wait-timeout-0.2.1.crate) = 09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11 SIZE (rust/crates/wait-timeout-0.2.1.crate) = 11435 -SHA256 (rust/crates/waybackend-0.6.0.crate) = 2df27d8dd17cc14e3fe81575a45afc6e869cbcec4309b445b3e034cbcb43ef10 -SIZE (rust/crates/waybackend-0.6.0.crate) = 69711 -SHA256 (rust/crates/waybackend-scanner-0.6.0.crate) = 9375b69fbd9cabe11889a1007a4c05d97f7d06c0219cf9a274319a749f2239c9 -SIZE (rust/crates/waybackend-scanner-0.6.0.crate) = 10654 +SHA256 (rust/crates/waybackend-0.6.2.crate) = 5b6d8f2fd99ebe132232e5eb1c01babb1138b324db93d4da2f95bae9324a1e36 +SIZE (rust/crates/waybackend-0.6.2.crate) = 69675 +SHA256 (rust/crates/waybackend-scanner-0.6.2.crate) = 71cbc42726e8a225d9ac093b1687c9fe6a518ccb96f89706895b8ec354b81e7f +SIZE (rust/crates/waybackend-scanner-0.6.2.crate) = 10657 SHA256 (rust/crates/weezl-0.1.10.crate) = a751b3277700db47d3e574514de2eced5e54dc8a5436a3bf7a0b248b2cee16f3 SIZE (rust/crates/weezl-0.1.10.crate) = 46418 SHA256 (rust/crates/windows-link-0.1.3.crate) = 5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a @@ -349,5 +349,5 @@ SHA256 (rust/crates/zune-inflate-0.2.54.crate) = 73ab332fe2f6680068f3582b16a24f9 SIZE (rust/crates/zune-inflate-0.2.54.crate) = 37973 SHA256 (rust/crates/zune-jpeg-0.4.21.crate) = 29ce2c8a9384ad323cf564b67da86e21d3cfdff87908bc1223ed5c99bc792713 SIZE (rust/crates/zune-jpeg-0.4.21.crate) = 68268 -SHA256 (LGFae-swww-v0.11.1_GH0.tar.gz) = 4fe4303c499af184c7d63abea859f3db4518847d66d42ce5a66da022728d2e9d -SIZE (LGFae-swww-v0.11.1_GH0.tar.gz) = 113060 +SHA256 (LGFae-swww-v0.11.2_GH0.tar.gz) = ec903cc75deb007a7f842deac851d4d2fadb6361d7491e98e900d4858f2c8eb7 +SIZE (LGFae-swww-v0.11.2_GH0.tar.gz) = 112991 diff --git a/x11/walker/Makefile b/x11/walker/Makefile index b27bac353a01..044284900fbc 100644 --- a/x11/walker/Makefile +++ b/x11/walker/Makefile @@ -1,6 +1,6 @@ PORTNAME= walker DISTVERSIONPREFIX= v -DISTVERSION= 1.0.4 +DISTVERSION= 1.0.9 CATEGORIES= x11 wayland PKGNAMESUFFIX= -launcher diff --git a/x11/walker/distinfo b/x11/walker/distinfo index 44f1ef436a14..9fa96ef9f8f0 100644 --- a/x11/walker/distinfo +++ b/x11/walker/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1758054872 +TIMESTAMP = 1759299748 SHA256 (rust/crates/addr2line-0.24.2.crate) = dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1 SIZE (rust/crates/addr2line-0.24.2.crate) = 39015 SHA256 (rust/crates/adler2-2.0.1.crate) = 320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa @@ -499,5 +499,5 @@ SHA256 (rust/crates/xml-rs-0.8.27.crate) = 6fd8403733700263c6eb89f192880191f1b83 SIZE (rust/crates/xml-rs-0.8.27.crate) = 55258 SHA256 (rust/crates/yaml-rust2-0.10.3.crate) = 4ce2a4ff45552406d02501cea6c18d8a7e50228e7736a872951fe2fe75c91be7 SIZE (rust/crates/yaml-rust2-0.10.3.crate) = 76325 -SHA256 (abenz1267-walker-v1.0.4_GH0.tar.gz) = d483ee8bf35ae8d21420d54c452332be318f81cb0746b708647ede63f498af2c -SIZE (abenz1267-walker-v1.0.4_GH0.tar.gz) = 65051 +SHA256 (abenz1267-walker-v1.0.9_GH0.tar.gz) = c31ef0ef31f1cb4ac0467326483a6e81223a555df00b5a8f8c1b8684d41d7e67 +SIZE (abenz1267-walker-v1.0.9_GH0.tar.gz) = 66274 diff --git a/x11/way-displays/Makefile b/x11/way-displays/Makefile index 8607b935ee34..77c2b58cd262 100644 --- a/x11/way-displays/Makefile +++ b/x11/way-displays/Makefile @@ -1,5 +1,5 @@ PORTNAME= way-displays -DISTVERSION= 1.14.1 +DISTVERSION= 1.15.0 CATEGORIES= x11 wayland MAINTAINER= jbeich@FreeBSD.org diff --git a/x11/way-displays/distinfo b/x11/way-displays/distinfo index dafbc9586d3e..7865fce76bf7 100644 --- a/x11/way-displays/distinfo +++ b/x11/way-displays/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749450886 -SHA256 (alex-courtis-way-displays-1.14.1_GH0.tar.gz) = 3e182285f16298ce7579b0cc3d17e41a29cf6d951929070738f7e198cb05667a -SIZE (alex-courtis-way-displays-1.14.1_GH0.tar.gz) = 126735 +TIMESTAMP = 1759214478 +SHA256 (alex-courtis-way-displays-1.15.0_GH0.tar.gz) = 8ef741fd2f0452098e5a3d0131013b8c0ea6bdb11ed85d1e39c34c05c0d353d6 +SIZE (alex-courtis-way-displays-1.15.0_GH0.tar.gz) = 128952 diff --git a/x11/zenity4/Makefile b/x11/zenity4/Makefile index a6065e869094..4f5b5d19572a 100644 --- a/x11/zenity4/Makefile +++ b/x11/zenity4/Makefile @@ -1,5 +1,5 @@ PORTNAME= zenity -PORTVERSION= 4.0.5 +PORTVERSION= 4.2.0 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome @@ -16,7 +16,7 @@ CONFLICTS_INSTALL= zenity-3.* BUILD_DEPENDS= itstool:textproc/itstool \ help2man:misc/help2man -USES= gettext gnome localbase meson pkgconfig \ +USES= gettext-tools gnome localbase meson pkgconfig \ perl5 tar:xz xorg USE_CSTD= c99 USE_GNOME= gtk40 libadwaita diff --git a/x11/zenity4/distinfo b/x11/zenity4/distinfo index 809e580ae344..3c12ad0763f7 100644 --- a/x11/zenity4/distinfo +++ b/x11/zenity4/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1738405401 -SHA256 (gnome/zenity-4.0.5.tar.xz) = 8a3ffe7751bed497a758229ece07be9114ad4e46a066abae4e5f31d6da4c0e9e -SIZE (gnome/zenity-4.0.5.tar.xz) = 3096696 +TIMESTAMP = 1758458917 +SHA256 (gnome/zenity-4.2.0.tar.xz) = 5f983340c6fa55f4fab5a9769d0771b2cdf1365e2c158ac11cc16ffd892f6bcd +SIZE (gnome/zenity-4.2.0.tar.xz) = 2815916 diff --git a/x11/zenity4/pkg-plist b/x11/zenity4/pkg-plist index 5c1aba0480cc..1cb6e0576adb 100644 --- a/x11/zenity4/pkg-plist +++ b/x11/zenity4/pkg-plist @@ -915,6 +915,7 @@ share/locale/th/LC_MESSAGES/zenity.mo share/locale/tr/LC_MESSAGES/zenity.mo share/locale/ug/LC_MESSAGES/zenity.mo share/locale/uk/LC_MESSAGES/zenity.mo +share/locale/uz/LC_MESSAGES/zenity.mo share/locale/vi/LC_MESSAGES/zenity.mo share/locale/xh/LC_MESSAGES/zenity.mo share/locale/zh_CN/LC_MESSAGES/zenity.mo |