diff options
| author | Brian Hinz <bphinz@users.sourceforge.net> | 2013-11-28 16:26:08 +0000 |
|---|---|---|
| committer | Brian Hinz <bphinz@users.sourceforge.net> | 2013-11-28 16:26:08 +0000 |
| commit | 1ff04d1b8a7b8358b8d3ffcf28b57ade52241058 (patch) | |
| tree | 0635743a5d75aca19f6375ecfb1de9d75558e1e3 /contrib/packages/rpm/el5/SOURCES/libXext-1.1-XAllocID.patch | |
| parent | fefa48d3c47a2cfbedf6dd544354a2db97760b85 (diff) | |
| download | tigervnc-1ff04d1b8a7b8358b8d3ffcf28b57ade52241058.tar.gz tigervnc-1ff04d1b8a7b8358b8d3ffcf28b57ade52241058.zip | |
Added 'contrib' folder to store patches necessary to build external dependecies, distribution-specific packaging files, etc. Also added a delimiter to the end of the fltk patch script defined in BUILDING.txt to make it easier to parse this script out for automated builds.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@5139 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'contrib/packages/rpm/el5/SOURCES/libXext-1.1-XAllocID.patch')
| -rw-r--r-- | contrib/packages/rpm/el5/SOURCES/libXext-1.1-XAllocID.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/contrib/packages/rpm/el5/SOURCES/libXext-1.1-XAllocID.patch b/contrib/packages/rpm/el5/SOURCES/libXext-1.1-XAllocID.patch new file mode 100644 index 00000000..d5256338 --- /dev/null +++ b/contrib/packages/rpm/el5/SOURCES/libXext-1.1-XAllocID.patch @@ -0,0 +1,35 @@ +From 956fd30e1046e5779ac0b6c07ec4f0e87250869a Mon Sep 17 00:00:00 2001 +From: Jamey Sharp <jamey@minilop.net> +Date: Wed, 7 Oct 2009 19:31:21 -0700 +Subject: [PATCH] XAllocID must only be called with the Display lock held. + +This patch makes XShmAttach follow the same XID allocation pattern used in +other stubs, such as XShmCreatePixmap. + +Reported-by: <fdsteve@ihug.co.nz> +Signed-off-by: Jamey Sharp <jamey@minilop.net> +--- + src/XShm.c | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) + +diff --git a/src/XShm.c b/src/XShm.c +index 922b4cb..38efa9f 100644 +--- a/src/XShm.c ++++ b/src/XShm.c +@@ -235,12 +235,11 @@ Status XShmAttach(Display *dpy, XShmSegmentInfo *shminfo) + + ShmCheckExtension (dpy, info, 0); + +- shminfo->shmseg = XAllocID(dpy); + LockDisplay(dpy); + GetReq(ShmAttach, req); + req->reqType = info->codes->major_opcode; + req->shmReqType = X_ShmAttach; +- req->shmseg = shminfo->shmseg; ++ req->shmseg = shminfo->shmseg = XAllocID(dpy); + req->shmid = shminfo->shmid; + req->readOnly = shminfo->readOnly ? xTrue : xFalse; + UnlockDisplay(dpy); +-- +1.6.5.2 + |