gentoo resync : 30.06.2019

7 files changed, 156 insertions, 10 deletions

diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index 828fb3c8a20a..b3c52bf03567 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -1,8 +1,12 @@
+AUX polybar-3.3.1-eventstruct.patch 1703 BLAKE2B ea25a8a04c511f51eaf6097f2662119c4d3d63aff08a128512a46b51806b686b7086aa2e202368edc40db279bba390a3e86cf48635ea1e53ca242b8b91aae8e1 SHA512 fe50c627b3375525441867ff4d7b7ecd3d60342b61545fc8e85db0dc708f41d9c94f660ab460675f009770049c01e5ab2ed84be3ee77cdd778b731482e3c9ada
+AUX polybar-3.3.1-gcc9.patch 1363 BLAKE2B 77c1880a87790218fbb4550e2f09c968574c52f2efc45bc5c8c42edb2041490b0b8772b523d18a95f0c05796fbd178bb0c1fcd760373989109c23465624a3b5b SHA512 b99aafb383a2279a19e860ab1b2baf93ff859888f5599bce93d6eec577a1a897c3ba23a34ab61e9e14c72946f6c97204f7f710cd0ae689c61d96ffd22a589fd6
+AUX polybar-3.3.1-i3ipcpp-gcc9.patch 1107 BLAKE2B 9fae68b6d05387c12fe9eb039fb503e704a6686d117b210bad924ca20e601b6ceb00749a5625c975315609b7c754af612983f45674fae1e652717e274ca6942e SHA512 fb695c4aebf5a8660b4ef756c6f434d220d6eb6f3ce905dfed8a7451fc6424c776dc4418ba81a717b9ad6a71c6b165b6740d56fb01afb4cc2e0c3a18a8d53f91
+AUX polybar-3.3.1-xpp-gcc9.patch 736 BLAKE2B e041631bcd110768edf6c56864d574082436f23419bc058f4640e6e19f04ee00301480b9638dc078be4feb1e0430010f6b74cb05205f2d35b9f599bf9523d023 SHA512 cc84e00c13f42b36791e63ae0fad0a51ec3035dc2ebc7d56d7eb0cb895c172741a3173283ded6291cdbea890fd6fb0aedd7aad97d15cfb91ec725e61d9ee9c27
 DIST i3ipcpp-0.7.1.tar.gz 191417 BLAKE2B 62b76a0921c78f374309d26856c01d1467b8bd181ce922fd47daec406afda9d76eea9a1f473b4899e22f99e2ef36fc70f72db1bb17eb1f3e71a8431c2634b915 SHA512 ef9f591bb4436916ad038bcb0c15ea3415d1978ff264fb276108ddac89c98515c464fbf252429f6a76589cb78e1434adba2efefb5a844dadad0e261f3806fb72
 DIST polybar-3.2.1.tar.gz 242327 BLAKE2B eb7bfe6e6d58fb4389016b8e5c73feea3984ce3ccefdb1acf202c6d2873a634e4d096658b850e8534c5c8c56e42ac66b3b8e80dabf5625491e5f56523b043ddf SHA512 e93c33738029b2e56a5dda75cbf3ee804c0d89c406444da6991ea8a5dd00e5544ef51d20f3d67ec293fc55ab7095e8e3057aaf8d1c08af61cf0531297e55a18d
 DIST polybar-3.3.1.tar.gz 248790 BLAKE2B 30c2cd2ff537f3a2fe2fe7ce489b5a0ab76a54cd42bbdf8b3727e5f4298898e289c6ea10a460385d8bcdc8ab11749255573bf7d728a01eae895a1ed8a2214c27 SHA512 c0bfaf99dcd19f8fcca8bd041c0f9e5f11fb822c92cf12edc2c59e67896f566ee46d1a0d75f5583d393af3a1958c3244a4eb28224f6336e9eaa98a50d740f834
 DIST xpp-1.4.0.tar.gz 84095 BLAKE2B 2af4221953abe7f40473c55cd50c608b54ebc85a62be65af987ed5e6c5eaf56fbd92531788becf39ba5ad52099ac78f36e9b2a2515b473f4d86ed5fda3fa5065 SHA512 d34cbbe2391db36db7dffac0415d26b7487536e97c4d7efd472ab0aeffa4c8e757ee030b05e2aa1cfa8a591ee591bb96a6db7eb9fa5850027f958e92f078739c
 EBUILD polybar-3.2.1.ebuild 1788 BLAKE2B c44044b3a7e3db34d10c9e018e52f192920f8a42fa6ea93e27c3cd0109143d8331c5f28e74958ed90fd569c632aa88257132c61625b0f5fb30cdfdb09f91b460 SHA512 db2abec6f14c08ed7beeff4fe90b2d832b5f249b64e5b0e4897316de597675bf06e4704ae8aa8635ec40fb3eca0e9be81c38889e82ddb7e98b73d99a69529980
