[PATCH 1/2] gnu: Add slop.

[PATCH 1/2] gnu: Add slop.

[Alex Kost]

* gnu/packages/xdisorg.scm (slop): New variable.
---
 gnu/packages/xdisorg.scm | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 5a77a6c..e6457de 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -2,7 +2,7 @@
 ;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
-;;; Copyright © 2014, 2015 Alex Kost <alezost@gmail.com>
+;;; Copyright © 2014, 2015, 2016 Alex Kost <alezost@gmail.com>
 ;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Mathieu Lirzin <mthl@openmailbox.org>
 ;;; Copyright © 2015 Alexander I.Grafov <grafov@gmail.com>
@@ -32,6 +32,7 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix utils)
+  #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system python)
@@ -41,6 +42,7 @@
   #:use-module (gnu packages image)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages gettext)
+  #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)               ;for libgudev
   #:use-module (gnu packages ncurses)
@@ -376,6 +378,38 @@ of the screen selected by mouse.")
     (license (license:x11-style "file://COPYING"
                                 "See 'COPYING' in the distribution."))))
 
+(define-public slop
+  (package
+    (name "slop")
+    (version "4.3.21")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/naelstrof/slop/archive/v"
+                    version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0z0p4a3p5mc6fjh5f8js9ppb0maxyvfxpiw2n6nqc5nim1kv6bim"))))
+    (build-system cmake-build-system)
+    (arguments '(#:tests? #f))  ; no check target
+    (inputs
+     `(("libx11" ,libx11)
+       ("libxrandr" ,libxrandr)
+       ("libxext" ,libxext)
+       ("imlib2" ,imlib2)
+       ("glew" ,glew)
+       ("mesa" ,mesa)))
+    (home-page "https://github.com/naelstrof/slop")
+    (synopsis "Select a region and print its bounds to stdout")
+    (description
+     "slop (Select Operation) is a tool that queries for a selection from a
+user and prints the region to stdout.  It grabs the mouse and turns it into a
+crosshair, lets the user click and drag to make a selection (or click on a
+window) while drawing a pretty box around it, then finally prints the
+selection's dimensions to stdout.")
+    (license license:gpl3+)))
+
 (define-public unclutter
   (package
     (name "unclutter")
-- 
2.7.3

[PATCH 2/2] gnu: Add maim.

[Alex Kost]

* gnu/packages/xdisorg.scm (maim): New variable.
---
 gnu/packages/xdisorg.scm | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index e6457de..93f838d 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -410,6 +410,48 @@ window) while drawing a pretty box around it, then finally prints the
 selection's dimensions to stdout.")
     (license license:gpl3+)))
 
+(define-public maim
+  (package
+    (name "maim")
+    (version "3.4.47")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/naelstrof/maim/archive/v"
+                    version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0kfp7k55bxc5h6h0wv8bwmsc5ny66h9ra2z4dzs4yzszq16544pv"))))
+    (build-system cmake-build-system)
+    (arguments
+     '(#:tests? #f              ; no check target
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-source
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((slop (string-append (assoc-ref inputs "slop")
+                                        "/bin/slop")))
+               ;; "slop" command is hardcoded in the source; replace it
+               ;; with the full file name.
+               (substitute* "src/main.cpp"
+                 (("^( +slopcommand.*)\"slop\"" all beg)
+                  (string-append beg "\"" slop "\"")))))))))
+    (inputs
+     `(("libx11" ,libx11)
+       ("libxrandr" ,libxrandr)
+       ("libxfixes" ,libxfixes)
+       ("imlib2" ,imlib2)
+       ("slop" ,slop)))
+    (home-page "https://github.com/naelstrof/maim")
+    (synopsis "Screenshot utility for X Window System")
+    (description
+     "maim (Make Image) is a tool that takes screenshots of your desktop and
+saves it in any format.  Along with a full screen, it allows you to capture a
+predefined region or a particular window.  Also, unlike other screenshot
+utilities, it makes it possible to include cursor to the result image.")
+    (license license:gpl3+)))
+
 (define-public unclutter
   (package
     (name "unclutter")
-- 
2.7.3

Re: [PATCH 2/2] gnu: Add maim.

[Eric Bavier]

On 2016-04-07 08:56, Alex Kost wrote:
> * gnu/packages/xdisorg.scm (maim): New variable.
> ---
>  gnu/packages/xdisorg.scm | 42 
> ++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 42 insertions(+)
> 
> diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
> index e6457de..93f838d 100644
> --- a/gnu/packages/xdisorg.scm
> +++ b/gnu/packages/xdisorg.scm
> @@ -410,6 +410,48 @@ window) while drawing a pretty box around it,
> then finally prints the
>  selection's dimensions to stdout.")
>      (license license:gpl3+)))
> 
> +(define-public maim
> +  (package
> +    (name "maim")
> +    (version "3.4.47")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append
> +                    "https://github.com/naelstrof/maim/archive/v"
> +                    version ".tar.gz"))
> +              (file-name (string-append name "-" version ".tar.gz"))
> +              (sha256
> +               (base32
> +                
> "0kfp7k55bxc5h6h0wv8bwmsc5ny66h9ra2z4dzs4yzszq16544pv"))))
> +    (build-system cmake-build-system)
> +    (arguments
> +     '(#:tests? #f              ; no check target
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-after 'unpack 'patch-source
> +           (lambda* (#:key inputs #:allow-other-keys)
> +             (let ((slop (string-append (assoc-ref inputs "slop")
> +                                        "/bin/slop")))
> +               ;; "slop" command is hardcoded in the source; replace 
> it
> +               ;; with the full file name.
> +               (substitute* "src/main.cpp"
> +                 (("^( +slopcommand.*)\"slop\"" all beg)
> +                  (string-append beg "\"" slop "\"")))))))))

