diff --git a/README.md b/README.md index 1c2450eb..353100c7 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,8 @@ available for more people. ### Dependencies -- clang-3.4+ +A compiler with c++14 support. For example [`clang`](http://clang.llvm.org/get_started.html). + - cmake - boost - xcb-util-wm @@ -75,8 +76,8 @@ Optional dependencies for module support: - libmpdclient (required for `internal/mpd` support) ~~~ sh -$ pacman -S clang35 cmake python2 boost xcb-util-wm libxft wireless_tools alsa-lib libmpdclient -$ apt-get install clang-3.8 libc++-dev libc++abi-dev cmake cmake-data libboost-dev libfreetype6-dev libxcb1-dev libx11-xcb-dev libxcb-util0-dev libxcb-randr0-dev libxcb-ewmh-dev libxcb-icccm4-dev xcb-proto python-xcbgen i3-wm libiw-dev libasound2-dev libmpdclient-dev +$ pacman -S cmake python2 boost xcb-util-wm libxft wireless_tools alsa-lib libmpdclient +$ apt-get install cmake cmake-data libboost-dev libfreetype6-dev libxcb1-dev libx11-xcb-dev libxcb-util0-dev libxcb-randr0-dev libxcb-ewmh-dev libxcb-icccm4-dev xcb-proto python-xcbgen i3-wm libiw-dev libasound2-dev libmpdclient-dev ~~~ @@ -88,7 +89,7 @@ Please [report any problems](https://github.com/jaagr/lemonbuddy/issues/new) you $ git clone --branch 2.1.1 --recursive https://github.com/jaagr/lemonbuddy $ mkdir lemonbuddy/build $ cd lemonbuddy/build - $ cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Release .. + $ cmake -DCMAKE_BUILD_TYPE=Release .. $ sudo make install ~~~ diff --git a/contrib/lemonbuddy-git.aur/.SRCINFO b/contrib/lemonbuddy-git.aur/.SRCINFO index 9849089c..39101005 100644 --- a/contrib/lemonbuddy-git.aur/.SRCINFO +++ b/contrib/lemonbuddy-git.aur/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = lemonbuddy-git pkgdesc = A fast and easy-to-use status bar - pkgver = 2.1.1 + pkgver = 2.1.2 pkgrel = 1 url = https://github.com/jaagr/lemonbuddy arch = i686 @@ -9,8 +9,6 @@ pkgbase = lemonbuddy-git makedepends = cmake makedepends = python2 makedepends = pkg-config - makedepends = clang35 - makedepends = libc++ makedepends = boost depends = libxft depends = xcb-util-wm diff --git a/contrib/lemonbuddy-git.aur/PKGBUILD b/contrib/lemonbuddy-git.aur/PKGBUILD index dad8c9a8..aaa50e8c 100644 --- a/contrib/lemonbuddy-git.aur/PKGBUILD +++ b/contrib/lemonbuddy-git.aur/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Michael Carlberg _pkgname=lemonbuddy pkgname="${_pkgname}-git" -pkgver=2.1.1 +pkgver=2.1.2 pkgrel=1 pkgdesc="A fast and easy-to-use tool for Lemonbar" arch=("i686" "x86_64") @@ -13,7 +13,7 @@ optdepends=("alsa-lib: volume module support" "libmpdclient: mpd module support" "wireless_tools: network module support" "i3ipc-glib-git: i3 module support") -makedepends=("cmake" "python2" "pkg-config" "clang35" "libc++" "boost") +makedepends=("cmake" "python2" "pkg-config" "boost") provides=("lemonbuddy") conflicts=("lemonbuddy") source=("${_pkgname}::git+${url}.git") @@ -32,12 +32,7 @@ prepare() { build() { cd "${_pkgname}/build" || exit - cmake \ - -DCMAKE_C_COMPILER=clang \ - -DCMAKE_CXX_COMPILER=clang++ \ - -DCMAKE_EXE_LINKER_FLAGS=-lc++ \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr .. + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr .. make } diff --git a/contrib/lemonbuddy.aur/.SRCINFO b/contrib/lemonbuddy.aur/.SRCINFO index 006b0a64..5df17819 100644 --- a/contrib/lemonbuddy.aur/.SRCINFO +++ b/contrib/lemonbuddy.aur/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = lemonbuddy pkgdesc = A fast and easy-to-use status bar - pkgver = 2.1.1 + pkgver = 2.1.2 pkgrel = 1 url = https://github.com/jaagr/lemonbuddy arch = i686 @@ -9,8 +9,6 @@ pkgbase = lemonbuddy makedepends = cmake makedepends = python2 makedepends = pkg-config - makedepends = clang35 - makedepends = libc++ makedepends = boost depends = libxft depends = xcb-util-wm diff --git a/contrib/lemonbuddy.aur/PKGBUILD b/contrib/lemonbuddy.aur/PKGBUILD index 1bf3796a..074711ec 100644 --- a/contrib/lemonbuddy.aur/PKGBUILD +++ b/contrib/lemonbuddy.aur/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Michael Carlberg # Contributor: Michael Carlberg pkgname=lemonbuddy -pkgver=2.1.1 +pkgver=2.1.2 pkgrel=1 pkgdesc="A fast and easy-to-use tool for Lemonbar" arch=("i686" "x86_64") @@ -12,7 +12,7 @@ optdepends=("alsa-lib: volume module support" "libmpdclient: mpd module support" "wireless_tools: network module support" "i3ipc-glib-git: i3 module support") -makedepends=("cmake" "python2" "pkg-config" "clang35" "libc++" "boost") +makedepends=("cmake" "python2" "pkg-config" "boost") conflicts=("lemonbuddy-git") source=("${pkgname}::git+${url}.git#tag=${pkgver}") md5sums=("SKIP") @@ -25,12 +25,7 @@ prepare() { build() { cd "${pkgname}/build" || exit - cmake \ - -DCMAKE_C_COMPILER=clang \ - -DCMAKE_CXX_COMPILER=clang++ \ - -DCMAKE_EXE_LINKER_FLAGS=-lc++ \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr .. + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr .. make }