[arch-commits] Commit in tigervnc/repos (12 files)
Bartłomiej Piotrowski
bpiotrowski at archlinux.org
Mon Dec 7 08:06:52 UTC 2015
Date: Monday, December 7, 2015 @ 09:06:52
Author: bpiotrowski
Revision: 149745
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
tigervnc/repos/community-staging-i686/
tigervnc/repos/community-staging-i686/PKGBUILD
(from rev 149744, tigervnc/trunk/PKGBUILD)
tigervnc/repos/community-staging-i686/gethomedir.patch
(from rev 149744, tigervnc/trunk/gethomedir.patch)
tigervnc/repos/community-staging-i686/vncserver.service
(from rev 149744, tigervnc/trunk/vncserver.service)
tigervnc/repos/community-staging-i686/vncviewer.desktop
(from rev 149744, tigervnc/trunk/vncviewer.desktop)
tigervnc/repos/community-staging-i686/xorg118.patch
(from rev 149744, tigervnc/trunk/xorg118.patch)
tigervnc/repos/community-staging-x86_64/
tigervnc/repos/community-staging-x86_64/PKGBUILD
(from rev 149744, tigervnc/trunk/PKGBUILD)
tigervnc/repos/community-staging-x86_64/gethomedir.patch
(from rev 149744, tigervnc/trunk/gethomedir.patch)
tigervnc/repos/community-staging-x86_64/vncserver.service
(from rev 149744, tigervnc/trunk/vncserver.service)
tigervnc/repos/community-staging-x86_64/vncviewer.desktop
(from rev 149744, tigervnc/trunk/vncviewer.desktop)
tigervnc/repos/community-staging-x86_64/xorg118.patch
(from rev 149744, tigervnc/trunk/xorg118.patch)
--------------------------------------------+
community-staging-i686/PKGBUILD | 72 +++++++++++++++++++++++++++
community-staging-i686/gethomedir.patch | 20 +++++++
community-staging-i686/vncserver.service | 29 ++++++++++
community-staging-i686/vncviewer.desktop | 9 +++
community-staging-i686/xorg118.patch | 27 ++++++++++
community-staging-x86_64/PKGBUILD | 72 +++++++++++++++++++++++++++
community-staging-x86_64/gethomedir.patch | 20 +++++++
community-staging-x86_64/vncserver.service | 29 ++++++++++
community-staging-x86_64/vncviewer.desktop | 9 +++
community-staging-x86_64/xorg118.patch | 27 ++++++++++
10 files changed, 314 insertions(+)
Copied: tigervnc/repos/community-staging-i686/PKGBUILD (from rev 149744, tigervnc/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-12-07 08:06:52 UTC (rev 149745)
@@ -0,0 +1,72 @@
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Uroš Vampl <mobile.leecher at gmail dot com>
+
+pkgname=tigervnc
+pkgver=1.5.0
+pkgrel=3
+_xorgver=1.18.0
+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')
+makedepends=('cmake' 'nasm' 'xorg-font-util' 'xorg-util-macros' 'bigreqsproto'
+ 'compositeproto' 'damageproto' 'randrproto' 'resourceproto'
+ 'scrnsaverproto' 'videoproto' 'xcmiscproto' 'xf86vidmodeproto'
+ 'xtrans' 'glproto' 'dri2proto' 'dri3proto' 'presentproto'
+ 'mesa' 'imagemagick')
+optdepends=('mesa: for OpenGL functionality in Xvnc')
+conflicts=('tightvnc')
+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)
+md5sums=('b11cc4c4d5249b9b8e355ee6f47ec4fe'
+ '3c1c1057d3ad27380d8dd87ffcc182cd'
+ '1aad8f06504b3e29a24ccfbaab617973'
+ 'b200d83c60e80c6f9693ea19a2d9f5b0'
+ '22f1523a0eca56ad79cfabd0db6e2cf6'
+ '2fd32181679077eb7f7ca06cf25f443f')
+
+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
+}
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr
+ make
+
+ cd unix/xserver
+ autoreconf -fiv
+ ./configure --prefix=/usr \
+ --disable-static --without-dtrace \
+ --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
+ --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
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+ cd unix/xserver/hw/vnc
+ make DESTDIR=${pkgdir} install
+ install -Dm0644 $srcdir/vncserver.service $pkgdir/usr/lib/systemd/system/vncserver.service
+ install -Dm0644 $srcdir/vncviewer.desktop $pkgdir/usr/share/applications/vncviewer.desktop
+}
Copied: tigervnc/repos/community-staging-i686/gethomedir.patch (from rev 149744, tigervnc/trunk/gethomedir.patch)
===================================================================
--- community-staging-i686/gethomedir.patch (rev 0)
+++ community-staging-i686/gethomedir.patch 2015-12-07 08:06:52 UTC (rev 149745)
@@ -0,0 +1,20 @@
+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
+
Copied: tigervnc/repos/community-staging-i686/vncserver.service (from rev 149744, tigervnc/trunk/vncserver.service)
===================================================================
--- community-staging-i686/vncserver.service (rev 0)
+++ community-staging-i686/vncserver.service 2015-12-07 08:06:52 UTC (rev 149745)
@@ -0,0 +1,29 @@
+# The vncserver service unit file
+#
+# 1. Copy this file to /etc/systemd/system/vncserver@:<display>.service
+# 2. Edit User=
+# ("User=foo")
+# 3. Edit and vncserver parameters appropriately
+# ("/usr/bin/vncserver %i -arg1 -arg2 -argn")
+# 4. Run `systemctl --system daemon-reload`
+# 5. Run `systemctl enable vncserver@:<display>.service`
+#
+# DO NOT RUN THIS SERVICE if your local area network is untrusted!
+#
+# See the wiki page for more on security
+# https://wiki.archlinux.org/index.php/Vncserver
+
+[Unit]
+Description=Remote desktop service (VNC)
+After=syslog.target network.target
+
+[Service]
+Type=forking
+User=
+
+ExecStartPre=/bin/sh -c '/usr/bin/vncserver -kill %i >/dev/null 2>&1 || true'
+ExecStart=/usr/bin/vncserver -fg %i
+ExecStop=/usr/bin/vncserver -kill %i
+
+[Install]
+WantedBy=multi-user.target
Copied: tigervnc/repos/community-staging-i686/vncviewer.desktop (from rev 149744, tigervnc/trunk/vncviewer.desktop)
===================================================================
--- community-staging-i686/vncviewer.desktop (rev 0)
+++ community-staging-i686/vncviewer.desktop 2015-12-07 08:06:52 UTC (rev 149745)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=TigerVNC Viewer
+Comment=VNC client
+Exec=/usr/bin/vncviewer
+Icon=tigervnc
+Terminal=false
+StartupNotify=false
+Categories=Network;RemoteAccess;
Copied: tigervnc/repos/community-staging-i686/xorg118.patch (from rev 149744, tigervnc/trunk/xorg118.patch)
===================================================================
--- community-staging-i686/xorg118.patch (rev 0)
+++ community-staging-i686/xorg118.patch 2015-12-07 08:06:52 UTC (rev 149745)
@@ -0,0 +1,27 @@
+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
Copied: tigervnc/repos/community-staging-x86_64/PKGBUILD (from rev 149744, tigervnc/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2015-12-07 08:06:52 UTC (rev 149745)
@@ -0,0 +1,72 @@
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Uroš Vampl <mobile.leecher at gmail dot com>
+
+pkgname=tigervnc
+pkgver=1.5.0
+pkgrel=3
+_xorgver=1.18.0
+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')
+makedepends=('cmake' 'nasm' 'xorg-font-util' 'xorg-util-macros' 'bigreqsproto'
+ 'compositeproto' 'damageproto' 'randrproto' 'resourceproto'
+ 'scrnsaverproto' 'videoproto' 'xcmiscproto' 'xf86vidmodeproto'
+ 'xtrans' 'glproto' 'dri2proto' 'dri3proto' 'presentproto'
+ 'mesa' 'imagemagick')
+optdepends=('mesa: for OpenGL functionality in Xvnc')
+conflicts=('tightvnc')
+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)
+md5sums=('b11cc4c4d5249b9b8e355ee6f47ec4fe'
+ '3c1c1057d3ad27380d8dd87ffcc182cd'
+ '1aad8f06504b3e29a24ccfbaab617973'
+ 'b200d83c60e80c6f9693ea19a2d9f5b0'
+ '22f1523a0eca56ad79cfabd0db6e2cf6'
+ '2fd32181679077eb7f7ca06cf25f443f')
+
+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
+}
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr
+ make
+
+ cd unix/xserver
+ autoreconf -fiv
+ ./configure --prefix=/usr \
+ --disable-static --without-dtrace \
+ --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
+ --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
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+ cd unix/xserver/hw/vnc
+ make DESTDIR=${pkgdir} install
+ install -Dm0644 $srcdir/vncserver.service $pkgdir/usr/lib/systemd/system/vncserver.service
+ install -Dm0644 $srcdir/vncviewer.desktop $pkgdir/usr/share/applications/vncviewer.desktop
+}
Copied: tigervnc/repos/community-staging-x86_64/gethomedir.patch (from rev 149744, tigervnc/trunk/gethomedir.patch)
===================================================================
--- community-staging-x86_64/gethomedir.patch (rev 0)
+++ community-staging-x86_64/gethomedir.patch 2015-12-07 08:06:52 UTC (rev 149745)
@@ -0,0 +1,20 @@
+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
+
Copied: tigervnc/repos/community-staging-x86_64/vncserver.service (from rev 149744, tigervnc/trunk/vncserver.service)
===================================================================
--- community-staging-x86_64/vncserver.service (rev 0)
+++ community-staging-x86_64/vncserver.service 2015-12-07 08:06:52 UTC (rev 149745)
@@ -0,0 +1,29 @@
+# The vncserver service unit file
+#
+# 1. Copy this file to /etc/systemd/system/vncserver@:<display>.service
+# 2. Edit User=
+# ("User=foo")
+# 3. Edit and vncserver parameters appropriately
+# ("/usr/bin/vncserver %i -arg1 -arg2 -argn")
+# 4. Run `systemctl --system daemon-reload`
+# 5. Run `systemctl enable vncserver@:<display>.service`
+#
+# DO NOT RUN THIS SERVICE if your local area network is untrusted!
+#
+# See the wiki page for more on security
+# https://wiki.archlinux.org/index.php/Vncserver
+
+[Unit]
+Description=Remote desktop service (VNC)
+After=syslog.target network.target
+
+[Service]
+Type=forking
+User=
+
+ExecStartPre=/bin/sh -c '/usr/bin/vncserver -kill %i >/dev/null 2>&1 || true'
+ExecStart=/usr/bin/vncserver -fg %i
+ExecStop=/usr/bin/vncserver -kill %i
+
+[Install]
+WantedBy=multi-user.target
Copied: tigervnc/repos/community-staging-x86_64/vncviewer.desktop (from rev 149744, tigervnc/trunk/vncviewer.desktop)
===================================================================
--- community-staging-x86_64/vncviewer.desktop (rev 0)
+++ community-staging-x86_64/vncviewer.desktop 2015-12-07 08:06:52 UTC (rev 149745)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=TigerVNC Viewer
+Comment=VNC client
+Exec=/usr/bin/vncviewer
+Icon=tigervnc
+Terminal=false
+StartupNotify=false
+Categories=Network;RemoteAccess;
Copied: tigervnc/repos/community-staging-x86_64/xorg118.patch (from rev 149744, tigervnc/trunk/xorg118.patch)
===================================================================
--- community-staging-x86_64/xorg118.patch (rev 0)
+++ community-staging-x86_64/xorg118.patch 2015-12-07 08:06:52 UTC (rev 149745)
@@ -0,0 +1,27 @@
+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
More information about the arch-commits
mailing list