From f516638b7fe9592837389826a6152a7e1b251c54 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 30 May 2020 11:44:06 +0100
Subject: gentoo resync : 30.05.2020

---
 x11-plugins/wmacpi/Manifest                        |  3 ++-
 .../wmacpi/files/wmacpi-2.3-fno-common.patch       | 27 ++++++++++++++++++++++
 x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild            |  8 +++++--
 3 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 x11-plugins/wmacpi/files/wmacpi-2.3-fno-common.patch

(limited to 'x11-plugins/wmacpi')

diff --git a/x11-plugins/wmacpi/Manifest b/x11-plugins/wmacpi/Manifest
index 21495bd9fbf3..b5ffd2325285 100644
--- a/x11-plugins/wmacpi/Manifest
+++ b/x11-plugins/wmacpi/Manifest
@@ -1,4 +1,5 @@
+AUX wmacpi-2.3-fno-common.patch 790 BLAKE2B 8ffbc5c6549c8f57ff768f6a3c171b6961121458a6ce9e7fa13dc9e33223493ded768f1e91ec2786fb5bd7d3d62dc13fd805155eccc560a4c7806726a2dccd12 SHA512 c1c17e68c4605ea885bf335e4f55e0fbb5427ec8405dbab0f3c3cc76f3cc9f61e43d90b2d3fb7c69d7b2e516716b53288a255b3bdbee4c6b134fa876adc878ac
 AUX wmacpi-2.3-makefile.patch 1103 BLAKE2B 8f0d0f15d322d0b318e9d5e94f120bf0eab00fc9559de72f5449abe4b0f78315cbb513ce7d8d84100257e21205d47136d2e9308c1f266d2ed26fe956eca17f14 SHA512 0c7e46514604b5f9e36e0ffbfda7a3a5d86d7932bd31cf88286e937db61fc516b5f5c0fac0edb96d6e1f657cb12d694b4b1505f7fd1e901872fc80e6aae50ab7
 DIST wmacpi-2.3.tar.gz 39374 BLAKE2B bcf55a801fbc7b7c4484cc8987366786e1a1dbaf4d9ff6800975de14bd295ced774eaeedfe0c9da524b774de7633d5d250e7be55742fca7893f7314b8b4fe6fc SHA512 47c260989cd3fdb8d7ceadba19224e6350056741b03c6f1b73a38b06d7e471a08972dfbcaeacdcbc460bc19b0f952641eda75e11468b4d7155eecd07e1e14cd9
-EBUILD wmacpi-2.3-r1.ebuild 615 BLAKE2B f9a72aa134b869388724eef81fe7d80b99aa28ca8a2e7cc680942023790e431efb3513777d9776da9c0dc035bc3ca27cd607db5c9713212a08fdb34c6d3647da SHA512 6a8382be50b54718aafe328f26144131d4d61ff44175e6b6b36a214e92e0e229da809c5c6c75cfab1d1e7d58b15c893e1d143344a691cd1f6e04589e0c3383a7
+EBUILD wmacpi-2.3-r1.ebuild 656 BLAKE2B 4ade245a55e1efc25e18eb8049f0ead5ce64cbb453c9a0190dcdbe7df1ffd1ca9650302f7adc8fc4f6454c6dc03eedf79bdc90ee4cb46da658a80fed5ca15516 SHA512 5cdcc29e02a2b1574af2aecd34cf20a2985b5e76293efd8a653d5b1082e57eed8b7626ce91641ab4d0e430c7156ac3867267261ef2e472a43d185bf269f1ca5b
 MISC metadata.xml 334 BLAKE2B f36478f76f93ad154022208ad0f1417400de70c9091166fb46e60a05c1f920f20e736f45628f7681c3f1e607d077c0a93689529fde8866c15b2dda7d07838e18 SHA512 708cecfa079327ebfa542b48b792e049348df0664e197c68cc148931820882aaa423ddcb996b47db98a05a87d1b65824ae7fb60492f77936592e3817c0af71b9
diff --git a/x11-plugins/wmacpi/files/wmacpi-2.3-fno-common.patch b/x11-plugins/wmacpi/files/wmacpi-2.3-fno-common.patch
new file mode 100644
index 000000000000..49ee8446fc44
--- /dev/null
+++ b/x11-plugins/wmacpi/files/wmacpi-2.3-fno-common.patch
@@ -0,0 +1,27 @@
+diff -Naur dockapps.orig/libacpi.c dockapps/libacpi.c
+--- dockapps.orig/libacpi.c	2015-01-12 11:24:15.000000000 +0100
++++ dockapps/libacpi.c	2020-05-29 22:33:52.526826841 +0200
+@@ -17,6 +17,9 @@
+ #define SYSFS_DATA_SOURCE   1
+ static int data_source;
+ 
++battery_t batteries[MAXBATT];
++int verbosity;
++
+ /* local proto */
+ int acpi_get_design_cap(int batt);
+ 
+diff -Naur dockapps.orig/libacpi.h dockapps/libacpi.h
+--- dockapps.orig/libacpi.h	2015-01-12 11:24:15.000000000 +0100
++++ dockapps/libacpi.h	2020-05-29 22:33:36.393811163 +0200
+@@ -128,8 +128,8 @@
+ 
+ 
+ /* Since these /are/ needed here . . . */
+-battery_t batteries[MAXBATT];
+-int verbosity;
++extern battery_t batteries[MAXBATT];
++extern int verbosity;
+ 
+ /* check if apm/acpi is enabled, etc */
+ int power_init(global_t *globals);
diff --git a/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild b/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild
index 5a0d2945eb42..9ee992963caf 100644
--- a/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild
+++ b/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,9 +17,13 @@ DEPEND=">=x11-libs/libdockapp-0.7:=
 
 S=${WORKDIR}/dockapps
 
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	)
+
 src_prepare() {
 	default
-	eapply "${FILESDIR}"/${P}-makefile.patch
 
 	sed -e 's#<dockapp.h>#<libdockapp/dockapp.h>#' -i *.c || die
 }
-- 
cgit v1.2.3