upgrade to 1.3.95 for xfce 4.16
Split out devel
This commit is contained in:
linz
parent
51a5380248
commit
94b67a1c98
@ -1,115 +0,0 @@
|
||||
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.
BIN
xfce4-sensors-plugin-1.3.95.tar.bz2
Normal file
BIN
xfce4-sensors-plugin-1.3.95.tar.bz2
Normal file
Binary file not shown.
@ -1,16 +1,15 @@
|
||||
%global xfceversion 4.14
|
||||
%global minorversion 1.3
|
||||
%global xfceversion 4.16
|
||||
|
||||
Name: xfce4-sensors-plugin
|
||||
Version: 1.3.92
|
||||
Version: 1.3.95
|
||||
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
|
||||
Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2
|
||||
|
||||
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
|
||||
@ -20,8 +19,8 @@ BuildRequires: gettext
|
||||
BuildRequires: hddtemp
|
||||
BuildRequires: intltool
|
||||
BuildRequires: libtool
|
||||
|
||||
Requires: hddtemp
|
||||
Requires: libxfce4util-devel
|
||||
Requires: lm_sensors >= 2.8
|
||||
Requires: xfce4-panel >= %{xfceversion}
|
||||
|
||||
@ -29,8 +28,16 @@ Requires: xfce4-panel >= %{xfceversion}
|
||||
The sensors plugin provides a handy way to monitor your hard disk,
|
||||
processor, fans, and other critical hardware right on your Xfce panel.
|
||||
|
||||
%package devel
|
||||
Summary: Development files for xfce4-sensors-plugin
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: libxfce4util-devel
|
||||
|
||||
%description devel
|
||||
Static libraries and header files for the xfce4-sensors-plugin.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
%autosetup
|
||||
|
||||
%build
|
||||
%configure --disable-static \
|
||||
@ -38,7 +45,6 @@ processor, fans, and other critical hardware right on your Xfce panel.
|
||||
--with-pathhddtemp=%{_bindir}/hddtemp
|
||||
%make_build
|
||||
|
||||
|
||||
%install
|
||||
%make_install
|
||||
|
||||
@ -56,11 +62,9 @@ desktop-file-install --vendor "" \
|
||||
|
||||
%files -f %{name}.lang
|
||||
%license COPYING
|
||||
%doc AUTHORS ChangeLog NEWS README TODO
|
||||
%doc AUTHORS ChangeLog NEWS 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
|
||||
@ -69,6 +73,13 @@ desktop-file-install --vendor "" \
|
||||
%{_datadir}/xfce4/panel/plugins/xfce4-sensors-plugin.*
|
||||
%{_mandir}/man1/xfce4-sensors.1.gz
|
||||
|
||||
%files devel
|
||||
%{_libdir}/pkgconfig/libxfce4sensors-1.0.pc
|
||||
%{_libdir}/xfce4/modules/libxfce4sensors.so
|
||||
|
||||
%changelog
|
||||
* Fri Jun 18 2021 zhanglin <lin.zhang@turbolinux.com.cn> - 1.3.95-1
|
||||
- Update to 1.3.95
|
||||
|
||||
* Mon Jul 27 2020 Dillon Chen <dillon.chen@turbolinux.com.cn> - 1.3.92-1
|
||||
- Init package
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user