OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=52

xorg-server-1.4-vnc-64bit.diff

@@ -0,0 +1,10 @@
+--- hw/xfree86/vnc/Makefile.am.orig	2007-10-23 21:53:43.000000000 +0200
++++ hw/xfree86/vnc/Makefile.am	2007-10-23 22:44:44.000000000 +0200
+@@ -12,6 +12,7 @@
+                    -DXFree86LOADER \
+                    -DXFREE86VNC=1 \
+                    -DCHROMIUM=1 \
++                   -DHAVE_DIX_CONFIG_H \
+                    @LIBDRM_CFLAGS@ \
+                    @GL_CFLAGS@ \
+                    @PIXMAN_CFLAGS@

xorg-x11-server.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Oct 23 14:56:13 CEST 2007 - sndirsch@suse.de
+
+- xorg-server-1.4-vnc-64bit.diff
+  * fixes segfault on 64bit during Xserver start; make sure to
+    define _XSERVER64 by having HAVE_DIX_CONFIG_H defined and
+    therefore including dix-config.h, so Atom is CARD32 instead of
+    unsigned long before and no longer messes up the pInfo structure
+    in xf86rfbMouseInit/xf86rfbKeybInit
+- finally enabled build of xf4vnc (standalone Xvnc and VNC Xserver
+  module)
+
 -------------------------------------------------------------------
 Fri Oct 19 04:03:57 CEST 2007 - sndirsch@suse.de
 

xorg-x11-server.spec

@@ -13,7 +13,7 @@
 Name:           xorg-x11-server
 %define dirsuffix 1.4
 %define fglrx_driver_hack 0
-%define vnc 0
+%define vnc 1
 BuildRequires:  Mesa-devel fontconfig-devel freetype2-devel ghostscript-library glitz-devel libdrm-devel pkgconfig xorg-x11 xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
 %if %vnc
 BuildRequires:  libjpeg-devel
@@ -21,7 +21,7 @@ BuildRequires:  libjpeg-devel
 Url:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.3
-Release:        12
+Release:        15
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -73,6 +73,7 @@ Patch36:        libdrm.diff
 %if %vnc
 Patch39:        xorg-server-1.4-vnc.patch
 Patch40:        xorg-server-1.4-vnc-fix.patch
+Patch43:        xorg-server-1.4-vnc-64bit.diff
 %endif
 Patch41:        loadmod-bug197195.diff
 Patch42:        bug227111-ddc_screensize.diff
@@ -181,6 +182,7 @@ popd
 %if %vnc
 %patch39 -p1
 %patch40 -p1
+%patch43 -p0
 chmod 755 hw/vnc/symlink-vnc.sh
 %endif
 %patch41 -p1
@@ -525,6 +527,15 @@ exit 0
 /usr/bin/Xvnc
 %endif
 %changelog
+* Tue Oct 23 2007 - sndirsch@suse.de
+- xorg-server-1.4-vnc-64bit.diff
+  * fixes segfault on 64bit during Xserver start; make sure to
+  define _XSERVER64 by having HAVE_DIX_CONFIG_H defined and
+  therefore including dix-config.h, so Atom is CARD32 instead of
+  unsigned long before and no longer messes up the pInfo structure
+  in xf86rfbMouseInit/xf86rfbKeybInit
+- finally enabled build of xf4vnc (standalone Xvnc and VNC Xserver
+  module)
 * Fri Oct 19 2007 - sndirsch@suse.de
 - updated xf4vnc patch; still disabled due to problematic vnc module
 * Tue Oct 09 2007 - sndirsch@suse.de