summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorManuel Teira <manuel.teira@telefonica.net>2008-02-09 22:23:44 +0000
committerManuel Teira <manuel.teira@telefonica.net>2008-02-09 22:23:44 +0000
commit6f1077b05000cf74216fc3a28d1c22f6cb7bd2fb (patch)
treeeb704ce70c076b2559db9955cae7b0bb9c98ec54 /packages
parent5d07910edb4b790a83c06164dc9bc1e426fc4079 (diff)
xserver-kdrive-imagen 1.2.0: Fixed include order in picturestr.h to
allow compilation against renderproto 0.9.3
Diffstat (limited to 'packages')
-rw-r--r--packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb3
-rw-r--r--packages/xorg-xserver/xserver-kdrive/fix-picturestr-include-order.patch15
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 {