From 1f850bd714c3394db6c2dcc564d8259ec8310703 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Wed, 6 Jan 2021 16:17:10 +0100 Subject: xfce4-sensors-plugin: upgrade 1.3.92 -> 1.3.95 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit First version compatible to xfce 4.16 Release notes for 1.3.95 ======================== Updated translations; code cleanups (thanks to all contributors and Xfce dev team); compatibility to Xfce 4.16. Signed-off-by: Andreas Müller Signed-off-by: Khem Raj --- ...multiple-definition-errors-under-GCC-10.0.patch | 118 --------------------- .../sensors/xfce4-sensors-plugin_1.3.92.bb | 28 ----- .../sensors/xfce4-sensors-plugin_1.3.95.bb | 25 +++++ 3 files changed, 25 insertions(+), 146 deletions(-) delete mode 100644 meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Fix-multiple-definition-errors-under-GCC-10.0.patch delete mode 100644 meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb create mode 100644 meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.95.bb (limited to 'meta-xfce') diff --git a/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Fix-multiple-definition-errors-under-GCC-10.0.patch b/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Fix-multiple-definition-errors-under-GCC-10.0.patch deleted file mode 100644 index 30cb487c8..000000000 --- a/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin/0001-Fix-multiple-definition-errors-under-GCC-10.0.patch +++ /dev/null @@ -1,118 +0,0 @@ -From 6c6de7c07290248a3c72a50c7790885ee4bc13a2 Mon Sep 17 00:00:00 2001 -From: Robin Lee -Date: Mon, 24 Feb 2020 17:52:39 +0800 -Subject: [PATCH] Fix multiple definition errors under GCC 10.0 - -Fixes #16436, RHBZ#1800268 - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - include/sensors-interface-common.h | 22 ++++++++++++++-------- - lib/sensors-interface-common.c | 1 + - 2 files changed, 15 insertions(+), 8 deletions(-) - -diff --git a/include/sensors-interface-common.h b/include/sensors-interface-common.h -index 62a27eb..05146c5 100644 ---- a/include/sensors-interface-common.h -+++ b/include/sensors-interface-common.h -@@ -146,6 +146,12 @@ t_sensors_dialog; - - - -+#ifdef XFCE4_SENSORS_INTERFACE_COMMON_DEFINING -+#define EXTERN -+#else -+#define EXTERN extern -+#endif -+ - /* Extern functions that need to be re-implemented in the sensors-viewer and - * the panel code. - * They kind of need to be registered at the library by any software -@@ -157,7 +163,7 @@ t_sensors_dialog; - * @param ptr_widget: Pointer to original widget, i.e, the update timer box - * @param ptr_sensorsdialog: argument pointer to sensors dialog data - */ --void -+EXTERN void - (*adjustment_value_changed) (GtkWidget *ptr_widget, - t_sensors_dialog *ptr_sensorsdialog); - -@@ -167,7 +173,7 @@ void - * @param ptr_widget: Pointer to original widget, i.e, the sensor entry combobox - * @param ptr_sensorsdialog: argument pointer to sensors dialog data - */ --void -+EXTERN void - (*sensor_entry_changed) (GtkWidget *ptr_widget, - t_sensors_dialog *ptr_sensorsdialog); - -@@ -178,7 +184,7 @@ void - * @param ptr_str_newtext: Pointer to the string containing the new label - * @param ptr_sensorsdialog: argument pointer to sensors dialog data - */ --void -+EXTERN void - (*list_cell_text_edited) (GtkCellRendererText *ptr_cellrenderertext, - gchar *ptr_str_path, gchar *ptr_str_newtext, - t_sensors_dialog *ptr_sensorsdialog); -@@ -189,7 +195,7 @@ void - * @param ptr_str_path: pointer to the string with the path of the changed item - * @param ptr_sensorsdialog: argument pointer to sensors dialog data - */ --void -+EXTERN void - (*list_cell_toggle) (GtkCellRendererToggle *ptr_cellrenderertoggle, gchar *ptr_str_path, - t_sensors_dialog *ptr_sensorsdialog); - -@@ -201,7 +207,7 @@ void - * hexadecimal rgb format #0011ff - * @param ptr_sensorsdialog: argument pointer to sensors dialog data - */ --void -+EXTERN void - (*list_cell_color_edited) (GtkCellRendererText *ptr_cellrenderertext, - gchar *ptr_str_path, gchar *ptr_str_newcolor, - t_sensors_dialog *ptr_sensorsdialog); -@@ -214,7 +220,7 @@ void - * temperature - * @param ptr_sensorsdialog: argument pointer to sensors dialog data - */ --void -+EXTERN void - (*minimum_changed) (GtkCellRendererText *ptr_cellrenderertext, gchar *ptr_str_path, - gchar *ptr_str_newmin, t_sensors_dialog *ptr_sensorsdialog); - -@@ -226,7 +232,7 @@ void - * temperature - * @param ptr_sensorsdialog: argument pointer to sensors dialog data - */ --void -+EXTERN void - (*maximum_changed) (GtkCellRendererText *ptr_cellrenderertext, gchar *ptr_str_path, - gchar *ptr_str_newmax, t_sensors_dialog *ptr_sensorsdialog); - -@@ -236,7 +242,7 @@ void - * @param ptr_widget: Pointer to original widget, i.e, the update timer box - * @param ptr_sensorsdialog: argument pointer to sensors dialog data - */ --void -+EXTERN void - (*temperature_unit_change) (GtkWidget *ptr_widget, - t_sensors_dialog *ptr_sensorsdialog); - -diff --git a/lib/sensors-interface-common.c b/lib/sensors-interface-common.c -index 70aa154..8c79f1d 100644 ---- a/lib/sensors-interface-common.c -+++ b/lib/sensors-interface-common.c -@@ -28,6 +28,7 @@ - #include - - /* Local/package includes */ -+#define XFCE4_SENSORS_INTERFACE_COMMON_DEFINING - #include - #include - #include --- -2.24.1 - diff --git a/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb b/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb deleted file mode 100644 index aa5fe019d..000000000 --- a/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.92.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Sensors plugin for the Xfce Panel" -HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b94789bed9aec03b9656a9cc5398c706" - -inherit xfce-panel-plugin - -SRC_URI[md5sum] = "7327c4c316ebd5d93665e77b432b8d89" -SRC_URI[sha256sum] = "3dc6643d2c064b7718badff44b948f8d410f00f13db197820b26ae38045f5112" -SRC_URI += "file://0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch \ - file://0001-Fix-multiple-definition-errors-under-GCC-10.0.patch \ - " - -EXTRA_OECONF = " \ - --disable-procacpi \ - --disable-xnvctrl \ -" - -do_configure_prepend() { - sed -i 's:LIBSENSORS_CFLAGS=.*:LIBSENSORS_CFLAGS=-I${STAGING_INCDIR}:g' ${S}/configure.ac -} - -PACKAGECONFIG[libsensors] = "--enable-libsensors,--disable-libsensors, lmsensors" -PACKAGECONFIG[hddtemp] = "--enable-hddtemp,--disable-hddtemp, hddtemp" -PACKAGECONFIG[netcat] = "--enable-netcat,--disable-netcat, netcat" -PACKAGECONFIG[libnotify] = "--enable-notification,--disable-notification, libnotify" - -FILES_SOLIBSDEV = "${libdir}/xfce4/modules/lib*${SOLIBSDEV}" diff --git a/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.95.bb b/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.95.bb new file mode 100644 index 000000000..3c7fa9a91 --- /dev/null +++ b/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.3.95.bb @@ -0,0 +1,25 @@ +SUMMARY = "Sensors plugin for the Xfce Panel" +HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b94789bed9aec03b9656a9cc5398c706" + +inherit xfce-panel-plugin + +SRC_URI[sha256sum] = "83c64ae4618dd592971cfa0bc285a9b47af801a3ed856835cdb2a4c533c7846c" +SRC_URI += "file://0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch" + +EXTRA_OECONF = " \ + --disable-procacpi \ + --disable-xnvctrl \ +" + +do_configure_prepend() { + sed -i 's:LIBSENSORS_CFLAGS=.*:LIBSENSORS_CFLAGS=-I${STAGING_INCDIR}:g' ${S}/configure.ac +} + +PACKAGECONFIG[libsensors] = "--enable-libsensors,--disable-libsensors, lmsensors" +PACKAGECONFIG[hddtemp] = "--enable-hddtemp,--disable-hddtemp, hddtemp" +PACKAGECONFIG[netcat] = "--enable-netcat,--disable-netcat, netcat" +PACKAGECONFIG[libnotify] = "--enable-notification,--disable-notification, libnotify" + +FILES_SOLIBSDEV = "${libdir}/xfce4/modules/lib*${SOLIBSDEV}" -- cgit v1.2.3-54-g00ecf