x11-misc/barrier: Drop old 2.3.2

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: James Le Cuirot <chewi@gentoo.org>

6 files changed, 0 insertions, 394 deletions

diff --git a/x11-misc/barrier/Manifest b/x11-misc/barrier/Manifest
index 8870062b2d6c..a1a891888b1b 100644
--- a/x11-misc/barrier/Manifest
+++ b/x11-misc/barrier/Manifest
@@ -1,2 +1 @@
-DIST barrier-2.3.2.tar.gz 7244128 BLAKE2B 263be99ffb692e5b8e3e3450565fbaf5c5e2f23beca4beaf5d699547933be1bcdcbf1ed6b9ce8bd53f2a5dbb1eba3fc06490620555520fcff0e8d34ff2ad52cb SHA512 0452244afc3294aaafd89f18d2472e24fb2fc62426e7be91ab4ffceca4697c7acb8f4438fc299835f1312f0ada83911679abe6b8e1268631130c5877e193ff83
 DIST barrier-2.3.3.tar.gz 5465909 BLAKE2B 3f881526f53113e48f1ea2e1592ebf2e932a8296fcba331243678963945001e7700dddc3bf8957f85285aec02c3d3700d31786cef291862a9b21780ee9e96cd6 SHA512 1ac945ce090d5bbdae7bab7d4ca802cc2d54c1644a12088203b240e38078d32d3b30ae2f764ba27d66c9d709e430b0eb1b4576314d99dd6177d8b88d19b89777
