From patchwork Wed Dec 19 09:38:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Rutger Helling X-Patchwork-Id: 487 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 77F5E16932; Wed, 19 Dec 2018 09:40:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTP id ACF2D168F9 for ; Wed, 19 Dec 2018 09:40:12 +0000 (GMT) Received: from localhost ([::1]:58499 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZYKq-0002oT-6o for patchwork@mira.cbaines.net; Wed, 19 Dec 2018 04:40:12 -0500 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 X-Loop: help-debbugs@gnu.org Subject: [bug#33800] [PATCH] gnu: Add grim. Resent-From: Rutger Helling Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 19 Dec 2018 09:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 33800 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33800@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.154521237213105 (code B ref -1); Wed, 19 Dec 2018 09:40:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Dec 2018 09:39:32 +0000 Received: from localhost ([127.0.0.1]:53986 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gZYK4-0003PC-GH for submit@debbugs.gnu.org; Wed, 19 Dec 2018 04:39:31 -0500 Received: from eggs.gnu.org ([208.118.235.92]:40272) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gZYJz-0003Ov-Qa for submit@debbugs.gnu.org; Wed, 19 Dec 2018 04:39:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gZYJt-0001S4-43 for submit@debbugs.gnu.org; Wed, 19 Dec 2018 04:39:14 -0500 Received: from lists.gnu.org ([2001:4830:134:3::11]:54081) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gZYJs-0001Ru-TB for submit@debbugs.gnu.org; Wed, 19 Dec 2018 04:39:12 -0500 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mykolab.com; h= content-type:content-type:mime-version:message-id:subject :subject:from:from:date:date:received:received:received; s= dkim20160331; t=1545212342; x=1547026743; bh=XDt2txf5KYcAc92upv3 vNAETbtDbWkDhr2X2LvYRkIA=; b=EFCjV6/RsTA9b/O83jKi2Niwb7vYDQ8ObDb mMKMAiNyhy0Uz0phGCk9ASApbRg8dw7EeobdIyiJ2Gq6Cj3mT0BnirZ1RxSL+q3M HhUgAOZNrZRmUJugQtzdpvhLdDi2nF/Q3JTHXJIIIQBQgT3ZfrwIbRI8mEaFXp9C dVbUWAbhtMSxGlruoYvqtDBxkQG5oaQlATjpexYzKF5Y5hn1vn3kP+DAtzvh/oXg 8SIBdFL5o5x50h5rlgl76U/aTFj2Usm9qSaDybL6+OQGWkP8+Fwldo1R/7X9LhcS GUsvfD7pBC1muEP8Kbs6jHbU03Pj9pCWC29QYuXd0Imhxc4yzRe1kS71HLVKVV+Z 33yeU/JbsRd0v60Gvx1e37y/ip/abURLOyxk8ZAbCI5sK8ZaC0Z4y1rO3+FEhzay lb6xYv+BSuG8tap/8jF5nq9NKzVnZQEMchFcMjwR276O/kbRS8no9l7aV+bko9bE aieePB3q5Vy1O9YAQAu3qZi1rQgdQzpBU/ttrfYSm97KGMN22SVwVLC17TBzloZx 4gx6zr2sEV3BJ0cA+JITaVzCccT05Q3VxAAJiBd2hXqhoilRdV3JEYofJQH0Q2tg PmP1rcSyPAsNJs9Zf8zf7DAOVp8wZc/HQ3X6IljegYkMih0PjgjSS+OVklXYg17S f1am/baU= X-Virus-Scanned: amavisd-new at mykolab.com 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 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hey Guix, these patches add grim. Basically scrot, but for Wayland instead of X11. 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. --- 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 ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Alex Vong +;;; Copyright © 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" 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