From 6b54ea277356f0ee9f1a3c03ff28c07c61fcae8d Mon Sep 17 00:00:00 2001 From: Mihir Lad Date: Sat, 19 Dec 2020 20:38:10 -0500 Subject: [PATCH] contrib: Add polybar-dwm-module PKGBUILD Also remove other PKGBUILDs and rpm --- .../PKGBUILD | 12 ++-- .../polybar-dwm-module.install} | 0 contrib/polybar.aur/PKGBUILD | 36 ---------- contrib/polybar.aur/polybar.install | 26 ------- contrib/rpm/polybar.spec | 71 ------------------- 5 files changed, 6 insertions(+), 139 deletions(-) rename contrib/{polybar-git.aur => polybar-dwm-module.aur}/PKGBUILD (84%) rename contrib/{polybar-git.aur/polybar.install => polybar-dwm-module.aur/polybar-dwm-module.install} (100%) delete mode 100644 contrib/polybar.aur/PKGBUILD delete mode 100644 contrib/polybar.aur/polybar.install delete mode 100644 contrib/rpm/polybar.spec diff --git a/contrib/polybar-git.aur/PKGBUILD b/contrib/polybar-dwm-module.aur/PKGBUILD similarity index 84% rename from contrib/polybar-git.aur/PKGBUILD rename to contrib/polybar-dwm-module.aur/PKGBUILD index 2b0f116c..aa43ca8f 100644 --- a/contrib/polybar-git.aur/PKGBUILD +++ b/contrib/polybar-dwm-module.aur/PKGBUILD @@ -1,11 +1,11 @@ -# Maintainer: Patrick Ziegler -_pkgname=polybar -pkgname="${_pkgname}-git" -pkgver=3.5.2 +# Maintainer: Mihir Lad +_pkgname=polybar-dwm-module +pkgname="${_pkgname}" +pkgver=3.5.2.r94.g5a29346 pkgrel=1 -pkgdesc="A fast and easy-to-use status bar" +pkgdesc="polybar fork with a dwm module" arch=("i686" "x86_64") -url="https://github.com/polybar/polybar" +url="https://github.com/mihirlad55/polybar-dwm-module" license=("MIT") depends=("cairo" "xcb-util-image" "xcb-util-wm" "xcb-util-xrm" "xcb-util-cursor" "alsa-lib" "libpulse" "libmpdclient" "libnl" "jsoncpp" "curl") diff --git a/contrib/polybar-git.aur/polybar.install b/contrib/polybar-dwm-module.aur/polybar-dwm-module.install similarity index 100% rename from contrib/polybar-git.aur/polybar.install rename to contrib/polybar-dwm-module.aur/polybar-dwm-module.install diff --git a/contrib/polybar.aur/PKGBUILD b/contrib/polybar.aur/PKGBUILD deleted file mode 100644 index 4f357eb5..00000000 --- a/contrib/polybar.aur/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Maintainer: Patrick Ziegler -pkgname=polybar -pkgver=3.5.2 -pkgrel=1 -pkgdesc="A fast and easy-to-use status bar" -arch=("i686" "x86_64") -url="https://github.com/polybar/polybar" -license=("MIT") -depends=("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" - "ttf-unifont: Font used in example config" - "siji-git: Font used in example config" - "xorg-fonts-misc: Font used in example config") -makedepends=("cmake" "git" "python" "pkg-config" "python-sphinx" "i3-wm") -conflicts=("polybar-git") -install="${pkgname}.install" -source=(${url}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz) -sha256sums=('e411d9c091d0d4b5e8fbb44969e45c537d8c45900ecb3e90c49a248b885fe110') -_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/contrib/polybar.aur/polybar.install b/contrib/polybar.aur/polybar.install deleted file mode 100644 index 25ac794f..00000000 --- a/contrib/polybar.aur/polybar.install +++ /dev/null @@ -1,26 +0,0 @@ -post_install() { - cat << EOF - - Get started with the example configuration: - - $ install -Dm644 /usr/share/doc/polybar/config \$HOME/.config/polybar/config - $ polybar example - - For more information, see https://github.com/polybar/polybar/wiki - -EOF -} - -post_upgrade() { - [ "$(vercmp "$2" "2.5.1-1")" = "-1" ] || exit 0 - cat << EOF - - The % suffix has been removed from percentage tokens. - The suffix is instead added by the user, for example: - - format-charging = Capacity %percentage%% - - -- jaagr - -EOF -} diff --git a/contrib/rpm/polybar.spec b/contrib/rpm/polybar.spec deleted file mode 100644 index f52e7bd5..00000000 --- a/contrib/rpm/polybar.spec +++ /dev/null @@ -1,71 +0,0 @@ -# -# spec file for package polybar -# Initially created for openSUSE -# - -Name: polybar -Version: 3.4.1 -Release: 0 -Summary: A fast and easy-to-use status bar -License: MIT -Group: System/GUI/Other -URL: https://github.com/polybar/polybar -Source: https://github.com/polybar/polybar/archive/%{version}.tar.gz -BuildRequires: clang >= 3.4 -BuildRequires: cmake >= 3.1 -BuildRequires: pkgconfig -BuildRequires: python-Sphinx -BuildRequires: python-xml -BuildRequires: xcb-util-image-devel -BuildRequires: xcb-util-wm-devel -# optional dependency -BuildRequires: pkgconfig(alsa) -# main dependency -BuildRequires: pkgconfig(cairo) -BuildRequires: pkgconfig(jsoncpp) -BuildRequires: pkgconfig(libcurl) -BuildRequires: pkgconfig(libpulse) -BuildRequires: pkgconfig(python3) -BuildRequires: pkgconfig(xcb) -BuildRequires: pkgconfig(xcb-proto) -BuildRequires: pkgconfig(xcb-util) -%if 0%{?suse_version} <= 1315 -BuildRequires: i3-devel -%else -BuildRequires: i3-gaps-devel -%endif -%if 0%{?suse_version} -BuildRequires: libiw-devel -%else -BuildRequires: wireless-tools-devel -%endif - -%description -A fast and easy-to-use status bar for tilling WM - -%prep -%setup -q - -%build -%cmake -make - -%install -%cmake_install - -%files -%dir %{_datadir}/bash-completion/ -%dir %{_datadir}/bash-completion/completions -%dir %{_datadir}/doc/%{name} -%dir %{_datadir}/zsh/ -%dir %{_datadir}/zsh/site-functions -%{_bindir}/%{name} -%{_bindir}/%{name}-msg -%{_datadir}/doc/%{name}/config -%{_mandir}/man1/%{name}.1%{?ext_man} -%{_datadir}/bash-completion/completions/%{name} -%{_datadir}/zsh/site-functions/_%{name} -%{_datadir}/zsh/site-functions/_%{name}_msg - -%changelog -