gentoo resync : 05.02.2020

3 files changed, 153 insertions, 2 deletions

diff --git a/x11-plugins/wmpower/Manifest b/x11-plugins/wmpower/Manifest
index 6fb8f2b5166f..39781d872d62 100644
--- a/x11-plugins/wmpower/Manifest
+++ b/x11-plugins/wmpower/Manifest
@@ -1,3 +1,4 @@
+AUX wmpower-0.4.3-gcc-10.patch 5515 BLAKE2B 2f7e9a9cca7672886a08b29ef5d933cb1ace2e578ba9755cdeb6b79d7fda20c943f1a5a0ce7403e2d16f31fdbd5a5cb2f32c7b5ae3b5ffed6dc90defd73bd641 SHA512 ec04484c756a265518bb4bc9c16bbe23b6ca8fcff89c5f770e01f055c8dad10fd4394490c288c967a237ba0691b2f207b50ddbc1f52aab054b82ac821691ecca
 DIST wmpower-0.4.3.tar.bz2 99178 BLAKE2B 191c562d0b3a2d738d826030323b17db049868bef988ac49250af3e0c32b0c531bb1d819526de609fae3da8bd74b2bc78d724c58999f5fae5e6655e0c1aaa5a1 SHA512 90d96949472497e39760f76b33f4363751863d3f824b1cb22ab9ff333f496b1f329db5fda1a2353c871f87b9f9f09781c410b51907cf13c617cdd3af2c2c84e9
-EBUILD wmpower-0.4.3-r1.ebuild 671 BLAKE2B 47d64382b046698a52291e43f71b2fe9c95f1ee857a3467b0bffdb97223bc560ad0421a514c6b89995bfe01b3474b743950291a4521f9b1e4ff833669901c2f8 SHA512 bdd1c1230481ef8c326e2e221e557e36927df1d5d17e4bb00400053bddb474e7bab936a4bb71a54ae56b0b1e1df1e95fccf760fe06026879e099056849693c5a
+EBUILD wmpower-0.4.3-r1.ebuild 716 BLAKE2B 4efc9b9a9bfd4c51cd7b1e99b9ce3337930a3ad9598f76ab63085660e016858d760ecfe238f58ce9cf7800baafebc43170962ac6c7fb405f1b1bc1837dbde73f SHA512 a24db08ee48b20b87c4c309fb29f3fb2309442cc1dc401a532ebaf0723dfe4be3b22871ea47e7d0c99ddc33fe8506cb0ee8d56c4514892cac9609f7164bb4a27
 MISC metadata.xml 684 BLAKE2B 3d50ae0a0c2d8c358b709fd5a2c0b86906aa1cddeeeed3f9f62a31d3aa56d533331d0254d1b74df833f0ab80a745b59c67ddad74875ba9677cdfc40a43945275 SHA512 56eff68c510d855dcfb617977cf9d837741441d1a8ec40e9c984c306b104c573f880d126dc61a8016b80351e6a77f9564e50288a3392e26dd32bf0fe2525403e
