From 50b05245279de83be4ff6d8d1869a5765214cadf70616d6e8088063ade7e948c Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 28 Apr 2014 01:06:02 +0000 Subject: [PATCH] Accepting request 231613 from home:StefanBruens:branches:X11:XOrg fix compilation for 12.3 OBS-URL: https://build.opensuse.org/request/show/231613 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=510 --- N_fix_XWAYLAND_SCANNER_undefined.diff | 12 ++++++++++++ xorg-x11-server.changes | 5 +++++ xorg-x11-server.spec | 2 ++ 3 files changed, 19 insertions(+) create mode 100644 N_fix_XWAYLAND_SCANNER_undefined.diff diff --git a/N_fix_XWAYLAND_SCANNER_undefined.diff b/N_fix_XWAYLAND_SCANNER_undefined.diff new file mode 100644 index 0000000..ba1fe70 --- /dev/null +++ b/N_fix_XWAYLAND_SCANNER_undefined.diff @@ -0,0 +1,12 @@ +--- configure.ac_orig 2014-04-28 01:51:17.419311470 +0200 ++++ configure.ac 2014-04-28 01:52:25.842088562 +0200 +@@ -2458,7 +2458,8 @@ + XWAYLAND_SYS_LIBS="$XWAYLANDMODULES_LIBS $GLX_SYS_LIBS" + AC_SUBST([XWAYLAND_LIBS]) + AC_SUBST([XWAYLAND_SYS_LIBS]) +- WAYLAND_SCANNER_RULES(['$(top_srcdir)/hw/xwayland']) ++ m4_ifdef([WAYLAND_SCANNER_RULES], ++ [WAYLAND_SCANNER_RULES(['$(top_srcdir)/hw/xwayland'])]) + fi + + diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index bc531c1..2003aa7 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Apr 27 23:55:29 UTC 2014 - stefan.bruens@rwth-aachen.de + +- handle undefined XWAYLAND_SCANNER_RULES in configure + ------------------------------------------------------------------- Fri Apr 25 01:36:46 UTC 2014 - tobias.johannes.klausmann@mni.thm.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index f048725..8e36df3 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -137,6 +137,7 @@ Patch2: N_zap_warning_xserver.diff Patch3: N_driver-autoconfig.diff Patch4: N_fix_fglrx_screendepth_issue.patch Patch6: N_fix-dpi-values.diff +Patch7: N_fix_XWAYLAND_SCANNER_undefined.diff Patch100: u_fbdevhw.diff Patch101: u_confine_to_shape.diff @@ -214,6 +215,7 @@ cp %{SOURCE90} . %patch3 -p0 %patch4 -p0 %patch6 -p0 +%patch7 -p0 # %patch100 %patch101