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: 16168 bytes --]

From fbaf320724c68c23f9dc554badc68102f89ad94d Mon Sep 17 00:00:00 2001
From: eoli3n <jkirsz@gmail.com>
Date: Fri, 25 Dec 2020 22:35:08 +0100
Subject: [PATCH 01/10] 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                      | 37 +++++++++++++++++++
 4 files changed, 62 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 079e0ebe5d0..1271dc26212 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4049,3 +4049,6 @@ libtdb-wrap-samba4.so samba-libs-4.13.2_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwbclient.so.0 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..e0a85399b43
--- /dev/null
+++ b/srcpkgs/nx-libs/template
@@ -0,0 +1,37 @@
+# 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
+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 40f9b6aa7e1869178cf78da677846ac30b90a5ec Mon Sep 17 00:00:00 2001
From: eoli3n <jkirsz@gmail.com>
Date: Fri, 25 Dec 2020 22:35:54 +0100
Subject: [PATCH 02/10] 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 85744cc1e6e339d389be80e2b7749dfd740d1c63 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 26 Dec 2020 13:37:35 +0100
Subject: [PATCH 03/10] vttest: update to 202012250920.

---
 srcpkgs/vttest/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/vttest/template b/srcpkgs/vttest/template
index 8316c746d2c..39ad569a783 100644
--- a/srcpkgs/vttest/template
+++ b/srcpkgs/vttest/template
@@ -1,6 +1,6 @@
 # Template file for 'vttest'
 pkgname=vttest
-version=20200920
+version=202012250920
 revision=1
 build_style=gnu-configure
 short_desc="Tests the compatibility so-called 'VT100-compatible' terminals"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-3-Clause"
 homepage="http://invisible-island.net/vttest/vttest.html"
 distfiles="http://invisible-mirror.net/archives/${pkgname}/${pkgname}-${version}.tgz"
