[PR PATCH] x2goclient and nx-libs

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] x2goclient and nx-libs
@ 2020-12-25 22:00 eoli3n
  2020-12-25 22:17 ` [PR PATCH] [Updated] " eoli3n
                   ` (40 more replies)
  0 siblings, 41 replies; 42+ messages in thread
From: eoli3n @ 2020-12-25 22:00 UTC (permalink / raw)
  To: ml

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

There is a new 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.

- Fixed x2goclient build by adding ``pkg-config`` dep
- Changed license
- Updated maintainer
- Updating nx-libs and x2goclient versions to latest

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

From ece502d46783be1574d390ee229145655e2026d8 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

---
 srcpkgs/nx-libs/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/nx-libs/template

diff --git a/srcpkgs/nx-libs/template b/srcpkgs/nx-libs/template
new file mode 100644
index 00000000000..3ec65c818d3
--- /dev/null
+++ b/srcpkgs/nx-libs/template
@@ -0,0 +1,19 @@
+# Template file for 'nx-libs'
+pkgname=nx-libs
+version=3.5.99.22
+revision=1
+build_style=gnu-makefile
+make_install_args="PREFIX=/usr"
+hostmakedepends="autoconf automake libtool pkg-config"
+makedepends="xorgproto zlib-devel libjpeg-turbo-devel libpng-devel"
+short_desc="NX X11 protocol compression libraries"
+maintainer="eoli3n <jkirsz@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="http://www.x2go.org"
+distfiles="https://code.x2go.org/releases/source/${pkgname}/${pkgname}-${version}-lite.tar.gz"
+checksum=0c411aae869675a0d1803e629592ce1c4ade598611e5dcc444696494b92a8e4e
+
+do_build() {
+	make ${makejobs} PREFIX=/usr \
+	     CONFIGURE="./configure ${configure_args} --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include"
+}

From c4cc371985080ba02607e5d66d6e1ea5d7d718be 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

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

* Re: [PR PATCH] [Updated] x2goclient and nx-libs
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
@ 2020-12-25 22:17 ` eoli3n
  2020-12-25 22:58 ` yopito
                   ` (39 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: eoli3n @ 2020-12-25 22:17 UTC (permalink / raw)
  To: ml

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

- Fixed x2goclient build by adding ``pkg-config`` dep
- Changed license
- Updated maintainer
- Updating nx-libs and x2goclient versions to latest

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

From d8b9bf1bef4b1e510760bb7ca9c2e72ff5fcf096 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

---
 srcpkgs/nx-libs/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/nx-libs/template

diff --git a/srcpkgs/nx-libs/template b/srcpkgs/nx-libs/template
new file mode 100644
index 00000000000..363cab304ce
--- /dev/null
+++ b/srcpkgs/nx-libs/template
@@ -0,0 +1,19 @@
+# Template file for 'nx-libs'
+pkgname=nx-libs
+version=3.5.99.22
+revision=1
+build_style=gnu-makefile
+make_install_args="PREFIX=/usr"
+hostmakedepends="autoconf automake libtool pkg-config"
+makedepends="xorgproto zlib-devel libjpeg-turbo-devel libpng-devel"
+short_desc="NX X11 protocol compression libraries"
+maintainer="eoli3n <jkirsz@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="http://www.x2go.org"
+distfiles="https://code.x2go.org/releases/source/${pkgname}/${pkgname}-${version}-lite.tar.gz"
+checksum=0c411aae869675a0d1803e629592ce1c4ade598611e5dcc444696494b92a8e4e
+
+do_build() {
+	make ${makejobs} PREFIX=/usr \
+	     CONFIGURE="./configure ${configure_args} --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include --host=${XBPS_TARGET_MACHINE}"
+}

From b648b1af67d00d507cd88e3228596810c0bf8598 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

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

* Re: x2goclient and nx-libs
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
  2020-12-25 22:17 ` [PR PATCH] [Updated] " eoli3n
@ 2020-12-25 22:58 ` yopito
  2020-12-25 23:35 ` [PR PATCH] [Updated] " eoli3n
                   ` (38 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: yopito @ 2020-12-25 22:58 UTC (permalink / raw)
  To: ml

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

New comment by yopito on void-packages repository

https://github.com/void-linux/void-packages/pull/27432#issuecomment-751297765

Comment:
hello, I've retrieved an old WIP branch of mine: https://github.com/yopito/void-packages/tree/WIP.x2go
Might help you to package it.
Feel free to reuse its content.

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

* Re: [PR PATCH] [Updated] x2goclient and nx-libs
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
  2020-12-25 22:17 ` [PR PATCH] [Updated] " eoli3n
  2020-12-25 22:58 ` yopito
@ 2020-12-25 23:35 ` eoli3n
  2020-12-26  0:39 ` eoli3n
                   ` (37 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: eoli3n @ 2020-12-25 23:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 895 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] Fixed x2goclient build by adding ``pkg-config`` dep
- [x] Changed license
- [x] Updated maintainer
- [x] Updated nx-libs and x2goclient versions to latest
- [ ] Package ``nx-lib-full`` instead of ``nx-lib-lite`` to be able to package ``x2goserver``
- [ ] Cross compile nx-libs and x2goclient

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

From c52c06e85576a23b260cf2fba6e4e7b96da5b347 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

---
 srcpkgs/nx-libs/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/nx-libs/template

diff --git a/srcpkgs/nx-libs/template b/srcpkgs/nx-libs/template
new file mode 100644
index 00000000000..3ec65c818d3
--- /dev/null
+++ b/srcpkgs/nx-libs/template
@@ -0,0 +1,19 @@
+# Template file for 'nx-libs'
+pkgname=nx-libs
+version=3.5.99.22
+revision=1
+build_style=gnu-makefile
+make_install_args="PREFIX=/usr"
+hostmakedepends="autoconf automake libtool pkg-config"
+makedepends="xorgproto zlib-devel libjpeg-turbo-devel libpng-devel"
+short_desc="NX X11 protocol compression libraries"
+maintainer="eoli3n <jkirsz@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="http://www.x2go.org"
+distfiles="https://code.x2go.org/releases/source/${pkgname}/${pkgname}-${version}-lite.tar.gz"
+checksum=0c411aae869675a0d1803e629592ce1c4ade598611e5dcc444696494b92a8e4e
+
+do_build() {
+	make ${makejobs} PREFIX=/usr \
+	     CONFIGURE="./configure ${configure_args} --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include"
+}

