From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37425) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZtKN-00037m-AE for guix-patches@gnu.org; Thu, 20 Dec 2018 03:05:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gZtKJ-0002U8-5v for guix-patches@gnu.org; Thu, 20 Dec 2018 03:05:07 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:51139) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gZtKJ-0002Tk-12 for guix-patches@gnu.org; Thu, 20 Dec 2018 03:05:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gZtKI-00063g-Pb for guix-patches@gnu.org; Thu, 20 Dec 2018 03:05:02 -0500 Subject: bug#33800: [PATCH] gnu: Add grim. Resent-To: guix-patches@gnu.org Resent-Message-ID: Date: Thu, 20 Dec 2018 09:03:50 +0100 From: Rutger Helling Message-ID: <20181220090350.6c2baca6@mykolab.com> In-Reply-To: <87k1k5tctb.fsf@gnu.org> References: <20181219103851.7cbbd4f2@mykolab.com> <87k1k5tctb.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/.s5HjklkdEn_ymzSRd_vunk"; 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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 33800-done@debbugs.gnu.org --Sig_/.s5HjklkdEn_ymzSRd_vunk Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Pushed as e2dd54c09035aadce8a363c3b1faf703f025d62d and 0290f533cc879239f275e45a704334c545f77f3a with your changes, thanks for the review! On Wed, 19 Dec 2018 22:40:48 +0100 Ludovic Court=C3=A8s wrote: > Hi, >=20 > Rutger Helling skribis: >=20 > > From 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. =20 >=20 > [...] >=20 > > + (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.") =20 >=20 > s/written in C99/in C99/ >=20 > > + ;; MIT license, see /share/doc/scdoc-1.6.0/COPYING. > > + (license (x11-style "file://COPYING")))) =20 >=20 > Should be =E2=80=98license:expat=E2=80=99. >=20 > > From 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. =20 >=20 > [...] >=20 > > +(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.") =20 >=20 > s/grab images/create screenshots/ ? That would make it easier to find > via =E2=80=98guix package -s=E2=80=99. :-) >=20 > > + ;; MIT license. > > + (license (license:x11-style > > +"https://raw.githubusercontent.com/emersion/grim/master/LICENSE")))) = =20 >=20 > =E2=80=98license:expat=E2=80=99 as well, AFAICS: >=20 > https://directory.fsf.org/wiki/License:Expat >=20 > OK with these changes, thanks! >=20 > Ludo=E2=80=99. --Sig_/.s5HjklkdEn_ymzSRd_vunk Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEAVThuRzJ2e93ZI3n86cn20T8yjYFAlwbTOYACgkQ86cn20T8 yjbckAf8CJBkdIEn172fw4Xwa5lOTDf13ZQk066V0mLmn5TDGNtqKmoMddlyOCV5 yFt52jtMFWCkHAgUiQE764oz5uhQOFn5MO0Y49AP8OcjdD9IbeEAiJSCo/727ipC PhFbnZUvDxST9as8JUtlhCLp3/bKKFDR4ncLIDH16MjFbuZFk/wnrQYsqmjoj102 glMHyubCx9RwYrkLK6rHlkGQcrmsvkanOQ0D4O1deYQeI8mOviEFy0yIQ6tm+wAd irdNdrFFF4JqPXQulFFuM4qjEnCDcLB8grI1LKJmHYJm+8WV7sMpTymjmDQCfF9T qdmbr1lhntAspGOG6PeFbHZV3Y3s5A== =tTVj -----END PGP SIGNATURE----- --Sig_/.s5HjklkdEn_ymzSRd_vunk--