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 CB90315803E for ; Tue, 2 Jan 2024 12:08:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E9A0D2BC013; Tue, 2 Jan 2024 12:08:33 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CB59B2BC013 for ; Tue, 2 Jan 2024 12:08:33 +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 EEC1E342FFA for ; Tue, 2 Jan 2024 12:08:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7548AAC2 for ; Tue, 2 Jan 2024 12:08:31 +0000 (UTC) From: "Yixun Lan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yixun Lan" Message-ID: <1704197195.e303fa66ac1d3fb7581c20f05d70f004295383ef.dlan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gui-wm/hyprland/, gui-wm/hyprland/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: gui-wm/hyprland/files/gcc14.patch gui-wm/hyprland/hyprland-0.33.1.ebuild X-VCS-Directories: gui-wm/hyprland/files/ gui-wm/hyprland/ X-VCS-Committer: dlan X-VCS-Committer-Name: Yixun Lan X-VCS-Revision: e303fa66ac1d3fb7581c20f05d70f004295383ef X-VCS-Branch: master Date: Tue, 2 Jan 2024 12:08:31 +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: 58b25888-e9f1-4485-961b-4734c7d4536f X-Archives-Hash: d85aba4c531593f8f19d952407017af4 commit: e303fa66ac1d3fb7581c20f05d70f004295383ef Author: Julien Roy jroy ca> AuthorDate: Sun Dec 31 21:57:37 2023 +0000 Commit: Yixun Lan gentoo org> CommitDate: Tue Jan 2 12:06:35 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e303fa66 gui-wm/hyprland: add patch for gcc14 Closes: https://bugs.gentoo.org/921123 Closes: https://github.com/gentoo/gentoo/pull/34588 Signed-off-by: Julien Roy jroy.ca> Signed-off-by: Yixun Lan gentoo.org> gui-wm/hyprland/files/gcc14.patch | 32 ++++++++++++++++++++++++++++++++ gui-wm/hyprland/hyprland-0.33.1.ebuild | 4 ++++ 2 files changed, 36 insertions(+) diff --git a/gui-wm/hyprland/files/gcc14.patch b/gui-wm/hyprland/files/gcc14.patch new file mode 100644 index 000000000000..1bebe9e9d4c4 --- /dev/null +++ b/gui-wm/hyprland/files/gcc14.patch @@ -0,0 +1,32 @@ +# From: https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/f3e1f7b2a70a500b740bfc406e893eba0852699a +diff --git a/subprojects/wlroots/backend/libinput/tablet_pad.c b/subprojects/wlroots/backend/libinput/tablet_pad.c +index 2e74022a..e5327528 100644 +--- a/subprojects/wlroots/backend/libinput/tablet_pad.c ++++ b/subprojects/wlroots/backend/libinput/tablet_pad.c +@@ -33,7 +33,7 @@ static void add_pad_group_from_libinput(struct wlr_tablet_pad *pad, + ++group->ring_count; + } + } +- group->rings = calloc(sizeof(unsigned int), group->ring_count); ++ group->rings = calloc(group->ring_count, sizeof(unsigned int)); + if (group->rings == NULL) { + goto group_fail; + } +@@ -50,7 +50,7 @@ static void add_pad_group_from_libinput(struct wlr_tablet_pad *pad, + ++group->strip_count; + } + } +- group->strips = calloc(sizeof(unsigned int), group->strip_count); ++ group->strips = calloc(group->strip_count, sizeof(unsigned int)); + if (group->strips == NULL) { + goto group_fail; + } +@@ -66,7 +66,7 @@ static void add_pad_group_from_libinput(struct wlr_tablet_pad *pad, + ++group->button_count; + } + } +- group->buttons = calloc(sizeof(unsigned int), group->button_count); ++ group->buttons = calloc(group->button_count, sizeof(unsigned int)); + if (group->buttons == NULL) { + goto group_fail; + } diff --git a/gui-wm/hyprland/hyprland-0.33.1.ebuild b/gui-wm/hyprland/hyprland-0.33.1.ebuild index 049bd8915031..5c3cf3abef5f 100644 --- a/gui-wm/hyprland/hyprland-0.33.1.ebuild +++ b/gui-wm/hyprland/hyprland-0.33.1.ebuild @@ -77,6 +77,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}/gcc14.patch" +) + pkg_setup() { [[ ${MERGE_TYPE} == binary ]] && return