[gentoo-commits] repo/gentoo:master commit in: mate-extra/mate-sensors-applet/, mate-extra/mate-sensors-applet/files/

[gentoo-commits] repo/gentoo:master commit in: mate-extra/mate-sensors-applet/, mate-extra/mate-sensors-applet/files/

[Sam James]

commit:     2e2f143876b32fbaeae7e1d59e79cbe340612c76
Author:     Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Mon May  8 18:09:23 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May  9 17:50:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e2f1438

mate-extra/mate-sensors-applet: fix undeclared function setlocale

Closes: https://bugs.gentoo.org/896200
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/30937
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...lang-16-fix-undeclared-function-setlocale.patch | 130 +++++++++++++++++++++
 .../mate-sensors-applet-1.26.0-r1.ebuild           |  65 +++++++++++
 2 files changed, 195 insertions(+)

diff --git a/mate-extra/mate-sensors-applet/files/1.26.0-clang-16-fix-undeclared-function-setlocale.patch b/mate-extra/mate-sensors-applet/files/1.26.0-clang-16-fix-undeclared-function-setlocale.patch
new file mode 100644
index 000000000000..a0b83dba38b2
--- /dev/null
+++ b/mate-extra/mate-sensors-applet/files/1.26.0-clang-16-fix-undeclared-function-setlocale.patch
@@ -0,0 +1,130 @@
+From 3ff9fb450aa2a28221fcd863bf7913e84eeeb7ba Mon Sep 17 00:00:00 2001
+From: listout <brahmajit.xyz@gmail.com>
+Date: Fri, 5 May 2023 11:07:20 +0530
+Subject: [PATCH] unconditionally include stdio.h and locale.h
+
+On musl mate-sensor-applet fails to build with error message saying
+"LC_NUMERIC undeclared". As suggested in issue mate-desktop#123, removing the include
+guards around #include <local.h> and #include <stdio.h>
+
+Upstream commit: https://patch-diff.githubusercontent.com/raw/mate-desktop/mate-sensors-applet/pull/128.patch
+Bug: https://bugs.gentoo.org/896200
+Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>
+--- a/configure.ac
++++ b/configure.ac
+@@ -38,7 +38,6 @@ AC_SUBST(LIBS)
+ AC_CHECK_HEADERS(
+ 	stdlib.h \
+ 	string.h \
+-	stdio.h \
+ 	sys/types.h \
+ 	sys/socket.h \
+ 	netinet/in.h \
+--- a/plugins/acpi/acpi-plugin.c
++++ b/plugins/acpi/acpi-plugin.c
+@@ -21,10 +21,7 @@
+ #include <config.h>
+ #endif /* HAVE_CONFIG_H */
+
+-#ifdef HAVE_STDIO_H
+ #include <stdio.h>
+-#endif /* HAVE_STDIO_H */
+-
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ #include "acpi-plugin.h"
+--- a/plugins/i2c-proc/i2c-proc-plugin.c
++++ b/plugins/i2c-proc/i2c-proc-plugin.c
+@@ -21,14 +21,8 @@
+ #include <config.h>
+ #endif /* HAVE_CONFIG_H */
+
+-#ifdef HAVE_STDIO_H
+ #include <stdio.h>
+-#endif /* HAVE_STDIO_H */
+-
+-#ifdef HAVE_LOCALE_H
+ #include <locale.h>
+-#endif
+-
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ #include "i2c-proc-plugin.h"
+--- a/plugins/i2c-sys/i2c-sys-plugin.c
++++ b/plugins/i2c-sys/i2c-sys-plugin.c
+@@ -21,10 +21,7 @@
+ #include <config.h>
+ #endif /* HAVE_CONFIG_H */
+
+-#ifdef HAVE_STDIO_H
+ #include <stdio.h>
+-#endif /* HAVE_STDIO_H */
+-
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ #include "i2c-sys-plugin.h"
+--- a/plugins/i8k/i8k-plugin.c
++++ b/plugins/i8k/i8k-plugin.c
+@@ -21,10 +21,7 @@
+ #include <config.h>
+ #endif /* HAVE_CONFIG_H */
+
+-#ifdef HAVE_STDIO_H
+ #include <stdio.h>
+-#endif /* HAVE_STDIO_H */
+-
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ #include "i8k-plugin.h"
+--- a/plugins/ibm-acpi/ibm-acpi-plugin.c
++++ b/plugins/ibm-acpi/ibm-acpi-plugin.c
+@@ -21,10 +21,7 @@
+ #include "config.h"
+ #endif /* HAVE_CONFIG_H */
+
+-#ifdef HAVE_STDIO_H
+ #include <stdio.h>
+-#endif /* HAVE_STDIO_H */
+-
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ #include "ibm-acpi-plugin.h"
+--- a/plugins/omnibook/omnibook-plugin.c
++++ b/plugins/omnibook/omnibook-plugin.c
+@@ -21,10 +21,7 @@
+ #include "config.h"
+ #endif /* HAVE_CONFIG_H */
+
+-#ifdef HAVE_STDIO_H
+ #include <stdio.h>
+-#endif /* HAVE_STDIO_H */
+-
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ #include "omnibook-plugin.h"
+--- a/plugins/pmu-sys/pmu-sys-plugin.c
++++ b/plugins/pmu-sys/pmu-sys-plugin.c
+@@ -21,10 +21,7 @@
+ #include "config.h"
+ #endif /* HAVE_CONFIG_H */
+
+-#ifdef HAVE_STDIO_H
+ #include <stdio.h>
+-#endif /* HAVE_STDIO_H */
+-
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ #include "pmu-sys-plugin.h"
+--- a/plugins/smu-sys/smu-sys-plugin.c
++++ b/plugins/smu-sys/smu-sys-plugin.c
+@@ -21,10 +21,7 @@
+ #include "config.h"
+ #endif /* HAVE_CONFIG_H */
+
+-#ifdef HAVE_STDIO_H
+ #include <stdio.h>
+-#endif /* HAVE_STDIO_H */
+-
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ #include "smu-sys-plugin.h"

diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.26.0-r1.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.26.0-r1.ebuild
new file mode 100644
index 000000000000..47853d0d23d7
--- /dev/null
+++ b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.26.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~loong ~riscv ~x86"
+fi
+
+DESCRIPTION="MATE panel applet to display readings from hardware sensors"
+LICENSE="FDL-1.1+ GPL-2+"
+SLOT="0"
+
+IUSE="+dbus hddtemp libnotify lm-sensors video_cards_nvidia"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.50:2
+	>=mate-base/mate-panel-1.17.0
+	>=x11-libs/cairo-1.0.4
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	hddtemp? ( >=app-admin/hddtemp-0.3_beta13 )
+	libnotify? ( >=x11-libs/libnotify-0.7 )
+	lm-sensors? ( sys-apps/lm-sensors )
+	video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+"
+
+BDEPEND="${COMMON_DEPEND}
+	app-text/rarian
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PDEPEND="hddtemp? ( dbus? ( sys-fs/udisks:2 ) )"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-clang-16-fix-undeclared-function-setlocale.patch
+)
+
+src_configure() {
+	local udisks
+
+	if use hddtemp && use dbus; then
+		udisks="--enable-udisks2"
+	else
+		udisks="--disable-udisks2"
+	fi
+
+	mate_src_configure \
+		--disable-netbsd \
+		$(use_enable libnotify) \
+		$(use_with lm-sensors libsensors) \
+		$(use_with video_cards_nvidia nvidia) \
+		${udisks}
+}

