diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2025-06-20 20:57:37 +0200 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2025-06-20 22:05:19 +0200 |
| commit | 258a81c26a9c3d1d9c5df3bd9a7a53f56d1d14e8 (patch) | |
| tree | b36a96806fbd34dd05809da6c1dadf7d980197fa | |
| parent | 235f1834fe7b765173c6c2fa24627cec03d2add7 (diff) | |
x11-toolkits/como: unbreak Wayland after 8dc860e74057
After `gainRealTime()` was expanded `return` changed semantic, aborting
startup instead of skipping realtime priority.
Reported by: jsm (via upstream bug)
(cherry picked from commit 2976009ae22a764b66a0def72f6765896a3d3937)
| -rw-r--r-- | x11-toolkits/como/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/como/files/patch-como_base_wayland_app__singleton.h | 17 | ||||
| -rw-r--r-- | x11-wm/theseus-ship/Makefile | 4 |
3 files changed, 11 insertions, 12 deletions
diff --git a/x11-toolkits/como/Makefile b/x11-toolkits/como/Makefile index 750032c3bccb..cdd7da660962 100644 --- a/x11-toolkits/como/Makefile +++ b/x11-toolkits/como/Makefile @@ -1,7 +1,7 @@ PORTNAME= como DISTVERSIONPREFIX= v DISTVERSION= 0.3.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ diff --git a/x11-toolkits/como/files/patch-como_base_wayland_app__singleton.h b/x11-toolkits/como/files/patch-como_base_wayland_app__singleton.h index 409f16e33d6e..d8da4bb4a97b 100644 --- a/x11-toolkits/como/files/patch-como_base_wayland_app__singleton.h +++ b/x11-toolkits/como/files/patch-como_base_wayland_app__singleton.h @@ -4,7 +4,7 @@ --- como/base/wayland/app_singleton.h.orig 2024-02-27 13:02:31 UTC +++ como/base/wayland/app_singleton.h -@@ -19,12 +19,17 @@ class app_singleton : public base::app_singleton (publ +@@ -19,12 +19,16 @@ class app_singleton : public base::app_singleton (publ setenv("QT_QPA_PLATFORM", "wayland-org.kde.kwin.qpa", true); setenv("KWIN_FORCE_OWN_QPA", "1", true); @@ -14,14 +14,13 @@ sp.sched_priority = minPriority; - sched_setscheduler(0, SCHED_RR | SCHED_RESET_ON_FORK, &sp); -#endif -+ if (pthread_setschedparam(pthread_self(), SCHED_RR, &sp)) -+ return; -+ -+ pthread_atfork(NULL, NULL, []() { -+ sched_param sp; -+ sp.sched_priority = 0; -+ pthread_setschedparam(pthread_self(), SCHED_OTHER, &sp); -+ }); ++ if (!pthread_setschedparam(pthread_self(), SCHED_RR, &sp)) { ++ pthread_atfork(NULL, NULL, []() { ++ sched_param sp; ++ sp.sched_priority = 0; ++ pthread_setschedparam(pthread_self(), SCHED_OTHER, &sp); ++ }); ++ } qapp = std::make_unique<QApplication>(argc, argv); prepare_qapp(); diff --git a/x11-wm/theseus-ship/Makefile b/x11-wm/theseus-ship/Makefile index 0c03a7652cce..ce87cbd891ea 100644 --- a/x11-wm/theseus-ship/Makefile +++ b/x11-wm/theseus-ship/Makefile @@ -1,8 +1,8 @@ PORTNAME= theseus-ship DISTVERSIONPREFIX= v DISTVERSION= 6.2.0 -PORTREVISION= 2 -CATEGORIES= x11-wm # wayland: https://github.com/winft/theseus-ship/issues/9 +PORTREVISION= 3 +CATEGORIES= x11-wm wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 01030427325c.patch:-p1 # https://github.com/winft/theseus-ship/pull/17 |