diff options
| author | Andreas Baumann | 2025-04-02 15:55:42 +0200 |
|---|---|---|
| committer | Andreas Baumann | 2025-04-02 15:55:42 +0200 |
| commit | d80143f47902aee0cf1ea2add281463bc5c5b985 (patch) | |
| tree | dcce3d45c5581ec3ac005ed46fd99b130e0e5604 /PKGBUILD | |
| parent | abc774c4b413b4ccdc6b789a68d225963ee77b40 (diff) | |
| parent | d91e43908111a16e1a2ec5ecfbf717f0004aedcf (diff) | |
| download | aur-barrier.tar.gz | |
merged with gitlab barrier (existed before in the AUR)
Diffstat (limited to 'PKGBUILD')
| -rw-r--r-- | PKGBUILD | 102 |
1 files changed, 49 insertions, 53 deletions
@@ -1,51 +1,53 @@ -# Maintainer: Tilman BLUMENBACH <tilman+aur AT ax86 DOT net> +# Maintainer: Morten Linderud <foxboron@archlinux.org> +# Contributor: Tilman BLUMENBACH <tilman+aur AT ax86 DOT net> pkgname=(barrier barrier-headless) -pkgver=2.3.2 -pkgrel=1 +pkgver=2.4.0 +pkgrel=3 pkgdesc="Open-source KVM software based on Synergy" +arch=(x86_64) url="https://github.com/debauchee/barrier" -license=("custom:GPL2WithOpenSSLException") +license=("LicenseRef-GPL-2.0-only-WITH-OpenSSL-Exception") changelog=CHANGELOG.rst -source=( - "https://github.com/debauchee/barrier/archive/v${pkgver?}.tar.gz" -) -arch=(x86_64) -depends=( - # Barrier core dependencies: - curl - avahi - libx11 - libxrandr - libxext - libxinerama - xorgproto - libxtst - libxi - libsm - libice - openssl -) -makedepends=( - cmake - - # Barrier GUI dependencies: - qt5-base - hicolor-icon-theme -) +depends=(curl avahi libx11 libxrandr libxext + libxinerama xorgproto libxtst libxi + libsm libice openssl) +makedepends=(cmake git qt5-base hicolor-icon-theme) +source=("git+https://github.com/debauchee/barrier.git#tag=v${pkgver}" + "git+https://github.com/google/googletest.git" + "git+https://github.com/google/googlemock.git" + "git+https://github.com/gulrak/filesystem.git" + "1886.patch") +sha256sums=('SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + '4b2e2c3c2c6524dfd3f2f1003c62e218a459291f0e6fb87a3ce56ba48a4a11fe') prepare() { - cd "barrier-${pkgver?}" + cd "barrier" - for patch in "${srcdir?}"/*.patch; do - if [ -f "${patch?}" ]; then - patch -Np1 -i "${patch?}" - fi - done + git submodule init + git config submodule.ext/gtest.url "$srcdir/googletest" + git config submodule.ext/gmock.url "$srcdir/googlemock" + git config submodule.ext/gulrak-filesystem.url "$srcdir/filesystem" + git -c protocol.file.allow=always submodule update + + # lib/platform: Fix encoding for text copied between linux and windows + # https://github.com/debauchee/barrier/commit/dd3ea8adfef868e52098ea24d2ed08320a90e3b9 + git cherry-pick -n dd3ea8adfef868e52098ea24d2ed08320a90e3b9 + + # Add missing cstddef includes for NULL + # https://github.com/debauchee/barrier/commit/4b12265ae5d324b942698a3177e1d8b1749414d7 + git cherry-pick -n 4b12265ae5d324b942698a3177e1d8b1749414d7 + + # Add missing cstdint includes for GCC 13 + # https://github.com/debauchee/barrier/pull/1886 + patch -Np1 < "$srcdir/1886.patch" } build() { - cd "barrier-${pkgver?}" + cd "barrier" mkdir -p build cd build @@ -61,29 +63,25 @@ build() { _package_common() { # Install binaries: - cd "barrier-${pkgver?}/build" - DESTDIR="${pkgdir?}" make install + cd "barrier/build" + DESTDIR="${pkgdir}" make install # Install the license: cd .. - install -m 644 -D LICENSE "${pkgdir?}/usr/share/licenses/${pkgname?}/LICENSE" + install -m 644 -D LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" # Install the manpages: - mkdir -p "${pkgdir?}/usr/share/man/man1" - install -m 644 doc/*.1 "${pkgdir?}/usr/share/man/man1" + mkdir -p "${pkgdir}/usr/share/man/man1" + install -m 644 doc/*.1 "${pkgdir}/usr/share/man/man1" # Install the examples: - mkdir -p "${pkgdir?}/usr/share/doc/${pkgname?}" - install -m 644 doc/barrier.conf* "${pkgdir?}/usr/share/doc/${pkgname?}" + mkdir -p "${pkgdir}/usr/share/doc/${pkgname}" + install -m 644 doc/barrier.conf* "${pkgdir}/usr/share/doc/${pkgname}" } package_barrier() { pkgdesc="Open-source KVM software based on Synergy (GUI)" - depends=( - "barrier-headless=${pkgver?}-${pkgrel?}" - qt5-base - hicolor-icon-theme - ) + depends=("barrier-headless=${pkgver}-${pkgrel}" qt5-base hicolor-icon-theme) # Install all the files: _package_common @@ -95,7 +93,7 @@ package_barrier() { /usr/share/man \ /usr/bin/barrier{s,c} \ ;do - rm -rf "${pkgdir:?}/${file:?}" + rm -rf "${pkgdir}/${file}" done } @@ -111,8 +109,6 @@ package_barrier-headless() { /usr/share/applications \ /usr/share/icons \ ;do - rm -rf "${pkgdir:?}/${file:?}" + rm -rf "${pkgdir}/${file}" done } - -sha256sums=('6b92a70c5f4d625065842d133386982ec2ad1db2a809af47e46ab8ce2acd39b5') |