diff --git a/x11-misc/barrier/barrier-2.3.2-r1.ebuild b/x11-misc/barrier/barrier-2.3.2-r1.ebuild
deleted file mode 100644
index 62b3dd6a5f97..000000000000
--- a/x11-misc/barrier/barrier-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg cmake
-
-DESCRIPTION="Share a mouse and keyboard between computers (fork of Synergy)"
-HOMEPAGE="https://github.com/debauchee/barrier"
-SRC_URI="https://github.com/debauchee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="gui libressl"
-
-RDEPEND="
-	net-misc/curl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-		net-dns/avahi[mdnsresponder-compat]
-	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-inf-loop.patch
-	"${FILESDIR}"/${P}-no-avahi.patch
-	"${FILESDIR}"/${P}-pthread.patch
-	"${FILESDIR}"/${P}-qt-gui-only.patch
-)
-
-DOCS=(
-	ChangeLog
-	README.md
-	doc/${PN}.conf.example{,-advanced,-basic}
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DBARRIER_BUILD_GUI=$(usex gui)
-		-DBARRIER_BUILD_INSTALLER=OFF
-		-DBARRIER_REVISION=00000000
-		-DBARRIER_VERSION_STAGE=gentoo
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	einstalldocs
-	doman doc/${PN}{c,s}.1
-
-	if use gui; then
-		doicon -s scalable res/${PN}.svg
-		doicon -s 256 res/${PN}.png
-		make_desktop_entry ${PN} Barrier ${PN} Utility
-	fi
-}
diff --git a/x11-misc/barrier/files/barrier-2.3.2-inf-loop.patch b/x11-misc/barrier/files/barrier-2.3.2-inf-loop.patch
deleted file mode 100644
index 125b903e58eb..000000000000
--- a/x11-misc/barrier/files/barrier-2.3.2-inf-loop.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From c79120c049d825fedeed70d5a1a9dc64d17ce9f0 Mon Sep 17 00:00:00 2001
-From: Vasily Galkin <galkin-vv@ya.ru>
-Date: Sun, 9 Feb 2020 23:27:26 +0300
-Subject: [PATCH] Fix infinite loop on fast TCP disconnection
-
-The commit a841b28 changed the condition for removing job from processing.
-New flag MultiplexerJobStatus::continue_servicing become used
-instead of checking pointer for NULL.
-However for cases when TCPSocket::newJob() returns nullptr
-the behaviour changed: earlier the job was removed, but after change
-it is called again, since MultiplexerJobStatus equal to {true, nullptr}
-means "run this job again".
-
-This leads to problem with eating CPU and RAM on linux
-https://github.com/debauchee/barrier/issues/470
-
-There is similar windows problem, but not sure it is related.
-https://github.com/debauchee/barrier/issues/552
-
-Since it looks that the goal of a841b28 was only clarifying
-object ownership and not changing job deletion behaviour,
-this commit tries to get original behaviour and fix the bugs above
-by returning {false, nullptr} instead of {true, nullptr}
-when TCPSocket::newJob() returns nullptr.
----
- src/lib/net/SecureSocket.cpp |  4 ++--
- src/lib/net/TCPSocket.cpp    | 25 +++++++++++++------------
- src/lib/net/TCPSocket.h      |  3 ++-
- 3 files changed, 17 insertions(+), 15 deletions(-)
-
-diff --git a/src/lib/net/SecureSocket.cpp b/src/lib/net/SecureSocket.cpp
-index 99f626e8..92abea3c 100644
---- a/src/lib/net/SecureSocket.cpp
-+++ b/src/lib/net/SecureSocket.cpp
-@@ -761,7 +761,7 @@ MultiplexerJobStatus SecureSocket::serviceConnect(ISocketMultiplexerJob* job,
-     // If status > 0, success
-     if (status > 0) {
-         sendEvent(m_events->forIDataSocket().secureConnected());
--        return {true, newJob()};
-+        return newJobOrStopServicing();
-     }
- 
-     // Retry case
-@@ -793,7 +793,7 @@ MultiplexerJobStatus SecureSocket::serviceAccept(ISocketMultiplexerJob* job,
-     // If status > 0, success
-     if (status > 0) {
-         sendEvent(m_events->forClientListener().accepted());
--        return {true, newJob()};
-+        return newJobOrStopServicing();
-     }
- 
-     // Retry case
-diff --git a/src/lib/net/TCPSocket.cpp b/src/lib/net/TCPSocket.cpp
-index 4f4251ad..09a8f17e 100644
---- a/src/lib/net/TCPSocket.cpp
-+++ b/src/lib/net/TCPSocket.cpp
-@@ -403,6 +403,15 @@ void TCPSocket::setJob(std::unique_ptr<ISocketMultiplexerJob>&& job)
-     }
- }
- 
-+MultiplexerJobStatus TCPSocket::newJobOrStopServicing()
-+{
-+    auto new_job = newJob();
-+    if (new_job)
-+        return {true, std::move(new_job)};
-+    else
-+        return {false, {}};
-+}
-+
- std::unique_ptr<ISocketMultiplexerJob> TCPSocket::newJob()
- {
-     // note -- must have m_mutex locked on entry
-@@ -519,22 +528,14 @@ MultiplexerJobStatus TCPSocket::serviceConnecting(ISocketMultiplexerJob* job, bo
-         catch (XArchNetwork& e) {
-             sendConnectionFailedEvent(e.what());
-             onDisconnected();
--            auto new_job = newJob();
--            if (new_job)
--                return {true, std::move(new_job)};
--            else
--                return {false, {}};
-+            return newJobOrStopServicing();
-         }
-     }
- 
-     if (write) {
-         sendEvent(m_events->forIDataSocket().connected());
-         onConnected();
--        auto new_job = newJob();
--        if (new_job)
--            return {true, std::move(new_job)};
--        else
--            return {false, {}};
-+        return newJobOrStopServicing();
-     }
- 
-     return {true, {}};
-@@ -548,7 +549,7 @@ MultiplexerJobStatus TCPSocket::serviceConnected(ISocketMultiplexerJob* job,
-     if (error) {
-         sendEvent(m_events->forISocket().disconnected());
-         onDisconnected();
--        return {true, newJob()};
-+        return newJobOrStopServicing();
-     }
- 
-     EJobResult writeResult = kRetry;
-@@ -603,7 +604,7 @@ MultiplexerJobStatus TCPSocket::serviceConnected(ISocketMultiplexerJob* job,
-     if (writeResult == kBreak || readResult == kBreak) {
-         return {false, {}};
-     } else if (writeResult == kNew || readResult == kNew) {
--        return {true, newJob()};
-+        return newJobOrStopServicing();
-     } else {
-         return {true, {}};
-     }
-diff --git a/src/lib/net/TCPSocket.h b/src/lib/net/TCPSocket.h
-index 28891353..0b988886 100644
---- a/src/lib/net/TCPSocket.h
-+++ b/src/lib/net/TCPSocket.h
-@@ -76,7 +76,8 @@ protected:
- 
-     void removeJob();
-     void setJob(std::unique_ptr<ISocketMultiplexerJob>&& job);
--    
-+    MultiplexerJobStatus newJobOrStopServicing();
-+
-     bool                isReadable() { return m_readable; }
-     bool                isWritable() { return m_writable; }
- 
--- 
-2.24.1
-
diff --git a/x11-misc/barrier/files/barrier-2.3.2-no-avahi.patch b/x11-misc/barrier/files/barrier-2.3.2-no-avahi.patch
deleted file mode 100644
index 481a23a2d705..000000000000
--- a/x11-misc/barrier/files/barrier-2.3.2-no-avahi.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 93a4035409ed5a4349c9848c3dae3ec670884ee0 Mon Sep 17 00:00:00 2001
-From: Tetja Rediske <tetja+gitlab@tetja.de~>
-Date: Sat, 19 Oct 2019 00:28:13 +0200
-Subject: [PATCH] make non-gui variants build without avahi
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7f9efac8..8e10776e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -175,7 +175,7 @@ if (UNIX)
-             link_directories("/usr/X11R6/lib")
-         endif()
- 
--        if (${PKG_CONFIG_FOUND})
-+        if (BARRIER_BUILD_GUI AND ${PKG_CONFIG_FOUND})
-             pkg_check_modules (AVAHI_COMPAT REQUIRED avahi-compat-libdns_sd)
-             include_directories (BEFORE SYSTEM ${AVAHI_COMPAT_INCLUDE_DIRS})
-             set (CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${AVAHI_COMPAT_INCLUDE_DIRS}")
--- 
-2.24.1
-
diff --git a/x11-misc/barrier/files/barrier-2.3.2-pthread.patch b/x11-misc/barrier/files/barrier-2.3.2-pthread.patch
deleted file mode 100644
index d29844843e45..000000000000
--- a/x11-misc/barrier/files/barrier-2.3.2-pthread.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From a0b3124f80f5696cbf070b3b714533ab4012398d Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Tue, 10 Mar 2020 21:10:48 +0000
-Subject: [PATCH] Use -pthread flag and simplify pthread build logic
-
-Sometimes -lpthread is not enough. This has caused build failures on
-Gentoo Linux in the past.
-
-The logic also seems needlessly complex. We check for HAVE_PTHREAD on
-UNIX platforms even though CMake errors out if pthreads are not
-found. Similarly, we have a fallback for HAVE_PTHREAD_SIGNAL being
-false even though we always set it to true.
----
- CMakeLists.txt                             | 11 ++++-------
- res/config.h.in                            |  6 ------
- src/lib/arch/Arch.h                        |  4 +---
- src/lib/arch/unix/ArchMultithreadPosix.cpp | 13 -------------
- 4 files changed, 5 insertions(+), 29 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8e10776e..ae7ccb21 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -123,12 +123,10 @@ if (UNIX)
-     check_type_size (short SIZEOF_SHORT)
- 
-     # pthread is used on both Linux and Mac
--    check_library_exists ("pthread" pthread_create "" HAVE_PTHREAD)
--    if (HAVE_PTHREAD)
--        list (APPEND libs pthread)
--    else()
--        message (FATAL_ERROR "Missing library: pthread")
--    endif()
-+    set (CMAKE_THREAD_PREFER_PTHREAD TRUE)
-+    set (THREADS_PREFER_PTHREAD_FLAG TRUE)
-+    find_package (Threads REQUIRED)
-+    list (APPEND libs Threads::Threads)
- 
-     # curl is used on both Linux and Mac
-     find_package (CURL)
-@@ -269,7 +267,6 @@ if (UNIX)
-     set (HAVE_CXX_EXCEPTIONS 1)
-     set (HAVE_CXX_MUTABLE 1)
-     set (HAVE_CXX_STDLIB 1)
--    set (HAVE_PTHREAD_SIGNAL 1)
-     set (SELECT_TYPE_ARG1 int)
-     set (SELECT_TYPE_ARG234 " (fd_set *)")
-     set (SELECT_TYPE_ARG5 " (struct timeval *)")
-diff --git a/res/config.h.in b/res/config.h.in
-index f3a72449..2bd3b3bf 100644
---- a/res/config.h.in
-+++ b/res/config.h.in
-@@ -55,12 +55,6 @@
- /* Define if you have a POSIX `sigwait` function. */
- #cmakedefine HAVE_POSIX_SIGWAIT ${HAVE_POSIX_SIGWAIT}
- 
--/* Define if you have POSIX threads libraries and header files. */
--#cmakedefine HAVE_PTHREAD ${HAVE_PTHREAD}
--
--/* Define if you have `pthread_sigmask` and `pthread_kill` functions. */
--#cmakedefine HAVE_PTHREAD_SIGNAL ${HAVE_PTHREAD_SIGNAL}
--
- /* Define if your compiler defines socklen_t. */
- #cmakedefine HAVE_SOCKLEN_T ${HAVE_SOCKLEN_T}
- 
-diff --git a/src/lib/arch/Arch.h b/src/lib/arch/Arch.h
-index c062d6f3..940a2e3a 100644
---- a/src/lib/arch/Arch.h
-+++ b/src/lib/arch/Arch.h
-@@ -54,9 +54,7 @@
- #    include "arch/unix/ArchConsoleUnix.h"
- #    include "arch/unix/ArchDaemonUnix.h"
- #    include "arch/unix/ArchLogUnix.h"
--#    if HAVE_PTHREAD
--#        include "arch/unix/ArchMultithreadPosix.h"
--#    endif
-+#    include "arch/unix/ArchMultithreadPosix.h"
- #    include "arch/unix/ArchNetworkBSD.h"
- #    include "arch/unix/ArchSleepUnix.h"
- #    include "arch/unix/ArchStringUnix.h"
-diff --git a/src/lib/arch/unix/ArchMultithreadPosix.cpp b/src/lib/arch/unix/ArchMultithreadPosix.cpp
-index c9ddc6ce..4866edce 100644
---- a/src/lib/arch/unix/ArchMultithreadPosix.cpp
-+++ b/src/lib/arch/unix/ArchMultithreadPosix.cpp
-@@ -36,17 +36,6 @@
- 
- #define SIGWAKEUP SIGUSR1
- 
--#if !HAVE_PTHREAD_SIGNAL
--    // boy, is this platform broken.  forget about pthread signal
--    // handling and let signals through to every process.  barrier
--    // will not terminate cleanly when it gets SIGTERM or SIGINT.
--#    define pthread_sigmask sigprocmask
--#    define pthread_kill(tid_, sig_) kill(0, (sig_))
--#    define sigwait(set_, sig_)
--#    undef HAVE_POSIX_SIGWAIT
--#    define HAVE_POSIX_SIGWAIT 1
--#endif
--
- static
- void
- setSignalSet(sigset_t* sigset)
-@@ -344,9 +333,7 @@ ArchMultithreadPosix::newThread(ThreadFunc func, void* data)
-     // can't tell the difference.
-     if (!m_newThreadCalled) {
-         m_newThreadCalled = true;
--#if HAVE_PTHREAD_SIGNAL
-         startSignalHandler();
--#endif
-     }
- 
-     // note that the child thread will wait until we release this mutex
--- 
-2.24.1
-
diff --git a/x11-misc/barrier/files/barrier-2.3.2-qt-gui-only.patch b/x11-misc/barrier/files/barrier-2.3.2-qt-gui-only.patch
deleted file mode 100644
index bcfe31386103..000000000000
--- a/x11-misc/barrier/files/barrier-2.3.2-qt-gui-only.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From af0ce63733e040d6220aaa2157190015d4a9b0fd Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Tue, 17 Mar 2020 22:45:20 +0000
-Subject: [PATCH] Only require Qt5 when building the GUI
-
-Commit 6c888437 made Qt5 mandatory for all builds when it is only
-required for the GUI. There's already a find_package call in src/gui,
-it just needed the REQUIRED flag to be added.
----
- CMakeLists.txt         | 6 ------
- src/gui/CMakeLists.txt | 2 +-
- 2 files changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8e10776e..ee0835ec 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -357,12 +357,6 @@ else()
-     set (OPENSSL_LIBS ${lib_ssl} ${lib_crypto})
- endif()
- 
--
--# Check we have the *required* Qt5 libs.
--find_package(Qt5Core REQUIRED)
--find_package(Qt5Network REQUIRED)
--find_package(Qt5Widgets REQUIRED)
--
- #
- # Configure_file... but for directories, recursively.
- #
-diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
-index 4988fe6a..f29fd910 100644
---- a/src/gui/CMakeLists.txt
-+++ b/src/gui/CMakeLists.txt
-@@ -1,6 +1,6 @@
- cmake_minimum_required (VERSION 3.4)
- 
--find_package (Qt5 COMPONENTS Core Widgets Network)
-+find_package (Qt5 REQUIRED COMPONENTS Core Widgets Network)
- set (CMAKE_AUTOMOC ON)
- set (CMAKE_AUTORCC ON)
- set (CMAKE_AUTOUIC ON)
--- 
-2.25.1
-