diff --git a/srcpkgs/synergy/files/synergy.desktop b/srcpkgs/synergy/files/synergy.desktop deleted file mode 100644 index e7bf87b9ee0..00000000000 --- a/srcpkgs/synergy/files/synergy.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Synergy -Comment=The Synergy GUI is based on QSynergy by Volker Lanz. -Exec=synergy -Icon=synergy -Terminal=false -Type=Application -Categories=Utility;DesktopUtility;Qt diff --git a/srcpkgs/synergy/files/synergy.png b/srcpkgs/synergy/files/synergy.png deleted file mode 100644 index 5534f0fdf52..00000000000 Binary files a/srcpkgs/synergy/files/synergy.png and /dev/null differ diff --git a/srcpkgs/synergy/patches/cmake.patch b/srcpkgs/synergy/patches/cmake.patch new file mode 100644 index 00000000000..66ed48df3da --- /dev/null +++ b/srcpkgs/synergy/patches/cmake.patch @@ -0,0 +1,22 @@ +--- CMakeLists.txt 2020-12-29 14:53:13.000000000 +0100 ++++ - 2021-02-17 22:53:35.496937933 +0100 +@@ -87,6 +87,7 @@ + include (CheckIncludeFileCXX) + include (CheckSymbolExists) + include (CheckCSourceCompiles) ++ include (FindPkgConfig) + + check_include_file_cxx (istream HAVE_ISTREAM) + check_include_file_cxx (ostream HAVE_OSTREAM) +@@ -247,6 +248,11 @@ + if (HAVE_Xi) + list (APPEND libs Xi) + endif() ++ if (${PKG_CONFIG_FOUND}) ++ pkg_check_modules (AVAHI_COMPAT REQUIRED avahi-compat-libdns_sd) ++ include_directories (BEFORE SYSTEM ${AVAHI_COMPAT_INCLUDE_DIRS}) ++ set (CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${AVAHI_COMPAT_INCLUDE_DIRS}") ++ endif () + + if (NOT SYNERGY_ENTERPRISE AND SYNERGY_BUILD_LEGACY_GUI) + set (DnsSdlib "dns_sd.h") diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template index 252ea57e6d1..b329e4d5921 100644 --- a/srcpkgs/synergy/template +++ b/srcpkgs/synergy/template @@ -1,59 +1,35 @@ # Template file for 'synergy' pkgname=synergy -version=1.8.8 -revision=7 +version=1.13.0 +revision=1 wrksrc="${pkgname}-core-${version}-stable" build_style=cmake -hostmakedepends="unzip pkg-config" -makedepends="avahi-compat-libs-devel libcurl-devel - libSM-devel libXext-devel libXrandr-devel libXtst-devel libXinerama-devel" +configure_args="-DBUILD_TESTS=OFF -DSYNERGY_BUILD_LEGACY_GUI=ON" +hostmakedepends="unzip pkg-config qt5-qmake qt5-host-tools" +makedepends="avahi-compat-libs-devel libcurl-devel avahi-compat-libs-devel + libSM-devel libXext-devel libXrandr-devel libXtst-devel libXinerama-devel + qt5-devel qt5-tools-devel" short_desc="Share a single mouse and keyboard between multiple computers" maintainer="Orphaned " +license="GPL-2.0-only" homepage="http://synergy-foss.org/" -license="GPL-2" distfiles="https://github.com/symless/synergy-core/archive/v${version}-stable.tar.gz" -checksum=9ee45aabf9f77925bfab6248e713ae5d9e6bfe6bc246e4a0a6304dc6a30f5f14 - -CXXFLAGS="-pthread" - -post_extract() { - cd ext - unzip gmock-1.6.0.zip -d gmock-1.6.0 - unzip gtest-1.6.0.zip -d gtest-1.6.0 -} - -if [ -z "$CROSS_BUILD" ]; then - makedepends+=" qt5-devel" - post_build() { - CXXFLAGS+=" $(pkg-config --cflags avahi-compat-libdns_sd)" - # qt5 gui - cd $wrksrc/src/gui - qmake-qt5 QMAKE_CXXFLAGS="$CXXFLAGS" QMAKE_LFLAGS="$LDFLAGS" - make ${makejobs} - } - synergy-gui_package() { - depends="desktop-file-utils ${sourcepkg}>=${version}_${revision}" - pkg_install() { - vbin ${wrksrc}/bin/synergy - vmove usr/share/pixmaps - vmove usr/share/applications - } - } -fi - -do_install() { - vbin bin/synergyc - vbin bin/synergys - vbin bin/syntool +checksum=a57989dd2d3ae30657f2b95cba3cae112c189f9bbbc3d1b25b3874859afeb94d +post_install() { vmkdir usr/share/examples/${pkgname} install -m644 doc/synergy.conf.example* \ ${DESTDIR}/usr/share/examples/${pkgname} - vinstall ${FILESDIR}/synergy.png 644 usr/share/pixmaps - vinstall ${FILESDIR}/synergy.desktop 644 usr/share/applications - vsv synergys vsv synergyc } +synergy-gui_package() { + depends="desktop-file-utils ${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/bin/synergy + vmove usr/share/icons + vmove usr/share/applications + } +}