summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2004-07-20 06:39:08 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2004-07-20 06:39:08 +0000
commitff166dc1f2cc7904962c011dac45ede6cf9e23af (patch)
tree55b3d0bc2f0234c217c2af098fec234b98fb6391 /x11-base/xorg-x11
parentAdded to ~amd64 (Manifest recommit) (diff)
downloadgentoo-2-ff166dc1f2cc7904962c011dac45ede6cf9e23af.tar.gz
gentoo-2-ff166dc1f2cc7904962c011dac45ede6cf9e23af.tar.bz2
gentoo-2-ff166dc1f2cc7904962c011dac45ede6cf9e23af.zip
Remove commented-out 'HasMotif YES' #define (#57271). Part of what patch 9385 was intended to fix was actually committed post-6.7.0, so it wasn't here to start with. If anyone requests motif support, we'll look into some sort of conditional enabling, probably similar to pam's, to avoid circular dependencies.
Diffstat (limited to 'x11-base/xorg-x11')
-rw-r--r--x11-base/xorg-x11/ChangeLog10
-rw-r--r--x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild13
2 files changed, 10 insertions, 13 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index ca3e287861ca..f95332de169f 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for x11-base/xorg-x11
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.80 2004/07/19 18:09:13 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.81 2004/07/20 06:39:08 spyderous Exp $
+
+ 20 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>;
+ xorg-x11-6.7.0-r2.ebuild:
+ Remove commented-out 'HasMotif YES' #define (#57271). Part of what patch 9385
+ was intended to fix was actually committed post-6.7.0, so it wasn't here to
+ start with. If anyone requests motif support, we'll look into some sort of
+ conditional enabling, probably similar to pam's, to avoid circular
+ dependencies.
19 Jul 2004; Martin Schlemmer <azarah@gentoo.org> xorg-x11-6.7.0-r2.ebuild:
Enabling Motif by default is is bogus, as XFree86/XOrg-X11 have never been
diff --git a/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild
index ac666e053eeb..4f7c03abb000 100644
--- a/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild,v 1.6 2004/07/19 18:09:13 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r2.ebuild,v 1.7 2004/07/20 06:39:08 spyderous Exp $
# Libraries which are now supplied in shared form that were not in the past
# include: libFS.so, libGLw.so, libI810XvMC.so, libXRes.so, libXfontcache.so,
@@ -191,17 +191,6 @@ host_def_setup() {
#echo "#define SharedLibraryLoadFlags -shared -Wl,-z,defs" \
# >> config/cf/host.def
- # 9385_all_6.7.0-motif-allow-fhs-and-default-off.patch from upstream
- # turns off HasMotif YES default on Linux and BSDs, so we need this
-#
-# This is bogus, as XFree86/XOrg-X11 have never been built against Motif, and
-# above patch do not enable/disable it, but just add some more bits _if_ and
-# _only_if_ its enabled ...
-#
-# http://bugs.gentoo.org/show_bug.cgi?id=57271#c21
-#
-# echo "#define HasMotif YES" >> config/cf/host.def
-
# Enable i810 on x86_64 (RH #126687)
echo "#define XF86ExtraCardDrivers i810" >> config/cf/host.def