diff options
| author | Andraž 'ruskie' Levstik | 2009-01-26 20:18:14 +0000 |
|---|---|---|
| committer | Andraž 'ruskie' Levstik | 2009-01-26 20:18:14 +0000 |
| commit | 2e44a0c7f286ba7544b19c6c12587f2d2fb0ecb1 (patch) | |
| tree | 1f58f61cd4bb9dc39845bf6a7d53b86d98c793e3 /xorg-util | |
| parent | f1bd737201e0c66432f576bf354f62f33cc27257 (diff) | |
xorg-cf-files: fixes for Xaw without Xp
Diffstat (limited to 'xorg-util')
| -rw-r--r-- | xorg-util/xorg-cf-files/05_xaw_without_xp.diff | 27 | ||||
| -rwxr-xr-x | xorg-util/xorg-cf-files/DETAILS | 1 | ||||
| -rw-r--r-- | xorg-util/xorg-cf-files/HISTORY | 6 | ||||
| -rwxr-xr-x | xorg-util/xorg-cf-files/PRE_BUILD | 1 |
4 files changed, 35 insertions, 0 deletions
diff --git a/xorg-util/xorg-cf-files/05_xaw_without_xp.diff b/xorg-util/xorg-cf-files/05_xaw_without_xp.diff new file mode 100644 index 0000000000..d327c456e6 --- /dev/null +++ b/xorg-util/xorg-cf-files/05_xaw_without_xp.diff @@ -0,0 +1,27 @@ +--- + xorg-cf-files/FreeBSD.cf | 10 ++++++++++ + xorg-cf-files/gnu.cf | 10 ++++++++++ + xorg-cf-files/linux.cf | 10 ++++++++++ + 3 files changed, 30 insertions(+) + +Index: xutils-dev/xorg-cf-files/linux.cf +=================================================================== +--- xutils-dev.orig/xorg-cf-files/linux.cf 2008-06-01 18:36:51.000000000 +0200 ++++ xutils-dev/xorg-cf-files/linux.cf 2008-06-01 18:36:51.000000000 +0200 +@@ -1153,6 +1153,16 @@ + #define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB) + #define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB) + ++#ifndef ExtraXawClientLibs ++# define ExtraXawClientLibs /**/ ++#endif ++#ifndef ExtraXawClientDepLibs ++# define ExtraXawClientDepLibs /**/ ++#endif ++#ifndef ExtraXawReqs ++# define ExtraXawReqs /**/ ++#endif ++ + #if HaveLib64 + # ifndef LibDirName + # define LibDirName lib64 diff --git a/xorg-util/xorg-cf-files/DETAILS b/xorg-util/xorg-cf-files/DETAILS index 766f0fd09e..e0357b3976 100755 --- a/xorg-util/xorg-cf-files/DETAILS +++ b/xorg-util/xorg-cf-files/DETAILS @@ -9,6 +9,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION} WEB_SITE=http://xorg.freedesktop.org ENTERED=20051125 LICENSE[0]=XCL + PATCHLEVEL=1 SHORT="host.def files for X window" cat << EOF host.def files for X window. diff --git a/xorg-util/xorg-cf-files/HISTORY b/xorg-util/xorg-cf-files/HISTORY index 99af86b14f..2f961bdde5 100644 --- a/xorg-util/xorg-cf-files/HISTORY +++ b/xorg-util/xorg-cf-files/HISTORY @@ -1,3 +1,9 @@ +2009-01-26 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> + * PRE_BUILD: patch added + * 05_xaw_without_xp.diff: debian patch to fix: + http://www.mail-archive.com/blfs-dev@linuxfromscratch.org/msg08933.html + * DETAILS: patchlevel++ + 2008-03-17 Eric Sandall <sandalle@sourcemage.org> * CONFLICTS: Auto-conflicts with xorg as well diff --git a/xorg-util/xorg-cf-files/PRE_BUILD b/xorg-util/xorg-cf-files/PRE_BUILD index 75fb56a474..2a50af8da8 100755 --- a/xorg-util/xorg-cf-files/PRE_BUILD +++ b/xorg-util/xorg-cf-files/PRE_BUILD @@ -1,4 +1,5 @@ default_pre_build && cd $SOURCE_DIRECTORY && patch -Np0 < "$SCRIPT_DIRECTORY/lib64.patch" && +patch -p2 < $SPELL_DIRECTORY/05_xaw_without_xp.diff && sedit "s:/X11R6::" $SOURCE_DIRECTORY/site.def |