unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
* [PATCH 3/3] gnu: Add scrot.
@ 2014-09-25  8:54 Alex Kost
  2014-09-25 13:02 ` Ludovic Courtès
  0 siblings, 1 reply; 6+ messages in thread
From: Alex Kost @ 2014-09-25  8:54 UTC (permalink / raw)
  To: guix-devel

[-- Attachment #1: Type: text/plain, Size: 58 bytes --]

COPYING for "scrot" is the same as the one for "giblib".


[-- Attachment #2: 0003-gnu-Add-scrot.patch --]
[-- Type: text/x-diff, Size: 3782 bytes --]

From 05a31c091d49d83fe25565a231396279a39f85a9 Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Thu, 25 Sep 2014 12:31:46 +0400
Subject: [PATCH 3/3] gnu: Add scrot.

* gnu/packages/scrot.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
---
 gnu-system.am          |  1 +
 gnu/packages/scrot.scm | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 gnu/packages/scrot.scm

diff --git a/gnu-system.am b/gnu-system.am
index 5b4ece1..9d4ba6a 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -220,6 +220,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/samba.scm			\
   gnu/packages/scheme.scm			\
   gnu/packages/screen.scm			\
+  gnu/packages/scrot.scm			\
   gnu/packages/sdl.scm				\
   gnu/packages/search.scm			\
   gnu/packages/serveez.scm			\
diff --git a/gnu/packages/scrot.scm b/gnu/packages/scrot.scm
new file mode 100644
index 0000000..df70045
--- /dev/null
+++ b/gnu/packages/scrot.scm
@@ -0,0 +1,66 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Alex Kost <alezost@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages scrot)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix licenses)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages giblib))
+
+(define-public scrot
+  (package
+    (name "scrot")
+    (version "0.8")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://linuxbrit.co.uk/downloads/scrot-"
+                    version ".tar.gz"))
+              (sha256
+               (base32
+                "1wll744rhb49lvr2zs6m93rdmiq59zm344jzqvijrdn24ksiqgb1"))))
+    (build-system gnu-build-system)
+    (arguments
+     ;; By default, man and doc are put in PREFIX/{man,doc} instead of
+     ;; PREFIX/share/{man,doc}.
+     '(#:configure-flags
+       (list (string-append "--mandir="
+                            (assoc-ref %outputs "out")
+                            "/share/man"))
+       #:phases (alist-replace
+                 'install
+                 (lambda* (#:key inputs outputs #:allow-other-keys)
+                   (let* ((out (assoc-ref outputs "out"))
+                          (doc (string-append out "/share/doc/scrot")))
+                     (mkdir-p doc)
+                     (zero?
+                      (system* "make" "install"
+                               (string-append "docsdir=" doc)))))
+                 %standard-phases)))
+    (inputs
+     `(("libx11" ,libx11)
+       ("giblib" ,giblib)))
+    (home-page "http://linuxbrit.co.uk/software/")
+    (synopsis "Command-line screen capture utility")
+    (description
+     "scrot allows to save a screenshot of a full screen, a window or a part
+of the screen selected by mouse.")
+    (license (bsd-style "file://COPYING"
+                        "See COPYING in the distribution."))))
-- 
2.1.0


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH 3/3] gnu: Add scrot.
  2014-09-25  8:54 [PATCH 3/3] gnu: Add scrot Alex Kost
