diff options
Diffstat (limited to '')
48 files changed, 482 insertions, 358 deletions
diff --git a/x11-wm/cosmic-comp/Makefile b/x11-wm/cosmic-comp/Makefile index 9ab55a03c1e2..82934897afbc 100644 --- a/x11-wm/cosmic-comp/Makefile +++ b/x11-wm/cosmic-comp/Makefile @@ -1,7 +1,7 @@ PORTNAME= cosmic-comp DISTVERSIONPREFIX= epoch- DISTVERSION= 1.0.0-alpha.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org diff --git a/x11-wm/cosmic-comp/Makefile.crates b/x11-wm/cosmic-comp/Makefile.crates index f3737b79d2b6..aa6c570116a5 100644 --- a/x11-wm/cosmic-comp/Makefile.crates +++ b/x11-wm/cosmic-comp/Makefile.crates @@ -251,9 +251,6 @@ CARGO_CRATES= ab_glyph-0.2.29 \ kurbo-0.11.1 \ lazy_static-1.5.0 \ libc-0.2.169 \ - libdisplay-info-0.2.2 \ - libdisplay-info-derive-0.1.0 \ - libdisplay-info-sys-0.2.2 \ libloading-0.8.6 \ libm-0.2.11 \ libredox-0.1.3 \ @@ -636,6 +633,7 @@ CARGO_CRATES= ab_glyph-0.2.29 \ atomicwrites@git+https://github.com/jackpot51/rust-atomicwrites\#043ab4859d53ffd3d55334685303d8df39c9f768 \ iced_glyphon@git+https://github.com/pop-os/glyphon.git?tag=iced-0.14-dev\#6ef9d12a20cfd0f7bdf38136a26ded9f7459ec8b \ clipboard_macos,clipboard_wayland,clipboard_x11,dnd,mime,window_clipboard@git+https://github.com/pop-os/window_clipboard.git?tag=pop-0.13-2\#6b9faab87bea9cebec6ae036906fd67fed254f5f \ + libdisplay-info,libdisplay-info-derive,libdisplay-info-sys@git+https://github.com/Smithay/libdisplay-info-rs?branch=feature%2F0.3.0\#5b706d544d87f1bcae4c5ba97b281a8ab16754ed \ softbuffer@git+https://github.com/pop-os/softbuffer?tag=cosmic-4.0\#6e75b1ad7e98397d37cb187886d05969bc480995 \ cosmic-config,cosmic-config-derive,cosmic-theme,iced,iced_core,iced_futures,iced_graphics,iced_renderer,iced_runtime,iced_tiny_skia,iced_wgpu,iced_widget,libcosmic@git+https://github.com/pop-os/libcosmic/\#8a0e74b189f53dae9b8001c6fa5cf1820b3ececb \ cosmic-client-toolkit,cosmic-protocols@git+https://github.com/pop-os/cosmic-protocols?branch=main\#bc4af9183e0967802d7fbe91ba811a29ca6a3b67 \ diff --git a/x11-wm/cosmic-comp/distinfo b/x11-wm/cosmic-comp/distinfo index ea738b7d046f..b28cba9d2342 100644 --- a/x11-wm/cosmic-comp/distinfo +++ b/x11-wm/cosmic-comp/distinfo @@ -505,12 +505,6 @@ SHA256 (rust/crates/lazy_static-1.5.0.crate) = bbd2bcb4c963f2ddae06a2efc7e9f3591 SIZE (rust/crates/lazy_static-1.5.0.crate) = 14025 SHA256 (rust/crates/libc-0.2.169.crate) = b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a SIZE (rust/crates/libc-0.2.169.crate) = 757901 -SHA256 (rust/crates/libdisplay-info-0.2.2.crate) = 4210cfe93a0dc37228e08105e3c13171e5af816f7bd39e00e3d3adcf2b487a2b -SIZE (rust/crates/libdisplay-info-0.2.2.crate) = 34625 -SHA256 (rust/crates/libdisplay-info-derive-0.1.0.crate) = ea1cd31036b732a546d845f9485c56b1b606b5e476b0821c680dd66c8cd6fcee -SIZE (rust/crates/libdisplay-info-derive-0.1.0.crate) = 3601 -SHA256 (rust/crates/libdisplay-info-sys-0.2.2.crate) = 7f4f9264ece23c37ffa023ae635f48d588e1786745dad06dff10c9fb99dc646c -SIZE (rust/crates/libdisplay-info-sys-0.2.2.crate) = 26200 SHA256 (rust/crates/libloading-0.8.6.crate) = fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34 SIZE (rust/crates/libloading-0.8.6.crate) = 28922 SHA256 (rust/crates/libm-0.2.11.crate) = 8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa @@ -1275,6 +1269,8 @@ SHA256 (pop-os-glyphon-iced-0.14-dev_GH0.tar.gz) = ec5f82cdbf5f5c0a7313cad64de78 SIZE (pop-os-glyphon-iced-0.14-dev_GH0.tar.gz) = 183465 SHA256 (pop-os-window_clipboard-pop-0.13-2_GH0.tar.gz) = 2181c53f2fe5d373cedfa7fe826bab04cbdd39fdbcb77920bbcc9f41a9cca79c SIZE (pop-os-window_clipboard-pop-0.13-2_GH0.tar.gz) = 24227 +SHA256 (Smithay-libdisplay-info-rs-5b706d544d87f1bcae4c5ba97b281a8ab16754ed_GH0.tar.gz) = 1f61882dcb638b790369d1f09e41ec4b4d24ec15abef2abf3b00e01399121ab5 +SIZE (Smithay-libdisplay-info-rs-5b706d544d87f1bcae4c5ba97b281a8ab16754ed_GH0.tar.gz) = 119266 SHA256 (pop-os-softbuffer-cosmic-4.0_GH0.tar.gz) = 980f30eb5afc07acdec43f181a9e745cb7a887a6dff7e06dc9199748b2487569 SIZE (pop-os-softbuffer-cosmic-4.0_GH0.tar.gz) = 165853 SHA256 (pop-os-libcosmic-8a0e74b189f53dae9b8001c6fa5cf1820b3ececb_GH0.tar.gz) = 7891bf08e33aef4d59046e038e5eb47e3144d06e12888161d5a1fbbd49fd9b33 diff --git a/x11-wm/cosmic-comp/files/patch-libdisplay-info-0.3 b/x11-wm/cosmic-comp/files/patch-libdisplay-info-0.3 new file mode 100644 index 000000000000..679912dccc17 --- /dev/null +++ b/x11-wm/cosmic-comp/files/patch-libdisplay-info-0.3 @@ -0,0 +1,52 @@ +https://github.com/Smithay/libdisplay-info-rs/pull/17 + +--- Cargo.lock.orig 2025-04-24 10:45:50 UTC ++++ Cargo.lock +@@ -2900,9 +2900,8 @@ name = "libdisplay-info" + + [[package]] + name = "libdisplay-info" +-version = "0.2.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4210cfe93a0dc37228e08105e3c13171e5af816f7bd39e00e3d3adcf2b487a2b" ++version = "0.2.3" ++source = "git+https://github.com/Smithay/libdisplay-info-rs?branch=feature%2F0.3.0#5b706d544d87f1bcae4c5ba97b281a8ab16754ed" + dependencies = [ + "bitflags 2.8.0", + "libc", +@@ -2913,9 +2912,8 @@ name = "libdisplay-info-derive" + + [[package]] + name = "libdisplay-info-derive" +-version = "0.1.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ea1cd31036b732a546d845f9485c56b1b606b5e476b0821c680dd66c8cd6fcee" ++version = "0.1.1" ++source = "git+https://github.com/Smithay/libdisplay-info-rs?branch=feature%2F0.3.0#5b706d544d87f1bcae4c5ba97b281a8ab16754ed" + dependencies = [ + "proc-macro2", + "quote", +@@ -2924,9 +2922,8 @@ name = "libdisplay-info-sys" + + [[package]] + name = "libdisplay-info-sys" +-version = "0.2.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7f4f9264ece23c37ffa023ae635f48d588e1786745dad06dff10c9fb99dc646c" ++version = "0.3.0" ++source = "git+https://github.com/Smithay/libdisplay-info-rs?branch=feature%2F0.3.0#5b706d544d87f1bcae4c5ba97b281a8ab16754ed" + dependencies = [ + "semver", + "system-deps", +--- Cargo.toml.orig 2025-04-24 10:45:50 UTC ++++ Cargo.toml +@@ -118,6 +118,9 @@ lto = "fat" + [profile.release] + lto = "fat" + ++[ patch.crates-io] ++libdisplay-info = { git = "https://github.com/Smithay/libdisplay-info-rs", branch = "feature/0.3.0" } ++ + [patch."https://github.com/pop-os/cosmic-protocols"] + cosmic-protocols = { git = "https://github.com/pop-os//cosmic-protocols", branch = "main" } + cosmic-client-toolkit = { git = "https://github.com/pop-os//cosmic-protocols", branch = "main" } diff --git a/x11-wm/dwm/Makefile b/x11-wm/dwm/Makefile index a369c93ade2e..505c8f136527 100644 --- a/x11-wm/dwm/Makefile +++ b/x11-wm/dwm/Makefile @@ -1,5 +1,5 @@ PORTNAME= dwm -DISTVERSION= 6.5 +DISTVERSION= 6.6 CATEGORIES= x11-wm MASTER_SITES= http://dl.suckless.org/${PORTNAME}/ diff --git a/x11-wm/dwm/distinfo b/x11-wm/dwm/distinfo index d8815f2d4992..3c32fd1ff1ea 100644 --- a/x11-wm/dwm/distinfo +++ b/x11-wm/dwm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1710925191 -SHA256 (dwm-6.5.tar.gz) = 21d79ebfa9f2fb93141836c2666cb81f4784c69d64e7f1b2352f9b970ba09729 -SIZE (dwm-6.5.tar.gz) = 25588 +TIMESTAMP = 1757341412 +SHA256 (dwm-6.6.tar.gz) = 7cfc2c6d9386c07c49e2c906f209c18ba3364ce0b4872eae39f56efdb7fc00a3 +SIZE (dwm-6.6.tar.gz) = 26379 diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile index 58f5d2f65118..5dd22221e6be 100644 --- a/x11-wm/gamescope/Makefile +++ b/x11-wm/gamescope/Makefile @@ -1,6 +1,6 @@ PORTNAME= gamescope DISTVERSION= 3.13.8 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= x11-wm wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile index 196623dd407d..1bcefe7d7c5a 100644 --- a/x11-wm/hyprland/Makefile +++ b/x11-wm/hyprland/Makefile @@ -1,15 +1,11 @@ PORTNAME= hyprland DISTVERSIONPREFIX= v -DISTVERSION= 0.50.1 +DISTVERSION= 0.51.0 CATEGORIES= x11-wm wayland MASTER_SITES= https://github.com/hyprwm/Hyprland/releases/download/${DISTVERSIONFULL}/ DISTNAME= source-${DISTVERSIONFULL} DIST_SUBDIR= ${PORTNAME} -PATCH_SITES= https://github.com/hyprwm/Hyprland/commit/ -PATCHFILES+= ecc04e8ba7469fb01c5a066bf1c48d5cd58d1a18.patch:-p1 # avoid app hang -PATCHFILES+= 66a6ef3859255f2a21c1e902a4b5f56562e87041.patch:-p1 # see #10437 - MAINTAINER= tagattie@FreeBSD.org COMMENT= Dynamic tiling Wayland compositor that doesn't sacrifice on its looks #' WWW= https://hypr.land/ @@ -20,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ glaze>0:devel/glaze \ hyprwayland-scanner>=0.3.10:devel/hyprwayland-scanner \ - wayland-protocols>=1.43:graphics/wayland-protocols + wayland-protocols>=1.45:graphics/wayland-protocols LIB_DEPENDS= libhyprlang.so:devel/hyprlang \ libhyprutils.so:devel/hyprutils \ libinotify.so:devel/libinotify \ @@ -76,6 +72,8 @@ post-patch: # Respect consolekit2 as XDG_RUNTIME_DIR fallback @${REINPLACE_CMD} 's|/run/user|/var&|' \ ${WRKSRC}/hyprctl/main.cpp \ + ${WRKSRC}/hyprpm/src/core/HyprlandSocket.cpp \ + ${WRKSRC}/hyprtester/src/hyprctlCompat.cpp \ ${WRKSRC}/src/Compositor.cpp # Respect PREFIX for wallpapers @${REINPLACE_CMD} 's|/usr/share|${DATADIR:H}|' \ @@ -83,7 +81,11 @@ post-patch: # XXX Replace linprocfs(4) with sysctl(3) @${REINPLACE_CMD} -e 's|/proc|${LINUXBASE}&|g' \ ${WRKSRC}/src/desktop/Window.cpp \ - ${WRKSRC}/src/plugins/HookSystem.cpp + ${WRKSRC}/src/debug/HyprCtl.cpp \ + ${WRKSRC}/src/debug/CrashReporter.cpp \ + ${WRKSRC}/src/helpers/MiscFunctions.cpp \ + ${WRKSRC}/src/plugins/HookSystem.cpp \ + ${WRKSRC}/src/plugins/PluginAPI.cpp post-install: @${RM} ${STAGEDIR}${PREFIX}/bin/hyprland diff --git a/x11-wm/hyprland/distinfo b/x11-wm/hyprland/distinfo index f694d363d3c2..5c6e9ab0866e 100644 --- a/x11-wm/hyprland/distinfo +++ b/x11-wm/hyprland/distinfo @@ -1,7 +1,3 @@ -TIMESTAMP = 1753943980 -SHA256 (hyprland/source-v0.50.1.tar.gz) = 2e7280e08d9b0460159bdfcdebdf6c532a79843a6a1e8417f78c15f6293fc956 -SIZE (hyprland/source-v0.50.1.tar.gz) = 54239562 -SHA256 (hyprland/ecc04e8ba7469fb01c5a066bf1c48d5cd58d1a18.patch) = 47b1a8071e38a4e47237af604a736e5b11ea023a8b3c23bfb04b4e1fb30755f7 -SIZE (hyprland/ecc04e8ba7469fb01c5a066bf1c48d5cd58d1a18.patch) = 5564 -SHA256 (hyprland/66a6ef3859255f2a21c1e902a4b5f56562e87041.patch) = 321d2b75fa6a5062cfdc55d9a35500b55858b6d814f922ea8c5f8b18808b0317 -SIZE (hyprland/66a6ef3859255f2a21c1e902a4b5f56562e87041.patch) = 2217 +TIMESTAMP = 1757747353 +SHA256 (hyprland/source-v0.51.0.tar.gz) = 6f02fcde4f21286f8b36f19f491e4a987e5cc7e7d74f48271da31b85cec47fb7 +SIZE (hyprland/source-v0.51.0.tar.gz) = 54279784 diff --git a/x11-wm/hyprland/files/patch-hyprctl_main.cpp b/x11-wm/hyprland/files/patch-hyprctl_main.cpp index 25fc645e01a9..b1c28e23f453 100644 --- a/x11-wm/hyprland/files/patch-hyprctl_main.cpp +++ b/x11-wm/hyprland/files/patch-hyprctl_main.cpp @@ -1,6 +1,6 @@ ---- hyprctl/main.cpp.orig 2025-07-25 09:09:59 UTC +--- hyprctl/main.cpp.orig 2025-09-10 12:53:39 UTC +++ hyprctl/main.cpp -@@ -268,7 +268,7 @@ int requestIPC(std::string_view filename, std::string_ +@@ -270,7 +270,7 @@ int requestIPC(std::string_view filename, std::string_ sockaddr_un serverAddress = {0}; serverAddress.sun_family = AF_UNIX; diff --git a/x11-wm/hyprland/files/patch-hyprpm b/x11-wm/hyprland/files/patch-hyprpm deleted file mode 100644 index 308729eb409b..000000000000 --- a/x11-wm/hyprland/files/patch-hyprpm +++ /dev/null @@ -1,14 +0,0 @@ -Avoid hyprpm rebuilding Hyprland outside of ports - ---- hyprpm/src/core/PluginManager.cpp.orig 2024-04-14 18:48:28 UTC -+++ hyprpm/src/core/PluginManager.cpp -@@ -316,9 +316,6 @@ eHeadersErrors CPluginManager::headersValid() { - eHeadersErrors CPluginManager::headersValid() { - const auto HLVER = getHyprlandVersion(); - -- if (!std::filesystem::exists(DataState::getHeadersPath() + "/share/pkgconfig/hyprland.pc")) -- return HEADERS_MISSING; -- - // find headers commit - std::string cmd = std::format("PKG_CONFIG_PATH=\"{}/share/pkgconfig\" pkgconf --cflags --keep-system-cflags hyprland", DataState::getHeadersPath()); - auto headers = execAndGet(cmd.c_str()); diff --git a/x11-wm/hyprland/files/patch-hyprpm_src_core_PluginManager.cpp b/x11-wm/hyprland/files/patch-hyprpm_src_core_PluginManager.cpp new file mode 100644 index 000000000000..898c0e5b76c2 --- /dev/null +++ b/x11-wm/hyprland/files/patch-hyprpm_src_core_PluginManager.cpp @@ -0,0 +1,14 @@ +Avoid hyprpm rebuilding Hyprland outside of ports + +--- hyprpm/src/core/PluginManager.cpp.orig 2025-09-10 12:53:39 UTC ++++ hyprpm/src/core/PluginManager.cpp +@@ -391,9 +391,6 @@ eHeadersErrors CPluginManager::headersValid() { + eHeadersErrors CPluginManager::headersValid() { + const auto HLVER = getHyprlandVersion(false); + +- if (!std::filesystem::exists(DataState::getHeadersPath() + "/share/pkgconfig/hyprland.pc")) +- return HEADERS_MISSING; +- + // find headers commit + const std::string& cmd = std::format("PKG_CONFIG_PATH=\"{}/share/pkgconfig\" pkgconf --cflags --keep-system-cflags hyprland", DataState::getHeadersPath()); + auto headers = execAndGet(cmd); diff --git a/x11-wm/hyprland/files/patch-src_config_ConfigWatcher.cpp b/x11-wm/hyprland/files/patch-src_config_ConfigWatcher.cpp new file mode 100644 index 000000000000..3dc27808ece6 --- /dev/null +++ b/x11-wm/hyprland/files/patch-src_config_ConfigWatcher.cpp @@ -0,0 +1,10 @@ +--- src/config/ConfigWatcher.cpp.orig 2025-09-13 08:12:56 UTC ++++ src/config/ConfigWatcher.cpp +@@ -1,5 +1,7 @@ + #include "ConfigWatcher.hpp" ++#if defined(__linux__) + #include <linux/limits.h> ++#endif + #include <sys/inotify.h> + #include "../debug/Log.hpp" + #include <ranges> diff --git a/x11-wm/hyprland/files/patch-src_render_OpenGL.cpp b/x11-wm/hyprland/files/patch-src_render_OpenGL.cpp new file mode 100644 index 000000000000..5fea597d485e --- /dev/null +++ b/x11-wm/hyprland/files/patch-src_render_OpenGL.cpp @@ -0,0 +1,11 @@ +--- src/render/OpenGL.cpp.orig 2025-09-13 08:51:11 UTC ++++ src/render/OpenGL.cpp +@@ -2876,7 +2876,7 @@ void CHyprOpenGLImpl::ensureBackgroundTexturePresence( + static auto PNOWALLPAPER = CConfigValue<Hyprlang::INT>("misc:disable_hyprland_logo"); + static auto PFORCEWALLPAPER = CConfigValue<Hyprlang::INT>("misc:force_default_wallpaper"); + +- const auto FORCEWALLPAPER = std::clamp(*PFORCEWALLPAPER, -1L, 2L); ++ const auto FORCEWALLPAPER = std::clamp(*PFORCEWALLPAPER, static_cast<Hyprlang::INT>(-1), static_cast<Hyprlang::INT>(2)); + + if (*PNOWALLPAPER) + m_backgroundTexture.reset(); diff --git a/x11-wm/hyprland/pkg-plist b/x11-wm/hyprland/pkg-plist index 32f5cf3feb32..dbbe6af63d2e 100644 --- a/x11-wm/hyprland/pkg-plist +++ b/x11-wm/hyprland/pkg-plist @@ -7,6 +7,7 @@ include/hyprland/protocols/color-management-v1.hpp include/hyprland/protocols/content-type-v1.hpp include/hyprland/protocols/cursor-shape-v1.hpp include/hyprland/protocols/drm-lease-v1.hpp +include/hyprland/protocols/ext-data-control-v1.hpp include/hyprland/protocols/ext-foreign-toplevel-list-v1.hpp include/hyprland/protocols/ext-idle-notify-v1.hpp include/hyprland/protocols/ext-session-lock-v1.hpp @@ -28,6 +29,7 @@ include/hyprland/protocols/linux-dmabuf-v1.hpp include/hyprland/protocols/linux-drm-syncobj-v1.hpp include/hyprland/protocols/pointer-constraints-unstable-v1.hpp include/hyprland/protocols/pointer-gestures-unstable-v1.hpp +include/hyprland/protocols/pointer-warp-v1.hpp include/hyprland/protocols/presentation-time.hpp include/hyprland/protocols/primary-selection-unstable-v1.hpp include/hyprland/protocols/relative-pointer-unstable-v1.hpp @@ -128,7 +130,6 @@ include/hyprland/src/layout/IHyprLayout.hpp include/hyprland/src/layout/MasterLayout.hpp include/hyprland/src/macros.hpp include/hyprland/src/managers/ANRManager.hpp -include/hyprland/src/managers/AnimationManager.hpp include/hyprland/src/managers/CursorManager.hpp include/hyprland/src/managers/DonationNagManager.hpp include/hyprland/src/managers/EventManager.hpp @@ -143,12 +144,26 @@ include/hyprland/src/managers/TokenManager.hpp include/hyprland/src/managers/VersionKeeperManager.hpp include/hyprland/src/managers/XCursorManager.hpp include/hyprland/src/managers/XWaylandManager.hpp +include/hyprland/src/managers/animation/AnimationManager.hpp +include/hyprland/src/managers/animation/DesktopAnimationManager.hpp include/hyprland/src/managers/eventLoop/EventLoopManager.hpp include/hyprland/src/managers/eventLoop/EventLoopTimer.hpp include/hyprland/src/managers/input/InputManager.hpp include/hyprland/src/managers/input/InputMethodPopup.hpp include/hyprland/src/managers/input/InputMethodRelay.hpp include/hyprland/src/managers/input/TextInput.hpp +include/hyprland/src/managers/input/UnifiedWorkspaceSwipeGesture.hpp +include/hyprland/src/managers/input/trackpad/GestureTypes.hpp +include/hyprland/src/managers/input/trackpad/TrackpadGestures.hpp +include/hyprland/src/managers/input/trackpad/gestures/CloseGesture.hpp +include/hyprland/src/managers/input/trackpad/gestures/DispatcherGesture.hpp +include/hyprland/src/managers/input/trackpad/gestures/FloatGesture.hpp +include/hyprland/src/managers/input/trackpad/gestures/FullscreenGesture.hpp +include/hyprland/src/managers/input/trackpad/gestures/ITrackpadGesture.hpp +include/hyprland/src/managers/input/trackpad/gestures/MoveGesture.hpp +include/hyprland/src/managers/input/trackpad/gestures/ResizeGesture.hpp +include/hyprland/src/managers/input/trackpad/gestures/SpecialWorkspaceGesture.hpp +include/hyprland/src/managers/input/trackpad/gestures/WorkspaceSwipeGesture.hpp include/hyprland/src/managers/permissions/DynamicPermissionManager.hpp include/hyprland/src/pch/pch.hpp include/hyprland/src/plugins/HookSystem.hpp @@ -162,6 +177,7 @@ include/hyprland/src/protocols/CursorShape.hpp include/hyprland/src/protocols/DRMLease.hpp include/hyprland/src/protocols/DRMSyncobj.hpp include/hyprland/src/protocols/DataDeviceWlr.hpp +include/hyprland/src/protocols/ExtDataDevice.hpp include/hyprland/src/protocols/ExtWorkspace.hpp include/hyprland/src/protocols/FocusGrab.hpp include/hyprland/src/protocols/ForeignToplevel.hpp @@ -182,6 +198,7 @@ include/hyprland/src/protocols/OutputManagement.hpp include/hyprland/src/protocols/OutputPower.hpp include/hyprland/src/protocols/PointerConstraints.hpp include/hyprland/src/protocols/PointerGestures.hpp +include/hyprland/src/protocols/PointerWarp.hpp include/hyprland/src/protocols/PresentationTime.hpp include/hyprland/src/protocols/PrimarySelection.hpp include/hyprland/src/protocols/RelativePointer.hpp diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile index 7674aa6937fd..ae0f9cecadc2 100644 --- a/x11-wm/icewm/Makefile +++ b/x11-wm/icewm/Makefile @@ -1,5 +1,5 @@ PORTNAME= icewm -PORTVERSION= 3.8.2 +PORTVERSION= 3.9.0 CATEGORIES= x11-wm MASTER_SITES= https://github.com/ice-wm/icewm/releases/download/${PORTVERSION}/ @@ -19,7 +19,7 @@ USES= compiler:c++11-lang gmake gnome iconv:translit localbase \ perl5 pkgconfig shebangfix tar:lz xorg USE_GNOME= glib20 USE_PERL5= build -USE_XORG= ice sm x11 xcomposite xdamage xext xfixes xpm xrender +USE_XORG= ice sm x11 xcomposite xcursor xdamage xext xfixes xrender GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-icesound=oss SHEBANG_FILES= contrib/icewm-menu-xrandr diff --git a/x11-wm/icewm/distinfo b/x11-wm/icewm/distinfo index bc563679a928..4960c41e6306 100644 --- a/x11-wm/icewm/distinfo +++ b/x11-wm/icewm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1754243276 -SHA256 (icewm-3.8.2.tar.lz) = c64b1b7c8ee262a3c4796be57349a3198998564d70ed26f11e724e1b73d48394 -SIZE (icewm-3.8.2.tar.lz) = 1885515 +TIMESTAMP = 1756604769 +SHA256 (icewm-3.9.0.tar.lz) = 1323527a9a49db66e9ce7b08e6ec43c87700243432fc6679681df367c67b2dc0 +SIZE (icewm-3.9.0.tar.lz) = 1889065 diff --git a/x11-wm/magpie/Makefile b/x11-wm/magpie/Makefile index e36e4797e133..b32d6fbd094d 100644 --- a/x11-wm/magpie/Makefile +++ b/x11-wm/magpie/Makefile @@ -1,6 +1,5 @@ PORTNAME= magpie -DISTVERSION= 0.9.3 -PORTREVISION= 2 +DISTVERSION= 0.9.4 CATEGORIES= x11-wm budgie MASTER_SITES= BUDGIE @@ -13,8 +12,7 @@ LICENSE= GPLv2+ BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ gnome-settings-daemon>0:sysutils/gnome-settings-daemon \ gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas \ - xkeyboard-config>0:x11/xkeyboard-config \ - zenity>0:x11/zenity + xkeyboard-config>0:x11/xkeyboard-config LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3 \ libcanberra.so:audio/libcanberra \ libgudev-1.0.so:devel/libgudev \ @@ -22,37 +20,33 @@ LIB_DEPENDS= libcanberra-gtk3.so:audio/libcanberra-gtk3 \ libinput.so:x11/libinput \ libgbm.so:graphics/mesa-libs \ libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ libfribidi.so:converters/fribidi \ libgraphene-1.0.so:graphics/graphene \ libjson-glib-1.0.so:devel/json-glib \ libstartup-notification-1.so:x11/startup-notification \ libupower-glib.so:sysutils/upower \ libxkbcommon.so:x11/libxkbcommon \ - libxkbfile.so:x11/libxkbfile \ liblcms2.so:graphics/lcms2 \ libdbus-1.so:devel/dbus \ libcolord.so:graphics/colord RUN_DEPENDS= gnome-settings-daemon>0:sysutils/gnome-settings-daemon \ gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas \ - xkeyboard-config>0:x11/xkeyboard-config \ - zenity>0:x11/zenity + xkeyboard-config>0:x11/xkeyboard-config -USES= budgie compiler:c++0x gettext gl gnome localbase meson \ - pkgconfig tar:xz xorg +USES= budgie compiler:c++0x gettext-tools gl gnome localbase meson \ + pkgconfig python:build shebangfix tar:xz xorg USE_GL= egl gbm USE_GNOME= atk cairo gdkpixbuf glib20 gtk30 introspection:build USE_LDCONFIG= yes USE_XORG= ice sm x11 xau xcb xcomposite xcursor xdamage xext xfixes xi \ - xinerama xrandr xrender xtst -MESON_ARGS= -Dopengl_libname=libGL.so \ - -Dgles2_libname=libGLESv2 \ - -Dsystemd=false \ + xinerama xkbfile xrandr xrender xtst +MESON_ARGS= -Dsystemd=false \ -Dnative_backend=false \ -Dremote_desktop=false \ -Dlibwacom=false \ -Dprofiler=false CFLAGS+= -Wno-format-nonliteral CPPFLAGS+= -fno-omit-frame-pointer +SHEBANG_FILES= tools/get-state.py .include <bsd.port.mk> diff --git a/x11-wm/magpie/distinfo b/x11-wm/magpie/distinfo index 2b69ad1fb211..8f7be527a417 100644 --- a/x11-wm/magpie/distinfo +++ b/x11-wm/magpie/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1693661625 -SHA256 (budgie/magpie-0.9.3.tar.xz) = 99060cefe4684be05daf8e82b414b78d15cbe2c723993db902681ab4017bbbe9 -SIZE (budgie/magpie-0.9.3.tar.xz) = 2781152 +TIMESTAMP = 1757326351 +SHA256 (budgie/magpie-0.9.4.tar.xz) = 348a572a78e6f199761fa45ebc2a7a8bbf267b8960d32cc4bf6fd4e6012dabdb +SIZE (budgie/magpie-0.9.4.tar.xz) = 2782796 diff --git a/x11-wm/magpie/files/patch-src_backends_meta-stage-impl.c b/x11-wm/magpie/files/patch-src_backends_meta-stage-impl.c deleted file mode 100644 index 65ccd7e0e4f0..000000000000 --- a/x11-wm/magpie/files/patch-src_backends_meta-stage-impl.c +++ /dev/null @@ -1,17 +0,0 @@ ---- src/backends/meta-stage-impl.c.orig 2023-02-13 18:12:26 UTC -+++ src/backends/meta-stage-impl.c -@@ -551,10 +551,14 @@ meta_stage_impl_redraw_view_primary (MetaStageImpl - * artefacts. - */ - /* swap_region does not need damage history, set it up before that */ -+#if 0 - if (use_clipped_redraw) - swap_region = cairo_region_copy (fb_clip_region); - else - swap_region = cairo_region_create (); -+#else -+ swap_region = cairo_region_copy (fb_clip_region); -+#endif - - swap_with_damage = FALSE; - if (has_buffer_age) diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile index bdf12a7da83c..380bad501064 100644 --- a/x11-wm/metacity/Makefile +++ b/x11-wm/metacity/Makefile @@ -1,5 +1,5 @@ PORTNAME= metacity -PORTVERSION= 3.56.0 +PORTVERSION= 3.57.1 CATEGORIES= x11-wm MASTER_SITES= GNOME DIST_SUBDIR= gnome @@ -10,15 +10,13 @@ WWW= https://gitlab.gnome.org/GNOME/metacity LICENSE= GPLv2 -BUILD_DEPENDS= gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas \ - zenity>0:x11/zenity +BUILD_DEPENDS= gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas LIB_DEPENDS= libcanberra.so:audio/libcanberra \ libcanberra-gtk3.so:audio/libcanberra-gtk3 \ libharfbuzz.so:print/harfbuzz \ libgtop-2.0.so:devel/libgtop \ libstartup-notification-1.so:x11/startup-notification -RUN_DEPENDS= gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas \ - zenity>0:x11/zenity +RUN_DEPENDS= gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas USES= compiler:c11 gettext gmake gnome libtool localbase pathfix \ pkgconfig tar:xz xorg diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo index 07b9488b6562..191e4798a366 100644 --- a/x11-wm/metacity/distinfo +++ b/x11-wm/metacity/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749549249 -SHA256 (gnome/metacity-3.56.0.tar.xz) = 7554997104b26ff0e79a02b37a2ba189bdf4e7ccd54226f0faf4b1a59006c901 -SIZE (gnome/metacity-3.56.0.tar.xz) = 1749348 +TIMESTAMP = 1756037975 +SHA256 (gnome/metacity-3.57.1.tar.xz) = 1293a26e4dedfd4bf200b5bb788673008979ae3ac6d3053f7db481b87acc7cde +SIZE (gnome/metacity-3.57.1.tar.xz) = 1756412 diff --git a/x11-wm/metacity/files/patch-data_Makefile.in b/x11-wm/metacity/files/patch-data_Makefile.in new file mode 100644 index 000000000000..bd0cef865b54 --- /dev/null +++ b/x11-wm/metacity/files/patch-data_Makefile.in @@ -0,0 +1,10 @@ +--- data/Makefile.in.orig 2025-08-23 09:46:51 UTC ++++ data/Makefile.in +@@ -381,7 +381,6 @@ SUBDIRS = \ + keybindings \ + pkgconfig \ + schemas \ +- systemd \ + ui \ + $(NULL) + diff --git a/x11-wm/metacity/pkg-descr b/x11-wm/metacity/pkg-descr index fb1cb52b9383..e09ba9d7a359 100644 --- a/x11-wm/metacity/pkg-descr +++ b/x11-wm/metacity/pkg-descr @@ -1,4 +1,4 @@ -Metacity is a low-frills Window Manager, and is the default -Window Manager of the GNOME 2 desktop. It provides most of -the features expected of a Window Manager, but leaves everything -it can up to other components of the GNOME environment. +Metacity is a simple compositing window manager that integrates nicely +with GNOME Flashback. +It uses GTK+ 3 for drawing window frames, so that it inherits colors, +fonts, and so on from the GTK+ theme. diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist index dc8e01275b97..695d881d9659 100644 --- a/x11-wm/metacity/pkg-plist +++ b/x11-wm/metacity/pkg-plist @@ -8,8 +8,9 @@ include/metacity/libmetacity/meta-frame-enums.h include/metacity/libmetacity/meta-theme.h lib/libmetacity.so lib/libmetacity.so.3 -lib/libmetacity.so.%%GTK3_VERSION%% +lib/libmetacity.so.3.0.0 libdata/pkgconfig/libmetacity.pc +libexec/metacity-dialog share/applications/metacity.desktop share/gnome-control-center/keybindings/50-metacity-navigation.xml share/gnome-control-center/keybindings/50-metacity-system.xml diff --git a/x11-wm/mutter/Makefile b/x11-wm/mutter/Makefile index 64dbb63ff254..f20c6fe427a2 100644 --- a/x11-wm/mutter/Makefile +++ b/x11-wm/mutter/Makefile @@ -1,5 +1,5 @@ PORTNAME= mutter -PORTVERSION= 47.9 +PORTVERSION= 47.10 CATEGORIES= x11-wm MASTER_SITES= GNOME DIST_SUBDIR= gnome @@ -25,7 +25,6 @@ LIB_DEPENDS= libcanberra.so:audio/libcanberra \ libpipewire-0.3.so:multimedia/pipewire \ libstartup-notification-1.so:x11/startup-notification \ libxkbcommon.so:x11/libxkbcommon \ - libxkbfile.so:x11/libxkbfile \ liblcms2.so:graphics/lcms2 \ libcolord.so:graphics/colord \ libharfbuzz.so:print/harfbuzz \ @@ -35,12 +34,12 @@ RUN_DEPENDS= gnome-settings-daemon>0:sysutils/gnome-settings-daemon \ gsettings-desktop-schemas>0:devel/gsettings-desktop-schemas \ xkeyboard-config>0:x11/xkeyboard-config -USES= compiler:c++0x gettext gl gnome localbase meson pkgconfig \ - tar:xz xorg +USES= compiler:c++0x gettext-tools gl gnome localbase meson \ + pkgconfig tar:xz xorg USE_GL= egl gbm USE_GNOME= atk cairo gdkpixbuf gnomedesktop4 gtk40 introspection:build USE_XORG= ice pixman sm x11 xcb xcomposite xcursor xdamage xext \ - xfixes xi xinerama xrandr xrender xtst + xfixes xi xinerama xkbfile xrandr xrender xtst USE_LDCONFIG= yes PORTSCOUT= limit:^47\. @@ -58,10 +57,6 @@ MESON_ARGS= -Dlibdisplay_info=enabled \ -Dmutter_tests=false \ -Dinstalled_tests=false -# Required by embedded cogl/clutter forks. -MESON_ARGS+= -Dgles2_libname=libGLESv2 \ - -Dopengl_libname=libGL.so - GLIB_SCHEMAS= org.gnome.mutter.gschema.xml \ org.gnome.mutter.wayland.gschema.xml diff --git a/x11-wm/mutter/distinfo b/x11-wm/mutter/distinfo index bb5b3091b85b..f242775e85e2 100644 --- a/x11-wm/mutter/distinfo +++ b/x11-wm/mutter/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1751313716 -SHA256 (gnome/mutter-47.9.tar.xz) = 28a7cfb01ecacaa2137c278e8934b9ef83f3e37e8ca8cfda61b38ec268755615 -SIZE (gnome/mutter-47.9.tar.xz) = 6860464 +TIMESTAMP = 1757846665 +SHA256 (gnome/mutter-47.10.tar.xz) = ee8a583c2b6ff309b501dc97e7c0b4f11d6197a9529ed22247ee95e89663e969 +SIZE (gnome/mutter-47.10.tar.xz) = 6860276 diff --git a/x11-wm/niri/Makefile b/x11-wm/niri/Makefile index 7895652e9a6a..f8f42f2a303e 100644 --- a/x11-wm/niri/Makefile +++ b/x11-wm/niri/Makefile @@ -1,7 +1,7 @@ PORTNAME= niri DISTVERSIONPREFIX= v DISTVERSION= 25.08 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org diff --git a/x11-wm/niri/Makefile.crates b/x11-wm/niri/Makefile.crates index 373506a3277c..2e6e0f7b71d7 100644 --- a/x11-wm/niri/Makefile.crates +++ b/x11-wm/niri/Makefile.crates @@ -204,9 +204,6 @@ CARGO_CRATES= accesskit-0.21.0 \ libadwaita-0.7.2 \ libadwaita-sys-0.7.2 \ libc-0.2.175 \ - libdisplay-info-0.2.2 \ - libdisplay-info-derive-0.1.0 \ - libdisplay-info-sys-0.2.2 \ libloading-0.8.8 \ libm-0.2.15 \ libredox-0.1.9 \ @@ -506,5 +503,6 @@ CARGO_CRATES= accesskit-0.21.0 \ zvariant-5.7.0 \ zvariant_derive-5.7.0 \ zvariant_utils-3.2.1 \ + libdisplay-info,libdisplay-info-derive,libdisplay-info-sys@git+https://github.com/Smithay/libdisplay-info-rs?branch=feature/0.3.0\#5b706d544d87f1bcae4c5ba97b281a8ab16754ed \ libspa,libspa-sys,pipewire,pipewire-sys@git+https://gitlab.freedesktop.org/pipewire/pipewire-rs.git\#93138d01b23628521b29b5604bbebe991cba4c65 \ smithay,smithay-drm-extras@git+https://github.com/Smithay/smithay.git\#20d2dacd71394b5f96f6ace0a70a6f20dc62c0c6 diff --git a/x11-wm/niri/distinfo b/x11-wm/niri/distinfo index b156e1fdae45..0e7649d8dbeb 100644 --- a/x11-wm/niri/distinfo +++ b/x11-wm/niri/distinfo @@ -411,12 +411,6 @@ SHA256 (rust/crates/libadwaita-sys-0.7.2.crate) = 6680988058c2558baf3f548a370e4e SIZE (rust/crates/libadwaita-sys-0.7.2.crate) = 35416 SHA256 (rust/crates/libc-0.2.175.crate) = 6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543 SIZE (rust/crates/libc-0.2.175.crate) = 788728 -SHA256 (rust/crates/libdisplay-info-0.2.2.crate) = 4210cfe93a0dc37228e08105e3c13171e5af816f7bd39e00e3d3adcf2b487a2b -SIZE (rust/crates/libdisplay-info-0.2.2.crate) = 34625 -SHA256 (rust/crates/libdisplay-info-derive-0.1.0.crate) = ea1cd31036b732a546d845f9485c56b1b606b5e476b0821c680dd66c8cd6fcee -SIZE (rust/crates/libdisplay-info-derive-0.1.0.crate) = 3601 -SHA256 (rust/crates/libdisplay-info-sys-0.2.2.crate) = 7f4f9264ece23c37ffa023ae635f48d588e1786745dad06dff10c9fb99dc646c -SIZE (rust/crates/libdisplay-info-sys-0.2.2.crate) = 26200 SHA256 (rust/crates/libloading-0.8.8.crate) = 07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667 SIZE (rust/crates/libloading-0.8.8.crate) = 31345 SHA256 (rust/crates/libm-0.2.15.crate) = f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de @@ -1015,6 +1009,8 @@ SHA256 (rust/crates/zvariant_derive-5.7.0.crate) = 6643fd0b26a46d226bd90d3f07c1b SIZE (rust/crates/zvariant_derive-5.7.0.crate) = 14214 SHA256 (rust/crates/zvariant_utils-3.2.1.crate) = c6949d142f89f6916deca2232cf26a8afacf2b9fdc35ce766105e104478be599 SIZE (rust/crates/zvariant_utils-3.2.1.crate) = 14678 +SHA256 (Smithay-libdisplay-info-rs-5b706d544d87f1bcae4c5ba97b281a8ab16754ed_GH0.tar.gz) = 1f61882dcb638b790369d1f09e41ec4b4d24ec15abef2abf3b00e01399121ab5 +SIZE (Smithay-libdisplay-info-rs-5b706d544d87f1bcae4c5ba97b281a8ab16754ed_GH0.tar.gz) = 119266 SHA256 (pipewire-pipewire-rs-93138d01b23628521b29b5604bbebe991cba4c65_GL0.tar.gz) = dc041defb2be7288e87d5a91f0a1f9960461e850b2c2b09f4afbedf371ea39db SIZE (pipewire-pipewire-rs-93138d01b23628521b29b5604bbebe991cba4c65_GL0.tar.gz) = 114280 SHA256 (Smithay-smithay-20d2dacd71394b5f96f6ace0a70a6f20dc62c0c6_GH0.tar.gz) = 1a97be0d3ac477a92c54547cc912ecb8452272d7d8a8435198e53129b6e5aa6c diff --git a/x11-wm/niri/files/patch-libdisplay-info-0.3 b/x11-wm/niri/files/patch-libdisplay-info-0.3 new file mode 100644 index 000000000000..b4d40b1e5d8c --- /dev/null +++ b/x11-wm/niri/files/patch-libdisplay-info-0.3 @@ -0,0 +1,52 @@ +https://github.com/Smithay/libdisplay-info-rs/pull/17 + +--- Cargo.lock.orig 2025-08-30 12:18:41 UTC ++++ Cargo.lock +@@ -2082,9 +2082,8 @@ name = "libdisplay-info" + + [[package]] + name = "libdisplay-info" +-version = "0.2.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4210cfe93a0dc37228e08105e3c13171e5af816f7bd39e00e3d3adcf2b487a2b" ++version = "0.2.3" ++source = "git+https://github.com/Smithay/libdisplay-info-rs?branch=feature/0.3.0#5b706d544d87f1bcae4c5ba97b281a8ab16754ed" + dependencies = [ + "bitflags 2.9.3", + "libc", +@@ -2095,9 +2094,8 @@ name = "libdisplay-info-derive" + + [[package]] + name = "libdisplay-info-derive" +-version = "0.1.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ea1cd31036b732a546d845f9485c56b1b606b5e476b0821c680dd66c8cd6fcee" ++version = "0.1.1" ++source = "git+https://github.com/Smithay/libdisplay-info-rs?branch=feature/0.3.0#5b706d544d87f1bcae4c5ba97b281a8ab16754ed" + dependencies = [ + "proc-macro2", + "quote", +@@ -2106,9 +2104,8 @@ name = "libdisplay-info-sys" + + [[package]] + name = "libdisplay-info-sys" +-version = "0.2.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7f4f9264ece23c37ffa023ae635f48d588e1786745dad06dff10c9fb99dc646c" ++version = "0.3.0" ++source = "git+https://github.com/Smithay/libdisplay-info-rs?branch=feature/0.3.0#5b706d544d87f1bcae4c5ba97b281a8ab16754ed" + dependencies = [ + "semver", + "system-deps", +--- Cargo.toml.orig 2025-08-30 12:18:41 UTC ++++ Cargo.toml +@@ -124,6 +124,9 @@ xshell = "0.2.7" + wayland-client = "0.31.11" + xshell = "0.2.7" + ++[patch.crates-io] ++libdisplay-info = { git = "https://github.com/Smithay/libdisplay-info-rs", branch = "feature/0.3.0" } ++ + [features] + default = ["dbus", "systemd", "xdp-gnome-screencast"] + # Enables D-Bus support (serve various freedesktop and GNOME interfaces, accessibility tree, power button handling). diff --git a/x11-wm/plasma6-kdecoration/distinfo b/x11-wm/plasma6-kdecoration/distinfo index 4df26127d0b8..2d791daa3f5d 100644 --- a/x11-wm/plasma6-kdecoration/distinfo +++ b/x11-wm/plasma6-kdecoration/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1754413483 -SHA256 (KDE/plasma/6.4.4/kdecoration-6.4.4.tar.xz) = a02ac71ea8ee7ad6ab34578f1b50f32b91347a05a932cfc50b253729ccadee6f -SIZE (KDE/plasma/6.4.4/kdecoration-6.4.4.tar.xz) = 58072 +TIMESTAMP = 1757499251 +SHA256 (KDE/plasma/6.4.5/kdecoration-6.4.5.tar.xz) = f9d3ec4256cf7125a3b0bc08c7737af715235d5c22b69ba29797bb06c5ef4a4c +SIZE (KDE/plasma/6.4.5/kdecoration-6.4.5.tar.xz) = 58076 diff --git a/x11-wm/plasma6-kwin-x11/Makefile b/x11-wm/plasma6-kwin-x11/Makefile index 67f0609af93c..b3c51eb1e30d 100644 --- a/x11-wm/plasma6-kwin-x11/Makefile +++ b/x11-wm/plasma6-kwin-x11/Makefile @@ -1,5 +1,6 @@ PORTNAME= kwin-x11 DISTVERSION= ${KDE_PLASMA_VERSION} +PORTREVISION= 1 CATEGORIES= x11-wm kde kde-plasma COMMENT= Easy to use, but flexible, X Window Manager diff --git a/x11-wm/plasma6-kwin-x11/distinfo b/x11-wm/plasma6-kwin-x11/distinfo index 219bb3c878a6..d3c3c420303d 100644 --- a/x11-wm/plasma6-kwin-x11/distinfo +++ b/x11-wm/plasma6-kwin-x11/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1754413484 -SHA256 (KDE/plasma/6.4.4/kwin-x11-6.4.4.tar.xz) = 987e207c2f2ab60e51421b5846ca03e69ef875ac20698022f5e8bdd1e1055ed9 -SIZE (KDE/plasma/6.4.4/kwin-x11-6.4.4.tar.xz) = 6876908 +TIMESTAMP = 1757499252 +SHA256 (KDE/plasma/6.4.5/kwin-x11-6.4.5.tar.xz) = cea91879467afdfa2caf0ec6dd7256eae78defa970cdc9a947fefd85d417acb1 +SIZE (KDE/plasma/6.4.5/kwin-x11-6.4.5.tar.xz) = 6881776 diff --git a/x11-wm/plasma6-kwin/Makefile b/x11-wm/plasma6-kwin/Makefile index 46c991f6d722..6c35fb468bbe 100644 --- a/x11-wm/plasma6-kwin/Makefile +++ b/x11-wm/plasma6-kwin/Makefile @@ -29,8 +29,6 @@ LIB_DEPENDS= libdisplay-info.so:sysutils/libdisplay-info \ RUN_DEPENDS= hwdata>0:misc/hwdata \ Xwayland:x11-servers/xwayland -CONFLICTS_INSTALL= theseus-ship # bin/kwin_wayland - USES= cmake gettext gl kde:6 pkgconfig python qt:6 shebangfix tar:xz \ xorg USE_GL= egl gbm gl opengl @@ -45,9 +43,12 @@ USE_KDE= activities attica auth colorscheme config \ USE_QT= base declarative multimedia sensors tools wayland USE_XORG= ice sm x11 xcb xext xi +DATADIR= ${PREFIX}/share/kwin-wayland BINARY_ALIAS= python3=${PYTHON_CMD} SHEBANG_FILES= src/plugins/strip-effect-metadata.py +CONFLICTS_INSTALL= theseus-ship # bin/kwin_wayland + OPTIONS_DEFINE= EI OPTIONS_DEFAULT= EI OPTIONS_SUB= yes diff --git a/x11-wm/plasma6-kwin/distinfo b/x11-wm/plasma6-kwin/distinfo index ae24fb0d7962..1cb84eb56f66 100644 --- a/x11-wm/plasma6-kwin/distinfo +++ b/x11-wm/plasma6-kwin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1754413484 -SHA256 (KDE/plasma/6.4.4/kwin-6.4.4.tar.xz) = b0742a12133b052519cb5af09132114ebf4d96b44e320015cc0d2d0bf055dae6 -SIZE (KDE/plasma/6.4.4/kwin-6.4.4.tar.xz) = 8778800 +TIMESTAMP = 1757499252 +SHA256 (KDE/plasma/6.4.5/kwin-6.4.5.tar.xz) = decf1cb79127c285c7eda768e7ff4f97c72f314735c82685758f0b956ac151f7 +SIZE (KDE/plasma/6.4.5/kwin-6.4.5.tar.xz) = 8792000 diff --git a/x11-wm/plasma6-kwin/pkg-plist b/x11-wm/plasma6-kwin/pkg-plist index 15bf02486b8d..85865349c944 100644 --- a/x11-wm/plasma6-kwin/pkg-plist +++ b/x11-wm/plasma6-kwin/pkg-plist @@ -729,116 +729,116 @@ share/knsrcfiles/kwinscripts.knsrc share/knsrcfiles/kwinswitcher.knsrc share/knsrcfiles/window-decorations.knsrc share/krunner/dbusplugins/kwin-runner-windows.desktop -%%DATADIR%%-wayland/builtin-effects/blendchanges.json -%%DATADIR%%-wayland/builtin-effects/blur.json -%%DATADIR%%-wayland/builtin-effects/colorblindnesscorrection.json -%%DATADIR%%-wayland/builtin-effects/colorpicker.json -%%DATADIR%%-wayland/builtin-effects/contrast.json -%%DATADIR%%-wayland/builtin-effects/diminactive.json -%%DATADIR%%-wayland/builtin-effects/fallapart.json -%%DATADIR%%-wayland/builtin-effects/glide.json -%%DATADIR%%-wayland/builtin-effects/hidecursor.json -%%DATADIR%%-wayland/builtin-effects/highlightwindow.json -%%DATADIR%%-wayland/builtin-effects/invert.json -%%DATADIR%%-wayland/builtin-effects/kscreen.json -%%DATADIR%%-wayland/builtin-effects/magiclamp.json -%%DATADIR%%-wayland/builtin-effects/magnifier.json -%%DATADIR%%-wayland/builtin-effects/mouseclick.json -%%DATADIR%%-wayland/builtin-effects/mousemark.json -%%DATADIR%%-wayland/builtin-effects/outputlocator.json -%%DATADIR%%-wayland/builtin-effects/overview.json -%%DATADIR%%-wayland/builtin-effects/screenedge.json -%%DATADIR%%-wayland/builtin-effects/screenshot.json -%%DATADIR%%-wayland/builtin-effects/screentransform.json -%%DATADIR%%-wayland/builtin-effects/shakecursor.json -%%DATADIR%%-wayland/builtin-effects/sheet.json -%%DATADIR%%-wayland/builtin-effects/showcompositing.json -%%DATADIR%%-wayland/builtin-effects/showfps.json -%%DATADIR%%-wayland/builtin-effects/showpaint.json -%%DATADIR%%-wayland/builtin-effects/slide.json -%%DATADIR%%-wayland/builtin-effects/slideback.json -%%DATADIR%%-wayland/builtin-effects/slidingpopups.json -%%DATADIR%%-wayland/builtin-effects/startupfeedback.json -%%DATADIR%%-wayland/builtin-effects/systembell.json -%%DATADIR%%-wayland/builtin-effects/thumbnailaside.json -%%DATADIR%%-wayland/builtin-effects/tileseditor.json -%%DATADIR%%-wayland/builtin-effects/touchpoints.json -%%DATADIR%%-wayland/builtin-effects/trackmouse.json -%%DATADIR%%-wayland/builtin-effects/windowview.json -%%DATADIR%%-wayland/builtin-effects/wobblywindows.json -%%DATADIR%%-wayland/builtin-effects/zoom.json -%%DATADIR%%-wayland/effects/dialogparent/contents/code/main.js -%%DATADIR%%-wayland/effects/dialogparent/metadata.json -%%DATADIR%%-wayland/effects/dimscreen/contents/code/main.js -%%DATADIR%%-wayland/effects/dimscreen/metadata.json -%%DATADIR%%-wayland/effects/eyeonscreen/contents/code/main.js -%%DATADIR%%-wayland/effects/eyeonscreen/metadata.json -%%DATADIR%%-wayland/effects/fade/contents/code/main.js -%%DATADIR%%-wayland/effects/fade/contents/config/main.xml -%%DATADIR%%-wayland/effects/fade/metadata.json -%%DATADIR%%-wayland/effects/fadedesktop/contents/code/main.js -%%DATADIR%%-wayland/effects/fadedesktop/contents/config/main.xml -%%DATADIR%%-wayland/effects/fadedesktop/contents/ui/config.ui -%%DATADIR%%-wayland/effects/fadedesktop/metadata.json -%%DATADIR%%-wayland/effects/fadingpopups/contents/code/main.js -%%DATADIR%%-wayland/effects/fadingpopups/metadata.json -%%DATADIR%%-wayland/effects/frozenapp/contents/code/main.js -%%DATADIR%%-wayland/effects/frozenapp/metadata.json -%%DATADIR%%-wayland/effects/fullscreen/contents/code/main.js -%%DATADIR%%-wayland/effects/fullscreen/metadata.json -%%DATADIR%%-wayland/effects/login/contents/code/main.js -%%DATADIR%%-wayland/effects/login/contents/config/main.xml -%%DATADIR%%-wayland/effects/login/contents/ui/config.ui -%%DATADIR%%-wayland/effects/login/metadata.json -%%DATADIR%%-wayland/effects/logout/contents/code/main.js -%%DATADIR%%-wayland/effects/logout/metadata.json -%%DATADIR%%-wayland/effects/maximize/contents/code/main.js -%%DATADIR%%-wayland/effects/maximize/metadata.json -%%DATADIR%%-wayland/effects/outputlocator/qml/OutputLabel.qml -%%DATADIR%%-wayland/effects/scale/contents/code/main.js -%%DATADIR%%-wayland/effects/scale/contents/config/main.xml -%%DATADIR%%-wayland/effects/scale/contents/ui/config.ui -%%DATADIR%%-wayland/effects/scale/metadata.json -%%DATADIR%%-wayland/effects/sessionquit/contents/code/main.js -%%DATADIR%%-wayland/effects/sessionquit/metadata.json -%%DATADIR%%-wayland/effects/showcompositing/qml/main.qml -%%DATADIR%%-wayland/effects/showfps/qml/main-fallback.qml -%%DATADIR%%-wayland/effects/showfps/qml/main.qml -%%DATADIR%%-wayland/effects/squash/contents/code/main.js -%%DATADIR%%-wayland/effects/squash/metadata.json -%%DATADIR%%-wayland/effects/tileseditor/qml/ResizeCorner.qml -%%DATADIR%%-wayland/effects/tileseditor/qml/ResizeHandle.qml -%%DATADIR%%-wayland/effects/tileseditor/qml/TileDelegate.qml -%%DATADIR%%-wayland/effects/tileseditor/qml/layouts.svg -%%DATADIR%%-wayland/effects/tileseditor/qml/main.qml -%%DATADIR%%-wayland/effects/translucency/contents/code/main.js -%%DATADIR%%-wayland/effects/translucency/contents/config/main.xml -%%DATADIR%%-wayland/effects/translucency/contents/ui/config.ui -%%DATADIR%%-wayland/effects/translucency/metadata.json -%%DATADIR%%-wayland/effects/windowaperture/contents/code/main.js -%%DATADIR%%-wayland/effects/windowaperture/metadata.json -%%DATADIR%%-wayland/effects/windowview/qml/main.qml -%%DATADIR%%-wayland/frames/plasma/frame_none.qml -%%DATADIR%%-wayland/frames/plasma/frame_styled.qml -%%DATADIR%%-wayland/frames/plasma/frame_unstyled.qml -%%DATADIR%%-wayland/onscreennotification/plasma/dummydata/osd.qml -%%DATADIR%%-wayland/onscreennotification/plasma/main.qml -%%DATADIR%%-wayland/outline/plasma/outline.qml -%%DATADIR%%-wayland/scripts/desktopchangeosd/contents/ui/main.qml -%%DATADIR%%-wayland/scripts/desktopchangeosd/contents/ui/osd.qml -%%DATADIR%%-wayland/scripts/desktopchangeosd/metadata.json -%%DATADIR%%-wayland/scripts/minimizeall/contents/code/main.js -%%DATADIR%%-wayland/scripts/minimizeall/metadata.json -%%DATADIR%%-wayland/scripts/synchronizeskipswitcher/contents/code/main.js -%%DATADIR%%-wayland/scripts/synchronizeskipswitcher/metadata.json -%%DATADIR%%-wayland/scripts/videowall/contents/code/main.js -%%DATADIR%%-wayland/scripts/videowall/contents/config/main.xml -%%DATADIR%%-wayland/scripts/videowall/contents/ui/config.ui -%%DATADIR%%-wayland/scripts/videowall/metadata.json -%%DATADIR%%-wayland/tabbox/thumbnail_grid/contents/ui/main.qml -%%DATADIR%%-wayland/tabbox/thumbnail_grid/metadata.json -%%DATADIR%%-wayland/tm_inner.png -%%DATADIR%%-wayland/tm_outer.png +%%DATADIR%%/builtin-effects/blendchanges.json +%%DATADIR%%/builtin-effects/blur.json +%%DATADIR%%/builtin-effects/colorblindnesscorrection.json +%%DATADIR%%/builtin-effects/colorpicker.json +%%DATADIR%%/builtin-effects/contrast.json +%%DATADIR%%/builtin-effects/diminactive.json +%%DATADIR%%/builtin-effects/fallapart.json +%%DATADIR%%/builtin-effects/glide.json +%%DATADIR%%/builtin-effects/hidecursor.json +%%DATADIR%%/builtin-effects/highlightwindow.json +%%DATADIR%%/builtin-effects/invert.json +%%DATADIR%%/builtin-effects/kscreen.json +%%DATADIR%%/builtin-effects/magiclamp.json +%%DATADIR%%/builtin-effects/magnifier.json +%%DATADIR%%/builtin-effects/mouseclick.json +%%DATADIR%%/builtin-effects/mousemark.json +%%DATADIR%%/builtin-effects/outputlocator.json +%%DATADIR%%/builtin-effects/overview.json +%%DATADIR%%/builtin-effects/screenedge.json +%%DATADIR%%/builtin-effects/screenshot.json +%%DATADIR%%/builtin-effects/screentransform.json +%%DATADIR%%/builtin-effects/shakecursor.json +%%DATADIR%%/builtin-effects/sheet.json +%%DATADIR%%/builtin-effects/showcompositing.json +%%DATADIR%%/builtin-effects/showfps.json +%%DATADIR%%/builtin-effects/showpaint.json +%%DATADIR%%/builtin-effects/slide.json +%%DATADIR%%/builtin-effects/slideback.json +%%DATADIR%%/builtin-effects/slidingpopups.json +%%DATADIR%%/builtin-effects/startupfeedback.json +%%DATADIR%%/builtin-effects/systembell.json +%%DATADIR%%/builtin-effects/thumbnailaside.json +%%DATADIR%%/builtin-effects/tileseditor.json +%%DATADIR%%/builtin-effects/touchpoints.json +%%DATADIR%%/builtin-effects/trackmouse.json +%%DATADIR%%/builtin-effects/windowview.json +%%DATADIR%%/builtin-effects/wobblywindows.json +%%DATADIR%%/builtin-effects/zoom.json +%%DATADIR%%/effects/dialogparent/contents/code/main.js +%%DATADIR%%/effects/dialogparent/metadata.json +%%DATADIR%%/effects/dimscreen/contents/code/main.js +%%DATADIR%%/effects/dimscreen/metadata.json +%%DATADIR%%/effects/eyeonscreen/contents/code/main.js +%%DATADIR%%/effects/eyeonscreen/metadata.json +%%DATADIR%%/effects/fade/contents/code/main.js +%%DATADIR%%/effects/fade/contents/config/main.xml +%%DATADIR%%/effects/fade/metadata.json +%%DATADIR%%/effects/fadedesktop/contents/code/main.js +%%DATADIR%%/effects/fadedesktop/contents/config/main.xml +%%DATADIR%%/effects/fadedesktop/contents/ui/config.ui +%%DATADIR%%/effects/fadedesktop/metadata.json +%%DATADIR%%/effects/fadingpopups/contents/code/main.js +%%DATADIR%%/effects/fadingpopups/metadata.json +%%DATADIR%%/effects/frozenapp/contents/code/main.js +%%DATADIR%%/effects/frozenapp/metadata.json +%%DATADIR%%/effects/fullscreen/contents/code/main.js +%%DATADIR%%/effects/fullscreen/metadata.json +%%DATADIR%%/effects/login/contents/code/main.js +%%DATADIR%%/effects/login/contents/config/main.xml +%%DATADIR%%/effects/login/contents/ui/config.ui +%%DATADIR%%/effects/login/metadata.json +%%DATADIR%%/effects/logout/contents/code/main.js +%%DATADIR%%/effects/logout/metadata.json +%%DATADIR%%/effects/maximize/contents/code/main.js +%%DATADIR%%/effects/maximize/metadata.json +%%DATADIR%%/effects/outputlocator/qml/OutputLabel.qml +%%DATADIR%%/effects/scale/contents/code/main.js +%%DATADIR%%/effects/scale/contents/config/main.xml +%%DATADIR%%/effects/scale/contents/ui/config.ui +%%DATADIR%%/effects/scale/metadata.json +%%DATADIR%%/effects/sessionquit/contents/code/main.js +%%DATADIR%%/effects/sessionquit/metadata.json +%%DATADIR%%/effects/showcompositing/qml/main.qml +%%DATADIR%%/effects/showfps/qml/main-fallback.qml +%%DATADIR%%/effects/showfps/qml/main.qml +%%DATADIR%%/effects/squash/contents/code/main.js +%%DATADIR%%/effects/squash/metadata.json +%%DATADIR%%/effects/tileseditor/qml/ResizeCorner.qml +%%DATADIR%%/effects/tileseditor/qml/ResizeHandle.qml +%%DATADIR%%/effects/tileseditor/qml/TileDelegate.qml +%%DATADIR%%/effects/tileseditor/qml/layouts.svg +%%DATADIR%%/effects/tileseditor/qml/main.qml +%%DATADIR%%/effects/translucency/contents/code/main.js +%%DATADIR%%/effects/translucency/contents/config/main.xml +%%DATADIR%%/effects/translucency/contents/ui/config.ui +%%DATADIR%%/effects/translucency/metadata.json +%%DATADIR%%/effects/windowaperture/contents/code/main.js +%%DATADIR%%/effects/windowaperture/metadata.json +%%DATADIR%%/effects/windowview/qml/main.qml +%%DATADIR%%/frames/plasma/frame_none.qml +%%DATADIR%%/frames/plasma/frame_styled.qml +%%DATADIR%%/frames/plasma/frame_unstyled.qml +%%DATADIR%%/onscreennotification/plasma/dummydata/osd.qml +%%DATADIR%%/onscreennotification/plasma/main.qml +%%DATADIR%%/outline/plasma/outline.qml +%%DATADIR%%/scripts/desktopchangeosd/contents/ui/main.qml +%%DATADIR%%/scripts/desktopchangeosd/contents/ui/osd.qml +%%DATADIR%%/scripts/desktopchangeosd/metadata.json +%%DATADIR%%/scripts/minimizeall/contents/code/main.js +%%DATADIR%%/scripts/minimizeall/metadata.json +%%DATADIR%%/scripts/synchronizeskipswitcher/contents/code/main.js +%%DATADIR%%/scripts/synchronizeskipswitcher/metadata.json +%%DATADIR%%/scripts/videowall/contents/code/main.js +%%DATADIR%%/scripts/videowall/contents/config/main.xml +%%DATADIR%%/scripts/videowall/contents/ui/config.ui +%%DATADIR%%/scripts/videowall/metadata.json +%%DATADIR%%/tabbox/thumbnail_grid/contents/ui/main.qml +%%DATADIR%%/tabbox/thumbnail_grid/metadata.json +%%DATADIR%%/tm_inner.png +%%DATADIR%%/tm_outer.png share/locale/af/LC_MESSAGES/kcm_kwindecoration.mo share/locale/af/LC_MESSAGES/kcm_kwinrules.mo share/locale/af/LC_MESSAGES/kcmkwm.mo @@ -1235,6 +1235,7 @@ share/locale/it/LC_MESSAGES/kcmkwincommon.mo share/locale/it/LC_MESSAGES/kcmkwinscreenedges.mo share/locale/it/LC_MESSAGES/kcmkwm.mo share/locale/it/LC_MESSAGES/kwin.mo +share/locale/ja/LC_MESSAGES/kcm_animations.mo share/locale/ja/LC_MESSAGES/kcm_kwin_effects.mo share/locale/ja/LC_MESSAGES/kcm_kwin_scripts.mo share/locale/ja/LC_MESSAGES/kcm_kwin_virtualdesktops.mo diff --git a/x11-wm/river/Makefile b/x11-wm/river/Makefile index 30f6e8af98f6..96116f9315bb 100644 --- a/x11-wm/river/Makefile +++ b/x11-wm/river/Makefile @@ -3,7 +3,7 @@ DISTVERSIONPREFIX= v DISTVERSION= 0.3.11 CATEGORIES= x11-wm wayland -MAINTAINER= jbeich@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Dynamic tiling Wayland compositor WWW= https://isaacfreund.com/software/river/ diff --git a/x11-wm/sway/Makefile b/x11-wm/sway/Makefile index 9b0f8f7f029e..120ae0e8cd0a 100644 --- a/x11-wm/sway/Makefile +++ b/x11-wm/sway/Makefile @@ -1,5 +1,6 @@ PORTNAME= sway DISTVERSION= 1.11 +PORTREVISION= 1 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org @@ -50,6 +51,15 @@ SWAYBG_RUN_DEPENDS= swaybg:x11/swaybg X11_USE= XORG=xcb X11_LIB_DEPENDS= libxcb-icccm.so:x11/xcb-util-wm +.include <bsd.port.options.mk> + +# https://github.com/freebsd/freebsd-src/pull/1675 +.if ${OPSYS} == FreeBSD && (${OSVERSION} < 1305503 \ + || ${OSVERSION} >= 1400000 && ${OSVERSION} < 1403505 \ + || ${OSVERSION} >= 1500000 && ${OSVERSION} < 1500052) +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-wordexp +.endif + post-patch: # Let @sample handle default files under etc/ @${REINPLACE_CMD} -e '/config\.in/{ N; s/@BASENAME@/&.sample/; }' \ @@ -58,7 +68,7 @@ post-patch: @${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \ -e '/project_version/s/@0@/${DISTVERSIONFULL}/' \ ${WRKSRC}/meson.build -.if exists(${.CURDIR}/files/patch-common_stringop.c) +.if exists(${.CURDIR}/files/extra-patch-wordexp) # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=275328 @${REINPLACE_CMD} -e 's/_POSIX_C_SOURCE=200809L/_XOPEN_SOURCE=700/' \ ${WRKSRC}/meson.build diff --git a/x11-wm/sway/files/extra-patch-wordexp b/x11-wm/sway/files/extra-patch-wordexp new file mode 100644 index 000000000000..eb1f79f130f5 --- /dev/null +++ b/x11-wm/sway/files/extra-patch-wordexp @@ -0,0 +1,49 @@ +https://github.com/swaywm/sway/issues/8673#issuecomment-2818260191 +https://github.com/swaywm/sway/issues/8828#issuecomment-3290045852 + +--- common/stringop.c.orig 2025-04-20 11:31:10 UTC ++++ common/stringop.c +@@ -6,6 +6,8 @@ + #include <string.h> + #include <strings.h> + #include <wordexp.h> ++#include <signal.h> ++#include <sys/wait.h> + #include "list.h" + #include "log.h" + #include "stringop.h" +@@ -319,7 +321,33 @@ bool expand_path(char **path) { + memmove(ptr + 1, ptr, strlen(ptr) + 1); + *ptr = '\\'; + } +- if (wordexp(*path, &p, 0) != 0 || p.we_wordv[0] == NULL) { ++ ++ // FreeBSD wordexp bug workaround: ++ // 1. Reset SIGCHLD handler ++ // 2. Run wordexp ++ // 3. Restore SIGCHLD handler and reap any processes that exited ++ struct sigaction prev_action; ++ struct sigaction new_action = { ++ .sa_flags = SA_RESETHAND, ++ }; ++ if (sigaction(SIGCHLD, &new_action, &prev_action) != 0) { ++ sway_log(SWAY_ERROR, "Restoring sigchild before wordexp failed"); ++ return false; ++ } ++ ++ int res = wordexp(*path, &p, 0); ++ ++ if (sigaction(SIGCHLD, &prev_action, NULL) != 0) { ++ sway_log(SWAY_ERROR, "Restoring sigchild after wordexp failed"); ++ } ++ ++ int status; ++ int wres; ++ do { ++ wres = waitpid(-1, &status, WNOHANG); ++ } while (wres > 0 || (wres == -1 && errno == EINTR)); ++ ++ if (res != 0 || p.we_wordv[0] == NULL) { + wordfree(&p); + return false; + } diff --git a/x11-wm/sway/files/patch-common_stringop.c b/x11-wm/sway/files/patch-common_stringop.c deleted file mode 100644 index 5a9f187e11df..000000000000 --- a/x11-wm/sway/files/patch-common_stringop.c +++ /dev/null @@ -1,53 +0,0 @@ -https://github.com/swaywm/sway/issues/8673#issuecomment-2818260191 - ---- common/stringop.c.orig 2025-04-20 11:31:10 UTC -+++ common/stringop.c -@@ -6,6 +6,8 @@ - #include <string.h> - #include <strings.h> - #include <wordexp.h> -+#include <signal.h> -+#include <sys/wait.h> - #include "list.h" - #include "log.h" - #include "stringop.h" -@@ -318,11 +320,34 @@ bool expand_path(char **path) { - char *ptr = strstr(*path, " ") + 1; - memmove(ptr + 1, ptr, strlen(ptr) + 1); - *ptr = '\\'; -- } -- if (wordexp(*path, &p, 0) != 0 || p.we_wordv[0] == NULL) { -- wordfree(&p); -- return false; -- } -+ } -+ -+ // FreeBSD wordexp bug workaround: -+ // 1. Reset SIGCHLD handler -+ // 2. Run wordexp -+ // 3. Restore SIGCHLD handler and reap any processes that exited -+ struct sigaction prev_action; -+ struct sigaction new_action = { -+ .sa_flags = SA_RESETHAND, -+ }; -+ if (sigaction(SIGCHLD, &new_action, &prev_action) != 0) { -+ sway_log(SWAY_ERROR, "Restoring sigchild before wordexp failed"); -+ return false; -+ } -+ -+ int res = wordexp(*path, &p, 0); -+ -+ if (sigaction(SIGCHLD, &prev_action, NULL) != 0) { -+ sway_log(SWAY_ERROR, "Restoring sigchild after wordexp failed"); -+ } -+ -+ int status; -+ while (waitpid(-1, &status, WNOHANG) != -1 || errno == EINTR); -+ -+ if (res != 0 || p.we_wordv[0] == NULL) { -+ wordfree(&p); -+ return false; -+ } - free(*path); - *path = join_args(p.we_wordv, p.we_wordc); - wordfree(&p); diff --git a/x11-wm/swayfx/Makefile b/x11-wm/swayfx/Makefile index 6d9cf7561faa..8e4890d5cdef 100644 --- a/x11-wm/swayfx/Makefile +++ b/x11-wm/swayfx/Makefile @@ -1,5 +1,6 @@ PORTNAME= sway DISTVERSION= 0.5.3 +PORTREVISION= 1 CATEGORIES= x11-wm wayland PKGNAMESUFFIX= ${GH_PROJECT:S/${PORTNAME}//} @@ -53,6 +54,15 @@ SWAYBG_RUN_DEPENDS= swaybg:x11/swaybg X11_USE= XORG=xcb X11_LIB_DEPENDS= libxcb-icccm.so:x11/xcb-util-wm +.include <bsd.port.options.mk> + +# https://github.com/freebsd/freebsd-src/pull/1675 +.if ${OPSYS} == FreeBSD && (${OSVERSION} < 1305503 \ + || ${OSVERSION} >= 1400000 && ${OSVERSION} < 1403505 \ + || ${OSVERSION} >= 1500000 && ${OSVERSION} < 1500052) +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-wordexp +.endif + post-patch: # Let @sample handle default files under etc/ @${REINPLACE_CMD} -e '/config\.in/{ N; s/@BASENAME@/&.sample/; }' \ @@ -61,7 +71,7 @@ post-patch: @${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \ -e '/project_version/s/@0@/${DISTVERSIONFULL}/' \ ${WRKSRC}/meson.build -.if exists(${.CURDIR}/files/patch-common_stringop.c) +.if exists(${.CURDIR}/files/extra-patch-wordexp) # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=275328 @${REINPLACE_CMD} -e 's/_POSIX_C_SOURCE=200809L/_XOPEN_SOURCE=700/' \ ${WRKSRC}/meson.build diff --git a/x11-wm/swayfx/files/extra-patch-wordexp b/x11-wm/swayfx/files/extra-patch-wordexp new file mode 100644 index 000000000000..eb1f79f130f5 --- /dev/null +++ b/x11-wm/swayfx/files/extra-patch-wordexp @@ -0,0 +1,49 @@ +https://github.com/swaywm/sway/issues/8673#issuecomment-2818260191 +https://github.com/swaywm/sway/issues/8828#issuecomment-3290045852 + +--- common/stringop.c.orig 2025-04-20 11:31:10 UTC ++++ common/stringop.c +@@ -6,6 +6,8 @@ + #include <string.h> + #include <strings.h> + #include <wordexp.h> ++#include <signal.h> ++#include <sys/wait.h> + #include "list.h" + #include "log.h" + #include "stringop.h" +@@ -319,7 +321,33 @@ bool expand_path(char **path) { + memmove(ptr + 1, ptr, strlen(ptr) + 1); + *ptr = '\\'; + } +- if (wordexp(*path, &p, 0) != 0 || p.we_wordv[0] == NULL) { ++ ++ // FreeBSD wordexp bug workaround: ++ // 1. Reset SIGCHLD handler ++ // 2. Run wordexp ++ // 3. Restore SIGCHLD handler and reap any processes that exited ++ struct sigaction prev_action; ++ struct sigaction new_action = { ++ .sa_flags = SA_RESETHAND, ++ }; ++ if (sigaction(SIGCHLD, &new_action, &prev_action) != 0) { ++ sway_log(SWAY_ERROR, "Restoring sigchild before wordexp failed"); ++ return false; ++ } ++ ++ int res = wordexp(*path, &p, 0); ++ ++ if (sigaction(SIGCHLD, &prev_action, NULL) != 0) { ++ sway_log(SWAY_ERROR, "Restoring sigchild after wordexp failed"); ++ } ++ ++ int status; ++ int wres; ++ do { ++ wres = waitpid(-1, &status, WNOHANG); ++ } while (wres > 0 || (wres == -1 && errno == EINTR)); ++ ++ if (res != 0 || p.we_wordv[0] == NULL) { + wordfree(&p); + return false; + } diff --git a/x11-wm/swayfx/files/patch-common_stringop.c b/x11-wm/swayfx/files/patch-common_stringop.c deleted file mode 100644 index 5a9f187e11df..000000000000 --- a/x11-wm/swayfx/files/patch-common_stringop.c +++ /dev/null @@ -1,53 +0,0 @@ -https://github.com/swaywm/sway/issues/8673#issuecomment-2818260191 - ---- common/stringop.c.orig 2025-04-20 11:31:10 UTC -+++ common/stringop.c -@@ -6,6 +6,8 @@ - #include <string.h> - #include <strings.h> - #include <wordexp.h> -+#include <signal.h> -+#include <sys/wait.h> - #include "list.h" - #include "log.h" - #include "stringop.h" -@@ -318,11 +320,34 @@ bool expand_path(char **path) { - char *ptr = strstr(*path, " ") + 1; - memmove(ptr + 1, ptr, strlen(ptr) + 1); - *ptr = '\\'; -- } -- if (wordexp(*path, &p, 0) != 0 || p.we_wordv[0] == NULL) { -- wordfree(&p); -- return false; -- } -+ } -+ -+ // FreeBSD wordexp bug workaround: -+ // 1. Reset SIGCHLD handler -+ // 2. Run wordexp -+ // 3. Restore SIGCHLD handler and reap any processes that exited -+ struct sigaction prev_action; -+ struct sigaction new_action = { -+ .sa_flags = SA_RESETHAND, -+ }; -+ if (sigaction(SIGCHLD, &new_action, &prev_action) != 0) { -+ sway_log(SWAY_ERROR, "Restoring sigchild before wordexp failed"); -+ return false; -+ } -+ -+ int res = wordexp(*path, &p, 0); -+ -+ if (sigaction(SIGCHLD, &prev_action, NULL) != 0) { -+ sway_log(SWAY_ERROR, "Restoring sigchild after wordexp failed"); -+ } -+ -+ int status; -+ while (waitpid(-1, &status, WNOHANG) != -1 || errno == EINTR); -+ -+ if (res != 0 || p.we_wordv[0] == NULL) { -+ wordfree(&p); -+ return false; -+ } - free(*path); - *path = join_args(p.we_wordv, p.we_wordc); - wordfree(&p); diff --git a/x11-wm/wideriver/Makefile b/x11-wm/wideriver/Makefile index dfc906a1257a..b8cf5062a975 100644 --- a/x11-wm/wideriver/Makefile +++ b/x11-wm/wideriver/Makefile @@ -1,5 +1,5 @@ PORTNAME= wideriver -DISTVERSION= 1.3.0 +DISTVERSION= 1.3.1 CATEGORIES= x11-wm MAINTAINER= nivit@FreeBSD.org diff --git a/x11-wm/wideriver/distinfo b/x11-wm/wideriver/distinfo index 692291cb42e2..f94469945f0f 100644 --- a/x11-wm/wideriver/distinfo +++ b/x11-wm/wideriver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1753771718 -SHA256 (alex-courtis-wideriver-1.3.0_GH0.tar.gz) = 77ef35b978483f245ac8d6fd14942b99c5d6e6e5437eedba43a96c994febc61b -SIZE (alex-courtis-wideriver-1.3.0_GH0.tar.gz) = 64914 +TIMESTAMP = 1758370589 +SHA256 (alex-courtis-wideriver-1.3.1_GH0.tar.gz) = 6ccd45cab794311ab9ad08c9c53b09eac5eb7bd24efc34f19b58586aa598df9d +SIZE (alex-courtis-wideriver-1.3.1_GH0.tar.gz) = 65688 diff --git a/x11-wm/wlmaker/Makefile b/x11-wm/wlmaker/Makefile index 6a644cb31f0f..9aea31eae01d 100644 --- a/x11-wm/wlmaker/Makefile +++ b/x11-wm/wlmaker/Makefile @@ -1,6 +1,6 @@ PORTNAME= wlmaker DISTVERSIONPREFIX= v -DISTVERSION= 0.6 +DISTVERSION= 0.6.1 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org diff --git a/x11-wm/wlmaker/distinfo b/x11-wm/wlmaker/distinfo index e3444d5a9f74..4443211b7c61 100644 --- a/x11-wm/wlmaker/distinfo +++ b/x11-wm/wlmaker/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1756341927 -SHA256 (phkaeser-wlmaker-v0.6_GH0.tar.gz) = 62e4a890ca0a826542b8dab9e47f5638412ad9ca9ad6252fe4a1faa68419a7d7 -SIZE (phkaeser-wlmaker-v0.6_GH0.tar.gz) = 423159 +TIMESTAMP = 1757949451 +SHA256 (phkaeser-wlmaker-v0.6.1_GH0.tar.gz) = bb7e5ea92eef8e21ff7091d8b307bc0179937d0bee7e55dc2948328d76aa5c7e +SIZE (phkaeser-wlmaker-v0.6.1_GH0.tar.gz) = 423334 SHA256 (phkaeser-libbase-f44570e_GH0.tar.gz) = 315de1cd1e179d8fc129a9beb57fdfccb323c6e1cae0282b15dc02c91b8b57dd SIZE (phkaeser-libbase-f44570e_GH0.tar.gz) = 121590 |