fix(aur): Update package templates

README.md

@@ -87,9 +87,8 @@ A compiler with c++14 support. For example [`clang`](http://clang.llvm.org/get_s
 
 - cmake
 - boost
-- libxcb
+- xcb-util-wm
-- xcb-proto
+- libxft
-- freetype2
 
 Optional dependencies for module support:
 
@@ -99,8 +98,8 @@ Optional dependencies for module support:
 - jsoncpp (required for `internal/i3` support)
 
 ~~~ sh
-$ pacman -S cmake boost libxcb xcb-proto wireless_tools alsa-lib libmpdclient jsoncpp
+$ pacman -S cmake boost xcb-util-wm libxft wireless_tools alsa-lib libmpdclient jsoncpp
-$ xbps-install cmake boost-devel libxcb-devel alsa-lib-devel i3-devel libmpdclient-devel jsoncpp-devel freetype-devel wireless_tools-devel
+$ xbps-install cmake boost-devel libxcb-util-dev alsa-lib-devel i3-devel libmpdclient-devel jsoncpp-devel wireless_tools-devel
 $ apt-get install cmake libxcb1-dev xcb-proto python-xcbgen libboost-dev libiw-dev libasound2-dev libmpdclient-dev libjsoncpp-dev libfreetype6-dev
 ~~~
 

contrib/lemonbuddy-git.aur/.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = lemonbuddy-git
-	pkgdesc = A fast and easy-to-use tool for Lemonbar
+	pkgdesc = A fast and easy-to-use status bar
-	pkgver = 1.4.6
+	pkgver = 2.0.0
 	pkgrel = 1
 	url = https://github.com/jaagr/lemonbuddy
 	arch = i686
@@ -11,8 +11,8 @@ pkgbase = lemonbuddy-git
 	makedepends = clang
 	makedepends = glibc
 	makedepends = boost
-	depends = bash
+	depends = libxft
-	depends = libxcb
+	depends = xcb-util-wm
 	optdepends = alsa-lib: volume module support
 	optdepends = libmpdclient: mpd module support
 	optdepends = wireless_tools: network module support

contrib/lemonbuddy-git.aur/PKGBUILD

@@ -2,17 +2,16 @@
 # Contributor: Michael Carlberg <c@rlberg.se>
 _pkgname=lemonbuddy
 pkgname="${_pkgname}-git"
-pkgver=1.4.6
+pkgver=2.0.0.rbeta.0.g593e5af
 pkgrel=1
 pkgdesc="A fast and easy-to-use tool for Lemonbar"
 arch=("i686" "x86_64")
 url="https://github.com/jaagr/lemonbuddy"
 license=("MIT")
-depends=("bash" "libxcb")
+depends=("libxft" "xcb-util-wm")
 optdepends=("alsa-lib: volume module support"
             "libmpdclient: mpd module support"
             "wireless_tools: network module support"
-            "libsigc++: i3 module support"
             "jsoncpp: i3 module support"
             "i3ipc-glib-git: i3 module support")
 makedepends=("cmake" "pkg-config" "clang" "glibc" "boost")
@@ -23,7 +22,7 @@ md5sums=("SKIP")
 
 pkgver() {
   cd "$_pkgname" || exit
-  git describe --long --tags | sed "s/-/.r/;s/-/./"
+  git describe --long --tags | sed "s/-/.r/;s/-/./g"
 }
 
 prepare() {

contrib/lemonbuddy.aur/.SRCINFO

@@ -1,6 +1,6 @@
-pkgbase = lemonbuddy
+pkgbase = lemonbuddy-git
-	pkgdesc = A fast and easy-to-use tool for Lemonbar
+	pkgdesc = A fast and easy-to-use status bar
-	pkgver = 1.4.6
+	pkgver = 2.0.0.beta
 	pkgrel = 1
 	url = https://github.com/jaagr/lemonbuddy
 	arch = i686
@@ -11,8 +11,8 @@ pkgbase = lemonbuddy
 	makedepends = clang
 	makedepends = glibc
 	makedepends = boost
-	depends = bash
+	depends = libxft
-	depends = libxcb
+	depends = xcb-util-wm
 	optdepends = alsa-lib: volume module support
 	optdepends = libmpdclient: mpd module support
 	optdepends = wireless_tools: network module support
@@ -20,8 +20,8 @@ pkgbase = lemonbuddy
 	optdepends = jsoncpp: i3 module support
 	optdepends = i3ipc-glib-git: i3 module support
 	conflicts = lemonbuddy-git
-	source = lemonbuddy::git+https://github.com/jaagr/lemonbuddy.git#tag=1.4.6
+	source = lemonbuddy::git+https://github.com/jaagr/lemonbuddy.git#tag=2.0.0-beta
 	md5sums = SKIP
 
-pkgname = lemonbuddy
+pkgname = lemonbuddy-git
 

contrib/lemonbuddy.aur/PKGBUILD

@@ -1,29 +1,27 @@
 # Maintainer: Michael Carlberg <c@rlberg.se>
 # Contributor: Michael Carlberg <c@rlberg.se>
 pkgname=lemonbuddy
-pkgver=1.4.6
+pkgver=2.0.0.beta
 pkgrel=1
 pkgdesc="A fast and easy-to-use tool for Lemonbar"
 arch=("i686" "x86_64")
 url="https://github.com/jaagr/lemonbuddy"
 license=("MIT")
-depends=("bash" "libxcb")
+depends=("libxft" "xcb-util-wm")
 optdepends=("alsa-lib: volume module support"
             "libmpdclient: mpd module support"
             "wireless_tools: network module support"
             "libsigc++: i3 module support"
-            "jsoncpp: i3 module support"
             "i3ipc-glib-git: i3 module support")
 makedepends=("cmake" "pkg-config" "clang" "glibc" "boost")
 conflicts=("lemonbuddy-git")
-source=("${pkgname}::git+${url}.git#tag=${pkgver}")
+source=("${pkgname}::git+${url}.git#tag=${pkgver%.*}-beta")
 md5sums=("SKIP")
 
 prepare() {
   cd "$pkgname" || exit
   git submodule update --init --recursive
   mkdir build
-  sed 's/python2.7/python3.5/g' -i lib/xpp/CMakeLists.txt
 }
 
 build() {

include/modules/i3.hpp

@@ -130,7 +130,6 @@ namespace modules {
         auto workspaces = ipc.get_workspaces();
         vector<shared_ptr<i3ipc::workspace_t>> sorted = workspaces;
         string focused_output;
-        bool output_unfocused = false;
 
         for (auto&& workspace : workspaces)
           if (workspace->focused) {
@@ -138,9 +137,6 @@ namespace modules {
             break;
           }
 
-        if (focused_output != m_bar.monitor->name)
-          output_unfocused = true;
-
         if (m_indexsort) {
           using ws_t = shared_ptr<i3ipc::workspace_t>;
           // clang-format off