Bug#222735: marked as done (patches to get XFree86 4.3.0 building on mips, and other cleanups)
Your message dated Fri, 20 Feb 2004 20:32:13 -0500
with message-id <20040221013212.GC19713@deadbeast.net>
and subject line closing fixed bug
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--------------------------------------
Received: (at submit) by bugs.debian.org; 2 Dec 2003 17:15:00 +0000
>From branden@progeny.com Tue Dec 02 11:14:58 2003
Return-path: <branden@progeny.com>
Received: from morimoto.progeny.com [216.37.46.163]
by master.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1ARE6z-0007Ol-00; Tue, 02 Dec 2003 11:14:57 -0600
Received: by morimoto.progeny.com (Postfix, from userid 10001)
id 7B9A4637C3; Tue, 2 Dec 2003 12:14:53 -0500 (EST)
Date: Tue, 2 Dec 2003 12:14:53 -0500
From: Branden Robinson <branden@progeny.com>
To: Thiemo Seufer <ica2_ts@csv.ica.uni-stuttgart.de>
Cc: submit@bugs.debian.org
Subject: patches to get XFree86 4.3.0 building on mips, and other cleanups
Message-ID: <20031202171453.GA19888@morimoto.progeny.com>
References: <20031116133729.GA1662@deprecation.cyrius.com> <20031118103405.GG31045@rembrandt.csv.ica.uni-stuttgart.de> <20031118152304.GM26886@morimoto.progeny.com> <20031118164707.GK31045@rembrandt.csv.ica.uni-stuttgart.de> <20031128151137.GF24927@rembrandt.csv.ica.uni-stuttgart.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20031128151137.GF24927@rembrandt.csv.ica.uni-stuttgart.de>
User-Agent: Mutt/1.3.28i
Delivered-To: submit@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin
2.60-master.debian.org_2003_11_25-bugs.debian.org_2003_11_20
(1.212-2003-09-23-exp) on master.debian.org
X-Spam-Status: No, hits=-4.0 required=4.0 tests=BAYES_90,HAS_PACKAGE
autolearn=no
version=2.60-master.debian.org_2003_11_25-bugs.debian.org_2003_11_20
X-Spam-Level:
Package: xfree86
Version: 4.3.0-0pre1v4
Severity: important
Tags: experimental, patch
On Fri, Nov 28, 2003 at 04:11:37PM +0100, Thiemo Seufer wrote:
> Oh my, X11 is a hog. Finally I got it to build on a different machine
> I set up for this purpose. A 4 GiB Harddrive is barely enough (by a
> margin of a few Megabytes) for a base system and X11 with its
> build-depends. The (unsigned) packages and the build logs are available at
> http://www.csv.ica.uni-stuttgart.de/homes/ths/debian-builds/
Yeah, I know it's a hog. :(
Thank you *very* much for doing this, though!
> > > Thanks for attempting the build; is it all right if I contact you again
> > > when I have the problem fixed (probably in 4.3.0-0pre1v5)?
>
> I had to use the appended patch for this build, but didn't change the
> version number. I hope the build insn't useless due to that.
It's not 100% kosher, but I don't mind. Thanks for the patches; I will
check them against my SVN repo and integrate any that are still needed.
> --- /dev/null 2000-11-21 04:44:10.000000000 +0100
> +++ debian/patches/999_mips_ths.diff 2003-11-23 11:36:17.000000000 +0100
> @@ -0,0 +1,107 @@
> +--- xc/programs/mkfontscale/mkfontscale.c.orig 2003-11-21 04:10:49.000000000 +0100
> ++++ xc/programs/mkfontscale/mkfontscale.c 2003-11-21 04:14:39.000000000 +0100
> +@@ -29,11 +29,17 @@
> + #include <dirent.h>
> +
> + #include <X11/fonts/fontenc.h>
> +-#include <freetype/freetype.h>
> +-#include <freetype/ftsnames.h>
> +-#include <freetype/tttables.h>
> +-#include <freetype/ttnameid.h>
> +-#include <freetype/t1tables.h>
> ++/* #include <freetype/freetype.h> */
> ++/* #include <freetype/ftsnames.h> */
> ++/* #include <freetype/tttables.h> */
> ++/* #include <freetype/ttnameid.h> */
> ++/* #include <freetype/t1tables.h> */
> ++#include <ft2build.h>
> ++#include FT_FREETYPE_H
> ++#include FT_SFNT_NAMES_H
> ++#include FT_TRUETYPE_TABLES_H
> ++#include FT_TRUETYPE_IDS_H
> ++#include FT_TYPE1_TABLES_H
> +
> + #define CODE_IGNORED(c) ((c) < 0x20 || \
> + ((c) >= 0x7F && (c) <= 0xA0) || \
> +--- xc/lib/Xft1/XftFreetype.h.orig 2003-11-18 17:20:03.000000000 +0100
> ++++ xc/lib/Xft1/XftFreetype.h 2003-11-18 12:38:54.000000000 +0100
> +@@ -26,7 +26,9 @@
> + #define _XFTFREETYPE_H_
> +
> + #include "Xft.h"
> +-#include <freetype/freetype.h>
> ++/* #include <freetype/freetype.h> */
> ++#include <ft2build.h>
> ++#include FT_FREETYPE_H
> +
> + #include <X11/Xfuncproto.h>
> + #include <X11/Xosdefs.h>
> +--- xc/lib/Xft/Xft.h.orig 2003-11-18 17:18:51.000000000 +0100
> ++++ xc/lib/Xft/Xft.h 2003-11-18 12:38:53.000000000 +0100
> +@@ -32,7 +32,9 @@
> + #define XftVersion XFT_VERSION
> +
> + #include <stdarg.h>
> +-#include <freetype/freetype.h>
> ++/*#include <freetype/freetype.h> */
> ++#include <ft2build.h>
> ++#include FT_FREETYPE_H
> + #include <fontconfig/fontconfig.h>
> + #include <X11/extensions/Xrender.h>
> +
> +--- xc/programs/Xserver/hw/xfree86/common/compiler.h.orig 2003-11-22 03:42:32.000000000 +0100
> ++++ xc/programs/Xserver/hw/xfree86/common/compiler.h 2003-11-22 03:43:32.000000000 +0100
> +@@ -29,6 +29,10 @@
> + # error missing #include "xf86_ansic.h" before #include "compiler.h"
> + # endif
> +
> ++# ifndef _XARCH_H_
> ++# include "Xarch.h"
> ++# endif
> ++
> + # define _COMPILER_H
> +
> + /* Allow drivers to use the GCC-supported __inline__ and/or __inline. */
> +--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c.orig 2003-11-22 02:53:16.000000000 +0100
> ++++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c 2003-11-22 02:53:28.000000000 +0100
> +@@ -66,6 +66,7 @@
> + /* kbd rate stuff based on kbdrate.c from Rik Faith <faith@cs.unc.edu> et.al.
> + * from util-linux-2.9t package */
> +
> ++#include <linux/version.h>
> + #include <linux/kd.h>
> + #ifdef __sparc__
> + #include <asm/param.h>
> +--- xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c.orig 2003-11-22 05:13:53.000000000 +0100
> ++++ xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c 2003-11-22 05:21:38.000000000 +0100
> +@@ -94,12 +94,20 @@
> + /* kbd rate stuff based on kbdrate.c from Rik Faith <faith@cs.unc.edu> et.al.
> + * from util-linux-2.9t package */
> +
> +-
> ++#include <linux/version.h>
> ++#include <linux/kd.h>
> + #ifdef __sparc__
> + #include <asm/param.h>
> + #include <asm/kbio.h>
> + #endif
> +
> ++/* Deal with spurious kernel header change */
> ++#if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION)
> ++# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42)
> ++# define rate period
> ++# endif
> ++#endif
> ++
> + static int
> + KDKBDREP_ioctl_ok(int rate, int delay) {
> + #if defined(KDKBDREP) && !defined(__sparc__)
> +@@ -161,6 +169,8 @@
> + #endif /* KIOCSRATE */
> + }
> +
> ++#undef rate
> ++
> + static void
> + SetKbdRepeat(InputInfoPtr pInfo, char rad)
> + {
> --- debian/rules.orig 2003-11-28 16:07:25.000000000 +0100
> +++ debian/rules 2003-11-28 15:58:25.000000000 +0100
> @@ -203,11 +203,14 @@
> mkdir -p debian/local/exports/include/X11/extensions
> ln -s /usr/X11R6/lib/libXft* debian/local/exports/lib
> rm -f debian/local/exports/lib/libXft.so.1* debian/local/exports/lib/libXft1*
> + rm -f debian/local/exports/include/X11/Xft
> ln -s /usr/include/X11/Xft debian/local/exports/include/X11
> # Xrender
> + rm -f debian/local/exports/lib/libXrender.* debian/local/exports/include/X11/extensions/Xrender.h
> ln -s /usr/X11R6/lib/libXrender.* debian/local/exports/lib
> - ln -s /usr/include/X11/extentions/Xrender.h debian/local/exports/include/X11/extentions
> + ln -s /usr/include/X11/extensions/Xrender.h debian/local/exports/include/X11/extensions
> # Xcursor
> + rm -f debian/local/exports/lib/libXcursor.* debian/local/exports/include/X11/Xcursor
> ln -s /usr/lib/libXcursor.* debian/local/exports/lib
> ln -s /usr/include/X11/Xcursor debian/local/exports/include/X11
> ifndef NOT_BUILDING_X_SERVER
> @@ -217,6 +220,7 @@
> $(CC) -Wall -g -O2 -o debian/local/xserver-wrapper debian/local/xserver-wrapper.c
> endif
> $(HTML2TEXT) debian/local/xterm.faq.html > debian/local/xterm.faq.text
> + rm -f debian/local/xterm.faq.text.gz
> gzip -9 debian/local/xterm.faq.text
> ifndef test_rules
> $(MAKE) -C $(SOURCE_TREE) WORLDOPTS="" IMAKE_DEFINES="$(IMAKE_DEFINES)" World
--
Branden Robinson | GPG signed/encrypted mail welcome
branden@progeny.com | 1024D/9C0BCBFB
Progeny Linux Systems | D5F6 D4C9 E25B 3D37 068C
| 72E8 0F42 191A 9C0B CBFB
---------------------------------------
Received: (at 222735-done) by bugs.debian.org; 21 Feb 2004 01:32:14 +0000
>From branden@deadbeast.net Fri Feb 20 17:32:13 2004
Return-path: <branden@deadbeast.net>
Received: from dhcp065-026-182-085.indy.rr.com (redwald.deadbeast.net) [65.26.182.85]
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1AuM05-00016k-00; Fri, 20 Feb 2004 17:32:13 -0800
Received: by redwald.deadbeast.net (Postfix, from userid 1000)
id 2A562640FA; Fri, 20 Feb 2004 20:32:13 -0500 (EST)
Date: Fri, 20 Feb 2004 20:32:13 -0500
From: Branden Robinson <branden@debian.org>
To: 222735-done@bugs.debian.org
Subject: closing fixed bug
Message-ID: <20040221013212.GC19713@deadbeast.net>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
protocol="application/pgp-signature"; boundary="uXxzq0nDebZQVNAZ"
Content-Disposition: inline
User-Agent: Mutt/1.5.5.1+cvs20040105i
Delivered-To: 222735-done@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_02_18
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=0.0 required=4.0 tests=none autolearn=no
version=2.60-bugs.debian.org_2004_02_18
X-Spam-Level:
--uXxzq0nDebZQVNAZ
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
The problems reported in this bug (FTBFS with FreeType 2.1.7, FTBFS
again Linux 2.6 kernel headers, clean up of externally-used library
logic in debian/rules), have been resolved.
xfree86 (4.3.0-1) experimental; urgency=3Dlow
[...]
* Search for external Xrender and Xft libraries in /usr/lib instead of
/usr/X11R6/lib when symlinking them to the local exports directory for
build purposes. Update build-dependencies on these libraries' -dev
packages to ensure their files are where we expect them.
[ISHIKAWA Mutsumi]
- debian/rules:
+ symlink libXrender.* from /usr/lib instead of /usr/X11R6/lib
+ symlink libXft.* from /usr/lib instead of /usr/X11R6/lib
- debian/control:
+ update build-dependency from libxft2-dev to libxft-dev (>=3D 2.1.2)
+ update build-dependency from libxrender-dev to libxrender-dev
(>=3D 0.8.3)
[...]
-- Branden Robinson <branden@debian.org> Tue, 17 Feb 2004 12:58:28 -0500
xfree86 (4.3.0-0pre1v5) experimental; urgency=3Dlow
[...]
* debian/patches/099b_Xft_FreeType_2.1.7_build_fix.diff:
+ Patch XFree86's internal copies of the Xft library to enable building
against FreeType 2.1.7; fixes FTBFS.
[...]
-- Branden Robinson <branden@debian.org> Fri, 5 Dec 2003 21:18:07 -0500
xfree86 (4.2.1-16) unstable; urgency=3Dlow
* Neutralize the workaround for the Linux kernel kbd_rate structure change
after it is no longer needed, so that we don't inadvertently re-#define=
a
symbol used by the Linux kernel's kbd_repeat structure. Yeesh. Fixes
FTBFS on SPARC (thanks, Daniel Jacobowitz and Nathanael Nerode!)
(Closes: #220814)
- debian/patches/098_fix_lnx_io_kbd_rate_fix.diff
[...]
-- Branden Robinson <branden@debian.org> Wed, 28 Jan 2004 11:51:38 -0500
--=20
G. Branden Robinson | That's the saving grace of humor:
Debian GNU/Linux | if you fail, no one is laughing at
branden@debian.org | you.
http://people.debian.org/~branden/ | -- A. Whitney Brown
--uXxzq0nDebZQVNAZ
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)
iEYEARECAAYFAkA2tRwACgkQ6kxmHytGonxmwQCeN2pEjTKQJ+RaVXw0af9NBz89
Yh8Anj7/a/p1s92ErI7pXUSuuGPHrISC
=AR3C
-----END PGP SIGNATURE-----
--uXxzq0nDebZQVNAZ--
Reply to: