diff options
Diffstat (limited to 'x11-misc/synergy')
-rw-r--r-- | x11-misc/synergy/Manifest | 1 | ||||
-rw-r--r-- | x11-misc/synergy/files/synergy-1.9.1-cmake-version.patch | 57 | ||||
-rw-r--r-- | x11-misc/synergy/files/synergy-1.9.1-gtest.patch | 28 | ||||
-rw-r--r-- | x11-misc/synergy/files/synergy-1.9.1-internal-gmock-gtest.patch | 23 | ||||
-rw-r--r-- | x11-misc/synergy/files/synergy-1.9.1-pthread.patch | 11 | ||||
-rw-r--r-- | x11-misc/synergy/files/synergy-1.9.1-qt-5.11.patch | 31 | ||||
-rw-r--r-- | x11-misc/synergy/synergy-1.9.1.ebuild | 103 |
7 files changed, 254 insertions, 0 deletions
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest index fb8fff4beb83..7fd062f77f56 100644 --- a/x11-misc/synergy/Manifest +++ b/x11-misc/synergy/Manifest @@ -1,5 +1,6 @@ DIST synergy-1.6.3.tar.gz 4405517 BLAKE2B 46a56a9833ac0132d0fefcbeefccbc440d3d4e123eceb4ccb04eedadd6fa9dec9abb6f7770d6739b576006783a8890788d53027d9d5a5b245ef6b14dc704e72b SHA512 de67b0663c5ef411570f163208b2a295a8f16537dcc37a41a31039a2d01de083410c023b7f255664eb0c84f0290473690b638934082c2276ddce594126861165 DIST synergy-1.8.6.tar.gz 13497043 BLAKE2B f74f6d48203bc49d7a74cf2f951ea506a1887b659e34954651d2a8333e604e3e41e04b5e6b6115b8b8ded6e94fbad004b0673465cb0734a57d137992f432a3c4 SHA512 e0816c280c77d4a865f4b7d4a9081963032a156bfb6da51e6b67a6fc41f8f18b097d3fc7c96218db268c36d0148021f9ddba95fe56daff8bfc54219dbdfe14a5 DIST synergy-1.8.8.tar.gz 13498599 BLAKE2B 40c52ed036ef21594d330f1b4e32b647bdb3076147d40f2437f649a54700cb4a7822137587c129f9bede26a93e872961135ee27dfb3b8f4256153a5e982737a1 SHA512 b4909930af7da10d877297e674df4c042ec54333eed585334da4a8c834c0ca3ad7c93fd2436c7d8d2f0e9e039d7bd385bb9e8a8c706750cbab3c3664a9b16bc6 +DIST synergy-1.9.1.tar.gz 6694745 BLAKE2B d7e19fd3e55e60b6a41dffa04d6a53c897c0a7e4895ff65ddfae18b06892959e8c7e56092b3d49f123768b3ce92d59fc890afe756192b3625db664b5fa19331e SHA512 83301f2d035bd91578cf83e335d721748791f62c85252156fd27d09db7b5216a745cfa81c06b27995d1785e676ee4c75f795b5fad2b9a700a981d27d05e5a8fe DIST synergy-2.0.0.tar.gz 5892923 BLAKE2B 661f42031499c9c1b2cbb90d9af45f5210c8e1b109f62cfc1cbdedf264f8c358c394005f4a040a8071773d538383adf3e85a059bc54ff67284aaf86990e0a6fa SHA512 69b8e4ea9d22f5699d3a0761cf9811d0689b06a920056b4b4dde466767ec89caaaa8c5736a78d0857ebfb814aaa3bf07591feaf0e64e0555949c5ee6d6974a13 DIST synergy.png 26910 BLAKE2B aa9c5c7c0647937eadc82edbdf7a5a374dd25e9450d6861f1092d8569155e38b3d0729bafb69809e62660802d471899c472a0c9d2066e4b7fcec379f34470535 SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d diff --git a/x11-misc/synergy/files/synergy-1.9.1-cmake-version.patch b/x11-misc/synergy/files/synergy-1.9.1-cmake-version.patch new file mode 100644 index 000000000000..da7a603119d3 --- /dev/null +++ b/x11-misc/synergy/files/synergy-1.9.1-cmake-version.patch @@ -0,0 +1,57 @@ +--- a/cmake/Version.cmake 2018-04-10 12:18:42.000000000 +0200 ++++ b/cmake/Version.cmake 2018-05-11 23:29:24.499906356 +0200 +@@ -23,7 +23,7 @@ + if (DEFINED ENV{SYNERGY_VERSION_PATCH}) + set (SYNERGY_VERSION_PATCH $ENV{SYNERGY_VERSION_PATCH}) + else() +- set (SYNERGY_VERSION_PATCH 0) ++ set (SYNERGY_VERSION_PATCH 1) + message (WARNING "Synergy version wasn't set. Set to ${SYNERGY_VERSION_MAJOR}.${SYNERGY_VERSION_MINOR}.${SYNERGY_VERSION_PATCH}") + endif() + endif() +@@ -36,29 +36,6 @@ + endif() + endif() + +-if (NOT DEFINED SYNERGY_REVISION) +- if (DEFINED ENV{GIT_COMMIT}) +- string (SUBSTRING $ENV{GIT_COMMIT} 0 8 SYNERGY_REVISION) +- elseif (SYNERGY_VERSION_STAGE STREQUAL "snapshot") +- execute_process ( +- COMMAND git rev-parse --short=8 HEAD +- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} +- OUTPUT_VARIABLE SYNERGY_REVISION +- OUTPUT_STRIP_TRAILING_WHITESPACE +- ) +- endif() +-endif() +- +-if (DEFINED SYNERGY_REVISION) +- string(LENGTH ${SYNERGY_REVISION} SYNERGY_REVISION_LENGTH) +- if (NOT ((SYNERGY_REVISION MATCHES "^[a-f0-9]+") AND (SYNERGY_REVISION_LENGTH EQUAL "8"))) +- message (FATAL_ERROR "SYNERGY_REVISION ('${SYNERGY_REVISION}') should be a short commit hash") +- endif() +- unset (SYNERGY_REVISION_LENGTH) +-else() +- set (SYNERGY_REVISION "0badc0de") +-endif() +- + if (DEFINED ENV{BUILD_NUMBER}) + set (SYNERGY_BUILD_NUMBER $ENV{BUILD_NUMBER}) + else() +@@ -66,7 +43,6 @@ + endif() + + string (TIMESTAMP SYNERGY_BUILD_DATE "%Y%m%d" UTC) +-set (SYNERGY_SNAPSHOT_INFO ".${SYNERGY_VERSION_STAGE}.${SYNERGY_REVISION}") + + if (SYNERGY_VERSION_STAGE STREQUAL "snapshot") + set (SYNERGY_VERSION_TAG "${SYNERGY_VERSION_STAGE}.b${SYNERGY_BUILD_NUMBER}-${SYNERGY_REVISION}") +@@ -80,7 +56,6 @@ + + add_definitions (-DSYNERGY_VERSION="${SYNERGY_VERSION}") + add_definitions (-DSYNERGY_VERSION_STRING="${SYNERGY_VERSION_STRING}") +-add_definitions (-DSYNERGY_REVISION="${SYNERGY_REVISION}") + add_definitions (-DSYNERGY_BUILD_DATE="${SYNERGY_BUILD_DATE}") + add_definitions (-DSYNERGY_BUILD_NUMBER=${SYNERGY_BUILD_NUMBER}) + diff --git a/x11-misc/synergy/files/synergy-1.9.1-gtest.patch b/x11-misc/synergy/files/synergy-1.9.1-gtest.patch new file mode 100644 index 000000000000..f7a5e614e810 --- /dev/null +++ b/x11-misc/synergy/files/synergy-1.9.1-gtest.patch @@ -0,0 +1,28 @@ +--- a/src/lib/synergy/KeyMap.h ++++ b/src/lib/synergy/KeyMap.h +@@ -24,7 +24,9 @@ + #include "common/stdset.h" + #include "common/stdvector.h" + ++#if WITH_GENTOO_TEST + #include <gtest/gtest_prod.h> ++#endif + + namespace synergy { + +@@ -327,6 +329,7 @@ + //@} + + ++#if WITH_GENTOO_TEST + private: + FRIEND_TEST(KeyMapTests, + findBestKey_requiredDown_matchExactFirstItem); +@@ -341,6 +344,7 @@ + FRIEND_TEST(KeyMapTests, + findBestKey_onlyOneRequiredDown_matchTwoRequiredChangesItem); + FRIEND_TEST(KeyMapTests, findBestKey_noRequiredDown_cannotMatch); ++#endif + + private: + //! Ways to synthesize a key diff --git a/x11-misc/synergy/files/synergy-1.9.1-internal-gmock-gtest.patch b/x11-misc/synergy/files/synergy-1.9.1-internal-gmock-gtest.patch new file mode 100644 index 000000000000..bc8a96130575 --- /dev/null +++ b/x11-misc/synergy/files/synergy-1.9.1-internal-gmock-gtest.patch @@ -0,0 +1,23 @@ +--- a/src/test/CMakeLists.txt ++++ b/src/test/CMakeLists.txt +@@ -14,20 +14,5 @@ + # 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 (UNIX) +- # ignore warnings in gtest and gmock +- set_target_properties(gtest PROPERTIES COMPILE_FLAGS "-w") +- set_target_properties(gmock PROPERTIES COMPILE_FLAGS "-w") +-endif() +- + add_subdirectory(integtests) + add_subdirectory(unittests) diff --git a/x11-misc/synergy/files/synergy-1.9.1-pthread.patch b/x11-misc/synergy/files/synergy-1.9.1-pthread.patch new file mode 100644 index 000000000000..46ae6e1588b8 --- /dev/null +++ b/x11-misc/synergy/files/synergy-1.9.1-pthread.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -141,6 +141,8 @@ + check_library_exists ("pthread" pthread_create "" HAVE_PTHREAD) + if (HAVE_PTHREAD) + list (APPEND libs pthread) ++ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread") ++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") + else() + message (FATAL_ERROR "Missing library: pthread") + endif() diff --git a/x11-misc/synergy/files/synergy-1.9.1-qt-5.11.patch b/x11-misc/synergy/files/synergy-1.9.1-qt-5.11.patch new file mode 100644 index 000000000000..7a706a084d0b --- /dev/null +++ b/x11-misc/synergy/files/synergy-1.9.1-qt-5.11.patch @@ -0,0 +1,31 @@ +--- a/src/gui/CMakeLists.txt 2018-05-11 23:30:26.425509147 +0200 ++++ b/src/gui/CMakeLists.txt 2018-05-11 23:31:53.237354182 +0200 +@@ -39,7 +39,7 @@ + target_link_libraries (synergy dns_sd) + endif() + +-qt5_use_modules (synergy Core Widgets Network) ++target_link_libraries (synergy Qt5::Core Qt5::Widgets Qt5::Network) + target_compile_definitions (synergy PRIVATE -DSYNERGY_VERSION_STAGE="${SYNERGY_VERSION_STAGE}") + target_compile_definitions (synergy PRIVATE -DSYNERGY_REVISION="${SYNERGY_REVISION}") + +--- a/src/gui/src/ActionDialog.cpp 2018-04-10 12:18:42.000000000 +0200 ++++ b/src/gui/src/ActionDialog.cpp 2018-05-11 23:33:50.814498692 +0200 +@@ -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), +--- a/src/gui/src/ScreenSetupView.cpp 2018-04-10 12:18:42.000000000 +0200 ++++ b/src/gui/src/ScreenSetupView.cpp 2018-05-11 23:35:33.304496343 +0200 +@@ -22,6 +22,7 @@ + + #include <QtCore> + #include <QtGui> ++#include <QHeaderView> + + ScreenSetupView::ScreenSetupView(QWidget* parent) : + QTableView(parent) diff --git a/x11-misc/synergy/synergy-1.9.1.ebuild b/x11-misc/synergy/synergy-1.9.1.ebuild new file mode 100644 index 000000000000..dda9e9c3a8d1 --- /dev/null +++ b/x11-misc/synergy/synergy-1.9.1.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils desktop gnome2-utils + +DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers" +HOMEPAGE="https://symless.com/synergy https://github.com/symless/synergy-core" +SRC_URI=" + https://github.com/symless/${PN}-core/archive/v${PV}-stable.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~jer/${PN}.png +" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="libressl qt5" +RESTRICT="test" + +S=${WORKDIR}/${PN}-core-${PV}-stable + +COMMON_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/qtnetwork:5 + dev-qt/qtwidgets:5 + net-dns/avahi[mdnsresponder-compat] + ) +" +DEPEND=" + ${COMMON_DEPEND} + x11-proto/kbproto + x11-proto/randrproto + x11-proto/xextproto + x11-proto/xineramaproto + x11-proto/xproto +" +RDEPEND=" + ${COMMON_DEPEND} + qt5? ( !x11-misc/qsynergy ) +" + +DOCS=( ChangeLog doc/synergy.conf.example{,-advanced,-basic} ) + +PATCHES=( + "${FILESDIR}"/${P}-pthread.patch + "${FILESDIR}"/${P}-internal-gmock-gtest.patch + "${FILESDIR}"/${P}-gtest.patch + "${FILESDIR}"/${P}-cmake-version.patch + "${FILESDIR}"/${P}-qt-5.11.patch +) + +src_configure() { + local mycmakeargs=( + -DSYNERGY_BUILD_LEGACY_GUI=$(usex qt5) + -DSYNERGY_BUILD_LEGACY_INSTALLER=OFF + ) + + cmake-utils_src_configure +} + +src_install () { + dobin "${BUILD_DIR}"/bin/{synergy{c,s},syntool} + + if use qt5 ; then + newbin "${BUILD_DIR}"/bin/${PN} qsynergy + newicon -s 256 "${DISTDIR}"/${PN}.png q${PN}.png + make_desktop_entry q${PN} ${PN/s/S} q${PN} Utility; + fi + + insinto /etc + newins doc/synergy.conf.example synergy.conf + + newman doc/${PN}c.man ${PN}c.1 + newman doc/${PN}s.man ${PN}s.1 + + einstalldocs +} + +pkg_preinst() { + use qt5 && gnome2_icon_savelist +} + +pkg_postinst() { + use qt5 && gnome2_icon_cache_update +} + +pkg_postrm() { + use qt5 && gnome2_icon_cache_update +} |