* [gentoo-commits] repo/gentoo:master commit in: x11-misc/synergy/, x11-misc/synergy/files/
@ 2015-11-22 6:11 Jeroen Roovers
0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2015-11-22 6:11 UTC (permalink / raw
To: gentoo-commits
commit: 96a5d1bb905515093279cd926786df0c20714316
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 22 06:07:39 2015 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 06:11:41 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96a5d1bb
x11-misc/synergy: Version bump (bug #566322 by Rüpel).
Package-Manager: portage-2.2.25
x11-misc/synergy/Manifest | 1 +
x11-misc/synergy/files/synergy-1.7.5-gentoo.patch | 11 ++
x11-misc/synergy/synergy-1.7.5.ebuild | 119 ++++++++++++++++++++++
3 files changed, 131 insertions(+)
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index 145c72f..04e1a5e 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -1,4 +1,5 @@
DIST synergy-1.6.3.tar.gz 4405517 SHA256 93b1965b8e0cfc55cc654aab7053a58b9e730d09e68bbc520be32353a01dce1a SHA512 de67b0663c5ef411570f163208b2a295a8f16537dcc37a41a31039a2d01de083410c023b7f255664eb0c84f0290473690b638934082c2276ddce594126861165 WHIRLPOOL cb8737f0fe75105c9f5c8c371a5aef55c5eb8f1c419b3a7315ed66880e79c379efc6d7bced20c0d046bc281be935322def54f98d67e383d7236620a948ae1c14
DIST synergy-1.7.3.tar.gz 13661943 SHA256 a4effc3ddb0ef6de95f83fa62b5290e2909f8b76729b1bde89c5061e5d381e25 SHA512 334cad16b843f0a6c1337960d76b37724bdb2a5f9841cffab4dbcbe6393cb0c4323860b64a15cccba1158763ef8cbea820900a5c53d0abbb6a92cfbeff827287 WHIRLPOOL c8e1587016b1fb930d8de9cb18a0fcfbf7423ab351c50bc7923da97b68008c57ef12bcd069cc2b15e87175ff1521a60af63dbb2bc09d94a4e45aec6994f035e5
DIST synergy-1.7.4.tar.gz 13665193 SHA256 215dc3918b9f3ddfb57cc963f8df6751e5e834fd90c0a8b2767091589b012bdf SHA512 ad6139209a8635ed91e943e11a7709d96a037bdda45a949c9f63aa3e13211aecf02651794921d2dde30d9024930e256da7538f1cf104d300be1e6b7bc4732932 WHIRLPOOL 5e0f066ca138a84cb34059e2aaf9e4eb3b31ecb930f2faaba48e692f322f2d958d72d134a05708be66d70fb9f49e67d575e4d5f85eb171a07b8c18068ba1bd94
+DIST synergy-1.7.5.tar.gz 13668296 SHA256 b50c79f5c8aca2048cb0e11ba37f75722d1acdda23b0352e25ad66aff999f192 SHA512 f6124509944b8fd2feb048fae88c723f8c3f9ca4f7fa514bfd48ab0324810d7851d9e670c668a333d8b5df636732349c7a486fa329c333ee4569d6b9b43b6084 WHIRLPOOL 4738659578f72c439b6994bab52f7f492f2057fe09783eb91444992eb70bd22e69b553d111832bbdd75b7ed9e01b284b45d8879d714f5ad7b31047065bcaf011
DIST synergy.png 26910 SHA256 c7e6cbaea549a189daed46c7170477772d932144ca20c9ea0db6859bd896f08c SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d WHIRLPOOL 7b3e7f9b05462fb536de0ca8d2257ea8abc0b2f17f0335d7eee73322f79a9ecccf729b992e58cd0965a9c9842f48020b6588cd4af47ea0f6d2b2cd7793c64e3a
diff --git a/x11-misc/synergy/files/synergy-1.7.5-gentoo.patch b/x11-misc/synergy/files/synergy-1.7.5-gentoo.patch
new file mode 100644
index 0000000..9c508f6
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.7.5-gentoo.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -80,7 +80,7 @@
+
+ # warnings as errors:
+ # we have a problem with people checking in code with warnings.
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-unused-local-typedef")
++ #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-unused-local-typedef")
+
+ # For config.h, detect the libraries, functions, etc.
+ include(CheckIncludeFiles)
diff --git a/x11-misc/synergy/synergy-1.7.5.ebuild b/x11-misc/synergy/synergy-1.7.5.ebuild
new file mode 100644
index 0000000..3cf8b0d
--- /dev/null
+++ b/x11-misc/synergy/synergy-1.7.5.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic gnome2-utils cmake-utils qt4-r2
+
+DESCRIPTION="Lets you easily share a single mouse and keyboard between multiple computers"
+HOMEPAGE="http://synergy-project.org/ https://github.com/synergy/synergy"
+SRC_URI="
+ https://github.com/${PN}/${PN}/archive/v${PV}-stable.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~hasufell/distfiles/${PN}.png
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="qt4 test"
+
+S=${WORKDIR}/${P}-stable
+
+COMMON_DEPEND="
+ dev-libs/openssl
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXtst
+ qt4? (
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ net-dns/avahi[mdnsresponder-compat]
+ )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ test? ( >=dev-cpp/gmock-1.6.0 )
+ x11-proto/kbproto
+ x11-proto/randrproto
+ x11-proto/xextproto
+ x11-proto/xineramaproto
+ x11-proto/xproto
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ qt4? ( !x11-misc/qsynergy )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.4.16_p1969-pthread.patch
+ "${FILESDIR}"/${PN}-1.4.17_p2055-test.patch
+ "${FILESDIR}"/${PN}-1.7.5-gentoo.patch
+)
+
+src_prepare() {
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ "$(cmake-utils_use_with test GENTOO_TEST)"
+ )
+ cmake-utils_src_configure
+
+ if use qt4 ; then
+ cd src/gui || die
+ qt4-r2_src_configure
+ fi
+}
+
+src_compile() {
+ cmake-utils_src_compile
+
+ if use qt4 ; then
+ cd src/gui || die
+ qt4-r2_src_compile
+ fi
+}
+
+src_test() {
+ local exe fail
+ for exe in bin/integtests bin/unittests; do
+ ${exe} || fail+=" ${exe}"
+ done
+ [[ ${fail} ]] && ewarn "${fail} failed"
+}
+
+src_install () {
+ dobin bin/${PN}{c,s} bin/syntool
+
+ if use qt4 ; then
+ newbin 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
+
+ dodoc README doc/synergy.conf.example* ChangeLog
+}
+
+pkg_preinst() {
+ use qt4 && gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ use qt4 && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ use qt4 && gnome2_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/synergy/, x11-misc/synergy/files/
@ 2017-12-03 12:32 Jeroen Roovers
0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2017-12-03 12:32 UTC (permalink / raw
To: gentoo-commits
commit: 34f43562515a84ea6b1f43d42bac003a5e62221e
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 3 12:32:22 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Dec 3 12:32:40 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34f43562
x11-misc/synergy: Clean up patch.
Package-Manager: Portage-2.3.16, Repoman-2.3.6
x11-misc/synergy/Manifest | 8 ++++----
x11-misc/synergy/files/synergy-1.8.5-gtest.patch | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index 4a65319d872..485997992c3 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -1,4 +1,4 @@
-DIST synergy-1.6.3.tar.gz 4405517 SHA256 93b1965b8e0cfc55cc654aab7053a58b9e730d09e68bbc520be32353a01dce1a SHA512 de67b0663c5ef411570f163208b2a295a8f16537dcc37a41a31039a2d01de083410c023b7f255664eb0c84f0290473690b638934082c2276ddce594126861165 WHIRLPOOL cb8737f0fe75105c9f5c8c371a5aef55c5eb8f1c419b3a7315ed66880e79c379efc6d7bced20c0d046bc281be935322def54f98d67e383d7236620a948ae1c14
-DIST synergy-1.8.6.tar.gz 13497043 SHA256 76b27c6e90961ee6bdad429904a2d5743854d0d027c067941d2411565d64352b SHA512 e0816c280c77d4a865f4b7d4a9081963032a156bfb6da51e6b67a6fc41f8f18b097d3fc7c96218db268c36d0148021f9ddba95fe56daff8bfc54219dbdfe14a5 WHIRLPOOL c12a0038f931963afee8190799dd74dcb300cbb79c2870d1a8a2e33238a86cc0ef30e5b577fdda05d7880e488d3c03da6a48c6a22095b2f4b312fc851325376a
-DIST synergy-1.8.8.tar.gz 13498599 SHA256 85c388f93881d741981ce3c675e840a52a76883cb2cea1da306c0c453c5d7d9b SHA512 b4909930af7da10d877297e674df4c042ec54333eed585334da4a8c834c0ca3ad7c93fd2436c7d8d2f0e9e039d7bd385bb9e8a8c706750cbab3c3664a9b16bc6 WHIRLPOOL 1e03d6b4463d924477637170a57acfe9238f2b3d5d099cad8b3e65eb473fc7407075afc9859e05d5a818bd27a9723d64bf8cf0d99d950282de490d63f745ab56
-DIST synergy.png 26910 SHA256 c7e6cbaea549a189daed46c7170477772d932144ca20c9ea0db6859bd896f08c SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d WHIRLPOOL 7b3e7f9b05462fb536de0ca8d2257ea8abc0b2f17f0335d7eee73322f79a9ecccf729b992e58cd0965a9c9842f48020b6588cd4af47ea0f6d2b2cd7793c64e3a
+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.png 26910 BLAKE2B aa9c5c7c0647937eadc82edbdf7a5a374dd25e9450d6861f1092d8569155e38b3d0729bafb69809e62660802d471899c472a0c9d2066e4b7fcec379f34470535 SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d
diff --git a/x11-misc/synergy/files/synergy-1.8.5-gtest.patch b/x11-misc/synergy/files/synergy-1.8.5-gtest.patch
index c9eaa516419..69391b217db 100644
--- a/x11-misc/synergy/files/synergy-1.8.5-gtest.patch
+++ b/x11-misc/synergy/files/synergy-1.8.5-gtest.patch
@@ -1,5 +1,5 @@
---- a/src/lib/synergy/KeyMap.h 2016-11-09 13:21:52.000000000 -0600
-+++ b/src/lib/synergy/KeyMap.h 2016-11-09 13:22:17.484457330 -0600
+--- a/src/lib/synergy/KeyMap.h
++++ b/src/lib/synergy/KeyMap.h
@@ -24,7 +24,9 @@
#include "common/stdset.h"
#include "common/stdvector.h"
@@ -26,8 +26,8 @@
private:
//! Ways to synthesize a key
---- a/src/CMakeLists.txt 2016-11-09 13:31:26.000000000 -0600
-+++ b/src/CMakeLists.txt 2016-11-09 13:40:08.189421727 -0600
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
@@ -50,6 +50,6 @@
add_subdirectory(cmd)
add_subdirectory(micro)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/synergy/, x11-misc/synergy/files/
@ 2020-11-30 9:01 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2020-11-30 9:01 UTC (permalink / raw
To: gentoo-commits
commit: 4a6e82ab8fdfe2c9c7c2b0398a7c429c56534552
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 30 08:59:55 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Nov 30 09:01:48 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a6e82ab
x11-misc/synergy: Reenable tests in 1.9.1
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
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 ++++++++++++++++++++++
...ynergy-1.9.1.ebuild => synergy-1.9.1-r1.ebuild} | 32 +++++++++++++++++----
4 files changed, 60 insertions(+), 56 deletions(-)
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 f7a5e614e81..00000000000
--- 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 <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
deleted file mode 100644
index bc8a9613057..00000000000
--- 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 <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-test.patch b/x11-misc/synergy/files/synergy-1.9.1-test.patch
new file mode 100644
index 00000000000..d0c44e9dd7f
--- /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/synergy-1.9.1.ebuild b/x11-misc/synergy/synergy-1.9.1-r1.ebuild
similarity index 76%
rename from x11-misc/synergy/synergy-1.9.1.ebuild
rename to x11-misc/synergy/synergy-1.9.1-r1.ebuild
index 0c5c3b75592..021b8d2d54b 100644
--- a/x11-misc/synergy/synergy-1.9.1.ebuild
+++ b/x11-misc/synergy/synergy-1.9.1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit cmake-utils desktop gnome2-utils
+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"
@@ -15,8 +15,8 @@ SRC_URI="
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"
+IUSE="libressl qt5 test"
+RESTRICT="!test? ( test )"
S=${WORKDIR}/${PN}-core-${PV}-stable
@@ -53,21 +53,43 @@ 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
+ "${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}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/synergy/, x11-misc/synergy/files/
@ 2021-03-23 14:09 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2021-03-23 14:09 UTC (permalink / raw
To: gentoo-commits
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?= <mgorny@gentoo.org>
-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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/synergy/, x11-misc/synergy/files/
@ 2023-04-18 7:02 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2023-04-18 7:02 UTC (permalink / raw
To: gentoo-commits
commit: 69de49ef72759bc2f6d87474bf41437b8ec5e5cd
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 18 06:57:18 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 18 06:57:18 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69de49ef
x11-misc/synergy: fix build w/ gcc 13
Closes: https://bugs.gentoo.org/898032
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../synergy/files/synergy-1.14.1.32-gcc13.patch | 57 ++++++++++++++++++++++
x11-misc/synergy/synergy-1.14.1.32.ebuild | 6 ++-
2 files changed, 62 insertions(+), 1 deletion(-)
diff --git a/x11-misc/synergy/files/synergy-1.14.1.32-gcc13.patch b/x11-misc/synergy/files/synergy-1.14.1.32-gcc13.patch
new file mode 100644
index 000000000000..655199f4b04a
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.14.1.32-gcc13.patch
@@ -0,0 +1,57 @@
+https://bugs.gentoo.org/898032
+https://github.com/symless/synergy-core/commit/ab8a7b5ed44a3aeadc7a20f0e4020d47ac258e14
+
+From ab8a7b5ed44a3aeadc7a20f0e4020d47ac258e14 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Thu, 8 Dec 2022 09:16:44 +0000
+Subject: [PATCH] add missing <cstdint> includes for SIZE_MAX (#7237)
+
+Without the change the build on upcoming `gcc-13` ails as:
+
+ src/lib/base/Log.cpp: In member function 'void Log::print(const char*, int, const char*, ...)':
+ src/lib/base/Log.cpp:128:23:
+ error: 'SIZE_MAX' was not declared in this scope
+ 128 | if ((strnlen(fmt, SIZE_MAX) > 2) && (fmt[0] == '%' && fmt[1] == 'z')) {
+ | ^~~~~~~~
+ src/lib/base/Log.cpp:30:1:
+ note: 'SIZE_MAX' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
+ 29 | #include <ctime>
+ +++ |+#include <cstdint>
+ 30 |
+
+gcc-13 cleaned it's header dependencies and that exposes these failures.
+--- a/src/lib/base/Log.cpp
++++ b/src/lib/base/Log.cpp
+@@ -23,10 +23,11 @@
+ #include "base/log_outputters.h"
+ #include "common/Version.h"
+
++#include <cstdint>
+ #include <cstdio>
+ #include <cstring>
+ #include <iostream>
+-#include <ctime>
++#include <ctime>
+
+ // names of priorities
+ static const char* g_priority[] = {
+--- a/src/lib/base/String.cpp
++++ b/src/lib/base/String.cpp
+@@ -21,6 +21,7 @@
+ #include "common/stdvector.h"
+
+ #include <cctype>
++#include <cstdint>
+ #include <cstdio>
+ #include <cstdlib>
+ #include <cstring>
+--- a/src/lib/synergy/IKeyState.cpp
++++ b/src/lib/synergy/IKeyState.cpp
+@@ -19,6 +19,7 @@
+ #include "synergy/IKeyState.h"
+ #include "base/EventQueue.h"
+
++#include <cstdint>
+ #include <cstring>
+ #include <cstdlib>
+
diff --git a/x11-misc/synergy/synergy-1.14.1.32.ebuild b/x11-misc/synergy/synergy-1.14.1.32.ebuild
index ed1586ea37b1..a85da6a5502d 100644
--- a/x11-misc/synergy/synergy-1.14.1.32.ebuild
+++ b/x11-misc/synergy/synergy-1.14.1.32.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -60,6 +60,10 @@ BDEPEND="
DOCS=( ChangeLog doc/synergy.conf.example{,-advanced,-basic} )
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.14.1.32-gcc13.patch
+)
+
src_prepare() {
# broken on Xvfb
rm src/test/integtests/platform/XWindowsScreenTests.cpp || die
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-04-18 7:02 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-22 6:11 [gentoo-commits] repo/gentoo:master commit in: x11-misc/synergy/, x11-misc/synergy/files/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2017-12-03 12:32 Jeroen Roovers
2020-11-30 9:01 Michał Górny
2021-03-23 14:09 Michał Górny
2023-04-18 7:02 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox