[PATCH] gnu: bemenu: Update to 0.4.1.

Josh Holland wrote on 29 May 2020 11:14

Recipients:(address . guix-patches@gnu.org)(name . Josh Holland)(address . josh@inv.alid.pw)

Message-ID:20200529091439.388824-1-josh@inv.alid.pw

* gnu/packages/xdisorg.scm (bemenu): Update to 0.4.1.---I'm not 100% sure that the CFLAGS setting is correct, but without-fPIC the build fails. Upstream changed their build system, and nowwe do not need to explicitly enable the Wayland backend.
gnu/packages/xdisorg.scm | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)

Toggle diff (53 lines)diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scmindex 5e4e275073..90cc7b2cb3 100644--- a/gnu/packages/xdisorg.scm+++ b/gnu/packages/xdisorg.scm@@ -27,7 +27,7 @@ ;;; Copyright © 2018 Nam Nguyen <namn@berkeley.edu> ;;; Copyright © 2019 Wiktor Żelazny <wzelazny@vurv.cz> ;;; Copyright © 2019 Kyle Andrews <kyle.c.andrews@gmail.com>-;;; Copyright © 2019 Josh Holland <josh@inv.alid.pw>+;;; Copyright © 2019, 2020 Josh Holland <josh@inv.alid.pw> ;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org> ;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2020 David Wilson <david@daviwil.com>@@ -211,7 +211,7 @@ used to further tweak the behaviour of the different profiles.") (define-public bemenu   (package     (name "bemenu")-    (version "0.2.0")+    (version "0.4.1")     (source      (origin        (method git-fetch)@@ -220,10 +220,18 @@ used to further tweak the behaviour of the different profiles.")              (commit version)))        (file-name (git-file-name name version))        (sha256-        (base32 "0piax49az5kp96r1g6dcgj87fi6p4jl286wlkxsdvljzpkn8q6gv"))))-    (build-system cmake-build-system)+        (base32 "1fjcs9d3533ay3nz79cx3c0lmy2chgragr2lhsy0xl2ckr0iins0"))))+    (build-system gnu-build-system)     (arguments-     '(#:configure-flags '("-DBEMENU_WAYLAND_RENDERER=ON")))+     '(#:tests? #f+       #:make-flags (list "CC=gcc"+                          "CFLAGS=-O2 -fPIC"+                          (string-append "LDFLAGS=-Wl,-rpath="+                                         (assoc-ref %outputs "out") "/lib")+                          (string-append "PREFIX=" (assoc-ref %outputs "out")))+       #:phases+       (modify-phases %standard-phases+         (delete 'configure))))     (inputs      `(("cairo" ,cairo)        ("libx11" ,libx11)@@ -242,7 +250,7 @@ used to further tweak the behaviour of the different profiles.")      "bemenu is a dynamic menu which allows the user to flexibly select from a list of options (usually programs to launch).  It renders the menu graphically with X11 or Wayland, or in a text terminal with ncurses.")-    (license (list license:gpl3+        ; client program[s] and other sources+    (license (list license:gpl3+ ; client program[s] and other sources                    license:lgpl3+))))   ; library and bindings
 (define-public copyq

--2.26.2

Marius Bakke wrote on 30 May 2020 16:27

Recipients:(name . Josh Holland)(address . josh@inv.alid.pw)

Message-ID:87ftbhzeew.fsf@gnu.org

Josh Holland <josh@inv.alid.pw> writes:

Toggle quote (2 lines)

> * gnu/packages/xdisorg.scm (bemenu): Update to 0.4.1.

Applied, thanks!

Toggle quote (5 lines)

> ---> I'm not 100% sure that the CFLAGS setting is correct, but without> -fPIC the build fails. Upstream changed their build system, and now> we do not need to explicitly enable the Wayland backend.

This is because lib/3rdparty/cdl.a is built statically, and needs to beembedded into the shared libbemenu.so.0.  It's odd that the Makefiledoes not add -fPIC for us though, can you file an upstream bug?
Ideally we'd build cdl separately as a shared library and provide it asan input, then -fPIC would be unnecessary.

Closed

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date