Hello community,
here is the log from the commit of package xorg-x11-server
checked in at Sat Jul 5 02:00:27 CEST 2008.
--------
--- xorg-x11-server/xorg-x11-server.changes 2008-06-13 15:31:23.000000000 +0200
+++ xorg-x11-server/xorg-x11-server.changes 2008-07-04 22:37:05.283427000 +0200
@@ -1,0 +2,36 @@
+Fri Jul 4 22:29:06 CEST 2008 - sndirsch@suse.de
+
+- xorg-server-1.4.99.905
+ * obsolete patches
+ - XAANoOffscreenPixmaps.diff
+ - bug227111-ddc_screensize.diff
+ - commit-184e571.diff
+ - commit-29e0e18.diff
+ - commit-c6c284e.diff
+ - commit-f7dd0c7.diff
+ - commit-fa19e84.diff
+ - commit-feac075.diff
+ - glx-align.patch
+ - mfb_without_xorg.diff
+ - p_ValidatePci.diff
+ - p_vga-crashfix.diff
+ - xkb_action.diff
+ - xorg-server.diff
+ - xprint.diff
+ - xserver-mode-fuzzy-check.diff
+ * new patches
+ - 64bit-portability-issue.diff
+ - no-return-in-nonvoid-function.diff
+ * adjusted patches
+ - bitmap_always_unscaled.diff
+ - disable-root-xorg_conf.diff
+ - p_ppc_domain_workaround.diff
+ - pixman.diff
+ - ps_showopts.diff
+ - xorg-server-1.4-vnc.patch
+ - bug-197858_dpms.diff
+- Mesa sources no longer required for xorg-server 1.5
+- VNC patches + build disabled for now
+- disabled some IA64 patches for now
+
+-------------------------------------------------------------------
Old:
----
bug227111-ddc_screensize.diff
commit-184e571.diff
commit-29e0e18.diff
commit-c6c284e.diff
commit-f7dd0c7.diff
commit-fa19e84.diff
commit-feac075.diff
glx-align.patch
ia64Pci.h
MesaLib-7.0.3.tar.bz2
mfb_without_xorg.diff
p_ValidatePci.diff
p_vga-crashfix.diff
XAANoOffscreenPixmaps.diff
xkb_action.diff
xorg-server-1.4.2.tar.bz2
xorg-server.diff
xprint.diff
xserver-mode-fuzzy-check.diff
New:
----
64bit-portability-issue.diff
no-return-in-nonvoid-function.diff
xorg-server-1.4.99.905.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-server.spec ++++++
--- /var/tmp/diff_new_pack.P32604/_old 2008-07-05 01:57:00.000000000 +0200
+++ /var/tmp/diff_new_pack.P32604/_new 2008-07-05 01:57:00.000000000 +0200
@@ -12,17 +12,18 @@
Name: xorg-x11-server
-%define dirsuffix 1.4.2
+%define dirsuffix 1.4.99.905
%define fglrx_driver_hack 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
+### FIXME
+%define vnc 0
+BuildRequires: Mesa-devel bison flex fontconfig-devel freetype2-devel ghostscript-library libdrm-devel libopenssl-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
%endif
Url: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0
Version: 7.3
-Release: 112
+Release: 114
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -36,7 +37,6 @@
Obsoletes: xorg-x11-server-glx
Summary: X.Org Server
Source: xorg-server-%{dirsuffix}.tar.bz2
-Source1: MesaLib-7.0.3.tar.bz2
Source3: README.updates
Source4: xorgcfg.tar.bz2
%if %suse_version > 1010
@@ -44,17 +44,12 @@
%endif
Source7: xorg-docs-1.4.tar.bz2
Source8: xorg.conf.man-070818.tar
-Source9: ia64Pci.h
Patch: 64bit.diff
Patch1: fpic.diff
Patch2: p_default-module-path.diff
-Patch3: p_ValidatePci.diff
-Patch4: xprint.diff
-Patch5: xorg-server.diff
Patch6: pu_fixes.diff
Patch7: p_mouse_misc.diff
Patch8: p_bug96328.diff
-Patch9: p_vga-crashfix.diff
Patch11: ps_showopts.diff
Patch12: p_xf86Mode.diff
Patch13: p_xorg_acpi.diff
@@ -63,7 +58,6 @@
Patch18: p_ia64-console.diff
Patch22: disable-root-xorg_conf.diff
Patch23: disable-fbblt-opt.diff
-Patch25: glx-align.patch
Patch27: mouse.diff
Patch29: xephyr.diff
Patch30: p_ppc_domain_workaround.diff
@@ -78,23 +72,14 @@
Patch43: xorg-server-1.4-vnc-64bit.diff
%endif
Patch41: loadmod-bug197195.diff
-Patch42: bug227111-ddc_screensize.diff
Patch45: bug-197858_dpms.diff
Patch63: xorg-x11-server-1.2.99-unbreak-domain.patch
Patch67: xorg-docs.diff
-Patch69: xserver-mode-fuzzy-check.diff
Patch72: randr12-8d230319040f0a7f72231da2bf5ec97dc3612e21.diff
Patch77: fbdevhw.diff
Patch79: edit_data_sanity_check.diff
Patch83: ia64linuxPciInit.diff
-Patch84: commit-feac075.diff
-Patch85: commit-29e0e18.diff
-Patch86: mfb_without_xorg.diff
-Patch87: commit-c6c284e.diff
Patch88: commit-f6401f9.diff
-Patch89: commit-184e571.diff
-Patch90: commit-fa19e84.diff
-Patch91: commit-f7dd0c7.diff
Patch93: pixman.diff
Patch99: commit-50e80c3.diff
Patch101: zap_warning_xserver.diff
@@ -102,12 +87,12 @@
Patch103: confine_to_shape.diff
Patch104: bitmap_always_unscaled.diff
Patch106: randr1_1-sig11.diff
-Patch107: XAANoOffscreenPixmaps.diff
-Patch108: xkb_action.diff
Patch109: events.diff
Patch110: xorg-server-1.4-vnc-disable_render.diff
Patch111: xorg-server-1.4-vnc-render_sig11.diff
Patch112: fix-dpi-values.diff
+Patch113: no-return-in-nonvoid-function.diff
+Patch114: 64bit-portability-issue.diff
%description
This package contains the X.Org Server.
@@ -168,26 +153,13 @@
%endif
%prep
-%setup -q -n xorg-server-%{dirsuffix} -b1 -a4 -a7 -a8
-test -s hw/xfree86/os-support/shared/ia64Pci.h || \
- cp $RPM_SOURCE_DIR/ia64Pci.h hw/xfree86/os-support/shared/ia64Pci.h
-# make legal department happy (Bug #204110)
-test -f ../Mesa-7.0.3/src/mesa/drivers/directfb/idirectfbgl_mesa.c && exit 1
-test -f ../Mesa-7.0.3/progs/ggi/asc-view.c && exit 1
-# remove wrongly prebuilt files (Bug #328201)
-mv hw/xfree86/xf1bpp/mfbmodule.c .
-rm hw/xfree86/xf1bpp/*.c
-mv mfbmodule.c hw/xfree86/xf1bpp
+%setup -q -n xorg-server-%{dirsuffix} -a4 -a7 -a8
%patch
%patch1
%patch2
-%patch3
-%patch4
-%patch5
%patch6
%patch7 -p2
%patch8 -p0
-%patch9 -p2
%patch11
#%patch12 -p2
%patch13
@@ -198,13 +170,13 @@
popd
%patch22
%patch23
-%patch25 -p1
%patch27
%patch29
### Bug 197572: X.Org PCI/IA64 patches
%patch30
%patch32 -p1
-%patch34 -p0
+### FIXME
+#%patch34 -p0
%patch36 -p0
%if %vnc
%patch39 -p1
@@ -217,35 +189,28 @@
chmod 755 hw/vnc/symlink-vnc.sh
%endif
%patch41 -p1
-%patch42 -p0
%patch45 -p0
-%patch63 -p1
+### FIXME
+#%patch63 -p1
pushd xorg-docs-*
%patch67
popd
-%patch69 -p1
%patch72 -p1
%patch77
%patch79 -p1
-%patch83
-%patch84 -p1
-%patch85 -p1
-%patch86 -p0
-%patch87 -p1
+### FIXME
+#%patch83
%patch88 -p1
-%patch89 -p1
-%patch90 -p1
-%patch91 -p1
%patch93
%patch99 -p1
%patch101 -p1
%patch103
%patch104 -p1
%patch106 -p1
-%patch107 -p0
-%patch108 -p1
%patch109 -p1
%patch112 -p0
+%patch113 -p0
+%patch114 -p0
%build
pushd xorg-docs-*
@@ -255,6 +220,8 @@
make
popd
autoreconf -fi
+# DRI2 disabled for Xserver 1.5 as libdrm 2.3.1 doesn't have the
+# drmBO functionality.
./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
%if %fglrx_driver_hack
--with-release-major=7 \
@@ -295,9 +262,9 @@
%ifarch s390 s390x
--disable-dri \
--disable-xorg \
- --enable-mfb \
%else
--enable-dri \
+ --disable-dri2 \
--enable-xorg \
%endif
--enable-dmx \
@@ -311,7 +278,6 @@
--with-log-dir="/var/log" \
--with-os-name="openSUSE" \
--with-os-vendor="SUSE LINUX" \
- --with-mesa-source=$RPM_BUILD_DIR/Mesa-7.0.3 \
--with-fontdir="/usr/share/fonts" \
--with-xkb-path="/usr/share/X11/xkb" \
--with-xkb-output="/var/lib/xkb/compiled"
@@ -365,12 +331,17 @@
rm $RPM_BUILD_ROOT/mfb.h
%endif
%endif
+%if %vnc
mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services
cat > $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/%{name} << EOF
## Name: VNC Server
## Description: Opens ports for VNC Server
TCP="5801 5901"
EOF
+%endif
+%ifarch s390 s390x
+rm $RPM_BUILD_ROOT/usr/%{_lib}/pkgconfig/*.pc
+%endif
%clean
rm -rf "$RPM_BUILD_ROOT"
@@ -469,8 +440,8 @@
%dir /etc/modprobe.d
/etc/modprobe.d/nvidia
%endif
-%ifnarch s390 s390x
%dir /usr/%{_lib}/xorg
+%ifnarch s390 s390x
%dir /var/X11R6/bin
%endif
%dir /var/lib/xkb
@@ -508,8 +479,6 @@
/usr/bin/outb
/usr/bin/outl
/usr/bin/outw
-/usr/bin/pcitweak
-/usr/bin/scanpci
%endif
/usr/bin/vdltodmx
/usr/bin/xdmx
@@ -520,13 +489,14 @@
/usr/%{_lib}/xorg/modules/
%{_mandir}/man4/*
%endif
-/usr/%{_lib}/pkgconfig/*.pc
-/usr/%{_lib}/xserver/
+/usr/%{_lib}/xorg/protocol.txt
%{_mandir}/man1/*
%exclude %{_mandir}/man1/Xdmx.1*
%exclude %{_mandir}/man1/Xnest.1*
%exclude %{_mandir}/man1/Xvfb.1*
+%ifnarch s390 s390x
%{_mandir}/man5/*
+%endif
%{_mandir}/man7/*
%ifnarch s390 s390x
/var/X11R6/bin/X
@@ -548,6 +518,7 @@
%defattr(-,root,root)
/usr/include/xorg/
/usr/%{_lib}/*.a
+/usr/%{_lib}/pkgconfig/*.pc
/usr/share/aclocal/*.m4
%endif
%if %vnc
@@ -559,6 +530,39 @@
%endif
%changelog
+* Sat Jul 05 2008 sndirsch@suse.de
+- xorg-server-1.4.99.905
+ * obsolete patches
+ - XAANoOffscreenPixmaps.diff
+ - bug227111-ddc_screensize.diff
+ - commit-184e571.diff
+ - commit-29e0e18.diff
+ - commit-c6c284e.diff
+ - commit-f7dd0c7.diff
+ - commit-fa19e84.diff
+ - commit-feac075.diff
+ - glx-align.patch
+ - mfb_without_xorg.diff
+ - p_ValidatePci.diff
+ - p_vga-crashfix.diff
+ - xkb_action.diff
+ - xorg-server.diff
+ - xprint.diff
+ - xserver-mode-fuzzy-check.diff
+ * new patches
+ - 64bit-portability-issue.diff
+ - no-return-in-nonvoid-function.diff
+ * adjusted patches
+ - bitmap_always_unscaled.diff
+ - disable-root-xorg_conf.diff
+ - p_ppc_domain_workaround.diff
+ - pixman.diff
+ - ps_showopts.diff
+ - xorg-server-1.4-vnc.patch
+ - bug-197858_dpms.diff
+- Mesa sources no longer required for xorg-server 1.5
+- VNC patches + build disabled for now
+- disabled some IA64 patches for now
* Fri Jun 13 2008 sndirsch@suse.de
- xorg-x11-Xvnc: added meta file for SuSEfirewall2 (bnc #398855)
* Wed Jun 11 2008 sndirsch@suse.de
++++++ 64bit-portability-issue.diff ++++++
--- composite/compinit.c.orig 2008-06-27 19:54:41.000000000 +0000
+++ composite/compinit.c 2008-06-27 20:10:45.000000000 +0000
@@ -122,11 +122,11 @@
if (ret && (mask & CWBackingStore)) {
if (pWin->backingStore != NotUseful) {
compRedirectWindow(serverClient, pWin, CompositeRedirectAutomatic);
- pWin->backStorage = TRUE;
+ pWin->backStorage = (pointer) TRUE;
} else {
compUnredirectWindow(serverClient, pWin,
CompositeRedirectAutomatic);
- pWin->backStorage = FALSE;
+ pWin->backStorage = (pointer) FALSE;
}
}
++++++ bitmap_always_unscaled.diff ++++++
--- /var/tmp/diff_new_pack.P32604/_old 2008-07-05 01:57:00.000000000 +0200
+++ /var/tmp/diff_new_pack.P32604/_new 2008-07-05 01:57:00.000000000 +0200
@@ -42,20 +42,20 @@
-DMODULEPATH=\"$(DEFAULT_MODULE_PATH)\"
relink:
---- xorg-server-1.4.0.90/configure.ac.orig 2008-04-05 02:06:32.000000000 +0000
-+++ xorg-server-1.4.0.90/configure.ac 2008-04-05 02:12:34.000000000 +0000
-@@ -441,7 +441,7 @@
+--- xorg-server-1.4.99.902/configure.ac.orig 2008-06-16 19:17:48.000000000 +0200
++++ xorg-server-1.4.99.902/configure.ac 2008-06-16 19:24:06.000000000 +0200
+@@ -466,7 +466,7 @@
AC_ARG_WITH(fontdir, AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to top level dir where fonts are installed (default: ${libdir}/X11/fonts)]),
[ FONTDIR="$withval" ],
[ FONTDIR="${libdir}/X11/fonts" ])
-DEFAULT_FONT_PATH="${FONTDIR}/misc/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi/,${FONTDIR}/75dpi/"
+DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled"
- AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
- [ FONTPATH="$withval" ],
- [ FONTPATH="${DEFAULT_FONT_PATH}" ])
---- xorg-server-1.4.0.90/hw/xfree86/utils/xorgconfig/xorgconfig.c.orig 2007-12-07 02:38:42.000000000 +0000
-+++ xorg-server-1.4.0.90/hw/xfree86/utils/xorgconfig/xorgconfig.c 2008-04-05 02:14:06.000000000 +0000
-@@ -1920,15 +1920,13 @@
+ case $host_os in
+ darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
+ esac
+--- xorg-server-1.4.99.902/hw/xfree86/utils/xorgconfig/xorgconfig.c.orig 2008-04-10 20:58:01.000000000 +0200
++++ xorg-server-1.4.99.902/hw/xfree86/utils/xorgconfig/xorgconfig.c 2008-06-16 19:26:46.000000000 +0200
+@@ -1908,14 +1908,12 @@
{
/* " FontPath \"" TREEROOTFONT "/75dpi/\"\n"*/
"/local/",
@@ -63,7 +63,6 @@
+ "/misc/:unscaled",
"/75dpi/:unscaled",
"/100dpi/:unscaled",
- "/Speedo/",
"/Type1/",
"/TrueType/",
"/freefont/",
++++++ bug-197858_dpms.diff ++++++
--- /var/tmp/diff_new_pack.P32604/_old 2008-07-05 01:57:00.000000000 +0200
+++ /var/tmp/diff_new_pack.P32604/_new 2008-07-05 01:57:00.000000000 +0200
@@ -28,7 +28,7 @@
+#ifdef DPMSExtension
+ XFD_ANDSET(&tmp_set, &devicesReadable, &EnabledDevices);
+ if (XFD_ANYSET (&tmp_set) && (DPMSPowerLevel != DPMSModeOn))
-+ DPMSSet(DPMSModeOn);
++ DPMSSet(serverClient, DPMSModeOn);
+#endif
+
if (XFD_ANYSET (&devicesReadable) || XFD_ANYSET (&clientsReadable))
++++++ disable-root-xorg_conf.diff ++++++
--- /var/tmp/diff_new_pack.P32604/_old 2008-07-05 01:57:00.000000000 +0200
+++ /var/tmp/diff_new_pack.P32604/_new 2008-07-05 01:57:00.000000000 +0200
@@ -1,15 +1,3 @@
-diff -p -u -r ../xorg-server-1.1.99.3.orig/hw/xfree86/common/xf86Config.c ./hw/xfree86/common/xf86Config.c
---- ../xorg-server-1.1.99.3.orig/hw/xfree86/common/xf86Config.c 2006-07-30 09:52:06.000000000 +0200
-+++ ./hw/xfree86/common/xf86Config.c 2006-08-31 10:22:07.000000000 +0200
-@@ -98,7 +98,6 @@ extern DeviceAssocRec mouse_assoc;
- "/etc/X11/%R," "%P/etc/X11/%R," \
- "%E," "%F," \
- "/etc/X11/%F," "%P/etc/X11/%F," \
-- "%D/%X," \
- "/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \
- "%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \
- "%P/etc/X11/%X," \
-diff -p -u -r ../xorg-server-1.1.99.3.orig/hw/xfree86/doc/man/xorg.conf.man.pre ./hw/xfree86/doc/man/xorg.conf.man.pre
--- ../xorg-server-1.1.99.3.orig/hw/xfree86/doc/man/xorg.conf.man.pre 2006-07-20 22:27:48.000000000 +0200
+++ ./hw/xfree86/doc/man/xorg.conf.man.pre 2006-08-31 10:35:00.000000000 +0200
@@ -65,7 +65,6 @@ search locations are as follows:
@@ -32,63 +20,3 @@
.I <hostname>
is the machine's hostname as reported by gethostname(3).
.PP
-diff -p -u -r ../xorg-server-1.1.99.3.orig/hw/xfree86/parser/cpconfig.c ./hw/xfree86/parser/cpconfig.c
---- ../xorg-server-1.1.99.3.orig/hw/xfree86/parser/cpconfig.c 2006-07-22 01:12:40.000000000 +0200
-+++ ./hw/xfree86/parser/cpconfig.c 2006-08-31 10:24:48.000000000 +0200
-@@ -62,7 +62,7 @@ xrealloc (void *p, int size)
- #endif
-
- #define CONFPATH "%A,%R,/etc/X11/%R,%P/etc/X11/%R,%E,%F,/etc/X11/%F," \
-- "%P/etc/X11/%F,%D/%X,/etc/X11/%X,/etc/%X,%P/etc/X11/%X.%H," \
-+ "%P/etc/X11/%F,/etc/X11/%X,/etc/%X,%P/etc/X11/%X.%H," \
- "%P/etc/X11/%X,%P/lib/X11/%X.%H,%P/lib/X11/%X"
-
- int
-diff -p -u -r ../xorg-server-1.1.99.3.orig/hw/xfree86/parser/scan.c ./hw/xfree86/parser/scan.c
---- ../xorg-server-1.1.99.3.orig/hw/xfree86/parser/scan.c 2006-07-22 01:12:40.000000000 +0200
-+++ ./hw/xfree86/parser/scan.c 2006-08-31 10:24:19.000000000 +0200
-@@ -448,7 +448,6 @@ xf86pathIsSafe(const char *path)
- * %E config file environment ($XORGCONFIG) as an absolute path
- * %F config file environment ($XORGCONFIG) as a relative path
- * %G config file environment ($XORGCONFIG) as a safe path
-- * %D $HOME
- * %P projroot
- * %M major version number
- * %% %
-@@ -597,14 +596,6 @@ DoSubstitution(const char *template, con
- } else
- BAIL_OUT;
- break;
-- case 'D':
-- if (!home)
-- home = getenv("HOME");
-- if (home && xf86pathIsAbsolute(home))
-- APPEND_STR(home);
-- else
-- BAIL_OUT;
-- break;
- case 'P':
- if (projroot && xf86pathIsAbsolute(projroot))
- APPEND_STR(projroot);
-diff -p -u -r ../xorg-server-1.1.99.3.orig/hw/xfree86/utils/xorgcfg/config.h ./hw/xfree86/utils/xorgcfg/config.h
---- ../xorg-server-1.1.99.3.orig/hw/xfree86/utils/xorgcfg/config.h 2006-07-22 01:12:40.000000000 +0200
-+++ ./hw/xfree86/utils/xorgcfg/config.h 2006-08-31 10:22:56.000000000 +0200
-@@ -108,7 +108,6 @@ extern int config_mode;
- "/etc/X11/%R," "%P/etc/X11/%R," \
- "%E," "%F," \
- "/etc/X11/%F," "%P/etc/X11/%F," \
-- "%D/%X," \
- "/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \
- "%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \
- "%P/etc/X11/%X," \
-diff -p -u -r ../xorg-server-1.1.99.3.orig/hw/xwin/winconfig.c ./hw/xwin/winconfig.c
---- ../xorg-server-1.1.99.3.orig/hw/xwin/winconfig.c 2006-07-22 01:12:41.000000000 +0200
-+++ ./hw/xwin/winconfig.c 2006-08-31 10:22:29.000000000 +0200
-@@ -49,7 +49,6 @@
- "/etc/X11/%R," "%P/etc/X11/%R," \
- "%E," "%F," \
- "/etc/X11/%F," "%P/etc/X11/%F," \
-- "%D/%X," \
- "/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \
- "%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \
- "%P/etc/X11/%X," \
++++++ no-return-in-nonvoid-function.diff ++++++
--- hw/kdrive/src/kdrive.c.orig 2008-06-27 19:35:41.000000000 +0000
+++ hw/kdrive/src/kdrive.c 2008-06-27 19:40:53.000000000 +0000
@@ -1397,6 +1397,7 @@ KdInitOutput (ScreenInfo *pScreenInfo
int
DPMSSet(ClientPtr client, int level)
{
+ return 0;
}
int
++++++ pixman.diff ++++++
--- /var/tmp/diff_new_pack.P32604/_old 2008-07-05 01:57:01.000000000 +0200
+++ /var/tmp/diff_new_pack.P32604/_new 2008-07-05 01:57:01.000000000 +0200
@@ -1,9 +1,9 @@
--- include/miscstruct.h.orig 2007-11-30 22:14:17.372752750 +0100
+++ include/miscstruct.h 2007-11-30 22:14:59.483384500 +0100
@@ -51,7 +51,7 @@
+
#include "misc.h"
#include