From 1f55eaf73d558833344f560e9ae6b23edabaf465 Mon Sep 17 00:00:00 2001
From: Patrick Ziegler
Date: Mon, 9 May 2022 16:36:54 +0200
Subject: [PATCH] Adapt to official Arch Linux package (#2719)
Now that polybar is in the official repos, we only need the polybar-git
PKGBUILD.
---
README.md | 10 ++++++----
contrib/polybar.aur/PKGBUILD | 35 -----------------------------------
doc/dev/release-workflow.rst | 4 ++--
3 files changed, 8 insertions(+), 41 deletions(-)
delete mode 100644 contrib/polybar.aur/PKGBUILD
diff --git a/README.md b/README.md
index d51acb4f..60de502a 100644
--- a/README.md
+++ b/README.md
@@ -98,10 +98,12 @@ repository for stable users, you need to enable [backports](https://wiki.debian.
If you are using **Ubuntu** 20.10 (Groovy Gorilla) or later, you can install polybar
using `sudo apt install polybar`.
-If you are using **Arch Linux**, you can install the package from `community` repo
-[polybar](https://archlinux.org/packages/community/x86_64/polybar/) to get the latest
-version, or from AUR [polybar-git](https://aur.archlinux.org/packages/polybar-git/) for
-the most up-to-date (unstable) changes.
+If you are using **Arch Linux**, you can install
+[polybar](https://archlinux.org/packages/community/x86_64/polybar/) to get the
+latest stable release using `sudo pacman -S polybar`. The latest unstable
+changes are also available in the
+[`polybar-git`](https://aur.archlinux.org/packages/polybar-git) package in the
+AUR.
If you are using **Manjaro**, you can install [polybar](https://software.manjaro.org/package/polybar) to get the latest stable release using `sudo pacman -S polybar`.
diff --git a/contrib/polybar.aur/PKGBUILD b/contrib/polybar.aur/PKGBUILD
deleted file mode 100644
index 7ffb758e..00000000
--- a/contrib/polybar.aur/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: Patrick Ziegler
-pkgname=polybar
-pkgver=3.6.3
-pkgrel=1
-pkgdesc="A fast and easy-to-use status bar"
-# aarch64 is not officially supported by polybar, it is only listed here for convenience
-arch=("i686" "x86_64" "aarch64")
-url="https://github.com/polybar/polybar"
-license=("MIT")
-depends=("libuv" "cairo" "xcb-util-image" "xcb-util-wm" "xcb-util-xrm"
- "xcb-util-cursor" "alsa-lib" "libpulse" "libmpdclient" "libnl"
- "jsoncpp" "curl")
-optdepends=("i3-wm: i3 module support")
-makedepends=("cmake" "python" "pkg-config" "python-sphinx" "python-packaging" "i3-wm")
-backup=("etc/polybar/config.ini")
-conflicts=("polybar-git")
-source=(${url}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz)
-sha256sums=('f25758573567208fc7b6f4d4115a6117a87389cbcc094cf605d079775be95fa5')
-_dir="${pkgname}-${pkgver}"
-
-prepare() {
- mkdir -p "${_dir}/build"
-}
-
-build() {
- cd "${_dir}/build" || exit 1
- # Force cmake to use system python (to detect xcbgen)
- cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DPYTHON_EXECUTABLE=/usr/bin/python3 ..
- cmake --build .
-}
-
-package() {
- cmake --build "${_dir}/build" --target install -- DESTDIR="${pkgdir}"
- install -Dm644 "${_dir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/doc/dev/release-workflow.rst b/doc/dev/release-workflow.rst
index 8fd4dd2e..b051c262 100644
--- a/doc/dev/release-workflow.rst
+++ b/doc/dev/release-workflow.rst
@@ -217,8 +217,8 @@ After-Release Checklist
release automatically creates a release archive, uploads it to the release,
and adds a 'Download' section to the release body.
If this fails for some reason, it should be triggered manually.
-* Create a PR that updates the AUR ``PKGBUILD`` files for the ``polybar`` and
- ``polybar-git`` packages (push after the release archive is uploaded).
+* Create a PR that updates the AUR ``PKGBUILD`` file for the ``polybar-git``
+ package (push after the release archive is uploaded).
* Close the `GitHub Milestone `_
for the new release and move open issues (if any) to a later release.
* Activate the version on `Read the Docs