@ 2014-09-25 13:02 ` Ludovic Courtès
  2014-09-25 13:16   ` Andreas Enge
  2014-09-25 17:37   ` Alex Kost
  0 siblings, 2 replies; 6+ messages in thread
From: Ludovic Courtès @ 2014-09-25 13:02 UTC (permalink / raw)
  To: Alex Kost; +Cc: guix-devel

Alex Kost <alezost@gmail.com> skribis:

> From 05a31c091d49d83fe25565a231396279a39f85a9 Mon Sep 17 00:00:00 2001
> From: Alex Kost <alezost@gmail.com>
> Date: Thu, 25 Sep 2014 12:31:46 +0400
> Subject: [PATCH 3/3] gnu: Add scrot.
>
> * gnu/packages/scrot.scm: New file.
> * gnu-system.am (GNU_SYSTEM_MODULES): Add it.

LGTM, with x11-style as the license.

> +    (description
> +     "scrot allows to save a screenshot of a full screen, a window or a part
> +of the screen selected by mouse.")

Perhaps mention that it’s for X11?

Could maybe go to xorg.scm, Andreas?

Ludo’.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 3/3] gnu: Add scrot.
  2014-09-25 13:02 ` Ludovic Courtès
@ 2014-09-25 13:16   ` Andreas Enge
  2014-09-25 13:34     ` Ludovic Courtès
  2014-09-25 17:37   ` Alex Kost
  1 sibling, 1 reply; 6+ messages in thread
From: Andreas Enge @ 2014-09-25 13:16 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: guix-devel, Alex Kost

On Thu, Sep 25, 2014 at 03:02:29PM +0200, Ludovic Courtès wrote:
> Could maybe go to xorg.scm, Andreas?

I would prefer to have only the x.org files in xorg.scm, plus a few of its
inputs; there are already a lot of packages in the module, and I think it
will make upgrading easier if there are no extraneous packages.

Andreas

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 3/3] gnu: Add scrot.
  2014-09-25 13:16   ` Andreas Enge
