summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorxiota2022-09-15 22:00:54 -0700
committerxiota2022-09-15 22:12:03 -0700
commit89c08a6b5b00af6536a582bbc92ed718a948ca1f (patch)
treebc54f7c2eb06980e197f4c5c119e17d9cf4cd3e0
parentcc8b88a590d1aa53104885e4b9173edd89676143 (diff)
downloadaur-89c08a6b5b00af6536a582bbc92ed718a948ca1f.tar.gz
put systemd files in /usr/lib/systemd/user
CMAKE_CXX_FLAGS='-std=c++11' remove gcc7 from makedepends
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD17
-rw-r--r--synergys.service (renamed from synergys_at.service)0
-rw-r--r--synergys.socket (renamed from synergys_at.socket)2
4 files changed, 10 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 150d60efcfee..1f56164a5229 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,7 +7,6 @@ pkgbase = synergy-1.6
arch = x86_64
license = GPL2
makedepends = cmake
- makedepends = gcc7
makedepends = libxt
makedepends = unzip
depends = libxtst
@@ -17,13 +16,13 @@ pkgbase = synergy-1.6
provides = synergy
conflicts = synergy
source = synergy-1.6.3.tar.gz::https://github.com/symless/synergy-core/archive/1.6.3-final.tar.gz
- source = synergys_at.service
- source = synergys_at.socket
+ source = synergys.service
+ source = synergys.socket
source = c++11-noexcept-destructor-fix.patch
source = missing-include-fix.patch
sha256sums = affd151965f97d3338595331c9e976ab0371a74e96a382f89e9a3ad02a37ddba
sha256sums = 30460dfbb53116b13a2e8e665c34e04b5b8ece759ea9e56eccceaa2455ada1af
- sha256sums = 3754b87a9164b498ff2726668c2daced901692c2cc816a1594e5ea5b15b65dc5
+ sha256sums = aeb357ba161131524aa70a5303a17f78831c9a1ab17dbc7c97e4781a5c4bac44
sha256sums = a14e1defabd30700ffe1616ea679e33e56a3baa601c8734c936783a641979b44
sha256sums = 2f766961d7a78dd283b8480571fd748aa1adde930928bcce91515b5eb440a8a9
diff --git a/PKGBUILD b/PKGBUILD
index d3f8f9e8dba5..a4f00c7a75e6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,6 @@ arch=('i686' 'x86_64')
depends=('libxtst' 'qt5-base' 'avahi')
makedepends=(
'cmake'
- 'gcc7'
'libxt'
'unzip'
)
@@ -21,8 +20,8 @@ optdepends=(
license=('GPL2')
source=(
"${_pkgname}-${pkgver}.tar.gz"::"https://github.com/symless/synergy-core/archive/1.6.3-final.tar.gz"
- "${_pkgname}s_at.service"
- "${_pkgname}s_at.socket"
+ "${_pkgname}s.service"
+ "${_pkgname}s.socket"
'c++11-noexcept-destructor-fix.patch'
'missing-include-fix.patch'
)
@@ -32,7 +31,7 @@ conflicts=("$_pkgname")
sha256sums=(
'affd151965f97d3338595331c9e976ab0371a74e96a382f89e9a3ad02a37ddba'
'30460dfbb53116b13a2e8e665c34e04b5b8ece759ea9e56eccceaa2455ada1af'
- '3754b87a9164b498ff2726668c2daced901692c2cc816a1594e5ea5b15b65dc5'
+ 'aeb357ba161131524aa70a5303a17f78831c9a1ab17dbc7c97e4781a5c4bac44'
'a14e1defabd30700ffe1616ea679e33e56a3baa601c8734c936783a641979b44'
'2f766961d7a78dd283b8480571fd748aa1adde930928bcce91515b5eb440a8a9'
)
@@ -56,13 +55,9 @@ build() {
cd "${srcdir}/${_pkgdir}"
cmake \
- -DCMAKE_C_COMPILER='/usr/bin/gcc-7' \
- -DCMAKE_C_FLAGS='' \
- -DCMAKE_CXX_COMPILER='/usr/bin/g++-7' \
- -DCMAKE_CXX_FLAGS='' \
-DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_CXX_FLAGS='-std=c++11' \
.
-
make
cd src/gui
@@ -74,8 +69,8 @@ package() {
cd "${srcdir}"
# install systemd service and socket
- install -Dm644 ${_pkgname}s_at.service "$pkgdir/usr/lib/systemd/system/${_pkgname}s@.service"
- install -Dm644 ${_pkgname}s_at.socket "$pkgdir/usr/lib/systemd/system/${_pkgname}s@.socket"
+ install -Dm644 "${_pkgname}s.service" -t "$pkgdir/usr/lib/systemd/user"
+ install -Dm644 "${_pkgname}s.socket" -t "$pkgdir/usr/lib/systemd/user"
cd "${srcdir}/${_pkgdir}"
diff --git a/synergys_at.service b/synergys.service
index 813fd6bd2c0e..813fd6bd2c0e 100644
--- a/synergys_at.service
+++ b/synergys.service
diff --git a/synergys_at.socket b/synergys.socket
index 9ab4bca7d852..dda1537caba1 100644
--- a/synergys_at.socket
+++ b/synergys.socket
@@ -1,5 +1,5 @@
[Unit]
-Conflicts=synergys@.service
+Conflicts=synergys.service
[Socket]
ListenStream=24800