>From 30042d73a58f90971cd6c37bf56269bd3abb2533 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan
Date: Sat, 2 May 2020 22:28:44 -0400
Subject: [PATCH 08/14] gnu: girara: Update package definition.
* gnu/packages/pwmt.scm (girara):
[source][method]: Changed from git-fetch to url-fetch; and
remove file-name field.
[arguments]<#:glib-or-gtk?>: New argument.
[arguments]<#:configure-flags>[-Dnotify]: New flag.
[native-inputs]: New input.
[inputs]: New inputs.
[propagated-inputs]: Removed.
[synopsis]: Updated.
[description]: Updated.
---
gnu/packages/pwmt.scm | 73 +++++++++++++++++++++++++------------------
1 file changed, 42 insertions(+), 31 deletions(-)
diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm
index 2516c62485..69007bde9a 100644
--- a/gnu/packages/pwmt.scm
+++ b/gnu/packages/pwmt.scm
@@ -56,38 +56,49 @@
(version "0.3.4")
(source
(origin
- (method git-fetch)
- (uri (git-reference
- (url "https://git.pwmt.org/pwmt/girara")
- (commit version)))
- (file-name (git-file-name name version))
+ (method url-fetch)
+ (uri
+ (string-append "https://pwmt.org/projects/girara/download/girara-"
+ version ".tar.xz"))
(sha256
- (base32 "08rpw9hkaprm4r853xy1d35i2af1pji8c3mzzl01mmwmyr9p0x8k"))))
- (native-inputs `(("pkg-config" ,pkg-config)
- ("check" ,check)
- ("gettext" ,gettext-minimal)
- ("glib:bin" ,glib "bin")
- ("xorg-server" ,xorg-server-for-tests)))
- ;; Listed in 'Requires.private' of 'girara.pc'.
- (propagated-inputs `(("gtk+" ,gtk+)))
- (arguments
- `(#:phases (modify-phases %standard-phases
- (add-before 'check 'start-xserver
- ;; Tests require a running X server.
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((xorg-server (assoc-ref inputs "xorg-server"))
- (display ":1"))
- (setenv "DISPLAY" display)
-
- ;; On busy machines, tests may take longer than
- ;; the default of four seconds.
- (setenv "CK_DEFAULT_TIMEOUT" "20")
-
- ;; Don't fail due to missing '/etc/machine-id'.
- (setenv "DBUS_FATAL_WARNINGS" "0")
- (zero? (system (string-append xorg-server "/bin/Xvfb "
- display " &")))))))))
+ (base32 "0cmjdismdsx9a5l7zx54zkd33mgg3mx4ckpvc7aap3x6a1ddmz2i"))))
(build-system meson-build-system)
+ (arguments
+ `(#:glib-or-gtk? #t ; To compile schemas
+ #:configure-flags
+ (list
+ "-Dnotify=enabled") ; For notification support
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'check 'start-xserver
+ ;; Tests require a running X server.
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let
+ ((xorg-server (assoc-ref inputs "xorg-server"))
+ (display ":1"))
+ (setenv "DISPLAY" display)
+ ;; On busy machines, tests may take longer than
+ ;; the default of four seconds.
+ (setenv "CK_DEFAULT_TIMEOUT" "20")
+ ;; Don't fail due to missing '/etc/machine-id'.
+ (setenv "DBUS_FATAL_WARNINGS" "0")
+ (zero?
+ (system
+ (string-append xorg-server "/bin/Xvfb "
+ display " &")))))))))
+ (native-inputs
+ `(("check" ,check) ; For tests
+ ("doxygen" ,doxygen) ; For docs
+ ("gettext" ,gettext-minimal)
+ ("glib:bin" ,glib "bin")
+ ("pkg-config" ,pkg-config)
+ ("xorg-server" ,xorg-server-for-tests))) ; For tests
+ (inputs
+ `(("glib" ,glib)
+ ("gtk+" ,gtk+)
+ ("json-c" ,json-c) ; For configuration dumping support
+ ("libnotify" ,libnotify) ; For notification support
+ ("pango" ,pango)))
(home-page "https://pwmt.org/projects/girara/")
(synopsis "Library for minimalistic gtk+3 user interfaces")
(description "Girara is a library that implements a user interface that
@@ -341,4 +352,4 @@ using the DjVuLibre library.")
(synopsis "Comic book support for zathura (libarchive backend)")
(description "The zathura-cb plugin adds comic book support to zathura
using libarchive.")
- (license license:zlib)))
\ No newline at end of file
+ (license license:zlib)))
--
2.26.2