Re: [PATCH 02/04] gnu: xdotools: Update to 3.20150503.1

2016-02-06 Thread Christopher Allan Webber 
Leo Famulari writes:

> On Sat, Feb 06, 2016 at 11:48:13AM -0800, Christopher Allan Webber wrote:
>> Leo Famulari writes:
>> > On Fri, Feb 05, 2016 at 07:48:12PM -0800, Christopher Allan Webber wrote:
>> > Is this line too long? I can't say for sure looking at the patch in my
>> > email client. If so, the linter should complain.
>> >
>> > [...]
>> 
>> You're right.  I should be using the linter but I was slacking off I
>> guess... sorry!
>
> The linter is our friend and we should visit him or her often :)

I agree.  I'll try to be more familiar with our linter friend more often!

> I do wonder about the tests... if the required "black magic" is having
> an X server available, we do have some examples of that in the package
> tree. Otherwise it might be good to explain a little more so that it's
> easier for future contributors to understand what the problem is.
>
> Otherwise LGTM.

Ah well... I didn't write this part about the tests!  And I don't know
the context.  I mostly just patched things up for the new version.

Anyway, since you say "LGTM", I'm going to merge this one.

Re: [PATCH 02/04] gnu: xdotools: Update to 3.20150503.1

2016-02-06 Thread Christopher Allan Webber 
Leo Famulari writes:

> On Fri, Feb 05, 2016 at 07:48:12PM -0800, Christopher Allan Webber wrote:
>> From fa531a1f2a6d84232d9c94feb5b3136cd11f83b5 Mon Sep 17 00:00:00 2001
>> From: Christopher Allan Webber 
>> Date: Fri, 5 Feb 2016 15:24:01 -0800
>> Subject: [PATCH 2/4] gnu: xdotools: Update to 3.20150503.1
>> 
>> * gnu/packages/xdisorg.scm (xdotools): Upgrade to 3.20150503.1.
>> * gnu/packages/patches/xdotool-fix-makefile.patch: New file.
>
> Please add the patch to gnu-system.am (dist_patch_DATA).
>
> [...]

Ah right.  Done!

>>  (method url-fetch)
>>  (uri (string-append
>> -  "http://semicomplete.googlecode.com/files/; name "-"
>> -  version ".tar.gz"))
>> +  "https://github.com/jordansissel/xdotool/releases/download/v; 
>> version
>
> Is this line too long? I can't say for sure looking at the patch in my
> email client. If so, the linter should complain.
>
> [...]

You're right.  I should be using the linter but I was slacking off I
guess... sorry!

New version attached.
 - Chris

>From 5a61858e92625b905b904f57c1efe7f7e23823e5 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber 
Date: Fri, 5 Feb 2016 15:24:01 -0800
Subject: [PATCH 1/3] gnu: xdotools: Update to 3.20150503.1

* gnu/packages/xdisorg.scm (xdotools): Upgrade to 3.20150503.1.
* gnu/packages/patches/xdotool-fix-makefile.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
---
 gnu-system.am   |  1 +
 gnu/packages/patches/xdotool-fix-makefile.patch | 16 
 gnu/packages/xdisorg.scm| 14 +-
 3 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 gnu/packages/patches/xdotool-fix-makefile.patch

diff --git a/gnu-system.am b/gnu-system.am
index 95150b6..4d32e59 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -754,6 +754,7 @@ dist_patch_DATA =		\
   gnu/packages/patches/wpa-supplicant-CVE-2015-5314.patch	\
   gnu/packages/patches/wpa-supplicant-CVE-2015-5315.patch	\
   gnu/packages/patches/wpa-supplicant-CVE-2015-5316.patch	\
+  gnu/packages/patches/xdotool-fix-makefile.patch   \
   gnu/packages/patches/xf86-video-ark-remove-mibstore.patch	\
   gnu/packages/patches/xf86-video-ast-remove-mibstore.patch	\
   gnu/packages/patches/xf86-video-geode-glibc-2.20.patch	\
