commit: f8361b5a267fe3095c2bf97808f739fa1848a0fc Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Tue Mar 23 14:07:35 2021 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue Mar 23 14:09:04 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8361b5a
x11-misc/synergy: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> x11-misc/synergy/Manifest | 3 - .../synergy/files/synergy-1.12.0-dnssd-dep.patch | 42 ------- .../files/synergy-1.9.1-cmake-version.patch | 57 ---------- x11-misc/synergy/files/synergy-1.9.1-pthread.patch | 11 -- x11-misc/synergy/files/synergy-1.9.1-qt-5.11.patch | 31 ------ x11-misc/synergy/files/synergy-1.9.1-test.patch | 33 ------ x11-misc/synergy/synergy-1.12.0.ebuild | 118 -------------------- x11-misc/synergy/synergy-1.9.1-r1.ebuild | 121 --------------------- 8 files changed, 416 deletions(-) diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest index 58f085f2575..34d950e8e54 100644 --- a/x11-misc/synergy/Manifest +++ b/x11-misc/synergy/Manifest @@ -1,8 +1,5 @@ DIST googletest-18f8200e3079b0e54fa00cb7ac55d4c39dcf6da6.tar.gz 876756 BLAKE2B f51050e656a449e7d8b7d4d920439825dc5857a8fac637b96191bbf668b6353b0e83c5221395f761ca8d1d29a20596ced4d8b4e08b3ce364a866cf7bcc977e4c SHA512 f77c747218dc5ae4858b2b4c58a401eb895493adf470a331d6bac32cd20542533ff3a77081db653bbc18b9f55f6864be04e1739ef4afaed7db39d7c698abf880 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-core-1.12.0-stable.tar.gz 8237539 BLAKE2B deb9729cadd59b9aee058cde6c9a9e01325081af3cbde0b294fb000c4f805bdba72a6c12266e9f0f360b7aca8a40718295e7d34263ad851bb27be54f54d0c1a0 SHA512 234e8eb42624f006aa45dfcf50a80089a82347c7151da040f10066b412f729adf01600bc9ec2274a0941965e91ab7bab74abd398287a20906dd4a70b1948db5a DIST synergy-core-1.13.0-stable.tar.gz 8657662 BLAKE2B b4da6abd1b396f71aa37531e1adf71ff06d4804b74659db362a8fe2701c44786108ecc8b52932038490dfad8b7ae617f13a365ebe1ecf559f50106772bda9102 SHA512 317f0aae7742a3ecaea2f3138364a5cd1a098d76a2decdb6558900112e5dd0b53c457b461201d25d3a33cc2d9189e1f7f4e777a80b98c87d693f51b636cbb564 DIST synergy-core-1.13.1.41-stable.tar.gz 8663717 BLAKE2B 13d0722b183080361492382d3dd489b911cfe2384390c7b614d17df7f681dfbd8be94fa79cc4088602ea3d431fee793aaebc07f1d976cdd9c22493fba2212392 SHA512 3743ea4ccf8734928d021d414c2f10839056cdac64768f2e3e89b73392969b392030a0d9250041a1c2c21db06659088c8ca66d952c07395baada154df0311b87 -DIST synergy.png 26910 BLAKE2B aa9c5c7c0647937eadc82edbdf7a5a374dd25e9450d6861f1092d8569155e38b3d0729bafb69809e62660802d471899c472a0c9d2066e4b7fcec379f34470535 SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d 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 deleted file mode 100644 index 1905fc552ea..00000000000 --- a/x11-misc/synergy/files/synergy-1.12.0-dnssd-dep.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 91e150889814ddf97a75b881bb979c975894f34f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]> -Date: Thu, 10 Dec 2020 22:40:40 +0100 -Subject: [PATCH] Check for dns_sd.h only when building GUI - -The <dns_sd.h> 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 <dns_sd.h> -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-cmake-version.patch b/x11-misc/synergy/files/synergy-1.9.1-cmake-version.patch deleted file mode 100644 index da7a603119d..00000000000 --- a/x11-misc/synergy/files/synergy-1.9.1-cmake-version.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- 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-pthread.patch b/x11-misc/synergy/files/synergy-1.9.1-pthread.patch deleted file mode 100644 index 46ae6e1588b..00000000000 --- a/x11-misc/synergy/files/synergy-1.9.1-pthread.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 7a706a084d0..00000000000 --- a/x11-misc/synergy/files/synergy-1.9.1-qt-5.11.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- 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/files/synergy-1.9.1-test.patch b/x11-misc/synergy/files/synergy-1.9.1-test.patch deleted file mode 100644 index d0c44e9dd7f..00000000000 --- a/x11-misc/synergy/files/synergy-1.9.1-test.patch +++ /dev/null @@ -1,33 +0,0 @@ -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/synergy-1.12.0.ebuild b/x11-misc/synergy/synergy-1.12.0.ebuild deleted file mode 100644 index 09888a62149..00000000000 --- a/x11-misc/synergy/synergy-1.12.0.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2021 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 ~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 deleted file mode 100644 index f59d79ef879..00000000000 --- a/x11-misc/synergy/synergy-1.9.1-r1.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2021 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 ~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 -}
