public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/synergy/files/, x11-misc/synergy/
@ 2016-07-17  6:48 Jeroen Roovers
  0 siblings, 0 replies; 5+ messages in thread
From: Jeroen Roovers @ 2016-07-17  6:48 UTC (permalink / raw
  To: gentoo-commits

commit:     ea243755514d7bb4ec68c146fb3c14de4e637c1a
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 17 06:47:46 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Jul 17 06:48:11 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea243755

x11-misc/synergy: Version bump.

	- add net-misc/curl dependency for syntool
	- Hack around false gtest dependency
	- Split out internal gtest/gmock patch

Package-Manager: portage-2.3.0

 x11-misc/synergy/Manifest                          |   1 +
 x11-misc/synergy/files/synergy-1.8.1-gtest.patch   |  38 +++++++
 .../files/synergy-1.8.1-internal-gmock-gtest.patch |  23 ++++
 x11-misc/synergy/synergy-1.8.1.ebuild              | 124 +++++++++++++++++++++
 4 files changed, 186 insertions(+)

diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index 89d555a..20f124a 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.5.tar.gz 13668296 SHA256 b50c79f5c8aca2048cb0e11ba37f75722d1acdda23b0352e25ad66aff999f192 SHA512 f6124509944b8fd2feb048fae88c723f8c3f9ca4f7fa514bfd48ab0324810d7851d9e670c668a333d8b5df636732349c7a486fa329c333ee4569d6b9b43b6084 WHIRLPOOL 4738659578f72c439b6994bab52f7f492f2057fe09783eb91444992eb70bd22e69b553d111832bbdd75b7ed9e01b284b45d8879d714f5ad7b31047065bcaf011
 DIST synergy-1.7.6.tar.gz 13668433 SHA256 a453b880606edbdaec82576bcb74189a7ae564feeee126b125063802a778411d SHA512 025305fc1aca425b27c1d4f16dd0c6ee7798c048e234c8a27272b81b03c0c1cb35fab6639707c1b55d58e7676fe2abf058b6f93e994ae5b256034c32c6fe806a WHIRLPOOL ef83b94d8b3b0d3fb5dd2efcf6702f46b25915e4e240d22b9794b0fc6d7c32d883ede2c62fdbaab9fb1b62aa1606ed2ac73cf07544550398beedb3ceaba4a75c
+DIST synergy-1.8.1.tar.gz 13676205 SHA256 021792533beb4b5d78b7f449341f491f004e9cc823795e423dedf1c41c4c30d7 SHA512 f535cd14be1104a39150bfeb22c202aa4d6ab1f5b6cb4e1d4084284e3b62ceab7fc9bb2e87bf11a843f9030cccec22b0ff1669930cf259a4dddb13422f9d0b90 WHIRLPOOL 5d71b77edaa4c46fb338858a8b2c1d993c53bbd1d819b8010e37d6526a8f26f93af8c803c6838cd2f01d89b4532191a71ceb7aaac1bf6af2beb1e28df60eef90
 DIST synergy.png 26910 SHA256 c7e6cbaea549a189daed46c7170477772d932144ca20c9ea0db6859bd896f08c SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d WHIRLPOOL 7b3e7f9b05462fb536de0ca8d2257ea8abc0b2f17f0335d7eee73322f79a9ecccf729b992e58cd0965a9c9842f48020b6588cd4af47ea0f6d2b2cd7793c64e3a

diff --git a/x11-misc/synergy/files/synergy-1.8.1-gtest.patch b/x11-misc/synergy/files/synergy-1.8.1-gtest.patch
new file mode 100644
index 0000000..3491077
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.8.1-gtest.patch
@@ -0,0 +1,38 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -19,6 +19,6 @@
+ add_subdirectory(plugin)
+ add_subdirectory(micro)
+ 
+-if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX")
++if (${WITH_GENTOO_TEST})
+	add_subdirectory(test)
+ endif()
+--- a/src/lib/synergy/SubscriptionManager.h
++++ b/src/lib/synergy/SubscriptionManager.h
+@@ -20,7 +20,9 @@
+ #include "SubscriptionKey.h"
+ #include "common/common.h"
+ 
++#if WITH_GENTOO_TEST
+ #include "gtest/gtest_prod.h"
++#endif
+ 
+ class SubscriptionManager {
+ public:
+@@ -35,6 +37,7 @@
+ 	//! Use standard output to return subscription filename to gui
+ 	void				printFilename();
+ 
++#if WITH_GENTOO_TEST
+ private:
+ 	FRIEND_TEST(SubscriptionTests, decode_invalidLength_throwException);
+ 	FRIEND_TEST(SubscriptionTests, decode_invalidSerial_outputPlainText);
+@@ -45,6 +48,7 @@
+ 	FRIEND_TEST(SubscriptionTests, parsePlainSerial_expiredTrialSerial_throwException);
+ 	FRIEND_TEST(SubscriptionTests, parsePlainSerial_expiredBasicSerial_validSubscriptionKey);
+ 	FRIEND_TEST(SubscriptionTests, parsePlainSerial_validSerialWithoutCompany_validSubscriptionKey);
++#endif
+ 
+ private:
+ 	String				decode(const String& input);

diff --git a/x11-misc/synergy/files/synergy-1.8.1-internal-gmock-gtest.patch b/x11-misc/synergy/files/synergy-1.8.1-internal-gmock-gtest.patch
new file mode 100644
index 0000000..7814c74
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.8.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-1.6.0
+-	../../ext/gtest-1.6.0/include
+-	../../ext/gmock-1.6.0
+-	../../ext/gmock-1.6.0/include)
+-	
+-add_library(gtest STATIC ../../ext/gtest-1.6.0/src/gtest-all.cc)
+-add_library(gmock STATIC ../../ext/gmock-1.6.0/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/synergy-1.8.1.ebuild b/x11-misc/synergy/synergy-1.8.1.ebuild
new file mode 100644
index 0000000..a5fab9d
--- /dev/null
+++ b/x11-misc/synergy/synergy-1.8.1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2016 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/symless/synergy"
+SRC_URI="
+	https://github.com/symless/${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="libressl qt4 test"
+
+S=${WORKDIR}/${P}-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
+	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.7.5-gentoo.patch
+	"${FILESDIR}"/${PN}-1.8.1-internal-gmock-gtest.patch
+	"${FILESDIR}"/${PN}-1.8.1-gtest.patch
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"$(usex test -DWITH_GENTOO_TEST=1 -DWITH_GENTOO_TEST=0)"
+	)
+	append-cxxflags ${mycmakeargs}
+
+	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/files/, x11-misc/synergy/
@ 2016-11-23  6:15 Yixun Lan
  0 siblings, 0 replies; 5+ messages in thread
From: Yixun Lan @ 2016-11-23  6:15 UTC (permalink / raw
  To: gentoo-commits

commit:     9e226a9a58598800152abf23b25e20dfdf3069bb
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 23 06:13:07 2016 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Wed Nov 23 06:15:21 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e226a9a

x11-misc/synergy: version bump

Gentoo-Bug: 598802

Package-Manager: portage-2.3.2

 x11-misc/synergy/Manifest                        |   1 +
 x11-misc/synergy/files/synergy-1.8.5-gtest.patch |  38 +++++++
 x11-misc/synergy/synergy-1.8.5.ebuild            | 124 +++++++++++++++++++++++
 3 files changed, 163 insertions(+)

diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index 186c929..2460d43 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.8.1.tar.gz 13676205 SHA256 021792533beb4b5d78b7f449341f491f004e9cc823795e423dedf1c41c4c30d7 SHA512 f535cd14be1104a39150bfeb22c202aa4d6ab1f5b6cb4e1d4084284e3b62ceab7fc9bb2e87bf11a843f9030cccec22b0ff1669930cf259a4dddb13422f9d0b90 WHIRLPOOL 5d71b77edaa4c46fb338858a8b2c1d993c53bbd1d819b8010e37d6526a8f26f93af8c803c6838cd2f01d89b4532191a71ceb7aaac1bf6af2beb1e28df60eef90
 DIST synergy-1.8.2.tar.gz 13500982 SHA256 2f84c718636f02acca4801fff30bd67f5bb2720304f7ab095f2112536da5a9fa SHA512 48d7e18e92f239feddc7afd31b5614c2c27b7dc1cb30e58aa168095771a85d87c9c621daaef6ee0126381bcdcfa515d484545d763d0b1c5e6c181e0e5175639c WHIRLPOOL 7ea3b3a9ab0b2ff861ecc8bba0b8f0d4c4145d24c8cbbd04e8800c731ab79ff9f6fb87f9b5d232995d2ffe331987c4214bc60711b61a4aad6e944abe4499f85c
+DIST synergy-1.8.5.tar.gz 13499654 SHA256 d913005e911bb6e5aa459f88fe91b40d59c37ea7207399814e4d450fd8634ec1 SHA512 bf751264d134dc1d171ed40499d29ee82d3bfdb4e5905543b35e586d4393c607cbb1260a1fd68b46bfe8c98adc392401c8ba05c587977bc678f2bb602703721d WHIRLPOOL a65217746d656b07c633366083cb652e040e215b52ae071721164176919f2e09ea98008ef0be5c3d8f3399dbd4d7598a93347b10c21b646be3b33fdd1e537219
 DIST synergy.png 26910 SHA256 c7e6cbaea549a189daed46c7170477772d932144ca20c9ea0db6859bd896f08c SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d WHIRLPOOL 7b3e7f9b05462fb536de0ca8d2257ea8abc0b2f17f0335d7eee73322f79a9ecccf729b992e58cd0965a9c9842f48020b6588cd4af47ea0f6d2b2cd7793c64e3a

diff --git a/x11-misc/synergy/files/synergy-1.8.5-gtest.patch b/x11-misc/synergy/files/synergy-1.8.5-gtest.patch
new file mode 100644
index 00000000..c9eaa51
--- /dev/null
+++ b/x11-misc/synergy/files/synergy-1.8.5-gtest.patch
@@ -0,0 +1,38 @@
+--- 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
+@@ -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
+--- a/src/CMakeLists.txt	2016-11-09 13:31:26.000000000 -0600
++++ b/src/CMakeLists.txt	2016-11-09 13:40:08.189421727 -0600
+@@ -50,6 +50,6 @@
+ add_subdirectory(cmd)
+ add_subdirectory(micro)
+ 
+-if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX")
++if (${WITH_GENTOO_TEST})
+ 	add_subdirectory(test)
+ endif()

diff --git a/x11-misc/synergy/synergy-1.8.5.ebuild b/x11-misc/synergy/synergy-1.8.5.ebuild
new file mode 100644
index 00000000..0749048
--- /dev/null
+++ b/x11-misc/synergy/synergy-1.8.5.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2016 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/symless/synergy"
+SRC_URI="
+	https://github.com/symless/${PN}/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 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="libressl qt4 test"
+
+S=${WORKDIR}/${P}-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
+	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.7.5-gentoo.patch
+	"${FILESDIR}"/${PN}-1.8.1-internal-gmock-gtest.patch
+	"${FILESDIR}"/${PN}-1.8.5-gtest.patch
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"$(usex test -DWITH_GENTOO_TEST=1 -DWITH_GENTOO_TEST=0)"
+	)
+	append-cxxflags ${mycmakeargs}
+
+	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/files/, x11-misc/synergy/
@ 2017-03-07  9:14 David Seifert
  0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2017-03-07  9:14 UTC (permalink / raw
  To: gentoo-commits

commit:     28620959cb1397c84eab88bda561815f91d26d27
Author:     Harri Nieminen <moikkis <AT> gmail <DOT> com>
AuthorDate: Mon Mar  6 15:03:56 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Mar  7 09:12:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28620959

x11-misc/synergy: Remove old

Package-Manager: Portage-2.3.4, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4142

 x11-misc/synergy/Manifest                        |   3 -
 x11-misc/synergy/files/synergy-1.8.1-gtest.patch |  38 -------
 x11-misc/synergy/synergy-1.8.1-r3.ebuild         | 126 -----------------------
 x11-misc/synergy/synergy-1.8.2.ebuild            | 126 -----------------------
 x11-misc/synergy/synergy-1.8.5.ebuild            | 123 ----------------------
 5 files changed, 416 deletions(-)

diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index 493fea78c34..c273be9bbf3 100644
--- a/x11-misc/synergy/Manifest
+++ b/x11-misc/synergy/Manifest
@@ -1,6 +1,3 @@
 DIST synergy-1.6.3.tar.gz 4405517 SHA256 93b1965b8e0cfc55cc654aab7053a58b9e730d09e68bbc520be32353a01dce1a SHA512 de67b0663c5ef411570f163208b2a295a8f16537dcc37a41a31039a2d01de083410c023b7f255664eb0c84f0290473690b638934082c2276ddce594126861165 WHIRLPOOL cb8737f0fe75105c9f5c8c371a5aef55c5eb8f1c419b3a7315ed66880e79c379efc6d7bced20c0d046bc281be935322def54f98d67e383d7236620a948ae1c14
-DIST synergy-1.8.1.tar.gz 13676205 SHA256 021792533beb4b5d78b7f449341f491f004e9cc823795e423dedf1c41c4c30d7 SHA512 f535cd14be1104a39150bfeb22c202aa4d6ab1f5b6cb4e1d4084284e3b62ceab7fc9bb2e87bf11a843f9030cccec22b0ff1669930cf259a4dddb13422f9d0b90 WHIRLPOOL 5d71b77edaa4c46fb338858a8b2c1d993c53bbd1d819b8010e37d6526a8f26f93af8c803c6838cd2f01d89b4532191a71ceb7aaac1bf6af2beb1e28df60eef90
-DIST synergy-1.8.2.tar.gz 13500982 SHA256 2f84c718636f02acca4801fff30bd67f5bb2720304f7ab095f2112536da5a9fa SHA512 48d7e18e92f239feddc7afd31b5614c2c27b7dc1cb30e58aa168095771a85d87c9c621daaef6ee0126381bcdcfa515d484545d763d0b1c5e6c181e0e5175639c WHIRLPOOL 7ea3b3a9ab0b2ff861ecc8bba0b8f0d4c4145d24c8cbbd04e8800c731ab79ff9f6fb87f9b5d232995d2ffe331987c4214bc60711b61a4aad6e944abe4499f85c
-DIST synergy-1.8.5.tar.gz 13499654 SHA256 d913005e911bb6e5aa459f88fe91b40d59c37ea7207399814e4d450fd8634ec1 SHA512 bf751264d134dc1d171ed40499d29ee82d3bfdb4e5905543b35e586d4393c607cbb1260a1fd68b46bfe8c98adc392401c8ba05c587977bc678f2bb602703721d WHIRLPOOL a65217746d656b07c633366083cb652e040e215b52ae071721164176919f2e09ea98008ef0be5c3d8f3399dbd4d7598a93347b10c21b646be3b33fdd1e537219
 DIST synergy-1.8.6.tar.gz 13497043 SHA256 76b27c6e90961ee6bdad429904a2d5743854d0d027c067941d2411565d64352b SHA512 e0816c280c77d4a865f4b7d4a9081963032a156bfb6da51e6b67a6fc41f8f18b097d3fc7c96218db268c36d0148021f9ddba95fe56daff8bfc54219dbdfe14a5 WHIRLPOOL c12a0038f931963afee8190799dd74dcb300cbb79c2870d1a8a2e33238a86cc0ef30e5b577fdda05d7880e488d3c03da6a48c6a22095b2f4b312fc851325376a
 DIST synergy.png 26910 SHA256 c7e6cbaea549a189daed46c7170477772d932144ca20c9ea0db6859bd896f08c SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d WHIRLPOOL 7b3e7f9b05462fb536de0ca8d2257ea8abc0b2f17f0335d7eee73322f79a9ecccf729b992e58cd0965a9c9842f48020b6588cd4af47ea0f6d2b2cd7793c64e3a

diff --git a/x11-misc/synergy/files/synergy-1.8.1-gtest.patch b/x11-misc/synergy/files/synergy-1.8.1-gtest.patch
deleted file mode 100644
index 3491077a15a..00000000000
--- a/x11-misc/synergy/files/synergy-1.8.1-gtest.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -19,6 +19,6 @@
- add_subdirectory(plugin)
- add_subdirectory(micro)
- 
--if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX")
-+if (${WITH_GENTOO_TEST})
-	add_subdirectory(test)
- endif()
---- a/src/lib/synergy/SubscriptionManager.h
-+++ b/src/lib/synergy/SubscriptionManager.h
-@@ -20,7 +20,9 @@
- #include "SubscriptionKey.h"
- #include "common/common.h"
- 
-+#if WITH_GENTOO_TEST
- #include "gtest/gtest_prod.h"
-+#endif
- 
- class SubscriptionManager {
- public:
-@@ -35,6 +37,7 @@
- 	//! Use standard output to return subscription filename to gui
- 	void				printFilename();
- 
-+#if WITH_GENTOO_TEST
- private:
- 	FRIEND_TEST(SubscriptionTests, decode_invalidLength_throwException);
- 	FRIEND_TEST(SubscriptionTests, decode_invalidSerial_outputPlainText);
-@@ -45,6 +48,7 @@
- 	FRIEND_TEST(SubscriptionTests, parsePlainSerial_expiredTrialSerial_throwException);
- 	FRIEND_TEST(SubscriptionTests, parsePlainSerial_expiredBasicSerial_validSubscriptionKey);
- 	FRIEND_TEST(SubscriptionTests, parsePlainSerial_validSerialWithoutCompany_validSubscriptionKey);
-+#endif
- 
- private:
- 	String				decode(const String& input);

diff --git a/x11-misc/synergy/synergy-1.8.1-r3.ebuild b/x11-misc/synergy/synergy-1.8.1-r3.ebuild
deleted file mode 100644
index 74d155ef823..00000000000
--- a/x11-misc/synergy/synergy-1.8.1-r3.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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/symless/synergy"
-SRC_URI="
-	https://github.com/symless/${PN}/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 qt4 test"
-
-S=${WORKDIR}/${P}-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
-	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.7.5-gentoo.patch
-	"${FILESDIR}"/${PN}-1.8.1-internal-gmock-gtest.patch
-	"${FILESDIR}"/${PN}-1.8.1-gtest.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"$(usex test -DWITH_GENTOO_TEST=1 -DWITH_GENTOO_TEST=0)"
-	)
-	append-cxxflags ${mycmakeargs}
-
-	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
-
-	exeinto /usr/$(get_libdir)/${PN}/plugins
-	doexe bin/plugins/libns.so
-
-	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
-}

diff --git a/x11-misc/synergy/synergy-1.8.2.ebuild b/x11-misc/synergy/synergy-1.8.2.ebuild
deleted file mode 100644
index 74d155ef823..00000000000
--- a/x11-misc/synergy/synergy-1.8.2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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/symless/synergy"
-SRC_URI="
-	https://github.com/symless/${PN}/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 qt4 test"
-
-S=${WORKDIR}/${P}-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
-	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.7.5-gentoo.patch
-	"${FILESDIR}"/${PN}-1.8.1-internal-gmock-gtest.patch
-	"${FILESDIR}"/${PN}-1.8.1-gtest.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"$(usex test -DWITH_GENTOO_TEST=1 -DWITH_GENTOO_TEST=0)"
-	)
-	append-cxxflags ${mycmakeargs}
-
-	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
-
-	exeinto /usr/$(get_libdir)/${PN}/plugins
-	doexe bin/plugins/libns.so
-
-	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
-}

