commit: 23c07da7a8d7acd22ea09c586fcbe61d31ff6c8f Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Tue Nov 2 22:32:40 2021 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Tue Nov 2 22:36:02 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23c07da7
x11-misc/barrier: Version bump to 2.4.0, EAPI 8 Bug: https://bugs.gentoo.org/821337 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> x11-misc/barrier/Manifest | 1 + x11-misc/barrier/barrier-2.4.0.ebuild | 82 ++++++++++++++++++++++ .../barrier/files/barrier-2.4.0-includes.patch | 39 ++++++++++ 3 files changed, 122 insertions(+) diff --git a/x11-misc/barrier/Manifest b/x11-misc/barrier/Manifest index a1a891888b1..3fc454b5951 100644 --- a/x11-misc/barrier/Manifest +++ b/x11-misc/barrier/Manifest @@ -1 +1,2 @@ DIST barrier-2.3.3.tar.gz 5465909 BLAKE2B 3f881526f53113e48f1ea2e1592ebf2e932a8296fcba331243678963945001e7700dddc3bf8957f85285aec02c3d3700d31786cef291862a9b21780ee9e96cd6 SHA512 1ac945ce090d5bbdae7bab7d4ca802cc2d54c1644a12088203b240e38078d32d3b30ae2f764ba27d66c9d709e430b0eb1b4576314d99dd6177d8b88d19b89777 +DIST barrier-2.4.0.tar.gz 5572043 BLAKE2B e3eee306324a661a655b31e3179b7daf3fb199553a581059c67113f9597fb41d6af00fa3090d20c7d0b1d7420764454a512e91d8180ea663c3f99b89c663417f SHA512 dff8d95c358688952baee0bbbf56b818e40a6c0483d58f6cadd55558ab5d0cefc92a37b0751bfd70868686e1716c729871ae00a30ee9b0ba944f531dfb742449 diff --git a/x11-misc/barrier/barrier-2.4.0.ebuild b/x11-misc/barrier/barrier-2.4.0.ebuild new file mode 100644 index 00000000000..5acabd7ab66 --- /dev/null +++ b/x11-misc/barrier/barrier-2.4.0.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop virtualx 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 ~x86" +IUSE="gui test" +RESTRICT="!test? ( test )" + +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] + ) + dev-libs/openssl:0= +" +DEPEND=" + ${RDEPEND} + dev-cpp/gtest + dev-cpp/gulrak-filesystem + x11-base/xorg-proto +" + +PATCHES=( + "${FILESDIR}"/${P}-includes.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_BUILD_TESTS=$(usex test) + -DBARRIER_REVISION=00000000 + -DBARRIER_USE_EXTERNAL_GTEST=ON + -DBARRIER_VERSION_STAGE=gentoo + ) + + cmake_src_configure +} + +src_test() { + "${BUILD_DIR}"/bin/unittests || die + virtx "${BUILD_DIR}"/bin/integtests || die +} + +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.4.0-includes.patch b/x11-misc/barrier/files/barrier-2.4.0-includes.patch new file mode 100644 index 00000000000..048a3b06809 --- /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 <[email protected]> +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 +
