Re: [PR PATCH] [Updated] nx-libs, x2goclient and x2goserver

[eoli3n <eoli3n@users.noreply.github.com>]

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

There is an updated pull request by eoli3n against master on the void-packages repository

https://github.com/eoli3n/void-packages x2goclient
https://github.com/void-linux/void-packages/pull/27432

nx-libs, x2goclient and x2goserver
Closes https://github.com/void-linux/void-packages/issues/9779 and https://github.com/void-linux/void-packages/issues/2091

From https://github.com/renatoaguiar/void-packages/tree/x2goclient
Ping @renatoaguiar, I sent you a mail, if you want to be the maintainer, just ask.

# nx-libs
- [x] Changed license
- [x] Updated maintainer
- [x] Changed nx-libs source to https://github.com/ArcticaProject/nx-libs/
- [x] Updated to latest version
- [x] Set ``python_version``
- [x] Added libs to ``common/shlib``
- [x] Patch for musl, and bigfont
- [x] Disable cross compilation for the current version
- [x] Discussion to fix some limitations upstream in next versions : https://github.com/ArcticaProject/nx-libs/issues/975
  - Drop imake for automake: crossbuild for arm
  - Patch mesa and bigfont: native musl builds
  - ``configure.ac`` at root level instead of subdirs: fix ``build_style=gnu-makefile``

The current version is ok to be merged.

# x2goclient
- [x] Changed license
- [x] Updated maintainer
- [x] Updated to latest version
- [ ] Disable cross compilation for the current version ?

# x2goserver

- [x] Create template
- [x] Patch ``/usr/sbin`` references
- [ ] Sgid https://github.com/eugenesan/x2goserver/blob/master/INSTALL#L31
- [ ] Init script for ``$PREFIX/bin/x2gocleansessions``
- [ ] Write runit service
- [ ] Disable cross compilation for the current version ?

# Note
- https://git.alpinelinux.org/aports/tree/community/nx-libs/APKBUILD
- https://git.alpinelinux.org/aports/tree/community/x2goserver/APKBUILD

A patch file from https://github.com/void-linux/void-packages/pull/27432.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-x2goclient-27432.patch --]
[-- Type: text/x-diff, Size: 7439 bytes --]

From ebe0d964f55d2663c8da51bbb2f332b7ab5104d5 Mon Sep 17 00:00:00 2001
From: eoli3n <jkirsz@gmail.com>
Date: Fri, 25 Dec 2020 22:35:08 +0100
Subject: [PATCH 1/3] New package: nx-libs-3.5.99.24

---
 common/shlibs                                 |  3 +
 .../patches/fix-musl-headers-x86.patch        | 11 ++++
 srcpkgs/nx-libs/patches/xf86bigfont.patch     | 11 ++++
 srcpkgs/nx-libs/template                      | 62 +++++++++++++++++++
 4 files changed, 87 insertions(+)
 create mode 100644 srcpkgs/nx-libs/patches/fix-musl-headers-x86.patch
 create mode 100644 srcpkgs/nx-libs/patches/xf86bigfont.patch
 create mode 100644 srcpkgs/nx-libs/template

diff --git a/common/shlibs b/common/shlibs
index a05844bbebb..74861ab2845 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4040,3 +4040,6 @@ libndr-samba4.so samba-libs-4.13.2_1
 libsmb-transport-samba4.so samba-libs-4.13.2_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
