diff options
Diffstat (limited to 'x11')
51 files changed, 1031 insertions, 325 deletions
diff --git a/x11/Makefile b/x11/Makefile index d0d0600e56db..0addc97e569f 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -302,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/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/kitty/Makefile b/x11/kitty/Makefile index 0c73d21c57bc..700609891d0b 100644 --- a/x11/kitty/Makefile +++ b/x11/kitty/Makefile @@ -1,6 +1,6 @@ PORTNAME= kitty DISTVERSIONPREFIX= v -DISTVERSION= 0.42.2 +DISTVERSION= 0.43.1 PORTREVISION= 0 CATEGORIES= x11 wayland diff --git a/x11/kitty/distinfo b/x11/kitty/distinfo index 7c4dbda0735b..985d0595b2ee 100644 --- a/x11/kitty/distinfo +++ b/x11/kitty/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1752653730 -SHA256 (go/x11_kitty/kitty-v0.42.2/v0.42.2.mod) = 0771bc71a0d5ab1ff09ab8d5e647ffa38e63de41971f7fb6cd3929e42914af46 -SIZE (go/x11_kitty/kitty-v0.42.2/v0.42.2.mod) = 1480 -SHA256 (go/x11_kitty/kitty-v0.42.2/v0.42.2.zip) = f915262b6afdd2d1bc70b46446efa330be6e4a864efd9f5d3c10c43186b827a4 -SIZE (go/x11_kitty/kitty-v0.42.2/v0.42.2.zip) = 10218438 +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 1c8cacb60bc1..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 @@ -64,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 @@ -75,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 @@ -99,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 @@ -133,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 @@ -144,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 @@ -203,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 @@ -238,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 @@ -252,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 @@ -662,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 @@ -964,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 @@ -981,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/py-waypaper/Makefile b/x11/py-waypaper/Makefile index c5c875a31314..de3f9ab6ba1a 100644 --- a/x11/py-waypaper/Makefile +++ b/x11/py-waypaper/Makefile @@ -1,6 +1,6 @@ PORTNAME= waypaper -DISTVERSION= 2.6 -PORTREVISION= 2 +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/files/patch-waypaper_changer.py b/x11/py-waypaper/files/patch-waypaper_changer.py deleted file mode 100644 index c6994c8df161..000000000000 --- a/x11/py-waypaper/files/patch-waypaper_changer.py +++ /dev/null @@ -1,19 +0,0 @@ ---- waypaper/changer.py.orig 2025-02-28 01:09:43 UTC -+++ waypaper/changer.py -@@ -138,9 +138,15 @@ def change_with_swww(image_path: Path, cf: Config, mon - subprocess.Popen(["swww-daemon"]) - print("Launched swww-daemon") - -+ version_p = subprocess.run(["swww", "-V"], capture_output=True, text=True) -+ swww_version = [int(x) for x in version_p.stdout.strip().split(" ")[1].split(".")] -+ - command = ["swww", "img", image_path] - command.extend(["--resize", fill]) -- command.extend(["--fill-color", cf.color]) -+ if swww_version >= [0, 11, 0]: -+ command.extend(["--fill-color", cf.color.lstrip("#")]) -+ else: -+ command.extend(["--fill-color", cf.color]) - command.extend(["--transition-type", cf.swww_transition_type]) - command.extend(["--transition-step", str(cf.swww_transition_step)]) - command.extend(["--transition-angle", str(cf.swww_transition_angle)]) 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/walker/Makefile b/x11/walker/Makefile index b18e7e0a7474..044284900fbc 100644 --- a/x11/walker/Makefile +++ b/x11/walker/Makefile @@ -1,6 +1,6 @@ PORTNAME= walker DISTVERSIONPREFIX= v -DISTVERSION= 1.0.7 +DISTVERSION= 1.0.9 CATEGORIES= x11 wayland PKGNAMESUFFIX= -launcher diff --git a/x11/walker/distinfo b/x11/walker/distinfo index 58cef0a67cfe..9fa96ef9f8f0 100644 --- a/x11/walker/distinfo +++ b/x11/walker/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1758432351 +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.7_GH0.tar.gz) = 0775066d2a9a66c242a1c86c2bd7b6da1b04b7cf3ca04152333bb1f8a12f9c52 -SIZE (abenz1267-walker-v1.0.7_GH0.tar.gz) = 65828 +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 |