-EBUILD polybar-3.3.1.ebuild 1968 BLAKE2B eeb084acbd61dddb5fcc2c1d84821c3a894717201df7233c7825e175212f46faa734dd199050ec931adabf6efb9ef937d24dd48f0e07a9cab50162cda91bd762 SHA512 23b5b98b3ce5e9c31dadbe446c72744f4a72969f08c0439e0a6982002686342ff40389948f20b20728346fdfd94f780695684110176d5c8335f18d3c677fe4a3
-EBUILD polybar-9999.ebuild 1968 BLAKE2B f3482b254e1e8ed6bcbb72531f94ffc3b21ac8cccf29992f6ec3794c3e8d650ef5f89f52f715f8b81925a6e726b68ae96e3de8e22f58b690951a854541bb6548 SHA512 25aaace811e587cccf2b4b2877bdf8e4da746043c0a574b93deaf53ea419e1612a4fcdb2e2af17877b2af53f4aebab1b23ac617555a66697c45b49302c6206e5
+EBUILD polybar-3.3.1.ebuild 1997 BLAKE2B 7784a0e0ff06a7f580f67457ecc56c07482a97a9e45b0efcb6b13339c5fc2124d22471b93f57b76736c496d17b5ea3cab1259d76ca4e506553ee9245ca33deb7 SHA512 cf759703268f8cf122563032e902f55856d493b993992662a503670722228c44a1afb65cc698b0f998baba8d1390033a04de29bababfde6407553dd4be18448c
+EBUILD polybar-9999.ebuild 1841 BLAKE2B a87b383b2af09f0f3bea7e62625c3308b6584f0c251fda9cdf7e1c71532e61dc89a3fa246fbbcf7a6a2dd231f67c2d28d4f5cbef535fbab769b04bf915f0e39e SHA512 2f0c7459c3a8cde6c492bfebf73df841aed24580ab3e6ab7df8582930dfb76912a1aa768d1e6c3b37a701d6d29ad013207298ba6811361636105ffc8ccb7ae76
 MISC metadata.xml 580 BLAKE2B 965fdbd2a3799e0c8a9b6f03bfb7e21f1f413a226bd4748d860f4711d60bfadc2d6c2fdb37f3bf9933f2c494e7e6e0c0705c9a0ebef943ec2978f3aaf65c0176 SHA512 15b64a04e588b5edeec9aa5e579881c3e7c5a7f3fb66ed4443f32d50b850c437f65bc9050960710f2bb1e80ea52ccca9ecb19e8bf68fe66edddc8896a58aeeb9
