-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Ferris McCormick wrote:
| 1. (Previously noted) A couple font directories (cyrillic, ukr) were
| never made into symbolic links before, and right now they must be
| removed by hand;
| 2. (Previously noted) A couple orphan symbolic links:
| a. /usr/include/X11/X11 --> ../X11R6/include/X11
| b. /usr/include/GL/GL --> ../X11R6/include/GL (I think; I removed it
| before writing this note.)
| 3. For some reason, /usr/include/GL/glu.h does not get installed (it is
| not in /var/tmp/portage/xorg-x11-6.8.1.903/image). With version
| 6.8.1.902, it is in the image directory and is installed. The problem
| seems to be that with ...903, nothing which started in
| /usr/X11R6/include/GL is installed, but only files from
| opengl/xorg-x11.
| So, for example, GL/glext.h is present (it is in both GL/include and
| in opengl/xorg-x11/include originally), but GL/glu.h is not installed
| because it is only in include/GL to begin with.
Try this patch.
Donnie
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
iD8DBQFCATW1XVaO67S1rtsRAkyoAJ9qYKcUv+3upp445OZAx2gD0oPeIwCfZUsc
Nz8OhbOxPvCoDfWCD/8KiPM=
=HRT3
-----END PGP SIGNATURE-----
--- xorg-x11-6.8.1.903.ebuild.orig 2005-02-02 12:16:33.354828664 -0800
+++ xorg-x11-6.8.1.903.ebuild 2005-02-02 12:17:49.611235928 -0800
@@ -241,10 +241,14 @@
# Do migration before anything else, so we do all the rest inside the
# symlink
- # Get rid of "standard" symlink from <6.8.0-r2
+ # Get rid of "standard" symlinks
# We can't overwrite symlink with directory w/ $(mv -f)
[ -L ${ROOT}usr/$(get_libdir)/X11 ] \
&& rm ${ROOT}usr/$(get_libdir)/X11
+ [ -L ${ROOT}usr/include/X11 ] \
+ && rm ${ROOT}usr/include/X11
+ [ -L ${ROOT}usr/include/GL ] \
+ && rm ${ROOT}usr/include/GL
# No need to do this, if it's already been done
# Also, it'll overwrite a ton of stuff because it won't realize /usr/X11R6
@@ -518,6 +522,9 @@
echo "#define FontDir /usr/share/fonts" >> ${HOSTCONF}
echo "#define BinDir /usr/bin" >> ${HOSTCONF}
echo "#define IncRoot /usr/include" >> ${HOSTCONF}
+ # This breaks the case when $(SYSTEMUSRINCDIR) = $(INCDIR)
+ # See xc/include/Imakefile
+ echo "#define LinkGLToUsrInclude NO" >> ${HOSTCONF}
# /usr/X11R6/lib/X11
echo "#define LibDir /usr/$(get_libdir)/X11" >> ${HOSTCONF}
# /usr/X11R6/lib with exception of /usr/X11R6/lib/X11
@@ -1632,7 +1639,7 @@
G_FONTDIRS="${G_FONTDIRS} 75dpi 100dpi"
fi
if use nls; then
- G_FONTDIRS="${G_FONTDIRS} cyrillic"
+ G_FONTDIRS="${G_FONTDIRS} cyrillic ukr"
fi
for G_FONTDIR in ${G_FONTDIRS}; do
--
[email protected] mailing list
