* [bug#40068] [PATCH 0/4] gnu: waybar: Update to 0.9.1. @ 2020-03-15 5:26 Brendan Tildesley 2020-03-15 5:28 ` [bug#40068] [PATCH 1/4] gnu: Add date Brendan Tildesley 2020-03-19 14:13 ` bug#40068: [PATCH 0/4] " Ludovic Courtès 0 siblings, 2 replies; 6+ messages in thread From: Brendan Tildesley @ 2020-03-15 5:26 UTC (permalink / raw) To: 40068 Here is a waybar update with 2 new dependencies akd an spdlog update. the spdlog update causes a libreoffice rebuild. i tested building that but didn't look closely at if anything broke or changed. ^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#40068] [PATCH 1/4] gnu: Add date. 2020-03-15 5:26 [bug#40068] [PATCH 0/4] gnu: waybar: Update to 0.9.1 Brendan Tildesley @ 2020-03-15 5:28 ` Brendan Tildesley 2020-03-15 5:28 ` [bug#40068] [PATCH 2/4] gnu: spdlog: Update to 1.5.0 Brendan Tildesley ` (2 more replies) 2020-03-19 14:13 ` bug#40068: [PATCH 0/4] " Ludovic Courtès 1 sibling, 3 replies; 6+ messages in thread From: Brendan Tildesley @ 2020-03-15 5:28 UTC (permalink / raw) To: 40068 * gnu/packages/wm.scm (date): New variable. * gnu/packages/patches/date-output-pkg-config-files.patch: New file. * gnu/local.mk: Add patch. --- gnu/local.mk | 2 + gnu/packages/calendar.scm | 58 ++++++++++++++++++ .../date-output-pkg-config-files.patch | 60 +++++++++++++++++++ 3 files changed, 120 insertions(+) create mode 100644 gnu/packages/patches/date-output-pkg-config-files.patch diff --git a/gnu/local.mk b/gnu/local.mk index 99baddea92..84ddeb3f9e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -26,6 +26,7 @@ # Copyright © 2019 Evan Straw <evan.straw99@gmail.com> # Copyright © 2019 Brett Gilio <brettg@gnu.org> # Copyright © 2019 Amin Bandali <mab@gnu.org> +# Copyright © 2020 Brendan Tildesley <mail@brendan.scot> # # This file is part of GNU Guix. # @@ -802,6 +803,7 @@ dist_patch_DATA = \ %D%/packages/patches/cube-nocheck.patch \ %D%/packages/patches/cursynth-wave-rand.patch \ %D%/packages/patches/cvs-CVE-2017-12836.patch \ + %D%/packages/patches/date-output-pkg-config-files.patch \ %D%/packages/patches/darkice-workaround-fpermissive-error.patch \ %D%/packages/patches/dbus-helper-search-path.patch \ %D%/packages/patches/dbus-c++-gcc-compat.patch \ diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 060e4d18ad..95c43e1d06 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2016 Stefan Reichoer <stefan@xsteve.at> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com +;;; Copyright © 2020 Brendan Tildesley <mail@brendan.scot> ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +27,7 @@ (define-module (gnu packages calendar) #:use-module (gnu packages) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) @@ -48,6 +50,62 @@ #:use-module (gnu packages xml) #:use-module (srfi srfi-26)) +(define-public date + ;; We make the same choice as the Arch package maintainer by choosing a + ;; recent commit to fix some bugs. + ;; https://github.com/Alexays/Waybar/issues/565 + (let ((commit "9a0ee2542848ab8625984fc8cdbfb9b5414c0082")) + (package + (name "date") + (version (string-append "2.4.1-" (string-take commit 8))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url"https://github.com/HowardHinnant/date.git") + (commit "9a0ee2542848ab8625984fc8cdbfb9b5414c0082"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0yxsn0hj22n61bjywysxqgfv7hj5xvsl6isma95fl8xrimpny083")) + (patches + ;; Install pkg-config files + ;; https://github.com/HowardHinnant/date/pull/538 + (search-patches "date-output-pkg-config-files.patch")))) + (inputs `(("tzdata" ,tzdata))) + (build-system cmake-build-system) + (arguments + '(#:configure-flags (list "-DUSE_SYSTEM_TZ_DB=ON" + "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_TZ_LIB=ON" + "-DENABLE_DATE_TESTING=ON") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-bin-bash + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "compile_fail.sh" + (("/bin/bash") (which "bash"))) + #t)) + (add-after 'unpack 'patch-zoneinfo-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/tz.cpp" + (("/usr/share/zoneinfo") + (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo"))) + #t)) + (replace 'check + (lambda _ + ;; Disable test that requires checking timezone that + ;; isn't set in the build environment. + (substitute* "CTestTestfile.cmake" + (("add_test.tz_test_pass_zoned_time_deduction_test.*") "") + (("set_tests_properties.tz_test_pass_zoned_time_deduction_test.*") "")) + (invoke "make" "testit")))))) + (synopsis "Date and time library for C++11 and C++14") + (description "Date is a header only C++ library that extends the chrono +date algorithms library for calendar dates and durations. It also provides +the <tz.h> library for handling time zones and leap seconds.") + (home-page "https://howardhinnant.github.io/date/date.html") + (license license:expat)))) + (define-public libical (package (name "libical") diff --git a/gnu/packages/patches/date-output-pkg-config-files.patch b/gnu/packages/patches/date-output-pkg-config-files.patch new file mode 100644 index 0000000000..3fd1d54b36 --- /dev/null +++ b/gnu/packages/patches/date-output-pkg-config-files.patch @@ -0,0 +1,60 @@ +From e56b2dce7e89a92e1b9b35caa13b3e938c4cedea Mon Sep 17 00:00:00 2001 +From: Cole Mickens <cole.mickens@gmail.com> +Date: Sun, 26 Jan 2020 01:27:08 -0800 +Subject: [PATCH] CMakeLists.txt: output date.pc for pkg-config + +--- + CMakeLists.txt | 15 +++++++++++++++ + date.pc.in | 10 ++++++++++ + 2 files changed, 25 insertions(+) + create mode 100644 date.pc.in + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f30c473..fe778e8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -128,6 +128,15 @@ if( BUILD_TZ_LIB ) + endif( ) + endif( ) + ++if ( BUILD_TZ_LIB ) ++ # Cflags: -I${includedir} @TZ_COMPILE_DEFINITIONS@ ++ set( TZ_COMPILE_DEFINITIONS "$<IF:$<TARGET_EXISTS:tz>,-D$<JOIN:$<TARGET_PROPERTY:tz,INTERFACE_COMPILE_DEFINITIONS>, -D>,>" ) ++ configure_file(date.pc.in date.pc.cf @ONLY) ++ file( GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/date.pc" ++ INPUT "${CMAKE_CURRENT_BINARY_DIR}/date.pc.cf" ) ++ ++endif( ) ++ + #[===================================================================[ + installation + #]===================================================================] +@@ -171,6 +180,12 @@ install ( + FILES cmake/dateConfig.cmake "${version_config}" + DESTINATION ${CONFIG_LOC}) + ++if ( BUILD_TZ_LIB ) ++ install( ++ FILES ${CMAKE_BINARY_DIR}/date.pc ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) ++endif( ) ++ + #[===================================================================[ + testing + #]===================================================================] +diff --git a/date.pc.in b/date.pc.in +new file mode 100644 +index 0000000..b9c4623 +--- /dev/null ++++ b/date.pc.in +@@ -0,0 +1,10 @@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=@CMAKE_INSTALL_BINDIR@ ++libdir=@CMAKE_INSTALL_LIB@ ++includedir=@CMAKE_INSTALL_INCLUDE@ ++ ++Name: date ++Description: A date and time library based on the C++11/14/17 <chrono> header ++Version: @PACKAGE_VERSION@ ++Libs: -L${libdir} -ltz ++Cflags: -I${includedir} @TZ_COMPILE_DEFINITIONS@ -- 2.25.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#40068] [PATCH 2/4] gnu: spdlog: Update to 1.5.0. 2020-03-15 5:28 ` [bug#40068] [PATCH 1/4] gnu: Add date Brendan Tildesley @ 2020-03-15 5:28 ` Brendan Tildesley 2020-03-15 5:28 ` [bug#40068] [PATCH 3/4] gnu: Add gtk-layer-shell Brendan Tildesley 2020-03-15 5:28 ` [bug#40068] [PATCH 4/4] gnu: waybar: Update to 0.9.1 Brendan Tildesley 2 siblings, 0 replies; 6+ messages in thread From: Brendan Tildesley @ 2020-03-15 5:28 UTC (permalink / raw) To: 40068 * gnu/packages/logging.scm (spdlog): Update to 1.5.0 --- gnu/packages/logging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index d75c44aea6..8496b6256d 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -179,7 +179,7 @@ windows in a terminal, colorize, filter and merge.") (define-public spdlog (package (name "spdlog") - (version "1.3.1") + (version "1.5.0") (source (origin (method git-fetch) @@ -189,7 +189,7 @@ windows in a terminal, colorize, filter and merge.") (file-name (git-file-name name version)) (sha256 (base32 - "1rd4zmrlkcdjx0m0wpmjm1g9srj7jak6ai08qkhbn2lsn0niifzd")))) + "0dn44r3xbw1w0bk9yflnxkh3rzdq2bpxkks44skfmqig0rsj1f1x")))) (build-system cmake-build-system) ;; TODO run benchmark. Currently not possible, as adding ;; (gnu packages benchmark) forms a dependency cycle -- 2.25.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#40068] [PATCH 3/4] gnu: Add gtk-layer-shell. 2020-03-15 5:28 ` [bug#40068] [PATCH 1/4] gnu: Add date Brendan Tildesley 2020-03-15 5:28 ` [bug#40068] [PATCH 2/4] gnu: spdlog: Update to 1.5.0 Brendan Tildesley @ 2020-03-15 5:28 ` Brendan Tildesley 2020-03-15 5:28 ` [bug#40068] [PATCH 4/4] gnu: waybar: Update to 0.9.1 Brendan Tildesley 2 siblings, 0 replies; 6+ messages in thread From: Brendan Tildesley @ 2020-03-15 5:28 UTC (permalink / raw) To: 40068 * gnu/packages/gtk.scm (gtk-layer-shell): New variable. --- gnu/packages/gtk.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 7a364d4b35..c40911c994 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2019 Meiyo Peng <meiyo@riseup.net> ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org> +;;; Copyright © 2020 Brendan Tildesley <mail@brendan.scot> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1892,3 +1893,30 @@ displayed on the other side of the bus.") ;; Dual-licensed under either LGPLv2.1 or LGPLv3. (license (list license:lgpl2.1 license:lgpl3)))) + +(define-public gtk-layer-shell + (package + (name "gtk-layer-shell") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/wmww/gtk-layer-shell/releases/download/v" + version "/gtk-layer-shell-" version ".tar.xz")) + (sha256 + (base32 "0ncklk3z0fzlz6p76jdcrr1ykyp1f4ykjjch4x2hfp9bwsnl4a3m")))) + (build-system meson-build-system) + (native-inputs `(("pkg-config" ,pkg-config) + ("gobject-introspection" ,gobject-introspection))) + (inputs `(("wayland" ,wayland) + ("gtk+" ,gtk+))) + (home-page "https://github.com/wmww/gtk-layer-shell") + (synopsis "Library to create Wayland desktop components using the Layer +Shell protocol") + (description "Layer Shell is a Wayland protocol for desktop shell +components, such as panels, notifications and wallpapers. It can be used to +anchor windows to a corner or edge of the output, or stretch them across the +entire output. It supports all Layer Shell features including popups and +popovers.") + (license license:expat))) -- 2.25.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#40068] [PATCH 4/4] gnu: waybar: Update to 0.9.1. 2020-03-15 5:28 ` [bug#40068] [PATCH 1/4] gnu: Add date Brendan Tildesley 2020-03-15 5:28 ` [bug#40068] [PATCH 2/4] gnu: spdlog: Update to 1.5.0 Brendan Tildesley 2020-03-15 5:28 ` [bug#40068] [PATCH 3/4] gnu: Add gtk-layer-shell Brendan Tildesley @ 2020-03-15 5:28 ` Brendan Tildesley 2 siblings, 0 replies; 6+ messages in thread From: Brendan Tildesley @ 2020-03-15 5:28 UTC (permalink / raw) To: 40068 * gnu/packages/wm.scm (waybar): Update to 0.9.1. [inputs]: Add date and gtk-layer-shell dependencies. [synopsis]:Remove period. --- gnu/packages/wm.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index f9b6ef9880..c61be7003f 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -66,6 +66,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bison) + #:use-module (gnu packages calendar) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) #:use-module (gnu packages fontutils) @@ -1485,7 +1486,7 @@ modules for building a Wayland compositor.") (define-public waybar (package (name "waybar") - (version "0.8.0") + (version "0.9.1") (source (origin (method git-fetch) @@ -1494,12 +1495,14 @@ modules for building a Wayland compositor.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0s8ck7qxka0l91ayma6amp9sc8cidi43byqgzcavi3a6id983r1z")))) + (base32 "0drlv8im5phz39jxp3gxkc40b6f85bb3piff2v3hmnfzh7ib915s")))) (build-system meson-build-system) (arguments `(#:configure-flags (list (string-append "-Dout=" (assoc-ref %outputs "out"))))) - (inputs `(("fmt" ,fmt) + (inputs `(("date" ,date) + ("fmt" ,fmt) + ("gtk-layer-shell" ,gtk-layer-shell) ("gtkmm" ,gtkmm) ("jsoncpp" ,jsoncpp) ("libdbusmenu" ,libdbusmenu) @@ -1513,7 +1516,7 @@ modules for building a Wayland compositor.") ("pkg-config" ,pkg-config) ("wayland-protocols" ,wayland-protocols))) (home-page "https://github.com/Alexays/Waybar") - (synopsis "Wayland bar for Sway and Wlroots based compositors.") + (synopsis "Wayland bar for Sway and Wlroots based compositors") (description "Waybar is a highly customisable Wayland bar for Sway and Wlroots based compositors.") (license license:expat))) ; MIT license -- 2.25.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* bug#40068: [PATCH 0/4] gnu: waybar: Update to 0.9.1. 2020-03-15 5:26 [bug#40068] [PATCH 0/4] gnu: waybar: Update to 0.9.1 Brendan Tildesley 2020-03-15 5:28 ` [bug#40068] [PATCH 1/4] gnu: Add date Brendan Tildesley @ 2020-03-19 14:13 ` Ludovic Courtès 1 sibling, 0 replies; 6+ messages in thread From: Ludovic Courtès @ 2020-03-19 14:13 UTC (permalink / raw) To: Brendan Tildesley; +Cc: 40068-done Hi, Brendan Tildesley <mail@brendan.scot> skribis: > Here is a waybar update with 2 new dependencies akd an spdlog > update. the spdlog update causes a libreoffice rebuild. i tested > building that but didn't look closely at if anything broke or changed. Applied all 4 patches, thank you! Ludo’. ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-03-19 14:14 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-03-15 5:26 [bug#40068] [PATCH 0/4] gnu: waybar: Update to 0.9.1 Brendan Tildesley 2020-03-15 5:28 ` [bug#40068] [PATCH 1/4] gnu: Add date Brendan Tildesley 2020-03-15 5:28 ` [bug#40068] [PATCH 2/4] gnu: spdlog: Update to 1.5.0 Brendan Tildesley 2020-03-15 5:28 ` [bug#40068] [PATCH 3/4] gnu: Add gtk-layer-shell Brendan Tildesley 2020-03-15 5:28 ` [bug#40068] [PATCH 4/4] gnu: waybar: Update to 0.9.1 Brendan Tildesley 2020-03-19 14:13 ` bug#40068: [PATCH 0/4] " Ludovic Courtès
Code repositories for project(s) associated with this public inbox https://git.savannah.gnu.org/cgit/guix.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).