diff options
| author | Brice Goglin <bgoglin@debian.org> | 2008-06-01 19:22:59 +0200 |
|---|---|---|
| committer | Brice Goglin <bgoglin@debian.org> | 2008-06-01 19:22:59 +0200 |
| commit | e1b811bfbb6c43a7554888dafad1f5dcf769ec2e (patch) | |
| tree | 018fb1e8df5d09e39491e5955184a515e8e9e18d | |
| parent | 1cbb72d02dac31cd0b6067803677a220308a9605 (diff) | |
| download | xutils-dev-e1b811bfbb6c43a7554888dafad1f5dcf769ec2e.tar.gz | |
Extend 05_xaw_without_xp.diff to disable Xp from Xaw on hurd-i386
and try to disable it for kfreebsd-i386 as well.
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/patches/05_xaw_without_xp.diff | 52 |
2 files changed, 58 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index d9429d7..0221046 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xutils-dev (1:7.4+2) UNRELEASED; urgency=low + + * Extend 05_xaw_without_xp.diff to disable Xp from Xaw on hurd-i386 + and try to disable it for kfreebsd-i386 as well. + Thanks Samuel Thibault, closes: #483093. + + -- Brice Goglin <bgoglin@debian.org> Sun, 01 Jun 2008 19:21:31 +0200 + xutils-dev (1:7.4+1) unstable; urgency=low [ Timo Aaltonen ] diff --git a/debian/patches/05_xaw_without_xp.diff b/debian/patches/05_xaw_without_xp.diff index 441bb73..34e3801 100644 --- a/debian/patches/05_xaw_without_xp.diff +++ b/debian/patches/05_xaw_without_xp.diff @@ -1,7 +1,13 @@ +--- + 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 2006-04-18 14:09:37.000000000 -0700 -+++ xutils-dev/xorg-cf-files/linux.cf 2006-04-18 14:33:56.000000000 -0700 +--- 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) @@ -19,3 +25,45 @@ Index: xutils-dev/xorg-cf-files/linux.cf #if HaveLib64 # ifndef LibDirName # define LibDirName lib64 +Index: xutils-dev/xorg-cf-files/gnu.cf +=================================================================== +--- xutils-dev.orig/xorg-cf-files/gnu.cf 2008-06-01 18:36:51.000000000 +0200 ++++ xutils-dev/xorg-cf-files/gnu.cf 2008-06-01 18:36:51.000000000 +0200 +@@ -541,6 +541,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 ++ + #ifndef BuildDmx + #define BuildDmx YES + #endif +Index: xutils-dev/xorg-cf-files/FreeBSD.cf +=================================================================== +--- xutils-dev.orig/xorg-cf-files/FreeBSD.cf 2008-06-01 18:43:49.000000000 +0200 ++++ xutils-dev/xorg-cf-files/FreeBSD.cf 2008-06-01 18:44:03.000000000 +0200 +@@ -570,6 +570,16 @@ + #endif + #endif + ++#ifndef ExtraXawClientLibs ++# define ExtraXawClientLibs /**/ ++#endif ++#ifndef ExtraXawClientDepLibs ++# define ExtraXawClientDepLibs /**/ ++#endif ++#ifndef ExtraXawReqs ++# define ExtraXawReqs /**/ ++#endif ++ + /* + * A hack to work around an optimization problem with gcc 2.95.2 - 2.95.4 + */ |