From a0097f9baa8f27a9c9cfc1897fcf57c649d29f55 Mon Sep 17 00:00:00 2001 From: Michael Carlberg Date: Sat, 19 Nov 2016 07:59:27 +0100 Subject: [PATCH] xbps: Update package --- contrib/polybar.xbps/INSTALL.msg | 9 ++++ .../polybar.xbps/patches/002-musl-poll.patch | 13 ----- .../polybar.xbps/patches/003-musl-poll.patch | 13 ----- contrib/polybar.xbps/template | 52 +++++++++---------- 4 files changed, 33 insertions(+), 54 deletions(-) create mode 100644 contrib/polybar.xbps/INSTALL.msg delete mode 100644 contrib/polybar.xbps/patches/002-musl-poll.patch delete mode 100644 contrib/polybar.xbps/patches/003-musl-poll.patch diff --git a/contrib/polybar.xbps/INSTALL.msg b/contrib/polybar.xbps/INSTALL.msg new file mode 100644 index 00000000..d7079b94 --- /dev/null +++ b/contrib/polybar.xbps/INSTALL.msg @@ -0,0 +1,9 @@ + + Get started with the example configuration: + + $ install -Dm644 /usr/share/examples/polybar/config $HOME/.config/polybar + $ polybar example + + + For more information, see https://github.com/jaagr/polybar + diff --git a/contrib/polybar.xbps/patches/002-musl-poll.patch b/contrib/polybar.xbps/patches/002-musl-poll.patch deleted file mode 100644 index b818a196..00000000 --- a/contrib/polybar.xbps/patches/002-musl-poll.patch +++ /dev/null @@ -1,13 +0,0 @@ -Fix poll.h warning on musl - ---- include/utils/inotify.hpp.orig -+++ include/utils/inotify.hpp -@@ -1,7 +1,7 @@ - #pragma once - - #include --#include -+#include - #include - - #include "common.hpp" diff --git a/contrib/polybar.xbps/patches/003-musl-poll.patch b/contrib/polybar.xbps/patches/003-musl-poll.patch deleted file mode 100644 index ed75d054..00000000 --- a/contrib/polybar.xbps/patches/003-musl-poll.patch +++ /dev/null @@ -1,13 +0,0 @@ -Fix poll.h warning on musl - ---- include/utils/socket.hpp.orig -+++ include/utils/socket.hpp -@@ -1,7 +1,7 @@ - #pragma once - - #include --#include -+#include - #include - #include - diff --git a/contrib/polybar.xbps/template b/contrib/polybar.xbps/template index c65d824c..080b7309 100644 --- a/contrib/polybar.xbps/template +++ b/contrib/polybar.xbps/template @@ -1,44 +1,46 @@ # Template file for 'polybar' pkgname=polybar -version=2.1.9 +version=2.3.0 revision=1 wrksrc="${pkgname}-${version}" _i3ipcpp_version=0.5.1 -_xpp_version=1.3.0 +_xpp_version=1.3.1 build_style=cmake -configure_args=" - -DCMAKE_CXX_COMPILER=clang++ - -DCMAKE_CXX_FLAGS=-fPIE - -DCMAKE_EXE_LINKER_FLAGS=-pie - -DENABLE_ALSA=$(vopt_if alsa ON OFF) - -DENABLE_I3=$(vopt_if i3 ON OFF) - -DENABLE_MPD=$(vopt_if mpd ON OFF) - -DENABLE_NETWORK=$(vopt_if network ON OFF)" -depends=("libXft" "xcb-util-wm") +replaces="lemonbuddy>=0" +configure_args="-DCMAKE_CXX_COMPILER=clang++ + -DCMAKE_CXX_FLAGS=-fPIE + -DCMAKE_EXE_LINKER_FLAGS=-pie + -DENABLE_ALSA=$(vopt_if alsa ON OFF) + -DENABLE_I3=$(vopt_if i3 ON OFF) + -DENABLE_MPD=$(vopt_if mpd ON OFF) + -DENABLE_NETWORK=$(vopt_if network ON OFF)" +depends="libXft xcb-util-wm xcb-util-image" hostmakedepends="clang pkg-config xcb-proto" -makedepends="libxcb-devel libXft-devel xcb-util-wm-devel boost-devel - $(vopt_if alsa alsa-lib-devel) - $(vopt_if i3 "i3-devel jsoncpp-devel") - $(vopt_if mpd libmpdclient-devel) - $(vopt_if network wireless_tools-devel)" +makedepends="libxcb-devel libXft-devel xcb-util-image-devel xcb-util-wm-devel boost-devel + $(vopt_if alsa alsa-lib-devel) + $(vopt_if i3 i3-devel) + $(vopt_if i3 jsoncpp-devel) + $(vopt_if mpd libmpdclient-devel) + $(vopt_if network wireless_tools-devel)" short_desc="A fast and easy-to-use status bar" maintainer="Michael Carlberg " license="MIT" homepage="https://github.com/jaagr/polybar" distfiles=" - https://github.com/jaagr/polybar/archive/${version}.tar.gz - https://github.com/jaagr/xpp/archive/${_xpp_version}.tar.gz - $(vopt_if i3 "https://github.com/jaagr/i3ipcpp/archive/v${_i3ipcpp_version}.tar.gz")" + https://github.com/jaagr/polybar/archive/${version}.tar.gz + https://github.com/jaagr/xpp/archive/${_xpp_version}.tar.gz + $(vopt_if i3 https://github.com/jaagr/i3ipcpp/archive/v${_i3ipcpp_version}.tar.gz)" checksum=" - f7e1c24d0c0abc3173da56d3586ab0c977f1c973b4ba1d8cda6fa1372d02426d - f66b5ff4881d359521a1516c3fd87a5ace2e95e0ca2e6a1e0ab7b66cc6d3f582 - $(vopt_if i3 2c5243e1d3be787f8e64ce5b1a3c087999e2ccaeea1db317f6ab2df3556fa952)" + 962252d5e5ac44f630c2598b63ecd5ed269f64899008114fbccf05455b93e742 + de92b258a136aa782a876d3058009a31238cc92f16038aa243ea6d55057e2ed1 + $(vopt_if i3 2c5243e1d3be787f8e64ce5b1a3c087999e2ccaeea1db317f6ab2df3556fa952)" build_options="alsa i3 mpd network" build_options_default="$build_options" case "$XBPS_TARGET_MACHINE" in arm*) broken="cross-compiler with c++14 support";; + aarch64*) broken="cross-compiler with c++14 support";; aarch64-musl) CXXFLAGS="-D_LINUX_IF_ETHER_H";; esac @@ -49,12 +51,6 @@ post_extract() { mv ../xpp-${_xpp_version}/* lib/xpp/ || true } -pre_configure() { - export CFLAGS="$(echo $CFLAGS | sed 's/-specs=.* //g')" - export CXXFLAGS="$(echo $CXXFLAGS | sed 's/-specs=.* //g')" - export LDFLAGS="$(echo $LDFLAGS | sed 's/-specs=.* //g')" -} - post_install() { vlicense LICENSE }