summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorpolygamma2023-08-28 17:34:13 +0200
committerpolygamma2023-08-28 17:34:13 +0200
commit08b3d76a579bb5faf4d55e51717bf70e5c9bfb5e (patch)
treeb5d9944cff891ee1ee742c6e656610879e3737dc
parent125a72d3e4dec04212a2cda76649b7dd95c62f14 (diff)
downloadaur-08b3d76a579bb5faf4d55e51717bf70e5c9bfb5e.tar.gz
Version bump to 3.5.99.27
-rw-r--r--.SRCINFO8
-rw-r--r--0001-nx-libs-ar.patch42
-rw-r--r--PKGBUILD10
3 files changed, 6 insertions, 54 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d596e6829ce9..5da8d40efbaa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = nx
- pkgver = 3.5.99.26
+ pkgver = 3.5.99.27
pkgrel = 1
url = https://arctica-project.org
arch = x86_64
@@ -22,12 +22,10 @@ pkgbase = nx
makedepends = libxdamage
makedepends = xorgproto
makedepends = imake
- source = https://github.com/ArcticaProject/nx-libs/archive/3.5.99.26/nx-libs-3.5.99.26.tar.gz
- source = 0001-nx-libs-ar.patch
+ source = https://github.com/ArcticaProject/nx-libs/archive/3.5.99.27/nx-libs-3.5.99.27.tar.gz
validpgpkeys = 1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B
validpgpkeys = 9BFBAEE86C0AA5FFBF2207829AF46B3025771B31
- sha256sums = 3ce7ca4e6b57b3a2d7588b2d0f4009036d2566a8925ca2c62f08a8dc0df50357
- sha256sums = 0a93a18591376cae1e4f0e9358c14cb905e5da9a7ec0c68ef4e2ad2c3741c306
+ sha256sums = 05d3d28a672475e5490c7b7ba39e1808794b6ae1443a7ec219974b50beddbeea
pkgname = libxcomp
pkgdesc = NX X compression library
diff --git a/0001-nx-libs-ar.patch b/0001-nx-libs-ar.patch
deleted file mode 100644
index ec2925da9790..000000000000
--- a/0001-nx-libs-ar.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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/PKGBUILD b/PKGBUILD
index 25e22994bd40..05b31c2533cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgbase=nx
pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nxagent' 'nx-headers')
-pkgver=3.5.99.26
+pkgver=3.5.99.27
pkgrel=1
arch=('x86_64')
url="https://arctica-project.org"
@@ -18,17 +18,13 @@ makedepends=(# runtime dependencies from subpackages
# 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')
+source=(https://github.com/ArcticaProject/nx-libs/archive/$pkgver/nx-libs-$pkgver.tar.gz)
+sha256sums=('05d3d28a672475e5490c7b7ba39e1808794b6ae1443a7ec219974b50beddbeea')
validpgpkeys=('1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B' # X2go Git Administrator <git-admin@x2go.org>
'9BFBAEE86C0AA5FFBF2207829AF46B3025771B31') # Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
prepare() {
cd "${srcdir}/nx-libs-$pkgver"
- # binutils 2.36 buildfix
- patch -Np1 -i ../0001-nx-libs-ar.patch
}
build() {