Date: Wednesday, January 15, 2014 @ 10:51:50
Author: spupykin
Revision: 104076
archrelease: copy trunk to community-i686, community-x86_64
Added:
tigervnc/repos/community-i686/PKGBUILD
(from rev 104075, tigervnc/trunk/PKGBUILD)
tigervnc/repos/community-i686/gethomedir.patch
(from rev 104075, tigervnc/trunk/gethomedir.patch)
tigervnc/repos/community-i686/getmaster.patch
(from rev 104075, tigervnc/trunk/getmaster.patch)
tigervnc/repos/community-i686/vncserver.service
(from rev 104075, tigervnc/trunk/vncserver.service)
tigervnc/repos/community-i686/vncviewer.desktop
(from rev 104075, tigervnc/trunk/vncviewer.desktop)
tigervnc/repos/community-i686/xorg115.patch
(from rev 104075, tigervnc/trunk/xorg115.patch)
tigervnc/repos/community-x86_64/PKGBUILD
(from rev 104075, tigervnc/trunk/PKGBUILD)
tigervnc/repos/community-x86_64/gethomedir.patch
(from rev 104075, tigervnc/trunk/gethomedir.patch)
tigervnc/repos/community-x86_64/getmaster.patch
(from rev 104075, tigervnc/trunk/getmaster.patch)
tigervnc/repos/community-x86_64/vncserver.service
(from rev 104075, tigervnc/trunk/vncserver.service)
tigervnc/repos/community-x86_64/vncviewer.desktop
(from rev 104075, tigervnc/trunk/vncviewer.desktop)
tigervnc/repos/community-x86_64/xorg115.patch
(from rev 104075, tigervnc/trunk/xorg115.patch)
Deleted:
tigervnc/repos/community-i686/PKGBUILD
tigervnc/repos/community-i686/gethomedir.patch
tigervnc/repos/community-i686/getmaster.patch
tigervnc/repos/community-i686/vncserver.service
tigervnc/repos/community-i686/vncviewer.desktop
tigervnc/repos/community-x86_64/PKGBUILD
tigervnc/repos/community-x86_64/gethomedir.patch
tigervnc/repos/community-x86_64/getmaster.patch
tigervnc/repos/community-x86_64/vncserver.service
tigervnc/repos/community-x86_64/vncviewer.desktop
------------------------------------+
/PKGBUILD | 146 ++++++++++++++++++++++++++
/gethomedir.patch | 40 +++++++
/getmaster.patch | 192 +++++++++++++++++++++++++++++++++++
/vncserver.service | 56 ++++++++++
/vncviewer.desktop | 20 +++
community-i686/PKGBUILD | 69 ------------
community-i686/gethomedir.patch | 20 ---
community-i686/getmaster.patch | 96 -----------------
community-i686/vncserver.service | 28 -----
community-i686/vncviewer.desktop | 10 -
community-i686/xorg115.patch | 15 ++
community-x86_64/PKGBUILD | 69 ------------
community-x86_64/gethomedir.patch | 20 ---
community-x86_64/getmaster.patch | 96 -----------------
community-x86_64/vncserver.service | 28 -----
community-x86_64/vncviewer.desktop | 10 -
community-x86_64/xorg115.patch | 15 ++
17 files changed, 484 insertions(+), 446 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-01-15 09:51:26 UTC (rev 104075)
+++ community-i686/PKGBUILD 2014-01-15 09:51:50 UTC (rev 104076)
@@ -1,69 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-# Maintainer: Uroš Vampl <mobile.leecher at gmail dot com>
-
-pkgname=tigervnc
-pkgver=1.3.0
-pkgrel=3
-_xorgver=1.14.2
-pkgdesc="suite of VNC servers and clients. 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' )
-makedepends=('cmake' 'nasm' 'xorg-font-util' 'xorg-util-macros' 'bigreqsproto'
- 'compositeproto' 'damageproto' 'randrproto' 'resourceproto'
- 'scrnsaverproto' 'videoproto' 'xcmiscproto' 'xf86vidmodeproto'
- 'xtrans' 'mesa' 'glproto' 'dri2proto' 'imagemagick')
-conflicts=('tightvnc')
-source=(http://downloads.sourceforge.net/project/tigervnc/tigervnc/$pkgver/tigervnc-$pkgver.tar.bz2
-
ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${_xorgver}.tar.bz2
- vncserver.service
- vncviewer.desktop
- gethomedir.patch
- getmaster.patch)
-md5sums=('a5158228e64d14496821a39bf3851f1b'
- '5d36a6483e8e301875131e8302c67727'
- '0903d5a0dfa38e0b04964505b644585c'
- '71cac0fb9701b0a041430f0fddfe00c8'
- '22f1523a0eca56ad79cfabd0db6e2cf6'
- 'e056a2502dfe0cb3b02e08cab689482f')
-
-prepare() {
- cd ${srcdir}/${pkgname}-${pkgver}
- cp -r ${srcdir}/xorg-server-${_xorgver}/* unix/xserver
-
- patch -Np1 -i ${srcdir}/gethomedir.patch
- patch -Np1 -i ${srcdir}/getmaster.patch
-}
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr
- make
-
- cd unix/xserver
- patch -Np1 -i ../xserver114.patch
- autoreconf -fiv
- ./configure --prefix=/usr \
- --disable-static --disable-xinerama --without-dtrace \
- --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
- --disable-xwin --disable-xephyr --disable-kdrive --with-pic \
- --disable-config-dbus --disable-config-hal --disable-config-udev \
- --disable-unit-tests --disable-devel-docs --disable-selective-werror \
- --disable-dri --enable-dri2 --enable-glx --enable-glx-tls
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
- cd unix/xserver/hw/vnc
- make DESTDIR=${pkgdir} install
- sed -i 's/iconic/nowin/' ${pkgdir}/usr/bin/vncserver
- 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-i686/PKGBUILD (from rev 104075,
tigervnc/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-01-15 09:51:50 UTC (rev 104076)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Maintainer: Uroš Vampl <mobile.leecher at gmail dot com>
+
+pkgname=tigervnc
+pkgver=1.3.0
+pkgrel=4
+_xorgver=1.15.0
+pkgdesc="suite of VNC servers and clients. 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' )
+makedepends=('cmake' 'nasm' 'xorg-font-util' 'xorg-util-macros' 'bigreqsproto'
+ 'compositeproto' 'damageproto' 'randrproto' 'resourceproto'
+ 'scrnsaverproto' 'videoproto' 'xcmiscproto' 'xf86vidmodeproto'
+ 'xtrans' 'mesa' 'glproto' 'dri2proto' 'imagemagick')
+conflicts=('tightvnc')
+source=(http://downloads.sourceforge.net/project/tigervnc/tigervnc/$pkgver/tigervnc-$pkgver.tar.bz2
+
ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${_xorgver}.tar.bz2
+ vncserver.service
+ vncviewer.desktop
+ gethomedir.patch
+ getmaster.patch
+ xorg115.patch)
+md5sums=('a5158228e64d14496821a39bf3851f1b'
+ 'c2ace3697b32414094cf8c597c39d7d9'
+ '0903d5a0dfa38e0b04964505b644585c'
+ '71cac0fb9701b0a041430f0fddfe00c8'
+ '22f1523a0eca56ad79cfabd0db6e2cf6'
+ 'e056a2502dfe0cb3b02e08cab689482f'
+ 'd7765cb11be43b557ee77dfa486fdb68')
+
+prepare() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ cp -r ${srcdir}/xorg-server-${_xorgver}/* unix/xserver
+
+ patch -Np1 -i ${srcdir}/gethomedir.patch
+ patch -Np1 -i ${srcdir}/getmaster.patch
+ patch -Np1 -i ${srcdir}/xorg115.patch
+}
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr
+ make
+
+ cd unix/xserver
+ patch -Np1 -i ../xserver114.patch
+ autoreconf -fiv
+ ./configure --prefix=/usr \
+ --disable-wayland --disable-present --disable-dri3 \
+ --disable-static --disable-xinerama --without-dtrace \
+ --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
+ --disable-xwin --disable-xephyr --disable-kdrive --with-pic \
+ --disable-config-dbus --disable-config-hal --disable-config-udev \
+ --disable-unit-tests --disable-devel-docs --disable-selective-werror \
+ --disable-dri --enable-dri2 --enable-glx --enable-glx-tls
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+ cd unix/xserver/hw/vnc
+ make DESTDIR=${pkgdir} install
+ sed -i 's/iconic/nowin/' ${pkgdir}/usr/bin/vncserver
+ install -Dm0644 $srcdir/vncserver.service
$pkgdir/usr/lib/systemd/system/vncserver.service
+ install -Dm0644 $srcdir/vncviewer.desktop
$pkgdir/usr/share/applications/vncviewer.desktop
+}
Deleted: community-i686/gethomedir.patch
===================================================================
--- community-i686/gethomedir.patch 2014-01-15 09:51:26 UTC (rev 104075)
+++ community-i686/gethomedir.patch 2014-01-15 09:51:50 UTC (rev 104076)
@@ -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
-
Copied: tigervnc/repos/community-i686/gethomedir.patch (from rev 104075,
tigervnc/trunk/gethomedir.patch)
===================================================================
--- community-i686/gethomedir.patch (rev 0)
+++ community-i686/gethomedir.patch 2014-01-15 09:51:50 UTC (rev 104076)
@@ -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
+
Deleted: community-i686/getmaster.patch
===================================================================
--- community-i686/getmaster.patch 2014-01-15 09:51:26 UTC (rev 104075)
+++ community-i686/getmaster.patch 2014-01-15 09:51:50 UTC (rev 104076)
@@ -1,96 +0,0 @@
-diff -up tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc.getmaster
tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc
---- tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc.getmaster 2013-07-12
09:30:50.551459439 +0100
-+++ tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc 2013-07-12
09:38:31.037480528 +0100
-@@ -232,10 +232,7 @@ void InputDevice::PrepareInputDevices(vo
-
- unsigned InputDevice::getKeyboardState(void)
- {
-- DeviceIntPtr master;
--
-- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT);
-- return XkbStateFieldFromRec(&master->key->xkbInfo->state);
-+ return XkbStateFieldFromRec(&keyboardDev->master->key->xkbInfo->state);
- }
-
- unsigned InputDevice::getLevelThreeMask(void)
-@@ -256,7 +253,7 @@ unsigned InputDevice::getLevelThreeMask(
- return 0;
- }
-
-- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+ xkb = keyboardDev->master->key->xkbInfo->desc;
-
- act = XkbKeyActionPtr(xkb, keycode, state);
- if (act == NULL)
-@@ -281,7 +278,7 @@ KeyCode InputDevice::pressShift(void)
- if (state & ShiftMask)
- return 0;
-
-- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+ xkb = keyboardDev->master->key->xkbInfo->desc;
- for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
- XkbAction *act;
- unsigned char mask;
-@@ -318,7 +315,7 @@ std::list<KeyCode> InputDevice::releaseS
- if (!(state & ShiftMask))
- return keys;
-
-- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT);
-+ master = keyboardDev->master;
- xkb = master->key->xkbInfo->desc;
- for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
- XkbAction *act;
-@@ -371,7 +368,7 @@ KeyCode InputDevice::pressLevelThree(voi
- return 0;
- }
-
-- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+ xkb = keyboardDev->master->key->xkbInfo->desc;
-
- act = XkbKeyActionPtr(xkb, keycode, state);
- if (act == NULL)
-@@ -399,7 +396,7 @@ std::list<KeyCode> InputDevice::releaseL
- if (!(state & mask))
- return keys;
-
-- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT);
-+ master = keyboardDev->master;
- xkb = master->key->xkbInfo->desc;
- for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
- XkbAction *act;
-@@ -440,7 +437,7 @@ KeyCode InputDevice::keysymToKeycode(Key
- if (new_state != NULL)
- *new_state = state;
-
-- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+ xkb = keyboardDev->master->key->xkbInfo->desc;
- for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
- unsigned int state_out;
- KeySym dummy;
-@@ -497,7 +494,7 @@ bool InputDevice::isLockModifier(KeyCode
- XkbDescPtr xkb;
- XkbAction *act;
-
-- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+ xkb = keyboardDev->master->key->xkbInfo->desc;
-
- act = XkbKeyActionPtr(xkb, keycode, state);
- if (act == NULL)
-@@ -535,7 +532,7 @@ bool InputDevice::isAffectedByNumLock(Ke
- if (numlock_keycode == 0)
- return false;
-
-- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+ xkb = keyboardDev->master->key->xkbInfo->desc;
-
- act = XkbKeyActionPtr(xkb, numlock_keycode, state);
- if (act == NULL)
-@@ -569,7 +566,7 @@ KeyCode InputDevice::addKeysym(KeySym ke
- KeySym *syms;
- KeySym upper, lower;
-
-- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT);
-+ master = keyboardDev->master;
- xkb = master->key->xkbInfo->desc;
- for (key = xkb->max_key_code; key >= xkb->min_key_code; key--) {
- if (XkbKeyNumGroups(xkb, key) == 0)
Copied: tigervnc/repos/community-i686/getmaster.patch (from rev 104075,
tigervnc/trunk/getmaster.patch)
===================================================================
--- community-i686/getmaster.patch (rev 0)
+++ community-i686/getmaster.patch 2014-01-15 09:51:50 UTC (rev 104076)
@@ -0,0 +1,96 @@
+diff -up tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc.getmaster
tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc
+--- tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc.getmaster 2013-07-12
09:30:50.551459439 +0100
++++ tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc 2013-07-12
09:38:31.037480528 +0100
+@@ -232,10 +232,7 @@ void InputDevice::PrepareInputDevices(vo
+
+ unsigned InputDevice::getKeyboardState(void)
+ {
+- DeviceIntPtr master;
+-
+- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT);
+- return XkbStateFieldFromRec(&master->key->xkbInfo->state);
++ return XkbStateFieldFromRec(&keyboardDev->master->key->xkbInfo->state);
+ }
+
+ unsigned InputDevice::getLevelThreeMask(void)
+@@ -256,7 +253,7 @@ unsigned InputDevice::getLevelThreeMask(
+ return 0;
+ }
+
+- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
++ xkb = keyboardDev->master->key->xkbInfo->desc;
+
+ act = XkbKeyActionPtr(xkb, keycode, state);
+ if (act == NULL)
+@@ -281,7 +278,7 @@ KeyCode InputDevice::pressShift(void)
+ if (state & ShiftMask)
+ return 0;
+
+- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
++ xkb = keyboardDev->master->key->xkbInfo->desc;
+ for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
+ XkbAction *act;
+ unsigned char mask;
+@@ -318,7 +315,7 @@ std::list<KeyCode> InputDevice::releaseS
+ if (!(state & ShiftMask))
+ return keys;
+
+- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT);
++ master = keyboardDev->master;
+ xkb = master->key->xkbInfo->desc;
+ for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
+ XkbAction *act;
+@@ -371,7 +368,7 @@ KeyCode InputDevice::pressLevelThree(voi
+ return 0;
+ }
+
+- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
++ xkb = keyboardDev->master->key->xkbInfo->desc;
+
+ act = XkbKeyActionPtr(xkb, keycode, state);
+ if (act == NULL)
+@@ -399,7 +396,7 @@ std::list<KeyCode> InputDevice::releaseL
+ if (!(state & mask))
+ return keys;
+
+- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT);
++ master = keyboardDev->master;
+ xkb = master->key->xkbInfo->desc;
+ for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
+ XkbAction *act;
+@@ -440,7 +437,7 @@ KeyCode InputDevice::keysymToKeycode(Key
+ if (new_state != NULL)
+ *new_state = state;
+
+- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
++ xkb = keyboardDev->master->key->xkbInfo->desc;
+ for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
+ unsigned int state_out;
+ KeySym dummy;
+@@ -497,7 +494,7 @@ bool InputDevice::isLockModifier(KeyCode
+ XkbDescPtr xkb;
+ XkbAction *act;
+
+- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
++ xkb = keyboardDev->master->key->xkbInfo->desc;
+
+ act = XkbKeyActionPtr(xkb, keycode, state);
+ if (act == NULL)
+@@ -535,7 +532,7 @@ bool InputDevice::isAffectedByNumLock(Ke
+ if (numlock_keycode == 0)
+ return false;
+
+- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
++ xkb = keyboardDev->master->key->xkbInfo->desc;
+
+ act = XkbKeyActionPtr(xkb, numlock_keycode, state);
+ if (act == NULL)
+@@ -569,7 +566,7 @@ KeyCode InputDevice::addKeysym(KeySym ke
+ KeySym *syms;
+ KeySym upper, lower;
+
+- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT);
++ master = keyboardDev->master;
+ xkb = master->key->xkbInfo->desc;
+ for (key = xkb->max_key_code; key >= xkb->min_key_code; key--) {
+ if (XkbKeyNumGroups(xkb, key) == 0)
Deleted: community-i686/vncserver.service
===================================================================
--- community-i686/vncserver.service 2014-01-15 09:51:26 UTC (rev 104075)
+++ community-i686/vncserver.service 2014-01-15 09:51:50 UTC (rev 104076)
@@ -1,28 +0,0 @@
-# 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=
-
-ExecStart=/usr/bin/vncserver %i
-ExecStop=/usr/bin/vncserver -kill %i
-
-[Install]
-WantedBy=multi-user.target
Copied: tigervnc/repos/community-i686/vncserver.service (from rev 104075,
tigervnc/trunk/vncserver.service)
===================================================================
--- community-i686/vncserver.service (rev 0)
+++ community-i686/vncserver.service 2014-01-15 09:51:50 UTC (rev 104076)
@@ -0,0 +1,28 @@
+# 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=
+
+ExecStart=/usr/bin/vncserver %i
+ExecStop=/usr/bin/vncserver -kill %i
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-i686/vncviewer.desktop
===================================================================
--- community-i686/vncviewer.desktop 2014-01-15 09:51:26 UTC (rev 104075)
+++ community-i686/vncviewer.desktop 2014-01-15 09:51:50 UTC (rev 104076)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=TigerVNC viewer
-Comment=TigerVNC viewer
-Exec=/usr/bin/vncviewer
-Icon=tigervnc.png
-Terminal=false
-StartupNotify=false
-Categories=Application; Network;
Copied: tigervnc/repos/community-i686/vncviewer.desktop (from rev 104075,
tigervnc/trunk/vncviewer.desktop)
===================================================================
--- community-i686/vncviewer.desktop (rev 0)
+++ community-i686/vncviewer.desktop 2014-01-15 09:51:50 UTC (rev 104076)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=TigerVNC viewer
+Comment=TigerVNC viewer
+Exec=/usr/bin/vncviewer
+Icon=tigervnc.png
+Terminal=false
+StartupNotify=false
+Categories=Application; Network;
Copied: tigervnc/repos/community-i686/xorg115.patch (from rev 104075,
tigervnc/trunk/xorg115.patch)
===================================================================
--- community-i686/xorg115.patch (rev 0)
+++ community-i686/xorg115.patch 2014-01-15 09:51:50 UTC (rev 104076)
@@ -0,0 +1,15 @@
+diff -up tigervnc-1.3.0/unix/xserver/hw/vnc/xorg-version.h.jx
tigervnc-1.3.0/unix/xserver/hw/vnc/xorg-version.h
+--- tigervnc-1.3.0/unix/xserver/hw/vnc/xorg-version.h.jx 2013-07-01
08:41:24.000000000 -0400
++++ tigervnc-1.3.0/unix/xserver/hw/vnc/xorg-version.h 2013-11-07
11:39:49.749992669 -0500
+@@ -44,8 +44,10 @@
+ #define XORG 113
+ #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (14 * 100000) + (99 * 1000))
+ #define XORG 114
++#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (15 * 100000) + (99 * 1000))
++#define XORG 115
+ #else
+-#error "X.Org newer than 1.14 is not supported"
++#error "X.Org newer than 1.15 is not supported"
+ #endif
+
+ #endif
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-01-15 09:51:26 UTC (rev 104075)
+++ community-x86_64/PKGBUILD 2014-01-15 09:51:50 UTC (rev 104076)
@@ -1,69 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-# Maintainer: Uroš Vampl <mobile.leecher at gmail dot com>
-
-pkgname=tigervnc
-pkgver=1.3.0
-pkgrel=3
-_xorgver=1.14.2
-pkgdesc="suite of VNC servers and clients. 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' )
-makedepends=('cmake' 'nasm' 'xorg-font-util' 'xorg-util-macros' 'bigreqsproto'
- 'compositeproto' 'damageproto' 'randrproto' 'resourceproto'
- 'scrnsaverproto' 'videoproto' 'xcmiscproto' 'xf86vidmodeproto'
- 'xtrans' 'mesa' 'glproto' 'dri2proto' 'imagemagick')
-conflicts=('tightvnc')
-source=(http://downloads.sourceforge.net/project/tigervnc/tigervnc/$pkgver/tigervnc-$pkgver.tar.bz2
-
ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${_xorgver}.tar.bz2
- vncserver.service
- vncviewer.desktop
- gethomedir.patch
- getmaster.patch)
-md5sums=('a5158228e64d14496821a39bf3851f1b'
- '5d36a6483e8e301875131e8302c67727'
- '0903d5a0dfa38e0b04964505b644585c'
- '71cac0fb9701b0a041430f0fddfe00c8'
- '22f1523a0eca56ad79cfabd0db6e2cf6'
- 'e056a2502dfe0cb3b02e08cab689482f')
-
-prepare() {
- cd ${srcdir}/${pkgname}-${pkgver}
- cp -r ${srcdir}/xorg-server-${_xorgver}/* unix/xserver
-
- patch -Np1 -i ${srcdir}/gethomedir.patch
- patch -Np1 -i ${srcdir}/getmaster.patch
-}
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr
- make
-
- cd unix/xserver
- patch -Np1 -i ../xserver114.patch
- autoreconf -fiv
- ./configure --prefix=/usr \
- --disable-static --disable-xinerama --without-dtrace \
- --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
- --disable-xwin --disable-xephyr --disable-kdrive --with-pic \
- --disable-config-dbus --disable-config-hal --disable-config-udev \
- --disable-unit-tests --disable-devel-docs --disable-selective-werror \
- --disable-dri --enable-dri2 --enable-glx --enable-glx-tls
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
- cd unix/xserver/hw/vnc
- make DESTDIR=${pkgdir} install
- sed -i 's/iconic/nowin/' ${pkgdir}/usr/bin/vncserver
- 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-x86_64/PKGBUILD (from rev 104075,
tigervnc/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-01-15 09:51:50 UTC (rev 104076)
@@ -0,0 +1,73 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Maintainer: Uroš Vampl <mobile.leecher at gmail dot com>
+
+pkgname=tigervnc
+pkgver=1.3.0
+pkgrel=4
+_xorgver=1.15.0
+pkgdesc="suite of VNC servers and clients. 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' )
+makedepends=('cmake' 'nasm' 'xorg-font-util' 'xorg-util-macros' 'bigreqsproto'
+ 'compositeproto' 'damageproto' 'randrproto' 'resourceproto'
+ 'scrnsaverproto' 'videoproto' 'xcmiscproto' 'xf86vidmodeproto'
+ 'xtrans' 'mesa' 'glproto' 'dri2proto' 'imagemagick')
+conflicts=('tightvnc')
+source=(http://downloads.sourceforge.net/project/tigervnc/tigervnc/$pkgver/tigervnc-$pkgver.tar.bz2
+
ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${_xorgver}.tar.bz2
+ vncserver.service
+ vncviewer.desktop
+ gethomedir.patch
+ getmaster.patch
+ xorg115.patch)
+md5sums=('a5158228e64d14496821a39bf3851f1b'
+ 'c2ace3697b32414094cf8c597c39d7d9'
+ '0903d5a0dfa38e0b04964505b644585c'
+ '71cac0fb9701b0a041430f0fddfe00c8'
+ '22f1523a0eca56ad79cfabd0db6e2cf6'
+ 'e056a2502dfe0cb3b02e08cab689482f'
+ 'd7765cb11be43b557ee77dfa486fdb68')
+
+prepare() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ cp -r ${srcdir}/xorg-server-${_xorgver}/* unix/xserver
+
+ patch -Np1 -i ${srcdir}/gethomedir.patch
+ patch -Np1 -i ${srcdir}/getmaster.patch
+ patch -Np1 -i ${srcdir}/xorg115.patch
+}
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr
+ make
+
+ cd unix/xserver
+ patch -Np1 -i ../xserver114.patch
+ autoreconf -fiv
+ ./configure --prefix=/usr \
+ --disable-wayland --disable-present --disable-dri3 \
+ --disable-static --disable-xinerama --without-dtrace \
+ --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \
+ --disable-xwin --disable-xephyr --disable-kdrive --with-pic \
+ --disable-config-dbus --disable-config-hal --disable-config-udev \
+ --disable-unit-tests --disable-devel-docs --disable-selective-werror \
+ --disable-dri --enable-dri2 --enable-glx --enable-glx-tls
+ make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+ cd unix/xserver/hw/vnc
+ make DESTDIR=${pkgdir} install
+ sed -i 's/iconic/nowin/' ${pkgdir}/usr/bin/vncserver
+ install -Dm0644 $srcdir/vncserver.service
$pkgdir/usr/lib/systemd/system/vncserver.service
+ install -Dm0644 $srcdir/vncviewer.desktop
$pkgdir/usr/share/applications/vncviewer.desktop
+}
Deleted: community-x86_64/gethomedir.patch
===================================================================
--- community-x86_64/gethomedir.patch 2014-01-15 09:51:26 UTC (rev 104075)
+++ community-x86_64/gethomedir.patch 2014-01-15 09:51:50 UTC (rev 104076)
@@ -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
-
Copied: tigervnc/repos/community-x86_64/gethomedir.patch (from rev 104075,
tigervnc/trunk/gethomedir.patch)
===================================================================
--- community-x86_64/gethomedir.patch (rev 0)
+++ community-x86_64/gethomedir.patch 2014-01-15 09:51:50 UTC (rev 104076)
@@ -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
+
Deleted: community-x86_64/getmaster.patch
===================================================================
--- community-x86_64/getmaster.patch 2014-01-15 09:51:26 UTC (rev 104075)
+++ community-x86_64/getmaster.patch 2014-01-15 09:51:50 UTC (rev 104076)
@@ -1,96 +0,0 @@
-diff -up tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc.getmaster
tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc
---- tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc.getmaster 2013-07-12
09:30:50.551459439 +0100
-+++ tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc 2013-07-12
09:38:31.037480528 +0100
-@@ -232,10 +232,7 @@ void InputDevice::PrepareInputDevices(vo
-
- unsigned InputDevice::getKeyboardState(void)
- {
-- DeviceIntPtr master;
--
-- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT);
-- return XkbStateFieldFromRec(&master->key->xkbInfo->state);
-+ return XkbStateFieldFromRec(&keyboardDev->master->key->xkbInfo->state);
- }
-
- unsigned InputDevice::getLevelThreeMask(void)
-@@ -256,7 +253,7 @@ unsigned InputDevice::getLevelThreeMask(
- return 0;
- }
-
-- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+ xkb = keyboardDev->master->key->xkbInfo->desc;
-
- act = XkbKeyActionPtr(xkb, keycode, state);
- if (act == NULL)
-@@ -281,7 +278,7 @@ KeyCode InputDevice::pressShift(void)
- if (state & ShiftMask)
- return 0;
-
-- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+ xkb = keyboardDev->master->key->xkbInfo->desc;
- for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
- XkbAction *act;
- unsigned char mask;
-@@ -318,7 +315,7 @@ std::list<KeyCode> InputDevice::releaseS
- if (!(state & ShiftMask))
- return keys;
-
-- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT);
-+ master = keyboardDev->master;
- xkb = master->key->xkbInfo->desc;
- for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
- XkbAction *act;
-@@ -371,7 +368,7 @@ KeyCode InputDevice::pressLevelThree(voi
- return 0;
- }
-
-- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+ xkb = keyboardDev->master->key->xkbInfo->desc;
-
- act = XkbKeyActionPtr(xkb, keycode, state);
- if (act == NULL)
-@@ -399,7 +396,7 @@ std::list<KeyCode> InputDevice::releaseL
- if (!(state & mask))
- return keys;
-
-- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT);
-+ master = keyboardDev->master;
- xkb = master->key->xkbInfo->desc;
- for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
- XkbAction *act;
-@@ -440,7 +437,7 @@ KeyCode InputDevice::keysymToKeycode(Key
- if (new_state != NULL)
- *new_state = state;
-
-- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+ xkb = keyboardDev->master->key->xkbInfo->desc;
- for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
- unsigned int state_out;
- KeySym dummy;
-@@ -497,7 +494,7 @@ bool InputDevice::isLockModifier(KeyCode
- XkbDescPtr xkb;
- XkbAction *act;
-
-- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+ xkb = keyboardDev->master->key->xkbInfo->desc;
-
- act = XkbKeyActionPtr(xkb, keycode, state);
- if (act == NULL)
-@@ -535,7 +532,7 @@ bool InputDevice::isAffectedByNumLock(Ke
- if (numlock_keycode == 0)
- return false;
-
-- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
-+ xkb = keyboardDev->master->key->xkbInfo->desc;
-
- act = XkbKeyActionPtr(xkb, numlock_keycode, state);
- if (act == NULL)
-@@ -569,7 +566,7 @@ KeyCode InputDevice::addKeysym(KeySym ke
- KeySym *syms;
- KeySym upper, lower;
-
-- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT);
-+ master = keyboardDev->master;
- xkb = master->key->xkbInfo->desc;
- for (key = xkb->max_key_code; key >= xkb->min_key_code; key--) {
- if (XkbKeyNumGroups(xkb, key) == 0)
Copied: tigervnc/repos/community-x86_64/getmaster.patch (from rev 104075,
tigervnc/trunk/getmaster.patch)
===================================================================
--- community-x86_64/getmaster.patch (rev 0)
+++ community-x86_64/getmaster.patch 2014-01-15 09:51:50 UTC (rev 104076)
@@ -0,0 +1,96 @@
+diff -up tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc.getmaster
tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc
+--- tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc.getmaster 2013-07-12
09:30:50.551459439 +0100
++++ tigervnc-1.3.0/unix/xserver/hw/vnc/InputXKB.cc 2013-07-12
09:38:31.037480528 +0100
+@@ -232,10 +232,7 @@ void InputDevice::PrepareInputDevices(vo
+
+ unsigned InputDevice::getKeyboardState(void)
+ {
+- DeviceIntPtr master;
+-
+- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT);
+- return XkbStateFieldFromRec(&master->key->xkbInfo->state);
++ return XkbStateFieldFromRec(&keyboardDev->master->key->xkbInfo->state);
+ }
+
+ unsigned InputDevice::getLevelThreeMask(void)
+@@ -256,7 +253,7 @@ unsigned InputDevice::getLevelThreeMask(
+ return 0;
+ }
+
+- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
++ xkb = keyboardDev->master->key->xkbInfo->desc;
+
+ act = XkbKeyActionPtr(xkb, keycode, state);
+ if (act == NULL)
+@@ -281,7 +278,7 @@ KeyCode InputDevice::pressShift(void)
+ if (state & ShiftMask)
+ return 0;
+
+- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
++ xkb = keyboardDev->master->key->xkbInfo->desc;
+ for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
+ XkbAction *act;
+ unsigned char mask;
+@@ -318,7 +315,7 @@ std::list<KeyCode> InputDevice::releaseS
+ if (!(state & ShiftMask))
+ return keys;
+
+- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT);
++ master = keyboardDev->master;
+ xkb = master->key->xkbInfo->desc;
+ for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
+ XkbAction *act;
+@@ -371,7 +368,7 @@ KeyCode InputDevice::pressLevelThree(voi
+ return 0;
+ }
+
+- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
++ xkb = keyboardDev->master->key->xkbInfo->desc;
+
+ act = XkbKeyActionPtr(xkb, keycode, state);
+ if (act == NULL)
+@@ -399,7 +396,7 @@ std::list<KeyCode> InputDevice::releaseL
+ if (!(state & mask))
+ return keys;
+
+- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT);
++ master = keyboardDev->master;
+ xkb = master->key->xkbInfo->desc;
+ for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
+ XkbAction *act;
+@@ -440,7 +437,7 @@ KeyCode InputDevice::keysymToKeycode(Key
+ if (new_state != NULL)
+ *new_state = state;
+
+- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
++ xkb = keyboardDev->master->key->xkbInfo->desc;
+ for (key = xkb->min_key_code; key <= xkb->max_key_code; key++) {
+ unsigned int state_out;
+ KeySym dummy;
+@@ -497,7 +494,7 @@ bool InputDevice::isLockModifier(KeyCode
+ XkbDescPtr xkb;
+ XkbAction *act;
+
+- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
++ xkb = keyboardDev->master->key->xkbInfo->desc;
+
+ act = XkbKeyActionPtr(xkb, keycode, state);
+ if (act == NULL)
+@@ -535,7 +532,7 @@ bool InputDevice::isAffectedByNumLock(Ke
+ if (numlock_keycode == 0)
+ return false;
+
+- xkb = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT)->key->xkbInfo->desc;
++ xkb = keyboardDev->master->key->xkbInfo->desc;
+
+ act = XkbKeyActionPtr(xkb, numlock_keycode, state);
+ if (act == NULL)
+@@ -569,7 +566,7 @@ KeyCode InputDevice::addKeysym(KeySym ke
+ KeySym *syms;
+ KeySym upper, lower;
+
+- master = GetMaster(keyboardDev, KEYBOARD_OR_FLOAT);
++ master = keyboardDev->master;
+ xkb = master->key->xkbInfo->desc;
+ for (key = xkb->max_key_code; key >= xkb->min_key_code; key--) {
+ if (XkbKeyNumGroups(xkb, key) == 0)
Deleted: community-x86_64/vncserver.service
===================================================================
--- community-x86_64/vncserver.service 2014-01-15 09:51:26 UTC (rev 104075)
+++ community-x86_64/vncserver.service 2014-01-15 09:51:50 UTC (rev 104076)
@@ -1,28 +0,0 @@
-# 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=
-
-ExecStart=/usr/bin/vncserver %i
-ExecStop=/usr/bin/vncserver -kill %i
-
-[Install]
-WantedBy=multi-user.target
Copied: tigervnc/repos/community-x86_64/vncserver.service (from rev 104075,
tigervnc/trunk/vncserver.service)
===================================================================
--- community-x86_64/vncserver.service (rev 0)
+++ community-x86_64/vncserver.service 2014-01-15 09:51:50 UTC (rev 104076)
@@ -0,0 +1,28 @@
+# 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=
+
+ExecStart=/usr/bin/vncserver %i
+ExecStop=/usr/bin/vncserver -kill %i
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-x86_64/vncviewer.desktop
===================================================================
--- community-x86_64/vncviewer.desktop 2014-01-15 09:51:26 UTC (rev 104075)
+++ community-x86_64/vncviewer.desktop 2014-01-15 09:51:50 UTC (rev 104076)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Name=TigerVNC viewer
-Comment=TigerVNC viewer
-Exec=/usr/bin/vncviewer
-Icon=tigervnc.png
-Terminal=false
-StartupNotify=false
-Categories=Application; Network;
Copied: tigervnc/repos/community-x86_64/vncviewer.desktop (from rev 104075,
tigervnc/trunk/vncviewer.desktop)
===================================================================
--- community-x86_64/vncviewer.desktop (rev 0)
+++ community-x86_64/vncviewer.desktop 2014-01-15 09:51:50 UTC (rev 104076)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=TigerVNC viewer
+Comment=TigerVNC viewer
+Exec=/usr/bin/vncviewer
+Icon=tigervnc.png
+Terminal=false
+StartupNotify=false
+Categories=Application; Network;
Copied: tigervnc/repos/community-x86_64/xorg115.patch (from rev 104075,
tigervnc/trunk/xorg115.patch)
===================================================================
--- community-x86_64/xorg115.patch (rev 0)
+++ community-x86_64/xorg115.patch 2014-01-15 09:51:50 UTC (rev 104076)
@@ -0,0 +1,15 @@
+diff -up tigervnc-1.3.0/unix/xserver/hw/vnc/xorg-version.h.jx
tigervnc-1.3.0/unix/xserver/hw/vnc/xorg-version.h
+--- tigervnc-1.3.0/unix/xserver/hw/vnc/xorg-version.h.jx 2013-07-01
08:41:24.000000000 -0400
++++ tigervnc-1.3.0/unix/xserver/hw/vnc/xorg-version.h 2013-11-07
11:39:49.749992669 -0500
+@@ -44,8 +44,10 @@
+ #define XORG 113
+ #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (14 * 100000) + (99 * 1000))
+ #define XORG 114
++#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (15 * 100000) + (99 * 1000))
++#define XORG 115
+ #else
+-#error "X.Org newer than 1.14 is not supported"
++#error "X.Org newer than 1.15 is not supported"
+ #endif
+
+ #endif
