subject:"\[arch\-commits\] Commit in \(nx\)"

[arch-commits] Commit in (nx)

2022-04-01 Thread Antonio Rojas via arch-commits

Date: Friday, April 1, 2022 @ 19:04:46
  Author: arojas
Revision: 441190

Spring cleanup

Deleted:
  nx/

[arch-commits] Commit in nx/repos (3 files)

2022-01-11 Thread Andreas Radke via arch-commits

Date: Tuesday, January 11, 2022 @ 22:22:52
  Author: andyrtr
Revision: 434263

archrelease: copy trunk to testing-x86_64

Added:
  nx/repos/testing-x86_64/
  nx/repos/testing-x86_64/0001-nx-libs-ar.patch
(from rev 434262, nx/trunk/0001-nx-libs-ar.patch)
  nx/repos/testing-x86_64/PKGBUILD
(from rev 434262, nx/trunk/PKGBUILD)

---+
 0001-nx-libs-ar.patch |   42 ++
 PKGBUILD  |  138 
 2 files changed, 180 insertions(+)

Copied: nx/repos/testing-x86_64/0001-nx-libs-ar.patch (from rev 434262, 
nx/trunk/0001-nx-libs-ar.patch)
===
--- testing-x86_64/0001-nx-libs-ar.patch(rev 0)
+++ testing-x86_64/0001-nx-libs-ar.patch2022-01-11 22:22:52 UTC (rev 
434263)
@@ -0,0 +1,42 @@
+From d35eba919c229cecf3c52a7dd034b9cd6b120ede Mon Sep 17 00:00:00 2001
+From: ponce 
+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 /**/

Copied: nx/repos/testing-x86_64/PKGBUILD (from rev 434262, nx/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2022-01-11 22:22:52 UTC (rev 434263)
@@ -0,0 +1,138 @@
+# Maintainer: Andreas Radke 
+
+pkgbase=nx
+pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nxagent' 'nx-headers')
+pkgver=3.5.99.26
+pkgrel=1
+arch=('x86_64')
+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
+ 'libjpeg-turbo' 'libpng' 'gcc-libs'
+ 'libxml2' 'xkeyboard-config' 'xorg-xkbcomp'
+ 'xorg-xkbcomp' 'libxfont2' 'libxinerama'
+ 'xorg-font-util'  'pixman'
+ 'libxrandr' 'libxtst' 'libxcomposite' 'libxpm' 'libxdamage'
+ # make dependencies
+ 'xorgproto' 'imake'
+)
+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 
+  '9BFBAEE86C0AA5FFBF2207829AF46B3025771B31') # Mike Gabriel 

+
+prepare() {
+  cd "${srcdir}/nx-libs-$pkgver"
+  # binutils 2.36 buildfix 
+  patch -Np1 -i ../0001-nx-libs-ar.patch
+}
+
+build() {
+  cd "${srcdir}/nx-libs-$pkgver"
+  
+  # let makepkg zip the man files
+  sed -i "s:gzip:#gzip:g" Makefile
+
+  make \
+PREFIX=/usr \
+CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib 
--libexecdir=/usr/lib --includedir=/usr/include" \
+IMAKE_DEFINES="-DUseTIRPC=YES"
+
+  # fake install
+  mkdir $srcdir/fakeinstall
+  make install \
+   PREFIX=/usr \
+   DESTDIR="$srcdir/fakeinstall" \
+   LIBDIR=/usr/lib \
+   SHLIBDIR=/usr/lib \
+   INSTALL_DIR="install -dm0755" \
+   INSTALL_FILE="install -pm0644" \
+   INSTALL_PROGRAM="install -pm0755"
+}
+
+package_libxcomp() {
+  
+  pkgdesc="NX X compression library"
+  depends=('libjpeg-turbo' 'libpng' 'gcc-libs')
+   
+  install -dm755 ${pkgdir}/usr/lib
+  cp -a ${srcdir}/fakeinstall/usr/lib/libXcomp.so* ${pkgdir}/usr/lib
+}
+
+package_nxproxy() {
+
+  pkgdesc="NX proxy"
+  depends=('libxcomp' )
+  
+  install -dm755 ${pkgdir}/usr/{bin,share/man/man1}
+  cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 
${pkgdir}/usr/share/man/man1
+  # the wrapper
+  cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/bin
+}
+
+package_nx-x11() {
+ 
+  pkgdesc="NX-X11 lib for the NX framework"
+  depends=('libxcomp')
+   
+  install -dm755 ${pkgdir}/usr/{lib/nx/X11,share/nx}
+  cp -aR ${srcdir}/fakeinstall/usr/lib/nx/X11/* ${pkgdir}/usr/lib/nx/X11
+  cp -aR

[arch-commits] Commit in nx/trunk (0001-nx-libs-ar.patch PKGBUILD)

2022-01-11 Thread Andreas Radke via arch-commits

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 
+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
===
--- PKGBUILD2022-01-11 20:47:05 UTC (rev 434261)
+++ PKGBUILD2022-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 
   '9BFBAEE86C0AA5FFBF2207829AF46B3025771B31') # Mike Gabriel 

 
+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

[arch-commits] Commit in (nx)

[arch-commits] Commit in nx/repos (3 files)

[arch-commits] Commit in nx/trunk (0001-nx-libs-ar.patch PKGBUILD)

3 matches

Site Navigation

Mail list logo

Footer information