Date: Friday, March 9, 2018 @ 21:16:34
Author: andyrtr
Revision: 318369
prepare new release - requires further fixes, x2gosever refuses connection
Modified:
nx/trunk/PKGBUILD
----------+
PKGBUILD | 110 ++++++++++++++++++++++++++-----------------------------------
1 file changed, 48 insertions(+), 62 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-03-09 21:13:10 UTC (rev 318368)
+++ PKGBUILD 2018-03-09 21:16:34 UTC (rev 318369)
@@ -2,45 +2,30 @@
# Maintainer: Andreas Radke <andy...@archlinux.org>
pkgbase=nx
-pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
-pkgver=3.5.0.33
-pkgrel=2
+pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nxagent' 'nx-headers')
+pkgver=3.5.99.15
+pkgrel=1
arch=('x86_64')
-url="http://wiki.x2go.org/";
+url="https://arctica-project.org";
license=('GPL')
-#options=('!makeflags') # '!strip')
-# http://code.x2go.org/gitweb?p=nx-libs.git;a=blob;f=nx-libs.spec
-makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' 'libxml2' 'fontconfig' #
runtime dependencies from subpackages
- 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm'
'libxdamage' 'libxrandr'
- 'libxcomposite' 'libxtst' 'xorg-sessreg' 'libfontenc'
'xorg-xkbcomp' # makedepends
- )
-source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz{,.asc})
-sha256sums=('378665a8098398d6fb642559cc59d23902d3b212aa05de4973a13ac9b325a06a'
- 'SKIP')
+# 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)
+sha256sums=('10102d01c284afeb3f59ed257b101495a2cc674a18db05e6f9190c7fe301803a')
validpgpkeys=('1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B' # X2go Git
Administrator <git-ad...@x2go.org>
'9BFBAEE86C0AA5FFBF2207829AF46B3025771B31') # Mike Gabriel
<mike.gabr...@das-netzwerkteam.de>
+
build() {
cd "${srcdir}/nx-libs-$pkgver"
- # debug flags
-# export CFLAGS="-march=x86-64 -O1 -g -pipe"
-# export CXXFLAGS="-march=x86-64 -O1 -g -pipe"
-
- # honour CFLAGS in X11 build - upstream fixed so far only the other libs
- # From xorg-x11-6.9.0-r3.ebuild
- pushd "${srcdir}/nx-libs-$pkgver/nx-X11"
-
- HOSTCONF="config/cf/host.def"
- echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
- echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >>
${HOSTCONF}
- # Respect LDFLAGS
- echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
- echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
- popd
-
- # fix a broken Makefiles
- sed -i "s:-o root -g root ::" nxcompshad/Makefile.in
-
# let makepkg zip the man files
sed -i "s:gzip:#gzip:g" Makefile
@@ -50,7 +35,14 @@
# fake install
mkdir $srcdir/fakeinstall
- make PREFIX=/usr DESTDIR="$srcdir/fakeinstall" install
+ 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() {
@@ -65,49 +57,38 @@
package_nxproxy() {
pkgdesc="NX proxy"
- depends=('libxcomp')
+ depends=('libxcomp' )
- install -dm755 ${pkgdir}/usr/{bin,share/man/man1,lib/nx/bin}
- cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxproxy
${pkgdir}/usr/lib/nx/bin/nxproxy
+ 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-xcompext() {
-
- pkgdesc="Xcompext/Xcompshad library for NX"
- depends=('libxcomp' 'nx-x11')
-
- install -dm755 ${pkgdir}/usr/lib
- cp -a ${srcdir}/fakeinstall/usr/lib/libXcompext.so* ${pkgdir}/usr/lib
-}
-
package_nx-x11() {
pkgdesc="NX-X11 lib for the NX framework"
- depends=('libxcomp' 'fontconfig' 'xorg-xkbcomp')
- optdepends=('libxext: for Xinerama support')
+ depends=('libxcomp')
- install -dm755 ${pkgdir}/{usr/bin,usr/lib/nx/{X11,bin},usr/share/man/man1}
+ install -dm755 ${pkgdir}/usr/{lib/nx/X11,share/nx}
cp -aR ${srcdir}/fakeinstall/usr/lib/nx/X11/* ${pkgdir}/usr/lib/nx/X11
cp -aR ${srcdir}/fakeinstall/usr/lib/libNX* ${pkgdir}/usr/lib
- # nxauth
- cp -a ${srcdir}/fakeinstall/usr/lib/nx/bin/nxauth ${pkgdir}/usr/lib/nx/bin
- cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxauth.1
${pkgdir}/usr/share/man/man1
+ rm -rfv ${pkgdir}/usr/lib/nx/X11
- # the wrapper
- cp -a ${srcdir}/fakeinstall/usr/bin/nxauth ${pkgdir}/usr/bin
-
- rm -rf ${pkgdir}/usr/lib/nx/X11
+ # fonts symlink
+ ln -vsf /usr/share/fonts ${pkgdir}/usr/share/nx/fonts
}
package_nxagent() {
pkgdesc="NX X server based on Xnest"
- backup=(etc/nxagent/{keystrokes.cfg,nxagent.keyboard,rgb})
- depends=('nx-xcompext' 'libxml2' 'xkeyboard-config' 'xorg-xkbcomp')
+ backup=(etc/nxagent/{keystrokes.cfg,nxagent.keyboard})
+ depends=('nx-x11' 'libxcomp' 'libxml2' 'xkeyboard-config' 'xorg-xkbcomp'
+ 'xorg-xkbcomp' 'libxfont2' 'libxinerama'
+ 'xorg-font-util' 'libxfont2' 'libxinerama' 'pixman'
+ 'libxrandr' 'libxtst' 'libxcomposite' 'libxpm' 'libxdamage')
+ conflicts=('nx-xcompext')
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
@@ -118,7 +99,7 @@
cp -a ${srcdir}/fakeinstall/usr/bin/nxagent ${pkgdir}/usr/bin
# additional files for documentation
- cp -a ${srcdir}/fakeinstall/usr/share/nx/{rgb,SecurityPolicy}
${pkgdir}/usr/share/nx
+ cp -a ${srcdir}/fakeinstall/usr/share/nx/SecurityPolicy
${pkgdir}/usr/share/nx
cp -a ${srcdir}/fakeinstall/usr/lib/libXcompshad.so* ${pkgdir}/usr/lib
@@ -127,7 +108,7 @@
touch ${pkgdir}/usr/lib/X11/xkb/keymap.dir
install -dm755 ${pkgdir}/etc/nxagent
- cp -a
${srcdir}/fakeinstall/etc/nxagent/{keystrokes.cfg,nxagent.keyboard,rgb}
${pkgdir}/etc/nxagent
+ cp -a ${srcdir}/fakeinstall/etc/nxagent/{keystrokes.cfg,nxagent.keyboard}
${pkgdir}/etc/nxagent
# add symlinks required for proper Xinerama support # FS#41037
install -dm755 ${pkgdir}/usr/lib/nx/X11/Xinerama
@@ -141,6 +122,11 @@
pkgdesc="NX headers"
- install -dm755 ${pkgdir}/usr/include/nx
- cp -aR ${srcdir}/fakeinstall/usr/include/nx/* ${pkgdir}/usr/include/nx
-}
+ install -dm755 ${pkgdir}/usr/include
+ cp -aR ${srcdir}/fakeinstall/usr/include/* ${pkgdir}/usr/include
+
+ # drop unneeded headers
+ rm -rf ${pkgdir}/usr/include/GL
+ rm -rf
${pkgdir}/usr/include/nx-X11/{extensions/XK*.h,nx-X11/extensions/*Xv*.h,nx-X11/Xtrans}
+}
+
