[PATCH 1/2] gnu: Add freerdp.

[PATCH 1/2] gnu: Add freerdp.

[Thomas Danckaert]

* gnu/packages/rdesktop.scm (freerdp): New variable.
---
 gnu/packages/rdesktop.scm | 71 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 70 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm
index e40852b..14965e1 100644
--- a/gnu/packages/rdesktop.scm
+++ b/gnu/packages/rdesktop.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -20,9 +21,19 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages cups)
+  #:use-module (gnu packages gstreamer)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages tls)
-  #:use-module (gnu packages xorg))
+  #:use-module (gnu packages video)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages xml))
 
 (define-public rdesktop
   (package
@@ -57,3 +68,61 @@
 capable of natively speaking Remote Desktop Protocol (RDP).  It allows users
 to remotely control a user's Windows desktop.")
     (license license:gpl3+)))
+
+(define-public freerdp
+  (package
+    (name "freerdp")
+    (version "1.2.0-beta1+android9")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "git://github.com/FreeRDP/FreeRDP.git")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32 "1m0lzrr7hkxfvc5f9p8snimv0rmin2463zhg25mv36wig8g5k7l3"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("xmlto" ,xmlto)))
+    (inputs
+     `(("libx11" ,libx11)
+       ("libxkbfile" ,libxkbfile)
+       ("libxcursor" ,libxcursor)
+       ("libxext" ,libxext)
+       ("libxi" ,libxi)
+       ("libxv" ,libxv)
+       ("libxrandr" ,libxrandr)
+       ("libxrender" ,libxrender)
+       ("libxinerama" ,libxinerama)
+       ("libxshmfence" ,libxshmfence)
+       ("libxml2" ,libxml2)
+       ("libxslt" ,libxslt)
+       ("cups" ,cups)
+       ("ffmpeg" ,ffmpeg)
+       ("pulseaudio" ,pulseaudio)
+       ("alsa-lib" ,alsa-lib)
+       ("gstreamer" ,gstreamer)
+       ("gst-plugins-base" ,gst-plugins-base)
+       ("zlib" ,zlib)
+       ("openssl" ,openssl)))
+    (arguments
+     `(#:configure-flags
+       '("-DCMAKE_INSTALL_LIBDIR=lib"
+         "-DWITH_PULSE=ON"
+         "-DWITH_CUPS=ON" "-DWITH_SSE2=ON")
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'patch-cmakelists
+           (lambda _
+             (substitute* "channels/client/CMakeLists.txt"
+               (("list\\(REMOVE_DUPLICATES CHANNEL_STATIC_CLIENT_ENTRIES\\)")
+                "")))))
+       #:tests? #f)) ; no 'test' target
+    (home-page "https://www.freerdp.com")
+    (synopsis "Remote Desktop Protocol implementation")
+    (description "FreeRDP implements Microsoft's Remote Desktop Protocol.  It
+consists of the @code{xfreerdp} client, libraries for client and server
+functionality, and Windows Portable Runtime (WinPR), a portable implementation
+of parts of the Windows API.")
+    (license license:asl2.0)))
-- 
2.7.4

[PATCH 2/2] gnu: Add vinagre.

[Thomas Danckaert]

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

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f6f7aae..23cf742 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -22,6 +22,7 @@
 ;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
 ;;; Copyright © 2016 David Craven <david@craven.ch>
 ;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -96,11 +97,13 @@
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages rdesktop)
   #:use-module (gnu packages scanner)
   #:use-module (gnu packages ssh)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages spice)
   #:use-module (gnu packages tex)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages web)