-checksum=c9619d6bbe5804181dda18ec2901d51ce5551259565b9ccb13d5ef86b3bfb301
+checksum=069db5efca2325280bc14ffe14ff7085e3ddfe6ae152499155daa28d94b90421
 
 post_install() {
 	vlicense COPYING

From 23caeacacc88e0115c1983b384dc31bb712e320a Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 26 Dec 2020 13:41:25 +0100
Subject: [PATCH 04/10] vttest: update to 20201225.

---
 srcpkgs/vttest/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vttest/template b/srcpkgs/vttest/template
index 39ad569a783..595b4df7482 100644
--- a/srcpkgs/vttest/template
+++ b/srcpkgs/vttest/template
@@ -1,6 +1,6 @@
 # Template file for 'vttest'
 pkgname=vttest
-version=202012250920
+version=20201225
 revision=1
 build_style=gnu-configure
 short_desc="Tests the compatibility so-called 'VT100-compatible' terminals"

From bb6ad89b1c5c294d895e68216ffb1e4fe602aafc Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 23 Dec 2020 23:01:27 +0200
Subject: [PATCH 05/10] oblibs: update to 0.1.1.1.

---
 common/shlibs           | 2 +-
 srcpkgs/oblibs/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 24e2df09f9d..a05844bbebb 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3697,7 +3697,7 @@ libbitcoin-server.so.0 libbitcoin-server-3.5.0_1
 libvpd-2.2.so.2 libvpd-2.2.6_1
 libvpd_cxx-2.2.so.2 libvpd-2.2.6_1
 liblcf.so.0 liblcf-0.6.0_1
-liboblibs.so.0.0 oblibs-0.0.1.1_1
+liboblibs.so.0.1 oblibs-0.1.1.1_1
 libaal-1.0.so.7 libaal-1.0.7_1
 libaal-minimal.so.0 libaal-1.0.7_1
 libcli.so.1.9 libcli-1.9.8.4_1
diff --git a/srcpkgs/oblibs/template b/srcpkgs/oblibs/template
index 6fb5662b0eb..f2e2aa0b53f 100644
--- a/srcpkgs/oblibs/template
+++ b/srcpkgs/oblibs/template
@@ -1,6 +1,6 @@
 # Template file for 'oblibs'
 pkgname=oblibs
-version=0.1.0.0
+version=0.1.1.1
 revision=1
 wrksrc="${pkgname}-v${version}"
 build_style=configure
@@ -11,10 +11,10 @@ maintainer="mobinmob <mobinmob@disroot.org>"
 license="ISC"
 homepage="https://framagit.org/Obarun/oblibs"
 distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.bz2"
-checksum=161e9b094c375ba2d073047617d050ce49f317d358927e1a73ce5a14d27daba6
+checksum=7b19fab4c1e3926c6f5dad6cc7373f250ac4bf9a1541ac01737e169b46dc765a
 
 post_install() {
-	vlicense COPYING
+	vlicense LICENSE
 }
 
 oblibs-devel_package() {

From cc2b7fd7017d5e8a0ab5c866963a2a12bf3a42a5 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 23 Dec 2020 23:02:48 +0200
Subject: [PATCH 06/10] 66: revbump for oblibs update.

---
 srcpkgs/66/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/66/template b/srcpkgs/66/template
index c6ace3e6a34..05d032bb8a5 100644
--- a/srcpkgs/66/template
+++ b/srcpkgs/66/template
@@ -1,7 +1,7 @@
 # Template file for '66'
 pkgname=66
 version=0.5.1.1
-revision=1
+revision=2
 wrksrc="66-v${version}"
 build_style=configure
 configure_args="--prefix=/usr

From 15dfd459ede8ceeb91e670406c1cb9a29079e8c6 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 23 Dec 2020 23:03:14 +0200
Subject: [PATCH 07/10] 66-tools: revbump for oblibs update.

---
 srcpkgs/66-tools/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/66-tools/template b/srcpkgs/66-tools/template
index 9ad51d48f04..4fe5daae075 100644
--- a/srcpkgs/66-tools/template
+++ b/srcpkgs/66-tools/template
@@ -1,7 +1,7 @@
 # Template file for '66-tools'
 pkgname=66-tools
 version=0.0.6.2
-revision=1
+revision=2
 wrksrc=${pkgname}-v${version}
 build_style=configure
 configure_args="--prefix=/usr

From 2bfbb3ffff39f62aa02d60f56a947833c041c1c0 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 26 Dec 2020 16:46:33 +0100
Subject: [PATCH 08/10] linux5.10: update to 5.10.3.

---
 srcpkgs/linux5.10/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 1de8a878403..c3a7c887bf6 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,6 +1,6 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
-version=5.10.2
+version=5.10.3
 revision=1
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
@@ -8,7 +8,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
 homepage="https://www.kernel.org"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz"
-checksum=3b84e13abae26af17ebccc4d7212f5843a991127a73a320848d5c6942ef781a2
+checksum=f9153333e5ce60c9cd9a501fbcb342ba6032b8fdb2cb492115c5595712a19525
 python_version=3
 patch_args="-Np1"
 

From 622e649543f398c08a38c325e21c8b3af5d14495 Mon Sep 17 00:00:00 2001
From: eoli3n <jkirsz@gmail.com>
Date: Fri, 25 Dec 2020 22:35:08 +0100
Subject: [PATCH 09/10] 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                      | 37 +++++++++++++++++++
 4 files changed, 62 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..e0a85399b43
--- /dev/null
+++ b/srcpkgs/nx-libs/template
@@ -0,0 +1,37 @@
+# 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
+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 4b56c92507ddd68f7c4f2c567d32d4db5e9d2cb0 Mon Sep 17 00:00:00 2001
From: eoli3n <jkirsz@gmail.com>
Date: Fri, 25 Dec 2020 22:35:54 +0100
Subject: [PATCH 10/10] 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