upgrade to 1.1.4 for xfce 4.16

This commit is contained in:
zhang__3125 2021-06-25 14:49:32 +08:00
parent cad60d60a4
commit bfd0e7839c
4 changed files with 11 additions and 34 deletions

View File

@ -1,27 +0,0 @@
From: Yves-Alexis Perez <corsac@debian.org>
Date: Mon, 14 Jan 2019 13:38:45 +0100
Subject: Inconditionnaly include err.h and errno.h
HAVE_SYSCTL is false on new architectures like arm64 or x32, and build
will fail (#766766).
---
panel-plugin/libacpi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/panel-plugin/libacpi.c b/panel-plugin/libacpi.c
index 0755585..1789cba 100644
--- a/panel-plugin/libacpi.c
+++ b/panel-plugin/libacpi.c
@@ -54,10 +54,10 @@ static int acpifd;
#ifndef __linux__
#include <sys/sysctl.h>
-#include <err.h>
-#include <errno.h>
#endif
+#include <err.h>
+#include <errno.h>
#endif
#include "libacpi.h"

Binary file not shown.

Binary file not shown.

View File

@ -1,22 +1,23 @@
%global xfceversion 4.14 %global minorversion 1.1
%global xfceversion 4.16
%global _hardened_build 1 %global _hardened_build 1
Name: xfce4-battery-plugin Name: xfce4-battery-plugin
Version: 1.1.3 Version: 1.1.4
Release: 1 Release: 1
Summary: Battery monitor panel plugin for Xfce Summary: Battery monitor panel plugin for Xfce
License: GPLv2+ License: GPLv2+
Group: Development/Libraries Group: Development/Libraries
URL: http://goodies.xfce.org/projects/panel-plugins/%{name} URL: http://goodies.xfce.org/projects/panel-plugins/%{name}
Source0: http://archive.xfce.org/src/panel-plugins/%{name}/1.1/%{name}-%{version}.tar.bz2 Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2
Patch0: 01_no-sysctl.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#BuildArch: noarch
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: libxfce4ui-devel >= %{xfceversion} BuildRequires: libxfce4ui-devel >= %{xfceversion}
BuildRequires: xfce4-panel-devel >= %{xfceversion} BuildRequires: xfce4-panel-devel >= %{xfceversion}
BuildRequires: gettext BuildRequires: gettext
BuildRequires: intltool BuildRequires: intltool
Requires: xfce4-panel >= %{xfceversion} Requires: xfce4-panel >= %{xfceversion}
%description %description
@ -24,7 +25,7 @@ A battery monitor panel plugin for Xfce4, compatible with APM and ACPI,
using either /proc files or the new sysfs files for recent kernels. using either /proc files or the new sysfs files for recent kernels.
%prep %prep
%autosetup -p1 %autosetup
%build %build
%configure %configure
@ -43,11 +44,14 @@ chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so
%files -f %{name}.lang %files -f %{name}.lang
%license COPYING %license COPYING
%doc AUTHORS COPYING.LIB ChangeLog README %doc AUTHORS COPYING.LIB ChangeLog
%{_libdir}/xfce4/panel/plugins/*.so %{_libdir}/xfce4/panel/plugins/*.so
%{_datadir}/xfce4/panel/plugins/*.desktop %{_datadir}/xfce4/panel/plugins/*.desktop
%{_datadir}/icons/hicolor/*/*/* %{_datadir}/icons/hicolor/*/*/*
%changelog %changelog
* Fri Jun 18 2021 zhanglin <lin.zhang@turbolinux.com.cn> - 1.1.4-1
- Update to 1.1.4
* Tue Jul 14 2020 Dillon Chen <dillon.chen@turbolinux.com.cn> - 1.1.3-1 * Tue Jul 14 2020 Dillon Chen <dillon.chen@turbolinux.com.cn> - 1.1.3-1
- Init package - Init package