@@ -1900,6 +1903,45 @@ selection and URL hints.")))
      `(("gtk+" ,gtk+-2)         ; required by libvte.pc
        ("ncurses" ,ncurses))))) ; required by libvte.la
 
+(define-public vinagre
+  (package
+    (name "vinagre")
+    (version "3.22.0")
+    (source
+      (origin
+       (method url-fetch)
+              (uri (string-append
+                    "mirror://gnome/sources/" name "/"
+                    (version-major+minor version) "/"
+                    name "-" version ".tar.xz"))
+       (sha256
+        (base32
+         "10jya3jyrm18nbw3v410gbkc7677bqamax44pzgd3j15randn76d"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("intltool" ,intltool)
+       ("itstool" ,itstool)
+       ("glib-bin" ,glib "bin")         ; for glib-compile-schemas
+       ("gtk+-bin" ,gtk+ "bin")))       ; for gtk-update-icon-cache
+    (inputs
+     `(("libxml2" ,libxml2)
+       ("gtk-vnc" ,gtk-vnc)
+       ("gnome-keyring" ,gnome-keyring)
+       ("libsecret" ,libsecret)
+       ("freerdp" ,freerdp)
+       ("spice" ,spice)
+       ("spice-gtk" ,spice-gtk)
+       ("telepathy-glib" ,telepathy-glib)
+       ("vte" ,vte)))
+    (arguments
+     `(#:configure-flags '("--enable-rdp")))
+    (home-page "https://wiki.gnome.org/Apps/Vinagre")
+    (synopsis "Remote desktop viewer for GNOME")
+    (description "Vinagre is a remote display client supporting the VNC, SPICE
+and RDP protocols.")
+    (license license:gpl3)))
+
 (define-public dconf
   (package
     (name "dconf")
-- 
2.7.4

Re: [PATCH 1/2] gnu: Add freerdp.

[Ricardo Wurmus]

Hi Thomas,

> * gnu/packages/rdesktop.scm (freerdp): New variable.
> ---
>  gnu/packages/rdesktop.scm | 71 ++++++++++++++++++++++++++++++++++++++++++++++-
>  1 file changed, 70 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm
> index e40852b..14965e1 100644
> --- a/gnu/packages/rdesktop.scm
> +++ b/gnu/packages/rdesktop.scm
> @@ -1,5 +1,6 @@
>  ;;; GNU Guix --- Functional package management for GNU
>  ;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
> +;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -20,9 +21,19 @@
>    #:use-module ((guix licenses) #:prefix license:)
>    #:use-module (guix packages)
>    #:use-module (guix download)
> +  #:use-module (guix git-download)
> +  #:use-module (guix build-system cmake)
>    #:use-module (guix build-system gnu)
> +  #:use-module (gnu packages compression)
> +  #:use-module (gnu packages cups)
> +  #:use-module (gnu packages gstreamer)
> +  #:use-module (gnu packages linux)
> +  #:use-module (gnu packages pkg-config)
> +  #:use-module (gnu packages pulseaudio)
>    #:use-module (gnu packages tls)
> -  #:use-module (gnu packages xorg))
> +  #:use-module (gnu packages video)
> +  #:use-module (gnu packages xorg)
> +  #:use-module (gnu packages xml))
>
>  (define-public rdesktop
>    (package
> @@ -57,3 +68,61 @@
>  capable of natively speaking Remote Desktop Protocol (RDP).  It allows users
>  to remotely control a user's Windows desktop.")
>      (license license:gpl3+)))
> +
> +(define-public freerdp
> +  (package
> +    (name "freerdp")
> +    (version "1.2.0-beta1+android9")
> +    (source (origin
> +              (method git-fetch)
> +              (uri (git-reference
> +                    (url "git://github.com/FreeRDP/FreeRDP.git")
> +                    (commit version)))
> +              (file-name (git-file-name name version))
> +              (sha256
> +               (base32 "1m0lzrr7hkxfvc5f9p8snimv0rmin2463zhg25mv36wig8g5k7l3"))))
> +    (build-system cmake-build-system)
> +    (native-inputs
> +     `(("pkg-config" ,pkg-config)
> +       ("xmlto" ,xmlto)))
> +    (inputs
> +     `(("libx11" ,libx11)
> +       ("libxkbfile" ,libxkbfile)
> +       ("libxcursor" ,libxcursor)
> +       ("libxext" ,libxext)
> +       ("libxi" ,libxi)
> +       ("libxv" ,libxv)
> +       ("libxrandr" ,libxrandr)
> +       ("libxrender" ,libxrender)
> +       ("libxinerama" ,libxinerama)
> +       ("libxshmfence" ,libxshmfence)
> +       ("libxml2" ,libxml2)
> +       ("libxslt" ,libxslt)
> +       ("cups" ,cups)
> +       ("ffmpeg" ,ffmpeg)
> +       ("pulseaudio" ,pulseaudio)
> +       ("alsa-lib" ,alsa-lib)
> +       ("gstreamer" ,gstreamer)
> +       ("gst-plugins-base" ,gst-plugins-base)
> +       ("zlib" ,zlib)
> +       ("openssl" ,openssl)))
> +    (arguments
> +     `(#:configure-flags
> +       '("-DCMAKE_INSTALL_LIBDIR=lib"
> +         "-DWITH_PULSE=ON"
> +         "-DWITH_CUPS=ON" "-DWITH_SSE2=ON")

Is WITH_SSE2 used to ensure that this won’t use uncommon CPU features?

> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-before 'configure 'patch-cmakelists
> +           (lambda _
> +             (substitute* "channels/client/CMakeLists.txt"
> +               (("list\\(REMOVE_DUPLICATES CHANNEL_STATIC_CLIENT_ENTRIES\\)")
> +                "")))))

