* [bug#33800] [PATCH] gnu: Add grim.
@ 2018-12-19 9:38 Rutger Helling
2018-12-19 21:40 ` Ludovic Courtès
0 siblings, 1 reply; 3+ messages in thread
From: Rutger Helling @ 2018-12-19 9:38 UTC (permalink / raw)
To: 33800
[-- Attachment #1.1: Type: text/plain, Size: 87 bytes --]
Hey Guix,
these patches add grim. Basically scrot, but for Wayland instead of X11.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-Add-scdoc.patch --]
[-- Type: text/x-patch, Size: 2162 bytes --]
From a55c2fedeca18627e8f0aa23efc0c78e846e40ee Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Wed, 19 Dec 2018 10:27:28 +0100
Subject: [PATCH 1/2] gnu: Add scdoc.
* gnu/packages/man.scm (scdoc): New variable.
---
gnu/packages/man.scm | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm
index b64088493..f2fe760ff 100644
--- a/gnu/packages/man.scm
+++ b/gnu/packages/man.scm
@@ -5,6 +5,7 @@
;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -228,6 +229,37 @@ automatically.")
(base32
"1p5830h88cx0zn0snwaj0vpph81xicpsirfwlxmcgjrlmn0nm3sj"))))))
+(define-public scdoc
+ (package
+ (name "scdoc")
+ (version "1.6.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://git.sr.ht/%7Esircmpwn/scdoc/archive/" version
+ ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1ca3js4arkg28gg2iszxxyrq7kgsrz482d1szv5dfd471h3vr5m3"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:make-flags '("CC=gcc")
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure)
+ (add-before 'install 'hardcode-paths
+ (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* "Makefile"
+ (("/usr/local") (assoc-ref outputs "out")))
+ #t)))))
+ (home-page "https://git.sr.ht/~sircmpwn/scdoc")
+ (synopsis "Simple man page generator")
+ (description "scdoc is a simple man page generator written for POSIX systems
+written in C99.")
+ ;; MIT license, see /share/doc/scdoc-1.6.0/COPYING.
+ (license (x11-style "file://COPYING"))))
+
(define-public txt2man
(package
(name "txt2man")
--
2.20.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: 0002-gnu-Add-grim.patch --]
[-- Type: text/x-patch, Size: 2926 bytes --]
From 793ae79c8bbd68b981f4c4b94b43784011776ede Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Wed, 19 Dec 2018 10:31:50 +0100
Subject: [PATCH 2/2] gnu: Add grim.
* gnu/packages/image.scm (grim): New variable.
---
gnu/packages/image.scm | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 1a6b8fe1c..0a7164059 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -22,6 +22,7 @@
;;; Copyright © 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2018 Pierre-Antoine Rouby <contact@parouby.fr>
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
+;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -49,6 +50,7 @@
#:use-module (gnu packages compression)
#:use-module (gnu packages documentation)
#:use-module (gnu packages fontutils)
+ #:use-module (gnu packages freedesktop)
;; To provide gcc@5 and gcc@6, to work around <http://bugs.gnu.org/24703>.
#:use-module (gnu packages gcc)
#:use-module (gnu packages gettext)
@@ -58,6 +60,7 @@
#:use-module (gnu packages graphics)
#:use-module (gnu packages gtk)
#:use-module (gnu packages lua)
+ #:use-module (gnu packages man)
#:use-module (gnu packages maths)
#:use-module (gnu packages mcrypt)
#:use-module (gnu packages perl)
@@ -73,6 +76,7 @@
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
#:use-module (guix build-system cmake)
+ #:use-module (guix build-system meson)
#:use-module (guix build-system python)
#:use-module (guix build-system r)
#:use-module (guix build-system scons)
@@ -1566,3 +1570,29 @@ identical visual appearance.")
(description
"Jp2a is a small utility that converts JPEG images to ASCII.")
(license license:gpl2)))
+
+(define-public grim
+ (package
+ (name "grim")
+ (version "1.0")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/emersion/grim/archive/v" version
+ ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32 "0xkk5nqyp1px0sxz4asmchznc0q39wdx1b67ql741k8aj815km0f"))))
+ (build-system meson-build-system)
+ (native-inputs `(("pkg-config" ,pkg-config)))
+ (inputs `(("cairo" ,cairo)
+ ("libjpeg-turbo" ,libjpeg-turbo)
+ ("scdoc" ,scdoc)
+ ("wayland" ,wayland)
+ ("wayland-protocols" ,wayland-protocols)))
+ (home-page "https://github.com/emersion/grim")
+ (synopsis "Grab images from a Wayland compositor")
+ (description "grim can grab images from a Wayland compositor.")
+ ;; MIT license.
+ (license (license:x11-style
+"https://raw.githubusercontent.com/emersion/grim/master/LICENSE"))))
--
2.20.1
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#33800] [PATCH] gnu: Add grim.
2018-12-19 9:38 [bug#33800] [PATCH] gnu: Add grim Rutger Helling
@ 2018-12-19 21:40 ` Ludovic Courtès
2018-12-20 8:03 ` bug#33800: " Rutger Helling
0 siblings, 1 reply; 3+ messages in thread
From: Ludovic Courtès @ 2018-12-19 21:40 UTC (permalink / raw)
To: Rutger Helling; +Cc: 33800
Hi,
Rutger Helling <rhelling@mykolab.com> skribis:
> From a55c2fedeca18627e8f0aa23efc0c78e846e40ee Mon Sep 17 00:00:00 2001
> From: Rutger Helling <rhelling@mykolab.com>
> Date: Wed, 19 Dec 2018 10:27:28 +0100
> Subject: [PATCH 1/2] gnu: Add scdoc.
>
> * gnu/packages/man.scm (scdoc): New variable.
[...]
> + (home-page "https://git.sr.ht/~sircmpwn/scdoc")
> + (synopsis "Simple man page generator")
> + (description "scdoc is a simple man page generator written for POSIX systems
> +written in C99.")
s/written in C99/in C99/
> + ;; MIT license, see /share/doc/scdoc-1.6.0/COPYING.
> + (license (x11-style "file://COPYING"))))
Should be ‘license:expat’.
> From 793ae79c8bbd68b981f4c4b94b43784011776ede Mon Sep 17 00:00:00 2001
> From: Rutger Helling <rhelling@mykolab.com>
> Date: Wed, 19 Dec 2018 10:31:50 +0100
> Subject: [PATCH 2/2] gnu: Add grim.
>
> * gnu/packages/image.scm (grim): New variable.
[...]
> +(define-public grim
> + (package
> + (name "grim")
> + (version "1.0")
> + (source
> + (origin
> + (method url-fetch)
> + (uri (string-append "https://github.com/emersion/grim/archive/v" version
> + ".tar.gz"))
> + (file-name (string-append name "-" version ".tar.gz"))
> + (sha256
> + (base32 "0xkk5nqyp1px0sxz4asmchznc0q39wdx1b67ql741k8aj815km0f"))))
> + (build-system meson-build-system)
> + (native-inputs `(("pkg-config" ,pkg-config)))
> + (inputs `(("cairo" ,cairo)
> + ("libjpeg-turbo" ,libjpeg-turbo)
> + ("scdoc" ,scdoc)
> + ("wayland" ,wayland)
> + ("wayland-protocols" ,wayland-protocols)))
> + (home-page "https://github.com/emersion/grim")
> + (synopsis "Grab images from a Wayland compositor")
> + (description "grim can grab images from a Wayland compositor.")
s/grab images/create screenshots/ ? That would make it easier to find
via ‘guix package -s’. :-)
> + ;; MIT license.
> + (license (license:x11-style
> +"https://raw.githubusercontent.com/emersion/grim/master/LICENSE"))))
‘license:expat’ as well, AFAICS:
https://directory.fsf.org/wiki/License:Expat
OK with these changes, thanks!
Ludo’.
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#33800: [PATCH] gnu: Add grim.
2018-12-19 21:40 ` Ludovic Courtès
@ 2018-12-20 8:03 ` Rutger Helling
0 siblings, 0 replies; 3+ messages in thread
From: Rutger Helling @ 2018-12-20 8:03 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 33800-done
[-- Attachment #1: Type: text/plain, Size: 2624 bytes --]
Pushed as e2dd54c09035aadce8a363c3b1faf703f025d62d and
0290f533cc879239f275e45a704334c545f77f3a with your changes, thanks for
the review!
On Wed, 19 Dec 2018 22:40:48 +0100
Ludovic Courtès <ludo@gnu.org> wrote:
> Hi,
>
> Rutger Helling <rhelling@mykolab.com> skribis:
>
> > From a55c2fedeca18627e8f0aa23efc0c78e846e40ee Mon Sep 17 00:00:00
> > 2001 From: Rutger Helling <rhelling@mykolab.com>
> > Date: Wed, 19 Dec 2018 10:27:28 +0100
> > Subject: [PATCH 1/2] gnu: Add scdoc.
> >
> > * gnu/packages/man.scm (scdoc): New variable.
>
> [...]
>
> > + (home-page "https://git.sr.ht/~sircmpwn/scdoc")
> > + (synopsis "Simple man page generator")
> > + (description "scdoc is a simple man page generator written for
> > POSIX systems +written in C99.")
>
> s/written in C99/in C99/
>
> > + ;; MIT license, see /share/doc/scdoc-1.6.0/COPYING.
> > + (license (x11-style "file://COPYING"))))
>
> Should be ‘license:expat’.
>
> > From 793ae79c8bbd68b981f4c4b94b43784011776ede Mon Sep 17 00:00:00
> > 2001 From: Rutger Helling <rhelling@mykolab.com>
> > Date: Wed, 19 Dec 2018 10:31:50 +0100
> > Subject: [PATCH 2/2] gnu: Add grim.
> >
> > * gnu/packages/image.scm (grim): New variable.
>
> [...]
>
> > +(define-public grim
> > + (package
> > + (name "grim")
> > + (version "1.0")
> > + (source
> > + (origin
> > + (method url-fetch)
> > + (uri (string-append
> > "https://github.com/emersion/grim/archive/v" version
> > + ".tar.gz"))
> > + (file-name (string-append name "-" version ".tar.gz"))
> > + (sha256
> > + (base32
> > "0xkk5nqyp1px0sxz4asmchznc0q39wdx1b67ql741k8aj815km0f"))))
> > + (build-system meson-build-system)
> > + (native-inputs `(("pkg-config" ,pkg-config)))
> > + (inputs `(("cairo" ,cairo)
> > + ("libjpeg-turbo" ,libjpeg-turbo)
> > + ("scdoc" ,scdoc)
> > + ("wayland" ,wayland)
> > + ("wayland-protocols" ,wayland-protocols)))
> > + (home-page "https://github.com/emersion/grim")
> > + (synopsis "Grab images from a Wayland compositor")
> > + (description "grim can grab images from a Wayland compositor.")
>
> s/grab images/create screenshots/ ? That would make it easier to find
> via ‘guix package -s’. :-)
>
> > + ;; MIT license.
> > + (license (license:x11-style
> > +"https://raw.githubusercontent.com/emersion/grim/master/LICENSE"))))
>
> ‘license:expat’ as well, AFAICS:
>
> https://directory.fsf.org/wiki/License:Expat
>
> OK with these changes, thanks!
>
> Ludo’.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-12-20 8:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-19 9:38 [bug#33800] [PATCH] gnu: Add grim Rutger Helling
2018-12-19 21:40 ` Ludovic Courtès
2018-12-20 8:03 ` bug#33800: " Rutger Helling
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.