unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#64261] [PATCH] gnu: Add xrdp
@ 2023-06-24  7:37 Andy Tai
  2023-06-24  9:21 ` [bug#64261] [PATCH v2] " Andy Tai
                   ` (5 more replies)
  0 siblings, 6 replies; 17+ messages in thread
From: Andy Tai @ 2023-06-24  7:37 UTC (permalink / raw)
  To: 64261; +Cc: Andy Tai

* gnu/packages/xorg.scm (xrdp): New variable
---
 gnu/packages/xorg.scm | 68 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index e41ddea28f..2b26deddc2 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -35,6 +35,7 @@
 ;;; Copyright © 2021 qblade <qblade@protonmail.com>
 ;;; Copyright © 2021 Lu Hui <luhux76@gmail.com>
 ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2023 Andy Tai <atai@atai.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -66,6 +67,7 @@ (define-module (gnu packages xorg)
   #:use-module (gnu packages)
   #:use-module (gnu packages aidc)
   #:use-module (gnu packages anthy)
+  #:use-module (gnu packages assembly)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
@@ -90,6 +92,7 @@ (define-module (gnu packages xorg)
   #:use-module (gnu packages libedit)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages llvm)
+  #:use-module (gnu packages mp3)
   #:use-module (gnu packages m4)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages onc-rpc)
@@ -103,6 +106,8 @@ (define-module (gnu packages xorg)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages spice)
+  #:use-module (gnu packages tls)
+  #:use-module (gnu packages version-control)
   #:use-module (gnu packages video)
   #:use-module (gnu packages xiph)
   #:use-module (gnu packages xml)
@@ -6685,3 +6690,66 @@ (define-public setroot
 syntax without its image viewing capabilities.  It supports multiple monitors
 and can restore previously set wallpapers and options.")
     (license license:gpl3+)))
+
+
+(define-public xrdp
+  (package
+    (name "xrdp")
+    (version "0.9.22.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/neutrinolabs/xrdp/releases/download/v"
+                    version "/xrdp-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1jzknwy003fk5lqzrncbypirq3smpghxy2prg2m2ljjrx77j1lvd"))))
+    (build-system gnu-build-system)
+    (inputs (list check
+                  fuse
+                  gettext-minimal
+                  imlib2
+                  lame
+                  libjpeg-turbo
+                  libx11
+                  libxfixes
+                  libxml2
+                  libxpm
+                  libxrandr
+                  libxslt
+                  libxt
+                  linux-pam
+                  openssl
+                  pixman
+                  python
+                  python-libxml2))
+    (native-inputs (list autoconf
+                         automake
+                         libtool
+                         bison
+                         flex
+                         intltool
+                         nasm
+                         pkg-config
+                         pixman))
+
+    (arguments
+     (list #:configure-flags #~(list "--enable-strict-locations=yes"
+                                     "--enable-fuse"
+                                     "--enable-mp3lame"
+                                     "--enable-pixman"
+                                     "--enable-pam-config=unix"
+                                     "--enable-ipv6=yes")))
+    (home-page "https://github.com/ttzhou/setroohttps://www.xrdp.org/t")
+    (synopsis "Open source RDP server ")
+    (description
+     "Xrdp provides a graphical login to remote machines using
+Microsoft Remote Desktop Protocol (RDP).  Xrdp accepts connections from a
+variety of RDP clients:
+* FreeRDP
+* rdesktop
+* KRDC
+* NeutrinoRDP
+* Windows MSTSC (Microsoft Terminal Services Client, aka mstsc.exe)
+* Microsoft Remote Desktop (found on Microsoft Store, which is distinct from MSTSC)")
+    (license license:asl2.0)))

base-commit: dcca13ed7340f17a33a4c0907c13b64d5da66a8e
-- 
2.40.1





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

