Author: baggins Date: Tue Nov 9 13:27:54 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- xinerama qt crash fix
---- Files affected:
packages/xorg-xserver-server:
xorg-xserver-server.spec (1.259 -> 1.260) ,
xorg-xserver-server-qt-crash.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server.spec
diff -u packages/xorg-xserver-server/xorg-xserver-server.spec:1.259
packages/xorg-xserver-server/xorg-xserver-server.spec:1.260
--- packages/xorg-xserver-server/xorg-xserver-server.spec:1.259 Mon Nov 1
09:34:25 2010
+++ packages/xorg-xserver-server/xorg-xserver-server.spec Tue Nov 9
14:27:49 2010
@@ -35,6 +35,7 @@
Patch2: %{name}-fb-size.patch
Patch3: %{name}-less-acpi-brokenness.patch
Patch4: %{name}-builtin-SHA1.patch
+Patch5: %{name}-qt-crash.patch
URL: http://xorg.freedesktop.org/
BuildRequires: Mesa-libGL-devel >= 7.8.1
# for glx headers
@@ -364,6 +365,7 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
# xserver uses pixman-1 API/ABI so put that explictly here
sed -i -e 's#<pixman\.h#<pixman-1/pixman.h#g' ./fb/fb.h ./include/miscstruct.h
./render/picture.h
@@ -612,6 +614,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.260 2010/11/09 13:27:49 baggins
+- xinerama qt crash fix
+
Revision 1.259 2010/11/01 08:34:25 qboosh
- don't call fop, only HTML specs are packaged (fop can be used for ps/pdf or
txt)
================================================================
Index: packages/xorg-xserver-server/xorg-xserver-server-qt-crash.patch
diff -u /dev/null
packages/xorg-xserver-server/xorg-xserver-server-qt-crash.patch:1.1
--- /dev/null Tue Nov 9 14:27:54 2010
+++ packages/xorg-xserver-server/xorg-xserver-server-qt-crash.patch Tue Nov
9 14:27:49 2010
@@ -0,0 +1,35 @@
+From linusarver at gmail.com Sun Oct 17 12:26:01 2010
+From: linusarver at gmail.com (Linus Arver)
+Date: Sun, 17 Oct 2010 12:26:01 -0700
+Subject: [PATCH] Xext: panoramiXprocs: fix typo
+Message-ID: <[email protected]>
+
+This fixes a typo introduced in commit
+80b5d3a3264d2c5167e5ac85a3b04af0f89cece1. The pointer pDst was changed
+unintentionally to pWin from a copy/paste error. This resulted in all
+QT-based apps and some tcl/tk ones (like fontforge) to crash X 1.9 on
+starting up, when Xinerama was enabled.
+
+Bug report: https://bbs.archlinux.org/viewtopic.php?id=106125
+
+Signed-off-by: Elie Bleton <drozofil at gmail.com>
+Tested-by: Linus Arver <linusarver at gmail.com>
+---
+ Xext/panoramiXprocs.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c
+index 67b4030..d843168 100644
+--- a/Xext/panoramiXprocs.c
++++ b/Xext/panoramiXprocs.c
+@@ -634,7 +634,7 @@ int PanoramiXTranslateCoords(ClientPtr client)
+ rep.dstX = x - pDst->drawable.x;
+ rep.dstY = y - pDst->drawable.y;
+ if((pDst == screenInfo.screens[0]->root) ||
+- (pWin->drawable.id == screenInfo.screens[0]->screensaver.wid))
++ (pDst->drawable.id == screenInfo.screens[0]->screensaver.wid))
+ {
+ rep.dstX += screenInfo.screens[0]->x;
+ rep.dstY += screenInfo.screens[0]->y;
+--
+1.7.3.1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-xserver-server/xorg-xserver-server.spec?r1=1.259&r2=1.260&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
