DIST xfce4-panel-4.19.4.tar.bz2 2237827 BLAKE2B 2f302a665c875cebf3d1017b13b658654bc9c0f1d498bc55e6d1fde036f2919759a9a77cbd06567796c43f34ce27d198391c10eed3c40907626a275e788e4b19 SHA512 c02d20931ec53817676a7c1c48b91075d79fbfd64ca0ecfe8d581d4206e86d7fb4893bcb8c2bd1e1bdf5040da0077e82a51988681928327fc791232af134fc8b

Gentoo bug https://bugs.gentoo.org/932303

From fcee4201e254a417f8146723b24ce0716840c96b Mon Sep 17 00:00:00 2001

From: Nicholas Vinson <nvinson234@gmail.com>

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 <nvinson234 at gmail.com>

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 <math.h>

+#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 <math.h>

+#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 <libxfce4ui/libxfce4ui.h>

 #include <libxfce4util/libxfce4util.h>

-

+#ifdef HAVE_MATH_H

+#include<math.h>

+#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 <cairo/cairo.h>

+#ifdef HAVE_MATH_H

+#include <math.h>

+#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 <cairo/cairo.h>

-

+#ifdef HAVE_MATH_H

+#include <math.h>

+#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 <cairo/cairo.h>

+#ifdef HAVE_MATH_H

+#include <math.h>

+#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 <gtk/gtk.h>

 #include <libxfce4ui/libxfce4ui.h>

+#ifdef HAVE_MATH_H

+#include <math.h>

+#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 <math.h>

+#endif

+

 #define SPACING (2)

 #define OFFSCREEN (-9999)

-- 

GitLab

# Copyright 1999-2024 Gentoo Authors

# Distributed under the terms of the GNU General Public License v2

EAPI=8

inherit vala xdg-utils

DESCRIPTION="Panel for the Xfce desktop environment"

HOMEPAGE="

	https://docs.xfce.org/xfce/xfce4-panel/start

	https://gitlab.xfce.org/xfce/xfce4-panel/

"

SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"

LICENSE="GPL-2+ LGPL-2.1+"

SLOT="0"

KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"

IUSE="+dbusmenu introspection vala wayland X"

REQUIRED_USE="

	|| ( wayland X )

	vala? ( introspection )

"

DEPEND="

	>=dev-libs/glib-2.72.0

	>=x11-libs/cairo-1.16.0

	>=x11-libs/gtk+-3.24.0:3[X?,introspection?,wayland?]

	>=xfce-base/exo-0.11.2:=

	>=xfce-base/garcon-4.17.0:=

	>=xfce-base/libxfce4ui-4.17.1:=

	>=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?]

	>=xfce-base/libxfce4windowing-4.19.3:=[X?]

	>=xfce-base/xfconf-4.13.2:=

	dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] )

	introspection? ( >=dev-libs/gobject-introspection-1.66:= )

	wayland? (

		>=dev-libs/wayland-1.15

		>=gui-libs/gtk-layer-shell-0.7.0

	)

	X? (

		>=x11-libs/libX11-1.6.7

		x11-libs/libwnck:3

	)

"

RDEPEND="

	${DEPEND}

"

BDEPEND="

	vala? ( $(vala_depend) )

	dev-lang/perl

	dev-util/gdbus-codegen

	dev-util/intltool

	sys-devel/gettext

	virtual/pkgconfig

"

PATCHES=(

	${FILESDIR}/math-includes.patch

)

src_configure() {

	local myconf=(

		$(use_enable introspection)

		$(use_enable dbusmenu dbusmenu-gtk3)

		$(use_enable vala)

		$(use_enable wayland)

		$(use_enable wayland gtk-layer-shell)

		$(use_enable X x11)

	)

	use vala && vala_setup

	econf "${myconf[@]}"

}

src_install() {

	default

	find "${D}" -name '*.la' -delete || die

}

pkg_postinst() {

	xdg_icon_cache_update

	xdg_desktop_database_update

}

pkg_postrm() {

	xdg_icon_cache_update

	xdg_desktop_database_update

}