Date: Tuesday, January 11, 2022 @ 22:22:39 Author: andyrtr Revision: 434262
upgpkg: nx 3.5.99.26-1: move to Arctica-Project source; upstream update 3.5.99.26 Added: nx/trunk/0001-nx-libs-ar.patch Modified: nx/trunk/PKGBUILD -----------------------+ 0001-nx-libs-ar.patch | 42 ++++++++++++++++++++++++++++++++++++++++++ PKGBUILD | 21 +++++++++++++-------- 2 files changed, 55 insertions(+), 8 deletions(-) Added: 0001-nx-libs-ar.patch =================================================================== --- 0001-nx-libs-ar.patch (rev 0) +++ 0001-nx-libs-ar.patch 2022-01-11 22:22:39 UTC (rev 434262) @@ -0,0 +1,42 @@ +From d35eba919c229cecf3c52a7dd034b9cd6b120ede Mon Sep 17 00:00:00 2001 +From: ponce <[email protected]> +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 /**/ Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-01-11 20:47:05 UTC (rev 434261) +++ PKGBUILD 2022-01-11 22:22:39 UTC (rev 434262) @@ -2,11 +2,11 @@ pkgbase=nx pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nxagent' 'nx-headers') -pkgver=3.5.99.22 +pkgver=3.5.99.26 pkgrel=1 arch=('x86_64') -#url="https://arctica-project.org"; -url="https://wiki.x2go.org/doku.php"; +url="https://arctica-project.org"; +#url="https://wiki.x2go.org/doku.php"; license=('GPL') # https://github.com/ArcticaProject/nx-libs/blob/3.6.x/nx-libs.spec makedepends=(# runtime dependencies from subpackages @@ -18,13 +18,19 @@ # make dependencies 'xorgproto' 'imake' ) -#source=(https://github.com/ArcticaProject/nx-libs/archive/$pkgver/nx-libs-$pkgver.tar.gz) -source=(https://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz{,.asc}) -sha256sums=('fe8851d96c2eedfe5caf4d2c0de870e06546471605da8a3742cfbadaad44a65f' - 'SKIP') +source=(https://github.com/ArcticaProject/nx-libs/archive/$pkgver/nx-libs-$pkgver.tar.gz + 0001-nx-libs-ar.patch) +sha256sums=('3ce7ca4e6b57b3a2d7588b2d0f4009036d2566a8925ca2c62f08a8dc0df50357' + '0a93a18591376cae1e4f0e9358c14cb905e5da9a7ec0c68ef4e2ad2c3741c306') validpgpkeys=('1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B' # X2go Git Administrator <[email protected]> '9BFBAEE86C0AA5FFBF2207829AF46B3025771B31') # Mike Gabriel <[email protected]> +prepare() { + cd "${srcdir}/nx-libs-$pkgver" + # binutils 2.36 buildfix + patch -Np1 -i ../0001-nx-libs-ar.patch +} + build() { cd "${srcdir}/nx-libs-$pkgver" @@ -95,7 +101,6 @@ install -dm755 ${pkgdir}/usr/{bin,lib/nx/bin,share/nx,share/man/man1,share/pixmaps} cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxagent ${pkgdir}/usr/lib/nx/bin cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxagent.1 ${pkgdir}/usr/share/man/man1 - cp -a ${srcdir}/fakeinstall/usr/share/pixmaps/nxagent.xpm ${pkgdir}/usr/share/pixmaps # the wrapper cp -a ${srcdir}/fakeinstall/usr/bin/nxagent ${pkgdir}/usr/bin