Please add a comment that explains why this is needed.  Also make sure
to end the phase with “#t” because “substitute*” does not (yet) return a
truthy value.

> +       #:tests? #f)) ; no 'test' target

Actually, the usual target is “check” :)  The comment should probably
either say “no tests” or “no ’check’ target”.  But this is nitpicking.

> +    (home-page "https://www.freerdp.com")
> +    (synopsis "Remote Desktop Protocol implementation")
> +    (description "FreeRDP implements Microsoft's Remote Desktop Protocol.  It
> +consists of the @code{xfreerdp} client, libraries for client and server
> +functionality, and Windows Portable Runtime (WinPR), a portable implementation
> +of parts of the Windows API.")
> +    (license license:asl2.0)))

Okay with the above changes.  Thanks!

--
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net

Re: [PATCH 1/2] gnu: Add freerdp.

[Thomas Danckaert]

[-- Attachment #1: Type: Text/Plain, Size: 1935 bytes --]

Hi Ricardo,

From: Ricardo Wurmus <rekado@elephly.net>
Subject: Re: [PATCH 1/2] gnu: Add freerdp.
Date: Mon, 06 Feb 2017 21:11:34 +0100

>> +    (arguments
>> +     `(#:configure-flags
>> +       '("-DCMAKE_INSTALL_LIBDIR=lib"
>> +         "-DWITH_PULSE=ON"
>> +         "-DWITH_CUPS=ON" "-DWITH_SSE2=ON")
>
> Is WITH_SSE2 used to ensure that this won’t use uncommon CPU 
> features?

Actually I don't know... why it is used, and it works just fine
without it. I got it from the (possibly outdated) build instructions
at https://github.com/FreeRDP/FreeRDP/wiki/Compilation (which also
suggest to make a “debug” build without explaining why...?).

>> +       #:phases
>> +       (modify-phases %standard-phases
>> +         (add-before 'configure 'patch-cmakelists
>> +           (lambda _
>> +             (substitute* "channels/client/CMakeLists.txt"
>> +               (("list\\(REMOVE_DUPLICATES 
>> CHANNEL_STATIC_CLIENT_ENTRIES\\)")
>> +                "")))))
>
> Please add a comment that explains why this is needed.  Also make 
> sure
> to end the phase with “#t” because “substitute*” does not (yet) 
> return a
> truthy value.

I've added a comment.  It's just that this list is somehow empty, and 
CMake complains that it can't remove duplicates from an empty list 
(...).  (This fix is no longer needed when building freerdp's current 
master, but it seems I can't use freerdp master in current vinagre)

>> +       #:tests? #f)) ; no 'test' target
>
> Actually, the usual target is “check” :)  The comment should 
> probably
> either say “no tests” or “no ’check’ target”.  But this is 
> nitpicking.

Actually, in a cmake-generated Makefile, it's 'make test' :-)  But 
I'm happy with 'no tests', too. I was just aiming for absolute 
clarity.

> [...]
> Okay with the above changes.  Thanks!

Thanks for reviewing so quickly.

Thomas

[-- Attachment #2: 0001-gnu-Add-freerdp.patch --]
[-- Type: Text/X-Patch, Size: 3952 bytes --]

From bcca85478a273789043f46e9574a58d26591bf56 Mon Sep 17 00:00:00 2001
From: Thomas Danckaert <thomas.danckaert@gmail.com>
Date: Mon, 6 Feb 2017 17:19:06 +0100
Subject: [PATCH] gnu: Add freerdp.

* gnu/packages/rdesktop.scm (freerdp): New variable.
---
 gnu/packages/rdesktop.scm | 71 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 70 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm
index e40852b..f98ad35 100644
--- a/gnu/packages/rdesktop.scm
+++ b/gnu/packages/rdesktop.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -20,9 +21,19 @@
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages cups)
+  #:use-module (gnu packages gstreamer)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages tls)
-  #:use-module (gnu packages xorg))
+  #:use-module (gnu packages video)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages xml))
 
 (define-public rdesktop
   (package
@@ -57,3 +68,61 @@
 capable of natively speaking Remote Desktop Protocol (RDP).  It allows users
 to remotely control a user's Windows desktop.")
     (license license:gpl3+)))
+
+(define-public freerdp
+  (package
+    (name "freerdp")
+    (version "1.2.0-beta1+android9")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "git://github.com/FreeRDP/FreeRDP.git")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32 "1m0lzrr7hkxfvc5f9p8snimv0rmin2463zhg25mv36wig8g5k7l3"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("xmlto" ,xmlto)))
+    (inputs
+     `(("libx11" ,libx11)
+       ("libxkbfile" ,libxkbfile)
+       ("libxcursor" ,libxcursor)
+       ("libxext" ,libxext)
+       ("libxi" ,libxi)
+       ("libxv" ,libxv)
+       ("libxrandr" ,libxrandr)
+       ("libxrender" ,libxrender)
+       ("libxinerama" ,libxinerama)
+       ("libxshmfence" ,libxshmfence)
+       ("libxml2" ,libxml2)
+       ("libxslt" ,libxslt)
+       ("cups" ,cups)
+       ("ffmpeg" ,ffmpeg)
+       ("pulseaudio" ,pulseaudio)
+       ("alsa-lib" ,alsa-lib)
+       ("gstreamer" ,gstreamer)
+       ("gst-plugins-base" ,gst-plugins-base)
+       ("zlib" ,zlib)
+       ("openssl" ,openssl)))
+    (arguments
+     `(#:configure-flags
+       '("-DCMAKE_INSTALL_LIBDIR=lib"
+         "-DWITH_PULSE=ON"
+         "-DWITH_CUPS=ON")
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'patch-cmakelists
+           (lambda _ ; CMake returns an error on REMOVE_DUPLICATES because this list is empty.
+             (substitute* "channels/client/CMakeLists.txt"
+               (("list\\(REMOVE_DUPLICATES CHANNEL_STATIC_CLIENT_ENTRIES\\)")
+                "")))))
+       #:tests? #f)) ; no 'test' target
+    (home-page "https://www.freerdp.com")
+    (synopsis "Remote Desktop Protocol implementation")
+    (description "FreeRDP implements Microsoft's Remote Desktop Protocol.  It
+consists of the @code{xfreerdp} client, libraries for client and server
+functionality, and Windows Portable Runtime (WinPR), a portable implementation
+of parts of the Windows API.")
+    (license license:asl2.0)))
-- 
2.7.4

Re: [PATCH 1/2] gnu: Add freerdp.

[Ludovic Courtès]

Thomas Danckaert <post@thomasdanckaert.be> skribis:

> From bcca85478a273789043f46e9574a58d26591bf56 Mon Sep 17 00:00:00 2001
> From: Thomas Danckaert <thomas.danckaert@gmail.com>
> Date: Mon, 6 Feb 2017 17:19:06 +0100
> Subject: [PATCH] gnu: Add freerdp.
>
> * gnu/packages/rdesktop.scm (freerdp): New variable.

Applied, thanks!

Ludo’.

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

[Ludovic Courtès]

Thomas Danckaert <thomas.danckaert@gmail.com> skribis:

> * gnu/packages/gnome.scm (vinagre): New variable.

Applied with minor changes:

> +    (build-system gnu-build-system)

I changed it to ‘glib-or-gtk-build-system’ so that Vinagre finds its own
schema.

> +    (license license:gpl3)))

Changed to gpl3+ (‘COPYING’ is GPLv3 and source file headers say
“version 2 or later”.)

Thanks!

Ludo’.