[Pkg-xfce-commits] [Git][xfce-team/goodies/xfce4-sensors-plugin][debian/master] 6 commits: d/watch: use uscan special strings
Yves-Alexis Perez
gitlab at salsa.debian.org
Wed Nov 4 12:54:50 GMT 2020
Yves-Alexis Perez pushed to branch debian/master at xfce / goodies / xfce4-sensors-plugin
Commits:
8d806574 by Yves-Alexis Perez at 2020-11-02T18:32:00+01:00
d/watch: use uscan special strings
- - - - -
b8052b82 by Yves-Alexis Perez at 2020-11-04T11:54:46+01:00
d/patches: import 108ffac from upstream to fix FTBFS
Closes: #957977
- - - - -
5b80b695 by Yves-Alexis Perez at 2020-11-04T11:59:05+01:00
lintian overrides: drop unused override
- - - - -
1d3b265b by Yves-Alexis Perez at 2020-11-04T12:02:43+01:00
d/control: update standards version to 4.5.0
- - - - -
4dc4aceb by Yves-Alexis Perez at 2020-11-04T12:02:56+01:00
finalize changelog
- - - - -
78c79ced by Yves-Alexis Perez at 2020-11-04T12:03:06+01:00
upload xfce4-sensors-plugin 1.3.92-2 to experimental
- - - - -
6 changed files:
- debian/changelog
- debian/control
- + debian/patches/0001-Fix-multiple-definition-errors-under-GCC-10.0.patch
- + debian/patches/series
- debian/watch
- debian/xfce4-sensors-plugin.lintian-overrides
Changes:
=====================================
debian/changelog
=====================================
@@ -1,5 +1,6 @@
-xfce4-sensors-plugin (1.3.92-2) UNRELEASED; urgency=medium
+xfce4-sensors-plugin (1.3.92-2) experimental; urgency=medium
+ [ Debian Janitor ]
* Trim trailing whitespace.
* Use secure copyright file specification URI.
* Bump debhelper from old 11 to 12.
@@ -8,7 +9,13 @@ xfce4-sensors-plugin (1.3.92-2) UNRELEASED; urgency=medium
* Fix field name typos in debian/copyright.
* Update standards version to 4.4.1, no changes needed.
- -- Debian Janitor <janitor at jelmer.uk> Wed, 25 Dec 2019 07:01:20 +0000
+ [ Yves-Alexis Perez ]
+ * d/watch: use uscan special strings
+ * d/patches: import 108ffac from upstream to fix FTBFS (Closes: #957977)
+ * lintian overrides: drop unused override
+ * d/control: update standards version to 4.5.0
+
+ -- Yves-Alexis Perez <corsac at debian.org> Wed, 04 Nov 2020 12:03:02 +0100
xfce4-sensors-plugin (1.3.92-1) experimental; urgency=medium
=====================================
debian/control
=====================================
@@ -15,7 +15,7 @@ Build-Depends: debhelper-compat (= 12),
libxml2-dev,
libxnvctrl-dev,
xfce4-dev-tools
-Standards-Version: 4.4.1
+Standards-Version: 4.5.0
Homepage: https://goodies.xfce.org/
Vcs-Git: https://salsa.debian.org/xfce-team/goodies/xfce4-sensors-plugin.git
Vcs-Browser: https://salsa.debian.org/xfce-team/goodies/xfce4-sensors-plugin
=====================================
debian/patches/0001-Fix-multiple-definition-errors-under-GCC-10.0.patch
=====================================
@@ -0,0 +1,111 @@
+From: Robin Lee <cheeselee at fedoraproject.org>
+Date: Mon, 24 Feb 2020 17:52:39 +0800
+Subject: Fix multiple definition errors under GCC 10.0
+
+Fixes issue #9, RHBZ#1800268
+---
+ 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 <libxfce4panel/xfce-panel-plugin.h>
+
+ /* Local/package includes */
++#define XFCE4_SENSORS_INTERFACE_COMMON_DEFINING
+ #include <configuration.h>
+ #include <sensors-interface-common.h>
+ #include <middlelayer.h>
=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+0001-Fix-multiple-definition-errors-under-GCC-10.0.patch
=====================================
debian/watch
=====================================
@@ -1,3 +1,3 @@
version=3
-https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/([\d\.]+)/ \
- xfce4-sensors-plugin-([\d\.]+)\.tar\.(?:gz|bz2)
+https://archive.xfce.org/src/panel-plugins/@PACKAGE@/(\d[\d\.]+)/ \
+ @PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@
=====================================
debian/xfce4-sensors-plugin.lintian-overrides
=====================================
@@ -1,3 +1,2 @@
# we do use fortify and ssp
-xfce4-sensors-plugin: hardening-no-stackprotector usr/bin/xfce4-sensors
xfce4-sensors-plugin: hardening-no-fortify-functions usr/lib/*/xfce4/modules/libxfce4sensors.so.*.*.*
View it on GitLab: https://salsa.debian.org/xfce-team/goodies/xfce4-sensors-plugin/-/compare/0776f464823eb560cd7005e30e9e3531db2a2b16...78c79cedbf0c9a09bc12b232ac30f84e30ab0f69
--
View it on GitLab: https://salsa.debian.org/xfce-team/goodies/xfce4-sensors-plugin/-/compare/0776f464823eb560cd7005e30e9e3531db2a2b16...78c79cedbf0c9a09bc12b232ac30f84e30ab0f69
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-xfce-commits/attachments/20201104/b99d9dbe/attachment-0001.html>
More information about the Pkg-xfce-commits
mailing list