@ 2014-09-25 13:34     ` Ludovic Courtès
  0 siblings, 0 replies; 6+ messages in thread
From: Ludovic Courtès @ 2014-09-25 13:34 UTC (permalink / raw)
  To: Andreas Enge; +Cc: guix-devel, Alex Kost

Andreas Enge <andreas@enge.fr> skribis:

> On Thu, Sep 25, 2014 at 03:02:29PM +0200, Ludovic Courtès wrote:
>> Could maybe go to xorg.scm, Andreas?
>
> I would prefer to have only the x.org files in xorg.scm, plus a few of its
> inputs; there are already a lot of packages in the module, and I think it
> will make upgrading easier if there are no extraneous packages.

Makes sense, so scrot.scm is OK.

Ludo’.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 3/3] gnu: Add scrot.
  2014-09-25 13:02 ` Ludovic Courtès
  2014-09-25 13:16   ` Andreas Enge
@ 2014-09-25 17:37   ` Alex Kost
  2014-09-25 19:02     ` Ludovic Courtès
  1 sibling, 1 reply; 6+ messages in thread
From: Alex Kost @ 2014-09-25 17:37 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: guix-devel

[-- Attachment #1: Type: text/plain, Size: 670 bytes --]

Ludovic Courtès (2014-09-25 17:02 +0400) wrote:

> Alex Kost <alezost@gmail.com> skribis:
>
>> From 05a31c091d49d83fe25565a231396279a39f85a9 Mon Sep 17 00:00:00 2001
>> From: Alex Kost <alezost@gmail.com>
>> Date: Thu, 25 Sep 2014 12:31:46 +0400
>> Subject: [PATCH 3/3] gnu: Add scrot.
>>
>> * gnu/packages/scrot.scm: New file.
>> * gnu-system.am (GNU_SYSTEM_MODULES): Add it.
>
> LGTM, with x11-style as the license.
>
>> +    (description
>> +     "scrot allows to save a screenshot of a full screen, a window or a part
>> +of the screen selected by mouse.")
>
> Perhaps mention that it’s for X11?

I mentioned it in the synopsis.  Is it OK?


[-- Attachment #2: 0003-gnu-Add-scrot.patch --]
[-- Type: text/x-diff, Size: 3901 bytes --]

From 59d3a0bf8182b61cca199fd0acca25870f060060 Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Thu, 25 Sep 2014 12:31:46 +0400
Subject: [PATCH 3/3] gnu: Add scrot.

* gnu/packages/scrot.scm: New file.
* gnu-system.am (GNU_SYSTEM_MODULES): Add it.
---
 gnu-system.am          |  1 +
 gnu/packages/scrot.scm | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100644 gnu/packages/scrot.scm

diff --git a/gnu-system.am b/gnu-system.am
index 7d6a6b9..e774f50 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -218,6 +218,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/samba.scm			\
   gnu/packages/scheme.scm			\
   gnu/packages/screen.scm			\
+  gnu/packages/scrot.scm			\
   gnu/packages/sdl.scm				\
   gnu/packages/search.scm			\
   gnu/packages/serveez.scm			\
diff --git a/gnu/packages/scrot.scm b/gnu/packages/scrot.scm
new file mode 100644
index 0000000..a5bbe18
--- /dev/null
+++ b/gnu/packages/scrot.scm
@@ -0,0 +1,68 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Alex Kost <alezost@gmail.com>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages scrot)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix licenses)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages image))
+
+(define-public scrot
+  (package
+    (name "scrot")
+    (version "0.8")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://linuxbrit.co.uk/downloads/scrot-"
+                    version ".tar.gz"))
+              (sha256
+               (base32
+                "1wll744rhb49lvr2zs6m93rdmiq59zm344jzqvijrdn24ksiqgb1"))))
+    (build-system gnu-build-system)
+    (arguments
+     ;; By default, man and doc are put in PREFIX/{man,doc} instead of
+     ;; PREFIX/share/{man,doc}.
+     '(#:configure-flags
+       (list (string-append "--mandir="
+                            (assoc-ref %outputs "out")
+                            "/share/man"))
+       #:phases (alist-replace
+                 'install
+                 (lambda* (#:key inputs outputs #:allow-other-keys)
+                   (let* ((out (assoc-ref outputs "out"))
+                          (doc (string-append out "/share/doc/scrot")))
+                     (mkdir-p doc)
+                     (zero?
+                      (system* "make" "install"
+                               (string-append "docsdir=" doc)))))
+                 %standard-phases)))
+    (inputs
+     `(("libx11" ,libx11)
+       ("giblib" ,giblib)))
+    (home-page "http://linuxbrit.co.uk/software/")
+    (synopsis "Command-line screen capture utility for X Window System")
+    (description
+     "scrot allows to save a screenshot of a full screen, a window or a part
+of the screen selected by mouse.")
+    ;; This license removes a clause about X Consortium from the original
+    ;; X11 license.
+    (license (x11-style "file://COPYING"
+                        "See 'COPYING' in the distribution."))))
-- 
2.1.0


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH 3/3] gnu: Add scrot.
  2014-09-25 17:37   ` Alex Kost
@ 2014-09-25 19:02     ` Ludovic Courtès
  0 siblings, 0 replies; 6+ messages in thread
From: Ludovic Courtès @ 2014-09-25 19:02 UTC (permalink / raw)
  To: Alex Kost; +Cc: guix-devel

Alex Kost <alezost@gmail.com> skribis:

> From 59d3a0bf8182b61cca199fd0acca25870f060060 Mon Sep 17 00:00:00 2001
> From: Alex Kost <alezost@gmail.com>
> Date: Thu, 25 Sep 2014 12:31:46 +0400
> Subject: [PATCH 3/3] gnu: Add scrot.
>
> * gnu/packages/scrot.scm: New file.
> * gnu-system.am (GNU_SYSTEM_MODULES): Add it.

OK, please push!

Ludo’.

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2014-09-25 19:03 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-25  8:54 [PATCH 3/3] gnu: Add scrot Alex Kost
2014-09-25 13:02 ` Ludovic Courtès
2014-09-25 13:16   ` Andreas Enge
2014-09-25 13:34     ` Ludovic Courtès
2014-09-25 17:37   ` Alex Kost
2014-09-25 19:02     ` Ludovic Courtès

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).