8 files changed, 47 insertions, 275 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index ce5b0b62485f..d6af7ebfa913 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/barrier/Manifest b/x11-misc/barrier/Manifest
index 32f74e48b844..b073b7e52809 100644
--- a/x11-misc/barrier/Manifest
+++ b/x11-misc/barrier/Manifest
@@ -1,5 +1,4 @@
-AUX barrier-2.3.3-gtest.patch 3981 BLAKE2B f9a91a9b090ae4210d005db307d31930f7d2939f17e1c2bdbdbcd26b22743054f2d35c57c3e55ac6b6212e2d2274bcecad015c2afe8db909bfd4c030f976ae65 SHA512 82d78f658af279c8f2ec48cfa1dcec2cd6104d605b1157adeead73623fd0f7459141eb696619e71ea78ab1f7872369c78ef1ceeb9f90e7e7bed4b2a57aac5cca
-AUX barrier-2.3.3-tests.patch 4951 BLAKE2B 66996d3d9297bf0b188350154a380e522a0ddade4b1693fb62be6acbd624f327527b281cc3611b25b3cae0d084dc6af0eaae0e8487696c4b2589f76382381a4f SHA512 dcde430f1c0e1a4d65a4ed6afad1501f4ec6e448d0a56eeeadb46732fb8149fc7e74b5245e583ca8d4552ecca75dd59cabb9ba4ad549c8fda55e2178ede1ffed
-DIST barrier-2.3.3.tar.gz 5465909 BLAKE2B 3f881526f53113e48f1ea2e1592ebf2e932a8296fcba331243678963945001e7700dddc3bf8957f85285aec02c3d3700d31786cef291862a9b21780ee9e96cd6 SHA512 1ac945ce090d5bbdae7bab7d4ca802cc2d54c1644a12088203b240e38078d32d3b30ae2f764ba27d66c9d709e430b0eb1b4576314d99dd6177d8b88d19b89777
-EBUILD barrier-2.3.3.ebuild 1555 BLAKE2B 695de940747eb8de9b9517a67567ad40f1e72ce6cf19ab214e1311919ed521ca83a457ab84593c989c9e73f58bd27ce0341815852122a3beae09358d55f8a1a9 SHA512 9e4ff875cb5d7cb8d2399b5ca093c141ad28ba8374ae932bf327d84ebd7a4f1e4436946992b0b3a61757a12fd0f160fe418e8f99d16c1818c27242fb7886936c
+AUX barrier-2.4.0-includes.patch 879 BLAKE2B 7d9652af91686fc43d76230d898556f4247314dfc72f817e4330c6e81e88f4cb6506b78522e9a1583a5bf7dd425fe88324ea8921ff3e63691e475dc4fefe5510 SHA512 ee1fd991b027bcb942b8785e2d34ec5a56d1e3efa7732e92120da77412a7f0caf8c7cd31a7d4e4d06fc2682a29cf329483693f9448fb66cc357bef47196012fc
+DIST barrier-2.4.0.tar.gz 5572043 BLAKE2B e3eee306324a661a655b31e3179b7daf3fb199553a581059c67113f9597fb41d6af00fa3090d20c7d0b1d7420764454a512e91d8180ea663c3f99b89c663417f SHA512 dff8d95c358688952baee0bbbf56b818e40a6c0483d58f6cadd55558ab5d0cefc92a37b0751bfd70868686e1716c729871ae00a30ee9b0ba944f531dfb742449
+EBUILD barrier-2.4.0.ebuild 1553 BLAKE2B c9eec06ef5de1a1d45fdea8a0a2ed0f09517053701d0580474f8dd5fe1dc60ee0020098133307aad6145fb75739889c47c76e88cce64f7c4155483cb03a3b947 SHA512 19ddc5abc05f501ef1603e04b985c037417dee880e562b5c9c552c9ff5d95d64b70d5f1248d479cca0ac706b50b22c9765b0d726b6f513bbd5455a9cb85f5c0f
 MISC metadata.xml 330 BLAKE2B 1fbe5756c4c15fbab194c7634c20e8736d2339a51d89853939397f12314122a3dec2e7842e58eac9e60b35d49f9dff147e8d022e125935598ce69e74b3fc8439 SHA512 102af001ad78e8da45205b0d2b44c9f9a0843a7a953a9868018821007d0c5e9d166dfe335f1fc9ecde71a200473edacff5643fab9d7c32ea16ceb8eaf9b857d4
