From a8360892d734b6c7418dd600b838faf2b2eda30c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 15 Sep 2020 11:55:57 +0300 Subject: gnu: waybar: Fix build. Reported by bdju. * gnu/packages/pretty-print.scm (fmt-6): New variable. * gnu/packages/wm.scm (waybar)[inputs]: Replace fmt with fmt-6. --- gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 15fbf43ec7..000ec8bd27 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015 xd1le ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2016 Danny Milosavljevic -;;; Copyright © 2016, 2019 Efraim Flashner +;;; Copyright © 2016, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 Al McElrath ;;; Copyright © 2016 Carlo Zancanaro ;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès @@ -1526,7 +1526,7 @@ modules for building a Wayland compositor.") (base32 "0ks719khhg2zwpyiwa2079i6962qcxpapm28hmr4ckpsp2n659ck")))) (build-system meson-build-system) (inputs `(("date" ,date) - ("fmt" ,fmt) + ("fmt" ,fmt-6) ("gtk-layer-shell" ,gtk-layer-shell) ("gtkmm" ,gtkmm) ("jsoncpp" ,jsoncpp) -- cgit v1.2.3 From 1af5e57d875000bfe878ca8e4435c2899fb66914 Mon Sep 17 00:00:00 2001 From: Ivan Kozlov Date: Fri, 31 Jul 2020 11:18:23 +0300 Subject: gnu: awesome: Fix command completion in the prompt and Lua paths MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (awesome): Delete useless ‘env’ invocation in lib/awful/completion.lua. Change the delimiter for LUA_PATH and LUA_CPATH variables. Signed-off-by: Ludovic Courtès --- gnu/packages/wm.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 000ec8bd27..be23980a12 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -973,6 +973,9 @@ experience.") (modify-phases %standard-phases (add-before 'configure 'set-paths (lambda* (#:key inputs #:allow-other-keys) + (substitute* "lib/awful/completion.lua" + (("/usr/bin/env") + "")) ;; The build process needs to load Cairo dynamically. (let* ((cairo (string-append (assoc-ref inputs "cairo") "/lib")) (lua-version ,(version-major+minor (package-version lua))) @@ -1021,9 +1024,9 @@ experience.") (lua-version ,(version-major+minor (package-version lua))) (lua-lgi (assoc-ref inputs "lua-lgi"))) (wrap-program (string-append awesome "/bin/awesome") - `("LUA_PATH" suffix + `("LUA_PATH" ";" suffix (,(format #f "~a/share/lua/~a/?.lua" lua-lgi lua-version))) - `("LUA_CPATH" suffix + `("LUA_CPATH" ";" suffix (,(format #f "~a/lib/lua/~a/?.so" lua-lgi lua-version))) `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))) `("LD_LIBRARY_PATH" suffix (,cairo))) -- cgit v1.2.3 From 08014aed88cd15c7dff03a47b16c9dc07215f6ea Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 1 Oct 2020 20:41:03 +0200 Subject: gnu: waybar: Update to 0.9.4. * gnu/packages/wm.scm (waybar): Update to 0.9.4. --- gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/wm.scm') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index be23980a12..8c32fe426d 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1517,7 +1517,7 @@ modules for building a Wayland compositor.") (define-public waybar (package (name "waybar") - (version "0.9.3") + (version "0.9.4") (source (origin (method git-fetch) @@ -1526,7 +1526,7 @@ modules for building a Wayland compositor.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0ks719khhg2zwpyiwa2079i6962qcxpapm28hmr4ckpsp2n659ck")))) + (base32 "038vnma7y7z81caywp45yr364bc1aq8d01j5vycyiyfv33nm76fy")))) (build-system meson-build-system) (inputs `(("date" ,date) ("fmt" ,fmt-6) -- cgit v1.2.3 From e1fefb810bc561fe4f1ccfe155b36ba8b93bce2d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 2 Oct 2020 00:12:18 +0200 Subject: gnu: grim: Fix output rotation interpretation with Sway 1.4. * gnu/packages/image.scm (grim)[source]: Add patch. * gnu/packages/patches/grim-revert-output-rotation.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/image.scm | 3 ++- .../patches/grim-revert-output-rotation.patch | 27 ++++++++++++++++++++++ gnu/packages/wm.scm | 2 ++ 4 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/grim-revert-output-rotation.patch (limited to 'gnu/packages/wm.scm') diff --git a/gnu/local.mk b/gnu/local.mk index a278c83553..f2b7a5da84 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1085,6 +1085,7 @@ dist_patch_DATA = \ %D%/packages/patches/gpsbabel-qstring.patch \ %D%/packages/patches/grantlee-merge-theme-dirs.patch \ %D%/packages/patches/grep-timing-sensitive-test.patch \ + %D%/packages/patches/grim-revert-output-rotation.patch \ %D%/packages/patches/grocsvs-dont-use-admiral.patch \ %D%/packages/patches/gromacs-tinyxml2.patch \ %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \ diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 8fbdd0b4ae..ae0f831082 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1949,7 +1949,8 @@ identical visual appearance.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0fjmjq0ws9rlblkcqxxw2lv7zvvyi618jqzlnz5z9zb477jwdfib")))) + (base32 "0fjmjq0ws9rlblkcqxxw2lv7zvvyi618jqzlnz5z9zb477jwdfib")) + (patches (search-patches "grim-revert-output-rotation.patch")))) (build-system meson-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("scdoc" ,scdoc))) diff --git a/gnu/packages/patches/grim-revert-output-rotation.patch b/gnu/packages/patches/grim-revert-output-rotation.patch new file mode 100644 index 0000000000..cbf0a86502 --- /dev/null +++ b/gnu/packages/patches/grim-revert-output-rotation.patch @@ -0,0 +1,27 @@ +From 80b17ceaff90b81b28b44004d2aca4cc40f365be Mon Sep 17 00:00:00 2001 +From: Tobias Geerinckx-Rice +Date: Fri, 2 Oct 2020 00:07:30 +0200 +Subject: [PATCH] Revert "Correct interpretation of output rotation" + +This reverts commit 8f9d60885ce2f9bd66cd93d3378dcb6866d4588a. +It is incompatible with the current Sway version (1.4) in Guix. +--- + render.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/render.c b/render.c +index 8f31e7e..a6b0b12 100644 +--- a/render.c ++++ b/render.c +@@ -104,7 +104,7 @@ cairo_surface_t *render(struct grim_state *state, struct grim_box *geometry, + cairo_matrix_translate(&matrix, + (double)output->geometry.width / 2, + (double)output->geometry.height / 2); +- cairo_matrix_rotate(&matrix, get_output_rotation(output->transform)); ++ cairo_matrix_rotate(&matrix, -get_output_rotation(output->transform)); + cairo_matrix_scale(&matrix, + (double)raw_output_width / output_width * output_flipped_x, + (double)raw_output_height / output_height * output_flipped_y); +-- +2.28.0 + diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 8c32fe426d..40458f55ab 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1386,6 +1386,8 @@ modules for building a Wayland compositor.") (define-public sway (package (name "sway") + ;; XXX When updating, check whether grim-revert-output-rotation.patch can + ;; be dropped from the grim package. (version "1.4") (source (origin -- cgit v1.2.3