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

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

[-- Attachment #1: Type: text/plain, Size: 999 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

x2goclient and nx-libs
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.

- [x] Changed license
- [x] Updated maintainer
- [x] Changed nx-libs source to https://github.com/ArcticaProject/nx-libs/
- [x] Updated nx-libs and x2goclient versions to latest
- [x] Set ``python_version``
- [x] Added libs to ``common/shlib``
- [x] Patch for musl, and bigfont
- [ ] Cross compile nx-libs and x2goclient

Note:
- https://git.alpinelinux.org/aports/tree/community/nx-libs/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: 5378 bytes --]

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

---
 common/shlibs                                 |  3 ++
 .../patches/fix-musl-headers-x86.patch        | 11 ++++++
 srcpkgs/nx-libs/patches/xf86bigfont.patch     | 11 ++++++
 srcpkgs/nx-libs/template                      | 38 +++++++++++++++++++
 4 files changed, 63 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..b30779a3c35
--- /dev/null
+++ b/srcpkgs/nx-libs/template
@@ -0,0 +1,38 @@
+# Template file for 'nx-libs'
+pkgname=nx-libs
+version=3.5.99.24
+revision=1
+build_style=gnu-makefile
+make_install_args="PREFIX=/usr"
+hostmakedepends="autoconf automake libtool pkg-config which imake xkbcomp"
+makedepends="xorgproto zlib-devel libjpeg-turbo-devel libpng-devel libXext-devel libXdamage-devel libXrandr-devel libXtst-devel pixman-devel gccmakedep 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
+nocross="imake will be droped in the next version https://github.com/ArcticaProject/nx-libs/issues/975"
+python_version=3
+
+post_patch() {
+	# Every Makefile has /usr/local as PREFIX, so replace that
+	sed -i -e 's,/usr/local,/usr,' nx-X11/config/cf/site.def
+}
+
+do_build() {
+	make ${makejobs} PREFIX=/usr \
+		CONFIGURE="./configure ${configure_args} --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include"
+}
+
+post_install() {
+	# remove extras, GL, and other unneeded headers
+	rm -rf ${DESTDIR}/usr/include/GL
+	rm -rf ${DESTDIR}/usr/include/nx-X11
+	rm -rf ${DESTDIR}/usr/include/nx-X11/extensions/XK*.h
+	rm -rf ${DESTDIR}/usr/include/nx-X11/extensions/*Xv*.h
+	rm -rf ${DESTDIR}/usr/include/nx-X11/extensions/Xres*.h
+	rm -rf ${DESTDIR}/usr/include/nx-X11/extensions/XIproto.h
+	rm -rf ${DESTDIR}/usr/include/nx-X11/extensions/XI.h
+	rm -rf ${DESTDIR}/usr/include/nx-X11/Xtrans
+}

From 191116065a60c38322294cfbd48f107d38e35993 Mon Sep 17 00:00:00 2001
From: eoli3n <jkirsz@gmail.com>
Date: Fri, 25 Dec 2020 22:35:54 +0100
Subject: [PATCH 2/2] 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