diff options
author | Joao Carreira <jfmcarreira@gmail.com> | 2017-07-08 14:42:21 +0100 |
---|---|---|
committer | Joao Carreira <jfmcarreira@gmail.com> | 2017-07-08 14:42:21 +0100 |
commit | 072d7ba0f7e3a2ee2742bcb52bfdcd2881282f90 (patch) | |
tree | 43bbd93e68fafbb40cf7e554033dd8c7765e5e21 /x11-misc | |
parent | fix ebuild.badheader erros (diff) | |
download | carreira-072d7ba0f7e3a2ee2742bcb52bfdcd2881282f90.tar.gz carreira-072d7ba0f7e3a2ee2742bcb52bfdcd2881282f90.tar.bz2 carreira-072d7ba0f7e3a2ee2742bcb52bfdcd2881282f90.zip |
x11-misc/synergy: Add ebuild with support for qt5
Diffstat (limited to 'x11-misc')
-rw-r--r-- | x11-misc/synergy/Manifest | 2 | ||||
-rw-r--r-- | x11-misc/synergy/files/synergy-1.4.16_p1969-pthread.patch | 11 | ||||
-rw-r--r-- | x11-misc/synergy/files/synergy-1.8.1-internal-gmock-gtest.patch | 23 | ||||
-rw-r--r-- | x11-misc/synergy/files/synergy-1.8.5-gtest.patch | 38 | ||||
-rw-r--r-- | x11-misc/synergy/metadata.xml | 12 | ||||
-rw-r--r-- | x11-misc/synergy/synergy-1.8.8-r1.ebuild | 122 |
6 files changed, 208 insertions, 0 deletions
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest new file mode 100644 index 0000000..15f46af --- /dev/null +++ b/x11-misc/synergy/Manifest @@ -0,0 +1,2 @@ +DIST synergy-1.8.8.tar.gz 13498599 SHA256 85c388f93881d741981ce3c675e840a52a76883cb2cea1da306c0c453c5d7d9b SHA512 b4909930af7da10d877297e674df4c042ec54333eed585334da4a8c834c0ca3ad7c93fd2436c7d8d2f0e9e039d7bd385bb9e8a8c706750cbab3c3664a9b16bc6 WHIRLPOOL 1e03d6b4463d924477637170a57acfe9238f2b3d5d099cad8b3e65eb473fc7407075afc9859e05d5a818bd27a9723d64bf8cf0d99d950282de490d63f745ab56 +DIST synergy.png 26910 SHA256 c7e6cbaea549a189daed46c7170477772d932144ca20c9ea0db6859bd896f08c SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d WHIRLPOOL 7b3e7f9b05462fb536de0ca8d2257ea8abc0b2f17f0335d7eee73322f79a9ecccf729b992e58cd0965a9c9842f48020b6588cd4af47ea0f6d2b2cd7793c64e3a diff --git a/x11-misc/synergy/files/synergy-1.4.16_p1969-pthread.patch b/x11-misc/synergy/files/synergy-1.4.16_p1969-pthread.patch new file mode 100644 index 0000000..adddf2f --- /dev/null +++ b/x11-misc/synergy/files/synergy-1.4.16_p1969-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.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/files/synergy-1.8.5-gtest.patch b/x11-misc/synergy/files/synergy-1.8.5-gtest.patch new file mode 100644 index 0000000..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/metadata.xml b/x11-misc/synergy/metadata.xml new file mode 100644 index 0000000..11c61fc --- /dev/null +++ b/x11-misc/synergy/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>desktop-misc@gentoo.org</email> + <name>Gentoo Desktop Miscellaneous Project</name> + </maintainer> + <upstream> + <remote-id type="google-code">synergy</remote-id> + <remote-id type="github">synergy/synergy</remote-id> + </upstream> +</pkgmetadata> diff --git a/x11-misc/synergy/synergy-1.8.8-r1.ebuild b/x11-misc/synergy/synergy-1.8.8-r1.ebuild new file mode 100644 index 0000000..528caad --- /dev/null +++ b/x11-misc/synergy/synergy-1.8.8-r1.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +inherit eutils cmake-utils qmake-utils flag-o-matic gnome2-utils + +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="~amd64" +IUSE="libressl qt4 qt5" +RESTRICT="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] + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui: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} + qt4? ( !x11-misc/qsynergy ) +" + +REQUIRED_USE=" + ?? ( qt5 qt4 ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.4.16_p1969-pthread.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() { + append-cxxflags ${mycmakeargs} + + cmake-utils_src_configure + + if use qt4 || use qt5; then + cd src/gui || die + use qt4 && eqmake4 + use qt5 && eqmake5 + fi +} + +src_compile() { + cmake-utils_src_compile + + if use qt4 || use qt5; then + cd src/gui || die + emake + fi +} + +src_install () { + dobin bin/${PN}{c,s} bin/syntool + + if use qt4 || use qt5; 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 +# } |