fs: fix header inclusions and bump PR

diff --git a/recipes/fs/files/fontsproto.patch b/recipes/fs/files/fontsproto.patch
new file mode 100644 (file)
index 0000000..1032b48
--- /dev/null
+++ b/recipes/fs/files/fontsproto.patch
@@ -0,0 +1,27 @@
+Index: FS/FSlibint.h
+===================================================================
+--- FS.orig/FSlibint.h 2011-02-25 22:34:43.884558121 +0100
++++ FS/FSlibint.h      2011-02-25 22:35:15.230223119 +0100
+@@ -72,8 +72,8 @@
+ #endif /* USG */
+ 
+ #include      "FSlib.h"
+-#include      "FSproto.h"
+ #include      "FSlibos.h"
++#include      <X11/fonts/FSproto.h>
+ #include      <errno.h>
+ #include      <stddef.h>
+ 
+Index: FS/configure.ac
+===================================================================
+--- FS.orig/configure.ac       2011-02-25 22:35:23.977928121 +0100
++++ FS/configure.ac    2011-02-25 22:35:39.622413120 +0100
+@@ -19,7 +19,7 @@
+ AC_PROG_CC
+ 
+ # Checks for pkg-config packages
+-PKG_CHECK_MODULES(FS, xfont xtrans)
++PKG_CHECK_MODULES(FS, xfont xtrans fontsproto)
+ 
+ # Checks for libraries.
+ 

diff --git a/recipes/fs/files/xtrans.patch b/recipes/fs/files/xtrans.patch
new file mode 100644 (file)
index 0000000..e628a26
--- /dev/null
+++ b/recipes/fs/files/xtrans.patch
@@ -0,0 +1,21 @@
+Index: FS/fs_trans.h
+===================================================================
+--- FS.orig/fs_trans.h 2011-02-25 23:00:34.025908119 +0100
++++ FS/fs_trans.h      2011-02-25 23:01:19.165133120 +0100
+@@ -24,4 +24,4 @@
+ 
+ #define FS_t
+ #define TRANS_CLIENT
+-#include <Xtrans.h>
++#include <X11/Xtrans/Xtrans.h>
+Index: FS/fs_trans.c
+===================================================================
+--- FS.orig/fs_trans.c 2011-02-25 23:08:51.177693119 +0100
++++ FS/fs_trans.c      2011-02-25 23:09:00.378958118 +0100
+@@ -28,5 +28,5 @@
+ 
+ #define FS_t
+ #define TRANS_CLIENT
+-#include <transport.c>
++#include <X11/Xtrans/transport.c>
+ 

diff --git a/recipes/fs/fs_cvs.bb b/recipes/fs/fs_cvs.bb
index 9dcba57..b4baee6 100644 (file)
--- a/recipes/fs/fs_cvs.bb
+++ b/recipes/fs/fs_cvs.bb
@@ -4,7 +4,13 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "libxfont xtrans"
 
-SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=FS"
+PR = "r1"
+
+SRC_URI = "${FREEDESKTOP_CVS}/xlibs;module=FS \
+           file://fontsproto.patch \
+           file://xtrans.patch \
+          "
+
 S = "${WORKDIR}/FS"
 
 inherit autotools pkgconfig