gentoo resync : 05.02.2020

3 files changed, 29 insertions, 2 deletions

diff --git a/x11-wm/aewm/Manifest b/x11-wm/aewm/Manifest
index f9efa9ff1c2f..e59a68d12ea0 100644
--- a/x11-wm/aewm/Manifest
+++ b/x11-wm/aewm/Manifest
@@ -1,6 +1,7 @@
+AUX aewm-1.3.12-fno-common.patch 489 BLAKE2B e8e8deaf9972fd5008291d438c21acb2e24285467aed5d64ee23175b69960cfe767eba12330f3ad7840ce337584469ab277aa898a6419cab165d10ef7bf7adbf SHA512 02bcbaf0187221637195239b6263c4593dc18a269ecfe1cbb64f3320a7998457372b7afbda8ae4b9964ad99064f335c7445d2c93a1375519ea218580026cdd81
 AUX aewm-1.3.12-gentoo.patch 1690 BLAKE2B f8bb7d861f3852d48c4a4919d06138baaabb053546261fbeb8d6f6e79d49f7561381cc02a614cc17998e37d40e000df1def0be71c8417194ea448797c911e6c8 SHA512 39c4d3258b29550fc99ac088c84f83af40645ebe48013f053584dd60baf99d9e58e3c3b4f221835c5ba7da27f6cc66a5d387a74928d596ba4a99a38aabaafb32
 AUX aewm-1.3.12-r1-gentoo.patch 2259 BLAKE2B 427a3286dfdf7170866a2e8b73b14259f390553fb53fc60780c6e5a8c87c224b46d6fcecda2784a17024ded5e513c1ca6be71a5aad5bd7dd6a82e783e6a4c8d6 SHA512 e3039462193018661acf9ed6532c67034a1352e381bb378a41ca3493580dfe847fa244b41389c37b3882fb5d0db4a26b9c6067b25a47134cc2d39f88b53415c9
 DIST aewm-1.3.12.tar.bz2 36677 BLAKE2B f84d272b82408600b10a3d08523219484cfbefff1ea5134284759e8743ae29918ceba842de07c640ca6fbc52c875df93f30f1692239119afcefb5a28ba3aa55e SHA512 69435edf1ba99661464221070ab6708a875056d244ee73b2eba1ed2beefba52ac2418d37e0d8b9f0c7c8a382e9d8740215b9c7098eca4f39cdf73b3c894125f1
-EBUILD aewm-1.3.12-r1.ebuild 827 BLAKE2B 9b7f046d9e26ec59ea37f922b218de494a4659abf6188075beae5d47698eb6d3a878e72d4cdacd82ab1b2c3632bf9a0174ea5d3197bed4c84a1b14e4c6611c64 SHA512 f41cf36caceb9deb29cdfa8d47f0124101a4e26266ab4f24cd2ca4b11aba1d2cb3acf0c14f3c14b43d416f2ee8a211169b0023b010713c6f8ab57dd485ff2518
+EBUILD aewm-1.3.12-r1.ebuild 864 BLAKE2B 8de17af2034120d176d40c118e218c3893a5a6c3358f3b359178c9bb0bad5b3b73a53f5eebe9661b061b2af62ac83616eb84d6b4fbc79a34acc487908e9d09a1 SHA512 1658eb25f7921ae01336bbb2e5bafab4e22fd01f3146a7aec2f73a95492b2fa5254e84bde4f6d50a736e46199dca3fbbba13c5d9815153fe18d21fadff1ee434
 EBUILD aewm-1.3.12.ebuild 951 BLAKE2B c5a64882fbd441afe25a4cf8b6aa63a4ce5bcea3ca3d48b4e26ac01f1305425f1c6ae023fa909442e133e2d3409d4349a29da363380b27b7a69b7be3273c7e8a SHA512 2b35a53725d8324c7d16bab1e7396d1bbe9faa28f76ad572bc1a8faca91cf195021914efbab3d8697ff86594b7fc2e05ce62bbd0188672315e998c3c6da3b7d8
 MISC metadata.xml 559 BLAKE2B 262c00ea913f10dccedef6d9b086d19de9b2b210cba0dac9125cad36642149d76b669387682ce1fa09fd96cfc715e618e1cc9c758ab2a66838d6fcf7fdb6a182 SHA512 f9a2092397717d558532432ee9ccb9715923338145485b7655fa84b83d08c89d900c3baf16d60cf3d16e5d495d26f04d889371ab010aa3dc54bdff3d7fa04831
diff --git a/x11-wm/aewm/aewm-1.3.12-r1.ebuild b/x11-wm/aewm/aewm-1.3.12-r1.ebuild
index c0d52983ed89..3efbc6c7a7ed 100644
--- a/x11-wm/aewm/aewm-1.3.12-r1.ebuild
+++ b/x11-wm/aewm/aewm-1.3.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,6 +26,7 @@ DEPEND="
 "
 PATCHES=(
 	"${FILESDIR}"/${P}-r1-gentoo.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_compile() {
diff --git a/x11-wm/aewm/files/aewm-1.3.12-fno-common.patch b/x11-wm/aewm/files/aewm-1.3.12-fno-common.patch
new file mode 100644
index 000000000000..e885161ce883
--- /dev/null
+++ b/x11-wm/aewm/files/aewm-1.3.12-fno-common.patch
@@ -0,0 +1,25 @@
+--- aedesk.c
++++ b/aedesk.c
+@@ -11,10 +11,6 @@
+ 
+ #define UMOD(x, y) ((((long)(x) % (long)(y)) + (y)) % (y))
+ 
+-Display *dpy;
+-Window root;
+-Atom net_cur_desk, net_num_desks;
+-
+ static unsigned long parse_desk(char *spec);
+ 
+ int main(int argc, char **argv)
+--- aepanel.c
++++ b/aepanel.c
+@@ -36,9 +36,6 @@
+ void sig_handler(int);
+ void set_strut(Window, strut_t *);
+ 
+-Atom net_wm_strut;
+-Atom net_wm_strut_partial;
+-Atom net_wm_wintype;
+ Atom net_wm_wintype_dock;
+ 
+ #define NAME_SIZE 48