[gentoo-commits] repo/gentoo:master commit in: mate-extra/mate-sensors-applet/, mate-extra/mate-sensors-applet/files/

[Sam James]

commit:     052b63d2d346d46c33052d126cdb46f4d93b4131
Author:     Ian Jordan <immoloism <AT> gmail <DOT> com>
AuthorDate: Thu Jul 10 07:10:00 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 13 06:45:52 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=052b63d2

mate-extra/mate-sensors-applet: Fix an invalid pointer crash

Fix an invalid pointer crash with glib 2.83.2
The typecast to non-const gchar produced invalid pointer errors on free() with glib 2.83.2

Not entirely sure why this wasn't included with 1.28.0 release, however as a Gentoo user has reported it resolves the issue for them and Fedora are using the same patch in https://bugzilla.redhat.com/show_bug.cgi?id=2326719 then I see no issue to cherrypick this before the 1.28.1 release.

Closes: https://bugs.gentoo.org/959761
Signed-off-by: Ian Jordan <immoloism <AT> gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/42944
Closes: https://github.com/gentoo/gentoo/pull/42944
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...ate-sensors-applet-1.28.0-invalid-pointer.patch | 45 +++++++++++++++
 .../mate-sensors-applet-1.28.0-r1.ebuild           | 65 ++++++++++++++++++++++
 2 files changed, 110 insertions(+)

