diff options
Diffstat (limited to 'community/tigervnc')
| -rw-r--r-- | community/tigervnc/PKGBUILD | 54 | ||||
| -rw-r--r-- | community/tigervnc/cmakelists.patch | 70 | ||||
| -rw-r--r-- | community/tigervnc/gethomedir.patch | 16 | ||||
| -rw-r--r-- | community/tigervnc/glx.patch | 85 | ||||
| -rw-r--r-- | community/tigervnc/gnutls.patch | 36 | ||||
| -rw-r--r-- | community/tigervnc/xorg111.patch | 235 | ||||
| -rw-r--r-- | community/tigervnc/xorg112.patch | 447 | ||||
| -rw-r--r-- | community/tigervnc/xorg113.patch | 275 | ||||
| -rw-r--r-- | community/tigervnc/xorg114.patch | 28 | ||||
| -rw-r--r-- | community/tigervnc/xserver113.patch | 92 |
10 files changed, 16 insertions, 1322 deletions
diff --git a/community/tigervnc/PKGBUILD b/community/tigervnc/PKGBUILD index e05d189d0..4e2ad657b 100644 --- a/community/tigervnc/PKGBUILD +++ b/community/tigervnc/PKGBUILD @@ -1,65 +1,43 @@ -# $Id: PKGBUILD 93093 2013-06-24 09:56:34Z spupykin $ +# $Id: PKGBUILD 93706 2013-07-08 14:56:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Uroš Vampl <mobile.leecher at gmail dot com> pkgname=tigervnc -pkgver=1.2.0 -pkgrel=13 -_xorgver=1.14.0 +pkgver=1.3.0 +pkgrel=1 +_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=('pam' 'gnutls' 'libjpeg-turbo' 'libxft' 'libxinerama' 'libxcursor' 'libxtst' 'libxfont' 'pixman' 'xorg-xauth' 'xorg-xsetroot' - 'xkeyboard-config' 'libgl' 'libgcrypt' 'perl' 'xorg-xkbcomp') + 'xkeyboard-config' 'libgl' 'libgcrypt' 'perl' 'xorg-xkbcomp' + 'fltk') makedepends=('cmake' 'nasm' 'xorg-font-util' 'xorg-util-macros' 'bigreqsproto' 'compositeproto' 'damageproto' 'randrproto' 'resourceproto' 'scrnsaverproto' 'videoproto' 'xcmiscproto' 'xf86vidmodeproto' 'xtrans' 'mesa' 'glproto' 'dri2proto' 'imagemagick' 'librsvg') options=(!libtool) conflicts=('tightvnc') -source=(http://downloads.sourceforge.net/tigervnc/${pkgname}-${pkgver}.tar.gz +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 - xorg111.patch - xorg112.patch - xorg113.patch - xorg114.patch - xserver113.patch - xserver114.patch - glx.patch - gnutls.patch - gethomedir.patch - cmakelists.patch) -md5sums=('3a5755b4ed600a81c3a17976c6f8420d' - '86110278b784e279381b7f6f2295c508' + xserver114.patch) +md5sums=('a5158228e64d14496821a39bf3851f1b' + '5d36a6483e8e301875131e8302c67727' '0903d5a0dfa38e0b04964505b644585c' '15c0405f920c3dac250692e8922578d1' - 'b680b55f7f9f569cd26ac0b330012a8b' - 'f73e055153889ae7b5aac8e697f7a841' - 'ef4078ba31a583dc3134e9090fbd30d0' - '72518a7a1e7d3721ebe7404dcd8b3d01' - 'fabbe561d4ac845317ffdbf1bb2eeb02' - '928faf837ba5b1b34283f9f018df2f5e' - '4b86c015c78a0360205fdcf511ea1c39' - '1a5fe8867ab3e49e20aafc70c415494f' - 'fa059baabe72308bf82622bca73cb3e0' - '6ef923c71cc0e79c4b37eb3b124eea75') + '928faf837ba5b1b34283f9f018df2f5e') -build() { +prepare() { cd ${srcdir}/${pkgname}-${pkgver} - cp -r ${srcdir}/xorg-server-${_xorgver}/* unix/xserver - patch -Np1 -i ${srcdir}/gnutls.patch - patch -Np1 -i ${srcdir}/gethomedir.patch - patch -Np1 -i ${srcdir}/cmakelists.patch - patch -Np1 -i ${srcdir}/xorg111.patch - patch -Np1 -i ${srcdir}/xorg112.patch - patch -Np1 -i ${srcdir}/xorg113.patch - patch -Np1 -i ${srcdir}/xorg114.patch - patch -Np1 -i ${srcdir}/glx.patch +} + +build() { + cd ${srcdir}/${pkgname}-${pkgver} cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr -DUSE_INCLUDED_FLTK=yes make diff --git a/community/tigervnc/cmakelists.patch b/community/tigervnc/cmakelists.patch deleted file mode 100644 index cc6286699..000000000 --- a/community/tigervnc/cmakelists.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff -ur tigervnc-1.2.0.orig/cmake/BuildPackages.cmake tigervnc-1.2.0/cmake/BuildPackages.cmake ---- tigervnc-1.2.0.orig/cmake/BuildPackages.cmake 2011-11-08 10:16:36.000000000 +0100 -+++ tigervnc-1.2.0/cmake/BuildPackages.cmake 2012-03-30 15:27:00.808919876 +0200 -@@ -86,5 +86,5 @@ - # Common - # - --install(FILES ${CMAKE_SOURCE_DIR}/LICENCE.TXT DESTINATION doc) --install(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION doc) -+install(FILES ${CMAKE_SOURCE_DIR}/LICENCE.TXT DESTINATION share/doc/${CMAKE_PROJECT_NAME}-${VERSION}) -+install(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION share/doc/${CMAKE_PROJECT_NAME}-${VERSION}) -diff -ur tigervnc-1.2.0.orig/CMakeLists.txt tigervnc-1.2.0/CMakeLists.txt ---- tigervnc-1.2.0.orig/CMakeLists.txt 2012-03-09 21:34:29.000000000 +0100 -+++ tigervnc-1.2.0/CMakeLists.txt 2012-03-30 15:28:59.716911575 +0200 -@@ -316,7 +316,8 @@ - if(APPLE) - set(FLTK_LIBRARIES "-framework Carbon -framework Cocoa -framework ApplicationServices") - elseif(NOT WIN32) -- set(FLTK_LIBRARIES "-ldl") -+ find_library(FONTCONFIG_LIB fontconfig) -+ set(FLTK_LIBRARIES "-ldl" ${FONTCONFIG_LIB}) - endif() - message(STATUS "Using included FLTK library") - endif() -diff -ur tigervnc-1.2.0.orig/unix/CMakeLists.txt tigervnc-1.2.0/unix/CMakeLists.txt ---- tigervnc-1.2.0.orig/unix/CMakeLists.txt 2011-11-03 20:01:18.000000000 +0100 -+++ tigervnc-1.2.0/unix/CMakeLists.txt 2012-03-30 15:27:00.808919876 +0200 -@@ -5,4 +5,4 @@ - add_subdirectory(x0vncserver) - - install(PROGRAMS vncserver DESTINATION bin) --install(FILES vncserver.man DESTINATION man/man1 RENAME vncserver.1) -+install(FILES vncserver.man DESTINATION share/man/man1 RENAME vncserver.1) -diff -ur tigervnc-1.2.0.orig/unix/vncconfig/CMakeLists.txt tigervnc-1.2.0/unix/vncconfig/CMakeLists.txt ---- tigervnc-1.2.0.orig/unix/vncconfig/CMakeLists.txt 2011-06-25 09:32:34.000000000 +0200 -+++ tigervnc-1.2.0/unix/vncconfig/CMakeLists.txt 2012-03-30 15:27:00.808919876 +0200 -@@ -12,4 +12,4 @@ - target_link_libraries(vncconfig tx rfb network rdr ${X11_LIBRARIES}) - - install(TARGETS vncconfig DESTINATION bin) --install(FILES vncconfig.man DESTINATION man/man1 RENAME vncconfig.1) -+install(FILES vncconfig.man DESTINATION share/man/man1 RENAME vncconfig.1) -diff -ur tigervnc-1.2.0.orig/unix/vncpasswd/CMakeLists.txt tigervnc-1.2.0/unix/vncpasswd/CMakeLists.txt ---- tigervnc-1.2.0.orig/unix/vncpasswd/CMakeLists.txt 2011-06-25 09:32:34.000000000 +0200 -+++ tigervnc-1.2.0/unix/vncpasswd/CMakeLists.txt 2012-03-30 15:27:00.808919876 +0200 -@@ -6,4 +6,4 @@ - target_link_libraries(vncpasswd tx rfb rdr os) - - install(TARGETS vncpasswd DESTINATION bin) --install(FILES vncpasswd.man DESTINATION man/man1 RENAME vncpasswd.1) -+install(FILES vncpasswd.man DESTINATION share/man/man1 RENAME vncpasswd.1) -diff -ur tigervnc-1.2.0.orig/unix/x0vncserver/CMakeLists.txt tigervnc-1.2.0/unix/x0vncserver/CMakeLists.txt ---- tigervnc-1.2.0.orig/unix/x0vncserver/CMakeLists.txt 2011-08-19 18:41:06.000000000 +0200 -+++ tigervnc-1.2.0/unix/x0vncserver/CMakeLists.txt 2012-03-30 15:27:00.809919874 +0200 -@@ -24,4 +24,4 @@ - endif() - - install(TARGETS x0vncserver DESTINATION bin) --install(FILES x0vncserver.man DESTINATION man/man1 RENAME x0vncserver.1) -+install(FILES x0vncserver.man DESTINATION share/man/man1 RENAME x0vncserver.1) -diff -ur tigervnc-1.2.0.orig/vncviewer/CMakeLists.txt tigervnc-1.2.0/vncviewer/CMakeLists.txt ---- tigervnc-1.2.0.orig/vncviewer/CMakeLists.txt 2011-10-05 11:32:28.000000000 +0200 -+++ tigervnc-1.2.0/vncviewer/CMakeLists.txt 2012-03-30 15:27:00.809919874 +0200 -@@ -55,5 +55,5 @@ - install(TARGETS vncviewer DESTINATION bin) - endif() - if(UNIX) -- install(FILES vncviewer.man DESTINATION man/man1 RENAME vncviewer.1) -+ install(FILES vncviewer.man DESTINATION share/man/man1 RENAME vncviewer.1) - endif() diff --git a/community/tigervnc/gethomedir.patch b/community/tigervnc/gethomedir.patch deleted file mode 100644 index 9114eea63..000000000 --- a/community/tigervnc/gethomedir.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am~ 2011-04-20 13:46:16.993047050 +0200 -+++ tigervnc-1.0.90/unix/xserver/hw/vnc/Makefile.am 2011-04-20 14:03:35.942724608 +0200 -@@ -1,11 +1,12 @@ - TIGERVNC_SRCDIR=${top_srcdir}/../.. - LIB_DIR=${top_builddir}/../../common - -+OS_LIB=$(LIB_DIR)/os/libos.a - RFB_LIB=$(LIB_DIR)/rfb/librfb.la - RDR_LIB=$(LIB_DIR)/rdr/librdr.la - NETWORK_LIB=$(LIB_DIR)/network/libnetwork.la - XREGION_LIB=$(LIB_DIR)/Xregion/libXregion.la --COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB) -+COMMON_LIBS=$(NETWORK_LIB) $(OS_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB) - - noinst_LTLIBRARIES = libvnccommon.la - diff --git a/community/tigervnc/glx.patch b/community/tigervnc/glx.patch deleted file mode 100644 index b2ecb672f..000000000 --- a/community/tigervnc/glx.patch +++ /dev/null @@ -1,85 +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 2013-01-21 03:39:14.924841615 +0100 -@@ -7,6 +7,10 @@ - XREGION_LIB=$(LIB_DIR)/Xregion/libXregion.la - COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB) - -+if GLX -+GLX_LIB = $(top_srcdir)/glx/libglx.la -+endif -+ - noinst_LTLIBRARIES = libvnccommon.la - - HDRS = RegionHelper.h vncExtInit.h vncHooks.h XserverDesktop.h xorg-version.h \ -@@ -34,7 +38,8 @@ - -UHAVE_CONFIG_H \ - -DXFree86Server -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ - -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common \ -- -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} -I$(includedir) -+ -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} -I$(includedir) \ -+ -I$(top_srcdir)/glx - - Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \ - $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XVNC_SYS_LIBS) -lX11 -@@ -55,7 +60,7 @@ - - libvnc_la_LDFLAGS = -module -avoid-version - --libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) -+libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(GLX_LIB) - - EXTRA_DIST = Xvnc.man - -diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xvnc.cc tigervnc-1.2.0/unix/xserver/hw/vnc/xvnc.cc ---- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xvnc.cc 2012-03-09 21:34:29.000000000 +0100 -+++ tigervnc-1.2.0/unix/xserver/hw/vnc/xvnc.cc 2013-01-21 03:38:38.187300899 +0100 -@@ -87,6 +87,17 @@ - #include "version-config.h" - #include "site.h" - #endif -+ -+#if XORG >= 113 -+#ifdef GLXEXT -+/* C++ really is the worst */ -+#define private _private -+#include "glxserver.h" -+#undef private -+#include "glx_extinit.h" -+#endif -+#endif -+ - #undef class - #undef public - } -@@ -1305,6 +1316,16 @@ - dispatchException &= ~DE_RESET; - } - -+#if XORG >= 113 -+#ifdef GLXEXT -+static ExtensionModule vnc_glx_ext = { -+ GlxExtensionInit, -+ "GLX", -+ &noGlxExtension -+}; -+#endif -+#endif -+ - void - InitOutput(ScreenInfo *screenInfo, int argc, char **argv) - { -@@ -1314,6 +1335,13 @@ - int i; - int NumFormats = 0; - -+#if XORG >= 113 -+#ifdef GLXEXT -+ if (serverGeneration == 1) -+ LoadExtension(&vnc_glx_ext, TRUE); -+#endif -+#endif -+ - /* initialize pixmap formats */ - - /* must have a pixmap depth to match every screen depth */ diff --git a/community/tigervnc/gnutls.patch b/community/tigervnc/gnutls.patch deleted file mode 100644 index d0b7ef861..000000000 --- a/community/tigervnc/gnutls.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -ur tigervnc-1.2.0.orig/CMakeLists.txt tigervnc-1.2.0/CMakeLists.txt ---- tigervnc-1.2.0.orig/CMakeLists.txt 2012-03-09 21:34:29.000000000 +0100 -+++ tigervnc-1.2.0/CMakeLists.txt 2012-03-27 23:14:12.292068145 +0200 -@@ -344,7 +344,7 @@ - # system's version (if available) to perform this test. - set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES};-lz) - endif() -- check_function_exists(gnutls_transport_set_global_errno HAVE_OLD_GNUTLS) -+ check_function_exists(gnutls_transport_set_global_errno HAVE_GNUTLS_GLOBAL_ERRNO) - check_function_exists(gnutls_x509_crt_print HAVE_GNUTLS_X509_CRT_PRINT) - check_type_size(gnutls_x509_crt_t GNUTLS_X509_CRT_T) - check_type_size(gnutls_datum_t GNUTLS_DATUM_T) -diff -ur tigervnc-1.2.0.orig/common/rdr/TLSInStream.cxx tigervnc-1.2.0/common/rdr/TLSInStream.cxx ---- tigervnc-1.2.0.orig/common/rdr/TLSInStream.cxx 2010-09-30 08:25:28.000000000 +0200 -+++ tigervnc-1.2.0/common/rdr/TLSInStream.cxx 2012-03-27 23:14:11.166068223 +0200 -@@ -27,7 +27,7 @@ - #include <rdr/TLSInStream.h> - #include <errno.h> - --#ifdef HAVE_OLD_GNUTLS -+#ifndef HAVE_GNUTLS_GLOBAL_ERRNO - #define gnutls_transport_set_global_errno(A) do { errno = (A); } while(0) - #endif - -diff -ur tigervnc-1.2.0.orig/common/rdr/TLSOutStream.cxx tigervnc-1.2.0/common/rdr/TLSOutStream.cxx ---- tigervnc-1.2.0.orig/common/rdr/TLSOutStream.cxx 2010-09-30 08:25:28.000000000 +0200 -+++ tigervnc-1.2.0/common/rdr/TLSOutStream.cxx 2012-03-27 23:14:09.576068335 +0200 -@@ -27,7 +27,7 @@ - #include <rdr/TLSOutStream.h> - #include <errno.h> - --#ifdef HAVE_OLD_GNUTLS -+#ifndef HAVE_GNUTLS_GLOBAL_ERRNO - #define gnutls_transport_set_global_errno(A) do { errno = (A); } while(0) - #endif - diff --git a/community/tigervnc/xorg111.patch b/community/tigervnc/xorg111.patch deleted file mode 100644 index ee0ddb999..000000000 --- a/community/tigervnc/xorg111.patch +++ /dev/null @@ -1,235 +0,0 @@ -diff -up tigervnc-1.1.0/unix/xserver/hw/vnc/Input.cc.xorg111 tigervnc-1.1.0/unix/xserver/hw/vnc/Input.cc ---- tigervnc-1.1.0/unix/xserver/hw/vnc/Input.cc.xorg111 2011-08-09 23:16:36.000000000 +0200 -+++ tigervnc-1.1.0/unix/xserver/hw/vnc/Input.cc 2011-11-11 11:59:14.226819903 +0100 -@@ -82,10 +82,11 @@ static KeyCode KeysymToKeycode(KeySymsPt - /* Event queue is shared between all devices. */ - #if XORG == 15 - static xEvent *eventq = NULL; --#else -+#elif XORG < 111 - static EventList *eventq = NULL; - #endif - -+#if XORG < 111 - static void initEventq(void) - { - /* eventq is never free()-ed because it exists during server life. */ -@@ -100,7 +101,9 @@ static void initEventq(void) - #endif - } - } -+#endif /* XORG < 111 */ - -+#if XORG < 111 - static void enqueueEvents(DeviceIntPtr dev, int n) - { - int i; -@@ -122,6 +125,7 @@ static void enqueueEvents(DeviceIntPtr d - ); - } - } -+#endif /* XORG < 111 */ - - InputDevice::InputDevice(rfb::VNCServerST *_server) - : server(_server), oldButtonMask(0) -@@ -141,12 +145,17 @@ InputDevice::InputDevice(rfb::VNCServerS - keyboardProc, TRUE); - RegisterKeyboardDevice(keyboardDev); - #endif -+#if XORG < 111 - initEventq(); -+#endif - } - - void InputDevice::PointerButtonAction(int buttonMask) - { -- int i, n; -+ int i; -+#if XORG < 111 -+ int n; -+#endif - #if XORG >= 110 - ValuatorMask mask; - #endif -@@ -160,13 +169,17 @@ void InputDevice::PointerButtonAction(in - #if XORG < 110 - n = GetPointerEvents(eventq, pointerDev, action, i + 1, - POINTER_RELATIVE, 0, 0, NULL); --#else -+ enqueueEvents(pointerDev, n); -+#elif XORG < 111 - valuator_mask_set_range(&mask, 0, 0, NULL); - n = GetPointerEvents(eventq, pointerDev, action, i + 1, - POINTER_RELATIVE, &mask); --#endif - enqueueEvents(pointerDev, n); -- -+#else -+ valuator_mask_set_range(&mask, 0, 0, NULL); -+ QueuePointerEvents(pointerDev, action, i + 1, -+ POINTER_RELATIVE, &mask); -+#endif - } - } - -@@ -175,7 +188,10 @@ void InputDevice::PointerButtonAction(in - - void InputDevice::PointerMove(const rfb::Point &pos) - { -- int n, valuators[2]; -+ int valuators[2]; -+#if XORG < 111 -+ int n; -+#endif - #if XORG >= 110 - ValuatorMask mask; - #endif -@@ -190,12 +206,16 @@ void InputDevice::PointerMove(const rfb: - #if XORG < 110 - n = GetPointerEvents(eventq, pointerDev, MotionNotify, 0, POINTER_ABSOLUTE, 0, - 2, valuators); --#else -+ enqueueEvents(pointerDev, n); -+#elif XORG < 111 - valuator_mask_set_range(&mask, 0, 2, valuators); - n = GetPointerEvents(eventq, pointerDev, MotionNotify, 0, POINTER_ABSOLUTE, - &mask); --#endif - enqueueEvents(pointerDev, n); -+#else -+ valuator_mask_set_range(&mask, 0, 2, valuators); -+ QueuePointerEvents(pointerDev, MotionNotify, 0, POINTER_ABSOLUTE, &mask); -+#endif - - cursorPos = pos; - } -@@ -299,14 +319,20 @@ void InputDevice::initInputDevice(void) - static inline void pressKey(DeviceIntPtr dev, int kc, bool down, const char *msg) - { - int action; -+#if XORG < 111 - unsigned int n; -+#endif - - if (msg != NULL) - vlog.debug("%s %d %s", msg, kc, down ? "down" : "up"); - - action = down ? KeyPress : KeyRelease; -- n = GetKeyboardEvents(eventq, dev, action, kc); -+#if XORG < 111 -+ n = GetKeyboardEvents(eventq, dev, action, kc, NULL); - enqueueEvents(dev, n); -+#else -+ QueueKeyboardEvents(dev, action, kc, NULL); -+#endif - } - - #define IS_PRESSED(keyc, keycode) \ -@@ -341,8 +367,11 @@ public: - int state, maxKeysPerMod, keycode; - #if XORG >= 17 - KeyCode *modmap = NULL; -- -+#if XORG >= 111 -+ state = XkbStateFieldFromRec(&dev->master->key->xkbInfo->state); -+#else /* XORG >= 111 */ - state = XkbStateFieldFromRec(&dev->u.master->key->xkbInfo->state); -+#endif /* XORG >= 111 */ - #else - KeyClassPtr keyc = dev->key; - state = keyc->state; -@@ -380,7 +409,11 @@ public: - #if XORG >= 17 - KeyCode *modmap = NULL; - -+#if XORG >= 111 -+ keyc = dev->master->key; -+#else /* XORG >= 111 */ - keyc = dev->u.master->key; -+#endif /* XORG >= 111 */ - state = XkbStateFieldFromRec(&keyc->xkbInfo->state); - #else - keyc = dev->key; -@@ -596,7 +629,11 @@ void InputDevice::keyEvent(rdr::U32 keys - } - - #if XORG >= 17 -+#if XORG >= 111 -+ keyc = keyboardDev->master->key; -+#else /* XORG >= 111 */ - keyc = keyboardDev->u.master->key; -+#endif /* XORG >= 111 */ - - keymap = XkbGetCoreMap(keyboardDev); - if (!keymap) { -@@ -753,7 +790,11 @@ ModeSwitchFound: - XkbApplyMappingChange(keyboardDev, keymap, minKeyCode, - maxKeyCode - minKeyCode + 1, - NULL, serverClient); -+#if XORG >= 111 -+ XkbCopyDeviceKeymap(keyboardDev->master, keyboardDev); -+#else - XkbCopyDeviceKeymap(keyboardDev->u.master, keyboardDev); -+#endif - #endif /* XORG < 17 */ - break; - } -diff -up tigervnc-1.1.0/unix/xserver/hw/vnc/xorg-version.h.xorg111 tigervnc-1.1.0/unix/xserver/hw/vnc/xorg-version.h ---- tigervnc-1.1.0/unix/xserver/hw/vnc/xorg-version.h.xorg111 2011-08-09 23:16:36.000000000 +0200 -+++ tigervnc-1.1.0/unix/xserver/hw/vnc/xorg-version.h 2011-11-11 11:55:32.255835319 +0100 -@@ -36,6 +36,8 @@ - #define XORG 19 - #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (10 * 100000) + (99 * 1000)) - #define XORG 110 -+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (11 * 100000) + (99 * 1000)) -+#define XORG 111 - #else - #error "X.Org newer than 1.10 is not supported" - #endif -diff -up tigervnc-1.1.0/unix/xserver/hw/vnc/xvnc.cc.xorg111 tigervnc-1.1.0/unix/xserver/hw/vnc/xvnc.cc ---- tigervnc-1.1.0/unix/xserver/hw/vnc/xvnc.cc.xorg111 2011-08-09 23:16:36.000000000 +0200 -+++ tigervnc-1.1.0/unix/xserver/hw/vnc/xvnc.cc 2011-11-11 11:55:32.256835319 +0100 -@@ -211,7 +211,11 @@ static void vfbFreeFramebufferMemory(vfb - - extern "C" { - -+#if XORG < 111 - void ddxGiveUp() -+#else -+void ddxGiveUp(enum ExitCode error) -+#endif - { - int i; - -@@ -221,9 +225,17 @@ void ddxGiveUp() - } - - void -+#if XORG < 111 - AbortDDX() -+#else -+AbortDDX(enum ExitCode error) -+#endif - { -+#if XORG < 111 - ddxGiveUp(); -+#else -+ ddxGiveUp(error); -+#endif - } - - #ifdef __DARWIN__ -@@ -668,8 +680,13 @@ vfbUninstallColormap(ColormapPtr pmap) - { - if (pmap->mid != pmap->pScreen->defColormap) - { -+#if XORG < 111 - curpmap = (ColormapPtr) LookupIDByType(pmap->pScreen->defColormap, - RT_COLORMAP); -+#else -+ dixLookupResourceByType((pointer *) &curpmap, pmap->pScreen->defColormap, -+ RT_COLORMAP, serverClient, DixUnknownAccess); -+#endif - (*pmap->pScreen->InstallColormap)(curpmap); - } - } diff --git a/community/tigervnc/xorg112.patch b/community/tigervnc/xorg112.patch deleted file mode 100644 index 51f259e19..000000000 --- a/community/tigervnc/xorg112.patch +++ /dev/null @@ -1,447 +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-04-15 12:19:00.995517546 +0200 -@@ -63,7 +63,7 @@ - BUILT_SOURCES = $(nodist_Xvnc_SOURCES) - - fb.h: $(top_srcdir)/fb/fb.h -- cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fb.h -+ cat $(top_srcdir)/fb/fb.h | sed -e 's,and,c_and,g' -e 's,xor,c_xor,g' > $(srcdir)/fb.h - - pixman.h: - for i in ${XSERVERLIBS_CFLAGS}; do \ -@@ -78,4 +78,4 @@ - fi - - fbrop.h: $(top_srcdir)/fb/fbrop.h -- cat $(top_srcdir)/fb/fbrop.h | sed -e 's,and,c_and,' -e 's,xor,c_xor,' > $(srcdir)/fbrop.h -+ cat $(top_srcdir)/fb/fbrop.h | sed -e 's,and,c_and,g' -e 's,xor,c_xor,g' > $(srcdir)/fbrop.h -diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/vncExtInit.cc tigervnc-1.2.0/unix/xserver/hw/vnc/vncExtInit.cc ---- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/vncExtInit.cc 2011-11-07 13:51:34.000000000 +0100 -+++ tigervnc-1.2.0/unix/xserver/hw/vnc/vncExtInit.cc 2012-04-15 12:18:57.819557251 +0200 -@@ -59,6 +59,7 @@ - #include "XserverDesktop.h" - #include "vncHooks.h" - #include "vncExtInit.h" -+#include "xorg-version.h" - - extern "C" { - -@@ -449,10 +450,16 @@ - ev.window = cur->window; - ev.time = GetTimeInMillis(); - if (cur->client->swapped) { -+#if XORG < 112 - int n; - swaps(&ev.sequenceNumber, n); - swapl(&ev.window, n); - swapl(&ev.time, n); -+#else -+ swaps(&ev.sequenceNumber); -+ swapl(&ev.window); -+ swapl(&ev.time); -+#endif - } - WriteToClient(cur->client, sizeof(xVncExtClientCutTextNotifyEvent), - (char *)&ev); -@@ -495,9 +502,14 @@ - ev.sequenceNumber = cur->client->sequence; - ev.window = cur->window; - if (cur->client->swapped) { -+#if XORG < 112 - int n; - swaps(&ev.sequenceNumber, n); - swapl(&ev.window, n); -+#else -+ swaps(&ev.sequenceNumber); -+ swapl(&ev.window); -+#endif - } - WriteToClient(cur->client, sizeof(xVncExtQueryConnectNotifyEvent), - (char *)&ev); -@@ -538,10 +550,16 @@ - ev.window = cur->window; - ev.selection = selection; - if (cur->client->swapped) { -+#if XORG < 112 - int n; - swaps(&ev.sequenceNumber, n); - swapl(&ev.window, n); - swapl(&ev.selection, n); -+#else -+ swaps(&ev.sequenceNumber); -+ swapl(&ev.window); -+ swapl(&ev.selection); -+#endif - } - WriteToClient(cur->client, sizeof(xVncExtSelectionChangeNotifyEvent), - (char *)&ev); -@@ -562,7 +580,6 @@ - param.buf[stuff->paramLen] = 0; - - xVncExtSetParamReply rep; -- int n; - rep.type = X_Reply; - rep.length = 0; - rep.success = 0; -@@ -603,8 +620,14 @@ - - deny: - if (client->swapped) { -+#if XORG < 112 -+ int n; - swaps(&rep.sequenceNumber, n); - swapl(&rep.length, n); -+#else -+ swaps(&rep.sequenceNumber); -+ swapl(&rep.length); -+#endif - } - WriteToClient(client, sizeof(xVncExtSetParamReply), (char *)&rep); - return (client->noClientException); -@@ -612,9 +635,13 @@ - - static int SProcVncExtSetParam(ClientPtr client) - { -- register char n; - REQUEST(xVncExtSetParamReq); -+#if XORG < 112 -+ register char n; - swaps(&stuff->length, n); -+#else -+ swaps(&stuff->length); -+#endif - REQUEST_AT_LEAST_SIZE(xVncExtSetParamReq); - return ProcVncExtSetParam(client); - } -@@ -628,7 +655,6 @@ - param.buf[stuff->paramLen] = 0; - - xVncExtGetParamReply rep; -- int n; - rep.type = X_Reply; - rep.sequenceNumber = client->sequence; - rep.success = 0; -@@ -646,9 +672,16 @@ - rep.length = (len + 3) >> 2; - rep.valueLen = len; - if (client->swapped) { -+#if XORG < 112 -+ int n; - swaps(&rep.sequenceNumber, n); - swapl(&rep.length, n); - swaps(&rep.valueLen, n); -+#else -+ swaps(&rep.sequenceNumber); -+ swapl(&rep.length); -+ swaps(&rep.valueLen); -+#endif - } - WriteToClient(client, sizeof(xVncExtGetParamReply), (char *)&rep); - if (value) -@@ -659,9 +692,13 @@ - - static int SProcVncExtGetParam(ClientPtr client) - { -- register char n; - REQUEST(xVncExtGetParamReq); -+#if XORG < 112 -+ register char n; - swaps(&stuff->length, n); -+#else -+ swaps(&stuff->length); -+#endif - REQUEST_AT_LEAST_SIZE(xVncExtGetParamReq); - return ProcVncExtGetParam(client); - } -@@ -675,7 +712,6 @@ - param.buf[stuff->paramLen] = 0; - - xVncExtGetParamDescReply rep; -- int n; - rep.type = X_Reply; - rep.sequenceNumber = client->sequence; - rep.success = 0; -@@ -690,9 +726,16 @@ - rep.length = (len + 3) >> 2; - rep.descLen = len; - if (client->swapped) { -+#if XORG < 112 -+ int n; - swaps(&rep.sequenceNumber, n); - swapl(&rep.length, n); - swaps(&rep.descLen, n); -+#else -+ swaps(&rep.sequenceNumber); -+ swapl(&rep.length); -+ swaps(&rep.descLen); -+#endif - } - WriteToClient(client, sizeof(xVncExtGetParamDescReply), (char *)&rep); - if (desc) -@@ -702,9 +745,13 @@ - - static int SProcVncExtGetParamDesc(ClientPtr client) - { -- register char n; - REQUEST(xVncExtGetParamDescReq); -+#if XORG < 112 -+ register char n; - swaps(&stuff->length, n); -+#else -+ swaps(&stuff->length); -+#endif - REQUEST_AT_LEAST_SIZE(xVncExtGetParamDescReq); - return ProcVncExtGetParamDesc(client); - } -@@ -715,7 +762,6 @@ - REQUEST_SIZE_MATCH(xVncExtListParamsReq); - - xVncExtListParamsReply rep; -- int n; - rep.type = X_Reply; - rep.sequenceNumber = client->sequence; - -@@ -731,9 +777,16 @@ - rep.length = (len + 3) >> 2; - rep.nParams = nParams; - if (client->swapped) { -+#if XORG < 112 -+ int n; - swaps(&rep.sequenceNumber, n); - swapl(&rep.length, n); - swaps(&rep.nParams, n); -+#else -+ swaps(&rep.sequenceNumber); -+ swapl(&rep.length); -+ swaps(&rep.nParams); -+#endif - } - WriteToClient(client, sizeof(xVncExtListParamsReply), (char *)&rep); - rdr::U8* data = new rdr::U8[len]; -@@ -753,9 +806,13 @@ - - static int SProcVncExtListParams(ClientPtr client) - { -- register char n; - REQUEST(xVncExtListParamsReq); -+#if XORG < 112 -+ register char n; - swaps(&stuff->length, n); -+#else -+ swaps(&stuff->length); -+#endif - REQUEST_SIZE_MATCH(xVncExtListParamsReq); - return ProcVncExtListParams(client); - } -@@ -778,11 +835,19 @@ - - static int SProcVncExtSetServerCutText(ClientPtr client) - { -- register char n; - REQUEST(xVncExtSetServerCutTextReq); -+#if XORG < 112 -+ register char n; - swaps(&stuff->length, n); -+#else -+ swaps(&stuff->length); -+#endif - REQUEST_AT_LEAST_SIZE(xVncExtSetServerCutTextReq); -+#if XORG < 112 - swapl(&stuff->textLen, n); -+#else -+ swapl(&stuff->textLen); -+#endif - return ProcVncExtSetServerCutText(client); - } - -@@ -792,15 +857,21 @@ - REQUEST_SIZE_MATCH(xVncExtGetClientCutTextReq); - - xVncExtGetClientCutTextReply rep; -- int n; - rep.type = X_Reply; - rep.length = (clientCutTextLen + 3) >> 2; - rep.sequenceNumber = client->sequence; - rep.textLen = clientCutTextLen; - if (client->swapped) { -+#if XORG < 112 -+ int n; - swaps(&rep.sequenceNumber, n); - swapl(&rep.length, n); - swapl(&rep.textLen, n); -+#else -+ swaps(&rep.sequenceNumber); -+ swapl(&rep.length); -+ swapl(&rep.textLen); -+#endif - } - WriteToClient(client, sizeof(xVncExtGetClientCutTextReply), (char *)&rep); - if (clientCutText) -@@ -810,9 +881,13 @@ - - static int SProcVncExtGetClientCutText(ClientPtr client) - { -- register char n; - REQUEST(xVncExtGetClientCutTextReq); -+#if XORG < 112 -+ register char n; - swaps(&stuff->length, n); -+#else -+ swaps(&stuff->length); -+#endif - REQUEST_SIZE_MATCH(xVncExtGetClientCutTextReq); - return ProcVncExtGetClientCutText(client); - } -@@ -842,12 +917,21 @@ - - static int SProcVncExtSelectInput(ClientPtr client) - { -- register char n; - REQUEST(xVncExtSelectInputReq); -+#if XORG < 112 -+ register char n; - swaps(&stuff->length, n); -+#else -+ swaps(&stuff->length); -+#endif - REQUEST_SIZE_MATCH(xVncExtSelectInputReq); -+#if XORG < 112 - swapl(&stuff->window, n); - swapl(&stuff->mask, n); -+#else -+ swapl(&stuff->window); -+ swapl(&stuff->mask); -+#endif - return ProcVncExtSelectInput(client); - } - -@@ -893,9 +977,14 @@ - rep.length = 0; - rep.sequenceNumber = client->sequence; - if (client->swapped) { -+#if XORG < 112 - int n; - swaps(&rep.sequenceNumber, n); - swapl(&rep.length, n); -+#else -+ swaps(&rep.sequenceNumber); -+ swapl(&rep.length); -+#endif - } - WriteToClient(client, sizeof(xVncExtConnectReply), (char *)&rep); - return (client->noClientException); -@@ -903,9 +992,13 @@ - - static int SProcVncExtConnect(ClientPtr client) - { -- register char n; - REQUEST(xVncExtConnectReq); -+#if XORG < 112 -+ register char n; - swaps(&stuff->length, n); -+#else -+ swaps(&stuff->length); -+#endif - REQUEST_AT_LEAST_SIZE(xVncExtConnectReq); - return ProcVncExtConnect(client); - } -@@ -925,7 +1018,6 @@ - qcTimeout = 0; - - xVncExtGetQueryConnectReply rep; -- int n; - rep.type = X_Reply; - rep.sequenceNumber = client->sequence; - rep.timeout = qcTimeout; -@@ -934,11 +1026,20 @@ - rep.opaqueId = (CARD32)(long)queryConnectId; - rep.length = (rep.userLen + rep.addrLen + 3) >> 2; - if (client->swapped) { -+#if XORG < 112 -+ int n; - swaps(&rep.sequenceNumber, n); - swapl(&rep.userLen, n); - swapl(&rep.addrLen, n); - swapl(&rep.timeout, n); - swapl(&rep.opaqueId, n); -+#else -+ swaps(&rep.sequenceNumber); -+ swapl(&rep.userLen); -+ swapl(&rep.addrLen); -+ swapl(&rep.timeout); -+ swapl(&rep.opaqueId); -+#endif - } - WriteToClient(client, sizeof(xVncExtGetQueryConnectReply), (char *)&rep); - if (qcTimeout) -@@ -950,9 +1051,13 @@ - - static int SProcVncExtGetQueryConnect(ClientPtr client) - { -- register char n; - REQUEST(xVncExtGetQueryConnectReq); -+#if XORG < 112 -+ register char n; - swaps(&stuff->length, n); -+#else -+ swaps(&stuff->length); -+#endif - REQUEST_SIZE_MATCH(xVncExtGetQueryConnectReq); - return ProcVncExtGetQueryConnect(client); - } -@@ -977,10 +1082,15 @@ - - static int SProcVncExtApproveConnect(ClientPtr client) - { -- register char n; - REQUEST(xVncExtApproveConnectReq); -+#if XORG < 112 -+ register char n; - swaps(&stuff->length, n); - swapl(&stuff->opaqueId, n); -+#else -+ swaps(&stuff->length); -+ swapl(&stuff->opaqueId); -+#endif - REQUEST_SIZE_MATCH(xVncExtApproveConnectReq); - return ProcVncExtApproveConnect(client); - } -diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xf86vncModule.cc tigervnc-1.2.0/unix/xserver/hw/vnc/xf86vncModule.cc ---- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xf86vncModule.cc 2010-04-23 15:55:10.000000000 +0200 -+++ tigervnc-1.2.0/unix/xserver/hw/vnc/xf86vncModule.cc 2012-04-15 12:18:57.820557239 +0200 -@@ -26,6 +26,8 @@ - #include <rfb/Logger_stdio.h> - #include <rfb/LogWriter.h> - -+#include "xorg-version.h" -+ - extern "C" { - #define class c_class - #define private c_private -@@ -89,7 +91,12 @@ - ScrnInfoPtr pScrn = xf86Screens[scr]; - - for (ParameterIterator i(Configuration::global()); i.param; i.next()) { -- char* val = xf86FindOptionValue(pScrn->options, i.param->getName()); -+ const char *val; -+#if XORG < 112 -+ val = xf86FindOptionValue(pScrn->options, i.param->getName()); -+#else -+ val = xf86FindOptionValue((XF86OptionPtr)pScrn->options, i.param->getName()); -+#endif - if (val) - i.param->setParam(val); - } -diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xorg-version.h tigervnc-1.2.0/unix/xserver/hw/vnc/xorg-version.h ---- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xorg-version.h 2012-04-15 12:18:21.272014160 +0200 -+++ tigervnc-1.2.0/unix/xserver/hw/vnc/xorg-version.h 2012-04-15 12:18:57.821557227 +0200 -@@ -38,6 +38,8 @@ - #define XORG 110 - #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (11 * 100000) + (99 * 1000)) - #define XORG 111 -+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (12 * 100000) + (99 * 1000)) -+#define XORG 112 - #else - #error "X.Org newer than 1.10 is not supported" - #endif diff --git a/community/tigervnc/xorg113.patch b/community/tigervnc/xorg113.patch deleted file mode 100644 index 505e0a758..000000000 --- a/community/tigervnc/xorg113.patch +++ /dev/null @@ -1,275 +0,0 @@ -diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/vncHooks.cc tigervnc-1.2.0/unix/xserver/hw/vnc/vncHooks.cc ---- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/vncHooks.cc 2012-01-23 16:54:11.000000000 +0100 -+++ tigervnc-1.2.0/unix/xserver/hw/vnc/vncHooks.cc 2012-09-06 18:53:26.392282102 +0200 -@@ -116,7 +116,11 @@ - - // screen functions - -+#if XORG < 112 - static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen); -+#else -+static Bool vncHooksCloseScreen(ScreenPtr pScreen); -+#endif - static Bool vncHooksCreateGC(GCPtr pGC); - static void vncHooksCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, - RegionPtr pOldRegion); -@@ -133,8 +137,13 @@ - DeviceIntPtr pDev, - #endif - ScreenPtr pScreen, CursorPtr cursor); -+#if XORG < 112 - static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout, - pointer pReadmask); -+#else -+static void vncHooksBlockHandler(ScreenPtr pScreen, pointer pTimeout, -+ pointer pReadmask); -+#endif - #ifdef RENDER - static void vncHooksComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, - PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask, -@@ -335,7 +344,11 @@ - // CloseScreen - unwrap the screen functions and call the original CloseScreen - // function - -+#if XORG < 112 - static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen_) -+#else -+static Bool vncHooksCloseScreen(ScreenPtr pScreen_) -+#endif - { - SCREEN_UNWRAP(pScreen_, CloseScreen); - -@@ -366,7 +379,11 @@ - - DBGPRINT((stderr,"vncHooksCloseScreen: unwrapped screen functions\n")); - -+#if XORG < 112 - return (*pScreen->CloseScreen)(i, pScreen); -+#else -+ return (*pScreen->CloseScreen)(pScreen); -+#endif - } - - // CreateGC - wrap the "GC funcs" -@@ -531,14 +548,27 @@ - // BlockHandler - ignore any changes during the block handler - it's likely - // these are just drawing the cursor. - -+#if XORG < 112 - static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout, - pointer pReadmask) -+#else -+static void vncHooksBlockHandler(ScreenPtr pScreen_, pointer pTimeout, -+ pointer pReadmask) -+#endif - { -+#if XORG < 112 - SCREEN_UNWRAP(screenInfo.screens[i], BlockHandler); -+#else -+ SCREEN_UNWRAP(pScreen_, BlockHandler); -+#endif - - vncHooksScreen->desktop->ignoreHooks(true); - -+#if XORG < 112 - (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask); -+#else -+ (*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask); -+#endif - - vncHooksScreen->desktop->ignoreHooks(false); - -diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xf86vncModule.cc tigervnc-1.2.0/unix/xserver/hw/vnc/xf86vncModule.cc ---- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xf86vncModule.cc 2012-09-06 18:52:54.668284962 +0200 -+++ tigervnc-1.2.0/unix/xserver/hw/vnc/xf86vncModule.cc 2012-09-06 18:53:26.393282091 +0200 -@@ -53,8 +53,10 @@ - { - vncExtensionInitWithParams, - "VNC", -+#if XORG < 112 - NULL, - NULL, -+#endif - NULL - }; - -diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xorg-version.h tigervnc-1.2.0/unix/xserver/hw/vnc/xorg-version.h ---- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xorg-version.h 2012-09-06 18:52:54.669284923 +0200 -+++ tigervnc-1.2.0/unix/xserver/hw/vnc/xorg-version.h 2012-09-06 18:53:26.393282091 +0200 -@@ -40,8 +40,10 @@ - #define XORG 111 - #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (12 * 100000) + (99 * 1000)) - #define XORG 112 -+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (13 * 100000) + (99 * 1000)) -+#define XORG 113 - #else --#error "X.Org newer than 1.10 is not supported" -+#error "X.Org newer than 1.13 is not supported" - #endif - - #endif -diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xvnc.cc tigervnc-1.2.0/unix/xserver/hw/vnc/xvnc.cc ---- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xvnc.cc 2012-09-06 18:52:51.896283812 +0200 -+++ tigervnc-1.2.0/unix/xserver/hw/vnc/xvnc.cc 2012-09-06 18:59:25.784263082 +0200 -@@ -285,7 +285,11 @@ - } - - void -+#if XORG < 113 - OsVendorFatalError() -+#else -+OsVendorFatalError(const char *f, va_list args) -+#endif - { - } - -@@ -626,14 +630,25 @@ - } - #endif - -+#if XORG < 113 - static ColormapPtr InstalledMaps[MAXSCREENS]; -+#else -+static DevPrivateKeyRec cmapScrPrivateKeyRec; -+#define cmapScrPrivateKey (&cmapScrPrivateKeyRec) -+#define GetInstalledColormap(s) ((ColormapPtr) dixLookupPrivate(&(s)->devPrivates, cmapScrPrivateKey)) -+#define SetInstalledColormap(s,c) (dixSetPrivate(&(s)->devPrivates, cmapScrPrivateKey, c)) -+#endif - - static int - vfbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps) - { - /* By the time we are processing requests, we can guarantee that there - * is always a colormap installed */ -+#if XORG < 113 - *pmaps = InstalledMaps[pScreen->myNum]->mid; -+#else -+ *pmaps = GetInstalledColormap(pScreen)->mid; -+#endif - return (1); - } - -@@ -641,8 +656,16 @@ - static void - vfbInstallColormap(ColormapPtr pmap) - { -+#if XORG < 113 - int index = pmap->pScreen->myNum; -- ColormapPtr oldpmap = InstalledMaps[index]; -+#endif -+ ColormapPtr oldpmap; -+ -+#if XORG < 113 -+ oldpmap = InstalledMaps[index]; -+#else -+ oldpmap = GetInstalledColormap(pmap->pScreen); -+#endif - - if (pmap != oldpmap) - { -@@ -656,7 +679,11 @@ - if(oldpmap != (ColormapPtr)None) - WalkTree(pmap->pScreen, TellLostMap, (char *)&oldpmap->mid); - /* Install pmap */ -+#if XORG < 113 - InstalledMaps[index] = pmap; -+#else -+ SetInstalledColormap(pmap->pScreen, pmap); -+#endif - WalkTree(pmap->pScreen, TellGainedMap, (char *)&pmap->mid); - - entries = pmap->pVisual->ColormapEntries; -@@ -692,7 +719,11 @@ - static void - vfbUninstallColormap(ColormapPtr pmap) - { -+#if XORG < 113 - ColormapPtr curpmap = InstalledMaps[pmap->pScreen->myNum]; -+#else -+ ColormapPtr curpmap = GetInstalledColormap(pmap->pScreen); -+#endif - - if(pmap == curpmap) - { -@@ -1153,31 +1184,66 @@ - #endif - - static Bool -+#if XORG < 113 - vfbCloseScreen(int index, ScreenPtr pScreen) -+#else -+vfbCloseScreen(ScreenPtr pScreen) -+#endif - { -+#if XORG < 113 - vfbScreenInfoPtr pvfb = &vfbScreens[index]; -+#else -+ vfbScreenInfoPtr pvfb = &vfbScreens[pScreen->myNum]; -+#endif - int i; - - pScreen->CloseScreen = pvfb->closeScreen; - - /* - * XXX probably lots of stuff to clean. For now, -- * clear InstalledMaps[] so that server reset works correctly. -+ * clear installed colormaps so that server reset works correctly. - */ -+#if XORG < 113 - for (i = 0; i < MAXSCREENS; i++) - InstalledMaps[i] = NULL; - - return pScreen->CloseScreen(index, pScreen); -+#else -+ for (i = 0; i < screenInfo.numScreens; i++) -+ SetInstalledColormap(screenInfo.screens[i], NULL); -+ -+ /* -+ * fb overwrites miCloseScreen, so do this here -+ */ -+ if (pScreen->devPrivate) -+ (*pScreen->DestroyPixmap) ((PixmapPtr) pScreen->devPrivate); -+ pScreen->devPrivate = NULL; -+ -+ return pScreen->CloseScreen(pScreen); -+#endif - } - - static Bool -+#if XORG < 113 - vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv) -+#else -+vfbScreenInit(ScreenPtr pScreen, int argc, char **argv) -+#endif - { -+#if XORG < 113 - vfbScreenInfoPtr pvfb = &vfbScreens[index]; -+#else -+ vfbScreenInfoPtr pvfb = &vfbScreens[pScreen->myNum]; -+#endif - int dpi; - int ret; - void *pbits; - -+#if XORG >= 113 -+ if (!dixRegisterPrivateKey(&cmapScrPrivateKeyRec, PRIVATE_SCREEN, 0)) -+ return FALSE; -+#endif -+ - /* 96 is the default used by most other systems */ - dpi = 96; - if (monitorResolution) -@@ -1185,8 +1251,13 @@ - - pbits = vfbAllocateFramebufferMemory(&pvfb->fb); - if (!pbits) return FALSE; -+#if XORG < 113 - vncFbptr[index] = pbits; - vncFbstride[index] = pvfb->fb.paddedWidth; -+#else -+ vncFbptr[pScreen->myNum] = pbits; -+ vncFbstride[pScreen->myNum] = pvfb->fb.paddedWidth; -+#endif - - miSetPixmapDepths(); - diff --git a/community/tigervnc/xorg114.patch b/community/tigervnc/xorg114.patch deleted file mode 100644 index 702706d34..000000000 --- a/community/tigervnc/xorg114.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xorg-version.h tigervnc-1.2.0/unix/xserver/hw/vnc/xorg-version.h ---- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xorg-version.h 2013-03-19 16:22:42.240358422 +0100 -+++ tigervnc-1.2.0/unix/xserver/hw/vnc/xorg-version.h 2013-03-19 16:23:33.846355724 +0100 -@@ -42,8 +42,10 @@ - #define XORG 112 - #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (13 * 100000) + (99 * 1000)) - #define XORG 113 -+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (14 * 100000) + (99 * 1000)) -+#define XORG 114 - #else --#error "X.Org newer than 1.13 is not supported" -+#error "X.Org newer than 1.14 is not supported" - #endif - - #endif -diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xvnc.cc tigervnc-1.2.0/unix/xserver/hw/vnc/xvnc.cc ---- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xvnc.cc 2013-03-19 16:22:51.327357948 +0100 -+++ tigervnc-1.2.0/unix/xserver/hw/vnc/xvnc.cc 2013-03-19 16:23:33.847355727 +0100 -@@ -54,7 +54,9 @@ - #include "servermd.h" - #include "fb.h" - #include "mi.h" -+#if XORG < 114 - #include "mibstore.h" -+#endif - #include "colormapst.h" - #include "gcstruct.h" - #include "input.h" diff --git a/community/tigervnc/xserver113.patch b/community/tigervnc/xserver113.patch deleted file mode 100644 index e4fabf3b0..000000000 --- a/community/tigervnc/xserver113.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff -up tigervnc-1.2.0/unix/xserver/configure.ac.vnc tigervnc-1.2.0/unix/xserver/configure.ac ---- tigervnc-1.2.0/unix/xserver/configure.ac.vnc 2012-08-28 15:35:23.778810954 +0200 -+++ tigervnc-1.2.0/unix/xserver/configure.ac 2012-08-28 15:54:46.396743431 +0200 -@@ -31,7 +31,6 @@ RELEASE_DATE="2012-08-21" - RELEASE_NAME="Splashing Orca" - AC_CONFIG_SRCDIR([Makefile.am]) - AM_INIT_AUTOMAKE([foreign dist-bzip2]) --AM_MAINTAINER_MODE - - # Require xorg-macros minimum of 1.14 for XORG_COMPILER_BRAND in XORG_DEFAULT_OPTIONS - m4_ifndef([XORG_MACROS_VERSION], -@@ -73,6 +72,7 @@ dnl forcing an entire recompile.x - AC_CONFIG_HEADERS(include/version-config.h) - - AM_PROG_AS -+AC_PROG_CXX - AC_PROG_LN_S - AC_LIBTOOL_WIN32_DLL - AC_DISABLE_STATIC -@@ -1561,6 +1561,10 @@ if test "x$XVFB" = xyes; then - AC_SUBST([XVFB_SYS_LIBS]) - fi - -+dnl Xvnc DDX -+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"]) -+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"]) -+AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"]) - - dnl Xnest DDX - -@@ -1596,6 +1600,8 @@ if test "x$XORG" = xauto; then - fi - AC_MSG_RESULT([$XORG]) - -+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) -+ - if test "x$XORG" = xyes; then - XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' - XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' -@@ -1815,7 +1821,6 @@ if test "x$XORG" = xyes; then - AC_DEFINE(XORG_SERVER, 1, [Building Xorg server]) - AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) - AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) -- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) - AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) - AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) - AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) -@@ -2280,6 +2285,7 @@ hw/dmx/Makefile - hw/dmx/man/Makefile - hw/vfb/Makefile - hw/vfb/man/Makefile -+hw/vnc/Makefile - hw/xnest/Makefile - hw/xnest/man/Makefile - hw/xwin/Makefile -diff -up tigervnc-1.2.0/unix/xserver/hw/Makefile.am.vnc tigervnc-1.2.0/unix/xserver/hw/Makefile.am ---- tigervnc-1.2.0/unix/xserver/hw/Makefile.am.vnc 2012-08-28 15:35:23.856810890 +0200 -+++ tigervnc-1.2.0/unix/xserver/hw/Makefile.am 2012-08-28 15:35:42.272795917 +0200 -@@ -33,7 +33,8 @@ SUBDIRS = \ - $(XNEST_SUBDIRS) \ - $(DMX_SUBDIRS) \ - $(KDRIVE_SUBDIRS) \ -- $(XQUARTZ_SUBDIRS) -+ $(XQUARTZ_SUBDIRS) \ -+ vnc - - DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive - -diff -up tigervnc-1.2.0/unix/xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c ---- tigervnc-1.2.0/unix/xserver/mi/miinitext.c.vnc 2012-08-28 15:35:23.000000000 +0200 -+++ tigervnc-1.2.0/unix/xserver/mi/miinitext.c 2012-09-05 15:07:40.714953972 +0200 -@@ -112,6 +112,10 @@ SOFTWARE. - #include "micmap.h" - #include "globals.h" - -+#ifdef TIGERVNC -+extern void vncExtensionInit(INITARGS); -+#endif -+ - /* The following is only a small first step towards run-time - * configurable extensions. - */ -@@ -299,6 +303,9 @@ static ExtensionModule staticExtensions[ - #ifdef XSELINUX - {SELinuxExtensionInit, SELINUX_EXTENSION_NAME, &noSELinuxExtension}, - #endif -+#ifdef TIGERVNC -+ {vncExtensionInit, "VNC-EXTENSION", NULL}, -+#endif - }; - - static ExtensionModule *ExtensionModuleList = NULL; |