diff --git a/x11-misc/barrier/barrier-2.3.3.ebuild b/x11-misc/barrier/barrier-2.4.0.ebuild
index 33d180e0a5d7..5acabd7ab66d 100644
--- a/x11-misc/barrier/barrier-2.3.3.ebuild
+++ b/x11-misc/barrier/barrier-2.4.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop virtualx xdg cmake
 
@@ -37,12 +37,12 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	dev-cpp/gtest
+	dev-cpp/gulrak-filesystem
 	x11-base/xorg-proto
 "
 
 PATCHES=(
-	"${FILESDIR}"/${P}-tests.patch
-	"${FILESDIR}"/${P}-gtest.patch
+	"${FILESDIR}"/${P}-includes.patch
 )
 
 DOCS=(
diff --git a/x11-misc/barrier/files/barrier-2.3.3-gtest.patch b/x11-misc/barrier/files/barrier-2.3.3-gtest.patch
deleted file mode 100644
index 363f8c2c02c0..000000000000
--- a/x11-misc/barrier/files/barrier-2.3.3-gtest.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From bd1db368b333783697d686c82c42e48c4bec8b9e Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Fri, 21 Aug 2020 23:13:58 +0100
-Subject: [PATCH] Add BARRIER_USE_EXTERNAL_GTEST CMake option to use external
- GTest
-
----
- CMakeLists.txt                     |  1 +
- src/test/CMakeLists.txt            | 38 ++++++++++++++++++++----------
- src/test/integtests/CMakeLists.txt |  4 +---
- src/test/unittests/CMakeLists.txt  |  4 +---
- 4 files changed, 29 insertions(+), 18 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4947d20f..18b242db 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -21,6 +21,7 @@ project (barrier C CXX)
- option (BARRIER_BUILD_GUI "Build the GUI" ON)
- option (BARRIER_BUILD_INSTALLER "Build the installer" ON)
- option (BARRIER_BUILD_TESTS "Build the tests" ON)
-+option (BARRIER_USE_EXTERNAL_GTEST "Use external installation of Google Test framework" OFF)
- 
- set (CMAKE_EXPORT_COMPILE_COMMANDS ON)
- set (CMAKE_CXX_STANDARD 14)
-diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
-index daecb317..4a50e701 100644
---- a/src/test/CMakeLists.txt
-+++ b/src/test/CMakeLists.txt
-@@ -14,19 +14,33 @@
- # You should have received a copy of the GNU General Public License
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
--include_directories(
--    ../../ext/gtest
--    ../../ext/gtest/include
--    ../../ext/gmock
--    ../../ext/gmock/include)
--    
--add_library(gtest STATIC ../../ext/gtest/src/gtest-all.cc)
--add_library(gmock STATIC ../../ext/gmock/src/gmock-all.cc)
-+if (BARRIER_USE_EXTERNAL_GTEST)
-+    include (FindPkgConfig)
-+    find_package(GTest REQUIRED)
-+    pkg_check_modules(GMOCK REQUIRED gmock)
-+    include_directories(
-+        ${GTEST_INCLUDE_DIRS}
-+        ${GMOCK_INCLUDE_DIRS}
-+    )
-+else()
-+    include_directories(
-+        ../../ext/gtest
-+        ../../ext/gtest/include
-+        ../../ext/gmock
-+        ../../ext/gmock/include
-+    )
- 
--if (UNIX)
--    # ignore warnings in gtest and gmock
--    set_target_properties(gtest PROPERTIES COMPILE_FLAGS "-w")
--    set_target_properties(gmock PROPERTIES COMPILE_FLAGS "-w")
-+    add_library(gtest STATIC ../../ext/gtest/src/gtest-all.cc)
-+    add_library(gmock STATIC ../../ext/gmock/src/gmock-all.cc)
-+
-+    set(GTEST_LIBRARIES gtest)
-+    set(GMOCK_LIBRARIES gmock)
-+
-+    if (UNIX)
-+        # ignore warnings in gtest and gmock
-+        set_target_properties(gtest PROPERTIES COMPILE_FLAGS "-w")
-+        set_target_properties(gmock PROPERTIES COMPILE_FLAGS "-w")
-+    endif()
- endif()
- 
- add_subdirectory(integtests)
-diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt
-index 0460d8df..9ef875bd 100644
---- a/src/test/integtests/CMakeLists.txt
-+++ b/src/test/integtests/CMakeLists.txt
-@@ -68,8 +68,6 @@ endif()
- 
- include_directories(
-     ../../
--    ../../../ext/gtest/include
--    ../../../ext/gmock/include
- )
- 
- if (UNIX)
-@@ -80,4 +78,4 @@ endif()
- 
- add_executable(integtests ${sources})
- target_link_libraries(integtests
--    arch base client common io ipc mt net platform server synlib gtest gmock ${libs} ${OPENSSL_LIBS})
-+    arch base client common io ipc mt net platform server synlib ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES} ${libs} ${OPENSSL_LIBS})
-diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt
-index c46375ce..61a0d35f 100644
---- a/src/test/unittests/CMakeLists.txt
-+++ b/src/test/unittests/CMakeLists.txt
-@@ -50,8 +50,6 @@ list(APPEND headers ${platform_sources})
- 
- include_directories(
-     ../../
--    ../../../ext/gtest/include
--    ../../../ext/gmock/include
-     ../../../ext
- )
- 
-@@ -67,4 +65,4 @@ endif()
- 
- add_executable(unittests ${sources})
- target_link_libraries(unittests
--    arch base client server common io net platform server synlib mt ipc gtest gmock ${libs} ${OPENSSL_LIBS})
-+    arch base client server common io net platform server synlib mt ipc ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES} ${libs} ${OPENSSL_LIBS})
--- 
-2.26.2
-
diff --git a/x11-misc/barrier/files/barrier-2.3.3-tests.patch b/x11-misc/barrier/files/barrier-2.3.3-tests.patch
deleted file mode 100644
index a4cc0d665a07..000000000000
--- a/x11-misc/barrier/files/barrier-2.3.3-tests.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From 4a031b8ce538af0c15857c37c1964bf144d5bc38 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Fri, 21 Aug 2020 22:22:48 +0100
-Subject: [PATCH] Add BARRIER_BUILD_TESTS CMake option to make tests optional
-
----
- CMakeLists.txt                             | 2 +-
- src/CMakeLists.txt                         | 5 ++++-
- src/lib/barrier/KeyMap.h                   | 4 ++++
- src/test/unittests/barrier/KeyMapTests.cpp | 2 ++
- 4 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6a377c04..4947d20f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -20,6 +20,7 @@ project (barrier C CXX)
- 
- option (BARRIER_BUILD_GUI "Build the GUI" ON)
- option (BARRIER_BUILD_INSTALLER "Build the installer" ON)
-+option (BARRIER_BUILD_TESTS "Build the tests" ON)
- 
- set (CMAKE_EXPORT_COMPILE_COMMANDS ON)
- set (CMAKE_CXX_STANDARD 14)
-@@ -49,7 +50,6 @@ else()
- endif()
- 
- set (libs)
--include_directories (BEFORE SYSTEM ./ext/gtest/include)
- 
- if (UNIX)
-     if (NOT APPLE)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 55aad09d..c3dea51f 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -19,7 +19,10 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}/lib)
- 
- add_subdirectory(lib)
- add_subdirectory(cmd)
--add_subdirectory(test)
-+
-+if (BARRIER_BUILD_TESTS)
-+    add_subdirectory(test)
-+endif()
- 
- if (BARRIER_BUILD_GUI)
-     add_subdirectory(gui)
-diff --git a/src/lib/barrier/KeyMap.h b/src/lib/barrier/KeyMap.h
-index b6eb8658..812b4d26 100644
---- a/src/lib/barrier/KeyMap.h
-+++ b/src/lib/barrier/KeyMap.h
-@@ -24,7 +24,9 @@
- #include "common/stdset.h"
- #include "common/stdvector.h"
- 
-+#ifdef TEST_ENV
- #include <gtest/gtest_prod.h>
-+#endif
- 
- namespace barrier {
- 
-@@ -327,6 +329,7 @@ public:
-     //@}
- 
- private:
-+#ifdef TEST_ENV
-     FRIEND_TEST(KeyMapTests,
-                 findBestKey_requiredDown_matchExactFirstItem);
-     FRIEND_TEST(KeyMapTests,
-@@ -340,6 +343,7 @@ private:
-     FRIEND_TEST(KeyMapTests,
-                 findBestKey_onlyOneRequiredDown_matchTwoRequiredChangesItem);
-     FRIEND_TEST(KeyMapTests, findBestKey_noRequiredDown_cannotMatch);
-+#endif
- 
- private:
-     //! Ways to synthesize a key
-diff --git a/src/test/unittests/barrier/KeyMapTests.cpp b/src/test/unittests/barrier/KeyMapTests.cpp
-index 59806339..c0832199 100644
---- a/src/test/unittests/barrier/KeyMapTests.cpp
-+++ b/src/test/unittests/barrier/KeyMapTests.cpp
-@@ -15,6 +15,8 @@
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
-+#define TEST_ENV
-+
- #include "barrier/KeyMap.h"
- 
- #include "test/global/gtest.h"
--- 
-2.26.2
-
-From 19e020080cb3f54befb504abc48cf304ab42f23e Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sat, 22 Aug 2020 11:46:25 +0100
-Subject: [PATCH] Respect DISPLAY environment variable in XWindows tests
-
-XWindowsScreenTests was failing under Gentoo's package manager. I have
-also addressed this in XWindowsScreenSaverTests, which is currently
-unused.
----
- src/test/integtests/platform/XWindowsScreenSaverTests.cpp | 7 ++++++-
- src/test/integtests/platform/XWindowsScreenTests.cpp      | 7 ++++++-
- 2 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/src/test/integtests/platform/XWindowsScreenSaverTests.cpp b/src/test/integtests/platform/XWindowsScreenSaverTests.cpp
-index c6a2710c..1ee273ed 100644
---- a/src/test/integtests/platform/XWindowsScreenSaverTests.cpp
-+++ b/src/test/integtests/platform/XWindowsScreenSaverTests.cpp
-@@ -30,7 +30,12 @@ using ::testing::_;
- // TODO: not working on build machine for some reason
- TEST(CXWindowsScreenSaverTests, activate_defaultScreen_todo)
- {
--    Display* display = XOpenDisplay(":0.0");
-+    const char* displayName = getenv("DISPLAY");
-+    if (displayName == NULL) {
-+        displayName = ":0.0";
-+    }
-+
-+    Display* display = XOpenDisplay(displayName);
-     Window window = DefaultRootWindow(display);
-     MockEventQueue eventQueue;
-     EXPECT_CALL(eventQueue, removeHandler(_, _)).Times(1);
-diff --git a/src/test/integtests/platform/XWindowsScreenTests.cpp b/src/test/integtests/platform/XWindowsScreenTests.cpp
-index d8f75e15..97358197 100644
---- a/src/test/integtests/platform/XWindowsScreenTests.cpp
-+++ b/src/test/integtests/platform/XWindowsScreenTests.cpp
-@@ -25,11 +25,16 @@ using ::testing::_;
- 
- TEST(CXWindowsScreenTests, fakeMouseMove_nonPrimary_getCursorPosValuesCorrect)
- {
-+    const char* displayName = getenv("DISPLAY");
-+    if (displayName == NULL) {
-+        displayName = ":0.0";
-+    }
-+
-     MockEventQueue eventQueue;
-     EXPECT_CALL(eventQueue, adoptHandler(_, _, _)).Times(2);
-     EXPECT_CALL(eventQueue, adoptBuffer(_)).Times(2);
-     EXPECT_CALL(eventQueue, removeHandler(_, _)).Times(2);
--    XWindowsScreen screen(new XWindowsImpl(), ":0.0", false, false, 0, &eventQueue);
-+    XWindowsScreen screen(new XWindowsImpl(), displayName, false, false, 0, &eventQueue);
- 
-     screen.fakeMouseMove(10, 20);
- 
--- 
-2.26.2
-
diff --git a/x11-misc/barrier/files/barrier-2.4.0-includes.patch b/x11-misc/barrier/files/barrier-2.4.0-includes.patch
new file mode 100644
index 000000000000..048a3b068092
--- /dev/null
+++ b/x11-misc/barrier/files/barrier-2.4.0-includes.patch
@@ -0,0 +1,39 @@
+From aa0a2998e8894716644ea5fb29fc6f0165add956 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Tue, 2 Nov 2021 20:59:51 +0000
+Subject: [PATCH] Add missing cstddef includes for NULL
+
+---
+ src/lib/base/Event.cpp | 2 ++
+ src/lib/base/Event.h   | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/src/lib/base/Event.cpp b/src/lib/base/Event.cpp
+index cc548fc6..08c5e98f 100644
+--- a/src/lib/base/Event.cpp
++++ b/src/lib/base/Event.cpp
+@@ -19,6 +19,8 @@
+ #include "base/Event.h"
+ #include "base/EventQueue.h"
+ 
++#include <cstddef>
++
+ //
+ // Event
+ //
+diff --git a/src/lib/base/Event.h b/src/lib/base/Event.h
+index 38a2cf11..cb00dccb 100644
+--- a/src/lib/base/Event.h
++++ b/src/lib/base/Event.h
+@@ -21,6 +21,8 @@
+ #include "common/basic_types.h"
+ #include "common/stdmap.h"
+ 
++#include <cstddef>
++
+ class EventData {
+ public:
+     EventData() { }
+-- 
+2.32.0
+
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index 0bc95e25d9fa..f7d12d452885 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -3,5 +3,5 @@ DIST polybar-3.5.6.tar.gz 282964 BLAKE2B 518e8b2e1d2e0698540c4c93cdfce5283c5479b
 DIST polybar-3.5.7.tar.gz 283520 BLAKE2B 3f7cad2886c0f8352b92e636035607b2abab6dafd0966e6edb9f3b768fc6e5b180be2479f81812eb792f66edada6fe2625af5c3ecc9216763c141a393ab90474 SHA512 6336613d37ae45ca43d1cc2e1e2126bcd09247dbf81b3df979def44b240e2a736035503cf5aaeff0a86c830deb956f9ef7057c7fa1ac3da5119b8e6c1db0fe7f
 DIST xpp-044e69d05db7f89339bda1ccd1efe0263b01c8f6.tar.gz 84121 BLAKE2B dea2384773803bbc5de2ec971ed0cf769b0af8b987bbcf918718647e4787b4713af54a358c029e9603c28c5424488731f76ecc430b6b124bcd9255aef893431f SHA512 646e159d47d6dac8f08a27a1cb54e2ef48e42cff952b55b3906c2021c424e015c070a31a7a1e70b62e0edc7a8b42b935a23b9a922eaab138d3f6929bc1fdb8d4
 EBUILD polybar-3.5.6.ebuild 1903 BLAKE2B a6256133894fe5e4d8ec5d66c47411376246b65406d5260a6973c5a2d7fc198319e54d767846a96b238feaba64de877013eb44acb86cf0d3688f72bfd317686e SHA512 1e772151348fb9029517f184f30adcbcc1700b1a7176b487b368ceb7dd61e224dd82842af20f7beba471ffabc053d8cdd87be3fe8ea4b2d3dfef5a687d9a79a2
-EBUILD polybar-3.5.7.ebuild 1905 BLAKE2B 266253f3680f8c2160c2681826b005af9433e2af5a8d9e3ba51b8dfe0a00c3c686568d3ba6751c74de09bedb13c46683a14e088b687ab02f319674fed2c073e8 SHA512 00fa80d9e76738de1a10d2a5e290d74129e8626df9eda2dc909c690c7d7ff0daabcdc644673309309eb7c241643937f5823fb036e7256c9569e398685c2b4276
+EBUILD polybar-3.5.7.ebuild 1903 BLAKE2B a6256133894fe5e4d8ec5d66c47411376246b65406d5260a6973c5a2d7fc198319e54d767846a96b238feaba64de877013eb44acb86cf0d3688f72bfd317686e SHA512 1e772151348fb9029517f184f30adcbcc1700b1a7176b487b368ceb7dd61e224dd82842af20f7beba471ffabc053d8cdd87be3fe8ea4b2d3dfef5a687d9a79a2
 MISC metadata.xml 585 BLAKE2B c792f265587effc07acc20f097adc1a1975d23ddf55ceb07b4bda02e61e1b48b1d20c5a07792ac18fa5f02949e0a88bc18fe6df2fffd9454406cda34ac33654b SHA512 c3f9080f68d989dbfd75492ec0c4870e4df9b0525a69256ac95bf55eea60022ac018cc1afe42677bc8f822beec75d137e1e7c8a876763c72664541a0a54b28f1
diff --git a/x11-misc/polybar/polybar-3.5.7.ebuild b/x11-misc/polybar/polybar-3.5.7.ebuild
index 967c31960f70..d36b8fef936b 100644
--- a/x11-misc/polybar/polybar-3.5.7.ebuild
+++ b/x11-misc/polybar/polybar-3.5.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/polybar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 	https://github.com/polybar/xpp/archive/${XPP_COMMIT}.tar.gz -> xpp-${XPP_COMMIT}.tar.gz
 	https://github.com/polybar/i3ipcpp/archive/${I3IPCPP_COMMIT}.tar.gz -> i3ipcpp-${I3IPCPP_COMMIT}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="alsa curl doc i3wm ipc mpd network pulseaudio"