From dcc9584b2bd329a41f856dbe6dcc826daee1dae5efe6cc0128c8787a4c263f52 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 28 Dec 2010 23:44:10 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/xorg-x11-server revision 190.0 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=4fc1f7a7bf222ddf24da94a748108eab --- xorg-x11-server.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index b5818fa..1f5f1ae 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -32,7 +32,7 @@ BuildRequires: libjpeg-devel %endif Url: http://xorg.freedesktop.org/ Version: 7.6_%{dirsuffix} -Release: 2 +Release: 1 License: GPLv2+ ; MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -80,7 +80,7 @@ Patch48: xorg-server-xf4vnc-fix.diff Patch49: xorg-server-xf4vnc-fixes_1_8.diff Patch50: xorg-server-xf4vnc-fixes_1_9.diff Patch51: xorg-server-xf4vnc-bug605015-vnc-umlauts.diff -Patch52: xorg-server-xf4vnc-fix-crash-on-193.diff +Patch52: xorg-server-xf4vnc-fix-crash-on-193.diff %endif Patch45: bug-197858_dpms.diff Patch67: xorg-docs.diff From d0747d5a6d785a08322c8c605e12c1123f09ce778b173bc452eca734d05a6700 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 3 Jan 2011 06:38:04 +0000 Subject: [PATCH 2/2] - use-last-screen.patch * adjusted the patch to no longer segfault the Xserver during startup immediately when there isn't any screen section specified at all (bnc #661989) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=320 --- use-last-screen.patch | 2 +- xorg-x11-server.changes | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/use-last-screen.patch b/use-last-screen.patch index b1aa046..b9c07ca 100644 --- a/use-last-screen.patch +++ b/use-last-screen.patch @@ -42,7 +42,7 @@ index 5800700..b2fc8e3 100644 } conf_screen = s; from = X_CMDLINE; -+ } else { ++ } else if (conf_screen) { + /* Use the last Screen in the list */ + s = conf_screen; + while (s->list.next) diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 8823ec3..bffba67 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jan 3 06:35:03 UTC 2011 - sndirsch@novell.com + +- use-last-screen.patch + * adjusted the patch to no longer segfault the Xserver during + startup immediately when there isn't any screen section + specified at all (bnc #661989) + ------------------------------------------------------------------- Mon Dec 27 22:41:54 UTC 2010 - sndirsch@novell.com