From dda3b024d8efe2c49185fb81b33e4b8b4ab53246 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

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

* Re: [PR PATCH] [Updated] x2goclient and nx-libs
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (2 preceding siblings ...)
  2020-12-25 23:35 ` [PR PATCH] [Updated] " eoli3n
@ 2020-12-26  0:39 ` eoli3n
  2020-12-26  9:53 ` eoli3n
                   ` (36 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: eoli3n @ 2020-12-26  0:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 895 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] Fixed x2goclient build by adding ``pkg-config`` dep
- [x] Changed license
- [x] Updated maintainer
- [x] Updated nx-libs and x2goclient versions to latest
- [ ] Package ``nx-lib-full`` instead of ``nx-lib-lite`` to be able to package ``x2goserver``
- [ ] Cross compile nx-libs and x2goclient

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

From 4e57d6225e80b8c328e15276092a665035c51b1b 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

---
 srcpkgs/nx-libs/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/nx-libs/template

diff --git a/srcpkgs/nx-libs/template b/srcpkgs/nx-libs/template
new file mode 100644
index 00000000000..53703c25f19
--- /dev/null
+++ b/srcpkgs/nx-libs/template
@@ -0,0 +1,20 @@
+# Template file for 'nx-libs'
+pkgname=nx-libs
+version=3.5.99.22
+revision=1
+build_style=gnu-makefile
+make_install_args="PREFIX=/usr"
+hostmakedepends="autoconf automake libtool pkg-config which imake"
+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"
+short_desc="NX X11 protocol compression libraries"
+maintainer="eoli3n <jkirsz@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="http://www.x2go.org"
+distfiles="https://code.x2go.org/releases/source/${pkgname}/${pkgname}-${version}-full.tar.gz"
+checksum=fe8851d96c2eedfe5caf4d2c0de870e06546471605da8a3742cfbadaad44a65f
+python_version=3.9
+
+do_build() {
+	make ${makejobs} PREFIX=/usr \
+	     CONFIGURE="./configure ${configure_args} --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include"
+}

From 9f380a35c3205764fdac972a8cedfb1202604d16 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

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

* Re: [PR PATCH] [Updated] x2goclient and nx-libs
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (3 preceding siblings ...)
  2020-12-26  0:39 ` eoli3n
@ 2020-12-26  9:53 ` eoli3n
  2020-12-26 10:23 ` eoli3n
                   ` (35 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: eoli3n @ 2020-12-26  9:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 836 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] Updated nx-libs and x2goclient versions to latest
- [x] Package ``nx-lib-full`` instead of ``nx-lib-lite`` to be able to package ``x2goserver``
- [ ] Cross compile nx-libs and x2goclient

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

From d1e20d67e81ba3342e24da5a1f68c8d2b39d5a42 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

---
 srcpkgs/nx-libs/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/nx-libs/template

diff --git a/srcpkgs/nx-libs/template b/srcpkgs/nx-libs/template
new file mode 100644
index 00000000000..99a5a521377
--- /dev/null
+++ b/srcpkgs/nx-libs/template
@@ -0,0 +1,20 @@
+# Template file for 'nx-libs'
+pkgname=nx-libs
+version=3.5.99.22
+revision=1
+build_style=gnu-makefile
+make_install_args="PREFIX=/usr"
+hostmakedepends="autoconf automake libtool pkg-config which imake"
+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"
+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=fe8851d96c2eedfe5caf4d2c0de870e06546471605da8a3742cfbadaad44a65f
+python_version=3.9
+
+do_build() {
+	make ${makejobs} PREFIX=/usr \
+	     CONFIGURE="./configure ${configure_args} --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include"
+}

From e6b2cbf6fdf198599a931ce6d644f0e149aaece7 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

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

* Re: [PR PATCH] [Updated] x2goclient and nx-libs
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (4 preceding siblings ...)
  2020-12-26  9:53 ` eoli3n
@ 2020-12-26 10:23 ` eoli3n
  2020-12-26 10:31 ` eoli3n
                   ` (34 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: eoli3n @ 2020-12-26 10:23 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 896 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] Updated nx-libs and x2goclient versions to latest
- [x] Changed nx-libs source to https://github.com/ArcticaProject/nx-libs/
- [ ] 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: 3895 bytes --]

From 1a70e065d418bba41e65c03465146fc8912e8a45 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/template                      | 20 +++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 100644 srcpkgs/nx-libs/patches/fix-musl-headers-x86.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/template b/srcpkgs/nx-libs/template
new file mode 100644
index 00000000000..7edb66e7276
--- /dev/null
+++ b/srcpkgs/nx-libs/template
@@ -0,0 +1,20 @@
+# 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"
+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"
+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.9
+
+do_build() {
+	make ${makejobs} PREFIX=/usr \
+	     CONFIGURE="./configure ${configure_args} --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include"
+}

From 56ee9fb13dc1036f62c4518de666f336fcea749f 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

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

* Re: [PR PATCH] [Updated] x2goclient and nx-libs
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (5 preceding siblings ...)
  2020-12-26 10:23 ` eoli3n
@ 2020-12-26 10:31 ` eoli3n
  2020-12-26 10:52 ` eoli3n
                   ` (33 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: eoli3n @ 2020-12-26 10:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 986 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
- [ ] 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: 4658 bytes --]

From c5b7d406c2509c6c9d3dc5ac41e17664a51408a9 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                      | 20 +++++++++++++++++++
 4 files changed, 45 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..94578dd7788
--- /dev/null
+++ b/srcpkgs/nx-libs/patches/xf86bigfont.patch
@@ -0,0 +1,11 @@
+--- nx-libs-3.5.0.28/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..7950336c1a7
--- /dev/null
+++ b/srcpkgs/nx-libs/template
@@ -0,0 +1,20 @@
+# 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"
+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"
+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
+
+do_build() {
+	make ${makejobs} PREFIX=/usr \
+	     CONFIGURE="./configure ${configure_args} --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include"
+}