diff --git a/mate-extra/mate-sensors-applet/files/mate-sensors-applet-1.28.0-invalid-pointer.patch b/mate-extra/mate-sensors-applet/files/mate-sensors-applet-1.28.0-invalid-pointer.patch
new file mode 100644
index 000000000000..aebe84572e56
--- /dev/null
+++ b/mate-extra/mate-sensors-applet/files/mate-sensors-applet-1.28.0-invalid-pointer.patch
@@ -0,0 +1,45 @@
+From: https://github.com/mate-desktop/mate-sensors-applet/commit/9b74dc16d852a40d37f7ce6c236406959fd013e5
+From: lukefromdc <lukefromdc@hushmail.com>
+Date: Mon, 13 Jan 2025 22:39:13 -0500
+Subject: [PATCH] Fix an invalid pointer crash with glib 2.83.2
+
+The typecast to non-const gchar produced invalid pointer errors on free() with glib 2.83.2
+--- a/plugins/udisks2/udisks2-plugin.c
++++ b/plugins/udisks2/udisks2-plugin.c
+@@ -304,16 +304,15 @@ syslog(LOG_ERR, "propdict2 type: %s", g_variant_print(propdict2, TRUE));
+ #endif
+ 
+             /* get data */
+-            gchar *id = NULL;
+-            gchar *model = NULL;
++            const gchar *id = NULL;
++            const gchar *model = NULL;
+ 
+             gboolean smartenabled;
+             gdouble temp;
+ 
+-            /* NULL, bc we don't care about the length of the string
+-             * typecast bc g_variant_get_string() returns const char* */
+-            id = (gchar *) g_variant_get_string (g_variant_lookup_value (propdict, "Id", G_VARIANT_TYPE_STRING), NULL);
+-            model = (gchar *) g_variant_get_string (g_variant_lookup_value (propdict, "Model", G_VARIANT_TYPE_STRING), NULL);
++            /* NULL, bc we don't care about the length of the string*/
++            id = g_variant_get_string (g_variant_lookup_value (propdict, "Id", G_VARIANT_TYPE_STRING), NULL);
++            model = g_variant_get_string (g_variant_lookup_value (propdict, "Model", G_VARIANT_TYPE_STRING), NULL);
+ 
+             smartenabled = g_variant_get_boolean (g_variant_lookup_value (propdict2, "SmartEnabled", G_VARIANT_TYPE_BOOLEAN));
+             temp = g_variant_get_double (g_variant_lookup_value (propdict2, "SmartTemperature", G_VARIANT_TYPE_DOUBLE));
+@@ -366,14 +365,6 @@ syslog(LOG_ERR, "No temp data for device: %s\n", key);
+ 
+                 g_debug ("No temp data for device: %s\n", key);
+             }
+-
+-#ifdef UD2PD
+-syslog(LOG_ERR, "b4 free1");
+-#endif
+-
+-            g_free (id);
+-            g_free (model);
+-
+         }
+ 
+ #ifdef UD2PD

diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.28.0-r1.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.28.0-r1.ebuild
new file mode 100644
index 000000000000..225c5ad305ab
--- /dev/null
+++ b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.28.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+MINOR=$(($(ver_cut 2) % 2))
+if [[ ${MINOR} -eq 0 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
+fi
+
+DESCRIPTION="MATE panel applet to display readings from hardware sensors"
+LICENSE="FDL-1.1+ GPL-2+"
+SLOT="0"
+
+IUSE="+dbus hddtemp libnotify lm-sensors video_cards_nvidia"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.50:2
+	>=mate-base/mate-panel-1.28.0
+	>=x11-libs/cairo-1.0.4
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	hddtemp? ( >=app-admin/hddtemp-0.3_beta13 )
+	libnotify? ( >=x11-libs/libnotify-0.7 )
+	lm-sensors? ( sys-apps/lm-sensors )
+	video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools] )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+"
+
+BDEPEND="${COMMON_DEPEND}
+	app-text/rarian
+	app-text/yelp-tools
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PDEPEND="hddtemp? ( dbus? ( sys-fs/udisks:2 ) )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.28.0-invalid-pointer.patch #959761
+)
+
+src_configure() {
+	local udisks
+
+	if use hddtemp && use dbus; then
+		udisks="--enable-udisks2"
+	else
+		udisks="--disable-udisks2"
+	fi
+
+	mate_src_configure \
+		--disable-netbsd \
+		$(use_enable libnotify) \
+		$(use_with lm-sensors libsensors) \
+		$(use_with video_cards_nvidia nvidia) \
+		${udisks}
+}