From 6e1426b6db605e426f52ab216381990a969c4451 Mon Sep 17 00:00:00 2001 From: eoli3n Date: Fri, 25 Dec 2020 22:35:08 +0100 Subject: [PATCH] New package: nx-libs-3.5.99.26 --- common/shlibs | 3 + .../patches/fix-musl-headers-x86.patch | 11 ++++ srcpkgs/nx-libs/patches/xf86bigfont.patch | 10 +++ srcpkgs/nx-libs/template | 62 +++++++++++++++++++ 4 files changed, 86 insertions(+) create mode 100644 srcpkgs/nx-libs/patches/fix-musl-headers-x86.patch create mode 100644 srcpkgs/nx-libs/patches/xf86bigfont.patch create mode 100644 srcpkgs/nx-libs/template diff --git a/common/shlibs b/common/shlibs index 2afcbb9a6d..0d4bdcffac 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3987,3 +3987,6 @@ libmariadb.so.3 libmariadbclient-10.5.9_1 libmariadbd.so.19 libmariadbclient-10.5.9_1 libinstpatch-1.0.so.2 libinstpatch-1.1.6_1 libbasu.so.0 basu-0.2.0_1 +libXcomp.so.3 nx-libs-3.5.99.24_1 +libXcompshad.so.3 nx-libs-3.5.99.24_1 +libNX_X11.so.6 nx-libs-3.5.99.24_1 diff --git a/srcpkgs/nx-libs/patches/fix-musl-headers-x86.patch b/srcpkgs/nx-libs/patches/fix-musl-headers-x86.patch new file mode 100644 index 0000000000..3f51b8e4b1 --- /dev/null +++ b/srcpkgs/nx-libs/patches/fix-musl-headers-x86.patch @@ -0,0 +1,11 @@ +--- ./nx-X11/extras/Mesa/src/mesa/main/glheader.h.orig ++++ ./nx-X11/extras/Mesa/src/mesa/main/glheader.h +@@ -62,7 +62,7 @@ + #include + #include + #include +-#if defined(__linux__) && defined(__i386__) ++#if defined(__GLIBC__) && defined(__i386__) + #include + #endif + #endif diff --git a/srcpkgs/nx-libs/patches/xf86bigfont.patch b/srcpkgs/nx-libs/patches/xf86bigfont.patch new file mode 100644 index 0000000000..b5f29e4933 --- /dev/null +++ b/srcpkgs/nx-libs/patches/xf86bigfont.patch @@ -0,0 +1,10 @@ +--- nx-X11/programs/Xserver/Xext/xf86bigfont.c 2021-02-04 14:34:56.000000000 +0100 ++++ - 2021-05-10 08:55:11.108944904 +0200 +@@ -45,7 +45,6 @@ + /* Linux libc4 and libc5 only (because glibc doesn't include kernel headers): + Linux 2.0.x and 2.2.x define SHMLBA as PAGE_SIZE, but forget to define + PAGE_SIZE. It is defined in . */ +-#include + #include + #endif + #ifdef SVR4 diff --git a/srcpkgs/nx-libs/template b/srcpkgs/nx-libs/template new file mode 100644 index 0000000000..e0b01308bc --- /dev/null +++ b/srcpkgs/nx-libs/template @@ -0,0 +1,62 @@ +# Template file for 'nx-libs' +pkgname=nx-libs +version=3.5.99.26 +revision=1 +build_style=gnu-configure +make_build_args="CONFIGURE=echo IMAKE_DEFINES=-DUseTIRPC=YES" +make_install_args="PREFIX=/usr" +hostmakedepends="autoconf automake libtool pkg-config which imake xkbcomp gccmakedep" +makedepends="xorgproto zlib-devel libjpeg-turbo-devel libpng-devel + libXext-devel libXdamage-devel libXrandr-devel libXtst-devel pixman-devel + libXfont2-devel libxml2-devel libXcomposite-devel libXinerama-devel + libtirpc-devel libXpm-devel font-util xkbcomp" +short_desc="NX X11 protocol compression libraries" +maintainer="eoli3n " +license="GPL-2.0-or-later" +homepage="https://github.com/ArcticaProject/nx-libs" +distfiles="https://github.com/ArcticaProject/nx-libs/archive/$version/$pkgname-$version.tar.gz" +checksum=3ce7ca4e6b57b3a2d7588b2d0f4009036d2566a8925ca2c62f08a8dc0df50357 +python_version=3 +nocross="imake attempts to run target executables on host" + +post_patch() { + # Replace hard-coded /usr/local ProjectRoot + vsed -e '/ProjectRoot/s,/usr/local,/usr,' -i nx-X11/config/cf/site.def + # Manually run autoreconf in pre_configure, disable in Makefile + vsed -e 's/autoreconf/echo &-disabled/' -i Makefile +} + +pre_configure() { + # Create configure scripts for all subprojects + local _subdir + for _subdir in nxcomp nx-X11/lib nxcompshad nxproxy nxdialog; do + ( cd ${_subdir} && autoreconf -vfsi ) + done +} + +do_configure() { + # Configure all subprojects in advance of build + local _subdir + for _subdir in nxcomp nxcompshad nxproxy nxdialog; do + ( cd ${_subdir} && ./configure ${configure_args} ) + done + + # nx-X11 configure has an extra argument + ( cd nx-X11/lib && ./configure ${configure_args} --disable-poll ) +} + +post_install() { + # Remove conflicting GL headers + rm -rf ${DESTDIR}/usr/include/GL +} + +nx-libs-devel_install() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig + } +}