From 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 14 Dec 2020 13:26:14 +0000 Subject: gentoo resync : 14.12.2020 --- x11-misc/synergy/Manifest | 12 +- .../synergy/files/synergy-1.12.0-dnssd-dep.patch | 42 +++++++ x11-misc/synergy/files/synergy-1.9.1-gtest.patch | 28 ----- .../files/synergy-1.9.1-internal-gmock-gtest.patch | 23 ---- x11-misc/synergy/files/synergy-1.9.1-test.patch | 33 ++++++ x11-misc/synergy/metadata.xml | 9 +- x11-misc/synergy/synergy-1.12.0.ebuild | 118 ++++++++++++++++++++ x11-misc/synergy/synergy-1.9.1-r1.ebuild | 121 +++++++++++++++++++++ x11-misc/synergy/synergy-1.9.1.ebuild | 99 ----------------- 9 files changed, 326 insertions(+), 159 deletions(-) create mode 100644 x11-misc/synergy/files/synergy-1.12.0-dnssd-dep.patch delete mode 100644 x11-misc/synergy/files/synergy-1.9.1-gtest.patch delete mode 100644 x11-misc/synergy/files/synergy-1.9.1-internal-gmock-gtest.patch create mode 100644 x11-misc/synergy/files/synergy-1.9.1-test.patch create mode 100644 x11-misc/synergy/synergy-1.12.0.ebuild create mode 100644 x11-misc/synergy/synergy-1.9.1-r1.ebuild delete mode 100644 x11-misc/synergy/synergy-1.9.1.ebuild (limited to 'x11-misc/synergy') diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest index 532248b7e4bc..b62b8b98313a 100644 --- a/x11-misc/synergy/Manifest +++ b/x11-misc/synergy/Manifest @@ -1,11 +1,15 @@ +AUX synergy-1.12.0-dnssd-dep.patch 1512 BLAKE2B 1014b7624142e744cfa5be14cc6e282dea5e6059922f59040304c15b397c6b1368c8892e4f40cf68b74de9bda9d3a2769d8f81c473b0588a56e763c4e76b77a0 SHA512 88ffdea5d85279abfb66ad1a6edc9451ef82d87ca944282e6d6a586cd1ad4a1c13016c519ad515d906ae7d3468ef49365475a049e049ad610daa9b3fcfb48265 AUX synergy-1.9.1-cmake-version.patch 2136 BLAKE2B e96bdfdc278e818be0f46eb2bef7dedb24f70d6fbab3b0ec36716811590f55a742f2d61b6976f6b3eb16490a2deedf6664ee556244065a97afbf2b603d151ec3 SHA512 80dd8adcfe58eff2d6ee74b5e2e408ded1b9b112e72d8bb1d86d33a12c778c5b8bb359501490dff0a896e21f23dc321bcf670fcb2d5cdf66a0ba5a8904f206cd -AUX synergy-1.9.1-gtest.patch 641 BLAKE2B 30103de347404858f35eba8600a961b7f01fa0f4469f293cdf13fb3956d02467924a17e0870fa690e715c5a02bf42d67cc4a103d70af8d006ed381d4fbefcac3 SHA512 c81471a2bded4aeafafb8c0369e6296dc32cf39371795082663d408fd6308d6b520f90bb7e7b57c5156d8e4e3cdb261eead4ac9668a4e0e18649a9ae0d256f64 -AUX synergy-1.9.1-internal-gmock-gtest.patch 725 BLAKE2B 2c7d6a2a2086283e761f3322959d3721a0e1b687683a0420eb282bf841ad5597925bdadd6098615a54e2fe6230e9efd8e0be1063fde8a881deafc149a52329a2 SHA512 1a644f8cb7422cbc36d0ce37648038ae464f7a1c26efb89ff07477447ee69ff2ea10d71765536e19269d63249db6391d997680ad06df1a5c24e1fcc708f2ba3c AUX synergy-1.9.1-pthread.patch 391 BLAKE2B 8d1aabe8a8ddcd1494de5aa5d19428e4e2d248fbef5a372fa1102f36d2e8e7868afdafce0109293b517b81ba3104f7555a9d3e808f5f3752434068ef527626b2 SHA512 8ab56a98baa7f97034bfd2e9577d84edbf7fbd954bce76b2674fe90f0baf9d91bc5f2d5550f7c57cc214316a34fb2769b1c91c4bcfbe967f13fb64863941cb24 AUX synergy-1.9.1-qt-5.11.patch 1211 BLAKE2B f457b5d8afa5c9fe0d750a5d80a6baa44edecb88bb907e5e260f10aedd1978a9c7b56a90cf83a6d4df227ccb548c416196a9ad7c30053aa6b14bedf2a1862042 SHA512 7931de105c6dd7a0d673dacb4ed26ceea6e5ed78460a8c8c8e7104c662d884de37fbe2a8d497c1a3689fcd6316063e3cd3bdd1d7e1650add52153deee0669fc2 +AUX synergy-1.9.1-test.patch 1372 BLAKE2B 3a73c9d431d0fee62e701770ceeb01e3f652b677343104a0ee804c5ed3f6943ec62dced7c24f2f518930099db1ccfb32db08cdf4df72915501e37a89ebfcc2b4 SHA512 cd923dd998dccf31e267db87154288c420538f621e9d179c7e275697edded2c835f75d323b6a94b6b453729fbb7909334474fc7a0202fcdda535e6dce42a44e3 +DIST googletest-aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b +DIST synergy-1.12.0.png 31383 BLAKE2B 228487058d09ee4fe7d3c909a3aee567b63c0d1aeaecf0e724a7bc9c59e48abecac71f8074902fd4f02ff9347fe8f6488b0554fb78a253339b04fe8d2e958d24 SHA512 7044395b41a0d2e49d308c599710fa32398d11584e70da32d4a1ccb292b02437c09860ed14f7bdd113a646daf696988fd3c0b80f3ab52ebbcaddf4c846cdd7ab 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-core-1.12.0-stable.tar.gz 8237539 BLAKE2B deb9729cadd59b9aee058cde6c9a9e01325081af3cbde0b294fb000c4f805bdba72a6c12266e9f0f360b7aca8a40718295e7d34263ad851bb27be54f54d0c1a0 SHA512 234e8eb42624f006aa45dfcf50a80089a82347c7151da040f10066b412f729adf01600bc9ec2274a0941965e91ab7bab74abd398287a20906dd4a70b1948db5a DIST synergy.png 26910 BLAKE2B aa9c5c7c0647937eadc82edbdf7a5a374dd25e9450d6861f1092d8569155e38b3d0729bafb69809e62660802d471899c472a0c9d2066e4b7fcec379f34470535 SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d -EBUILD synergy-1.9.1.ebuild 2121 BLAKE2B f70ec2b27f543ba1ea37bce20cfc88b3ea28f5a100d6b72713112dbcf2b1d9df6c032594c3c9131750c403254c3e544d3be2259e08c59c3cc1de7fc64acd9d17 SHA512 ccc1adf63d0d50ae81110f11b3f8a63386df7cc9c8ee59b2f70f19f2282d8138c7faccb5b68b92aa864790837e8e89e22363879eb97815113db5442e8c7a8ed6 +EBUILD synergy-1.12.0.ebuild 2586 BLAKE2B 157712549a01453c2d65aa5f30005d1d978b795e3a85acfc758de79e108f9b578970502073618ddfbb9668c1bdcdbb2a2023f1317ddb778b78732748fde8bf7e SHA512 72715baf7a8d10983bc6ee23165d22deaaa726c302b8f708b6c81c73595e7ea92b515a2fa6493a4c48d9531391dce7de2de3be61b2f52dd600784b5fa3663759 +EBUILD synergy-1.9.1-r1.ebuild 2575 BLAKE2B b47f14fbdf5ab56e142e80b84d7d52a1e2aa2ed30b4d0209d1d56496b89aa1d5de6c1541c429ba3d430c1481ebbf53fd31b1ab4f3c8ebf80b8dbdd0b0ba6e071 SHA512 dd058c22b6a547582e2d3e3bd869fe6c19c8dedfe00481907134650687b7a8323055e30d99b8cdb835c4d60cd0678c5ba417869ad77977ef1c5c43816594f8be EBUILD synergy-2.0.0.ebuild 1429 BLAKE2B cadd551ffa38911e4e825ffd7ada68d08f5fd8278f71af7321af48aefa81a632c608cba876a17dda8a1f66e0b5762e220389b68ac03c2bfbcf5446e51d9969c9 SHA512 9a931df7b5d5f37b3f5d951aafad19fbb24def897a46fb1d37ecab62bc07141d0f3e19e36e0f9cdd3903e44f23e7e83b8fe6daa56944dada2906026878d489fd -MISC metadata.xml 408 BLAKE2B 2572799c57cee21427948e30551975170b9f655fb2fd0fe307eb7e01eba868a1355fd69df540be767ced000847547d107ad36ae4b8658f0b8628f5960dd4a983 SHA512 381d9d6b5beb883c7bef9453577d76d96bf0160dd891a88d146e5f6b44d6d91dcca02c26ec61f9d50c1e4c920c3a843859a2f3bdbeca81c0208f4e33b705e2d7 +MISC metadata.xml 332 BLAKE2B 04a719c2b19204a1ea7ed755c89b072b271760a85f3b2b7e734796deca104682c147372a1d154d4fdb493d7025e16cfc2012e7d352fdc88dde93d0f3df477b67 SHA512 8c447ce795a81157c40a2839d8845d6db89ee768f70aa397b686b5ec9a7e59fc66f9fec5561e25ab0aed68bcabc369c0c53660ee2a0b7e24b52e169d5debaae0 diff --git a/x11-misc/synergy/files/synergy-1.12.0-dnssd-dep.patch b/x11-misc/synergy/files/synergy-1.12.0-dnssd-dep.patch new file mode 100644 index 000000000000..1905fc552ea1 --- /dev/null +++ b/x11-misc/synergy/files/synergy-1.12.0-dnssd-dep.patch @@ -0,0 +1,42 @@ +From 91e150889814ddf97a75b881bb979c975894f34f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Thu, 10 Dec 2020 22:40:40 +0100 +Subject: [PATCH] Check for dns_sd.h only when building GUI + +The header is only used in the synergy GUI component. Update +the CMake check to be done only if SYNERGY_BUILD_LEGACY_GUI is enabled. +This fixes build failures when GUI is not being built and +is not installed. + +While at it, fix indentation around the added check to match the rest +of the file and avoid being misleading. +--- + CMakeLists.txt | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 581fdf77..35d806d9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -235,11 +235,13 @@ if (UNIX) + list (APPEND libs Xi) + endif() + +- set (DnsSdlib "dns_sd.h") +- set (CMAKE_EXTRA_INCLUDE_FILES "${CMAKE_EXTRA_INCLUDE_FILES};${DnsSdlib}") +- check_include_files ("${DnsSdlib}" HAVE_DNS_SD) +- if (NOT HAVE_DNS_SD) +- message (FATAL_ERROR "Missing header: " ${DnsSdlib}) ++ if (SYNERGY_BUILD_LEGACY_GUI) ++ set (DnsSdlib "dns_sd.h") ++ set (CMAKE_EXTRA_INCLUDE_FILES "${CMAKE_EXTRA_INCLUDE_FILES};${DnsSdlib}") ++ check_include_files ("${DnsSdlib}" HAVE_DNS_SD) ++ if (NOT HAVE_DNS_SD) ++ message (FATAL_ERROR "Missing header: " ${DnsSdlib}) ++ endif() + endif() + endif() + +-- +2.29.2 + diff --git a/x11-misc/synergy/files/synergy-1.9.1-gtest.patch b/x11-misc/synergy/files/synergy-1.9.1-gtest.patch deleted file mode 100644 index f7a5e614e810..000000000000 --- a/x11-misc/synergy/files/synergy-1.9.1-gtest.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- 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 -+#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 deleted file mode 100644 index bc8a96130575..000000000000 --- a/x11-misc/synergy/files/synergy-1.9.1-internal-gmock-gtest.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- 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 . - --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-test.patch b/x11-misc/synergy/files/synergy-1.9.1-test.patch new file mode 100644 index 000000000000..d0c44e9dd7ff --- /dev/null +++ b/x11-misc/synergy/files/synergy-1.9.1-test.patch @@ -0,0 +1,33 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index ab63a06..ec7a3e0 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -22,3 +22,8 @@ add_subdirectory(cmd) + if (SYNERGY_BUILD_LEGACY_GUI) + add_subdirectory(gui) + endif (SYNERGY_BUILD_LEGACY_GUI) ++ ++option(BUILD_TESTS "Build tests" OFF) ++if (BUILD_TESTS) ++ add_subdirectory(test) ++endif() +diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt +index f39968a..bfc886c 100644 +--- a/src/test/integtests/CMakeLists.txt ++++ b/src/test/integtests/CMakeLists.txt +@@ -68,4 +68,4 @@ endif() + + add_executable(integtests ${sources}) + target_link_libraries(integtests +- arch base client common io ipc mt net platform server synergy gtest gmock ${libs} ${OPENSSL_LIBS}) ++ arch base client common io ipc mt net platform server gtest gmock ${libs} ${OPENSSL_LIBS}) +diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt +index 54131eb..ef84dba 100644 +--- a/src/test/unittests/CMakeLists.txt ++++ b/src/test/unittests/CMakeLists.txt +@@ -68,4 +68,4 @@ endif() + + add_executable(unittests ${sources}) + target_link_libraries(unittests +- arch base client server common io net platform server synergy mt ipc gtest gmock shared ${libs} ${OPENSSL_LIBS}) ++ arch base client server common io net platform server mt ipc gtest gmock shared ${libs} ${OPENSSL_LIBS}) diff --git a/x11-misc/synergy/metadata.xml b/x11-misc/synergy/metadata.xml index 11c61fc68912..23c6a90172fc 100644 --- a/x11-misc/synergy/metadata.xml +++ b/x11-misc/synergy/metadata.xml @@ -1,12 +1,11 @@ - - desktop-misc@gentoo.org - Gentoo Desktop Miscellaneous Project + + mgorny@gentoo.org + Michał Górny - synergy - synergy/synergy + symless/synergy-core diff --git a/x11-misc/synergy/synergy-1.12.0.ebuild b/x11-misc/synergy/synergy-1.12.0.ebuild new file mode 100644 index 000000000000..d144f9cb3919 --- /dev/null +++ b/x11-misc/synergy/synergy-1.12.0.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake desktop xdg-utils virtualx + +MY_P=synergy-core-${PV}-stable +GTEST_COMMIT=aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e + +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 + -> ${MY_P}.tar.gz + https://dev.gentoo.org/~mgorny/dist/synergy-1.12.0.png + test? ( + https://github.com/google/googletest/archive/${GTEST_COMMIT}.tar.gz + -> googletest-${GTEST_COMMIT}.tar.gz + ) +" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="libressl gui test" +RESTRICT="!test? ( test )" + +RDEPEND=" + !libressl? ( dev-libs/openssl:= ) + libressl? ( dev-libs/libressl:= ) + 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] + ) +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" + +DOCS=( ChangeLog doc/synergy.conf.example{,-advanced,-basic} ) + +PATCHES=( + "${FILESDIR}"/synergy-1.12.0-dnssd-dep.patch +) + +src_prepare() { + # broken on Xvfb + rm src/test/integtests/platform/XWindowsScreenTests.cpp || die + + if use test; then + rmdir ext/googletest || die + mv "${WORKDIR}/googletest-${GTEST_COMMIT}" ext/googletest || die + else + [[ ${PV} == 1.12.0 ]] || die "Remove this hack on bump" + > ext/googletest/CMakeLists.txt || die + fi + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DSYNERGY_BUILD_LEGACY_GUI=$(usex gui) + -DSYNERGY_BUILD_LEGACY_INSTALLER=OFF + -DBUILD_TESTS=$(usex test) + ) + + cmake_src_configure +} + +my_test() { + "${BUILD_DIR}"/bin/unittests && + "${BUILD_DIR}"/bin/integtests +} + +src_test() { + virtx my_test +} + +src_install() { + dobin "${BUILD_DIR}"/bin/{synergy{c,s},syntool} + + if use gui; then + newbin "${BUILD_DIR}"/bin/synergy qsynergy + newicon -s 256 "${DISTDIR}"/synergy-1.12.0.png qsynergy.png + make_desktop_entry qsynergy Synergy qsynergy 'Utility;' + fi + + insinto /etc + newins doc/synergy.conf.example synergy.conf + + newman doc/synergyc.man synergyc.1 + newman doc/synergys.man synergys.1 + + einstalldocs +} + +pkg_postinst() { + use gui && xdg_icon_cache_update +} + +pkg_postrm() { + use gui && xdg_icon_cache_update +} diff --git a/x11-misc/synergy/synergy-1.9.1-r1.ebuild b/x11-misc/synergy/synergy-1.9.1-r1.ebuild new file mode 100644 index 000000000000..e44e659f7187 --- /dev/null +++ b/x11-misc/synergy/synergy-1.9.1-r1.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils desktop gnome2-utils virtualx + +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 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="libressl qt5 test" +RESTRICT="!test? ( 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-base/xorg-proto +" +RDEPEND=" + ${COMMON_DEPEND} + qt5? ( !x11-misc/qsynergy ) +" + +DOCS=( ChangeLog doc/synergy.conf.example{,-advanced,-basic} ) + +PATCHES=( + "${FILESDIR}"/${P}-pthread.patch + "${FILESDIR}"/${P}-cmake-version.patch + "${FILESDIR}"/${P}-qt-5.11.patch + "${FILESDIR}"/${P}-test.patch +) + +src_prepare() { + # requires Internet, and relies on old site anyway + rm src/test/integtests/arch/ArchInternetTests.cpp || die + # broken on Xvfb + rm src/test/integtests/platform/XWindowsScreenTests.cpp || die + + cmake-utils_src_prepare +} + +src_configure() { + # otherwise unit tests segfault + local -x CFLAGS="${CFLAGS} -O0" + local -x CXXFLAGS="${CXXFLAGS} -O0" + + local mycmakeargs=( + -DSYNERGY_BUILD_LEGACY_GUI=$(usex qt5) + -DSYNERGY_BUILD_LEGACY_INSTALLER=OFF + -DBUILD_TESTS=$(usex test) + ) + + cmake-utils_src_configure +} + +my_test() { + "${BUILD_DIR}"/bin/unittests && + "${BUILD_DIR}"/bin/integtests +} + +src_test() { + virtx my_test +} + +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 +} diff --git a/x11-misc/synergy/synergy-1.9.1.ebuild b/x11-misc/synergy/synergy-1.9.1.ebuild deleted file mode 100644 index 0c5c3b75592b..000000000000 --- a/x11-misc/synergy/synergy-1.9.1.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# 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 ~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-base/xorg-proto -" -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 -} -- cgit v1.2.3