[arch-commits] Commit in barrier/repos/community-x86_64 (4 files)
Morten Linderud
foxboron at gemini.archlinux.org
Thu Nov 4 21:14:11 UTC 2021
Date: Thursday, November 4, 2021 @ 21:14:10
Author: foxboron
Revision: 1036998
archrelease: copy trunk to community-x86_64
Added:
barrier/repos/community-x86_64/CHANGELOG.rst
(from rev 1036997, barrier/trunk/CHANGELOG.rst)
barrier/repos/community-x86_64/PKGBUILD
(from rev 1036997, barrier/trunk/PKGBUILD)
Deleted:
barrier/repos/community-x86_64/CHANGELOG.rst
barrier/repos/community-x86_64/PKGBUILD
---------------+
CHANGELOG.rst | 120 +++++++++++++++++------------------
PKGBUILD | 192 ++++++++++++++++++++++++++++----------------------------
2 files changed, 158 insertions(+), 154 deletions(-)
Deleted: CHANGELOG.rst
===================================================================
--- CHANGELOG.rst 2021-11-04 21:14:04 UTC (rev 1036997)
+++ CHANGELOG.rst 2021-11-04 21:14:10 UTC (rev 1036998)
@@ -1,60 +0,0 @@
-Changelog for package base ``barrier``
-======================================
-
-2.3.2-1 - 2019-10-12
---------------------
-
-- Updated to upstream release 2.3.2_, for which there is no upstream
- changelog available (apart from the VCS history).
-
-2.3.1-1 - 2019-09-25
---------------------
-
-- Updated to upstream release 2.3.1_.
-
- Upstream release notes since version 2.1.2_:
-
- * Fixes for the international US keyboard (2.3.1_)
- * Misc. Fixes and Improvements (2.3.0_)
-
-2.1.2-2 - 2018-12-29
---------------------
-
-- The ``barrier`` package now only contains the Barrier GUI, while
- a new package ``barrier-headless`` contains the server and client
- CLI binaries. Users that don't require the GUI can now install only
- the ``barrier-headless`` package and avoid the ``qt5-base`` dependency
- required by the Barrier GUI.
-
- The ``barrier`` package automatically pulls in the ``barrier-headless``
- package.
-
-2.1.2-1 - 2018-12-29
---------------------
-
-- Updated to upstream release 2.1.2_, for which there is no upstream
- changelog available (apart from the VCS history).
-
-**Note:** While this release has been tagged as ``2.1.2`` by upstream,
-the actual version number shown by the Barrier programs is ``2.2.0``.
-
-2.1.1-2 - 2018-05-30
---------------------
-
-- Work around Barrier `issue 49`_.
-
-2.1.1-1 - 2018-05-20
---------------------
-
-- Updated to upstream release 2.1.1_, which contains the following
- changes:
-
- * Fixed ``.desktop`` file.
-
-
-.. _2.1.1: https://github.com/debauchee/barrier/releases/tag/v2.1.1
-.. _2.1.2: https://github.com/debauchee/barrier/releases/tag/v2.1.2
-.. _2.3.0: https://github.com/debauchee/barrier/releases/tag/v2.3.0
-.. _2.3.1: https://github.com/debauchee/barrier/releases/tag/v2.3.1
-.. _2.3.2: https://github.com/debauchee/barrier/releases/tag/v2.3.2
-.. _issue 49: https://github.com/debauchee/barrier/issues/49
Copied: barrier/repos/community-x86_64/CHANGELOG.rst (from rev 1036997, barrier/trunk/CHANGELOG.rst)
===================================================================
--- CHANGELOG.rst (rev 0)
+++ CHANGELOG.rst 2021-11-04 21:14:10 UTC (rev 1036998)
@@ -0,0 +1,60 @@
+Changelog for package base ``barrier``
+======================================
+
+2.3.2-1 - 2019-10-12
+--------------------
+
+- Updated to upstream release 2.3.2_, for which there is no upstream
+ changelog available (apart from the VCS history).
+
+2.3.1-1 - 2019-09-25
+--------------------
+
+- Updated to upstream release 2.3.1_.
+
+ Upstream release notes since version 2.1.2_:
+
+ * Fixes for the international US keyboard (2.3.1_)
+ * Misc. Fixes and Improvements (2.3.0_)
+
+2.1.2-2 - 2018-12-29
+--------------------
+
+- The ``barrier`` package now only contains the Barrier GUI, while
+ a new package ``barrier-headless`` contains the server and client
+ CLI binaries. Users that don't require the GUI can now install only
+ the ``barrier-headless`` package and avoid the ``qt5-base`` dependency
+ required by the Barrier GUI.
+
+ The ``barrier`` package automatically pulls in the ``barrier-headless``
+ package.
+
+2.1.2-1 - 2018-12-29
+--------------------
+
+- Updated to upstream release 2.1.2_, for which there is no upstream
+ changelog available (apart from the VCS history).
+
+**Note:** While this release has been tagged as ``2.1.2`` by upstream,
+the actual version number shown by the Barrier programs is ``2.2.0``.
+
+2.1.1-2 - 2018-05-30
+--------------------
+
+- Work around Barrier `issue 49`_.
+
+2.1.1-1 - 2018-05-20
+--------------------
+
+- Updated to upstream release 2.1.1_, which contains the following
+ changes:
+
+ * Fixed ``.desktop`` file.
+
+
+.. _2.1.1: https://github.com/debauchee/barrier/releases/tag/v2.1.1
+.. _2.1.2: https://github.com/debauchee/barrier/releases/tag/v2.1.2
+.. _2.3.0: https://github.com/debauchee/barrier/releases/tag/v2.3.0
+.. _2.3.1: https://github.com/debauchee/barrier/releases/tag/v2.3.1
+.. _2.3.2: https://github.com/debauchee/barrier/releases/tag/v2.3.2
+.. _issue 49: https://github.com/debauchee/barrier/issues/49
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-11-04 21:14:04 UTC (rev 1036997)
+++ PKGBUILD 2021-11-04 21:14:10 UTC (rev 1036998)
@@ -1,94 +0,0 @@
-# Maintainer: Morten Linderud <foxboron at archlinux.org>
-# Contributor: Tilman BLUMENBACH <tilman+aur AT ax86 DOT net>
-
-pkgname=(barrier barrier-headless)
-pkgver=2.3.3
-pkgrel=1
-pkgdesc="Open-source KVM software based on Synergy"
-arch=(x86_64)
-url="https://github.com/debauchee/barrier"
-license=("custom:GPL2WithOpenSSLException")
-changelog=CHANGELOG.rst
-depends=(curl avahi libx11 libxrandr libxext
- libxinerama xorgproto libxtst libxi
- libsm libice openssl)
-makedepends=(cmake qt5-base hicolor-icon-theme gtest gmock)
-source=("$pkgname-$pkgver.tar.gz::https://github.com/debauchee/barrier/archive/v${pkgver}.tar.gz")
-sha256sums=('259e75c150ca16d9db51870b026dc7aad56c410fa3d2f5fdccc19d4b6024bdc5')
-
-prepare() {
- cd "barrier-${pkgver}"
- # Doesn't build!
- rm -rf ext/{gmock,gtest}
- sed -i 's|add_library.*||g' src/test/CMakeLists.txt
- sed -i 's|set_target_properties.*||g' src/test/CMakeLists.txt
-}
-
-build() {
- cd "barrier-${pkgver}"
-
- mkdir -p build
- cd build
-
- cmake -G "Unix Makefiles" \
- -D CMAKE_BUILD_TYPE:STRING=Release \
- -D CMAKE_INSTALL_PREFIX:STRING=/usr \
- -D BARRIER_REVISION:STRING=00000000 \
- -D BARRIER_VERSION_STAGE:STRING=RELEASE \
- ..
- make
-}
-
-
-_package_common() {
- # Install binaries:
- cd "barrier-${pkgver}/build"
- DESTDIR="${pkgdir}" make install
-
- # Install the license:
- cd ..
- 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"
-
- # Install the examples:
- 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)
-
- # Install all the files:
- _package_common
-
- # Now go and delete files that are already in
- # barrier-headless:
- for file in \
- /usr/share/doc \
- /usr/share/man \
- /usr/bin/barrier{s,c} \
- ;do
- rm -rf "${pkgdir}/${file}"
- done
-}
-
-package_barrier-headless() {
- pkgdesc="Open-source KVM software based on Synergy (client and server CLI binaries)"
-
- # Install all the files:
- _package_common
-
- # Now go and delete the GUI-related files:
- for file in \
- /usr/bin/barrier \
- /usr/share/applications \
- /usr/share/icons \
- ;do
- rm -rf "${pkgdir}/${file}"
- done
-}
-
Copied: barrier/repos/community-x86_64/PKGBUILD (from rev 1036997, barrier/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-11-04 21:14:10 UTC (rev 1036998)
@@ -0,0 +1,98 @@
+# Maintainer: Morten Linderud <foxboron at archlinux.org>
+# Contributor: Tilman BLUMENBACH <tilman+aur AT ax86 DOT net>
+
+pkgname=(barrier barrier-headless)
+pkgver=2.4.0
+pkgrel=1
+pkgdesc="Open-source KVM software based on Synergy"
+arch=(x86_64)
+url="https://github.com/debauchee/barrier"
+license=("custom:GPL2WithOpenSSLException")
+changelog=CHANGELOG.rst
+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}")
+sha256sums=('SKIP')
+
+prepare() {
+ cd "barrier"
+ git submodule update --init --recursive
+ # 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
+}
+
+build() {
+ cd "barrier"
+
+ mkdir -p build
+ cd build
+
+ cmake -G "Unix Makefiles" \
+ -D CMAKE_BUILD_TYPE:STRING=Release \
+ -D CMAKE_INSTALL_PREFIX:STRING=/usr \
+ -D BARRIER_REVISION:STRING=00000000 \
+ -D BARRIER_VERSION_STAGE:STRING=RELEASE \
+ ..
+ make
+}
+
+
+_package_common() {
+ # Install binaries:
+ cd "barrier/build"
+ DESTDIR="${pkgdir}" make install
+
+ # Install the license:
+ cd ..
+ 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"
+
+ # Install the examples:
+ 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)
+
+ # Install all the files:
+ _package_common
+
+ # Now go and delete files that are already in
+ # barrier-headless:
+ for file in \
+ /usr/share/doc \
+ /usr/share/man \
+ /usr/bin/barrier{s,c} \
+ ;do
+ rm -rf "${pkgdir}/${file}"
+ done
+}
+
+package_barrier-headless() {
+ pkgdesc="Open-source KVM software based on Synergy (client and server CLI binaries)"
+
+ # Install all the files:
+ _package_common
+
+ # Now go and delete the GUI-related files:
+ for file in \
+ /usr/bin/barrier \
+ /usr/share/applications \
+ /usr/share/icons \
+ ;do
+ rm -rf "${pkgdir}/${file}"
+ done
+}
+
More information about the arch-commits
mailing list