From d6f08dc9cbc52562901e7cc712006aa8b32afcf9 Mon Sep 17 00:00:00 2001 From: hasufell Date: Mon, 15 Feb 2016 14:55:42 +0100 Subject: [PATCH] x11-wm/i3: update and use my icon branch --- packages/x11-wm/i3/i3-scm.exheres-0 | 13 ++++++++++++- packages/x11-wm/i3/i3.exlib | 28 ++++++++++++++++------------ 2 files changed, 28 insertions(+), 13 deletions(-) diff --git a/packages/x11-wm/i3/i3-scm.exheres-0 b/packages/x11-wm/i3/i3-scm.exheres-0 index e3a4cf4..c643a14 100644 --- a/packages/x11-wm/i3/i3-scm.exheres-0 +++ b/packages/x11-wm/i3/i3-scm.exheres-0 @@ -1,7 +1,11 @@ # Copyright 2011-2013 Quentin "Sardem FF7" Glidic +# Copyright 2016 Julian Ospald # Distributed under the terms of the GNU General Public License v2 -require i3 github [ user=hasufell pn=i3wm branch=next ] +SCM_REPOSITORY="https://github.com/hasufell/i3wm.git" +: ${SCM_BRANCH:=next} + +require i3 scm-git UPSTREAM_CHANGELOG="http://code.stapelberg.de/git/i3/log/" UPSTREAM_DOCUMENTATION=" @@ -13,15 +17,22 @@ UPSTREAM_DOCUMENTATION=" PLATFORMS="~amd64" +MYOPTIONS="icons" + DEPENDENCIES=" build: app-doc/asciidoc[>=8.3.0] app-text/xmlto build+run: x11-utils/xcb-util-cursor + icons? ( x11-utils/xcb-util-image ) " DEFAULT_SRC_COMPILE_PARAMS+=( all mans ) +src_compile() { + emake "${DEFAULT_SRC_COMPILE_PARAMS[@]}" \ + USE_ICONS="$(option icons 1 0)" +} diff --git a/packages/x11-wm/i3/i3.exlib b/packages/x11-wm/i3/i3.exlib index b51ecee..4231d89 100644 --- a/packages/x11-wm/i3/i3.exlib +++ b/packages/x11-wm/i3/i3.exlib @@ -31,7 +31,9 @@ DEPENDENCIES=" build+run: dev-libs/libev dev-libs/yajl[>=2.0.1] + x11-libs/cairo[X] x11-libs/libxcb[>=1.1.93] + x11-libs/libxkbcommon[X][>=0.4.0] x11-libs/pango x11-libs/startup-notification x11-utils/xcb-util @@ -55,19 +57,21 @@ DEPENDENCIES=" ]] " -if ever at_least scm; then - DEPENDENCIES+=" - build+run: - x11-libs/libxkbcommon[X] - " -else - DEPENDENCIES+=" - build+run: - x11-libs/libX11 - " -fi - DEFAULT_SRC_COMPILE_PARAMS=( + CC=${CC} + AR=${AR} + PKG_CONFIG=$(exhost --tool-prefix)pkg-config + PREFIX=/usr + EXEC_PREFIX=/usr/$(exhost --target) + SYSCONFDIR=/etc + V=1 +) + +DEFAULT_SRC_INSTALL_PARAMS=( + PKG_CONFIG=$(exhost --tool-prefix)pkg-config + PREFIX=/usr + EXEC_PREFIX=/usr/$(exhost --target) + SYSCONFDIR=/etc V=1 )