Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at 2013-11-26 06:16:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old) and /work/SRC/openSUSE:Factory/.xorg-x11-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xorg-x11-server" Changes: -------- --- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes 2013-11-06 11:02:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xorg-x11-server.new/xorg-x11-server.changes 2013-11-26 06:16:08.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 6 16:12:38 UTC 2013 - [email protected] + +- N_x86emu-include-order.patch: Change include order to avoid conflict + with system header, remove duplicate definitions + +------------------------------------------------------------------- New: ---- N_x86emu-include-order.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.Tiz6Cv/_old 2013-11-26 06:16:09.000000000 +0100 +++ /var/tmp/diff_new_pack.Tiz6Cv/_new 2013-11-26 06:16:09.000000000 +0100 @@ -149,6 +149,8 @@ Patch213: N_xorg-server-xdmcp.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch222: N_sync-fix.patch +# PATCH-FIX-UPSTREAM N_x86emu-include-order.patch [email protected] -- Change include order to avoid conflict with system header, remove duplicate definitions +Patch223: N_x86emu-include-order.patch Patch226: u_vgaHW-no-legacy.patch Patch228: u_aarch64-support.patch @@ -243,6 +245,7 @@ %patch213 -p1 ### patch222 might not be applicable anymore #%patch222 -p1 +%patch223 -p1 %patch226 -p0 %patch228 -p1 %patch229 -p1 ++++++ N_x86emu-include-order.patch ++++++ Subject: [PATCH] Change include order to avoid conflict with system header From: Andreas Schwab <[email protected]> R_SP is also defined in <sys/ucontext.h> on m68k. Also remove duplicate definitions. Signed-off-by: Andreas Schwab <[email protected]> Index: xorg-server-1.14.3/hw/xfree86/int10/xf86x86emu.c =================================================================== --- xorg-server-1.14.3.orig/hw/xfree86/int10/xf86x86emu.c +++ xorg-server-1.14.3/hw/xfree86/int10/xf86x86emu.c @@ -7,7 +7,6 @@ #include <xorg-config.h> #endif -#include <x86emu.h> #include "xf86.h" #include "compiler.h" #include "xf86_OSproc.h" @@ -15,6 +14,7 @@ #define _INT10_PRIVATE #include "xf86int10.h" #include "int10Defines.h" +#include <x86emu.h> #define M _X86EMU_env Index: xorg-server-1.14.3/hw/xfree86/x86emu/x86emu/regs.h =================================================================== --- xorg-server-1.14.3.orig/hw/xfree86/x86emu/x86emu/regs.h +++ xorg-server-1.14.3/hw/xfree86/x86emu/x86emu/regs.h @@ -147,14 +147,6 @@ struct i386_segment_regs { #define R_FLG spc.FLAGS /* special registers */ -#define R_SP spc.SP.I16_reg.x_reg -#define R_BP spc.BP.I16_reg.x_reg -#define R_SI spc.SI.I16_reg.x_reg -#define R_DI spc.DI.I16_reg.x_reg -#define R_IP spc.IP.I16_reg.x_reg -#define R_FLG spc.FLAGS - -/* special registers */ #define R_ESP spc.SP.I32_reg.e_reg #define R_EBP spc.BP.I32_reg.e_reg #define R_ESI spc.SI.I32_reg.e_reg -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
