From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 46D0F158064 for ; Thu, 2 May 2024 03:55:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7DA1DE2AD0; Thu, 2 May 2024 03:55:36 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5B797E2ACF for ; Thu, 2 May 2024 03:55:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4A4D4335CB9 for ; Thu, 2 May 2024 03:55:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D77F416E4 for ; Thu, 2 May 2024 03:55:33 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1714622065.5b37553a9c5af8e400cd23a2dd79ecdf4b32812e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/notion/, x11-wm/notion/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-wm/notion/files/notion-4.0.2-gcc14-build-fix.patch x11-wm/notion/notion-4.0.2_p20220613-r1.ebuild x11-wm/notion/notion-9999.ebuild X-VCS-Directories: x11-wm/notion/ x11-wm/notion/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5b37553a9c5af8e400cd23a2dd79ecdf4b32812e X-VCS-Branch: master Date: Thu, 2 May 2024 03:55:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 28699555-600d-478f-86b8-89619381256c X-Archives-Hash: 6cfead1407bce0d66e03230ef42301f7 commit: 5b37553a9c5af8e400cd23a2dd79ecdf4b32812e Author: Brahmajit Das gmail com> AuthorDate: Wed May 1 08:48:39 2024 +0000 Commit: Sam James gentoo org> CommitDate: Thu May 2 03:54:25 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b37553a x11-wm/notion: Fix passing of incompatible pointer type TODO: According to developer/s, frame->mplex->win would be a more type-safe way to achieve the same, but then it becomes less clear whether this is an 'is' or a 'has' relationship. Closes: https://bugs.gentoo.org/919249 Signed-off-by: Brahmajit Das gmail.com> Closes: https://github.com/gentoo/gentoo/pull/36498 Signed-off-by: Sam James gentoo.org> .../files/notion-4.0.2-gcc14-build-fix.patch | 49 ++++++++++++++++++++++ ...999.ebuild => notion-4.0.2_p20220613-r1.ebuild} | 10 ++++- x11-wm/notion/notion-9999.ebuild | 6 ++- 3 files changed, 62 insertions(+), 3 deletions(-) diff --git a/x11-wm/notion/files/notion-4.0.2-gcc14-build-fix.patch b/x11-wm/notion/files/notion-4.0.2-gcc14-build-fix.patch new file mode 100644 index 000000000000..94782a30a8cc --- /dev/null +++ b/x11-wm/notion/files/notion-4.0.2-gcc14-build-fix.patch @@ -0,0 +1,49 @@ +https://github.com/raboof/notion/commit/3c81575d48b2fd1b851536e305961bb199ea36b5.patch +From: Brahmajit Das +Date: Wed, 1 May 2024 11:35:59 +0530 +Subject: [PATCH] Fix build with GCC 14 and above +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Newer compilers such as GCC 14 ( and above ) have enabled a few compiler +flags by default, -Wincompatible-pointer-types being one of them. Thus +resulting in build errors such as: + +frame.c: In function ‘frame_set_numbers_extl’: +frame.c:799:32: error: passing argument 1 of ‘ioncore_grab_establish’ from incompatible pointer type [-Wincompatible-pointer-types] + 799 | ioncore_grab_establish(frame, numbers_grab_handler, NULL, + | ^~~~~ + | | + | WFrame * {aka struct WFrame_struct *} + +For now a type casting can be used to supress the error, as changing the type +of frame would require touching other parts of the codebase. This should be +fine for now as WFrame is a WMPlex which is a WWindow. + +TODO: +According to developer/s, frame->mplex->win would be a more type-safe way to +achieve the same, but then it becomes less clear whether this is an 'is' or a +'has' relationship. + +First reported on Gentoo Linux with GCC 14, for more details please +reffer https://bugs.gentoo.org/919249 + +Signed-off-by: Brahmajit Das +--- + ioncore/frame.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ioncore/frame.c b/ioncore/frame.c +index dbe0d107c..2f7663815 100644 +--- a/ioncore/frame.c ++++ b/ioncore/frame.c +@@ -796,7 +796,7 @@ bool frame_set_numbers_extl(WFrame *frame, const char *how) + { + if(how!=NULL && strcmp(how, "during_grab")==0){ + bool new_state = frame_set_numbers(frame, SETPARAM_SET); +- ioncore_grab_establish(frame, numbers_grab_handler, NULL, ++ ioncore_grab_establish((WRegion *)frame, numbers_grab_handler, NULL, + 0, GRAB_DEFAULT_FLAGS&~GRAB_POINTER); + return new_state; + } diff --git a/x11-wm/notion/notion-9999.ebuild b/x11-wm/notion/notion-4.0.2_p20220613-r1.ebuild similarity index 88% copy from x11-wm/notion/notion-9999.ebuild copy to x11-wm/notion/notion-4.0.2_p20220613-r1.ebuild index 3bc5247a3ad3..8838324ac69b 100644 --- a/x11-wm/notion/notion-9999.ebuild +++ b/x11-wm/notion/notion-4.0.2_p20220613-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,9 @@ if [[ ${PV} == *9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/raboof/${PN}.git" else - SRC_URI="https://github.com/raboof/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + inherit vcs-snapshot + COMMIT="f161c1b4dbba1ac81d8e9c3d7e5e353058a4d7d1" + SRC_URI="https://github.com/raboof/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi @@ -43,6 +45,10 @@ BDEPEND=" ${LUA_DEPS} virtual/pkgconfig" +PATCHES=( + "${FILESDIR}"/${PN}-4.0.2-gcc14-build-fix.patch +) + src_configure() { tc-export AR CC PKG_CONFIG export INSTALL_STRIP="" diff --git a/x11-wm/notion/notion-9999.ebuild b/x11-wm/notion/notion-9999.ebuild index 3bc5247a3ad3..213357db0dbf 100644 --- a/x11-wm/notion/notion-9999.ebuild +++ b/x11-wm/notion/notion-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -43,6 +43,10 @@ BDEPEND=" ${LUA_DEPS} virtual/pkgconfig" +PATCHES=( + "${FILESDIR}"/${PN}-4.0.2-gcc14-build-fix.patch +) + src_configure() { tc-export AR CC PKG_CONFIG export INSTALL_STRIP=""