From b5fb9e164a1445841800606642390d04b6a5b2a5 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

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

* Re: [PR PATCH] [Updated] x2goclient and nx-libs
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (6 preceding siblings ...)
  2020-12-26 10:31 ` eoli3n
@ 2020-12-26 10:52 ` eoli3n
  2020-12-26 11:34 ` eoli3n
                   ` (32 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: eoli3n @ 2020-12-26 10:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 986 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
- [ ] 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: 4643 bytes --]

From a56656c8bff8098d7cd1412cb70d9d26f18beb9c 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                      | 20 +++++++++++++++++++
 4 files changed, 45 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..7950336c1a7
--- /dev/null
+++ b/srcpkgs/nx-libs/template
@@ -0,0 +1,20 @@
+# 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"
+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"
+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
+
+do_build() {
+	make ${makejobs} PREFIX=/usr \
+	     CONFIGURE="./configure ${configure_args} --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include"
+}

From 305f088dce65b2b9a27630f83ced0506243e96c8 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

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

* Re: [PR PATCH] [Updated] x2goclient and nx-libs
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (7 preceding siblings ...)
  2020-12-26 10:52 ` eoli3n
@ 2020-12-26 11:34 ` eoli3n
  2020-12-26 11:39 ` eoli3n
                   ` (31 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: eoli3n @ 2020-12-26 11:34 UTC (permalink / raw)
  To: ml

[-- 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: 4794 bytes --]

From f7959cb274b6b889be99009179833f455247aeac 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                      | 25 +++++++++++++++++++
 4 files changed, 50 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..f09678df979
--- /dev/null
+++ b/srcpkgs/nx-libs/template
@@ -0,0 +1,25 @@
+# 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 font-util"
+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"
+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"
+}

From 62d064f5406ab0ac0197ab9d0c5892cf213de4bc 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

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

