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
This commit is contained in:
Stefan Dirsch 2014-04-28 01:06:02 +00:00 committed by Git OBS Bridge
parent 9141005c33
commit 50b0524527
3 changed files with 19 additions and 0 deletions

View File

@ -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

View File

@ -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

View File

@ -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