From 121e40d73e587310a777c45359eb4a07b6835cfe Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Sat, 2 Nov 2024 14:43:03 +0100 Subject: [PATCH] x11-toolkits/como: unbreak consumers with clang 19 In file included from theseus-ship-6.2.0/main_wayland.cpp:10: In file included from /usr/local/include/como/base/wayland/xwl_platform.h:17: /usr/local/include/como/render/wayland/xwl_platform.h:268:19: error: no member named 'addRepaintFull' in 'xwl_platform'; did you mean 'addRepaint'? 268 | this->addRepaintFull(); | ^ /usr/local/include/como/render/wayland/xwl_platform.h:233:10: note: 'addRepaint' declared here 233 | void addRepaint(QRegion const& region) | ^ Reported by: pkg-fallout --- x11-toolkits/como/Makefile | 2 +- x11-toolkits/como/files/patch-clang19 | 40 +++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 x11-toolkits/como/files/patch-clang19 diff --git a/x11-toolkits/como/Makefile b/x11-toolkits/como/Makefile index 627dff44c54d..209665210ea4 100644 --- a/x11-toolkits/como/Makefile +++ b/x11-toolkits/como/Makefile @@ -1,6 +1,7 @@ PORTNAME= como DISTVERSIONPREFIX= v DISTVERSION= 0.3.0 +PORTREVISION= 1 CATEGORIES= x11-toolkits PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -38,7 +39,6 @@ USE_QT= base declarative tools USE_XORG= x11 xcb GH_ACCOUNT= winft SHEBANG_FILES= plugins/effects/*.py -CMAKE_OFF= BUILD_EXAMPLES # https://github.com/winft/como/issues/29 PLIST_SUB= VERSION=${PORTVERSION} LDFLAGS+= -Wl,--as-needed # fontconfig/freetype, GL, ICE/SM/Xext/Xi, pixman diff --git a/x11-toolkits/como/files/patch-clang19 b/x11-toolkits/como/files/patch-clang19 new file mode 100644 index 000000000000..887256e4b228 --- /dev/null +++ b/x11-toolkits/como/files/patch-clang19 @@ -0,0 +1,40 @@ +https://github.com/winft/como/issues/29 + +--- como/render/wayland/platform.h.orig 2024-10-09 12:19:16 UTC ++++ como/render/wayland/platform.h +@@ -246,16 +246,6 @@ class platform (public) + locked++; + } + +- void unlock() +- { +- assert(locked > 0); +- locked--; +- +- if (!locked) { +- this->addRepaintFull(); +- } +- } +- + std::unique_ptr create_scene() + { + auto setup_hooks = [&, this](auto scene) -> decltype(scene) { +--- como/render/wayland/xwl_platform.h.orig 2024-10-09 12:19:16 UTC ++++ como/render/wayland/xwl_platform.h +@@ -259,16 +259,6 @@ class xwl_platform (public) + locked++; + } + +- void unlock() +- { +- assert(locked > 0); +- locked--; +- +- if (!locked) { +- this->addRepaintFull(); +- } +- } +- + std::unique_ptr create_scene() + { + if (is_sw_compositing()) {