diff --git a/gnu/packages/patches/xdotool-fix-makefile.patch b/gnu/packages/patches/xdotool-fix-makefile.patch
new file mode 100644
index 000..5fed41f
--- /dev/null
+++ b/gnu/packages/patches/xdotool-fix-makefile.patch
@@ -0,0 +1,16 @@
+Fix Makefile, which missed including a necessary library for compiling in the
+0.5.0 release.
+
+See https://github.com/jordansissel/xdotool/pull/81 for more information.
+
+--- xdotool-3.20150503.1/Makefile	2014-10-20 13:05:34.0 -0700
 xdotool-3.20150503.1/Makefile	2016-02-05 14:44:18.652734272 -0800
+@@ -28,7 +28,7 @@
+ CFLAGS+=-g # TODO(sissel): Comment before release
+ CFLAGS+=$(CPPFLAGS)
+ 
+-DEFAULT_LIBS=-L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXtst -lXinerama
++DEFAULT_LIBS=-L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXtst -lXinerama -lxkbcommon
+ DEFAULT_INC=-I/usr/X11R6/include -I/usr/local/include
+ 
+ XDOTOOL_LIBS=$(shell pkg-config --libs x11 2> /dev/null || echo "$(DEFAULT_LIBS)")  $(shell sh platform.sh extralibs)
\ No newline at end of file
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index dc01637..5ca203e 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -9,6 +9,7 @@
 ;;; Copyright © 2015 Andy Wingo 
 ;;; Copyright © 2015 xd1le 
 ;;; Copyright © 2015 Florian Paul Schmidt 
+;;; Copyright © 2016 Christopher Allan Webber 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -48,6 +49,7 @@
   #:use-module (gnu packages guile)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages gtk)
+  #:use-module (gnu packages qt)
   #:use-module (gnu packages xorg))
 
 ;; packages outside the x.org system proper
