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 F21CD1581D3 for ; Wed, 22 May 2024 10:01:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 440B0E2A17; Wed, 22 May 2024 10:01:04 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 1DD93E2A17 for ; Wed, 22 May 2024 10:01:04 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E767033BDF0 for ; Wed, 22 May 2024 10:01:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 57FB91B28 for ; Wed, 22 May 2024 10:01:01 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1716372056.566d64d08eb5fc75d7b67debe24a103dc04c545f.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: xfce-base/xfce4-panel/files/, xfce-base/xfce4-panel/ X-VCS-Repository: repo/gentoo X-VCS-Files: xfce-base/xfce4-panel/files/xfce4-panel-4.19.4-build.patch xfce-base/xfce4-panel/xfce4-panel-4.19.4.ebuild X-VCS-Directories: xfce-base/xfce4-panel/files/ xfce-base/xfce4-panel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 566d64d08eb5fc75d7b67debe24a103dc04c545f X-VCS-Branch: master Date: Wed, 22 May 2024 10:01:01 +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: 0eede9d4-1f8e-4629-97cf-85d5e15a3b6b X-Archives-Hash: 749e5909548c947c0f6e2ff63fef2a09 commit: 566d64d08eb5fc75d7b67debe24a103dc04c545f Author: Michał Górny gentoo org> AuthorDate: Wed May 22 10:00:08 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed May 22 10:00:56 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=566d64d0 xfce-base/xfce4-panel: Backport missing include fix Closes: https://bugs.gentoo.org/932303 Signed-off-by: Michał Górny gentoo.org> .../files/xfce4-panel-4.19.4-build.patch | 148 +++++++++++++++++++++ xfce-base/xfce4-panel/xfce4-panel-4.19.4.ebuild | 6 + 2 files changed, 154 insertions(+) diff --git a/xfce-base/xfce4-panel/files/xfce4-panel-4.19.4-build.patch b/xfce-base/xfce4-panel/files/xfce4-panel-4.19.4-build.patch new file mode 100644 index 000000000000..7813ba1bb363 --- /dev/null +++ b/xfce-base/xfce4-panel/files/xfce4-panel-4.19.4-build.patch @@ -0,0 +1,148 @@ +From fcee4201e254a417f8146723b24ce0716840c96b Mon Sep 17 00:00:00 2001 +From: Nicholas Vinson +Date: Tue, 21 May 2024 01:10:10 +0200 +Subject: [PATCH] build: Add missing math.h includes + +Commit 0f786ce451297f8d26d41dc8492c10db08d8f87f added a math.h include +statement to libxfce4panel/xfce-panel-image.c to fix issue #833. +However, libm functions are used in more files than just +xfce-panel-image.c. + +Therefore, add math.h include to other files that use math functions. + +Signed-off-by: Nicholas Vinson +Fixes: https://bugs.gentoo.org/932303 +--- + panel/panel-base-window.c | 4 +++- + panel/panel-itembar.c | 4 ++++ + panel/panel-preferences-dialog.c | 4 +++- + plugins/clock/clock-analog.c | 4 ++++ + plugins/clock/clock-binary.c | 4 +++- + plugins/clock/clock-lcd.c | 4 ++++ + plugins/clock/clock.c | 4 ++++ + plugins/systray/systray-box.c | 4 ++++ + 8 files changed, 29 insertions(+), 3 deletions(-) + +diff --git a/panel/panel-base-window.c b/panel/panel-base-window.c +index 5e0f3a688..832520be6 100644 +--- a/panel/panel-base-window.c ++++ b/panel/panel-base-window.c +@@ -35,7 +35,9 @@ + #define gtk_layer_is_supported() FALSE + #endif + +- ++#ifdef HAVE_MATH_H ++#include ++#endif + + #define PANEL_BASE_CSS ".xfce4-panel.background { border-style: solid; }" \ + ".xfce4-panel.background button { background: transparent; padding: 0; }" \ +diff --git a/panel/panel-itembar.c b/panel/panel-itembar.c +index 4ffcb5ba4..11ccf5d1d 100644 +--- a/panel/panel-itembar.c ++++ b/panel/panel-itembar.c +@@ -29,6 +29,10 @@ + #include "libxfce4panel/libxfce4panel.h" + #include "libxfce4panel/xfce-panel-plugin-provider.h" + ++#ifdef HAVE_MATH_H ++#include ++#endif ++ + #define IS_HORIZONTAL(itembar) ((itembar)->mode == XFCE_PANEL_PLUGIN_MODE_HORIZONTAL) + #define HIGHLIGHT_SIZE 2 + +diff --git a/panel/panel-preferences-dialog.c b/panel/panel-preferences-dialog.c +index 9a54e9ab3..dfcc67db3 100644 +--- a/panel/panel-preferences-dialog.c ++++ b/panel/panel-preferences-dialog.c +@@ -37,7 +37,9 @@ + #include + #include + +- ++#ifdef HAVE_MATH_H ++#include ++#endif + + static void + panel_preferences_dialog_finalize (GObject *object); +diff --git a/plugins/clock/clock-analog.c b/plugins/clock/clock-analog.c +index ae4ae21f4..50196352d 100644 +--- a/plugins/clock/clock-analog.c ++++ b/plugins/clock/clock-analog.c +@@ -27,6 +27,10 @@ + + #include + ++#ifdef HAVE_MATH_H ++#include ++#endif ++ + #define CLOCK_SCALE 0.08 + #define TICKS_TO_RADIANS(x) (G_PI - (G_PI / 30.0) * (x)) + #define HOURS_TO_RADIANS(x, y) (G_PI - (G_PI / 6.0) * (((x) > 12 ? (x) - 12 : (x)) + (y) / 60.0)) +diff --git a/plugins/clock/clock-binary.c b/plugins/clock/clock-binary.c +index 5ac4151af..36fe31c72 100644 +--- a/plugins/clock/clock-binary.c ++++ b/plugins/clock/clock-binary.c +@@ -27,7 +27,9 @@ + + #include + +- ++#ifdef HAVE_MATH_H ++#include ++#endif + + static void + xfce_clock_binary_set_property (GObject *object, +diff --git a/plugins/clock/clock-lcd.c b/plugins/clock/clock-lcd.c +index 97e041d58..8b7454dfd 100644 +--- a/plugins/clock/clock-lcd.c ++++ b/plugins/clock/clock-lcd.c +@@ -27,6 +27,10 @@ + + #include + ++#ifdef HAVE_MATH_H ++#include ++#endif ++ + #define RELATIVE_SPACE (0.10) + #define RELATIVE_DIGIT (5 * RELATIVE_SPACE) + #define RELATIVE_DOTS (3 * RELATIVE_SPACE) +diff --git a/plugins/clock/clock.c b/plugins/clock/clock.c +index 472ff8f17..ee1d4402b 100644 +--- a/plugins/clock/clock.c ++++ b/plugins/clock/clock.c +@@ -39,6 +39,10 @@ + #include + #include + ++#ifdef HAVE_MATH_H ++#include ++#endif ++ + /* TRANSLATORS: adjust this accordingly for your locale format */ + #define DEFAULT_TOOLTIP_FORMAT NC_ ("Date", "%A %d %B %Y") + +diff --git a/plugins/systray/systray-box.c b/plugins/systray/systray-box.c +index 1fc22c925..f808acb97 100644 +--- a/plugins/systray/systray-box.c ++++ b/plugins/systray/systray-box.c +@@ -27,6 +27,10 @@ + #include "common/panel-debug.h" + #include "common/panel-private.h" + ++#ifdef HAVE_MATH_H ++#include ++#endif ++ + #define SPACING (2) + #define OFFSCREEN (-9999) + +-- +GitLab + diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.19.4.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.19.4.ebuild index 6329f2e10d87..909458cf5c95 100644 --- a/xfce-base/xfce4-panel/xfce4-panel-4.19.4.ebuild +++ b/xfce-base/xfce4-panel/xfce4-panel-4.19.4.ebuild @@ -54,6 +54,12 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + # fix build with USE=-wayland + # https://gitlab.xfce.org/xfce/xfce4-panel/-/issues/833 + "${FILESDIR}/${P}-build.patch" +) + src_configure() { local myconf=( $(use_enable introspection)