diff --git a/x11-misc/synergy/synergy-1.8.5.ebuild b/x11-misc/synergy/synergy-1.8.5.ebuild
deleted file mode 100644
index 51c84973290..00000000000
--- a/x11-misc/synergy/synergy-1.8.5.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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/symless/synergy"
-SRC_URI="
-	https://github.com/symless/${PN}/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 qt4 test"
-
-S=${WORKDIR}/${P}-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
-	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.7.5-gentoo.patch
-	"${FILESDIR}"/${PN}-1.8.1-internal-gmock-gtest.patch
-	"${FILESDIR}"/${PN}-1.8.5-gtest.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"$(usex test -DWITH_GENTOO_TEST=1 -DWITH_GENTOO_TEST=0)"
-	)
-	append-cxxflags ${mycmakeargs}
-
-	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/files/, x11-misc/synergy/
@ 2018-05-12 11:21 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2018-05-12 11:21 UTC (permalink / raw
  To: gentoo-commits

commit:     5dd1f7a3908dec9ae6cf6773acd8ec3b33fc0b2c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 11 21:57:30 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 12 11:21:20 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dd1f7a3

x11-misc/synergy: 1.9.1 version bump, Qt4 -> Qt5

Bug: https://bugs.gentoo.org/649572
Bug: https://bugs.gentoo.org/653468
Package-Manager: Portage-2.3.36, Repoman-2.3.9

 x11-misc/synergy/Manifest                          |   1 +
 .../files/synergy-1.9.1-cmake-version.patch        |  57 ++++++++++++
 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-pthread.patch |  11 +++
 x11-misc/synergy/files/synergy-1.9.1-qt-5.11.patch |  31 +++++++
 x11-misc/synergy/synergy-1.9.1.ebuild              | 103 +++++++++++++++++++++
 7 files changed, 254 insertions(+)

diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest
index fb8fff4beb8..7fd062f77f5 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 00000000000..da7a603119d
--- /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 00000000000..f7a5e614e81
--- /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 00000000000..bc8a9613057
--- /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 00000000000..46ae6e1588b
--- /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 00000000000..7a706a084d0
--- /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 00000000000..dda9e9c3a8d
--- /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
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/synergy/files/, x11-misc/synergy/
@ 2020-12-14 12:29 Michał Górny
  0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2020-12-14 12:29 UTC (permalink / raw
  To: gentoo-commits

commit:     1d8baf1ca102bd80ca28ab4b093284ceba702a68
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 14 12:26:07 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Dec 14 12:28:56 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d8baf1c

x11-misc/synergy: Fix non-GUI build without avahi

Closes: https://bugs.gentoo.org/759412
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../synergy/files/synergy-1.12.0-dnssd-dep.patch   | 42 ++++++++++++++++++++++
 x11-misc/synergy/synergy-1.12.0.ebuild             |  4 +++
 2 files changed, 46 insertions(+)

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 00000000000..1905fc552ea
--- /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?= <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/synergy-1.12.0.ebuild b/x11-misc/synergy/synergy-1.12.0.ebuild
index b0539697f5b..d144f9cb391 100644
--- a/x11-misc/synergy/synergy-1.12.0.ebuild
+++ b/x11-misc/synergy/synergy-1.12.0.ebuild
@@ -53,6 +53,10 @@ DEPEND="
 
 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


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-12-14 12:29 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-12 11:21 [gentoo-commits] repo/gentoo:master commit in: x11-misc/synergy/files/, x11-misc/synergy/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2020-12-14 12:29 Michał Górny
2017-03-07  9:14 David Seifert
2016-11-23  6:15 Yixun Lan
2016-07-17  6:48 Jeroen Roovers

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox