Author: baggins Date: Thu Sep 1 10:58:27 2011 GMT Module: packages Tag: HEAD ---- Log message: - fixes for xorg 1.11 fro fedora
---- Files affected: packages/tigervnc: tigervnc.spec (1.43 -> 1.44) , tigervnc-xorg111.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/tigervnc/tigervnc.spec diff -u packages/tigervnc/tigervnc.spec:1.43 packages/tigervnc/tigervnc.spec:1.44 --- packages/tigervnc/tigervnc.spec:1.43 Thu Sep 1 12:54:00 2011 +++ packages/tigervnc/tigervnc.spec Thu Sep 1 12:58:21 2011 @@ -8,7 +8,7 @@ Summary(pl.UTF-8): System zdalnego dostępu TigerVNC Name: tigervnc Version: 1.1.0 -Release: 4 +Release: 3.2 License: GPL v2 Group: X11/Applications/Networking Source0: http://dl.sourceforge.net/tigervnc/1.1.0/%{name}-%{version}.tar.gz @@ -20,6 +20,7 @@ Patch3: %{name}-viewer-reparent.patch Patch4: %{name}-as-needed.patch Patch5: %{name}-ipv6.patch +Patch6: %{name}-xorg111.patch URL: http://www.tigervnc.com/ BuildRequires: ImageMagick BuildRequires: ImageMagick-coder-png @@ -177,6 +178,7 @@ cd unix/xserver patch -p1 <../xserver110.patch cd - +%patch6 -p1 %build %{__gettextize} @@ -304,6 +306,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.44 2011/09/01 10:58:21 baggins +- fixes for xorg 1.11 fro fedora + Revision 1.43 2011/09/01 10:54:00 baggins - rel 4 - ipv6 support for vnc server and listem mode of client ================================================================ Index: packages/tigervnc/tigervnc-xorg111.patch diff -u /dev/null packages/tigervnc/tigervnc-xorg111.patch:1.1 --- /dev/null Thu Sep 1 12:58:27 2011 +++ packages/tigervnc/tigervnc-xorg111.patch Thu Sep 1 12:58:21 2011 @@ -0,0 +1,95 @@ +diff -up tigervnc-1.0.90/unix/xserver/hw/vnc/Input.cc.xorg111 tigervnc-1.0.90/unix/xserver/hw/vnc/Input.cc +--- tigervnc-1.0.90/unix/xserver/hw/vnc/Input.cc.xorg111 2011-05-12 10:42:52.813229993 +0200 ++++ tigervnc-1.0.90/unix/xserver/hw/vnc/Input.cc 2011-05-12 10:52:41.036211939 +0200 +@@ -305,7 +305,7 @@ static inline void pressKey(DeviceIntPtr + vlog.debug("%s %d %s", msg, kc, down ? "down" : "up"); + + action = down ? KeyPress : KeyRelease; +- n = GetKeyboardEvents(eventq, dev, action, kc); ++ n = GetKeyboardEvents(eventq, dev, action, kc, NULL); + enqueueEvents(dev, n); + } + +@@ -341,8 +341,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 +382,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 +570,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 +599,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 +757,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.0.90/unix/xserver/hw/vnc/xorg-version.h.xorg111 tigervnc-1.0.90/unix/xserver/hw/vnc/xorg-version.h +--- tigervnc-1.0.90/unix/xserver/hw/vnc/xorg-version.h.xorg111 2011-05-12 10:40:34.109227333 +0200 ++++ tigervnc-1.0.90/unix/xserver/hw/vnc/xorg-version.h 2011-05-12 10:41:10.970229530 +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.0.90/unix/xserver/hw/vnc/xvnc.cc.xorg111 tigervnc-1.0.90/unix/xserver/hw/vnc/xvnc.cc +--- tigervnc-1.0.90/unix/xserver/hw/vnc/xvnc.cc.xorg111 2011-05-12 10:54:21.068235787 +0200 ++++ tigervnc-1.0.90/unix/xserver/hw/vnc/xvnc.cc 2011-05-12 10:59:01.867225478 +0200 +@@ -670,8 +670,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); + } + } ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tigervnc/tigervnc.spec?r1=1.43&r2=1.44&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