* [bug#64261] [PATCH v2] gnu: Add xrdp
  2023-06-24  7:37 [bug#64261] [PATCH] gnu: Add xrdp Andy Tai
@ 2023-06-24  9:21 ` Andy Tai
  2023-06-27  7:29 ` [bug#64261] [PATCH v3] gnu: Add xrdp and xorgxrdp Andy Tai
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 17+ messages in thread
From: Andy Tai @ 2023-06-24  9:21 UTC (permalink / raw)
  To: 64261; +Cc: Andy Tai

* gnu/packages/xorg.scm (xrdp): New variable
---
 gnu/packages/xorg.scm | 69 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index e41ddea28f..6316c515f7 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -35,6 +35,7 @@
 ;;; Copyright © 2021 qblade <qblade@protonmail.com>
 ;;; Copyright © 2021 Lu Hui <luhux76@gmail.com>
 ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
+;;; Copyright © 2023 Andy Tai <atai@atai.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -66,6 +67,7 @@ (define-module (gnu packages xorg)
   #:use-module (gnu packages)
   #:use-module (gnu packages aidc)
   #:use-module (gnu packages anthy)
+  #:use-module (gnu packages assembly)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
@@ -90,6 +92,7 @@ (define-module (gnu packages xorg)
   #:use-module (gnu packages libedit)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages llvm)
+  #:use-module (gnu packages mp3)
   #:use-module (gnu packages m4)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages onc-rpc)
@@ -103,6 +106,8 @@ (define-module (gnu packages xorg)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages spice)
+  #:use-module (gnu packages tls)
+  #:use-module (gnu packages version-control)
   #:use-module (gnu packages video)
   #:use-module (gnu packages xiph)
   #:use-module (gnu packages xml)
@@ -6685,3 +6690,67 @@ (define-public setroot
 syntax without its image viewing capabilities.  It supports multiple monitors
 and can restore previously set wallpapers and options.")
     (license license:gpl3+)))
+
+
+(define-public xrdp
+  (package
+    (name "xrdp")
+    (version "0.9.22.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/neutrinolabs/xrdp/releases/download/v"
+                    version "/xrdp-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1jzknwy003fk5lqzrncbypirq3smpghxy2prg2m2ljjrx77j1lvd"))))
+    (build-system gnu-build-system)
+    (inputs (list check
+                  fuse
+                  gettext-minimal
+                  imlib2
+                  lame
+                  libjpeg-turbo
+                  libx11
+                  libxfixes
+                  libxml2
+                  libxpm
+                  libxrandr
+                  libxslt
+                  libxt
+                  linux-pam
+                  openssl
+                  pixman
+                  python
+                  python-libxml2))
+    (native-inputs (list autoconf
+                         automake
+                         libtool
+                         bison
+                         flex
+                         intltool
+                         nasm
+                         pkg-config
+                         pixman))
+
+    (arguments
+     (list #:configure-flags #~(list "--enable-strict-locations=yes"
+                                     "--enable-fuse=yes"
+                                     "--enable-mp3lame=yes"
+                                     "--enable-pixman=yes"
+                                     "--enable-imlib2=yes"
+                                     "--enable-pam-config=unix"
+                                     "--enable-ipv6=yes")))
+    (home-page "https://www.xrdp.org")
+    (synopsis "Open source RDP server ")
+    (description
+     "Xrdp provides a graphical login to remote machines using
+Microsoft Remote Desktop Protocol (RDP).  Xrdp accepts connections from a
+variety of RDP clients:
+* FreeRDP
+* rdesktop
+* KRDC
+* NeutrinoRDP
+* Windows MSTSC (Microsoft Terminal Services Client, aka mstsc.exe)
+* Microsoft Remote Desktop (found on Microsoft Store, which is distinct from MSTSC)")
+    (license license:asl2.0)))

base-commit: dcca13ed7340f17a33a4c0907c13b64d5da66a8e
-- 
2.40.1





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

* [bug#64261] [PATCH v3] gnu: Add xrdp and xorgxrdp
  2023-06-24  7:37 [bug#64261] [PATCH] gnu: Add xrdp Andy Tai
  2023-06-24  9:21 ` [bug#64261] [PATCH v2] " Andy Tai
@ 2023-06-27  7:29 ` Andy Tai
  2023-07-11 14:12   ` [bug#64261] [PATCH] gnu: Add xrdp Ludovic Courtès
  2023-07-22 23:28 ` [bug#64261] [PATCH v4 0/2] Add xrdp and xorgxrdp Andy Tai
                   ` (3 subsequent siblings)
  5 siblings, 1 reply; 17+ messages in thread
From: Andy Tai @ 2023-06-27  7:29 UTC (permalink / raw)
  To: 64261; +Cc: Andy Tai

* gnu/packages/rdesktop.scm (xrdp): New variabble
  (xorgxrdp): New variable
---
 gnu/packages/rdesktop.scm | 122 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 122 insertions(+)

diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm
index be4fe83cdc..9c73f57754 100644
--- a/gnu/packages/rdesktop.scm
+++ b/gnu/packages/rdesktop.scm
@@ -31,19 +31,29 @@ (define-module (gnu packages rdesktop)
   #:use-module (guix utils)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
+  #:use-module (gnu packages assembly)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages bison)
+  #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cups)
   #:use-module (gnu packages docbook)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages freedesktop)
+  #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages image)
   #:use-module (gnu packages libusb)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages mp3)
   #:use-module (gnu packages nettle)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages tls)
+  #:use-module (gnu packages version-control)
   #:use-module (gnu packages video)
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xorg)
@@ -137,3 +147,115 @@ (define-public freerdp
 functionality, and Windows Portable Runtime (WinPR), a portable implementation
 of parts of the Windows API.")
     (license license:asl2.0)))
+
+(define-public xrdp
+  (package
+    (name "xrdp")
+    (version "0.9.22.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/neutrinolabs/xrdp/releases/download/v"
+                    version "/xrdp-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1jzknwy003fk5lqzrncbypirq3smpghxy2prg2m2ljjrx77j1lvd"))))
+    (build-system gnu-build-system)
+    (inputs (list check
+                  fuse
+                  imlib2
+                  lame
+                  libjpeg-turbo
+                  libx11
+                  libxfixes
+                  libxml2
+                  libxpm
+                  libxrandr
+                  libxslt
+                  libxt
+                  linux-pam
+                  openssl
+                  pixman
+                  python
+                  python-libxml2))
+    (native-inputs (list autoconf
+                         automake
+                         libtool
+                         bison
+                         flex
+                         gettext-minimal
+                         intltool
+                         nasm
+                         pkg-config
+                         pixman))
+
+    (arguments
+     (list #:configure-flags #~(list "--enable-strict-locations=yes"
+                                     "--enable-fuse=yes"
+                                     "--enable-mp3lame=yes"
+                                     "--enable-pixman=yes"
+                                     "--enable-imlib2=yes"
+                                     "--enable-pam-config=unix"
+                                     "--enable-ipv6=yes")))
+    (home-page "https://www.xrdp.org")
+    (synopsis "Open source RDP server ")
+    (description
+     "Xrdp provides a graphical login to remote machines using
+Microsoft Remote Desktop Protocol (RDP).  Xrdp accepts connections from a
+variety of RDP clients:
+* FreeRDP
+* rdesktop
+* KRDC
+* NeutrinoRDP
+* Windows MSTSC (Microsoft Terminal Services Client, aka mstsc.exe)
+* Microsoft Remote Desktop (found on Microsoft Store, which is distinct from MSTSC)")
+    (license license:asl2.0)))
+
+
+
+(define-public xorgxrdp
+  (package
+    (name "xorgxrdp")
+    (version "0.9.19")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/neutrinolabs/xorgxrdp/releases/download/v"
+                    version "/xorgxrdp-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0m8lvdnhfvwwqrr56difgy3mblplp23x6iy12kl4r8i87ic4rky1"))))
+    (build-system gnu-build-system)
+    (inputs (list check
+                  libx11
+                  libxfixes
+                  libxfont2
+                  libxml2
+                  libxpm
+                  libxrandr
+                  libxslt
+                  libxt
+                  pixman
+                  xdpyinfo
+                  xorg-server
+                  xrdp))
+    (native-inputs (list autoconf
+                         automake
+                         libtool
+                         nasm
+                         intltool
+                         pkg-config
+                         pixman))
+    (arguments
+     (list #:configure-flags #~(list "--enable-strict-locations=yes"
+                                     (string-append "XRDP_CFLAGS=-I"
+                                                    (assoc-ref %build-inputs
+                                                               "xrdp")
+                                                    "/common"))))
+    (home-page "https://github.com/neutrinolabs/xorgxrdp")
+    (synopsis "Xorg drivers for xrdp")
+    (description
+     "xorgxrdp is a collection of modules to be used with a pre-existing X.Org
+install to make the X server act like X11rdp")
+    (license license:x11)))
+

base-commit: ac86174e22fcd762893bd4515786b1376af9397b
-- 
2.40.1





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

* [bug#64261] [PATCH] gnu: Add xrdp
  2023-06-27  7:29 ` [bug#64261] [PATCH v3] gnu: Add xrdp and xorgxrdp Andy Tai
@ 2023-07-11 14:12   ` Ludovic Courtès
  2023-07-11 14:13     ` Andy Tai
  0 siblings, 1 reply; 17+ messages in thread
From: Ludovic Courtès @ 2023-07-11 14:12 UTC (permalink / raw)
  To: Andy Tai; +Cc: 64261

Hi Andy,

Andy Tai <atai@atai.org> skribis:

> * gnu/packages/rdesktop.scm (xrdp): New variabble
>   (xorgxrdp): New variable

Could you send a v2 with one patch per package, as is customary?

> +    (home-page "https://www.xrdp.org")
> +    (synopsis "Open source RDP server ")

Please remote the trailing slash as well as “open source”: everything is
free software in here, so no need to specify it! :-) However, please
spell out “Remote Desktop Protocol (RDP)”.

> +    (description
> +     "Xrdp provides a graphical login to remote machines using
> +Microsoft Remote Desktop Protocol (RDP).  Xrdp accepts connections from a
> +variety of RDP clients:
> +* FreeRDP
> +* rdesktop

Please use @itemize.

See
<https://guix.gnu.org/manual/devel/en/html_node/Synopses-and-Descriptions.html>.

> +(define-public xorgxrdp
> +  (package
> +    (name "xorgxrdp")
> +    (version "0.9.19")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append
> +                    "https://github.com/neutrinolabs/xorgxrdp/releases/download/v"
> +                    version "/xorgxrdp-" version ".tar.gz"))
> +              (sha256
> +               (base32
> +                "0m8lvdnhfvwwqrr56difgy3mblplp23x6iy12kl4r8i87ic4rky1"))))

Should it inherit from ‘xrdp’?  I fail to see what the difference is.

> +    (arguments
> +     (list #:configure-flags #~(list "--enable-strict-locations=yes"
> +                                     (string-append "XRDP_CFLAGS=-I"
> +                                                    (assoc-ref %build-inputs
> +                                                               "xrdp")
> +                                                    "/common"))))

Rather than (assoc-ref …), write #$(this-package-input "xrdp').

Also, xrdp should not have .h files under /common; it should be under
/include or /include/common or similar.  Could you check that?

> +    (home-page "https://github.com/neutrinolabs/xorgxrdp")
> +    (synopsis "Xorg drivers for xrdp")
> +    (description
> +     "xorgxrdp is a collection of modules to be used with a pre-existing X.Org
> +install to make the X server act like X11rdp")

Please add a period at the end of the sentence and expound a bit so one
can better understand what this is about.

Thanks in advance!

Ludo’.




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

* [bug#64261] [PATCH] gnu: Add xrdp
  2023-07-11 14:12   ` [bug#64261] [PATCH] gnu: Add xrdp Ludovic Courtès
@ 2023-07-11 14:13     ` Andy Tai
  0 siblings, 0 replies; 17+ messages in thread
From: Andy Tai @ 2023-07-11 14:13 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: 64261

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

will do

On Tue, Jul 11, 2023 at 7:12 AM Ludovic Courtès <ludo@gnu.org> wrote:

> Hi Andy,
>
> Andy Tai <atai@atai.org> skribis:
>
> > * gnu/packages/rdesktop.scm (xrdp): New variabble
> >   (xorgxrdp): New variable
>
> Could you send a v2 with one patch per package, as is customary?
>
> > +    (home-page "https://www.xrdp.org")
> > +    (synopsis "Open source RDP server ")
>
> Please remote the trailing slash as well as “open source”: everything is
> free software in here, so no need to specify it! :-) However, please
> spell out “Remote Desktop Protocol (RDP)”.
>
> > +    (description
> > +     "Xrdp provides a graphical login to remote machines using
> > +Microsoft Remote Desktop Protocol (RDP).  Xrdp accepts connections from
> a
> > +variety of RDP clients:
> > +* FreeRDP
> > +* rdesktop
>
> Please use @itemize.
>
> See
> <
> https://guix.gnu.org/manual/devel/en/html_node/Synopses-and-Descriptions.html
> >.
>
> > +(define-public xorgxrdp
> > +  (package
> > +    (name "xorgxrdp")
> > +    (version "0.9.19")
> > +    (source (origin
> > +              (method url-fetch)
> > +              (uri (string-append
> > +                    "
> https://github.com/neutrinolabs/xorgxrdp/releases/download/v"
> > +                    version "/xorgxrdp-" version ".tar.gz"))
> > +              (sha256
> > +               (base32
> > +
> "0m8lvdnhfvwwqrr56difgy3mblplp23x6iy12kl4r8i87ic4rky1"))))
>
> Should it inherit from ‘xrdp’?  I fail to see what the difference is.
>
> > +    (arguments
> > +     (list #:configure-flags #~(list "--enable-strict-locations=yes"
> > +                                     (string-append "XRDP_CFLAGS=-I"
> > +                                                    (assoc-ref
> %build-inputs
> > +                                                               "xrdp")
> > +                                                    "/common"))))
>
> Rather than (assoc-ref …), write #$(this-package-input "xrdp').
>
> Also, xrdp should not have .h files under /common; it should be under
> /include or /include/common or similar.  Could you check that?
>
> > +    (home-page "https://github.com/neutrinolabs/xorgxrdp")
> > +    (synopsis "Xorg drivers for xrdp")
> > +    (description
> > +     "xorgxrdp is a collection of modules to be used with a
> pre-existing X.Org
> > +install to make the X server act like X11rdp")
>
> Please add a period at the end of the sentence and expound a bit so one
> can better understand what this is about.
>
> Thanks in advance!
>
> Ludo’.
>


-- 
Andy Tai, atai@atai.org, Skype: licheng.tai, Line: andy_tai, WeChat:
andytai1010
Year 2023 民國112年
自動的精神力是信仰與覺悟
自動的行為力是勞動與技能

[-- Attachment #2: Type: text/html, Size: 4581 bytes --]

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

* [bug#64261] [PATCH v4 0/2] Add xrdp and xorgxrdp
  2023-06-24  7:37 [bug#64261] [PATCH] gnu: Add xrdp Andy Tai
  2023-06-24  9:21 ` [bug#64261] [PATCH v2] " Andy Tai
  2023-06-27  7:29 ` [bug#64261] [PATCH v3] gnu: Add xrdp and xorgxrdp Andy Tai
@ 2023-07-22 23:28 ` Andy Tai
  2023-07-22 23:28   ` [bug#64261] [PATCH v4 1/2] gnu: Add xrdp Andy Tai
  2023-07-22 23:28   ` [bug#64261] [PATCH v4 2/2] gnu: Add xorgxrdp Andy Tai
  2023-07-26  5:56 ` [bug#64261] Guix QA showing failure on invalid derivation Andy Tai
                   ` (2 subsequent siblings)
  5 siblings, 2 replies; 17+ messages in thread
From: Andy Tai @ 2023-07-22 23:28 UTC (permalink / raw)
  To: 64261, ludo; +Cc: Andy Tai

Add xrdp and xorgxrdp

Andy Tai (2):
  gnu: Add xrdp
  gnu: Add xorgxrdp

 gnu/packages/rdesktop.scm | 123 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 123 insertions(+)


base-commit: a0508975dd6c70a2d2997a75c302a9fd42f7c370
-- 
2.41.0





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

* [bug#64261] [PATCH v4 1/2] gnu: Add xrdp
  2023-07-22 23:28 ` [bug#64261] [PATCH v4 0/2] Add xrdp and xorgxrdp Andy Tai
@ 2023-07-22 23:28   ` Andy Tai
  2023-07-22 23:28   ` [bug#64261] [PATCH v4 2/2] gnu: Add xorgxrdp Andy Tai
  1 sibling, 0 replies; 17+ messages in thread
From: Andy Tai @ 2023-07-22 23:28 UTC (permalink / raw)
  To: 64261, ludo; +Cc: Andy Tai

* gnu/packages/rdesktop.scm (xrdp): New variable
---
 gnu/packages/rdesktop.scm | 76 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)

diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm
index be4fe83cdc..04d3db610d 100644
--- a/gnu/packages/rdesktop.scm
+++ b/gnu/packages/rdesktop.scm
@@ -31,19 +31,29 @@ (define-module (gnu packages rdesktop)
   #:use-module (guix utils)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
+  #:use-module (gnu packages assembly)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages bison)
+  #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cups)
   #:use-module (gnu packages docbook)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages freedesktop)
+  #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages image)
   #:use-module (gnu packages libusb)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages mp3)
   #:use-module (gnu packages nettle)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages tls)
+  #:use-module (gnu packages version-control)
   #:use-module (gnu packages video)
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xorg)
@@ -137,3 +147,69 @@ (define-public freerdp
 functionality, and Windows Portable Runtime (WinPR), a portable implementation
 of parts of the Windows API.")
     (license license:asl2.0)))
+
+(define-public xrdp
+  (package
+    (name "xrdp")
+    (version "0.9.22.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/neutrinolabs/xrdp/releases/download/v"
+                    version "/xrdp-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1jzknwy003fk5lqzrncbypirq3smpghxy2prg2m2ljjrx77j1lvd"))))
+    (build-system gnu-build-system)
+    (inputs (list check
+                  fuse
+                  imlib2
+                  lame
+                  libjpeg-turbo
+                  libx11
+                  libxfixes
+                  libxml2
+                  libxpm
+                  libxrandr
+                  libxslt
+                  libxt
+                  linux-pam
+                  openssl
+                  pixman
+                  python
+                  python-libxml2))
+    (native-inputs (list autoconf
+                         automake
+                         libtool
+                         bison
+                         flex
+                         gettext-minimal
+                         intltool
+                         nasm
+                         pkg-config
+                         pixman))
+
+    (arguments
+     (list #:configure-flags #~(list "--enable-strict-locations=yes"
+                                     "--enable-fuse=yes"
+                                     "--enable-mp3lame=yes"
+                                     "--enable-pixman=yes"
+                                     "--enable-imlib2=yes"
+                                     "--enable-pam-config=unix"
+                                     "--enable-ipv6=yes")))
+    (home-page "https://www.xrdp.org")
+    (synopsis "Remote Desktop Protocol (RDP) server")
+    (description
+     "Xrdp provides a graphical login to remote machines using
+Microsoft Remote Desktop Protocol (RDP).  Xrdp accepts connections from a
+variety of RDP clients:
+@itemize
+@item FreeRDP
+@item rdesktop
+@item KRDC
+@item NeutrinoRDP
+@item Windows MSTSC (Microsoft Terminal Services Client, aka mstsc.exe)
+@item Microsoft Remote Desktop (found on Microsoft Store, which is distinct from MSTSC).
+@end itemize")
+    (license license:asl2.0)))
+
-- 
2.41.0





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

* [bug#64261] [PATCH v4 2/2] gnu: Add xorgxrdp
  2023-07-22 23:28 ` [bug#64261] [PATCH v4 0/2] Add xrdp and xorgxrdp Andy Tai
  2023-07-22 23:28   ` [bug#64261] [PATCH v4 1/2] gnu: Add xrdp Andy Tai
@ 2023-07-22 23:28   ` Andy Tai
  1 sibling, 0 replies; 17+ messages in thread
From: Andy Tai @ 2023-07-22 23:28 UTC (permalink / raw)
  To: 64261, ludo; +Cc: Andy Tai

* gnu/packages/rdesktop.scm (xorgxrdp): New variable
---
 gnu/packages/rdesktop.scm | 47 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm
index 04d3db610d..43db733cf6 100644
--- a/gnu/packages/rdesktop.scm
+++ b/gnu/packages/rdesktop.scm
@@ -213,3 +213,50 @@ (define-public xrdp
 @end itemize")
     (license license:asl2.0)))
 
+
+(define-public xorgxrdp
+  (package
+    (name "xorgxrdp")
+    (version "0.9.19")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/neutrinolabs/xorgxrdp/releases/download/v"
+                    version "/xorgxrdp-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0m8lvdnhfvwwqrr56difgy3mblplp23x6iy12kl4r8i87ic4rky1"))))
+    (build-system gnu-build-system)
+    (inputs (list check
+                  libx11
+                  libxfixes
+                  libxfont2
+                  libxml2
+                  libxpm
+                  libxrandr
+                  libxslt
+                  libxt
+                  pixman
+                  xdpyinfo
+                  xorg-server
+                  xrdp))
+    (native-inputs (list autoconf
+                         automake
+                         libtool
+                         nasm
+                         intltool
+                         pkg-config
+                         pixman))
+    (arguments
+     (list #:configure-flags #~(list "--enable-strict-locations=yes"
+                                     (string-append "XRDP_CFLAGS=-I"
+                                                    #$(this-package-input
+                                                       "xrdp") "/common"))))
+    (home-page "https://github.com/neutrinolabs/xorgxrdp")
+    (synopsis "Xorg drivers for xrdp")
+    (description
+     "xorgxrdp is a collection of modules to be used with a pre-existing X.Org
+install to make the X server act like X11rdp.  Unlike X11rdp, you don't have to
+recompile the whole X Window System.  Instead, additional modules are installed
+to a location where the existing Xorg installation would pick them.")
+    (license license:x11)))
-- 
2.41.0





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

* [bug#64261] Guix QA showing failure on invalid derivation
  2023-06-24  7:37 [bug#64261] [PATCH] gnu: Add xrdp Andy Tai
                   ` (2 preceding siblings ...)
  2023-07-22 23:28 ` [bug#64261] [PATCH v4 0/2] Add xrdp and xorgxrdp Andy Tai
@ 2023-07-26  5:56 ` Andy Tai
  2023-07-26  9:53   ` Christopher Baines
  2023-07-29  3:53 ` [bug#64261] [PATCH v5 1/2] gnu: Add xrdp Andy Tai
  2023-08-10  5:31 ` [bug#64261] [PATCH v6 1/2] " Andy Tai
  5 siblings, 1 reply; 17+ messages in thread
From: Andy Tai @ 2023-07-26  5:56 UTC (permalink / raw)
  To: 64261

Hi, for this latest patch Guix QA shows build failure for
arm targets for this package

guile-for-guile-emacs

that has nothing to do with xrdp or xorgxrdp.   So that is a Guix QA
bug and the build for the latest patch should be successful.




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

* [bug#64261] Guix QA showing failure on invalid derivation
  2023-07-26  5:56 ` [bug#64261] Guix QA showing failure on invalid derivation Andy Tai
@ 2023-07-26  9:53   ` Christopher Baines
  0 siblings, 0 replies; 17+ messages in thread
From: Christopher Baines @ 2023-07-26  9:53 UTC (permalink / raw)
  To: Andy Tai; +Cc: 64261

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


Andy Tai <atai@atai.org> writes:

> Hi, for this latest patch Guix QA shows build failure for
> arm targets for this package
>
> guile-for-guile-emacs
>
> that has nothing to do with xrdp or xorgxrdp.   So that is a Guix QA
> bug and the build for the latest patch should be successful.

It's not a bug in QA, just that the guile-for-guile-emacs package in
Guix is broken, and broken in such a way that the derivation changes
constantly.

I've fixed it in [1] but that'll take a while to filter in to the patch
testing.

1: https://git.savannah.gnu.org/cgit/guix.git/commit/?id=d979197eaf10883e02c53b87f8e0d14bf254c525

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

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

* [bug#64261] [PATCH v5 1/2] gnu: Add xrdp
  2023-06-24  7:37 [bug#64261] [PATCH] gnu: Add xrdp Andy Tai
                   ` (3 preceding siblings ...)
  2023-07-26  5:56 ` [bug#64261] Guix QA showing failure on invalid derivation Andy Tai
@ 2023-07-29  3:53 ` Andy Tai
  2023-07-29  3:53   ` [bug#64261] [PATCH v5 2/2] gnu: Add xorgxrdp Andy Tai
  2023-08-07 13:27   ` [bug#64261] [PATCH] gnu: Add xrdp Ludovic Courtès
  2023-08-10  5:31 ` [bug#64261] [PATCH v6 1/2] " Andy Tai
  5 siblings, 2 replies; 17+ messages in thread
From: Andy Tai @ 2023-07-29  3:53 UTC (permalink / raw)
  To: 64261; +Cc: Andy Tai

* gnu/packages/rdesktop.scm (xrdp): New variable
---
 gnu/packages/rdesktop.scm | 76 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)

diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm
index be4fe83cdc..04d3db610d 100644
--- a/gnu/packages/rdesktop.scm
+++ b/gnu/packages/rdesktop.scm
@@ -31,19 +31,29 @@ (define-module (gnu packages rdesktop)
   #:use-module (guix utils)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
+  #:use-module (gnu packages assembly)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages bison)
+  #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cups)
   #:use-module (gnu packages docbook)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages freedesktop)
+  #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages image)
   #:use-module (gnu packages libusb)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages mp3)
   #:use-module (gnu packages nettle)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages tls)
+  #:use-module (gnu packages version-control)
   #:use-module (gnu packages video)
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xorg)
@@ -137,3 +147,69 @@ (define-public freerdp
 functionality, and Windows Portable Runtime (WinPR), a portable implementation
 of parts of the Windows API.")
     (license license:asl2.0)))
+
+(define-public xrdp
+  (package
+    (name "xrdp")
+    (version "0.9.22.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/neutrinolabs/xrdp/releases/download/v"
+                    version "/xrdp-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1jzknwy003fk5lqzrncbypirq3smpghxy2prg2m2ljjrx77j1lvd"))))
+    (build-system gnu-build-system)
+    (inputs (list check
+                  fuse
+                  imlib2
+                  lame
+                  libjpeg-turbo
+                  libx11
+                  libxfixes
+                  libxml2
+                  libxpm
+                  libxrandr
+                  libxslt
+                  libxt
+                  linux-pam
+                  openssl
+                  pixman
+                  python
+                  python-libxml2))
+    (native-inputs (list autoconf
+                         automake
+                         libtool
+                         bison
+                         flex
+                         gettext-minimal
+                         intltool
+                         nasm
+                         pkg-config
+                         pixman))
+
+    (arguments
+     (list #:configure-flags #~(list "--enable-strict-locations=yes"
+                                     "--enable-fuse=yes"
+                                     "--enable-mp3lame=yes"
+                                     "--enable-pixman=yes"
+                                     "--enable-imlib2=yes"
+                                     "--enable-pam-config=unix"
+                                     "--enable-ipv6=yes")))
+    (home-page "https://www.xrdp.org")
+    (synopsis "Remote Desktop Protocol (RDP) server")
+    (description
+     "Xrdp provides a graphical login to remote machines using
+Microsoft Remote Desktop Protocol (RDP).  Xrdp accepts connections from a
+variety of RDP clients:
+@itemize
+@item FreeRDP
+@item rdesktop
+@item KRDC
+@item NeutrinoRDP
+@item Windows MSTSC (Microsoft Terminal Services Client, aka mstsc.exe)
+@item Microsoft Remote Desktop (found on Microsoft Store, which is distinct from MSTSC).
+@end itemize")
+    (license license:asl2.0)))
+

base-commit: e43cbeafd1b632f39b08b3644af5230d5350a656
-- 
2.41.0





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

* [bug#64261] [PATCH v5 2/2] gnu: Add xorgxrdp
  2023-07-29  3:53 ` [bug#64261] [PATCH v5 1/2] gnu: Add xrdp Andy Tai
@ 2023-07-29  3:53   ` Andy Tai
  2023-08-07 13:27   ` [bug#64261] [PATCH] gnu: Add xrdp Ludovic Courtès
  1 sibling, 0 replies; 17+ messages in thread
From: Andy Tai @ 2023-07-29  3:53 UTC (permalink / raw)
  To: 64261; +Cc: Andy Tai

* gnu/packages/rdesktop.scm (xorgxrdp): New variable
---
 gnu/packages/rdesktop.scm | 47 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm
index 04d3db610d..43db733cf6 100644
--- a/gnu/packages/rdesktop.scm
+++ b/gnu/packages/rdesktop.scm
@@ -213,3 +213,50 @@ (define-public xrdp
 @end itemize")
     (license license:asl2.0)))
 
+
+(define-public xorgxrdp
+  (package
+    (name "xorgxrdp")
+    (version "0.9.19")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/neutrinolabs/xorgxrdp/releases/download/v"
+                    version "/xorgxrdp-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0m8lvdnhfvwwqrr56difgy3mblplp23x6iy12kl4r8i87ic4rky1"))))
+    (build-system gnu-build-system)
+    (inputs (list check
+                  libx11
+                  libxfixes
+                  libxfont2
+                  libxml2
+                  libxpm
+                  libxrandr
+                  libxslt
+                  libxt
+                  pixman
+                  xdpyinfo
+                  xorg-server
+                  xrdp))
+    (native-inputs (list autoconf
+                         automake
+                         libtool
+                         nasm
+                         intltool
+                         pkg-config
+                         pixman))
+    (arguments
+     (list #:configure-flags #~(list "--enable-strict-locations=yes"
+                                     (string-append "XRDP_CFLAGS=-I"
+                                                    #$(this-package-input
+                                                       "xrdp") "/common"))))
+    (home-page "https://github.com/neutrinolabs/xorgxrdp")
+    (synopsis "Xorg drivers for xrdp")
+    (description
+     "xorgxrdp is a collection of modules to be used with a pre-existing X.Org
+install to make the X server act like X11rdp.  Unlike X11rdp, you don't have to
+recompile the whole X Window System.  Instead, additional modules are installed
+to a location where the existing Xorg installation would pick them.")
+    (license license:x11)))
-- 
2.41.0





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

* [bug#64261] [PATCH] gnu: Add xrdp
  2023-07-29  3:53 ` [bug#64261] [PATCH v5 1/2] gnu: Add xrdp Andy Tai
  2023-07-29  3:53   ` [bug#64261] [PATCH v5 2/2] gnu: Add xorgxrdp Andy Tai
@ 2023-08-07 13:27   ` Ludovic Courtès
  2023-08-07 13:29     ` Andy Tai
  1 sibling, 1 reply; 17+ messages in thread
From: Ludovic Courtès @ 2023-08-07 13:27 UTC (permalink / raw)
  To: Andy Tai; +Cc: 64261

Hi Andy,

LGTM, but on current ‘master’ I get:

--8<---------------cut here---------------start------------->8---
configure: imlib2 will not be supported
checking for security/pam_appl.h... yes
checking for FUSE... no
configure: error: please install libfuse-dev or fuse-devel
error: in phase 'configure': uncaught exception:
%exception #<&invoke-error program: "/gnu/store/rib9g2ig1xf3kclyl076w28parmncg4k-bash-minimal-5.1.16/bin/bash" arguments: ("./configure" "CONFIG_SHELL=/gnu/store/rib9g2ig1xf3kclyl076w28parmncg4k-bash-minimal-5.1.16/bin/bash" "SHELL=/gnu/store/rib9g2ig1xf3kclyl076w28parmncg4k-bash-minimal-5.1.16/bin/bash" "--prefix=/gnu/store/54a1c7ar3hhbyncf5g6s4nndy3bwxssq-xrdp-0.9.22.1" "--enable-fast-install" "--build=x86_64-unknown-linux-gnu" "--enable-strict-locations=yes" "--enable-fuse=yes" "--enable-mp3lame=yes" "--enable-pixman=yes" "--enable-imlib2=yes" "--enable-pam-config=unix" "--enable-ipv6=yes") exit-status: 1 term-signal: #f stop-signal: #f> 
phase `configure' failed after 4.2 seconds
command "/gnu/store/rib9g2ig1xf3kclyl076w28parmncg4k-bash-minimal-5.1.16/bin/bash" "./configure" "CONFIG_SHELL=/gnu/store/rib9g2ig1xf3kclyl076w28parmncg4k-bash-minimal-5.1.16/bin/bash" "SHELL=/gnu/store/rib9g2ig1xf3kclyl076w28parmncg4k-bash-minimal-5.1.16/bin/bash" "--prefix=/gnu/store/54a1c7ar3hhbyncf5g6s4nndy3bwxssq-xrdp-0.9.22.1" "--enable-fast-install" "--build=x86_64-unknown-linux-gnu" "--enable-strict-locations=yes" "--enable-fuse=yes" "--enable-mp3lame=yes" "--enable-pixman=yes" "--enable-imlib2=yes" "--enable-pam-config=unix" "--enable-ipv6=yes" failed with status 1
builder for `/gnu/store/szpyq693qdj51f0444jjvgl4afl8ffv6-xrdp-0.9.22.1.drv' failed with exit code 1
build of /gnu/store/szpyq693qdj51f0444jjvgl4afl8ffv6-xrdp-0.9.22.1.drv failed
--8<---------------cut here---------------end--------------->8---

Could you take a look?

Ludo’.




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

* [bug#64261] [PATCH] gnu: Add xrdp
  2023-08-07 13:27   ` [bug#64261] [PATCH] gnu: Add xrdp Ludovic Courtès
@ 2023-08-07 13:29     ` Andy Tai
  0 siblings, 0 replies; 17+ messages in thread
From: Andy Tai @ 2023-08-07 13:29 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: 64261

OK, will check... the patch may be out of date now with resp. to
current guix git.


On Mon, Aug 7, 2023 at 6:27 AM Ludovic Courtès <ludo@gnu.org> wrote:
>
> Hi Andy,
>
> LGTM, but on current ‘master’ I get:
>
> --8<---------------cut here---------------start------------->8---
> configure: imlib2 will not be supported
> checking for security/pam_appl.h... yes
> checking for FUSE... no
> configure: error: please install libfuse-dev or fuse-devel
> error: in phase 'configure': uncaught exception:
> %exception #<&invoke-error program: "/gnu/store/rib9g2ig1xf3kclyl076w28parmncg4k-bash-minimal-5.1.16/bin/bash" arguments: ("./configure" "CONFIG_SHELL=/gnu/store/rib9g2ig1xf3kclyl076w28parmncg4k-bash-minimal-5.1.16/bin/bash" "SHELL=/gnu/store/rib9g2ig1xf3kclyl076w28parmncg4k-bash-minimal-5.1.16/bin/bash" "--prefix=/gnu/store/54a1c7ar3hhbyncf5g6s4nndy3bwxssq-xrdp-0.9.22.1" "--enable-fast-install" "--build=x86_64-unknown-linux-gnu" "--enable-strict-locations=yes" "--enable-fuse=yes" "--enable-mp3lame=yes" "--enable-pixman=yes" "--enable-imlib2=yes" "--enable-pam-config=unix" "--enable-ipv6=yes") exit-status: 1 term-signal: #f stop-signal: #f>
> phase `configure' failed after 4.2 seconds
> command "/gnu/store/rib9g2ig1xf3kclyl076w28parmncg4k-bash-minimal-5.1.16/bin/bash" "./configure" "CONFIG_SHELL=/gnu/store/rib9g2ig1xf3kclyl076w28parmncg4k-bash-minimal-5.1.16/bin/bash" "SHELL=/gnu/store/rib9g2ig1xf3kclyl076w28parmncg4k-bash-minimal-5.1.16/bin/bash" "--prefix=/gnu/store/54a1c7ar3hhbyncf5g6s4nndy3bwxssq-xrdp-0.9.22.1" "--enable-fast-install" "--build=x86_64-unknown-linux-gnu" "--enable-strict-locations=yes" "--enable-fuse=yes" "--enable-mp3lame=yes" "--enable-pixman=yes" "--enable-imlib2=yes" "--enable-pam-config=unix" "--enable-ipv6=yes" failed with status 1
> builder for `/gnu/store/szpyq693qdj51f0444jjvgl4afl8ffv6-xrdp-0.9.22.1.drv' failed with exit code 1
> build of /gnu/store/szpyq693qdj51f0444jjvgl4afl8ffv6-xrdp-0.9.22.1.drv failed
> --8<---------------cut here---------------end--------------->8---
>
> Could you take a look?
>
> Ludo’.



-- 
Andy Tai, atai@atai.org, Skype: licheng.tai, Line: andy_tai, WeChat: andytai1010
Year 2023 民國112年
自動的精神力是信仰與覺悟
自動的行為力是勞動與技能




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

* [bug#64261] [PATCH v6 1/2] gnu: Add xrdp
  2023-06-24  7:37 [bug#64261] [PATCH] gnu: Add xrdp Andy Tai
                   ` (4 preceding siblings ...)
  2023-07-29  3:53 ` [bug#64261] [PATCH v5 1/2] gnu: Add xrdp Andy Tai
@ 2023-08-10  5:31 ` Andy Tai
  2023-08-10  5:31   ` [bug#64261] [PATCH v6 2/2] gnu: Add xorgxrdp Andy Tai
  2023-08-12 20:42   ` bug#64261: [PATCH v6 1/2] gnu: Add xrdp Ludovic Courtès
  5 siblings, 2 replies; 17+ messages in thread
From: Andy Tai @ 2023-08-10  5:31 UTC (permalink / raw)
  To: 64261, ludo; +Cc: Andy Tai

* gnu/packages/rdesktop.scm (xrdp): New variable
---
 gnu/packages/rdesktop.scm | 76 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)

diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm
index be4fe83cdc..0edb7a746d 100644
--- a/gnu/packages/rdesktop.scm
+++ b/gnu/packages/rdesktop.scm
@@ -31,19 +31,29 @@ (define-module (gnu packages rdesktop)
   #:use-module (guix utils)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
+  #:use-module (gnu packages assembly)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages bison)
+  #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages cups)
   #:use-module (gnu packages docbook)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages freedesktop)
+  #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages image)
   #:use-module (gnu packages libusb)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages mp3)
   #:use-module (gnu packages nettle)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages tls)
+  #:use-module (gnu packages version-control)
   #:use-module (gnu packages video)
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xorg)
@@ -137,3 +147,69 @@ (define-public freerdp
 functionality, and Windows Portable Runtime (WinPR), a portable implementation
 of parts of the Windows API.")
     (license license:asl2.0)))
+
+(define-public xrdp
+  (package
+    (name "xrdp")
+    (version "0.9.22.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/neutrinolabs/xrdp/releases/download/v"
+                    version "/xrdp-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1jzknwy003fk5lqzrncbypirq3smpghxy2prg2m2ljjrx77j1lvd"))))
+    (build-system gnu-build-system)
+    (inputs (list check
+                  fuse-2
+                  imlib2
+                  lame
+                  libjpeg-turbo
+                  libx11
+                  libxfixes
+                  libxml2
+                  libxpm
+                  libxrandr
+                  libxslt
+                  libxt
+                  linux-pam
+                  openssl
+                  pixman
+                  python
+                  python-libxml2))
+    (native-inputs (list autoconf
+                         automake
+                         libtool
+                         bison
+                         flex
+                         gettext-minimal
+                         intltool
+                         nasm
+                         pkg-config
+                         pixman))
+
+    (arguments
+     (list #:configure-flags #~(list "--enable-strict-locations=yes"
+                                     "--enable-fuse=yes"
+                                     "--enable-mp3lame=yes"
+                                     "--enable-pixman=yes"
+                                     "--enable-imlib2=yes"
+                                     "--enable-pam-config=unix"
+                                     "--enable-ipv6=yes")))
+    (home-page "https://www.xrdp.org")
+    (synopsis "Remote Desktop Protocol (RDP) server")
+    (description
+     "Xrdp provides a graphical login to remote machines using
+Microsoft Remote Desktop Protocol (RDP).  Xrdp accepts connections from a
+variety of RDP clients:
+@itemize
+@item FreeRDP
+@item rdesktop
+@item KRDC
+@item NeutrinoRDP
+@item Windows MSTSC (Microsoft Terminal Services Client, aka mstsc.exe)
+@item Microsoft Remote Desktop (found on Microsoft Store, which is distinct from MSTSC).
+@end itemize")
+    (license license:asl2.0)))
+

base-commit: 210bbf9c59355218fec1484a686cc2ecdc218506
-- 
2.41.0





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

* [bug#64261] [PATCH v6 2/2] gnu: Add xorgxrdp
  2023-08-10  5:31 ` [bug#64261] [PATCH v6 1/2] " Andy Tai
@ 2023-08-10  5:31   ` Andy Tai
  2023-08-12 20:42   ` bug#64261: [PATCH v6 1/2] gnu: Add xrdp Ludovic Courtès
  1 sibling, 0 replies; 17+ messages in thread
From: Andy Tai @ 2023-08-10  5:31 UTC (permalink / raw)
  To: 64261, ludo; +Cc: Andy Tai

* gnu/packages/rdesktop.scm (xorgxrdp): New variable
---
 gnu/packages/rdesktop.scm | 47 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm
index 0edb7a746d..8133edede6 100644
--- a/gnu/packages/rdesktop.scm
+++ b/gnu/packages/rdesktop.scm
@@ -213,3 +213,50 @@ (define-public xrdp
 @end itemize")
     (license license:asl2.0)))
 
+(define-public xorgxrdp
+  (package
+    (name "xorgxrdp")
+    (version "0.9.19")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/neutrinolabs/xorgxrdp/releases/download/v"
+                    version "/xorgxrdp-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0m8lvdnhfvwwqrr56difgy3mblplp23x6iy12kl4r8i87ic4rky1"))))
+    (build-system gnu-build-system)
+    (inputs (list check
+                  imlib2
+                  libx11
+                  libxfixes
+                  libxfont2
+                  libxml2
+                  libxpm
+                  libxrandr
+                  libxslt
+                  libxt
+                  pixman
+                  xdpyinfo
+                  xorg-server
+                  xrdp))
+    (native-inputs (list autoconf
+                         automake
+                         libtool
+                         nasm
+                         intltool
+                         pkg-config
+                         pixman))
+    (arguments
+     (list #:configure-flags #~(list "--enable-strict-locations=yes"
+                                     (string-append "XRDP_CFLAGS=-I"
+                                                    #$(this-package-input
+                                                       "xrdp") "/common"))))
+    (home-page "https://github.com/neutrinolabs/xorgxrdp")
+    (synopsis "Xorg drivers for xrdp")
+    (description
+     "xorgxrdp is a collection of modules to be used with a pre-existing X.Org
+install to make the X server act like X11rdp.  Unlike X11rdp, you don't have to
+recompile the whole X Window System.  Instead, additional modules are installed
+to a location where the existing Xorg installation would pick them.")
+    (license license:x11)))
-- 
2.41.0





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

* bug#64261: [PATCH v6 1/2] gnu: Add xrdp
  2023-08-10  5:31 ` [bug#64261] [PATCH v6 1/2] " Andy Tai
  2023-08-10  5:31   ` [bug#64261] [PATCH v6 2/2] gnu: Add xorgxrdp Andy Tai
@ 2023-08-12 20:42   ` Ludovic Courtès
  1 sibling, 0 replies; 17+ messages in thread
From: Ludovic Courtès @ 2023-08-12 20:42 UTC (permalink / raw)
  To: Andy Tai; +Cc: 64261-done

Andy Tai <atai@atai.org> skribis:

> * gnu/packages/rdesktop.scm (xrdp): New variable

[...]

> * gnu/packages/rdesktop.scm (xorgxrdp): New variable

Hi Andy!  Applied after removing autoconf/automake/libtool from
‘native-inputs’ since they were unused.

Thanks,
Ludo’.




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

end of thread, other threads:[~2023-08-12 20:43 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-24  7:37 [bug#64261] [PATCH] gnu: Add xrdp Andy Tai
2023-06-24  9:21 ` [bug#64261] [PATCH v2] " Andy Tai
2023-06-27  7:29 ` [bug#64261] [PATCH v3] gnu: Add xrdp and xorgxrdp Andy Tai
2023-07-11 14:12   ` [bug#64261] [PATCH] gnu: Add xrdp Ludovic Courtès
2023-07-11 14:13     ` Andy Tai
2023-07-22 23:28 ` [bug#64261] [PATCH v4 0/2] Add xrdp and xorgxrdp Andy Tai
2023-07-22 23:28   ` [bug#64261] [PATCH v4 1/2] gnu: Add xrdp Andy Tai
2023-07-22 23:28   ` [bug#64261] [PATCH v4 2/2] gnu: Add xorgxrdp Andy Tai
2023-07-26  5:56 ` [bug#64261] Guix QA showing failure on invalid derivation Andy Tai
2023-07-26  9:53   ` Christopher Baines
2023-07-29  3:53 ` [bug#64261] [PATCH v5 1/2] gnu: Add xrdp Andy Tai
2023-07-29  3:53   ` [bug#64261] [PATCH v5 2/2] gnu: Add xorgxrdp Andy Tai
2023-08-07 13:27   ` [bug#64261] [PATCH] gnu: Add xrdp Ludovic Courtès
2023-08-07 13:29     ` Andy Tai
2023-08-10  5:31 ` [bug#64261] [PATCH v6 1/2] " Andy Tai
2023-08-10  5:31   ` [bug#64261] [PATCH v6 2/2] gnu: Add xorgxrdp Andy Tai
2023-08-12 20:42   ` bug#64261: [PATCH v6 1/2] gnu: Add xrdp 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).