Created
February 5, 2017 11:45
-
-
Save asergi/a0ebc9aaf18ac6f9a7cedd18e2322198 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/srcpkgs/lemonbuddy/INSTALL.msg b/srcpkgs/lemonbuddy/INSTALL.msg | |
deleted file mode 100644 | |
index 909ecf5d01..0000000000 | |
--- a/srcpkgs/lemonbuddy/INSTALL.msg | |
+++ /dev/null | |
@@ -1,9 +0,0 @@ | |
- | |
- Get started with the example configuration: | |
- | |
- $ install -Dm644 /usr/share/examples/lemonbuddy/config $HOME/.config/lemonbuddy | |
- $ lemonbuddy example | |
- | |
- | |
- For more information, see https://github.com/jaagr/lemonbuddy | |
- | |
diff --git a/srcpkgs/lemonbuddy/patches/001-musl-poll.patch b/srcpkgs/lemonbuddy/patches/001-musl-poll.patch | |
deleted file mode 100644 | |
index 8cdeaab2b1..0000000000 | |
--- a/srcpkgs/lemonbuddy/patches/001-musl-poll.patch | |
+++ /dev/null | |
@@ -1,17 +0,0 @@ | |
-Fix poll.h warning on musl | |
- | |
---- include/adapters/alsa.hpp.orig | |
-+++ include/adapters/alsa.hpp | |
-@@ -4,7 +4,12 @@ | |
- #include <functional> | |
- #include <string> | |
- | |
-+#include <poll.h> | |
-+ | |
-+#pragma clang diagnostic push | |
-+#pragma clang diagnostic ignored "-W#warnings" | |
- #include <alsa/asoundlib.h> | |
-+#pragma clang diagnostic pop | |
- | |
- #include "common.hpp" | |
- #include "config.hpp" | |
diff --git a/srcpkgs/lemonbuddy/template b/srcpkgs/lemonbuddy/template | |
index c5dafa9db4..c4b1fd6ff6 100644 | |
--- a/srcpkgs/lemonbuddy/template | |
+++ b/srcpkgs/lemonbuddy/template | |
@@ -1,61 +1,10 @@ | |
# Template file for 'lemonbuddy' | |
pkgname=lemonbuddy | |
version=2.2.5 | |
-revision=1 | |
-wrksrc="${pkgname}-${version}" | |
-_i3ipcpp_version=0.5.1 | |
-_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" "xcb-util-image") | |
-hostmakedepends="clang pkg-config xcb-proto" | |
-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 jsoncpp-devel") | |
- $(vopt_if mpd libmpdclient-devel) | |
- $(vopt_if network wireless_tools-devel)" | |
-short_desc="A fast and easy-to-use status bar" | |
+revision=2 | |
+build_style=meta | |
+depends="polybar>=${version}_${revision}" | |
+short_desc="A fast and easy-to-use status bar (transitional dummy package)" | |
maintainer="Michael Carlberg <c@rlberg.se>" | |
license="MIT" | |
homepage="https://github.com/jaagr/lemonbuddy" | |
-distfiles=" | |
- https://github.com/jaagr/lemonbuddy/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=" | |
- 0b93c280846e9e29ea7177c721d9ebe638a5ff90d5f830c01d79b3f230fe46e8 | |
- 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 | |
- | |
-post_extract() { | |
- [ -d ../i3ipcpp-${_i3ipcpp_version} ] && \ | |
- mv ../i3ipcpp-${_i3ipcpp_version}/* lib/i3ipcpp/ || true | |
- [ -d ../xpp-${_xpp_version} ] && \ | |
- 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 | |
-} | |
diff --git a/srcpkgs/polybar/template b/srcpkgs/polybar/template | |
index 4250bf31c8..79610c2c20 100644 | |
--- a/srcpkgs/polybar/template | |
+++ b/srcpkgs/polybar/template | |
@@ -19,7 +19,7 @@ makedepends="cairo-devel xcb-util-image-devel xcb-util-wm-devel xcb-util-xrm-dev | |
$(vopt_if i3 "i3-devel jsoncpp-devel") | |
$(vopt_if mpd "libmpdclient-devel") | |
$(vopt_if network "wireless_tools-devel")" | |
-short_desc="A fast and easy-to-use status bar" | |
+short_desc="A fast and easy-to-use status bar (formerly called lemonbuddy)" | |
maintainer="Michael Carlberg <c@rlberg.se>" | |
license="MIT" | |
homepage="https://github.com/jaagr/polybar" | |
@@ -32,6 +32,7 @@ checksum=" | |
b81993893190bf7ba19529e0da6e8b069e13e833f6a62874830b46785bee3349 | |
$(vopt_if i3 7ad9c0c1e1cb9dfd07ecc2a7769eae9ac962c22db2e07be08b2186b7fd85189d)" | |
+replaces="lemonbuddy>=0" | |
build_options="alsa curl i3 mpd network" | |
build_options_default="$build_options" | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment