diff options
| author | Rod Whitby <rod@whitby.id.au> | 2008-02-10 00:09:59 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2008-02-10 00:09:59 +0000 |
| commit | 2b39dc8d708431b8316a7d0974a3e5c6a7bedec6 (patch) | |
| tree | 2cce9c97018e40dd36ef659b015216fb8ca10c1e | |
| parent | ceef3d9e48b5c6f02166ad6f2c9d5392a9801d74 (diff) | |
| parent | 6f1077b05000cf74216fc3a28d1c22f6cb7bd2fb (diff) | |
merge of 'a6109edcbd4aec5e8bb368261b02f11ccc0e0a62'
and 'db2b97c9756f9fee0b72ffe7725a8db0da899833'
| -rw-r--r-- | packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb | 3 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-kdrive/fix-picturestr-include-order.patch | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb index 26f8666076..622b32179d 100644 --- a/packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb +++ b/packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb @@ -7,7 +7,7 @@ DEPENDS += "libxkbfile libxcalibrate" PROVIDES = "virtual/xserver" PE = "1" -PR = "r3" +PR = "r4" FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-1.2.0:${FILE_DIRNAME}/xserver-kdrive" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ @@ -21,6 +21,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ file://kdrive-imageon.patch;patch=1 \ file://xcalibrate_coords.patch;patch=1 \ file://enable-builtin-fonts.patch;patch=1 \ + file://fix-picturestr-include-order.patch;patch=1 \ " S = "${WORKDIR}/xorg-server-${PV}" diff --git a/packages/xorg-xserver/xserver-kdrive/fix-picturestr-include-order.patch b/packages/xorg-xserver/xserver-kdrive/fix-picturestr-include-order.patch new file mode 100644 index 0000000000..3da235e1e1 --- /dev/null +++ b/packages/xorg-xserver/xserver-kdrive/fix-picturestr-include-order.patch @@ -0,0 +1,15 @@ +# Reverse include order in render/picturestr.h to be able to compile against renderproto >= 0.9.3 +Index: xorg-server-1.2.0/render/picturestr.h +=================================================================== +--- xorg-server-1.2.0.orig/render/picturestr.h 2008-02-09 22:54:46.000000000 +0100 ++++ xorg-server-1.2.0/render/picturestr.h 2008-02-09 22:54:50.000000000 +0100 +@@ -26,8 +26,8 @@ + #ifndef _PICTURESTR_H_ + #define _PICTURESTR_H_ + +-#include "glyphstr.h" + #include "scrnintstr.h" ++#include "glyphstr.h" + #include "resource.h" + + typedef struct _DirectFormat { |