From 1283aca0786d6bb3dd0167138788c03298dcd102 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 7 Jun 2017 19:31:55 +0000 Subject: tigervnc: update to 1.8.0 --- abs/extra/tigervnc/PKGBUILD | 54 +++++++++++++++--------------------- abs/extra/tigervnc/gethomedir.patch | 20 ------------- abs/extra/tigervnc/vncserver.service | 2 +- abs/extra/tigervnc/xorg118.patch | 27 ------------------ 4 files changed, 24 insertions(+), 79 deletions(-) delete mode 100644 abs/extra/tigervnc/gethomedir.patch delete mode 100644 abs/extra/tigervnc/xorg118.patch diff --git a/abs/extra/tigervnc/PKGBUILD b/abs/extra/tigervnc/PKGBUILD index db327ef..8460632 100644 --- a/abs/extra/tigervnc/PKGBUILD +++ b/abs/extra/tigervnc/PKGBUILD @@ -2,16 +2,16 @@ # Maintainer: Uroš Vampl pkgname=tigervnc -pkgver=1.6.0 +pkgver=1.8.0 pkgrel=2 -_xorgver=1.18.0 +_xorgver=1.19.3 pkgdesc="Suite of VNC servers and clients. Based on the VNC 4 branch of TightVNC." arch=('i686' 'x86_64') url="http://www.tigervnc.org" license=('GPL') depends=('fltk' 'pam' 'gnutls' 'libjpeg-turbo' 'libxtst' 'libxfont' 'pixman' 'xorg-xauth' 'xorg-xsetroot' 'xkeyboard-config' 'xorg-xkbcomp' - 'libgl' 'libgcrypt' 'perl' 'libxdamage') + 'libgl' 'libgcrypt' 'perl' 'libxdamage' 'libxfont2') makedepends=('cmake' 'nasm' 'xorg-font-util' 'xorg-util-macros' 'bigreqsproto' 'compositeproto' 'damageproto' 'randrproto' 'resourceproto' 'scrnsaverproto' 'videoproto' 'xcmiscproto' 'xf86vidmodeproto' @@ -23,27 +23,21 @@ install=tiger.install source=($pkgname-$pkgver.tar.gz::https://github.com/TigerVNC/tigervnc/archive/v${pkgver}.tar.gz ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${_xorgver}.tar.bz2 vncserver.service - vncviewer.desktop - vncsvc.rules - gethomedir.patch - xorg118.patch) + vncsvc.rules + vncviewer.desktop) prepare() { - cd ${srcdir}/${pkgname}-${pkgver} - - patch -Np1 -i ${srcdir}/xorg118.patch - patch -Np1 -i ${srcdir}/gethomedir.patch - sed -i 's/iconic/nowin/' unix/vncserver - + cd "$srcdir"/${pkgname}-${pkgver} cd unix/xserver - cp -r ${srcdir}/xorg-server-${_xorgver}/* . - patch -Np1 -i ../xserver117.patch + cp -r "$srcdir"/xorg-server-${_xorgver}/* . + patch -Np1 -i ../xserver119.patch } build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir"/${pkgname}-${pkgver} - cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr + cmake -G "Unix Makefiles" \ + -DCMAKE_INSTALL_PREFIX=/usr make cd unix/xserver @@ -54,19 +48,19 @@ build() { --disable-xwin --disable-xephyr --disable-kdrive --disable-xwayland \ --disable-config-hal --disable-config-udev --with-pic \ --disable-unit-tests --disable-devel-docs --disable-selective-werror \ - --disable-dri --enable-dri2 --enable-dri3 --enable-glx --enable-glx-tls + --disable-dri --enable-dri2 --enable-dri3 --enable-glx make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir"/${pkgname}-${pkgver} + make DESTDIR="$pkgdir" install cd unix/xserver/hw/vnc - make DESTDIR=${pkgdir} install - install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/contrib/systemd/user/vncserver@.service \ - $pkgdir/usr/lib/systemd/user/vncserver@.service - install -Dm0644 $srcdir/vncserver.service $pkgdir/usr/lib/systemd/system/vncserver.service - install -Dm0644 $srcdir/vncviewer.desktop $pkgdir/usr/share/applications/vncviewer.desktop + make DESTDIR="$pkgdir" install + install -Dm0644 "$srcdir"/${pkgname}-${pkgver}/contrib/systemd/user/vncserver@.service \ + "$pkgdir"/usr/lib/systemd/user/vncserver@.service + install -Dm0644 "$srcdir"/vncserver.service "$pkgdir"/usr/lib/systemd/system/vncserver.service + install -Dm0644 "$srcdir"/vncviewer.desktop "$pkgdir"/usr/share/applications/vncviewer.desktop #LinHES sudo rules mkdir -p $pkgdir/etc/sudoers.d/ @@ -74,10 +68,8 @@ package() { chown -R root:root $pkgdir/etc/sudoers.d install -o root -g root -m 0750 $srcdir/vncsvc.rules $pkgdir/etc/sudoers.d/vncsvc-tigervnc } -md5sums=('78b736445781d86c48e942465a391ccc' - '3c1c1057d3ad27380d8dd87ffcc182cd' - '1aad8f06504b3e29a24ccfbaab617973' - 'b200d83c60e80c6f9693ea19a2d9f5b0' +md5sums=('5c9a80dd4b99b4eb19f535db5ce5830f' + '015d2fc4b9f2bfe7a626edb63a62c65e' + 'a8a20685c23a50f86a13c33ce96a7ba7' 'f333a228ddbefffc6ce945754bc9c5c5' - '22f1523a0eca56ad79cfabd0db6e2cf6' - '2fd32181679077eb7f7ca06cf25f443f') + 'b200d83c60e80c6f9693ea19a2d9f5b0') diff --git a/abs/extra/tigervnc/gethomedir.patch b/abs/extra/tigervnc/gethomedir.patch deleted file mode 100644 index 5f3542d..0000000 --- a/abs/extra/tigervnc/gethomedir.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/Makefile.am tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am ---- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/Makefile.am 2011-10-31 09:14:40.000000000 +0100 -+++ tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am 2012-09-06 19:44:04.431123087 +0200 -@@ -5,6 +5,7 @@ - RDR_LIB=$(LIB_DIR)/rdr/librdr.la - NETWORK_LIB=$(LIB_DIR)/network/libnetwork.la - XREGION_LIB=$(LIB_DIR)/Xregion/libXregion.la -+OS_LIB=$(LIB_DIR)/os/libos.la - COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB) - - noinst_LTLIBRARIES = libvnccommon.la -@@ -55,7 +56,7 @@ - - libvnc_la_LDFLAGS = -module -avoid-version - --libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) -+libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(OS_LIB) - - EXTRA_DIST = Xvnc.man - diff --git a/abs/extra/tigervnc/vncserver.service b/abs/extra/tigervnc/vncserver.service index 0c257b3..40151ac 100644 --- a/abs/extra/tigervnc/vncserver.service +++ b/abs/extra/tigervnc/vncserver.service @@ -18,7 +18,7 @@ Description=Remote desktop service (VNC) After=syslog.target network.target [Service] -Type=forking +Type=simple User= ExecStartPre=/bin/sh -c '/usr/bin/vncserver -kill %i >/dev/null 2>&1 || true' diff --git a/abs/extra/tigervnc/xorg118.patch b/abs/extra/tigervnc/xorg118.patch deleted file mode 100644 index 7484200..0000000 --- a/abs/extra/tigervnc/xorg118.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -wbBur tigervnc-1.5.0/unix/xserver/hw/vnc/Input.c tigervnc-1.5.0.q/unix/xserver/hw/vnc/Input.c ---- tigervnc-1.5.0/unix/xserver/hw/vnc/Input.c 2015-07-11 16:00:36.000000000 +0300 -+++ tigervnc-1.5.0.q/unix/xserver/hw/vnc/Input.c 2015-11-25 19:04:24.278747038 +0300 -@@ -300,6 +300,8 @@ - #if XORG < 111 - n = GetKeyboardEvents(eventq, dev, action, kc); - enqueueEvents(dev, n); -+#elif XORG > 117 -+ QueueKeyboardEvents(dev, action, kc); - #else - QueueKeyboardEvents(dev, action, kc, NULL); - #endif -diff -wbBur tigervnc-1.5.0/unix/xserver/hw/vnc/xorg-version.h tigervnc-1.5.0.q/unix/xserver/hw/vnc/xorg-version.h ---- tigervnc-1.5.0/unix/xserver/hw/vnc/xorg-version.h 2015-07-11 16:00:36.000000000 +0300 -+++ tigervnc-1.5.0.q/unix/xserver/hw/vnc/xorg-version.h 2015-11-25 19:02:47.688751421 +0300 -@@ -48,8 +48,10 @@ - #define XORG 116 - #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (17 * 100000) + (99 * 1000)) - #define XORG 117 -+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (18 * 100000) + (99 * 1000)) -+#define XORG 118 - #else --#error "X.Org newer than 1.17 is not supported" -+#error "X.Org newer than 1.18 is not supported" - #endif - - #endif -- cgit v0.12