From 0d59862fe89e79b918b33babf3b6da7cdeef3de7 Mon Sep 17 00:00:00 2001 From: eoli3n Date: Mon, 10 May 2021 21:27:15 +0200 Subject: [PATCH 1/4] x2goserver: fix non working package --- srcpkgs/x2goserver/INSTALL | 6 ++++++ srcpkgs/x2goserver/template | 43 +++++++++++++++++++++++-------------- 2 files changed, 33 insertions(+), 16 deletions(-) create mode 100644 srcpkgs/x2goserver/INSTALL diff --git a/srcpkgs/x2goserver/INSTALL b/srcpkgs/x2goserver/INSTALL new file mode 100644 index 000000000000..31ae1da07f7f --- /dev/null +++ b/srcpkgs/x2goserver/INSTALL @@ -0,0 +1,6 @@ +case "${ACTION}" in +post) + chgrp x2gouser usr/lib/x2go/libx2go-server-db-sqlite3-wrapper + chmod g+s usr/lib/x2go/libx2go-server-db-sqlite3-wrapper + ;; +esac diff --git a/srcpkgs/x2goserver/template b/srcpkgs/x2goserver/template index 158130a96717..819a2326325b 100644 --- a/srcpkgs/x2goserver/template +++ b/srcpkgs/x2goserver/template @@ -1,28 +1,39 @@ # Template file for 'x2goserver' pkgname=x2goserver version=4.1.0.3 -revision=1 +revision=2 build_style=gnu-makefile -hostmakedepends="pkg-config perl" +hostmakedepends="pkg-config perl which" makedepends="libssh2-devel" -depends="perl perl-Config-Simple perl-DBI perl-Capture-Tiny perl-DBD-SQLite bash iproute2 makepasswd openssh lsof xauth perl-File-BaseDir nx-libs perl-File-Which" +make_install_args="SBINDIR=/usr/bin" +make_build_args="PREFIX=/usr" +depends="bash iproute2 openssh lsof xauth xhost xwininfo psmisc xkeyboard-config + perl-Config-Simple perl-DBI perl-Capture-Tiny perl-DBD-SQLite perl-File-BaseDir + perl-File-Which perl-Try-Tiny perl-Switch nx-libs" short_desc="Open source graphical Remote Desktop based on NX technology" -maintainer="eoli3n " +maintainer="eoli3n " license="GPL-2.0-or-later" homepage="http://www.x2go.org" distfiles="http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${version}.tar.gz" checksum=6776aaa354f5a44e349f0b3c176d4988c88a618c2edf46c98a37ae89c069dcd0 system_groups="x2gouser" -system_accounts="x2gouser" -x2gouser_homedir="/var/lib/x2go" -x2gouser_shell="/bin/false" +make_dirs="/var/lib/x2go 0770 root x2gouser" -post_extract() { - # Replace hard-coded /usr/sbin - for _file in x2goserver-printing/Makefile x2goserver/Makefile x2goserver-xsession/Makefile libx2go-server-db-perl/Makefile x2goserver-common/Makefile; do - vsed -e 's,/sbin,/bin,g' -i "$_file" - done - for _file in bin/x2golistdesktops bin/x2goresume-session bin/x2gostartagent sbin/x2gocleansessions; do - vsed -e 's,/usr/sbin,/usr/bin,g' -i x2goserver/"$_file" - done -} +#post_patch() { +# for _file in \ +# Makefile \ +# x2goserver-desktopsharing/Makefile \ +# x2goserver-desktopsharing/bin/x2goterminate-desktopsharing \ +# libx2go-server-db-perl/Makefile \ +# x2goserver-fmbindings/Makefile \ +# x2goserver-xsession/Makefile \ +# x2goserver-x2goagent/Makefile \ +# x2goserver-common/Makefile \ +# x2goserver/Makefile \ +# x2goserver-extensions/Makefile \ +# x2goserver-printing/Makefile \ +# x2goserver/man/man8/x2gobasepath.8 \ +# x2goserver/man/man8/x2gopath.8; do +# vsed -e 's,/usr/local,/usr,g' -i "$_file" +# done +#} From 2b63f29f783d711a9ed77c6715a9d5232515606e Mon Sep 17 00:00:00 2001 From: eoli3n Date: Mon, 10 May 2021 23:45:00 +0200 Subject: [PATCH 2/4] New Package: perl-Switch-2.17 --- srcpkgs/perl-Switch/template | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 srcpkgs/perl-Switch/template diff --git a/srcpkgs/perl-Switch/template b/srcpkgs/perl-Switch/template new file mode 100644 index 000000000000..36bac68a661d --- /dev/null +++ b/srcpkgs/perl-Switch/template @@ -0,0 +1,15 @@ +# Template file for 'perl-Switch' +pkgname=perl-Switch +version=2.17 +revision=1 +wrksrc="Switch-${version}" +build_style=perl-module +hostmakedepends="pkg-config perl" +makedepends="perl" +depends="perl" +short_desc="Switch statement for Perl" +maintainer="eoli3n " +license="Artistic-1.0-Perl, GPL-1.0-or-later" +homepage="https://metacpan.org/pod/Switch" +distfiles="${CPAN_SITE}/File/CHORNY/Switch-${version}.tar.gz" +checksum=31354975140fe6235ac130a109496491ad33dd42f9c62189e23f49f75f936d75 From 95ccce365ba5c6b16f9c9b81685e49b0728b4553 Mon Sep 17 00:00:00 2001 From: eoli3n Date: Tue, 11 May 2021 14:51:09 +0200 Subject: [PATCH 3/4] nx-libs: fix nxagent --- srcpkgs/nx-libs-devel | 1 + srcpkgs/nx-libs/template | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) create mode 120000 srcpkgs/nx-libs-devel diff --git a/srcpkgs/nx-libs-devel b/srcpkgs/nx-libs-devel new file mode 120000 index 000000000000..3aefdeffb22b --- /dev/null +++ b/srcpkgs/nx-libs-devel @@ -0,0 +1 @@ +nx-libs \ No newline at end of file diff --git a/srcpkgs/nx-libs/template b/srcpkgs/nx-libs/template index e0b01308bc97..eb9d2e05e5c5 100644 --- a/srcpkgs/nx-libs/template +++ b/srcpkgs/nx-libs/template @@ -1,9 +1,12 @@ # Template file for 'nx-libs' pkgname=nx-libs version=3.5.99.26 -revision=1 +revision=2 build_style=gnu-configure -make_build_args="CONFIGURE=echo IMAKE_DEFINES=-DUseTIRPC=YES" +# The rpath for nxagent is USRLIBDIRPATH, which must be where this package +# provides a symlink to the custom libX11 with NX features +make_build_args='CONFIGURE=echo IMAKE_DEFINES=-DUseTIRPC=YES + USRLIBDIRPATH=\$$ORIGIN/../lib/nx/X11' make_install_args="PREFIX=/usr" hostmakedepends="autoconf automake libtool pkg-config which imake xkbcomp gccmakedep" makedepends="xorgproto zlib-devel libjpeg-turbo-devel libpng-devel @@ -11,10 +14,10 @@ makedepends="xorgproto zlib-devel libjpeg-turbo-devel libpng-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 " +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" +distfiles="${homepage}/archive/$version/$pkgname-$version.tar.gz" checksum=3ce7ca4e6b57b3a2d7588b2d0f4009036d2566a8925ca2c62f08a8dc0df50357 python_version=3 nocross="imake attempts to run target executables on host" @@ -50,7 +53,7 @@ post_install() { rm -rf ${DESTDIR}/usr/include/GL } -nx-libs-devel_install() { +nx-libs-devel_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { From c7d3e0256d22485009602e325f14139b88466564 Mon Sep 17 00:00:00 2001 From: eoli3n Date: Tue, 11 May 2021 14:51:33 +0200 Subject: [PATCH 4/4] x2goclient: updated maintainer email address --- srcpkgs/x2goclient/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/x2goclient/template b/srcpkgs/x2goclient/template index 76dbc1e2f258..d0bcfecc0ad8 100644 --- a/srcpkgs/x2goclient/template +++ b/srcpkgs/x2goclient/template @@ -13,7 +13,7 @@ makedepends="qt5-svg-devel qt5-x11extras-devel libldap-devel libssh-devel libXpm-devel cups-devel" depends="nx-libs" short_desc="Graphical Qt5 client for X2Go" -maintainer="eoli3n " +maintainer="eoli3n " license="GPL-2.0-or-later" homepage="http://www.x2go.org" distfiles="http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${version}.tar.gz"