diff options
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xfree/ChangeLog | 19 | ||||
| -rw-r--r-- | x11-base/xfree/Manifest | 6 | ||||
| -rw-r--r-- | x11-base/xfree/files/digest-xfree-4.3.0-r6 | 2 | ||||
| -rw-r--r-- | x11-base/xfree/xfree-4.3.0-r6.ebuild | 24 |
4 files changed, 30 insertions, 21 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog index 4784dc411a74..bf73dba0c9c2 100644 --- a/x11-base/xfree/ChangeLog +++ b/x11-base/xfree/ChangeLog @@ -1,6 +1,23 @@ # ChangeLog for x11-base/xfree # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.318 2004/04/13 04:34:38 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.319 2004/04/13 15:49:14 spyderous Exp $ + + 13 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild: + PATCH_VER 2.1.26.16. Drop + 9016_all_4.3.0-libfontenc-IncludeSharedObjectInNormalLib.patch and + 9015_all_4.2.99.4-IncludeSharedObjectInNormalLib.patch, combine into one + larger patch 9015_all_4.3.0-IncludeSharedObjectInNormalLib.patch to force all + libs to PIC (#40646, #44274). solar says there shouldn't be any negative + performance impact on any arch from PIC static libs. Add + 9300_all_4.3.0-ncurses-xf86cfg-bool-conflict.patch to avoid conflict of bool + between ncurses-5.4 and xf86cfg (#43491). Add + 9550_all_4.3.0-nls-cjk-utf8.patch to change fontset order for UTF-8 in + XLC_LOCALE, from Kang-Ho Song <khsongdr@yahoo.com> (#46392). Ported from + upstream patches. Add 9113_all_4.3.0-xterm-make-optional.patch and use + external xterm (Mike Harris). This now depends on x11-terms/xterm. Fix a + doc-building error with BuildLinuxDocText, which actually prevents some docs + from building. Enhance XVendorString to show PATCH_VER and make it compliant + with upstream. 13 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; : Restore ChangeLog. Somehow I managed to erase most of it on version 1.315. diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest index d877fc6c23a7..1a6ef5bda91f 100644 --- a/x11-base/xfree/Manifest +++ b/x11-base/xfree/Manifest @@ -1,9 +1,9 @@ MD5 e6ee387a2de6b2fea8e5a3573c48b667 metadata.xml 228 -MD5 687282f57d11bf3dc1ea063d20a106c2 ChangeLog 69778 -MD5 4e6c8cdf197b258a9faba3c23881ebf6 xfree-4.3.0-r6.ebuild 37048 +MD5 7ea4c9a5966a297fb3fc09cfdeae5951 ChangeLog 70841 +MD5 f1497bf90c6a1d8545c5be5ec359476e xfree-4.3.0-r6.ebuild 36806 MD5 a1ccbd533a8ff77116bcfbad367e2d39 xfree-4.3.0-r5.ebuild 35220 MD5 6cab60be8b532ddd77f177f64d0948b8 xfree-4.3.99.902-r2.ebuild 31419 -MD5 01380f74ac52b69ed0fbb849a8126184 files/digest-xfree-4.3.0-r6 1528 +MD5 22283efeb0bda201de6b574fa1ab369e files/digest-xfree-4.3.0-r6 1528 MD5 a80dd36e88ff79e9019049017fee8cd6 files/digest-xfree-4.3.0-r5 2002 MD5 2308a80167b398e266fc7a711c8014c6 files/digest-xfree-4.3.99.902-r2 1254 MD5 2d22ba49943c630e4299f439d3a0d4cc files/4.3.0/XftConfig 7750 diff --git a/x11-base/xfree/files/digest-xfree-4.3.0-r6 b/x11-base/xfree/files/digest-xfree-4.3.0-r6 index 4cedfe227591..2ed576a47192 100644 --- a/x11-base/xfree/files/digest-xfree-4.3.0-r6 +++ b/x11-base/xfree/files/digest-xfree-4.3.0-r6 @@ -8,7 +8,7 @@ MD5 e002e70f24098ca4f62fabd1c2809ed1 X430src-7.tgz 9317241 MD5 69233e5fc7cafb3a154447e2eb76ffe7 render-0.8.tar.gz 51478 MD5 c745339dbe5f05cff8950b71a739e34c libXrender-0.8.4.tar.bz2 205660 MD5 ba10c9c3f4758f304f04f8d48e2f81a4 libXft-2.1.6.tar.bz2 234117 -MD5 fcc15d4e5ee69322a03e12538381ff3c XFree86-4.3.0-patches-2.1.26.15.tar.bz2 565860 +MD5 f4c5e4fda1c7c233d556536587415827 XFree86-4.3.0-patches-2.1.26.16.tar.bz2 568496 MD5 e0c52f0e726e20db445e9708665a26d4 xfree86-dri-resume-v8.patch 15333 MD5 29f1c1c6576bdc6b4af064d6a21c0a43 XFree86-4.3.0-files-0.1.5.tar.bz2 11028 MD5 537bb3e2da7642bd979ebc1cafa8dce7 savage-1.1.27t.zip 76974 diff --git a/x11-base/xfree/xfree-4.3.0-r6.ebuild b/x11-base/xfree/xfree-4.3.0-r6.ebuild index b3feea0ad3b3..725e0e650926 100644 --- a/x11-base/xfree/xfree-4.3.0-r6.ebuild +++ b/x11-base/xfree/xfree-4.3.0-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r6.ebuild,v 1.20 2004/04/12 05:30:24 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r6.ebuild,v 1.21 2004/04/13 15:49:14 spyderous Exp $ # TODO # 14 Mar. 2004 <spyderous@gentoo.org> @@ -29,7 +29,7 @@ RESTRICT="nostrip" IUSE="3dfx truetype nls cjk doc ipv6 debug static sdk gatos pam pie" IUSE_INPUT_DEVICES="synaptics wacom" -PATCH_VER="2.1.26.15" +PATCH_VER="2.1.26.16" FILES_VER="0.1.5" RENDER_VER="0.8" XRENDER_VER="0.8.4" @@ -121,7 +121,8 @@ PDEPEND="x86? ( input_devices_synaptics? ( x11-misc/synaptics ) input_devices_wacom? ( x11-misc/linuxwacom ) ) - media-fonts/ttf-bitstream-vera" + media-fonts/ttf-bitstream-vera + x11-terms/xterm" PROVIDE="virtual/x11 virtual/opengl @@ -361,7 +362,7 @@ src_unpack() { ebegin "Setting up config/cf/host.def" cd ${S}; cp ${FILES_DIR}/${PV}/site.def config/cf/host.def || die - echo "#define XVendorString \"Gentoo Linux (XFree86 ${PV}, revision ${PR})\"" \ + echo "#define XVendorString \"Gentoo Linux (The XFree86 Project, Inc ${PV}, revision ${PR}-${PATCH_VER})\"" \ >> config/cf/host.def # Makes ld bail at link time on undefined symbols @@ -383,6 +384,9 @@ src_unpack() { echo "#define MiscManSuffix 7x /* use just one tab or cpp will die */" \ >> config/cf/host.def + # Don't build xterm -- use external + echo "#define BuildXterm NO" >> config/cf/host.def + # We're using Xwrapper instead -- so that nothing else needs to be # set uid any more. echo "#define InstallXserverSetUID NO" >> config/cf/host.def @@ -454,11 +458,6 @@ src_unpack() { echo "#define HasPamMisc NO" >> config/cf/host.def fi - if use nls - then - echo "#define XtermWithI18N YES" >> config/cf/host.def - fi - if use x86 then # build with glide3 support? (build the tdfx_dri.o module) @@ -521,7 +520,6 @@ src_unpack() { local DOC="NO" fi - echo "#define BuildLinuxDocText ${DOC}" >> config/cf/host.def echo "#define BuildLinuxDocHtml ${DOC}" >> config/cf/host.def echo "#define BuildLinuxDocPS ${DOC}" >> config/cf/host.def echo "#define BuildSpecsDocs ${DOC}" >> config/cf/host.def @@ -717,12 +715,6 @@ EOF sed -i "s:/usr/X116/lib/X11/fonts:/usr/share/fonts:g" \ ${D}/etc/X11/fs/config - # Make sure the user running xterm can only write to utmp. - fowners root:utmp /usr/X11R6/bin/xterm - fperms 2755 /usr/X11R6/bin/xterm - # bug 24414, somehow it slips through stripping later in the ebuild - strip ${D}/usr/X11R6/bin/xterm - # Fix permissions on locale/common/*.so for x in ${D}/usr/X11R6/lib/X11/locale/lib/common/*.so* do |