From 29469111691473f06633cccfc9c0c853281f28e9f44d749b321d320512f6aad8 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 8 Aug 2013 15:55:58 +0000 Subject: [PATCH] - removed N_vidmode-sig11.diff (fixed upstream already) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=452 --- N_vidmode-sig11.diff | 13 ------------- xorg-x11-server.changes | 5 +++++ xorg-x11-server.spec | 3 --- 3 files changed, 5 insertions(+), 16 deletions(-) delete mode 100644 N_vidmode-sig11.diff diff --git a/N_vidmode-sig11.diff b/N_vidmode-sig11.diff deleted file mode 100644 index 4266ee2..0000000 --- a/N_vidmode-sig11.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: hw/xfree86/common/xf86VidMode.c -=================================================================== ---- hw/xfree86/common/xf86VidMode.c.orig -+++ hw/xfree86/common/xf86VidMode.c -@@ -224,6 +224,8 @@ VidModeGetFirstModeline(int scrnIndex, p - return FALSE; - - pVidMode = VMPTR(pScrn->pScreen); -+ if (!pScrn->modes) -+ return FALSE; - pVidMode->First = pScrn->modes; - pVidMode->Next = pVidMode->First->next; - diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index fab982b..4746503 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 8 15:55:14 UTC 2013 - sndirsch@suse.com + +- removed N_vidmode-sig11.diff (fixed upstream already) + ------------------------------------------------------------------- Tue Jul 2 13:18:07 UTC 2013 - hrvoje.senjan@gmail.com diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index d619fd5..6637c97 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -149,8 +149,6 @@ Patch106: N_randr1_1-sig11.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch112: N_fix-dpi-values.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch123: N_vidmode-sig11.diff -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch125: N_0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch127: N_dpms_screensaver.diff @@ -281,7 +279,6 @@ cp %{SOURCE96} . %patch103 %patch106 -p1 %patch112 -p0 -%patch123 -p0 ### disabled for now #%patch125 -p1 %patch127 -p1