@@ -107,16 +109,17 @@ avoiding password prompts when X11 forwarding has already been setup.")
 (define-public xdotool
   (package
 (name "xdotool")
-(version "2.20110530.1")
+(version "3.20150503.1")
 (source
   (origin
 (method url-fetch)
 (uri (string-append
-  "http://semicomplete.googlecode.com/files/; name "-"
-  version ".tar.gz"))
+  "https://github.com/jordansissel/xdotool/releases/download/v;
+  version "/xdotool-" version ".tar.gz"))
 (sha256
   (base32
-   "0rxggg1cy7nnkwidx8x2w3c5f3pk6dh2b6q0q7hp069r3n5jrd77"
+   "1lcngsw33fy9my21rdiz1gs474bfdqcfxjrnfggbx4aypn1nhcp8"))
+(patches (list (search-patch "xdotool-fix-makefile.patch")
 (build-system gnu-build-system)
 (arguments
  '(#:tests? #f ; Test suite requires a lot of black magic

Re: [PATCH 02/04] gnu: xdotools: Update to 3.20150503.1

2016-02-06 Thread Leo Famulari 
On Fri, Feb 05, 2016 at 07:48:12PM -0800, Christopher Allan Webber wrote:
> From fa531a1f2a6d84232d9c94feb5b3136cd11f83b5 Mon Sep 17 00:00:00 2001
> From: Christopher Allan Webber 
> Date: Fri, 5 Feb 2016 15:24:01 -0800
> Subject: [PATCH 2/4] gnu: xdotools: Update to 3.20150503.1
> 
> * gnu/packages/xdisorg.scm (xdotools): Upgrade to 3.20150503.1.
> * gnu/packages/patches/xdotool-fix-makefile.patch: New file.

Please add the patch to gnu-system.am (dist_patch_DATA).

[...]

>  (method url-fetch)
>  (uri (string-append
> -  "http://semicomplete.googlecode.com/files/; name "-"
> -  version ".tar.gz"))
> +  "https://github.com/jordansissel/xdotool/releases/download/v; 
> version

Is this line too long? I can't say for sure looking at the patch in my
email client. If so, the linter should complain.

[...]

[PATCH 02/04] gnu: xdotools: Update to 3.20150503.1

2016-02-05 Thread Christopher Allan Webber 
>From fa531a1f2a6d84232d9c94feb5b3136cd11f83b5 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber 
Date: Fri, 5 Feb 2016 15:24:01 -0800
Subject: [PATCH 2/4] gnu: xdotools: Update to 3.20150503.1

* gnu/packages/xdisorg.scm (xdotools): Upgrade to 3.20150503.1.
* gnu/packages/patches/xdotool-fix-makefile.patch: New file.
---
 gnu/packages/patches/xdotool-fix-makefile.patch | 16 
 gnu/packages/xdisorg.scm| 14 +-
 2 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 gnu/packages/patches/xdotool-fix-makefile.patch

diff --git a/gnu/packages/patches/xdotool-fix-makefile.patch b/gnu/packages/patches/xdotool-fix-makefile.patch
new file mode 100644
index 000..5fed41f
--- /dev/null
+++ b/gnu/packages/patches/xdotool-fix-makefile.patch
@@ -0,0 +1,16 @@
+Fix Makefile, which missed including a necessary library for compiling in the
+0.5.0 release.
+
+See https://github.com/jordansissel/xdotool/pull/81 for more information.
+
+--- xdotool-3.20150503.1/Makefile	2014-10-20 13:05:34.0 -0700
 xdotool-3.20150503.1/Makefile	2016-02-05 14:44:18.652734272 -0800
+@@ -28,7 +28,7 @@
+ CFLAGS+=-g # TODO(sissel): Comment before release
+ CFLAGS+=$(CPPFLAGS)
+ 
+-DEFAULT_LIBS=-L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXtst -lXinerama
++DEFAULT_LIBS=-L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXtst -lXinerama -lxkbcommon
+ DEFAULT_INC=-I/usr/X11R6/include -I/usr/local/include
+ 
+ XDOTOOL_LIBS=$(shell pkg-config --libs x11 2> /dev/null || echo "$(DEFAULT_LIBS)")  $(shell sh platform.sh extralibs)
\ No newline at end of file
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index dc01637..4662fad 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -9,6 +9,7 @@
 ;;; Copyright © 2015 Andy Wingo 
 ;;; Copyright © 2015 xd1le 
 ;;; Copyright © 2015 Florian Paul Schmidt 
+;;; Copyright © 2016 Christopher Allan Webber 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -48,6 +49,7 @@
   #:use-module (gnu packages guile)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages gtk)
+  #:use-module (gnu packages qt)
   #:use-module (gnu packages xorg))
 
 ;; packages outside the x.org system proper
@@ -107,16 +109,17 @@ avoiding password prompts when X11 forwarding has already been setup.")
 (define-public xdotool
   (package
 (name "xdotool")
-(version "2.20110530.1")
+(version "3.20150503.1")
 (source
   (origin
 (method url-fetch)
 (uri (string-append
-  "http://semicomplete.googlecode.com/files/; name "-"
-  version ".tar.gz"))
+  "https://github.com/jordansissel/xdotool/releases/download/v; version
+  "/xdotool-" version ".tar.gz"))
 (sha256
   (base32
-   "0rxggg1cy7nnkwidx8x2w3c5f3pk6dh2b6q0q7hp069r3n5jrd77"
+   "1lcngsw33fy9my21rdiz1gs474bfdqcfxjrnfggbx4aypn1nhcp8"))
+(patches (list (search-patch "xdotool-fix-makefile.patch")
 (build-system gnu-build-system)
 (arguments
  '(#:tests? #f ; Test suite requires a lot of black magic
@@ -134,7 +137,8 @@ avoiding password prompts when X11 forwarding has already been setup.")
   ("libxext" ,libxext)
   ("libxi" ,libxi)
   ("libxinerama" ,libxinerama)
-  ("libxtst" ,libxtst)))
+  ("libxtst" ,libxtst)
+  ("libxkbcommon" ,libxkbcommon)))
 (home-page "http://www.semicomplete.com/projects/xdotool;)
 (synopsis "Fake keyboard/mouse input, window management, and more")
 (description "Xdotool lets you simulate keyboard input and mouse activity,
-- 
2.6.3