Instead of "beg", could we use something like "front" to avoid 
potentially confusing abbreviations.

Otherwise LGTM.

-- 
`~Eric

Re: [PATCH 2/2] gnu: Add maim.

[Alex Kost]

Eric Bavier (2016-04-07 17:48 +0300) wrote:

> On 2016-04-07 08:56, Alex Kost wrote:
[...]
>> +               (substitute* "src/main.cpp"
>> +                 (("^( +slopcommand.*)\"slop\"" all beg)
>> +                  (string-append beg "\"" slop "\"")))))))))
>
> Instead of "beg", could we use something like "front" to avoid
> potentially confusing abbreviations.

Sure, I don't have a preference here.

> Otherwise LGTM.

Thanks!

-- 
Alex

Re: [PATCH 2/2] gnu: Add maim.

[Tobias Geerinckx-Rice]

[Sigh. Re-sent since I still can't Thunderbird good.]

Hullo Alex,

On 07/04/16 15:56, Alex Kost wrote:
> [...] Also, unlike other screenshot
> +utilities[...]

A strange claim even if it were true. Even the basic GNOME Screenshot
tool has an ‘include pointer’ option.

> [...], it makes it possible to include cursor to the result image.")

I'd say "include the cursor in" in any case.

Kind regards,

T G-R

Re: [PATCH 2/2] gnu: Add maim.

[Alex Kost]

Tobias Geerinckx-Rice (2016-04-07 21:00 +0300) wrote:

> [Sigh. Re-sent since I still can't Thunderbird good.]
>
> Hullo Alex,
>
> On 07/04/16 15:56, Alex Kost wrote:
>> [...] Also, unlike other screenshot
>> +utilities[...]
>
> A strange claim even if it were true. Even the basic GNOME Screenshot
> tool has an ‘include pointer’ option.

Indeed, I'll fix it, thanks!

>> [...], it makes it possible to include cursor to the result image.")
>
> I'd say "include the cursor in" in any case.

Sorry, I didn't get it: do you mean it should be "in the result image"
instead of "to the result image"?

-- 
Alex

Re: [PATCH 2/2] gnu: Add maim.

[Tobias Geerinckx-Rice]

Alex,

On 07/04/16 22:27, Alex Kost wrote:
> Tobias Geerinckx-Rice (2016-04-07 21:00 +0300) wrote:
>>> [...], it makes it possible to include cursor to the result image.")
>>
>> I'd say "include the cursor in" in any case.
> 
> Sorry, I didn't get it: do you mean it should be "in the result image"
> instead of "to the result image"?

Yep. ‘In the resulting image’, to be entirely pedantic.

Kind regards,

T G-R

Re: [PATCH 2/2] gnu: Add maim.

[Alex Kost]

Tobias Geerinckx-Rice (2016-04-08 00:34 +0300) wrote:

> Alex,
>
> On 07/04/16 22:27, Alex Kost wrote:
>> Tobias Geerinckx-Rice (2016-04-07 21:00 +0300) wrote:
>>>> [...], it makes it possible to include cursor to the result image.")
>>>
>>> I'd say "include the cursor in" in any case.
>>
>> Sorry, I didn't get it: do you mean it should be "in the result image"
>> instead of "to the result image"?
>
> Yep. ‘In the resulting image’, to be entirely pedantic.

Fixed, thanks!

-- 
Alex