diff --git a/tigervnc/.SRCINFO b/tigervnc/.SRCINFO new file mode 100644 index 0000000000..ca3fa531b1 --- /dev/null +++ b/tigervnc/.SRCINFO @@ -0,0 +1,54 @@ +pkgbase = tigervnc + pkgdesc = Suite of VNC servers and clients based on the VNC 4 branch of TightVNC + pkgver = 1.14.0 + pkgrel = 2 + url = https://www.tigervnc.org + arch = x86_64 + license = GPL-2.0-only + makedepends = cmake + makedepends = nasm + makedepends = xorg-font-util + makedepends = xorg-util-macros + makedepends = git + makedepends = xtrans + makedepends = xorgproto + makedepends = mesa + makedepends = imagemagick + makedepends = java-environment=8 + depends = fltk + depends = pam + depends = gnutls + depends = libjpeg-turbo + depends = libxtst + depends = pixman + depends = xorg-xauth + depends = xorg-xsetroot + depends = xkeyboard-config + depends = xorg-xkbcomp + depends = libgl + depends = libgcrypt + depends = perl + depends = libxdamage + depends = libxfont2 + depends = libdrm + depends = xorg-xinit + depends = libxcvt + depends = ffmpeg + optdepends = mesa: for OpenGL functionality in Xvnc + conflicts = tightvnc + backup = etc/pam.d/tigervnc + backup = etc/tigervnc/vncserver-config-defaults + backup = etc/tigervnc/vncserver-config-mandatory + backup = etc/tigervnc/vncserver.users + source = git+https://github.com/TigerVNC/tigervnc.git#tag=v1.14.0 + source = git+https://gitlab.freedesktop.org/xorg/xserver.git?#tag=xorg-server-21.1.13 + source = Xsession + source = more-xsessions.patch + source = remove-selinux.patch + sha256sums = 70f47b0fcd5d698e7e504cc02eeeb54a5ffec9468ab4f7716052628456373623 + sha256sums = 63620c5faf0f76d6f52ee5aed57f3bc739a7868dac9379a1a7e36df6375540a0 + sha256sums = c9276f6ea277cf9654fb2cc3bc9dadbb2e596b5cf8ca867ee906c0080cf7f810 + sha256sums = df7d5ac0b16781ba50963833f1bdd4603f1cdfcc24b1727f563ae800508c9dc0 + sha256sums = b5da49ee5f10dd40945df9c8563066c5523a24ac0ad934c7efcb41d0847b94ed + +pkgname = tigervnc diff --git a/tigervnc/.nvchecker.toml b/tigervnc/.nvchecker.toml new file mode 100644 index 0000000000..4d370767c6 --- /dev/null +++ b/tigervnc/.nvchecker.toml @@ -0,0 +1,5 @@ +[tigervnc] +source = "git" +git = "https://github.com/TigerVNC/tigervnc.git" +prefix = "v" +exclude_regex = ".*.90" diff --git a/tigervnc/PKGBUILD b/tigervnc/PKGBUILD index 8efdecc461..c4552c9978 100644 --- a/tigervnc/PKGBUILD +++ b/tigervnc/PKGBUILD @@ -1,22 +1,27 @@ +# POWER Maintainer: Alexander Baldeck # Maintainer: Sergej Pupykin # Maintainer: Uroš Vampl pkgname=tigervnc -pkgver=1.13.1 -pkgrel=5.1 +pkgver=1.14.1 +pkgrel=1 _xorgver=21.1.13 -pkgdesc="Suite of VNC servers and clients. Based on the VNC 4 branch of TightVNC." +pkgdesc="Suite of VNC servers and clients based on the VNC 4 branch of TightVNC" arch=(x86_64 powerpc64le powerpc64 powerpc riscv64) -url="http://www.tigervnc.org" -license=('GPL') +url="https://www.tigervnc.org" +license=('GPL-2.0-only') depends=('fltk' 'pam' 'gnutls' 'libjpeg-turbo' 'libxtst' 'pixman' 'xorg-xauth' 'xorg-xsetroot' 'xkeyboard-config' 'xorg-xkbcomp' 'libgl' 'libgcrypt' 'perl' 'libxdamage' 'libxfont2' 'libdrm' 'xorg-xinit' 'libxcvt' 'ffmpeg') makedepends=('cmake' 'xorg-font-util' 'xorg-util-macros' 'git' 'xtrans' 'xorgproto' - 'mesa' 'imagemagick' 'java-environment>=8') -makedepends_x86_64=('nasm') + 'mesa' 'imagemagick') +makedepends_powerpc=('nasm' 'java-environment=8') +makedepends_powerpc64=('nasm' 'java-environment=17') +makedepends_powerpc64le=('nasm' 'java-environment=8') +makedepends_riscv64=('nasm' 'java-environment=11') +makedepends_x86_64=('nasm' 'java-environment=8') optdepends=('mesa: for OpenGL functionality in Xvnc') conflicts=('tightvnc') backup=(etc/pam.d/tigervnc @@ -28,11 +33,11 @@ source=(git+https://github.com/TigerVNC/tigervnc.git#tag=v${pkgver} Xsession more-xsessions.patch remove-selinux.patch) -sha256sums=('a742d94c23ec632145afe613a4ce9c67cb32429dd47aba58fd01a7cbf6d5d8f2' +sha256sums=('293489c6ce098a1e4a4bfee2f185f95bd905679d2001a07a0cdb88b4d654203b' '63620c5faf0f76d6f52ee5aed57f3bc739a7868dac9379a1a7e36df6375540a0' 'c9276f6ea277cf9654fb2cc3bc9dadbb2e596b5cf8ca867ee906c0080cf7f810' - 'cb57dece026b29d7019a3e1e42fd2fb201d37fc60a70c885d2a50acffb808c06' - 'fb8bb5bd3ec990720580a664326a70fd178ce94b97c2130462df9b1e3a3925c3') + 'df7d5ac0b16781ba50963833f1bdd4603f1cdfcc24b1727f563ae800508c9dc0' + 'b5da49ee5f10dd40945df9c8563066c5523a24ac0ad934c7efcb41d0847b94ed') prepare() { cd ${pkgname} @@ -41,7 +46,7 @@ prepare() { cd unix/xserver cp -r "$srcdir"/xserver/* . - patch -Np1 -i ../xserver21.1.1.patch + patch -Np1 -i ../xserver21.patch } build() { diff --git a/tigervnc/more-xsessions.patch b/tigervnc/more-xsessions.patch index 5ca990b516..21448c9057 100644 --- a/tigervnc/more-xsessions.patch +++ b/tigervnc/more-xsessions.patch @@ -1,7 +1,8 @@ -diff -wbBur tigervnc-1.11.0/unix/vncserver/vncserver.in tigervnc-1.11.0.my/unix/vncserver/vncserver.in ---- tigervnc-1.11.0/unix/vncserver/vncserver.in 2020-09-08 15:16:08.000000000 +0300 -+++ tigervnc-1.11.0.my/unix/vncserver/vncserver.in 2020-09-11 15:39:59.980775388 +0300 -@@ -438,7 +438,13 @@ +diff --git a/unix/vncserver/vncserver.in b/unix/vncserver/vncserver.in +index ebdd3a97..089177a9 100755 +--- a/unix/vncserver/vncserver.in ++++ b/unix/vncserver/vncserver.in +@@ -447,7 +447,13 @@ sub SanityCheck die "$prog: couldn't find \"$cmd\" on your PATH.\n"; } diff --git a/tigervnc/remove-selinux.patch b/tigervnc/remove-selinux.patch index 8c8601c213..952948206c 100644 --- a/tigervnc/remove-selinux.patch +++ b/tigervnc/remove-selinux.patch @@ -1,8 +1,11 @@ -diff -wbBur tigervnc-1.11.0/unix/vncserver/tigervnc.pam tigervnc-1.11.0.my/unix/vncserver/tigervnc.pam ---- tigervnc-1.11.0/unix/vncserver/tigervnc.pam 2020-09-08 15:16:08.000000000 +0300 -+++ tigervnc-1.11.0.my/unix/vncserver/tigervnc.pam 2020-09-11 18:42:35.160649140 +0300 -@@ -1,8 +1,5 @@ - #%PAM-1.0 +diff --git a/unix/vncserver/tigervnc.pam b/unix/vncserver/tigervnc.pam +index dda76c49..b372c821 100644 +--- a/unix/vncserver/tigervnc.pam ++++ b/unix/vncserver/tigervnc.pam +@@ -3,10 +3,7 @@ + # THIS IS AN EXAMPLE CONFIGURATION + # MODIFY AS NEEDED FOR YOUR DISTRIBUTION + -# pam_selinux.so close should be the first session rule --session required pam_selinux.so close session required pam_loginuid.so @@ -10,11 +13,11 @@ diff -wbBur tigervnc-1.11.0/unix/vncserver/tigervnc.pam tigervnc-1.11.0.my/unix/ session required pam_namespace.so session optional pam_keyinit.so force revoke session required pam_limits.so -diff -wbBur tigervnc-1.11.0/unix/vncserver/vncserver@.service.in tigervnc-1.11.0.my/unix/vncserver/vncserver@.service.in ---- tigervnc-1.11.0/unix/vncserver/vncserver@.service.in 2020-09-08 15:16:08.000000000 +0300 -+++ tigervnc-1.11.0.my/unix/vncserver/vncserver@.service.in 2020-09-11 18:42:45.223982346 +0300 -@@ -36,8 +36,7 @@ - [Service] +diff --git a/unix/vncserver/vncserver@.service.in b/unix/vncserver/vncserver@.service.in +index 592ddb67..1ff14012 100644 +--- a/unix/vncserver/vncserver@.service.in ++++ b/unix/vncserver/vncserver@.service.in +@@ -37,7 +37,6 @@ After=syslog.target network.target systemd-user-sessions.service Type=forking ExecStart=@CMAKE_INSTALL_FULL_LIBEXECDIR@/vncsession-start %i PIDFile=/run/vncsession-%i.pid