Init package

This commit is contained in:
dillon chen 2020-07-27 17:11:55 +08:00
parent 3247e89961
commit 0c859f7c41
3 changed files with 189 additions and 0 deletions

View File

@ -0,0 +1,115 @@
From 6c6de7c07290248a3c72a50c7790885ee4bc13a2 Mon Sep 17 00:00:00 2001
From: Robin Lee <cheeselee@fedoraproject.org>
Date: Mon, 24 Feb 2020 17:52:39 +0800
Subject: [PATCH] Fix multiple definition errors under GCC 10.0
Fixes #16436, 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>
--
2.24.1

Binary file not shown.

74
xfce4-sensors-plugin.spec Normal file
View File

@ -0,0 +1,74 @@
%global xfceversion 4.14
Name: xfce4-sensors-plugin
Version: 1.3.92
Release: 1
Summary: Hardware sensors plugin for the Xfce panel
License: GPLv2+
#Group: Development/Libraries
URL: http://goodies.xfce.org/projects/panel-plugins/%{name}
Source0: http://archive.xfce.org/src/panel-plugins/%{name}/1.3/%{name}-%{version}.tar.bz2
Patch0: 0001-Fix-multiple-definition-errors-under-GCC-10.0.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#BuildArch: noarch
BuildRequires: libnotify-devel >= 0.4
BuildRequires: libxfce4ui-devel >= %{xfceversion}
BuildRequires: lm_sensors-devel >= 2.8
BuildRequires: xfce4-panel-devel >= %{xfceversion}
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: hddtemp
BuildRequires: intltool
BuildRequires: libtool
Requires: hddtemp
Requires: libxfce4util-devel
Requires: lm_sensors >= 2.8
Requires: xfce4-panel >= %{xfceversion}
%description
The sensors plugin provides a handy way to monitor your hard disk,
processor, fans, and other critical hardware right on your Xfce panel.
%prep
%autosetup -p1
%build
%configure --disable-static \
--enable-sysfsacpi=yes \
--with-pathhddtemp=%{_bindir}/hddtemp
%make_build
%install
%make_install
%find_lang %{name}
# remove la file
find %{buildroot} -name '*.la' -exec rm -f {} ';'
desktop-file-install --vendor "" \
--add-category "System" \
--remove-category "Utility" \
--dir %{buildroot}%{_datadir}/applications \
--delete-original \
%{buildroot}%{_datadir}/applications/xfce4-sensors.desktop
%files -f %{name}.lang
%license COPYING
%doc AUTHORS ChangeLog NEWS README TODO
%{_bindir}/xfce4-sensors
%dir %{_libdir}/xfce4/modules/
%{_libdir}/pkgconfig/libxfce4sensors-1.0.pc
%{_libdir}/xfce4/modules/libxfce4sensors.so
%{_libdir}/xfce4/modules/libxfce4sensors.so.*
%{_libdir}/xfce4/panel/plugins/libxfce4-sensors-plugin.so
%{_datadir}/applications/xfce4-sensors.desktop
%{_datadir}/icons/hicolor/*/apps/xfce-sensors.png
%{_datadir}/icons/hicolor/scalable/apps/xfce-sensors.svg
%{_datadir}/xfce4/panel/plugins/xfce4-sensors-plugin.*
%{_mandir}/man1/xfce4-sensors.1.gz
%changelog
* Mon Jul 27 2020 Dillon Chen <dillon.chen@turbolinux.com.cn> - 1.3.92-1
- Init package