[packages/tigervnc] - removed obsolete patches (1.2.0 -> 1.3.0 update)
hawk
hawk at pld-linux.org
Thu Jul 18 18:05:16 CEST 2013
commit d2a8f12f8e284c06ee8d7c83b57fc3d71e38434b
Author: Marcin Krol <hawk at tld-linux.org>
Date: Thu Jul 18 16:12:53 2013 +0000
- removed obsolete patches (1.2.0 -> 1.3.0 update)
cmake-mandir.patch | 46 ------
gnutls3.patch | 24 ----
sed-all.patch | 24 ----
tigervnc-viewer-reparent.patch | 121 ----------------
tigervnc-xorg111.patch | 240 -------------------------------
xorg112.patch | 311 -----------------------------------------
xorg113.patch | 144 -------------------
xorg114.patch | 22 ---
8 files changed, 932 deletions(-)
---
diff --git a/cmake-mandir.patch b/cmake-mandir.patch
deleted file mode 100644
index ddb820f..0000000
--- a/cmake-mandir.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -ur tigervnc-1.2.0/unix/CMakeLists.txt tigervnc-1.2.0,man/unix/CMakeLists.txt
---- tigervnc-1.2.0/unix/CMakeLists.txt 2011-11-03 20:01:18.000000000 +0100
-+++ tigervnc-1.2.0,man/unix/CMakeLists.txt 2012-03-23 23:53:25.105829218 +0100
-@@ -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/unix/vncconfig/CMakeLists.txt tigervnc-1.2.0,man/unix/vncconfig/CMakeLists.txt
---- tigervnc-1.2.0/unix/vncconfig/CMakeLists.txt 2011-06-25 09:32:34.000000000 +0200
-+++ tigervnc-1.2.0,man/unix/vncconfig/CMakeLists.txt 2012-03-23 23:53:06.832567152 +0100
-@@ -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/unix/vncpasswd/CMakeLists.txt tigervnc-1.2.0,man/unix/vncpasswd/CMakeLists.txt
---- tigervnc-1.2.0/unix/vncpasswd/CMakeLists.txt 2011-06-25 09:32:34.000000000 +0200
-+++ tigervnc-1.2.0,man/unix/vncpasswd/CMakeLists.txt 2012-03-23 23:53:56.332374099 +0100
-@@ -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/unix/x0vncserver/CMakeLists.txt tigervnc-1.2.0,man/unix/x0vncserver/CMakeLists.txt
---- tigervnc-1.2.0/unix/x0vncserver/CMakeLists.txt 2011-08-19 18:41:06.000000000 +0200
-+++ tigervnc-1.2.0,man/unix/x0vncserver/CMakeLists.txt 2012-03-23 23:54:15.198967188 +0100
-@@ -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/vncviewer/CMakeLists.txt tigervnc-1.2.0,man/vncviewer/CMakeLists.txt
---- tigervnc-1.2.0/vncviewer/CMakeLists.txt 2011-10-05 11:32:28.000000000 +0200
-+++ tigervnc-1.2.0,man/vncviewer/CMakeLists.txt 2012-03-23 23:54:29.648910832 +0100
-@@ -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/gnutls3.patch b/gnutls3.patch
deleted file mode 100644
index 82912bf..0000000
--- a/gnutls3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- tigervnc-1.2.0/common/rdr/TLSInStream.cxx.orig 2010-09-30 08:25:28.000000000 +0200
-+++ tigervnc-1.2.0/common/rdr/TLSInStream.cxx 2012-03-23 13:33:16.068563580 +0100
-@@ -27,9 +27,7 @@
- #include <rdr/TLSInStream.h>
- #include <errno.h>
-
--#ifdef HAVE_OLD_GNUTLS
- #define gnutls_transport_set_global_errno(A) do { errno = (A); } while(0)
--#endif
-
- #ifdef HAVE_GNUTLS
- using namespace rdr;
---- tigervnc-1.2.0/common/rdr/TLSOutStream.cxx~ 2010-09-30 08:25:28.000000000 +0200
-+++ tigervnc-1.2.0/common/rdr/TLSOutStream.cxx 2012-03-23 13:42:11.861921087 +0100
-@@ -27,9 +27,7 @@
- #include <rdr/TLSOutStream.h>
- #include <errno.h>
-
--#ifdef HAVE_OLD_GNUTLS
- #define gnutls_transport_set_global_errno(A) do { errno = (A); } while(0)
--#endif
-
- #ifdef HAVE_GNUTLS
- using namespace rdr;
diff --git a/sed-all.patch b/sed-all.patch
deleted file mode 100644
index 79e48f7..0000000
--- a/sed-all.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- tigervnc-1.2.0/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-19 08:15:51.849379891 +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 \
-@@ -72,10 +72,10 @@
- fi; \
- done; \
- if [ ! "$$PIXMANINCDIR" = "" ]; then \
-- cat $$PIXMANINCDIR/pixman.h | sed 's/xor/c_xor/' > $(srcdir)/pixman.h; \
-+ cat $$PIXMANINCDIR/pixman.h | sed 's/xor/c_xor/g' > $(srcdir)/pixman.h; \
- else \
- echo Pixman include directory not set in XSERVERLIBS_CFLAGS \(perhaps Pixman was not found by configure?\); \
- 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 --git a/tigervnc-viewer-reparent.patch b/tigervnc-viewer-reparent.patch
deleted file mode 100644
index 4916f49..0000000
--- a/tigervnc-viewer-reparent.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-diff -up tightvnc-1.5.0-20081015svn3022/unix/tx/TXViewport.cxx.viewer-reparent tightvnc-1.5.0-20081015svn3022/unix/tx/TXViewport.cxx
---- tightvnc-1.5.0-20081015svn3022/unix/tx/TXViewport.cxx.viewer-reparent 2008-03-14 14:37:09.000000000 +0100
-+++ tightvnc-1.5.0-20081015svn3022/unix/tx/TXViewport.cxx 2008-10-23 13:11:39.000000000 +0200
-@@ -44,6 +44,21 @@ TXViewport::~TXViewport()
- delete vScrollbar;
- }
-
-+void TXViewport::reparent(long embed_window)
-+{
-+ XReparentWindow(dpy, win(), (Window)embed_window, 0, 0);
-+ XSelectInput(dpy, embed_window, child->eventMask);
-+ if (!eventHandler)
-+ this->setEventHandler(this);
-+}
-+
-+void TXViewport::handleEvent(TXWindow* w, XEvent* ev)
-+{
-+ if (child && child->eventHandler)
-+ ((TXEventHandler *)child->eventHandler)->handleEvent(child, ev);
-+}
-+
-+
- void TXViewport::setChild(TXWindow* child_)
- {
- child = child_;
-diff -up tightvnc-1.5.0-20081015svn3022/unix/tx/TXViewport.h.viewer-reparent tightvnc-1.5.0-20081015svn3022/unix/tx/TXViewport.h
---- tightvnc-1.5.0-20081015svn3022/unix/tx/TXViewport.h.viewer-reparent 2008-03-14 14:37:09.000000000 +0100
-+++ tightvnc-1.5.0-20081015svn3022/unix/tx/TXViewport.h 2008-10-23 13:11:39.000000000 +0200
-@@ -32,8 +32,8 @@
- #include "TXWindow.h"
- #include "TXScrollbar.h"
-
--class TXViewport : public TXWindow, public TXScrollbarCallback,
-- public rfb::Timer::Callback {
-+class TXViewport : public TXWindow, public TXScrollbarCallback,
-+ public TXEventHandler, public rfb::Timer::Callback {
- public:
- TXViewport(Display* dpy_, int width, int height, TXWindow* parent_=0);
- virtual ~TXViewport();
-@@ -59,6 +59,12 @@ public:
- // normally.
- bool bumpScrollEvent(XMotionEvent* ev);
-
-+ // reparent the viewport into a new window
-+ void reparent(long embed_window);
-+
-+ // event handler
-+ void handleEvent(TXWindow* w, XEvent* ev);
-+
- private:
- virtual void resizeNotify();
- virtual void scrollbarPos(int x, int y, TXScrollbar* sb);
-diff -up tightvnc-1.5.0-20081015svn3022/unix/tx/TXWindow.h.viewer-reparent tightvnc-1.5.0-20081015svn3022/unix/tx/TXWindow.h
---- tightvnc-1.5.0-20081015svn3022/unix/tx/TXWindow.h.viewer-reparent 2006-05-18 13:08:21.000000000 +0200
-+++ tightvnc-1.5.0-20081015svn3022/unix/tx/TXWindow.h 2008-10-23 13:11:39.000000000 +0200
-@@ -183,6 +183,9 @@ public:
-
- Display* const dpy;
-
-+ TXEventHandler* eventHandler;
-+ long eventMask;
-+
- int xPad, yPad, bevel;
-
- private:
-@@ -195,9 +198,7 @@ private:
- TXWindow* parent;
- Window win_;
- int width_, height_;
-- TXEventHandler* eventHandler;
- TXDeleteWindowCallback* dwc;
-- long eventMask;
- XSizeHints sizeHints;
- std::map<Atom,Time> selectionOwnTime;
- std::map<Atom,bool> selectionOwner_;
-diff -up tightvnc-1.5.0-20081015svn3022/vncviewer/CConn.cxx.viewer-reparent tightvnc-1.5.0-20081015svn3022/vncviewer/CConn.cxx
---- tightvnc-1.5.0-20081015svn3022/vncviewer/CConn.cxx.viewer-reparent 2008-10-23 13:11:39.000000000 +0200
-+++ tightvnc-1.5.0-20081015svn3022/vncviewer/CConn.cxx 2008-10-23 13:11:39.000000000 +0200
-@@ -647,10 +647,18 @@ void CConn::recreateViewport()
-
- void CConn::reconfigureViewport()
- {
-+ const char * par = embedParent.getValueStr();
- viewport->setMaxSize(cp.width, cp.height);
- if (fullScreen) {
- viewport->resize(DisplayWidth(dpy,DefaultScreen(dpy)),
- DisplayHeight(dpy,DefaultScreen(dpy)));
-+ } else if (strlen(par) != 0) {
-+ XWindowAttributes win_attr;
-+ Window w = strtol(par, (char **)NULL, 0);
-+
-+ XGetWindowAttributes(dpy, w, &win_attr);
-+ viewport->reparent(w);
-+ viewport->resize(win_attr.width, win_attr.height);
- } else {
- int w = cp.width;
- int h = cp.height;
-diff -up tightvnc-1.5.0-20081015svn3022/vncviewer/parameters.h.viewer-reparent tightvnc-1.5.0-20081015svn3022/vncviewer/parameters.h
---- tightvnc-1.5.0-20081015svn3022/vncviewer/parameters.h.viewer-reparent 2008-10-23 13:11:39.000000000 +0200
-+++ tightvnc-1.5.0-20081015svn3022/vncviewer/parameters.h 2008-10-23 13:12:41.000000000 +0200
-@@ -42,6 +42,7 @@ extern rfb::IntParameter compressLevel;
- extern rfb::BoolParameter noJpeg;
- extern rfb::IntParameter qualityLevel;
- extern rfb::BoolParameter passwdInput;
-+extern rfb::StringParameter embedParent;
-
- extern char aboutText[];
- extern char* programName;
-diff -up tightvnc-1.5.0-20081015svn3022/vncviewer/parameters.cxx.viewer-reparent tightvnc-1.5.0-20081015svn3022/vncviewer/parameters.cxx
---- tightvnc-1.5.0-20081015svn3022/vncviewer/parameters.cxx.viewer-reparent 2008-10-23 13:11:39.000000000 +0200
-+++ tightvnc-1.5.0-20081015svn3022/vncviewer/parameters.cxx 2008-10-23 13:12:59.000000000 +0200
-@@ -106,6 +106,9 @@ StringParameter displayname("display", "
- StringParameter preferredEncoding("PreferredEncoding",
- "Preferred encoding to use (Tight, ZRLE, Hextile or"
- " Raw)", "Tight");
-+/* Support for reparenting */
-+StringParameter embedParent("Parent", "X Window to use as a parent", "");
-+
- BoolParameter customCompressLevel("CustomCompressLevel",
- "Use custom compression level. "
- "Default if CompressLevel is specified.", false);
diff --git a/tigervnc-xorg111.patch b/tigervnc-xorg111.patch
deleted file mode 100644
index 4e1b727..0000000
--- a/tigervnc-xorg111.patch
+++ /dev/null
@@ -1,240 +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-09-14 13:22:19.540000049 +0200
-@@ -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;
-+ DeviceIntPtr master;
-
-- state = XkbStateFieldFromRec(&dev->u.master->key->xkbInfo->state);
-+ master = GetMaster(dev, MASTER_KEYBOARD);
-+
-+ state = XkbStateFieldFromRec(&master->key->xkbInfo->state);
- #else
- KeyClassPtr keyc = dev->key;
- state = keyc->state;
-@@ -379,8 +408,10 @@ public:
- KeyClassPtr keyc;
- #if XORG >= 17
- KeyCode *modmap = NULL;
-+ DeviceIntPtr master;
-
-- keyc = dev->u.master->key;
-+ master = GetMaster(dev, MASTER_KEYBOARD);
-+ keyc = master->key;
- state = XkbStateFieldFromRec(&keyc->xkbInfo->state);
- #else
- keyc = dev->key;
-@@ -565,9 +596,7 @@ static inline int isModifier(KeySymsPtr
-
- void InputDevice::keyEvent(rdr::U32 keysym, bool down)
- {
--#if XORG < 17
- DeviceIntPtr master;
--#endif
- KeyClassPtr keyc;
- KeySymsPtr keymap = NULL;
- KeySym *map = NULL;
-@@ -596,7 +625,8 @@ void InputDevice::keyEvent(rdr::U32 keys
- }
-
- #if XORG >= 17
-- keyc = keyboardDev->u.master->key;
-+ master = GetMaster(keyboardDev, MASTER_KEYBOARD);
-+ keyc = master->key;
-
- keymap = XkbGetCoreMap(keyboardDev);
- if (!keymap) {
-@@ -753,7 +783,7 @@ ModeSwitchFound:
- XkbApplyMappingChange(keyboardDev, keymap, minKeyCode,
- maxKeyCode - minKeyCode + 1,
- NULL, serverClient);
-- XkbCopyDeviceKeymap(keyboardDev->u.master, keyboardDev);
-+ XkbCopyDeviceKeymap(master, keyboardDev);
- #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-09-12 16:51:36.958000000 +0200
-@@ -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-09-14 13:49:23.751000543 +0200
-@@ -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/xorg112.patch b/xorg112.patch
deleted file mode 100644
index 0899c14..0000000
--- a/xorg112.patch
+++ /dev/null
@@ -1,311 +0,0 @@
---- tigervnc-1.2.0/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-03-23 14:06:29.207547404 +0100
-@@ -449,10 +449,9 @@
- ev.window = cur->window;
- ev.time = GetTimeInMillis();
- if (cur->client->swapped) {
-- int n;
-- swaps(&ev.sequenceNumber, n);
-- swapl(&ev.window, n);
-- swapl(&ev.time, n);
-+ swaps(&ev.sequenceNumber);
-+ swapl(&ev.window);
-+ swapl(&ev.time);
- }
- WriteToClient(cur->client, sizeof(xVncExtClientCutTextNotifyEvent),
- (char *)&ev);
-@@ -495,9 +494,8 @@
- ev.sequenceNumber = cur->client->sequence;
- ev.window = cur->window;
- if (cur->client->swapped) {
-- int n;
-- swaps(&ev.sequenceNumber, n);
-- swapl(&ev.window, n);
-+ swaps(&ev.sequenceNumber);
-+ swapl(&ev.window);
- }
- WriteToClient(cur->client, sizeof(xVncExtQueryConnectNotifyEvent),
- (char *)&ev);
-@@ -538,10 +536,9 @@
- ev.window = cur->window;
- ev.selection = selection;
- if (cur->client->swapped) {
-- int n;
-- swaps(&ev.sequenceNumber, n);
-- swapl(&ev.window, n);
-- swapl(&ev.selection, n);
-+ swaps(&ev.sequenceNumber);
-+ swapl(&ev.window);
-+ swapl(&ev.selection);
- }
- WriteToClient(cur->client, sizeof(xVncExtSelectionChangeNotifyEvent),
- (char *)&ev);
-@@ -562,7 +559,6 @@
- param.buf[stuff->paramLen] = 0;
-
- xVncExtSetParamReply rep;
-- int n;
- rep.type = X_Reply;
- rep.length = 0;
- rep.success = 0;
-@@ -603,8 +599,8 @@
-
- deny:
- if (client->swapped) {
-- swaps(&rep.sequenceNumber, n);
-- swapl(&rep.length, n);
-+ swaps(&rep.sequenceNumber);
-+ swapl(&rep.length);
- }
- WriteToClient(client, sizeof(xVncExtSetParamReply), (char *)&rep);
- return (client->noClientException);
-@@ -612,9 +608,8 @@
-
- static int SProcVncExtSetParam(ClientPtr client)
- {
-- register char n;
- REQUEST(xVncExtSetParamReq);
-- swaps(&stuff->length, n);
-+ swaps(&stuff->length);
- REQUEST_AT_LEAST_SIZE(xVncExtSetParamReq);
- return ProcVncExtSetParam(client);
- }
-@@ -628,7 +623,6 @@
- param.buf[stuff->paramLen] = 0;
-
- xVncExtGetParamReply rep;
-- int n;
- rep.type = X_Reply;
- rep.sequenceNumber = client->sequence;
- rep.success = 0;
-@@ -646,9 +640,9 @@
- rep.length = (len + 3) >> 2;
- rep.valueLen = len;
- if (client->swapped) {
-- swaps(&rep.sequenceNumber, n);
-- swapl(&rep.length, n);
-- swaps(&rep.valueLen, n);
-+ swaps(&rep.sequenceNumber);
-+ swapl(&rep.length);
-+ swaps(&rep.valueLen);
- }
- WriteToClient(client, sizeof(xVncExtGetParamReply), (char *)&rep);
- if (value)
-@@ -659,9 +653,8 @@
-
- static int SProcVncExtGetParam(ClientPtr client)
- {
-- register char n;
- REQUEST(xVncExtGetParamReq);
-- swaps(&stuff->length, n);
-+ swaps(&stuff->length);
- REQUEST_AT_LEAST_SIZE(xVncExtGetParamReq);
- return ProcVncExtGetParam(client);
- }
-@@ -675,7 +668,6 @@
- param.buf[stuff->paramLen] = 0;
-
- xVncExtGetParamDescReply rep;
-- int n;
- rep.type = X_Reply;
- rep.sequenceNumber = client->sequence;
- rep.success = 0;
-@@ -690,9 +682,9 @@
- rep.length = (len + 3) >> 2;
- rep.descLen = len;
- if (client->swapped) {
-- swaps(&rep.sequenceNumber, n);
-- swapl(&rep.length, n);
-- swaps(&rep.descLen, n);
-+ swaps(&rep.sequenceNumber);
-+ swapl(&rep.length);
-+ swaps(&rep.descLen);
- }
- WriteToClient(client, sizeof(xVncExtGetParamDescReply), (char *)&rep);
- if (desc)
-@@ -702,9 +694,8 @@
-
- static int SProcVncExtGetParamDesc(ClientPtr client)
- {
-- register char n;
- REQUEST(xVncExtGetParamDescReq);
-- swaps(&stuff->length, n);
-+ swaps(&stuff->length);
- REQUEST_AT_LEAST_SIZE(xVncExtGetParamDescReq);
- return ProcVncExtGetParamDesc(client);
- }
-@@ -715,7 +706,6 @@
- REQUEST_SIZE_MATCH(xVncExtListParamsReq);
-
- xVncExtListParamsReply rep;
-- int n;
- rep.type = X_Reply;
- rep.sequenceNumber = client->sequence;
-
-@@ -731,9 +721,9 @@
- rep.length = (len + 3) >> 2;
- rep.nParams = nParams;
- if (client->swapped) {
-- swaps(&rep.sequenceNumber, n);
-- swapl(&rep.length, n);
-- swaps(&rep.nParams, n);
-+ swaps(&rep.sequenceNumber);
-+ swapl(&rep.length);
-+ swaps(&rep.nParams);
- }
- WriteToClient(client, sizeof(xVncExtListParamsReply), (char *)&rep);
- rdr::U8* data = new rdr::U8[len];
-@@ -753,9 +743,8 @@
-
- static int SProcVncExtListParams(ClientPtr client)
- {
-- register char n;
- REQUEST(xVncExtListParamsReq);
-- swaps(&stuff->length, n);
-+ swaps(&stuff->length);
- REQUEST_SIZE_MATCH(xVncExtListParamsReq);
- return ProcVncExtListParams(client);
- }
-@@ -778,11 +767,10 @@
-
- static int SProcVncExtSetServerCutText(ClientPtr client)
- {
-- register char n;
- REQUEST(xVncExtSetServerCutTextReq);
-- swaps(&stuff->length, n);
-+ swaps(&stuff->length);
- REQUEST_AT_LEAST_SIZE(xVncExtSetServerCutTextReq);
-- swapl(&stuff->textLen, n);
-+ swapl(&stuff->textLen);
- return ProcVncExtSetServerCutText(client);
- }
-
-@@ -792,15 +780,14 @@
- 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) {
-- swaps(&rep.sequenceNumber, n);
-- swapl(&rep.length, n);
-- swapl(&rep.textLen, n);
-+ swaps(&rep.sequenceNumber);
-+ swapl(&rep.length);
-+ swapl(&rep.textLen);
- }
- WriteToClient(client, sizeof(xVncExtGetClientCutTextReply), (char *)&rep);
- if (clientCutText)
-@@ -810,9 +797,8 @@
-
- static int SProcVncExtGetClientCutText(ClientPtr client)
- {
-- register char n;
- REQUEST(xVncExtGetClientCutTextReq);
-- swaps(&stuff->length, n);
-+ swaps(&stuff->length);
- REQUEST_SIZE_MATCH(xVncExtGetClientCutTextReq);
- return ProcVncExtGetClientCutText(client);
- }
-@@ -842,12 +828,11 @@
-
- static int SProcVncExtSelectInput(ClientPtr client)
- {
-- register char n;
- REQUEST(xVncExtSelectInputReq);
-- swaps(&stuff->length, n);
-+ swaps(&stuff->length);
- REQUEST_SIZE_MATCH(xVncExtSelectInputReq);
-- swapl(&stuff->window, n);
-- swapl(&stuff->mask, n);
-+ swapl(&stuff->window);
-+ swapl(&stuff->mask);
- return ProcVncExtSelectInput(client);
- }
-
-@@ -893,9 +878,8 @@
- rep.length = 0;
- rep.sequenceNumber = client->sequence;
- if (client->swapped) {
-- int n;
-- swaps(&rep.sequenceNumber, n);
-- swapl(&rep.length, n);
-+ swaps(&rep.sequenceNumber);
-+ swapl(&rep.length);
- }
- WriteToClient(client, sizeof(xVncExtConnectReply), (char *)&rep);
- return (client->noClientException);
-@@ -903,9 +887,8 @@
-
- static int SProcVncExtConnect(ClientPtr client)
- {
-- register char n;
- REQUEST(xVncExtConnectReq);
-- swaps(&stuff->length, n);
-+ swaps(&stuff->length);
- REQUEST_AT_LEAST_SIZE(xVncExtConnectReq);
- return ProcVncExtConnect(client);
- }
-@@ -925,7 +908,6 @@
- qcTimeout = 0;
-
- xVncExtGetQueryConnectReply rep;
-- int n;
- rep.type = X_Reply;
- rep.sequenceNumber = client->sequence;
- rep.timeout = qcTimeout;
-@@ -934,11 +916,11 @@
- rep.opaqueId = (CARD32)(long)queryConnectId;
- rep.length = (rep.userLen + rep.addrLen + 3) >> 2;
- if (client->swapped) {
-- swaps(&rep.sequenceNumber, n);
-- swapl(&rep.userLen, n);
-- swapl(&rep.addrLen, n);
-- swapl(&rep.timeout, n);
-- swapl(&rep.opaqueId, n);
-+ swaps(&rep.sequenceNumber);
-+ swapl(&rep.userLen);
-+ swapl(&rep.addrLen);
-+ swapl(&rep.timeout);
-+ swapl(&rep.opaqueId);
- }
- WriteToClient(client, sizeof(xVncExtGetQueryConnectReply), (char *)&rep);
- if (qcTimeout)
-@@ -950,9 +932,8 @@
-
- static int SProcVncExtGetQueryConnect(ClientPtr client)
- {
-- register char n;
- REQUEST(xVncExtGetQueryConnectReq);
-- swaps(&stuff->length, n);
-+ swaps(&stuff->length);
- REQUEST_SIZE_MATCH(xVncExtGetQueryConnectReq);
- return ProcVncExtGetQueryConnect(client);
- }
-@@ -977,10 +958,9 @@
-
- static int SProcVncExtApproveConnect(ClientPtr client)
- {
-- register char n;
- REQUEST(xVncExtApproveConnectReq);
-- swaps(&stuff->length, n);
-- swapl(&stuff->opaqueId, n);
-+ swaps(&stuff->length);
-+ swapl(&stuff->opaqueId);
- REQUEST_SIZE_MATCH(xVncExtApproveConnectReq);
- return ProcVncExtApproveConnect(client);
- }
---- tigervnc-1.2.0/unix/xserver/hw/vnc/xorg-version.h~ 2012-03-23 13:48:15.281937484 +0100
-+++ tigervnc-1.2.0/unix/xserver/hw/vnc/xorg-version.h 2012-03-23 14:08:49.217553722 +0100
-@@ -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/xorg113.patch b/xorg113.patch
deleted file mode 100644
index 78667fb..0000000
--- a/xorg113.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-diff -up tigervnc/unix/xserver/hw/vnc/vncHooks.cc.xorg113 tigervnc/unix/xserver/hw/vnc/vncHooks.cc
---- tigervnc/unix/xserver/hw/vnc/vncHooks.cc.xorg113 2012-07-19 21:31:37.191820942 -0400
-+++ tigervnc/unix/xserver/hw/vnc/vncHooks.cc 2012-07-19 21:36:00.327531293 -0400
-@@ -116,7 +116,7 @@ static DevPrivateKeyRec vncHooksGCKeyRec
-
- // screen functions
-
--static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen);
-+static Bool vncHooksCloseScreen(ScreenPtr pScreen);
- static Bool vncHooksCreateGC(GCPtr pGC);
- static void vncHooksCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg,
- RegionPtr pOldRegion);
-@@ -133,7 +133,7 @@ static Bool vncHooksDisplayCursor(
- DeviceIntPtr pDev,
- #endif
- ScreenPtr pScreen, CursorPtr cursor);
--static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout,
-+static void vncHooksBlockHandler(ScreenPtr pScreen_, pointer pTimeout,
- pointer pReadmask);
- #ifdef RENDER
- static void vncHooksComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask,
-@@ -335,7 +335,7 @@ Bool vncHooksInit(ScreenPtr pScreen, Xse
- // CloseScreen - unwrap the screen functions and call the original CloseScreen
- // function
-
--static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen_)
-+static Bool vncHooksCloseScreen(ScreenPtr pScreen_)
- {
- SCREEN_UNWRAP(pScreen_, CloseScreen);
-
-@@ -366,7 +366,7 @@ static Bool vncHooksCloseScreen(int i, S
-
- DBGPRINT((stderr,"vncHooksCloseScreen: unwrapped screen functions\n"));
-
-- return (*pScreen->CloseScreen)(i, pScreen);
-+ return (*pScreen->CloseScreen)(pScreen);
- }
-
- // CreateGC - wrap the "GC funcs"
-@@ -531,14 +531,14 @@ static Bool vncHooksDisplayCursor(
- // BlockHandler - ignore any changes during the block handler - it's likely
- // these are just drawing the cursor.
-
--static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout,
-+static void vncHooksBlockHandler(ScreenPtr pScreen_, pointer pTimeout,
- pointer pReadmask)
- {
-- SCREEN_UNWRAP(screenInfo.screens[i], BlockHandler);
-+ SCREEN_UNWRAP(pScreen_, BlockHandler);
-
- vncHooksScreen->desktop->ignoreHooks(true);
-
-- (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
-+ (*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask);
-
- vncHooksScreen->desktop->ignoreHooks(false);
-
-diff -up tigervnc/unix/xserver/hw/vnc/xf86vncModule.cc.xorg113 tigervnc/unix/xserver/hw/vnc/xf86vncModule.cc
---- tigervnc/unix/xserver/hw/vnc/xf86vncModule.cc.xorg113 2012-07-19 21:19:27.558942606 -0400
-+++ tigervnc/unix/xserver/hw/vnc/xf86vncModule.cc 2012-07-19 21:19:27.574942408 -0400
-@@ -53,8 +53,6 @@ ExtensionModule vncExt =
- {
- vncExtensionInitWithParams,
- "VNC",
-- NULL,
-- NULL,
- NULL
- };
-
-diff -up tigervnc/unix/xserver/hw/vnc/xorg-version.h.xorg113 tigervnc/unix/xserver/hw/vnc/xorg-version.h
---- tigervnc/unix/xserver/hw/vnc/xorg-version.h.xorg113 2012-07-19 21:19:27.560942582 -0400
-+++ tigervnc/unix/xserver/hw/vnc/xorg-version.h 2012-07-19 21:19:27.576942382 -0400
-@@ -40,6 +40,8 @@
- #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"
- #endif
-diff -up tigervnc/unix/xserver/hw/vnc/xvnc.cc.xorg113 tigervnc/unix/xserver/hw/vnc/xvnc.cc
---- tigervnc/unix/xserver/hw/vnc/xvnc.cc.xorg113 2012-07-19 21:36:33.078121854 -0400
-+++ tigervnc/unix/xserver/hw/vnc/xvnc.cc 2012-07-19 21:39:49.685663920 -0400
-@@ -267,7 +267,7 @@ OsVendorInit()
- }
-
- void
--OsVendorFatalError()
-+OsVendorFatalError(const char *f, va_list args)
- {
- }
-
-@@ -1135,9 +1135,9 @@ static Bool vncRandRSetConfig (ScreenPtr
- #endif
-
- static Bool
--vfbCloseScreen(int index, ScreenPtr pScreen)
-+vfbCloseScreen(ScreenPtr pScreen)
- {
-- vfbScreenInfoPtr pvfb = &vfbScreens[index];
-+ vfbScreenInfoPtr pvfb = &vfbScreens[pScreen->myNum];
- int i;
-
- pScreen->CloseScreen = pvfb->closeScreen;
-@@ -1149,13 +1149,13 @@ vfbCloseScreen(int index, ScreenPtr pScr
- for (i = 0; i < MAXSCREENS; i++)
- InstalledMaps[i] = NULL;
-
-- return pScreen->CloseScreen(index, pScreen);
-+ return pScreen->CloseScreen(pScreen);
- }
-
- static Bool
--vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
-+vfbScreenInit(ScreenPtr pScreen, int argc, char **argv)
- {
-- vfbScreenInfoPtr pvfb = &vfbScreens[index];
-+ vfbScreenInfoPtr pvfb = &vfbScreens[pScreen->myNum];
- int dpi;
- int ret;
- void *pbits;
-@@ -1167,8 +1167,8 @@ vfbScreenInit(int index, ScreenPtr pScre
-
- pbits = vfbAllocateFramebufferMemory(&pvfb->fb);
- if (!pbits) return FALSE;
-- vncFbptr[index] = pbits;
-- vncFbstride[index] = pvfb->fb.paddedWidth;
-+ vncFbptr[pScreen->myNum] = pbits;
-+ vncFbstride[pScreen->myNum] = pvfb->fb.paddedWidth;
-
- miSetPixmapDepths();
-
---- tigervnc-1.2.0/unix/xserver/hw/vnc/vncExtInit.cc~ 2012-09-23 19:45:21.946623087 +0200
-+++ tigervnc-1.2.0/unix/xserver/hw/vnc/vncExtInit.cc 2012-09-23 19:49:31.809947601 +0200
-@@ -943,7 +943,7 @@
- {
- REQUEST(xVncExtApproveConnectReq);
- REQUEST_SIZE_MATCH(xVncExtApproveConnectReq);
-- if (queryConnectId == (void*)stuff->opaqueId) {
-+ if ((CARD32)(long)queryConnectId == stuff->opaqueId) {
- for (int scr = 0; scr < screenInfo.numScreens; scr++) {
- if (desktop[scr]) {
- desktop[scr]->approveConnection(queryConnectId, stuff->approve,
diff --git a/xorg114.patch b/xorg114.patch
deleted file mode 100644
index 6fef6d1..0000000
--- a/xorg114.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up tigervnc/unix/xserver/hw/vnc/xorg-version.h.xorg113 tigervnc/unix/xserver/hw/vnc/xorg-version.h
---- tigervnc/unix/xserver/hw/vnc/xorg-version.h.xorg113 2012-07-19 21:19:27.560942582 -0400
-+++ tigervnc/unix/xserver/hw/vnc/xorg-version.h 2012-07-19 21:19:27.576942382 -0400
-@@ -42,6 +42,8 @@
- #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.10 is not supported"
- #endif
---- tigervnc-1.2.0/unix/xserver/hw/vnc/xvnc.cc~ 2013-04-07 20:20:47.297384278 +0200
-+++ tigervnc-1.2.0/unix/xserver/hw/vnc/xvnc.cc 2013-04-07 20:23:13.141847987 +0200
-@@ -54,7 +54,6 @@
- #include "servermd.h"
- #include "fb.h"
- #include "mi.h"
--#include "mibstore.h"
- #include "colormapst.h"
- #include "gcstruct.h"
- #include "input.h"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/tigervnc.git/commitdiff/ea73831e4b9179b53a4e8c9b6b5091ddd28835f8
More information about the pld-cvs-commit
mailing list