diff --git a/x11-misc/polybar/files/polybar-3.3.1-eventstruct.patch b/x11-misc/polybar/files/polybar-3.3.1-eventstruct.patch
new file mode 100644
index 000000000000..93bf034f7de0
--- /dev/null
+++ b/x11-misc/polybar/files/polybar-3.3.1-eventstruct.patch
@@ -0,0 +1,44 @@
+From 00165e1a6d5dd61bc153e1352b21ec07fc81245d Mon Sep 17 00:00:00 2001
+From: patrick96 <p.ziegler96@gmail.com>
+Date: Sun, 11 Feb 2018 21:27:52 +0100
+Subject: [PATCH] fix(generators): Add support for eventstruct
+
+Newer xcb-proto commits after the 1.12 release require the 'eventstruct'
+key in the output dictionary, otherwise the generator crashes.
+
+I don't see a need for xpp to actually support the eventstruct key and
+thus it uses a NOP lambda function
+---
+ generators/cpp_client.py | 19 ++++++++++---------
+ 1 file changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/generators/cpp_client.py b/generators/cpp_client.py
+index 20d116f..709e8d8 100644
+--- a/lib/xpp/generators/cpp_client.py
++++ b/lib/xpp/generators/cpp_client.py
+@@ -3130,15 +3130,16 @@ def cpp_type_classes():
+ #           }
+ 
+ # Must create an "output" dictionary before any xcbgen imports.
+-output = {'open'    : c_open,
+-          'close'   : c_close,
+-          'simple'  : c_simple, # lambda x, y: None,
+-          'enum'    : lambda x, y: None,
+-          'struct'  : lambda x, y: None,
+-          'union'   : lambda x, y: None,
+-          'request' : c_request,
+-          'event'   : cpp_event,
+-          'error'   : cpp_error,
++output = {'open'          : c_open,
++          'close'         : c_close,
++          'simple'        : c_simple, # lambda x, y: None,
++          'enum'          : lambda x, y: None,
++          'struct'        : lambda x, y: None,
++          'union'         : lambda x, y: None,
++          'request'       : c_request,
++          'event'         : cpp_event,
++          'error'         : cpp_error,
++          'eventstruct'   : lambda x, y: None,
+           }
+ 
+ # Boilerplate below this point
diff --git a/x11-misc/polybar/files/polybar-3.3.1-gcc9.patch b/x11-misc/polybar/files/polybar-3.3.1-gcc9.patch
new file mode 100644
index 000000000000..7df7b99fa653
--- /dev/null
+++ b/x11-misc/polybar/files/polybar-3.3.1-gcc9.patch
@@ -0,0 +1,43 @@
+From 8b648b9265ed6f09802bd749ec8bf74181032b39 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9r=C3=B4me=20BOULMIER?= <jerome.boulmier@outlook.fr>
+Date: Sun, 7 Apr 2019 02:10:38 -0400
+Subject: [PATCH] fix(window): remove useless operator= and add default copy
+ cstr
+
+---
+ include/x11/window.hpp | 3 +--
+ src/x11/window.cpp     | 5 -----
+ 2 files changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/include/x11/window.hpp b/include/x11/window.hpp
+index 9490c3760..9ddfe9f45 100644
+--- a/include/x11/window.hpp
++++ b/include/x11/window.hpp
+@@ -12,10 +12,9 @@ class connection;
+ 
+ class window : public xpp::window<connection&> {
+  public:
++  window(const window&) = default;
+   using xpp::window<class connection&>::window;
+ 
+-  window& operator=(const xcb_window_t win);
+-
+   window reconfigure_geom(unsigned short int w, unsigned short int h, short int x = 0, short int y = 0);
+   window reconfigure_pos(short int x, short int y);
+   window reconfigure_struts(unsigned short int w, unsigned short int h, short int x, bool bottom = false);
+diff --git a/src/x11/window.cpp b/src/x11/window.cpp
+index e22e4451e..35393ddc8 100644
+--- a/src/x11/window.cpp
++++ b/src/x11/window.cpp
+@@ -7,11 +7,6 @@
+ 
+ POLYBAR_NS
+ 
+-window& window::operator=(const xcb_window_t win) {
+-  resource(connection(), win);
+-  return *this;
+-}
+-
+ /**
+  * Reconfigure the window geometry
+  */
diff --git a/x11-misc/polybar/files/polybar-3.3.1-i3ipcpp-gcc9.patch b/x11-misc/polybar/files/polybar-3.3.1-i3ipcpp-gcc9.patch
new file mode 100644
index 000000000000..beb0461885bc
--- /dev/null
+++ b/x11-misc/polybar/files/polybar-3.3.1-i3ipcpp-gcc9.patch
@@ -0,0 +1,29 @@
+From d4e4786be35b48d72dc7e59cf85ec34a90d129b5 Mon Sep 17 00:00:00 2001
+From: patrick96 <p.ziegler96@gmail.com>
+Date: Sun, 6 May 2018 18:25:32 +0200
+Subject: [PATCH] fix(gcc): Fix -Wstringop-truncation warning
+
+As mentioned in [1], gcc >=8 will complain, if strncpy truncates the
+source string or gcc can prove there is no NUL terminating byte.
+
+The header_t.magic field is a non-NUL terminated 6 byte string, so we
+use memcpy here
+
+[1] https://github.com/jaagr/polybar/issues/1215
+---
+ src/ipc-util.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ipc-util.cpp b/src/ipc-util.cpp
+index 2e8ac8e..d9851ee 100644
+--- a/lib/i3ipcpp/src/ipc-util.cpp
++++ b/lib/i3ipcpp/src/ipc-util.cpp
+@@ -34,7 +34,7 @@ buf_t::buf_t(uint32_t  payload_size) : size(sizeof(header_t) + payload_size) {
+ 	data = new uint8_t[size];
+ 	header = (header_t*)data;
+ 	payload = (char*)(data + sizeof(header_t));
+-	strncpy(header->magic, g_i3_ipc_magic.c_str(), sizeof(header->magic));
++	memcpy(header->magic, g_i3_ipc_magic.c_str(), sizeof(header->magic));
+ 	header->size = payload_size;
+ 	header->type = 0x0;
+ }
diff --git a/x11-misc/polybar/files/polybar-3.3.1-xpp-gcc9.patch b/x11-misc/polybar/files/polybar-3.3.1-xpp-gcc9.patch
new file mode 100644
index 000000000000..f80a72f12793
--- /dev/null
+++ b/x11-misc/polybar/files/polybar-3.3.1-xpp-gcc9.patch
@@ -0,0 +1,23 @@
+From d2ff2aaba6489f606bbcc090c0a78a8a3f9fcd1f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9r=C3=B4me=20BOULMIER?= <jerome.boulmier@outlook.fr>
+Date: Sun, 7 Apr 2019 10:34:32 -0400
+Subject: [PATCH] fix(window): add default copy cstr (#16)
+
+The copy constructor must be declared explicitly since the implicit declaration is deprecated.
+Ref jaagr/polybar#1729.
+---
+ include/xpp/window.hpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/xpp/window.hpp b/include/xpp/window.hpp
+index e5c6503..3e53074 100644
+--- a/lib/xpp/include/xpp/window.hpp
++++ b/lib/xpp/include/xpp/window.hpp
+@@ -23,6 +23,7 @@ class window
+     {}
+ 
+   public:
++    window(const window&) = default;
+     using base::base;
+     using base::operator=;
+ 
diff --git a/x11-misc/polybar/polybar-3.3.1.ebuild b/x11-misc/polybar/polybar-3.3.1.ebuild
index d90ec9a2e765..304f98fa0c1d 100644
--- a/x11-misc/polybar/polybar-3.3.1.ebuild
+++ b/x11-misc/polybar/polybar-3.3.1.ebuild
@@ -46,18 +46,23 @@ DEPEND="
 
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	cmake-utils_src_prepare
+PATCHES=(
+	"${FILESDIR}/${P}-eventstruct.patch"
+	"${FILESDIR}/${P}-gcc9.patch"
+	"${FILESDIR}/${P}-xpp-gcc9.patch"
+	"${FILESDIR}/${P}-i3ipcpp-gcc9.patch"
+)
 
+src_prepare() {
 	if [[ ${PV} != *9999* ]]; then
 		rmdir "${S}"/lib/xpp || die
 		mv "${WORKDIR}"/xpp-$XPP_VERSION "${S}"/lib/xpp || die
 
 		rmdir "${S}"/lib/i3ipcpp || die
 		mv "${WORKDIR}"/i3ipcpp-$I3IPCPP_VERSION "${S}"/lib/i3ipcpp || die
-
-		sed -i "s/.*cpp_error,.*/&\n\t  'eventstruct'   : lambda x, y: None,/" lib/xpp/generators/cpp_client.py || die "sed failed"
 	fi
+
+	cmake-utils_src_prepare
 }
 
 src_configure() {
diff --git a/x11-misc/polybar/polybar-9999.ebuild b/x11-misc/polybar/polybar-9999.ebuild
index 70e8d426aaf5..adddc936af65 100644
--- a/x11-misc/polybar/polybar-9999.ebuild
+++ b/x11-misc/polybar/polybar-9999.ebuild
@@ -47,17 +47,15 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	cmake-utils_src_prepare
-
 	if [[ ${PV} != *9999* ]]; then
 		rmdir "${S}"/lib/xpp || die
 		mv "${WORKDIR}"/xpp-$XPP_VERSION "${S}"/lib/xpp || die
 
 		rmdir "${S}"/lib/i3ipcpp || die
 		mv "${WORKDIR}"/i3ipcpp-$I3IPCPP_VERSION "${S}"/lib/i3ipcpp || die
-
-		sed -i "s/.*cpp_error,.*/&\n\t  'eventstruct'   : lambda x, y: None,/" lib/xpp/generators/cpp_client.py || die "sed failed"
 	fi
+
+	cmake-utils_src_prepare
 }
 
 src_configure() {