* [gentoo-commits] repo/gentoo:master commit in: net-misc/nx/, net-misc/nx/files/
@ 2021-04-16 12:37 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2021-04-16 12:37 UTC (permalink / raw
To: gentoo-commits
commit: 1121bce8ec9678ca7f29d39cfea002dbee75327e
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 16 12:25:38 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Apr 16 12:37:24 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1121bce8
net-misc/nx: Fixed build with binutils-2.36
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
net-misc/nx/files/nx-3.5.99.26-binutils-2.36.patch | 42 ++++++++++++++++++++++
net-misc/nx/nx-3.5.99.26.ebuild | 5 +++
2 files changed, 47 insertions(+)
diff --git a/net-misc/nx/files/nx-3.5.99.26-binutils-2.36.patch b/net-misc/nx/files/nx-3.5.99.26-binutils-2.36.patch
new file mode 100644
index 00000000000..ec2925da979
--- /dev/null
+++ b/net-misc/nx/files/nx-3.5.99.26-binutils-2.36.patch
@@ -0,0 +1,42 @@
+From d35eba919c229cecf3c52a7dd034b9cd6b120ede Mon Sep 17 00:00:00 2001
+From: ponce <matteo.bernardini@gmail.com>
+Date: Mon, 5 Apr 2021 08:44:00 +0200
+Subject: [PATCH] fix building with binutils >= 2.36.
+
+The l option of ar in the newer binutils versions switched
+from being unused to being used to specify dependencies
+so here should be safely removed
+---
+ nx-X11/config/cf/Imake.tmpl | 12 ------------
+ 1 file changed, 12 deletions(-)
+
+diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl
+index 25d985d75f..de1fca937e 100644
+--- a/nx-X11/config/cf/Imake.tmpl
++++ b/nx-X11/config/cf/Imake.tmpl
+@@ -1015,25 +1015,13 @@ TCLIBDIR = TclLibDir
+ #define ArCmdBase ar
+ #endif
+ #ifndef ArCmd
+-#if HasLargeTmp || SystemV4
+ #define ArCmd ArCmdBase cq
+-#else
+-#define ArCmd ArCmdBase clq
+-#endif
+ #endif
+ #ifndef ArAddCmd
+-#if HasLargeTmp || SystemV4
+ #define ArAddCmd ArCmdBase ru
+-#else
+-#define ArAddCmd ArCmdBase rul
+-#endif
+ #endif
+ #ifndef ArExtCmd
+-#if HasLargeTmp || SystemV4
+ #define ArExtCmd ArCmdBase x
+-#else
+-#define ArExtCmd ArCmdBase xl
+-#endif
+ #endif
+ #ifndef BootstrapCFlags
+ #define BootstrapCFlags /**/
diff --git a/net-misc/nx/nx-3.5.99.26.ebuild b/net-misc/nx/nx-3.5.99.26.ebuild
index 428f571e7e7..17d9b3f5472 100644
--- a/net-misc/nx/nx-3.5.99.26.ebuild
+++ b/net-misc/nx/nx-3.5.99.26.ebuild
@@ -43,6 +43,11 @@ BDEPEND="
S="${WORKDIR}/nx-libs-${PV}"
+PATCHES=(
+ # https://github.com/ArcticaProject/nx-libs/pull/1012
+ "${FILESDIR}/${PN}-3.5.99.26-binutils-2.36.patch"
+)
+
src_prepare() {
default
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/nx/, net-misc/nx/files/
@ 2025-02-08 11:20 Bernard Cafarelli
0 siblings, 0 replies; 3+ messages in thread
From: Bernard Cafarelli @ 2025-02-08 11:20 UTC (permalink / raw
To: gentoo-commits
commit: c70aa96384207367b8a6d876b574c64021da4b67
Author: Cristian Othón Martínez Vera <cfuga <AT> cfuga <DOT> mx>
AuthorDate: Wed Feb 5 23:00:41 2025 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sat Feb 8 11:20:45 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c70aa963
net-misc/nx: fix compilation with gcc14 (access.c)
Backport from XOrg.
This PR also fixes a small URL typo from my previous patch ;-)
Link: https://gitlab.freedesktop.org/xorg/xserver/-/commit/0ddcd8785199c08d9bded3c767a3b1227c670999
Closes: https://bugs.gentoo.org/934131
Signed-off-by: Cristian Othón Martínez Vera <cfuga <AT> cfuga.mx>
Closes: https://github.com/gentoo/gentoo/pull/40458
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
net-misc/nx/files/nx-3.5.99.26-gcc14-access.patch | 28 +++++++++++++++++++++++
net-misc/nx/nx-3.5.99.26.ebuild | 3 ++-
net-misc/nx/nx-3.5.99.27.ebuild | 1 +
3 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/net-misc/nx/files/nx-3.5.99.26-gcc14-access.patch b/net-misc/nx/files/nx-3.5.99.26-gcc14-access.patch
new file mode 100644
index 000000000000..44afd9232434
--- /dev/null
+++ b/net-misc/nx/files/nx-3.5.99.26-gcc14-access.patch
@@ -0,0 +1,28 @@
+Bugs: https://bugs.gentoo.org/934131
+https://gitlab.freedesktop.org/xorg/xserver/-/commit/0ddcd8785199c08d9bded3c767a3b1227c670999
+
+Backport from XOrg server:
+
+ commit 0ddcd8785199c08d9bded3c767a3b1227c670999
+ Author: Joaquim Monteiro <joaquim.monteiro@protonmail.com>
+ Date: Sun, 23 Jun 2024 21:17:25 +0100
+
+ [PATCH 1/2] os: Fix assignment with incompatible pointer type
+
+ struct hostent->h_addr_list is of type char**, not const char**.
+ GCC considers this an error when in C99 mode or later.
+
+ Signed-off-by: Joaquim Monteiro <joaquim.monteiro@protonmail.com>
+ Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1572>
+
+--- a/nx-X11/programs/Xserver/os/access.c
++++ b/nx-X11/programs/Xserver/os/access.c
+@@ -1941,7 +1941,7 @@
+ char hostname[SI_HOSTNAME_MAXLEN];
+ int f, hostaddrlen;
+ void * hostaddr;
+- const char **addrlist;
++ char **addrlist;
+
+ if (siAddrLen >= sizeof(hostname))
+ return FALSE;
diff --git a/net-misc/nx/nx-3.5.99.26.ebuild b/net-misc/nx/nx-3.5.99.26.ebuild
index c08c5941821d..437f6f51c202 100644
--- a/net-misc/nx/nx-3.5.99.26.ebuild
+++ b/net-misc/nx/nx-3.5.99.26.ebuild
@@ -50,8 +50,9 @@ PATCHES=(
"${FILESDIR}/${PN}-3.5.99.26-riscv64-support.patch"
"${FILESDIR}/${PN}-3.5.99.26-musl.patch"
"${FILESDIR}/${PN}-3.5.99.26-which.patch"
- # https://github.com/ArticaProject/nx-libs/pull/1087
+ # https://github.com/ArcticaProject/nx-libs/pull/1087
"${FILESDIR}/${PN}-3.5.99.26-gcc14-32bit.patch"
+ "${FILESDIR}/${PN}-3.5.99.26-gcc14-access.patch"
)
src_prepare() {
diff --git a/net-misc/nx/nx-3.5.99.27.ebuild b/net-misc/nx/nx-3.5.99.27.ebuild
index 095b3d048849..9df06029d9a7 100644
--- a/net-misc/nx/nx-3.5.99.27.ebuild
+++ b/net-misc/nx/nx-3.5.99.27.ebuild
@@ -46,6 +46,7 @@ PATCHES=(
"${FILESDIR}/${PN}-3.5.99.27-which.patch"
# https://github.com/ArcticaProject/nx-libs/pull/1087
"${FILESDIR}/${PN}-3.5.99.26-gcc14-32bit.patch"
+ "${FILESDIR}/${PN}-3.5.99.26-gcc14-access.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/nx/, net-misc/nx/files/
@ 2025-02-16 20:09 Bernard Cafarelli
0 siblings, 0 replies; 3+ messages in thread
From: Bernard Cafarelli @ 2025-02-16 20:09 UTC (permalink / raw
To: gentoo-commits
commit: 420937fa0027ab7ac01f8a1c424247dda81c37c8
Author: Cristian Othón Martínez Vera <cfuga <AT> cfuga <DOT> mx>
AuthorDate: Mon Feb 10 15:17:51 2025 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 20:09:05 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=420937fa
net-misc/nx: fix compilation with clang
Also fix ```VariableOrderWrong``` for the ```${S}``` variable
Link: https://github.com/ArcticaProject/nx-libs/issues/1044
Link: https://trac.macports.org/ticket/71014
Closes: https://bugs.gentoo.org/930440
Signed-off-by: Cristian Othón Martínez Vera <cfuga <AT> cfuga.mx>
Closes: https://github.com/gentoo/gentoo/pull/40516
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
net-misc/nx/files/nx-3.5.99.26-clang-bind.patch | 17 +++++++++++++++++
net-misc/nx/nx-3.5.99.26.ebuild | 5 +++--
net-misc/nx/nx-3.5.99.27.ebuild | 5 +++--
3 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/net-misc/nx/files/nx-3.5.99.26-clang-bind.patch b/net-misc/nx/files/nx-3.5.99.26-clang-bind.patch
new file mode 100644
index 000000000000..112268b33b75
--- /dev/null
+++ b/net-misc/nx/files/nx-3.5.99.26-clang-bind.patch
@@ -0,0 +1,17 @@
+Fix:
+
+Loop.cpp:4224:34: error: invalid operands to binary expression ('__bind<int &, sockaddr *&, unsigned int &>' and 'int')
+
+https://github.com/ArcticaProject/nx-libs/issues/1044
+https://bugs.gentoo.org/930440
+--- a/nxcomp/src/Loop.cpp
++++ b/nxcomp/src/Loop.cpp
+@@ -4221,7 +4221,7 @@
+ goto SetupSocketError;
+ }
+
+- if (bind(newFD, addr, addrlen) == -1)
++ if (::bind(newFD, addr, addrlen) == -1)
+ {
+ nxfatal << "Loop: PANIC! Call to bind failed for " << label
+ << ". Error is " << EGET()
diff --git a/net-misc/nx/nx-3.5.99.26.ebuild b/net-misc/nx/nx-3.5.99.26.ebuild
index 437f6f51c202..255ff13f8658 100644
--- a/net-misc/nx/nx-3.5.99.26.ebuild
+++ b/net-misc/nx/nx-3.5.99.26.ebuild
@@ -7,6 +7,7 @@ inherit autotools flag-o-matic toolchain-funcs
DESCRIPTION="NX compression technology core libraries"
HOMEPAGE="https://github.com/ArcticaProject/nx-libs"
SRC_URI="https://github.com/ArcticaProject/nx-libs/archive/${PV}.tar.gz -> nx-libs-${PV}.tar.gz"
+S="${WORKDIR}/nx-libs-${PV}"
LICENSE="GPL-2"
SLOT="0"
@@ -41,8 +42,6 @@ BDEPEND="virtual/pkgconfig
RDEPEND+=" selinux? ( sec-policy/selinux-nx )"
-S="${WORKDIR}/nx-libs-${PV}"
-
PATCHES=(
# https://github.com/ArcticaProject/nx-libs/pull/1012
"${FILESDIR}/${PN}-3.5.99.26-binutils-2.36.patch"
@@ -53,6 +52,8 @@ PATCHES=(
# https://github.com/ArcticaProject/nx-libs/pull/1087
"${FILESDIR}/${PN}-3.5.99.26-gcc14-32bit.patch"
"${FILESDIR}/${PN}-3.5.99.26-gcc14-access.patch"
+ # https://github.com/ArcticaProject/nx-libs/issues/1044
+ "${FILESDIR}/${PN}-3.5.99.26-clang-bind.patch"
)
src_prepare() {
diff --git a/net-misc/nx/nx-3.5.99.27.ebuild b/net-misc/nx/nx-3.5.99.27.ebuild
index 9df06029d9a7..d4ef7e951c9a 100644
--- a/net-misc/nx/nx-3.5.99.27.ebuild
+++ b/net-misc/nx/nx-3.5.99.27.ebuild
@@ -8,6 +8,7 @@ DESCRIPTION="NX compression technology core libraries"
HOMEPAGE="https://github.com/ArcticaProject/nx-libs"
SRC_URI="https://github.com/ArcticaProject/nx-libs/archive/${PV}.tar.gz -> nx-libs-${PV}.tar.gz"
+S="${WORKDIR}/nx-libs-${PV}"
LICENSE="GPL-2"
SLOT="0"
@@ -39,14 +40,14 @@ BDEPEND="virtual/pkgconfig
x11-misc/gccmakedep
x11-misc/imake"
-S="${WORKDIR}/nx-libs-${PV}"
-
PATCHES=(
"${FILESDIR}/${PN}-3.5.99.26-musl.patch"
"${FILESDIR}/${PN}-3.5.99.27-which.patch"
# https://github.com/ArcticaProject/nx-libs/pull/1087
"${FILESDIR}/${PN}-3.5.99.26-gcc14-32bit.patch"
"${FILESDIR}/${PN}-3.5.99.26-gcc14-access.patch"
+ # https://github.com/ArcticaProject/nx-libs/issues/1044
+ "${FILESDIR}/${PN}-3.5.99.26-clang-bind.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-02-16 20:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-08 11:20 [gentoo-commits] repo/gentoo:master commit in: net-misc/nx/, net-misc/nx/files/ Bernard Cafarelli
-- strict thread matches above, loose matches on Subject: below --
2025-02-16 20:09 Bernard Cafarelli
2021-04-16 12:37 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox