From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50081) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZYKk-0002oJ-8D for guix-patches@gnu.org; Wed, 19 Dec 2018 04:40:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gZYKg-0002Bo-Vo for guix-patches@gnu.org; Wed, 19 Dec 2018 04:40:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:49728) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gZYKg-0002Aw-Qu for guix-patches@gnu.org; Wed, 19 Dec 2018 04:40:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gZYKg-0003QB-JO for guix-patches@gnu.org; Wed, 19 Dec 2018 04:40:02 -0500 Subject: [bug#33800] [PATCH] gnu: Add grim. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:49855) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZYJr-0002iV-H5 for guix-patches@gnu.org; Wed, 19 Dec 2018 04:39:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gZYJo-0001Pz-0I for guix-patches@gnu.org; Wed, 19 Dec 2018 04:39:11 -0500 Received: from mx.kolabnow.com ([95.128.36.42]:10512) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZYJm-0001PT-GF for guix-patches@gnu.org; Wed, 19 Dec 2018 04:39:07 -0500 Received: from localhost (unknown [127.0.0.1]) by ext-mx-out002.mykolab.com (Postfix) with ESMTP id 3E4EF9F6 for ; Wed, 19 Dec 2018 10:39:04 +0100 (CET) Received: from mx.kolabnow.com ([127.0.0.1]) by localhost (ext-mx-out002.mykolab.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HWGDjHnXrtLo for ; Wed, 19 Dec 2018 10:39:02 +0100 (CET) Received: from int-mx001.mykolab.com (unknown [10.9.13.1]) by ext-mx-out002.mykolab.com (Postfix) with ESMTPS id A19FA98E for ; Wed, 19 Dec 2018 10:39:02 +0100 (CET) Received: from ext-subm003.mykolab.com (unknown [10.9.6.3]) by int-mx001.mykolab.com (Postfix) with ESMTPS id 842151BB for ; Wed, 19 Dec 2018 10:39:02 +0100 (CET) Date: Wed, 19 Dec 2018 10:38:51 +0100 From: Rutger Helling Message-ID: <20181219103851.7cbbd4f2@mykolab.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/zg3b+ftVo8H6scwNMHZuP=0"; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 33800@debbugs.gnu.org --Sig_/zg3b+ftVo8H6scwNMHZuP=0 Content-Type: multipart/mixed; boundary="MP_/dSTz6vRg=BeNZQf+IIwVu.n" --MP_/dSTz6vRg=BeNZQf+IIwVu.n Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hey Guix, these patches add grim. Basically scrot, but for Wayland instead of X11. --MP_/dSTz6vRg=BeNZQf+IIwVu.n Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-gnu-Add-scdoc.patch =46rom a55c2fedeca18627e8f0aa23efc0c78e846e40ee Mon Sep 17 00:00:00 2001 From: Rutger Helling 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 =C2=A9 2015 Alex Kost ;;; Copyright =C2=A9 2015, 2016 Efraim Flashner ;;; Copyright =C2=A9 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright =C2=A9 2018 Rutger Helling ;;; ;;; This file is part of GNU Guix. ;;; @@ -228,6 +229,37 @@ automatically.") (base32 "1p5830h88cx0zn0snwaj0vpph81xicpsirfwlxmcgjrlmn0nm3sj"))))= )) =20 +(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/" ve= rsion + ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ca3js4arkg28gg2iszxxyrq7kgsrz482d1szv5dfd471h3vr5m3")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags '("CC=3Dgcc") + #: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 sy= stems +written in C99.") + ;; MIT license, see /share/doc/scdoc-1.6.0/COPYING. + (license (x11-style "file://COPYING")))) + (define-public txt2man (package (name "txt2man") --=20 2.20.1 --MP_/dSTz6vRg=BeNZQf+IIwVu.n Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0002-gnu-Add-grim.patch =46rom 793ae79c8bbd68b981f4c4b94b43784011776ede Mon Sep 17 00:00:00 2001 From: Rutger Helling 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 =C2=A9 2018 Marius Bakke ;;; Copyright =C2=A9 2018 Pierre-Antoine Rouby ;;; Copyright =C2=A9 2018 Alex Vong +;;; Copyright =C2=A9 2018 Rutger Helling ;;; ;;; 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 . #: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" versi= on + ".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")))) --=20 2.20.1 --MP_/dSTz6vRg=BeNZQf+IIwVu.n-- --Sig_/zg3b+ftVo8H6scwNMHZuP=0 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEAVThuRzJ2e93ZI3n86cn20T8yjYFAlwaEasACgkQ86cn20T8 yjYayQf9HUnJ/XX/pWwiEmTGt7JwGybj9kQobqCiw1jaur2eOZEGvO6luHdkRf6F RUNOAXKLdujXD4t3KKmor6t+67UwAS+JeXngkT/YsTQmeFTylJ0cZqevPmjxuHVo 1VgtoHAWb9pAgoKh+aZWL7v5rhWVJOuASSTnCISZpdzP81s4SCUa/VJoZktxXQXu aK7FILJwx6UXpY+4H8ng6L49XrusbaDhg7qidf6nkKax079MdRNdHL+r8ITdInuD LtQd7Pj6M2SptJNAu4m8c2eIhl75D5KSWPgK12iUZq9IqHOOvBDsT5du56Vth1oM +hm1x9pUcAOeHnNa97nxyFjmQ+9d3g== =FFe7 -----END PGP SIGNATURE----- --Sig_/zg3b+ftVo8H6scwNMHZuP=0--