+libXcomp.so.3 nx-libs-3.5.99.24_1
+libXcompshad.so.3 nx-libs-3.5.99.24_1
+libNX_X11.so.6 nx-libs-3.5.99.24_1
diff --git a/srcpkgs/nx-libs/patches/fix-musl-headers-x86.patch b/srcpkgs/nx-libs/patches/fix-musl-headers-x86.patch
new file mode 100644
index 00000000000..3f51b8e4b1a
--- /dev/null
+++ b/srcpkgs/nx-libs/patches/fix-musl-headers-x86.patch
@@ -0,0 +1,11 @@
+--- ./nx-X11/extras/Mesa/src/mesa/main/glheader.h.orig
++++ ./nx-X11/extras/Mesa/src/mesa/main/glheader.h
+@@ -62,7 +62,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+-#if defined(__linux__) && defined(__i386__)
++#if defined(__GLIBC__) && defined(__i386__)
+ #include <fpu_control.h>
+ #endif
+ #endif
diff --git a/srcpkgs/nx-libs/patches/xf86bigfont.patch b/srcpkgs/nx-libs/patches/xf86bigfont.patch
new file mode 100644
index 00000000000..b9972bc074d
--- /dev/null
+++ b/srcpkgs/nx-libs/patches/xf86bigfont.patch
@@ -0,0 +1,11 @@
+--- ./nx-X11/programs/Xserver/Xext/xf86bigfont.c
++++ ../xf86bigfont.c
+@@ -46,7 +46,7 @@
+ /* Linux libc4 and libc5 only (because glibc doesn't include kernel headers):
+    Linux 2.0.x and 2.2.x define SHMLBA as PAGE_SIZE, but forget to define
+    PAGE_SIZE. It is defined in <asm/page.h>. */
+-#include <asm/page.h>
++#include <limits.h>
+ #endif
+ #ifdef SVR4
+ #include <sys/sysmacros.h>
diff --git a/srcpkgs/nx-libs/template b/srcpkgs/nx-libs/template
new file mode 100644
index 00000000000..b18263aa1a3
--- /dev/null
+++ b/srcpkgs/nx-libs/template
@@ -0,0 +1,62 @@
+# Template file for 'nx-libs'
+pkgname=nx-libs
+version=3.5.99.24
+revision=1
+build_style=gnu-configure
+make_build_args="CONFIGURE=echo"
+make_install_args="PREFIX=/usr"
+hostmakedepends="autoconf automake libtool pkg-config which imake xkbcomp gccmakedep"
+makedepends="xorgproto zlib-devel libjpeg-turbo-devel libpng-devel
+ libXext-devel libXdamage-devel libXrandr-devel libXtst-devel pixman-devel
+ libXfont2-devel libxml2-devel libXcomposite-devel libXinerama-devel
+ libXpm-devel font-util"
+short_desc="NX X11 protocol compression libraries"
+maintainer="eoli3n <jkirsz@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/ArcticaProject/nx-libs"
+distfiles="https://github.com/ArcticaProject/nx-libs/archive/$version/$pkgname-$version.tar.gz"
+checksum=e1ea9ae7621ca955e9650caacd2260eed26aae2be4eff2b44c2b1aaecd69f9eb
+python_version=3
+nocross="imake attempts to run target executables on host"
+
+post_patch() {
+	# Replace hard-coded /usr/local ProjectRoot
+	vsed -e '/ProjectRoot/s,/usr/local,/usr,' -i nx-X11/config/cf/site.def
+	# Manually run autoreconf in pre_configure, disable in Makefile
+	vsed -e 's/autoreconf/echo &-disabled/' -i Makefile
+}
+
+pre_configure() {
+	# Create configure scripts for all subprojects
+	local _subdir
+	for _subdir in nxcomp nx-X11/lib nxcompshad nxproxy nxdialog; do
+		( cd ${_subdir} && autoreconf -vfsi )
+	done
+}
+
+do_configure() {
+	# Configure all subprojects in advance of build
+	local _subdir
+	for _subdir in nxcomp nxcompshad nxproxy nxdialog; do
+		( cd ${_subdir} && ./configure ${configure_args} )
+	done
+
+	# nx-X11 configure has an extra argument
+	( cd nx-X11/lib && ./configure ${configure_args} --disable-poll )
+}
+
+post_install() {
+	# Remove conflicting GL headers
+	rm -rf ${DESTDIR}/usr/include/GL
+}
+
+nx-libs-devel_install() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 24f738663d07e1a767f2fa4469bacb0a4d9f1c78 Mon Sep 17 00:00:00 2001
From: eoli3n <jkirsz@gmail.com>
Date: Fri, 25 Dec 2020 22:35:54 +0100
Subject: [PATCH 2/3] New package: x2goclient-4.1.2.2

---
 srcpkgs/x2goclient/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/x2goclient/template

diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
new file mode 100644
index 00000000000..e794a0d001f
--- /dev/null
+++ b/srcpkgs/x2goclient/template
@@ -0,0 +1,16 @@
+# Template file for 'x2goclient'
+pkgname=x2goclient
+version=4.1.2.2
+revision=1
+build_style=gnu-makefile
+make_build_target="build_client build_man"
+make_install_target="install_client install_man"
+hostmakedepends="pkg-config qt-devel-tools"
+makedepends="qt-devel libldap-devel libssh-devel libXpm-devel cups-devel"
+depends="nx-libs"
+short_desc="Graphical Qt5 client for X2Go"
+maintainer="eoli3n <jkirsz@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="http://www.x2go.org"
+distfiles="http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=c9953267c40fa67119ad96a73bacb1f266196da2059f0cdcd1b8d5199421d12a

From 8c941871ef29f3c9828964235027b2a30a50da79 Mon Sep 17 00:00:00 2001
From: eoli3n <jkirsz@gmail.com>
Date: Mon, 28 Dec 2020 23:15:17 +0100
Subject: [PATCH 3/3] New package: x2goserver-4.1.0.3

---
 srcpkgs/x2goserver/template | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 srcpkgs/x2goserver/template

diff --git a/srcpkgs/x2goserver/template b/srcpkgs/x2goserver/template
new file mode 100644
index 00000000000..158130a9671
--- /dev/null
+++ b/srcpkgs/x2goserver/template
@@ -0,0 +1,28 @@
+# Template file for 'x2goserver'
+pkgname=x2goserver
+version=4.1.0.3
+revision=1
+build_style=gnu-makefile
+hostmakedepends="pkg-config perl"
+makedepends="libssh2-devel"
+depends="perl perl-Config-Simple perl-DBI perl-Capture-Tiny perl-DBD-SQLite bash iproute2 makepasswd openssh lsof xauth perl-File-BaseDir nx-libs perl-File-Which"
+short_desc="Open source graphical Remote Desktop based on NX technology"
+maintainer="eoli3n <jkirsz@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="http://www.x2go.org"
+distfiles="http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=6776aaa354f5a44e349f0b3c176d4988c88a618c2edf46c98a37ae89c069dcd0
+system_groups="x2gouser"
+system_accounts="x2gouser"
+x2gouser_homedir="/var/lib/x2go"
+x2gouser_shell="/bin/false"
+
+post_extract() {
+	# Replace hard-coded /usr/sbin
+	for _file in x2goserver-printing/Makefile x2goserver/Makefile x2goserver-xsession/Makefile libx2go-server-db-perl/Makefile x2goserver-common/Makefile; do
+		vsed -e 's,/sbin,/bin,g' -i "$_file"
+	done
+	for _file in bin/x2golistdesktops bin/x2goresume-session bin/x2gostartagent sbin/x2gocleansessions; do
+		vsed -e 's,/usr/sbin,/usr/bin,g' -i x2goserver/"$_file"
+	done
+}