From nobody Sat Nov 02 14:23:26 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xgg270yVcz5c651; Sat, 02 Nov 2024 14:23:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xgg270GzLz44SM; Sat, 2 Nov 2024 14:23:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730557407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AbVQU//aocXsK0k7QrC8VuH0cQ/CLdYDeJsDETKwfXE=; b=pc7wg5lfjzG2VRNJ0RvVev0yI8YANtS3n7SLbYltLH6YM1qdjX+sn1Xzcjn0QvJGrD/uGi oeU4j2M2TnonsnaTkcnFFVOKxNupTRMcLFOplda3w7lzuBtmir3TjI23WpfoRKCmI8JDp6 ig33p3IUMM6rc452jE+NW/g98tKjcH3oZOaH04vk3+RkVZV29OPso0+ed+R1L7nfyT9ME8 RjffMYYUtp9vLx/ZXWrMk2RXA2mvKET46ZAKxSFU2sheTAIsN/GDhcJlNkwypSV+0dLlnp N+ScaAgayVKTw6zO73twhpGsTxENzGgSTObyjPrKuDznmcoYp9kV7C1AAWJoPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730557407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AbVQU//aocXsK0k7QrC8VuH0cQ/CLdYDeJsDETKwfXE=; b=hvuJzWjNi+uPgHuCzNC/A1quGfSKsGZYSYE7f8Rr0LPHWATTXzCJP8AcDPlgQ4/oQNWtvj XwxS35NFMpPPHsz/qT9nOygIeQl6ZM6hRqi6FF6bI5Cyw1aCgDRl8L9gQQ/xrNYHh+g2lP RQ3KbpxHVbB94am9o/v65E5fJ/7tu/6+HC85LJdrShfMhxdu/pILDQw5KgAaw/DkisG+qW E+29ydT+jOvNG0zKPNv+dn7yn1FF87lr1bGcQUtEFsFWFSMLl13UnEdUWDPsFPfgVHZ7EQ F2Ht0k0/UnuXSiG8F2Oka6TxpjgmtgfhYAWFjAIJwzoM103y61j7JUkd2oso5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730557407; a=rsa-sha256; cv=none; b=mb7o3VNAcoVEkKs9HCCLwLiQX5fBYni46xNOX8zLO4M+p8iBTDfeBFWSXfdvUT0MZ0S2yW FeuZNGJ0fBgQgmNebIN6k4jtdM6Sx3rz76tLOgSiLXFOHFRZ7tP6owFZzM4nFPKRMArC9K Ti44b5Sfy+yyFV80QNGcSTxL/h+5tEys0++9cnXM4gSBS+ivthYHjY1lao6zOjgLeVwy2T /5q44VBslb2nJUnnSoKIo/llqW07UNe8Xy/xjWwzzCunjx6Z4UyEb+tDX7hpJCpfMxZQBs ocH7+0HEHaayJqVIAQUf1YXrXuvCkUDDISHzxs5U2ptMWT1tKx/3vht2w9AbTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xgg266Y4Bz16tF; Sat, 2 Nov 2024 14:23:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A2ENQTN055801; Sat, 2 Nov 2024 14:23:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A2ENQXB055798; Sat, 2 Nov 2024 14:23:26 GMT (envelope-from git) Date: Sat, 2 Nov 2024 14:23:26 GMT Message-Id: <202411021423.4A2ENQXB055798@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 121e40d73e58 - main - x11-toolkits/como: unbreak consumers with clang 19 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 121e40d73e587310a777c45359eb4a07b6835cfe Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=121e40d73e587310a777c45359eb4a07b6835cfe commit 121e40d73e587310a777c45359eb4a07b6835cfe Author: Jan Beich AuthorDate: 2024-11-02 13:43:03 +0000 Commit: Jan Beich CommitDate: 2024-11-02 14:22:42 +0000 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(-) 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()) {