diff --git a/x11-plugins/wmpower/files/wmpower-0.4.3-gcc-10.patch b/x11-plugins/wmpower/files/wmpower-0.4.3-gcc-10.patch
new file mode 100644
index 000000000000..bdc28a16341e
--- /dev/null
+++ b/x11-plugins/wmpower/files/wmpower-0.4.3-gcc-10.patch
@@ -0,0 +1,148 @@
+diff -Naur wmpower-0.4.3.orig/src/dockapp/dockapp.c wmpower-0.4.3/src/dockapp/dockapp.c
+--- wmpower-0.4.3.orig/src/dockapp/dockapp.c	2003-09-18 18:53:27.000000000 +0200
++++ wmpower-0.4.3/src/dockapp/dockapp.c	2020-01-29 19:15:58.062434728 +0100
+@@ -50,6 +50,7 @@
+ GC         NormalGC;
+ XpmIcon    wmgen;
+ Pixmap     pixmask;
++Display    *display;
+ 
+   /*****************/
+  /* Mouse Regions */
+diff -Naur wmpower-0.4.3.orig/src/dockapp/dockapp.h wmpower-0.4.3/src/dockapp/dockapp.h
+--- wmpower-0.4.3.orig/src/dockapp/dockapp.h	2003-09-18 18:29:17.000000000 +0200
++++ wmpower-0.4.3/src/dockapp/dockapp.h	2020-01-29 19:15:58.062434728 +0100
+@@ -28,7 +28,7 @@
+  /* Global variable */
+ /*******************/
+ 
+-Display		*display;
++extern Display		*display;
+ 
+   /***********************/
+  /* Function Prototypes */
+diff -Naur wmpower-0.4.3.orig/src/power_management/acpi/libacpi.c wmpower-0.4.3/src/power_management/acpi/libacpi.c
+--- wmpower-0.4.3.orig/src/power_management/acpi/libacpi.c	2005-09-06 12:09:10.000000000 +0200
++++ wmpower-0.4.3/src/power_management/acpi/libacpi.c	2020-01-29 19:20:44.031452047 +0100
+@@ -46,6 +46,8 @@
+ #include "power_management.h"
+ #include "lib_utils.h"
+ 
++char battery_type;
++int batt_count;
+ 
+ /* here we put temp stuff read from proc files */
+ char buf[512];
+diff -Naur wmpower-0.4.3.orig/src/power_management/acpi/libacpi.h wmpower-0.4.3/src/power_management/acpi/libacpi.h
+--- wmpower-0.4.3.orig/src/power_management/acpi/libacpi.h	2004-07-16 20:13:19.000000000 +0200
++++ wmpower-0.4.3/src/power_management/acpi/libacpi.h	2020-01-29 19:20:48.717452334 +0100
+@@ -67,7 +67,7 @@
+ }
+ ACPIinfo;
+ 
+-char battery_type;
++extern char battery_type;
+ 
+ typedef struct
+ {
+@@ -76,7 +76,7 @@
+ ACADstate;
+ 
+ /* number of batteries detected */
+-int batt_count;
++extern int batt_count;
+ 
+ int  check_acpi (void);
+ void read_acad_state (ACADstate *acadstate);
+diff -Naur wmpower-0.4.3.orig/src/power_management/compal/compal_lib.c wmpower-0.4.3/src/power_management/compal/compal_lib.c
+--- wmpower-0.4.3.orig/src/power_management/compal/compal_lib.c	2005-09-12 18:13:32.000000000 +0200
++++ wmpower-0.4.3/src/power_management/compal/compal_lib.c	2020-01-29 19:21:14.455453915 +0100
+@@ -40,6 +40,7 @@
+ #include "lib_utils.h"
+ #include "power_management.h"
+ 
++char  compal_model[COMPAL_MAX_MODEL_INFO];
+ 
+ 
+ /* gets a value from a strtok-ed buffer; for reading from /proc */
+diff -Naur wmpower-0.4.3.orig/src/power_management/compal/compal_lib.h wmpower-0.4.3/src/power_management/compal/compal_lib.h
+--- wmpower-0.4.3.orig/src/power_management/compal/compal_lib.h	2005-09-12 18:13:23.000000000 +0200
++++ wmpower-0.4.3/src/power_management/compal/compal_lib.h	2020-01-29 19:21:09.180453591 +0100
+@@ -44,7 +44,7 @@
+ #define COMPAL_PROC_FILE_BATT	"/proc/omnibook/battery"
+ 
+ 
+-char  compal_model[COMPAL_MAX_MODEL_INFO];
++extern char  compal_model[COMPAL_MAX_MODEL_INFO];
+ 
+ char *getvaluefromhash (char *key, char *hash);
+ 
+diff -Naur wmpower-0.4.3.orig/src/power_management/power_management.c wmpower-0.4.3/src/power_management/power_management.c
+--- wmpower-0.4.3.orig/src/power_management/power_management.c	2005-12-15 12:54:59.000000000 +0100
++++ wmpower-0.4.3/src/power_management/power_management.c	2020-01-29 19:18:36.031444239 +0100
+@@ -55,6 +55,13 @@
+ int use_noflushd=1;
+ int use_cpufreq=1;
+ 
++kernel_versions kernel_version;
++int minBrightness;
++int maxBrightness;
++int waittime; /* /proc polling time */
++char *cpufreq_online_governor;
++char *cpufreq_offline_governor;
++
+ /* Battery to monitor */
+ int Battery;
+ 
+diff -Naur wmpower-0.4.3.orig/src/power_management/power_management.h wmpower-0.4.3/src/power_management/power_management.h
+--- wmpower-0.4.3.orig/src/power_management/power_management.h	2005-12-15 12:54:12.000000000 +0100
++++ wmpower-0.4.3/src/power_management/power_management.h	2020-01-29 19:18:29.941443870 +0100
+@@ -34,7 +34,7 @@
+ 	IS_2_6 = 0,
+ 	IS_OTHER
+ } kernel_versions;
+-kernel_versions kernel_version;
++extern kernel_versions kernel_version;
+ 
+ typedef struct
+ {
+@@ -49,11 +49,11 @@
+ 
+ } pm_status;
+ 
+-int minBrightness;
+-int maxBrightness;
+-int waittime; /* /proc polling time */
+-char *cpufreq_online_governor;
+-char *cpufreq_offline_governor;
++extern int minBrightness;
++extern int maxBrightness;
++extern int waittime; /* /proc polling time */
++extern char *cpufreq_online_governor;
++extern char *cpufreq_offline_governor;
+ 
+ int pm_support(int which_battery);
+ void get_power_status(pm_status *power_status);
+diff -Naur wmpower-0.4.3.orig/src/power_management/toshiba/toshiba_lib.c wmpower-0.4.3/src/power_management/toshiba/toshiba_lib.c
+--- wmpower-0.4.3.orig/src/power_management/toshiba/toshiba_lib.c	2005-09-02 11:46:16.000000000 +0200
++++ wmpower-0.4.3/src/power_management/toshiba/toshiba_lib.c	2020-01-29 19:19:47.112448563 +0100
+@@ -57,6 +57,7 @@
+ #include "lib_utils.h"
+ #include "power_management.h"
+ 
++char toshiba_model[255];
+ 
+ void UglyHack(void);
+ int Get_Fan_Status(void);
+diff -Naur wmpower-0.4.3.orig/src/power_management/toshiba/toshiba_lib.h wmpower-0.4.3/src/power_management/toshiba/toshiba_lib.h
+--- wmpower-0.4.3.orig/src/power_management/toshiba/toshiba_lib.h	2005-09-02 11:34:04.000000000 +0200
++++ wmpower-0.4.3/src/power_management/toshiba/toshiba_lib.h	2020-01-29 19:19:38.749448053 +0100
+@@ -34,7 +34,7 @@
+ #define TOSHIBA_LCD_MED 1
+ #define TOSHIBA_LCD_MAX 2
+ 
+-char toshiba_model[255];
++extern char toshiba_model[255];
+ 
+ int machine_is_toshiba(int *use_toshiba_hardware);
+ int toshiba_get_fan_status(int use_toshiba_hardware);
diff --git a/x11-plugins/wmpower/wmpower-0.4.3-r1.ebuild b/x11-plugins/wmpower/wmpower-0.4.3-r1.ebuild
index d161fd1e3b51..0f828dab5809 100644
--- a/x11-plugins/wmpower/wmpower-0.4.3-r1.ebuild
+++ b/x11-plugins/wmpower/wmpower-0.4.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,6 +18,8 @@ RDEPEND="x11-libs/libX11
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
+PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )
+
 DOCS=( AUTHORS BUGS ChangeLog LEGGIMI NEWS README README.compal THANKS TODO )
 
 src_configure() {