[arch-commits] Commit in tigervnc/trunk (PKGBUILD gethomedir.patch xorg118.patch)

[Sergej Pupykin]

    Date: Tuesday, May 16, 2017 @ 17:53:32
  Author: spupykin
Revision: 228284

upgpkg: tigervnc 1.8.0-1

Modified:
  tigervnc/trunk/PKGBUILD
Deleted:
  tigervnc/trunk/gethomedir.patch
  tigervnc/trunk/xorg118.patch

------------------+
 PKGBUILD         |   25 ++++++++-----------------
 gethomedir.patch |   20 --------------------
 xorg118.patch    |   27 ---------------------------
 3 files changed, 8 insertions(+), 64 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-05-16 17:06:24 UTC (rev 228283)
+++ PKGBUILD	2017-05-16 17:53:32 UTC (rev 228284)
@@ -2,9 +2,9 @@
 # Maintainer: Uroš Vampl <mobile.leecher at gmail dot com>
 
 pkgname=tigervnc
-pkgver=1.7.1
+pkgver=1.8.0
 pkgrel=1
-_xorgver=1.18.4
+_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"
@@ -11,7 +11,7 @@
 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'
@@ -22,26 +22,17 @@
 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
-	gethomedir.patch
-	xorg118.patch)
-sha256sums=('3c021ec0bee4611020c0bcbab995b0ef2f6f1a46127a52b368827f3275527ccc'
-            '278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8'
+	vncviewer.desktop)
+sha256sums=('9951dab0e10f8de03996ec94bec0d938da9f36d48dca8c954e8bbc95c16338f8'
+            '677a8166e03474719238dfe396ce673c4234735464d6dadf2959b600d20e5a98'
             '80f8fc7598d05e645ae73bc3371bbdededf07136a9f024ce6ebbfe469335b16e'
-            '2ada7da1a926d78f11d2dd8ec376ac5877d2ce2bbb57a99526c13d8fcae6ddd7'
-            '589441f368159d18be931856c30bb1874d54392d80d58a39e3826f00cb0c110e'
-            '7764c6a6b3052042aefe571c9dce24b1b30359fc92853821eb78e9d14dd185db')
+            '2ada7da1a926d78f11d2dd8ec376ac5877d2ce2bbb57a99526c13d8fcae6ddd7')
 
 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 unix/xserver
   cp -r "$srcdir"/xorg-server-${_xorgver}/* .
-  patch -Np1 -i ../xserver117.patch
+  patch -Np1 -i ../xserver119.patch
 }
 
 build() {

Deleted: gethomedir.patch
===================================================================
--- gethomedir.patch	2017-05-16 17:06:24 UTC (rev 228283)
+++ gethomedir.patch	2017-05-16 17:53:32 UTC (rev 228284)
@@ -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
- 

Deleted: xorg118.patch
===================================================================
--- xorg118.patch	2017-05-16 17:06:24 UTC (rev 228283)
+++ xorg118.patch	2017-05-16 17:53:32 UTC (rev 228284)
@@ -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