x11-misc/barrier: fix src_install and add 9999 ebuild

Package-Manager: Portage-2.3.41, Repoman-2.3.9

3 files changed, 114 insertions, 5 deletions

diff --git a/x11-misc/barrier/barrier-2.1.1.ebuild b/x11-misc/barrier/barrier-2.1.1.ebuild
index 2b9b652..f40cbb9 100644
--- a/x11-misc/barrier/barrier-2.1.1.ebuild
+++ b/x11-misc/barrier/barrier-2.1.1.ebuild
@@ -6,9 +6,7 @@ inherit eutils cmake-utils flag-o-matic
 
 DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers"
 HOMEPAGE="https://github.com/debauchee/barrier"
-SRC_URI="
-	https://github.com/debauchee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-"
+SRC_URI="https://github.com/debauchee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -39,6 +37,8 @@ DEPEND="
 
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}"/${PN}-qt5.11-port.patch )
+
 src_configure() {
 	local mycmakeargs=(
 		-DBARRIER_BUILD_INSTALLER=OFF
@@ -48,8 +48,9 @@ src_configure() {
 }
 
 src_install() {
+	cmake-utils_src_install
 	if use qt5; then
-		newicon -s 256 res/${PN}.png ${PN}.png
-		newmenu res/${PN}.desktop ${PN}.desktop
+		newicon -s 256 "${S}"/res/${PN}.png ${PN}.png
+		newmenu "${S}"/res/${PN}.desktop ${PN}.desktop
 	fi
 }
diff --git a/x11-misc/barrier/barrier-9999.ebuild b/x11-misc/barrier/barrier-9999.ebuild
new file mode 100644
index 0000000..4665de1
--- /dev/null
+++ b/x11-misc/barrier/barrier-9999.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils cmake-utils flag-o-matic  git-r3
+
+DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers"
+HOMEPAGE="https://github.com/debauchee/barrier"
+
+EGIT_REPO_URI="https://github.com/debauchee/${PN}.git"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=
+IUSE="libressl qt5"
+RESTRICT="test"
+
+DEPEND="
+	!libressl? ( dev-libs/openssl:* )
+	libressl? ( dev-libs/libressl )
+	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
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		net-dns/avahi[mdnsresponder-compat]
+	)
+	x11-base/xorg-proto
+"
+
+RDEPEND="${DEPEND}"
+
+# PATCHES=( "${FILESDIR}"/${PN}-qt5.11-port.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBARRIER_BUILD_INSTALLER=OFF
+		-DBARRIER_BUILD_GUI=$(usex qt5)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use qt5; then
+		newicon -s 256 "${S}"/res/${PN}.png ${PN}.png
+		newmenu "${S}"/res/${PN}.desktop ${PN}.desktop
+	fi
+}
diff --git a/x11-misc/barrier/files/barrier-qt5.11-port.patch b/x11-misc/barrier/files/barrier-qt5.11-port.patch
new file mode 100644
index 0000000..3f0a396
--- /dev/null
+++ b/x11-misc/barrier/files/barrier-qt5.11-port.patch
@@ -0,0 +1,51 @@
+diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
+index 9c902867..d49b4b04 100644
+--- a/src/gui/CMakeLists.txt
++++ b/src/gui/CMakeLists.txt
+@@ -22,13 +22,12 @@ add_executable (barrier WIN32
+ 
+ include_directories (./src)
+ 
+-qt5_use_modules (barrier Core Widgets Network)
+ target_compile_definitions (barrier PRIVATE -DBARRIER_VERSION_STAGE="${BARRIER_VERSION_STAGE}")
+ target_compile_definitions (barrier PRIVATE -DBARRIER_REVISION="${BARRIER_REVISION}")
+ 
+ if (WIN32)
+     include_directories ($ENV{BONJOUR_SDK_HOME}/Include)
+-    find_library (DNSSD_LIB dnssd.lib 
++    find_library (DNSSD_LIB dnssd.lib
+                   HINTS ENV BONJOUR_SDK_HOME
+                   PATH_SUFFIXES "Lib/x64")
+     set_target_properties (barrier PROPERTIES LINK_FLAGS "/NODEFAULTLIB:LIBCMT")
+@@ -46,6 +45,7 @@ if (HAVE_X11)
+ endif()
+ 
+ target_link_libraries (barrier common)
++target_link_libraries (barrier Qt5::Core Qt5::Widgets Qt5::Network)
+ 
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+     install (TARGETS barrier DESTINATION ${BARRIER_BUNDLE_BINARY_DIR})
+diff --git a/src/gui/src/ActionDialog.cpp b/src/gui/src/ActionDialog.cpp
+index e824ea3c..3565cfbc 100644
+--- a/src/gui/src/ActionDialog.cpp
++++ b/src/gui/src/ActionDialog.cpp
+@@ -25,6 +25,7 @@
+ 
+ #include <QtCore>
+ #include <QtGui>
++#include <QButtonGroup>
+ 
+ ActionDialog::ActionDialog(QWidget* parent, ServerConfig& config, Hotkey& hotkey, Action& action) :
+     QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
+diff --git a/src/gui/src/ScreenSetupView.cpp b/src/gui/src/ScreenSetupView.cpp
+index e42ae17e..46e70990 100644
+--- a/src/gui/src/ScreenSetupView.cpp
++++ b/src/gui/src/ScreenSetupView.cpp
+@@ -22,6 +22,7 @@
+ 
+ #include <QtCore>
+ #include <QtGui>
++#include <QHeaderView>
+ 
+ ScreenSetupView::ScreenSetupView(QWidget* parent) :
+     QTableView(parent)