* Re: [PR PATCH] [Updated] x2goclient and nx-libs
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (8 preceding siblings ...)
  2020-12-26 11:34 ` eoli3n
@ 2020-12-26 11:39 ` eoli3n
  2020-12-26 11:51 ` eoli3n
                   ` (30 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: eoli3n @ 2020-12-26 11:39 UTC (permalink / raw)
  To: ml

[-- 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: 5268 bytes --]

From 4151e7d3cc8ea16af27339179f58e4d373c5efa7 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                      | 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..b0eab9ff67f
--- /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"
+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 xkbcomp 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 f790ba17e22f2b387f2930701794933286686146 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

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

* Re: [PR PATCH] [Updated] x2goclient and nx-libs
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (9 preceding siblings ...)
  2020-12-26 11:39 ` eoli3n
@ 2020-12-26 11:51 ` eoli3n
  2020-12-26 16:03 ` eoli3n
                   ` (29 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: eoli3n @ 2020-12-26 11:51 UTC (permalink / raw)
  To: ml

[-- 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: 5268 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 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                      | 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 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

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

* Re: [PR PATCH] [Updated] x2goclient and nx-libs
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (10 preceding siblings ...)
  2020-12-26 11:51 ` eoli3n
@ 2020-12-26 16:03 ` eoli3n
  2020-12-26 16:10 ` eoli3n
                   ` (28 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: eoli3n @ 2020-12-26 16:03 UTC (permalink / raw)
  To: ml

[-- 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

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

* Re: [PR PATCH] [Updated] x2goclient and nx-libs
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (11 preceding siblings ...)
  2020-12-26 16:03 ` eoli3n
@ 2020-12-26 16:10 ` eoli3n
  2020-12-27 17:08 ` eoli3n
                   ` (27 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: eoli3n @ 2020-12-26 16:10 UTC (permalink / raw)
  To: ml

[-- 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: 5273 bytes --]

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 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                      | 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 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

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

* Re: [PR PATCH] [Updated] x2goclient and nx-libs
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (12 preceding siblings ...)
  2020-12-26 16:10 ` eoli3n
@ 2020-12-27 17:08 ` eoli3n
  2020-12-27 17:11 ` eoli3n
                   ` (26 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: eoli3n @ 2020-12-27 17:08 UTC (permalink / raw)
  To: ml

[-- 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: 5653 bytes --]

From 34f321ae5d1ca17f46112419979d50ae77aa96db 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                      | 52 +++++++++++++++++++
 4 files changed, 77 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..004d3ecc7de
--- /dev/null
+++ b/srcpkgs/nx-libs/template
@@ -0,0 +1,52 @@
+# 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"
+    make -j1 \
+		PREFIX=/usr \
+		USRLIBDIR=/usr/lib \
+		SHLIBDIR=/usr/lib \
+		CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --includedir=/usr/include"
+}
+
+do_install(){
+	make \
+		PREFIX=/usr \
+		DESTDIR="$pkgdir" \
+		NXLIBDIR=/usr/lib/nx \
+		SHLIBDIR=/usr/lib \
+		CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --includedir=/usr/include" \
+		install
+}
+
+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 4384cfb094587a875e7ccff432e10d7af8572e9c 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

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

* Re: [PR PATCH] [Updated] x2goclient and nx-libs
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (13 preceding siblings ...)
  2020-12-27 17:08 ` eoli3n
@ 2020-12-27 17:11 ` eoli3n
  2020-12-27 17:26 ` eoli3n
                   ` (25 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: eoli3n @ 2020-12-27 17:11 UTC (permalink / raw)
  To: ml

[-- 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: 5651 bytes --]

From d68b3e33984162084cc0559bbdadd70e3f956693 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                      | 52 +++++++++++++++++++
 4 files changed, 77 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..ad27e489564
--- /dev/null
+++ b/srcpkgs/nx-libs/template
@@ -0,0 +1,52 @@
+# 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"
+	make -j1 \
+		PREFIX=/usr \
+		USRLIBDIR=/usr/lib \
+		SHLIBDIR=/usr/lib \
+		CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --includedir=/usr/include"
+}
+
+do_install() {
+	make \
+		PREFIX=/usr \
+		DESTDIR="$pkgdir" \
+		NXLIBDIR=/usr/lib/nx \
+		SHLIBDIR=/usr/lib \
+		CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --includedir=/usr/include" \
+		install
+}
+
+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 13a1341c16df450f74b9d5f8d3ef1e812fbf94e2 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

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

* Re: [PR PATCH] [Updated] x2goclient and nx-libs
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (14 preceding siblings ...)
  2020-12-27 17:11 ` eoli3n
@ 2020-12-27 17:26 ` eoli3n
  2020-12-28 19:15 ` eoli3n
                   ` (24 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: eoli3n @ 2020-12-27 17:26 UTC (permalink / raw)
  To: ml

[-- 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: 5654 bytes --]

From 4b13769c0d35cb7657557ef26a13bd995be45492 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                      | 52 +++++++++++++++++++
 4 files changed, 77 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..2e9bfa3b44c
--- /dev/null
+++ b/srcpkgs/nx-libs/template
@@ -0,0 +1,52 @@
+# 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"
+	make -j1 \
+		PREFIX=/usr \
+		USRLIBDIR=/usr/lib \
+		SHLIBDIR=/usr/lib \
+		CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --includedir=/usr/include"
+}
+
+do_install() {
+	make \
+		PREFIX=/usr \
+		DESTDIR="${DESTDIR}" \
+		NXLIBDIR=/usr/lib/nx \
+		SHLIBDIR=/usr/lib \
+		CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --includedir=/usr/include" \
+		install
+}
+
+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 eefe6dcff71492e45bbca9da676feb4d6db7b3df 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

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

* Re: [PR PATCH] [Updated] x2goclient and nx-libs
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (15 preceding siblings ...)
  2020-12-27 17:26 ` eoli3n
@ 2020-12-28 19:15 ` eoli3n
  2020-12-28 19:17 ` eoli3n
                   ` (23 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: eoli3n @ 2020-12-28 19:15 UTC (permalink / raw)
  To: ml

[-- 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 be043272665e4c286034954f949aab04a7bbc456 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..95128d9e61b
--- /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
+nocross="imake will be droped in the next version https://github.com/ArcticaProject/nx-libs/issues/975"
+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 cee64554eea3d8293a265b4a2ab861c04a7833ff 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

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

* Re: [PR PATCH] [Updated] x2goclient and nx-libs
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (16 preceding siblings ...)
  2020-12-28 19:15 ` eoli3n
@ 2020-12-28 19:17 ` eoli3n
  2020-12-28 19:26 ` ahesford
                   ` (22 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: eoli3n @ 2020-12-28 19:17 UTC (permalink / raw)
  To: ml

[-- 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

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

* Re: x2goclient and nx-libs
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (17 preceding siblings ...)
  2020-12-28 19:17 ` eoli3n
@ 2020-12-28 19:26 ` ahesford
  2020-12-28 19:37 ` [PR PATCH] [Updated] " eoli3n
                   ` (21 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: ahesford @ 2020-12-28 19:26 UTC (permalink / raw)
  To: ml

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/27432#issuecomment-751836821

Comment:
Cf. https://github.com/ahesford/void-packages/commit/2653816f13e501d10657b9c1094c8ecbe4004c9b

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

* Re: [PR PATCH] [Updated] x2goclient and nx-libs
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (18 preceding siblings ...)
  2020-12-28 19:26 ` ahesford
@ 2020-12-28 19:37 ` eoli3n
  2020-12-28 22:15 ` eoli3n
                   ` (20 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: eoli3n @ 2020-12-28 19:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1270 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
- [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 support: crossbuild for arm
  - Patch mesa and bigfont: native musl builds

The current version is ok to be merged.

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

From 3040ad83249571e1d93a789bfc03fa1790c664a3 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                      | 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 756ec9ab110f7964f8a82d6d7b5db375bea0c72e 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

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

* Re: [PR PATCH] [Updated] x2goclient and nx-libs
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (19 preceding siblings ...)
  2020-12-28 19:37 ` [PR PATCH] [Updated] " eoli3n
@ 2020-12-28 22:15 ` eoli3n
  2020-12-28 22:18 ` eoli3n
                   ` (19 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: eoli3n @ 2020-12-28 22:15 UTC (permalink / raw)
  To: ml

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

# 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 support: crossbuild for arm
  - Patch mesa and bigfont: native musl builds

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

From 3040ad83249571e1d93a789bfc03fa1790c664a3 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.22

---
 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 756ec9ab110f7964f8a82d6d7b5db375bea0c72e 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 3722e5d3d03cd3a42bea842f7ad5ed1d367c2801 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..7d252170fb5
--- /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 and terminal server 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
+}

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

* Re: [PR PATCH] [Updated] x2goclient and nx-libs
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (20 preceding siblings ...)
  2020-12-28 22:15 ` eoli3n
@ 2020-12-28 22:18 ` eoli3n
  2020-12-28 23:33 ` [PR PATCH] [Updated] nx-libs, x2goclient and x2goserver eoli3n
                   ` (18 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: eoli3n @ 2020-12-28 22:18 UTC (permalink / raw)
  To: ml

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

# 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 support: crossbuild for arm
  - Patch mesa and bigfont: native musl builds

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 3040ad83249571e1d93a789bfc03fa1790c664a3 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.22

---
 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 756ec9ab110f7964f8a82d6d7b5db375bea0c72e 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 6d068c7a942732d437981a97ebf6df786f092989 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
+}

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

* Re: [PR PATCH] [Updated] nx-libs, x2goclient and x2goserver
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (21 preceding siblings ...)
  2020-12-28 22:18 ` eoli3n
@ 2020-12-28 23:33 ` eoli3n
  2021-01-26 12:02 ` [PR REVIEW] " Johnnynator
                   ` (17 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: eoli3n @ 2020-12-28 23:33 UTC (permalink / raw)
  To: ml

[-- 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
+}

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

* Re: [PR REVIEW] nx-libs, x2goclient and x2goserver
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (22 preceding siblings ...)
  2020-12-28 23:33 ` [PR PATCH] [Updated] nx-libs, x2goclient and x2goserver eoli3n
@ 2021-01-26 12:02 ` Johnnynator
  2021-01-26 12:04 ` Johnnynator
                   ` (16 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: Johnnynator @ 2021-01-26 12:02 UTC (permalink / raw)
  To: ml

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

New review comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/27432#discussion_r564459617

Comment:
Do use qt5, it should also be supported (at least nix is using it). Qt4 will be dropped some time soon (and is ages EOL)

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

* Re: nx-libs, x2goclient and x2goserver
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (23 preceding siblings ...)
  2021-01-26 12:02 ` [PR REVIEW] " Johnnynator
@ 2021-01-26 12:04 ` Johnnynator
  2021-01-26 14:01 ` [PR PATCH] [Updated] " eoli3n
                   ` (15 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: Johnnynator @ 2021-01-26 12:04 UTC (permalink / raw)
  To: ml

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

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/27432#issuecomment-767499148

Comment:
It also needs `libtirpc-devel`
nx-libs fails to compile with
```
utils.c: In function 'LockServer':
utils.c:382:35: warning: 'sprintf' may write a terminating nul past the end of the destination [-Wformat-overflow=]
  382 |   (void) sprintf(pid_str, "%10ld\n", (long)getpid());
      |                                   ^
utils.c:382:10: note: 'sprintf' output between 12 and 13 bytes into a destination of size 12
  382 |   (void) sprintf(pid_str, "%10ld\n", (long)getpid());
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  CC strlcat.c
rpcauth.c:47:10: fatal error: rpc/rpc.h: No such file or directory
   47 | #include <rpc/rpc.h>
      |          ^~~~~~~~~~~
compilation terminated.
failed command: gcc -c -g -O3 -fno-strict-aliasing -std=c99 -Wall -Wpedantic -Wpointer-arith -Wshadow -Wundef -I. -I../include -I../../../exports/include/nx-X11 -I../../../include/extensions -I../../../programs/Xserver/Xext -I../../../programs/Xserver/render -I../../../lib/Xau -I../../../../nxcomp -I/usr/include/pixman-1 -I../../.. -I../../../exports/include -Dlinux -D__amd64__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_DEFAULT_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DSHAPE -DXINPUT -DXKB -DXCSECURITY -DXF86BIGFONT -DDPMSExtension -DRENDER -DRANDR -DPANORAMIX -DXFIXES -DDAMAGE -DCOMPOSITE -DGCCUSESGAS -DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH -DXvExtension -DXFree86Server -DXvMCExtension -DBUILDDEBUG -DXResExtension -DX_BYTE_ORDER=X_LITTLE_ENDIAN -DXORG_VERSION_CURRENT=(((6) * 10000000) + ((9) * 100000) + ((0) * 1000) + 0) -D_XSERVER64 -DNDEBUG -DHAVE_SETITIMER=1 -DHAS_XFONT2 -DFUNCPROTO=15 -DNARROWPROTO -DUNIXCONN -DTCPCONN -DHAS_STICKY_DIR_BIT -DHAS_FCHOWN -DIPv6 -DHASXDMAUTH -DSECURE_RPC -DDDXOSINIT -DSERVER_LOCK -DDDXOSFATALERROR -DDDXOSVERRORF -DCLIENTIDS -DBUILDERADDR="xorg@lists.freedesktop.org" -DFAIL_HARD -DXTRANS_SEND_FDS=0 -DNX_TRANS_SOCKET -DNX_TRANS_AUTH -DNX_TRANS_FOPEN -DNX_TRANS_SLEEP -DNX_TRANS_EXIT -DNX_TRANS_WAKEUP -DNXAGENT_SERVER rpcauth.c
make[7]: *** [Makefile:531: rpcauth.o] Error 1
make[7]: *** Waiting for unfinished jobs....
```

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

* Re: [PR PATCH] [Updated] nx-libs, x2goclient and x2goserver
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (24 preceding siblings ...)
  2021-01-26 12:04 ` Johnnynator
@ 2021-01-26 14:01 ` eoli3n
  2021-01-26 14:16 ` eoli3n
                   ` (14 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: eoli3n @ 2021-01-26 14:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1835 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 -> WIP https://github.com/ArcticaProject/nx-libs/pull/946
  - Patch mesa and bigfont: native musl builds -> WIP https://github.com/ArcticaProject/nx-libs/pull/976

The current version is ok to be merged.

# x2goclient
- [x] Changed license
- [x] Updated maintainer
- [x] Updated to latest version
- [ ] Disable cross compilation until nx-libs update ?
# x2goserver

- [x] Create template
- [x] Patch ``/usr/sbin`` references
- [ ] Init script for ``$PREFIX/bin/x2gocleansessions``
- [ ] Write runit service
- [ ] Disable cross compilation until nx-libs update ?

# 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: 7440 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 f42607e894abf6993a88c3dc8dce3591c4a0b157 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..aa08b3aebfe
--- /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="qt5-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 dfb75ec1b414c9becaf533407cbe78e9233129d5 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
+}

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

* Re: [PR PATCH] [Updated] nx-libs, x2goclient and x2goserver
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (25 preceding siblings ...)
  2021-01-26 14:01 ` [PR PATCH] [Updated] " eoli3n
@ 2021-01-26 14:16 ` eoli3n
  2021-01-26 14:39 ` [PR REVIEW] " eoli3n
                   ` (13 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: eoli3n @ 2021-01-26 14:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1835 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 -> WIP https://github.com/ArcticaProject/nx-libs/pull/946
  - Patch mesa and bigfont: native musl builds -> WIP https://github.com/ArcticaProject/nx-libs/pull/976

The current version is ok to be merged.

# x2goclient
- [x] Changed license
- [x] Updated maintainer
- [x] Updated to latest version
- [ ] Disable cross compilation until nx-libs update ?
# x2goserver

- [x] Create template
- [x] Patch ``/usr/sbin`` references
- [ ] Init script for ``$PREFIX/bin/x2gocleansessions``
- [ ] Write runit service
- [ ] Disable cross compilation until nx-libs update ?

# 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: 7423 bytes --]

From 0951af4b419113e21090fc32e9a33b7ece299892 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 78416f43ed0..fea5a88046c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4041,3 +4041,6 @@ libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
 libsixel.so.1 libsixel-1.8.6_1
 libpamtest.so.0 pam_wrapper-1.1.3_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 22679a1e7c484c48f891d40ede97957c0cafb039 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..aa08b3aebfe
--- /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="qt5-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 070372a4c2404c77e9d11a12d4362075c30651a2 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
+}

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

* Re: [PR REVIEW] nx-libs, x2goclient and x2goserver
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (26 preceding siblings ...)
  2021-01-26 14:16 ` eoli3n
@ 2021-01-26 14:39 ` eoli3n
  2021-01-26 14:51 ` eoli3n
                   ` (12 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: eoli3n @ 2021-01-26 14:39 UTC (permalink / raw)
  To: ml

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

New review comment by eoli3n on void-packages repository

https://github.com/void-linux/void-packages/pull/27432#discussion_r564561145

Comment:
Done

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

* Re: nx-libs, x2goclient and x2goserver
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (27 preceding siblings ...)
  2021-01-26 14:39 ` [PR REVIEW] " eoli3n
@ 2021-01-26 14:51 ` eoli3n
  2021-01-26 15:00 ` eoli3n
                   ` (11 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: eoli3n @ 2021-01-26 14:51 UTC (permalink / raw)
  To: ml

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

New comment by eoli3n on void-packages repository

https://github.com/void-linux/void-packages/pull/27432#issuecomment-767595579

Comment:
> It also needs `libtirpc-devel`
> nx-libs fails to compile with

@Johnnynator  As you said on IRC, you found this : https://github.com/ArcticaProject/nx-libs/blob/3.6.x/nx-libs.spec#L437
Then, I don't know how to force this with the actual template.

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

* Re: nx-libs, x2goclient and x2goserver
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (28 preceding siblings ...)
  2021-01-26 14:51 ` eoli3n
@ 2021-01-26 15:00 ` eoli3n
  2021-05-09 12:00 ` eoli3n
                   ` (10 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: eoli3n @ 2021-01-26 15:00 UTC (permalink / raw)
  To: ml

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

New comment by eoli3n on void-packages repository

https://github.com/void-linux/void-packages/pull/27432#issuecomment-767595579

Comment:
> It also needs `libtirpc-devel`
> nx-libs fails to compile with

@Johnnynator  As you said on IRC, you found this : https://github.com/ArcticaProject/nx-libs/blob/3.6.x/nx-libs.spec#L437
Then, I don't know how to force this with the actual template.

@ahesford Would you take a look
How to force ``IMAKE`` arguments ?

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

* Re: nx-libs, x2goclient and x2goserver
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (29 preceding siblings ...)
  2021-01-26 15:00 ` eoli3n
@ 2021-05-09 12:00 ` eoli3n
  2021-05-09 12:11 ` eoli3n
                   ` (9 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: eoli3n @ 2021-05-09 12:00 UTC (permalink / raw)
  To: ml

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

New comment by eoli3n on void-packages repository

https://github.com/void-linux/void-packages/pull/27432#issuecomment-835792365

Comment:
I need some help to finish this, ping @ahesford @Johnnynator @

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

* Re: nx-libs, x2goclient and x2goserver
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (30 preceding siblings ...)
  2021-05-09 12:00 ` eoli3n
@ 2021-05-09 12:11 ` eoli3n
  2021-05-10  8:24 ` [PR PATCH] [Updated] " Johnnynator
                   ` (8 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: eoli3n @ 2021-05-09 12:11 UTC (permalink / raw)
  To: ml

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

New comment by eoli3n on void-packages repository

https://github.com/void-linux/void-packages/pull/27432#issuecomment-835792365

Comment:
I need some help to finish this, ping @ahesford @Johnnynator

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

* Re: [PR PATCH] [Updated] nx-libs, x2goclient and x2goserver
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (31 preceding siblings ...)
  2021-05-09 12:11 ` eoli3n
@ 2021-05-10  8:24 ` Johnnynator
  2021-05-10  8:26 ` Johnnynator
                   ` (7 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: Johnnynator @ 2021-05-10  8:24 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by Johnnynator 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 -> WIP https://github.com/ArcticaProject/nx-libs/pull/946
  - Patch mesa and bigfont: native musl builds -> WIP https://github.com/ArcticaProject/nx-libs/pull/976

The current version is ok to be merged.

# x2goclient
- [x] Changed license
- [x] Updated maintainer
- [x] Updated to latest version
- [ ] Disable cross compilation until nx-libs update ?
# x2goserver

- [x] Create template
- [x] Patch ``/usr/sbin`` references
- [ ] Init script for ``$PREFIX/bin/x2gocleansessions``
- [ ] Write runit service
- [ ] Disable cross compilation until nx-libs update ?

# 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: 7675 bytes --]

From 9fa4606589195c7f28319a7da6ee8030893e6a06 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.26

---
 common/shlibs                                 |  3 +
 .../patches/fix-musl-headers-x86.patch        | 11 ++++
 srcpkgs/nx-libs/patches/xf86bigfont.patch     | 10 +++
 srcpkgs/nx-libs/template                      | 62 +++++++++++++++++++
 4 files changed, 86 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 2afcbb9a6dea..0d4bdcffac05 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3987,3 +3987,6 @@ libmariadb.so.3 libmariadbclient-10.5.9_1
 libmariadbd.so.19 libmariadbclient-10.5.9_1
 libinstpatch-1.0.so.2 libinstpatch-1.1.6_1
 libbasu.so.0 basu-0.2.0_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 000000000000..3f51b8e4b1a1
--- /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 000000000000..b5f29e493372
--- /dev/null
+++ b/srcpkgs/nx-libs/patches/xf86bigfont.patch
@@ -0,0 +1,10 @@
+--- nx-X11/programs/Xserver/Xext/xf86bigfont.c	2021-02-04 14:34:56.000000000 +0100
++++ -	2021-05-10 08:55:11.108944904 +0200
+@@ -45,7 +45,6 @@
+ /* 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
diff --git a/srcpkgs/nx-libs/template b/srcpkgs/nx-libs/template
new file mode 100644
index 000000000000..e0b01308bc97
--- /dev/null
+++ b/srcpkgs/nx-libs/template
@@ -0,0 +1,62 @@
+# Template file for 'nx-libs'
+pkgname=nx-libs
+version=3.5.99.26
+revision=1
+build_style=gnu-configure
+make_build_args="CONFIGURE=echo IMAKE_DEFINES=-DUseTIRPC=YES"
+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
+ libtirpc-devel libXpm-devel font-util xkbcomp"
+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=3ce7ca4e6b57b3a2d7588b2d0f4009036d2566a8925ca2c62f08a8dc0df50357
+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 e5c97a2a6a8b0a4deb1096f9a691290d8fd51de6 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 | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/x2goclient/template

diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template
new file mode 100644
index 000000000000..76dbc1e2f258
--- /dev/null
+++ b/srcpkgs/x2goclient/template
@@ -0,0 +1,20 @@
+# Template file for 'x2goclient'
+pkgname=x2goclient
+version=4.1.2.2
+revision=1
+build_style=gnu-makefile
+build_helper=qmake
+make_build_args="QMAKE_BINARY=qmake-qt5 LRELEASE_BINARY=lrelease-qt5"
+make_build_target="build_client build_man"
+make_install_args="$make_build_args"
+make_install_target="install_client install_man"
+hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
+makedepends="qt5-svg-devel qt5-x11extras-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 1504a31220f30b4708e99c7390a373c6f1d4274e 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 000000000000..158130a96717
--- /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
+}

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

* Re: nx-libs, x2goclient and x2goserver
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (32 preceding siblings ...)
  2021-05-10  8:24 ` [PR PATCH] [Updated] " Johnnynator
@ 2021-05-10  8:26 ` Johnnynator
  2021-05-10  8:26 ` [PR PATCH] [Merged]: " Johnnynator
                   ` (6 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: Johnnynator @ 2021-05-10  8:26 UTC (permalink / raw)
  To: ml

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

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/27432#issuecomment-836359180

Comment:
Changes I pushed ontop: x2goclient moved to qt5 and fixed cross issues
```diff
--- a/srcpkgs/x2goclient/template
+++ b/srcpkgs/x2goclient/template
@@ -3,10 +3,14 @@ pkgname=x2goclient
 version=4.1.2.2
 revision=1
 build_style=gnu-makefile
+build_helper=qmake
+make_build_args="QMAKE_BINARY=qmake-qt5 LRELEASE_BINARY=lrelease-qt5"
 make_build_target="build_client build_man"
+make_install_args="$make_build_args"
 make_install_target="install_client install_man"
-hostmakedepends="pkg-config qt-devel-tools"
-makedepends="qt5-devel libldap-devel libssh-devel libXpm-devel cups-devel"
+hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
+makedepends="qt5-svg-devel qt5-x11extras-devel libldap-devel
+ libssh-devel libXpm-devel cups-devel"
 depends="nx-libs"
 short_desc="Graphical Qt5 client for X2Go"
 maintainer="eoli3n <jkirsz@gmail.com>"
```

and nx-libs: updated to 3.5.99.26 and added usage of libtirpc
```diff
--- a/srcpkgs/nx-libs/template
+++ b/srcpkgs/nx-libs/template
@@ -1,21 +1,21 @@
 # Template file for 'nx-libs'
 pkgname=nx-libs
-version=3.5.99.24
+version=3.5.99.26
 revision=1
 build_style=gnu-configure
-make_build_args="CONFIGURE=echo"
+make_build_args="CONFIGURE=echo IMAKE_DEFINES=-DUseTIRPC=YES"
 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"
+ libtirpc-devel libXpm-devel font-util xkbcomp"
 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
+checksum=3ce7ca4e6b57b3a2d7588b2d0f4009036d2566a8925ca2c62f08a8dc0df50357
 python_version=3
 nocross="imake attempts to run target executables on host"
```

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

* Re: [PR PATCH] [Merged]: nx-libs, x2goclient and x2goserver
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (33 preceding siblings ...)
  2021-05-10  8:26 ` Johnnynator
@ 2021-05-10  8:26 ` Johnnynator
  2021-05-10  8:29 ` eoli3n
                   ` (5 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: Johnnynator @ 2021-05-10  8:26 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

nx-libs, x2goclient and x2goserver
https://github.com/void-linux/void-packages/pull/27432

Description:
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 -> WIP https://github.com/ArcticaProject/nx-libs/pull/946
  - Patch mesa and bigfont: native musl builds -> WIP https://github.com/ArcticaProject/nx-libs/pull/976

The current version is ok to be merged.

# x2goclient
- [x] Changed license
- [x] Updated maintainer
- [x] Updated to latest version
- [ ] Disable cross compilation until nx-libs update ?
# x2goserver

- [x] Create template
- [x] Patch ``/usr/sbin`` references
- [ ] Init script for ``$PREFIX/bin/x2gocleansessions``
- [ ] Write runit service
- [ ] Disable cross compilation until nx-libs update ?

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

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

* Re: nx-libs, x2goclient and x2goserver
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (34 preceding siblings ...)
  2021-05-10  8:26 ` [PR PATCH] [Merged]: " Johnnynator
@ 2021-05-10  8:29 ` eoli3n
  2021-05-10  8:33 ` eoli3n
                   ` (4 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: eoli3n @ 2021-05-10  8:29 UTC (permalink / raw)
  To: ml

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

New comment by eoli3n on void-packages repository

https://github.com/void-linux/void-packages/pull/27432#issuecomment-836361961

Comment:
Thanks @Johnnynator 

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

* Re: nx-libs, x2goclient and x2goserver
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (35 preceding siblings ...)
  2021-05-10  8:29 ` eoli3n
@ 2021-05-10  8:33 ` eoli3n
  2021-05-10  8:43 ` Anachron
                   ` (3 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: eoli3n @ 2021-05-10  8:33 UTC (permalink / raw)
  To: ml

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

New comment by eoli3n on void-packages repository

https://github.com/void-linux/void-packages/pull/27432#issuecomment-836366779

Comment:
What about ``x2goserver`` ? No need to create a runit service in the package ?

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

* Re: nx-libs, x2goclient and x2goserver
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (36 preceding siblings ...)
  2021-05-10  8:33 ` eoli3n
@ 2021-05-10  8:43 ` Anachron
  2021-05-10 13:57 ` cultab
                   ` (2 subsequent siblings)
  40 siblings, 0 replies; 42+ messages in thread
From: Anachron @ 2021-05-10  8:43 UTC (permalink / raw)
  To: ml

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

New comment by Anachron on void-packages repository

https://github.com/void-linux/void-packages/pull/27432#issuecomment-836380849

Comment:
Wohoo! Thanks for packaging this. 
I've closed my issue manually because it seems not to have been auto closed on merge.

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

* Re: nx-libs, x2goclient and x2goserver
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (37 preceding siblings ...)
  2021-05-10  8:43 ` Anachron
@ 2021-05-10 13:57 ` cultab
  2021-05-10 13:57 ` cultab
  2021-05-10 13:59 ` ericonr
  40 siblings, 0 replies; 42+ messages in thread
From: cultab @ 2021-05-10 13:57 UTC (permalink / raw)
  To: ml

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

New comment by cultab on void-packages repository

https://github.com/void-linux/void-packages/pull/27432#issuecomment-836733735

Comment:
running x2godbadmin returns this.
```
Can't locate Try/Tiny.pm in @INC (you may need to install the Try::Tiny module) (@INC contains: /usr/lib/perl5/site_perl /usr/share/perl5/site_perl /usr/lib/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib/perl5/core_perl /usr/share/perl5/core_perl) at /usr/local/sbin/x2godbadmin line 29.
BEGIN failed--compilation aborted at /usr/local/sbin/x2godbadmin line 29.
```

I think the` perl-Try-Tiny` package needs to be added in the dependencies, correct me if I'm wrong or if this is not the place to share this.

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

* Re: nx-libs, x2goclient and x2goserver
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (38 preceding siblings ...)
  2021-05-10 13:57 ` cultab
@ 2021-05-10 13:57 ` cultab
  2021-05-10 13:59 ` ericonr
  40 siblings, 0 replies; 42+ messages in thread
From: cultab @ 2021-05-10 13:57 UTC (permalink / raw)
  To: ml

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

New comment by cultab on void-packages repository

https://github.com/void-linux/void-packages/pull/27432#issuecomment-836733735

Comment:
running x2godbadmin returns this.
```
Can't locate Try/Tiny.pm in @INC (you may need to install the Try::Tiny module) (@INC contains: /usr/lib/perl5/site_perl /usr/share/perl5/site_perl /usr/lib/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib/perl5/core_perl /usr/share/perl5/core_perl) at /usr/local/sbin/x2godbadmin line 29.
BEGIN failed--compilation aborted at /usr/local/sbin/x2godbadmin line 29.
```

I think the `perl-Try-Tiny` package needs to be added in the dependencies, correct me if I'm wrong or if this is not the place to share this.

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

* Re: nx-libs, x2goclient and x2goserver
  2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
                   ` (39 preceding siblings ...)
  2021-05-10 13:57 ` cultab
@ 2021-05-10 13:59 ` ericonr
  40 siblings, 0 replies; 42+ messages in thread
From: ericonr @ 2021-05-10 13:59 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27432#issuecomment-836736140

Comment:
@cultab please open a separate issue about this or a PR to fix it :)

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

end of thread, other threads:[~2021-05-10 13:59 UTC | newest]

Thread overview: 42+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-25 22:00 [PR PATCH] x2goclient and nx-libs eoli3n
2020-12-25 22:17 ` [PR PATCH] [Updated] " eoli3n
2020-12-25 22:58 ` yopito
2020-12-25 23:35 ` [PR PATCH] [Updated] " eoli3n
2020-12-26  0:39 ` eoli3n
2020-12-26  9:53 ` eoli3n
2020-12-26 10:23 ` eoli3n
2020-12-26 10:31 ` eoli3n
2020-12-26 10:52 ` eoli3n
2020-12-26 11:34 ` eoli3n
2020-12-26 11:39 ` eoli3n
2020-12-26 11:51 ` eoli3n
2020-12-26 16:03 ` eoli3n
2020-12-26 16:10 ` eoli3n
2020-12-27 17:08 ` eoli3n
2020-12-27 17:11 ` eoli3n
2020-12-27 17:26 ` eoli3n
2020-12-28 19:15 ` eoli3n
2020-12-28 19:17 ` eoli3n
2020-12-28 19:26 ` ahesford
2020-12-28 19:37 ` [PR PATCH] [Updated] " eoli3n
2020-12-28 22:15 ` eoli3n
2020-12-28 22:18 ` eoli3n
2020-12-28 23:33 ` [PR PATCH] [Updated] nx-libs, x2goclient and x2goserver eoli3n
2021-01-26 12:02 ` [PR REVIEW] " Johnnynator
2021-01-26 12:04 ` Johnnynator
2021-01-26 14:01 ` [PR PATCH] [Updated] " eoli3n
2021-01-26 14:16 ` eoli3n
2021-01-26 14:39 ` [PR REVIEW] " eoli3n
2021-01-26 14:51 ` eoli3n
2021-01-26 15:00 ` eoli3n
2021-05-09 12:00 ` eoli3n
2021-05-09 12:11 ` eoli3n
2021-05-10  8:24 ` [PR PATCH] [Updated] " Johnnynator
2021-05-10  8:26 ` Johnnynator
2021-05-10  8:26 ` [PR PATCH] [Merged]: " Johnnynator
2021-05-10  8:29 ` eoli3n
2021-05-10  8:33 ` eoli3n
2021-05-10  8:43 ` Anachron
2021-05-10 13:57 ` cultab
2021-05-10 13:57 ` cultab
2021-05-10 13:59 ` ericonr

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 NNTP newsgroup(s).