From bfb587435415079ff23620217f8e391ccb124734 Mon Sep 17 00:00:00 2001 From: Michael Carlberg Date: Tue, 28 Jun 2016 21:55:37 +0200 Subject: [PATCH] refactor(i3ipcpp): Use patched standalone version --- .gitmodules | 2 +- contrib/lemonbuddy-git.aur/.SRCINFO | 4 ++-- contrib/lemonbuddy-git.aur/PKGBUILD | 5 +++-- contrib/lemonbuddy.aur/.SRCINFO | 6 +++--- contrib/lemonbuddy.aur/PKGBUILD | 5 +++-- include/version.hpp | 2 +- lib/i3ipcpp | 2 +- 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.gitmodules b/.gitmodules index a72a284b..7098b259 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,7 +5,7 @@ [submodule "lib/i3ipcpp"] path = lib/i3ipcpp url = https://github.com/jaagr/i3ipcpp - branch = v0.1.4 + branch = v0.3.0 [submodule "lib/xpp"] path = lib/xpp url = https://github.com/jaagr/xpp diff --git a/contrib/lemonbuddy-git.aur/.SRCINFO b/contrib/lemonbuddy-git.aur/.SRCINFO index 3f2bd575..ffd3c37b 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 tool for Lemonbar - pkgver = 1.3.2 + pkgver = 1.4.0 pkgrel = 1 url = https://github.com/jaagr/lemonbuddy arch = i686 @@ -11,13 +11,13 @@ pkgbase = lemonbuddy-git makedepends = clang makedepends = glibc makedepends = boost - makedepends = libxcb depends = bash depends = libxcb optdepends = alsa-lib: volume module support optdepends = libmpdclient: mpd module support optdepends = wireless_tools: network module support optdepends = libsigc++: i3 module support + optdepends = jsoncpp: i3 module support optdepends = i3ipc-glib-git: i3 module support provides = lemonbuddy conflicts = lemonbuddy diff --git a/contrib/lemonbuddy-git.aur/PKGBUILD b/contrib/lemonbuddy-git.aur/PKGBUILD index 0e27902d..9d5594d4 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=1.3.2 +pkgver=1.4.0 pkgrel=1 pkgdesc="A fast and easy-to-use tool for Lemonbar" arch=("i686" "x86_64") @@ -13,8 +13,9 @@ 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" "libxcb") +makedepends=("cmake" "pkg-config" "clang" "glibc" "boost") provides=("lemonbuddy") conflicts=("lemonbuddy") source=("${_pkgname}::git+${url}.git") diff --git a/contrib/lemonbuddy.aur/.SRCINFO b/contrib/lemonbuddy.aur/.SRCINFO index 46f8ef4f..9c7f0734 100644 --- a/contrib/lemonbuddy.aur/.SRCINFO +++ b/contrib/lemonbuddy.aur/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = lemonbuddy pkgdesc = A fast and easy-to-use tool for Lemonbar - pkgver = 1.3.2 + pkgver = 1.4.0 pkgrel = 1 url = https://github.com/jaagr/lemonbuddy arch = i686 @@ -11,16 +11,16 @@ pkgbase = lemonbuddy makedepends = clang makedepends = glibc makedepends = boost - makedepends = libxcb depends = bash depends = libxcb optdepends = alsa-lib: volume module support optdepends = libmpdclient: mpd module support optdepends = wireless_tools: network module support optdepends = libsigc++: i3 module support + 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.3.2 + source = lemonbuddy::git+https://github.com/jaagr/lemonbuddy.git#tag=1.4.0 md5sums = SKIP pkgname = lemonbuddy diff --git a/contrib/lemonbuddy.aur/PKGBUILD b/contrib/lemonbuddy.aur/PKGBUILD index 8bb1a93d..8e510dc1 100644 --- a/contrib/lemonbuddy.aur/PKGBUILD +++ b/contrib/lemonbuddy.aur/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Michael Carlberg # Contributor: Michael Carlberg pkgname=lemonbuddy -pkgver=1.3.2 +pkgver=1.4.0 pkgrel=1 pkgdesc="A fast and easy-to-use tool for Lemonbar" arch=("i686" "x86_64") @@ -12,8 +12,9 @@ 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" "libxcb") +makedepends=("cmake" "pkg-config" "clang" "glibc" "boost") conflicts=("lemonbuddy-git") source=("${pkgname}::git+${url}.git#tag=${pkgver}") md5sums=("SKIP") diff --git a/include/version.hpp b/include/version.hpp index 438abb5f..3301d514 100644 --- a/include/version.hpp +++ b/include/version.hpp @@ -1,3 +1,3 @@ #pragma once -#define GIT_TAG "1.3.2" +#define GIT_TAG "1.4.0" diff --git a/lib/i3ipcpp b/lib/i3ipcpp index 7958c1ed..86ed2a59 160000 --- a/lib/i3ipcpp +++ b/lib/i3ipcpp @@ -1 +1 @@ -Subproject commit 7958c1ed796abad5fe4a3ae6322baaff1826079f +Subproject commit 86ed2a595bfebb22a08437f3303d79b25cdc2b33