Re: g++/libstdc++-dev [was Re: X Strike Force SVN commit: rev 69 - branches/4.3.0/sid/debian]
Branden Robinson writes: On Fri, May 30, 2003 at 03:36:41PM -0400, Phil Edwards wrote: On Fri, May 30, 2003 at 08:03:38AM +0200, Matthias Klose wrote: Well, uh, so what? If G++ 3.2 and 3.3 have compatible ABIs, and the standard C++ libraries are compatible at the source level, does the above really matter? I don'know, if the libraries are compatible at source level, the combination of g++ and library (from the same gcc source) should be. The standard C++ library is compatible at the source level (i.e., recompiles should Just Work), with the exception of deprecated stuff and odd extensions. All right, then I continue to suspect that the right thing for the -dev package question is the following: Package: xlibmesa3-glu-dev -Depends: xlibmesa3-glu, xlibmesa-gl-dev | libgl-dev, libstdc++5-dev, libc6-dev | libc-dev +Depends: xlibmesa3-glu, xlibmesa-gl-dev | libgl-dev, libstdc++5-dev | libstdc++-dev, libc6-dev | libc-dev This library should be linkable against libstdc++. Which one should be used is a matter for Policy to specify and build-essential to enforce. The dependency on libstdc++5-dev is meaningless, the files in the package are not used for the build, if you are building using g++ (= 3:3.3). But it doesn't hurt either. Take libstdc++5-3.3-dev, if you really want a dependency on libstdc++-dev. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#172526: [wacom] Patch for Cintiq support
For the record: This patch has been included in XFree86 4.3.99.2, but was subsequently replaced by a more comprehensive patch by Frederic Lepied. So this bug will be fixed by Debian packages of XFree 4.4. - Sebastian -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#195582: xserver-xfree86: problem with and keys
Package: xserver-xfree86 Version: 4.3.0-0ds4 Severity: normal Hi Daniel, first I would like to thank you for your Xfree 4.3.0 prerelease packages ! The good news is that all bugs with the XVideo extension on my radeon card are fixed. The bad news are several other bugs. The most annoying one is described in this e-mail and the other ones will follow in subsequent messages... So the first bug is that and keys are inactive in my french keyboard setup. -- Package-specific info: 01:00.0 VGA compatible controller: ATI Technologies Inc Radeon RV100 QY [Radeon 7000/VE] 01:00.0 Class 0300: 1002:5159 Section Files FontPathunix/:7100# xfs # FontPathunix/:7110# xfs-xtt # if the local font server has problems, we can fall back on these FontPath/usr/lib/X11/fonts/misc FontPath/usr/lib/X11/fonts/cyrillic FontPath/usr/lib/X11/fonts/100dpi/:unscaled FontPath/usr/lib/X11/fonts/75dpi/:unscaled FontPath/usr/lib/X11/fonts/Type1 FontPath/usr/lib/X11/fonts/Speedo #FontPath/usr/lib/X11/fonts/100dpi #FontPath/usr/lib/X11/fonts/75dpi FontPath /var/lib/defoma/x-ttcidfont-conf.d/dirs/CID FontPath /var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType EndSection ### BEGIN DEBCONF SECTION # XF86Config-4 (XFree86 server configuration file) generated by dexconf, the # Debian X Configuration tool, using values from the debconf database. # # Edit this file with caution, and see the XF86Config-4 manual page. # (Type man XF86Config-4 at the shell prompt.) # # If you want your changes to this file preserved by dexconf, only make changes # before the ### BEGIN DEBCONF SECTION line above, and/or after the # ### END DEBCONF SECTION line below. # # To change things within the debconf section, run the command: # dpkg-reconfigure xserver-xfree86 # as root. Also see How do I add custom sections to a dexconf-generated # XF86Config or XF86Config-4 file? in /usr/share/doc/xfree86-common/FAQ.gz. Section Module LoadGLcore Loadbitmap Loaddbe Loadddc Loaddri Loadextmod Loadfreetype Loadglx Loadint10 Loadrecord Loadspeedo Loadtype1 Loadvbe EndSection Section InputDevice Identifier Generic Keyboard Driver keyboard Option CoreKeyboard Option XkbRules xfree86 Option XkbModel pc105 Option XkbLayout fr EndSection Section InputDevice Identifier Configured Mouse Driver mouse Option CorePointer Option Device/dev/psaux Option Protocol PS/2 Option ZAxisMapping 4 5 EndSection Section InputDevice Identifier Generic Mouse Driver mouse Option SendCoreEventstrue Option Device/dev/input/mice Option Protocol ImPS/2 Option ZAxisMapping 4 5 EndSection Section Device Identifier RadeonVE64Mo Driver ati EndSection Section Monitor Identifier LiteOn HorizSync 30-94 VertRefresh 50-75 Option DPMS EndSection Section Screen Identifier Default Screen Device RadeonVE64Mo Monitor LiteOn DefaultDepth24 SubSection Display Depth 1 Modes 1600x1200 1280x1024 1280x960 1152x864 1024x768 800x600 640x480 EndSubSection SubSection Display Depth 4 Modes 1600x1200 1280x1024 1280x960 1152x864 1024x768 800x600 640x480 EndSubSection SubSection Display Depth 8 Modes 1600x1200 1280x1024 1280x960 1152x864 1024x768 800x600 640x480 EndSubSection SubSection Display Depth 15 Modes 1600x1200 1280x1024 1280x960 1152x864 1024x768 800x600 640x480 EndSubSection SubSection Display Depth 16 Modes 1600x1200 1280x1024 1280x960 1152x864 1024x768 800x600 640x480 EndSubSection SubSection Display Depth 24 Modes 1600x1200 1280x1024 1280x960 1152x864 1024x768 800x600 640x480 EndSubSection EndSection Section ServerLayout Identifier Default Layout Screen Default Screen InputDevice Generic Keyboard InputDevice Configured Mouse InputDevice
Bug#172526: [wacom] Patch for Cintiq support
On Sat, May 31, 2003 at 03:26:52PM +0200, Sebastian Rittau wrote: For the record: This patch has been included in XFree86 4.3.99.2, but was subsequently replaced by a more comprehensive patch by Frederic Lepied. So this bug will be fixed by Debian packages of XFree 4.4. I have incorporated a large Wacom patch (from the Wacom sf.net crew, I think) into my XFree86 4.3 packages, but I don't know if it adds Cintiq support. -- Daniel Stone [EMAIL PROTECTED] [EMAIL PROTECTED] KDE: Konquering a desktop near you - http://www.kde.org pgp0.pgp Description: PGP signature
Processed: close 195582
Processing commands for [EMAIL PROTECTED]: close 195582 Bug#195582: xserver-xfree86: problem with and keys 'close' is deprecated; see http://www.debian.org/Bugs/Developer#closing. Bug closed, send any further explanations to Laurent Bonnaud [EMAIL PROTECTED] thanks Stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database) -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: Processed: close 195582
On Sat, May 31, 2003 at 01:48:08PM -0500, Debian Bug Tracking System wrote: Processing commands for [EMAIL PROTECTED]: close 195582 Bug#195582: xserver-xfree86: problem with and keys 'close' is deprecated; see http://www.debian.org/Bugs/Developer#closing. Bug closed, send any further explanations to Laurent Bonnaud [EMAIL PROTECTED] I've handled this in private, too. Seems my BTS solution for reportbug isn't working. :| -- Daniel Stone [EMAIL PROTECTED] [EMAIL PROTECTED] KDE: Konquering a desktop near you - http://www.kde.org pgp0.pgp Description: PGP signature
Bug#195606: xfree86v3: FTBFS with gcc-3.3: Invalid preprocessor pasting
Package: xfree86v3 Version: 3.3.6-44 Severity: serious From my build log: ... gcc -c -O2 -g -Wall -I. -I../../../../../../programs/Xserver/hw/xfree86/common -I../../../../../../programs/Xserver/hw/xfree86/os-support -I../../../../../../programs/Xserver/hw/xfree86/common_hw -I../../../../../../programs/Xserver/cfb -I../../../../../../programs/Xserver/mfb -I../../../../../../programs/Xserver/mi -I../../../../../../programs/Xserver/include -I../../../../../../exports/include/X11 -I../../../../../../include/fonts -I../../xaa -I../../../../../.. -I../../../../../../exports/include -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE=500L -D_BSD_SOURCE -D_SVID_SOURCE -DSHAPE -DXINPUT -DXKB -DLBX -DXAPPGROUP -DXCSECURITY -DDPMSExtension-DPIXPRIV -DGCCUSESGAS -DSTATIC_COLOR -DAVOID_GLYPHBLT -DPIXPRIV -DXFreeXDGA -DNDEBUG -DFUNCPROTO=15 -DNARROWPROTO -DPSZ=8 -DRROP=GXcopy vgasolidC.c vgasolidC.c:177:45: pasting repe\n and stosl does not give a valid preprocessing token vgasolidC.c:177:45: pasting repe\n and stosl does not give a valid preprocessing token make[8]: *** [vgasolidC.o] Error 1 make[8]: Leaving directory `/tmp/buildd/xfree86v3-3.3.6/build-tree/xc/programs/Xserver/hw/xfree86/vga256/vga' make[7]: *** [vga] Error 2 make[7]: Leaving directory `/tmp/buildd/xfree86v3-3.3.6/build-tree/xc/programs/Xserver/hw/xfree86/vga256' make[6]: *** [all] Error 2 make[6]: Leaving directory `/tmp/buildd/xfree86v3-3.3.6/build-tree/xc/programs/Xserver/hw/xfree86' make[5]: *** [hw/xfree86] Error 2 make[5]: Leaving directory `/tmp/buildd/xfree86v3-3.3.6/build-tree/xc/programs/Xserver' make[4]: *** [all] Error 2 make[4]: Leaving directory `/tmp/buildd/xfree86v3-3.3.6/build-tree/xc/programs' make[3]: *** [all] Error 2 make[3]: Leaving directory `/tmp/buildd/xfree86v3-3.3.6/build-tree/xc' make[2]: *** [World] Error 2 make[2]: Leaving directory `/tmp/buildd/xfree86v3-3.3.6/build-tree/xc' make[1]: *** [World] Error 2 make[1]: Leaving directory `/tmp/buildd/xfree86v3-3.3.6/build-tree/xc' make: *** [debian/stampdir/build-libc6] Error 2 -- System Information: Debian Release: testing/unstable Architecture: i386 Kernel: Linux frobnitz 2.4.21-pre5 #1 Sat Mar 1 09:01:10 PST 2003 i686 Locale: LANG=C, LC_CTYPE=C -- Daniel Schepler Please don't disillusion me. I [EMAIL PROTECTED]haven't had breakfast yet. -- Orson Scott Card -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Re: 4.2.1-6 fatal xtt symbol errors
On Sat, May 31, 2003 at 01:53:57AM -0700, Mark Hedges wrote: This is after upgrading and after trying dpkg-reconfigure -plow. Trying to use the xtt module instead of freetype, it bombs. Config and log attached. [...] This is a pre-release version of XFree86, and is not supported in any way. Bugs may be reported to [EMAIL PROTECTED] and patches submitted to [EMAIL PROTECTED] Before reporting bugs in pre-release versions, please check the latest version in the XFree86 CVS repository (http://www.XFree86.Org/cvs) XFree86 Version 4.2.1.1 (Debian 4.2.1-6 20030225230350 [EMAIL PROTECTED]) / X Window System You probably want to be using 4.2.1-7 instead, which fixes this bug. [The following is a form letter.] Hello, You recently sent an off-charter message to the debian-x mailing list. First, I will offer an explanation of what this mailing list's purpose is; I will then suggest some alternative forums for your message or concern. The full charter of the mailing list follows. This list is for the discussion and support of the X Window System within Debian. Issues of maintenance and porting of Debian's XFree86 packages are germane here, as are discussions of possible Debian policy mechanisms for ensuring the smooth interoperation of packages that use the X Window System, particularly widget sets, desktop environments, window managers, display managers, and packages that provide fonts for the X Window System. In particular, individuals involved with building official Debian XFree86 packages for any architecture are invited to join, as are those with various graphics hardware who seek to reproduce and/or fix bugs in the X server. This is not a user support list; this list is intended for those who deal with the source code of any of the X Window System components mentioned above. If you are experiencing a problem, the first thing to check is the Debian X FAQ. This FAQ is available on the World Wide Web: http://people.debian.org/~branden/xsf/FAQ The FAQ is also available on any Debian system that has the xfree86-common package installed. You can use the command dpkg --status xfree86-common at a shell prompt to determine whether you have the xfree86-common package installed (this technique works with any other package name as well). For instance, when I run this command I see the following: $ dpkg --status xfree86-common Package: xfree86-common Status: install ok installed (followed by additional information about the package) If xfree86-common is installed, you can view the Debian X FAQ in a variety of ways, since it is a gzipped (compressed) text file. The path to the FAQ is /usr/share/doc/xfree86-common/FAQ.gz. Here's one method for viewing it: $ zmore /usr/share/doc/xfree86-common/FAQ.gz Debian X Window System Frequently Asked Questions (FAQ) List Copyright 1998-2002 Branden Robinson. This document is licensed under the GNU General Public License, version 2 (see /usr/share/common-licenses/GPL). By its nature, this document is not complete. If your question is not answered here, try /usr/share/doc/packagename/README.Debian (and other files in the package's doc directory), manual pages, and the debian-user mailing list. See http://www.debian.org/ for more information about the Debian mailing lists. (followed by the rest of the FAQ) If the FAQ does not satisfactorily answer your question, the primary Debian users' support forum is the debian-user mailing list. You can learn more about this list at: http://lists.debian.org/debian-user/ If you have already tried that mailing list, and/or your machine does *NOT* use an Intel-x86 compatible CPU (such as a Pentium or AMD Athlon chip), you may also want to peruse one of Debian's architecture-specific mailing lists: http://lists.debian.org/debian-alpha/ http://lists.debian.org/debian-arm/ http://lists.debian.org/debian-hppa/ http://lists.debian.org/debian-ia64/ http://lists.debian.org/debian-m68k/ http://lists.debian.org/debian-mips/ http://lists.debian.org/debian-powerpc/ http://lists.debian.org/debian-sparc/ http://lists.debian.org/debian-superh/ Before sending a message to one of the mailing lists, it's wise to try using the search interface; in many cases, your problem has been experienced before by other people, and a solution, workaround, or explanation may already be available! http://lists.debian.org/search.html If the search engine turns up nothing, you should know whether or not you're subscribed to a mailing list before sending a message to it. If you are not subscribed, make *certain* that you ask for private copies of replies to your message. Debian's standard practice is to reply only to mailing lists (this cuts down on Internet traffic and annoying bounce messages). If you want people to deviate from this standard practice you should ask them to do so. (Advanced mail users should set a Mail-Followup-To header that includes both the list
Bug#195646: upgrade clobbers my XF86Config-4 w/ incorrect display modes
Package: xserver-xfree86 Version: 4.2.1-7 Severity: normal Tags: sid When I upgraded from -6 to -7, my XF86Config-4 was replaced. This isn't usually a problem, but it changed the display mode to incorrect values, cutting off 2 inches from the right side of my display (I have an odd-shaped lcd monitor). I realize that I have dexconf set to manage my XF86Config-4, but shouldn't it be smart enough to know that something's incorrect, since its stored values are completely different from what's in the config file (and the ### BEGIN DEBCONF SECTION isn't even the file)? The postinst bailing out (Error: your /etc/X11/XF86Config-4 is incorrectly formatted, yet you have this package configured to manage it; please run dpkg-reconfigure xserver-xfree86 to fix this) would've been preferable, I think. More than anything else, not having my screen mode (1152x768) as an option in dexconf is a nuisance. An even better solution (imo) would be the option to manually type in your mode if it's not in the list. This is my previous, correct XF86Config-4: -- Section Files FontPath/usr/lib/X11/fonts/misc FontPath/usr/lib/X11/fonts/75dpi/:unscaled FontPath/usr/lib/X11/fonts/TrueType FontPath/usr/lib/X11/fonts/75dpi FontPath/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType #FontPath unix/:7100# local font server # if the local font server has problems, we can fall back on these #FontPath /usr/lib/X11/fonts/cyrillic #FontPath /usr/lib/X11/fonts/100dpi/:unscaled #FontPath /usr/lib/X11/fonts/Speedo #FontPath /usr/lib/X11/fonts/100dpi #FontPath /usr/lib/X11/fonts/Type1 EndSection Section Module LoadGLcore Loadbitmap Loaddbe Loadddc Loaddri Loadextmod Loadfreetype Loadglx Loadint10 Loadfb Loadrecord Loadspeedo Loadtype1 Loadvbe #Load xie # Loadpex5 EndSection Section InputDevice Identifier Generic Keyboard Driver keyboard Option CoreKeyboard Option XkbRules xfree86 Option XkbModel macintosh Option XkbLayout us EndSection Section InputDevice Identifier Configured Mouse Driver mouse Option CorePointer Option Device/dev/input/mice Option Protocol IMPS/2 Option ZAxisMapping 4 5 EndSection Section Device Identifier TiBook Internal Video Driver r128 BusID PCI:0:16:0 Option UseFBDev #true EndSection Section Monitor Identifier TiBook Panel HorizSync 30-100 VertRefresh 55-160 Option DPMS Modeline1152x768 78.741 1152 1173 1269 1440 768 769 772 800 +HSync +VSync EndSection Section Screen Identifier Default Screen Device TiBook Internal Video Monitor TiBook Panel DefaultDepth16 SubSection Display Depth 24 Modes 1152x768 EndSubSection SubSection Display Depth 8 Modes 1152x768 EndSubSection SubSection Display Depth 16 Modes 1152x768 EndSubSection EndSection Section ServerLayout Identifier Default Layout Screen Default Screen InputDevice Generic Keyboard InputDevice Configured Mouse EndSection Section DRI Group dri Mode0666 EndSection - And, here's the one the -7 packages replaced it w/: - ### BEGIN DEBCONF SECTION # XF86Config-4 (XFree86 server configuration file) generated by dexconf, the # Debian X Configuration tool, using values from the debconf database. # # Edit this file with caution, and see the XF86Config-4 manual page. # (Type man XF86Config-4 at the shell prompt.) # # If you want your changes to this file preserved by dexconf, only make changes # before the ### BEGIN DEBCONF SECTION line above, and/or after the # ### END DEBCONF SECTION line below. # # To change things within the debconf section, run the command: # dpkg-reconfigure xserver-xfree86 # as root. Also see How do I add custom sections to a dexconf-generated # XF86Config or XF86Config-4 file? in /usr/share/doc/xfree86-common/FAQ.gz. Section Module LoadGLcore Loadbitmap Loaddbe Loadddc Loaddri Loadextmod Loadfreetype Loadglx Loadint10
Bug#195646: upgrade clobbers my XF86Config-4 w/ incorrect display modes
On Sun, Jun 01, 2003 at 03:41:57AM -0400, Andres Salomon wrote: When I upgraded from -6 to -7, my XF86Config-4 was replaced. This isn't usually a problem, but it changed the display mode to incorrect values, cutting off 2 inches from the right side of my display (I have an odd-shaped lcd monitor). I realize that I have dexconf set to manage my XF86Config-4, but shouldn't it be smart enough to know that something's incorrect, since its stored values are completely different from what's in the config file (and the ### BEGIN DEBCONF SECTION isn't even the file)? The postinst bailing out (Error: your /etc/X11/XF86Config-4 is incorrectly formatted, yet you have this package configured to manage it; please run dpkg-reconfigure xserver-xfree86 to fix this) would've been preferable, I think. More than anything else, not having my screen mode (1152x768) as an option in dexconf is a nuisance. An even better solution (imo) would be the option to manually type in your mode if it's not in the list. Matt Zimmerman and I have discussed overhauling xserver-xfree86's debconfage, and after that big flamefest on the -devel list about it I have made up my mind that It Shall Be Done. Now all that's needed is the time to do it. [To debian-x: anyone want commit access to the XSF Subversion repo so they can create a branch to work on this?] -- G. Branden Robinson| No math genius, eh? Then perhaps Debian GNU/Linux | you could explain to me where you [EMAIL PROTECTED] | got these... PENROSE TILES! http://people.debian.org/~branden/ | -- Stephen R. Notley pgp0.pgp Description: PGP signature
[zeratul2@wanadoo.es: patches for GNU/FreeBSD]
I thought good news would never arrive! :)
- Forwarded message from Robert Millan [EMAIL PROTECTED] -
Date: Sun, 1 Jun 2003 13:20:03 +0200
From: Robert Millan [EMAIL PROTECTED]
To: Daniel Stone [EMAIL PROTECTED]
Subject: patches for GNU/FreeBSD
Message-ID: [EMAIL PROTECTED]
hi Daniel!
Xfree86 builds for first time on the Glibc-based GNU/FreeBSD system!!
I'm attaching a few patches. I can't bring you the MANIFEST stuff yet
because i'm still bootstrapping it (missing tetex-bin build-depends)
the debian/control patch does a little change to the kernel-headers
dependency. when i proposed the current |hurd|freebsd... scheme,
i assumed there would be each of these packages but it won't be like
that. I'll use freebsd-{kernel,libc,utils} for the stuff from the
FreeBSD system, so this needs to be changed. Since Xfree86 needs
manual work to support every architecture anyway, i think it's ok
to put the dependency like this.
820 adds GNU/FreeBSD to the build system and does the config/cf/ stuff,
the rest are bug fixes for misc components that fail miserabily. see my
comments on the patch headers for details.
please copy vars.i386 to vars.freebsd-i386 too.
buddy, my new box and UFS+SoftUpdates are _really_ making a difference,
i can build the whole thing in two or three hours! (it used to take 11 hours
on my old GNU box)
--
Robert Millan
diff -ur xfree86-4.3.0/debian.old/control xfree86-4.3.0/debian/control
--- xfree86-4.3.0/debian.old/control2003-06-01 12:35:55.0 +0200
+++ xfree86-4.3.0/debian/control2003-06-01 13:09:24.0 +0200
@@ -4,7 +4,7 @@
Maintainer: Debian X Strike Force [EMAIL PROTECTED]
Uploaders: Branden Robinson [EMAIL PROTECTED]
Standards-Version: 3.5.8
-Build-Depends: dpkg (= 1.7.0), flex, bison, bsdmainutils, m4, groff, zlib1g-dev |
libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev | libpam-dev,
libfreetype6-dev, libpaperg, tetex-bin, po-debconf, debhelper (= 4.1.16), html2text,
libglide2-dev ( 2001.01.26) [i386], libglide3-dev ( 2001.01.26) [i386],
libglide3-alpha-dev [alpha], kernel-headers-2.4 | hurd | freebsd | netbsd | openbsd,
libpng12-0-dev | libpng-dev (= 1.2.1), libexpat1-dev, libfontconfig1-dev, fontconfig,
bzip2, libxft2-dev, libstdc++5-dev
+Build-Depends: dpkg (= 1.7.0), flex, bison, bsdmainutils, m4, groff, zlib1g-dev |
libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev | libpam-dev,
libfreetype6-dev, libpaperg, tetex-bin, po-debconf, debhelper (= 4.1.16), html2text,
libglide2-dev ( 2001.01.26) [i386], libglide3-dev ( 2001.01.26) [i386],
libglide3-alpha-dev [alpha], kernel-headers-2.4 [alpha arm hppa i386 ia64 m68k mips
mipsel powerpc s390 sh sparc], libpng12-0-dev | libpng-dev (= 1.2.1), libexpat1-dev,
libfontconfig1-dev, fontconfig, bzip2, libxft2-dev, libstdc++5-dev
Package: lbxproxy
Architecture: any
adds GNU/FreeBSD build defines to xc/config/cf. they're basicaly
copied and adapted from the defines for GNU OS.
not for submitting upstream yet, the defines in linux.cf, gnu.cf
and gnu-freebsd.cf (specialy the last two) share a large amount
of common lines. i want to split these into a gnu-common.cf file
so gnu.cf and gnu-freebsd.cf don't get easily outdated.
also the debian-specific lines in linux.cf should be moved somewhere
else. i suggested using site.def. --Robert Millan [EMAIL PROTECTED]
diff -Nur xc/config/cf.old/Imake.cf xc/config/cf/Imake.cf
--- xc/config/cf.old/Imake.cf 2003-02-27 07:34:03.0 +0100
+++ xc/config/cf/Imake.cf 2003-05-31 15:00:51.0 +0200
@@ -213,6 +213,12 @@
# endif
#endif /* NetBSD */
+#ifdef __GNU_FreeBSD__
+#define MacroIncludeFile gnu-freebsd.cf
+#define MacroFile gnu-freebsd.cf
+#define GNUFreeBSDArchitecture
+#endif
+
#ifdef __FreeBSD__
# define MacroIncludeFile FreeBSD.cf
# define MacroFile FreeBSD.cf
diff -Nur xc/config/cf.old/gfbLib.rules xc/config/cf/gfbLib.rules
--- xc/config/cf.old/gfbLib.rules 1970-01-01 01:00:00.0 +0100
+++ xc/config/cf/gfbLib.rules 2003-05-31 15:00:39.0 +0200
@@ -0,0 +1,181 @@
+/*
+ * GNU/Hurd shared library rules
+ *
+ * $XFree86: xc/config/cf/gnuLib.rules,v 1.5 2002/01/16 00:39:59 keithp Exp $
+ */
+
+/*
+ * GNU/FreeBSD shared library rules
+ * Cloned from GNU (ELF) shared library rules
+ *
+ */
+
+#ifndef HasSharedLibraries
+#define HasSharedLibraries YES
+#endif
+#ifndef ForceNormalLib
+#define ForceNormalLib NO
+#endif
+
+#ifndef SharedOldX
+#define SharedOldX NO
+#endif
+
+#undef SpecialMalloc
+#define SpecialMalloc NO
+
+#define BaseShLibReqs -lc
+
+#ifndef SharedDataSeparation
+#define SharedDataSeparation NO
+#endif
+#ifndef SharedCodeDef
+#define SharedCodeDef /**/
+#endif
+#ifndef SharedLibraryDef
+#define SharedLibraryDef /**/
+#endif
+#ifndef ShLibIncludeFile
+#define ShLibIncludeFile gfbLib.tmpl
+#endif
+#ifndef SharedLibraryLoadFlags
+XCOMM XXX To rpath or not to rpath...
+XCOMM #define SharedLibraryLoadFlags -shared -Wl,-rpath=$(USRLIBDIR)
+#define
Re: 4.2.1-6 fatal xtt symbol errors
On Sat, May 31, 2003 at 09:40:02PM -0700, Mark Hedges wrote: If this is an off-charter message then why does the X log say to report problems to the list? Because that was another bug fixed in 4.2.1-7; the BuilderEMailAddr variable wasn't getting set correctly. If you don't want people to report problems to the list then change it so the log doesn't instruct them to, but don't chastise people for following your own instructions. My boilerplate message does not presume ill-will on the part of the bug submitter, so a presumption of ill-will in its content on your part would appear to be unwarranted. More simply, don't ascribe to malice that which can be adequately explained by stupidity. (Most bugs in code are stupid ones, as my screwup of BuilderEMailAddr was.) Again, I encourage you to upgrade to 4.2.1-7. You'll get a fix for the problem you reported as well as a better message in the X log. -- G. Branden Robinson|Damnit, we're all going to die; Debian GNU/Linux |let's die doing something *useful*! [EMAIL PROTECTED] |-- Hal Clement, on comments that http://people.debian.org/~branden/ | space exploration is dangerous pgprunIhQxWqm.pgp Description: PGP signature
Bug#195646: upgrade clobbers my XF86Config-4 w/ incorrect display modes
On Sun, Jun 01, 2003 at 03:41:57AM -0400, Andres Salomon wrote: When I upgraded from -6 to -7, my XF86Config-4 was replaced. This isn't usually a problem, but it changed the display mode to incorrect values, cutting off 2 inches from the right side of my display (I have an odd-shaped lcd monitor). I realize that I have dexconf set to manage my XF86Config-4, but shouldn't it be smart enough to know that something's incorrect, since its stored values are completely different from what's in the config file (and the ### BEGIN DEBCONF SECTION isn't even the file)? The postinst bailing out (Error: your /etc/X11/XF86Config-4 is incorrectly formatted, yet you have this package configured to manage it; please run dpkg-reconfigure xserver-xfree86 to fix this) would've been preferable, I think. More than anything else, not having my screen mode (1152x768) as an option in dexconf is a nuisance. An even better solution (imo) would be the option to manually type in your mode if it's not in the list. Matt Zimmerman and I have discussed overhauling xserver-xfree86's debconfage, and after that big flamefest on the -devel list about it I have made up my mind that It Shall Be Done. Now all that's needed is the time to do it. [To debian-x: anyone want commit access to the XSF Subversion repo so they can create a branch to work on this?] -- G. Branden Robinson| No math genius, eh? Then perhaps Debian GNU/Linux | you could explain to me where you [EMAIL PROTECTED] | got these... PENROSE TILES! http://people.debian.org/~branden/ | -- Stephen R. Notley pgpbdYJfwbStM.pgp Description: PGP signature
[zeratul2@wanadoo.es: patches for GNU/FreeBSD]
I thought good news would never arrive! :)
- Forwarded message from Robert Millan [EMAIL PROTECTED] -
Date: Sun, 1 Jun 2003 13:20:03 +0200
From: Robert Millan [EMAIL PROTECTED]
To: Daniel Stone [EMAIL PROTECTED]
Subject: patches for GNU/FreeBSD
Message-ID: [EMAIL PROTECTED]
hi Daniel!
Xfree86 builds for first time on the Glibc-based GNU/FreeBSD system!!
I'm attaching a few patches. I can't bring you the MANIFEST stuff yet
because i'm still bootstrapping it (missing tetex-bin build-depends)
the debian/control patch does a little change to the kernel-headers
dependency. when i proposed the current |hurd|freebsd... scheme,
i assumed there would be each of these packages but it won't be like
that. I'll use freebsd-{kernel,libc,utils} for the stuff from the
FreeBSD system, so this needs to be changed. Since Xfree86 needs
manual work to support every architecture anyway, i think it's ok
to put the dependency like this.
820 adds GNU/FreeBSD to the build system and does the config/cf/ stuff,
the rest are bug fixes for misc components that fail miserabily. see my
comments on the patch headers for details.
please copy vars.i386 to vars.freebsd-i386 too.
buddy, my new box and UFS+SoftUpdates are _really_ making a difference,
i can build the whole thing in two or three hours! (it used to take 11 hours
on my old GNU box)
--
Robert Millan
diff -ur xfree86-4.3.0/debian.old/control xfree86-4.3.0/debian/control
--- xfree86-4.3.0/debian.old/control2003-06-01 12:35:55.0 +0200
+++ xfree86-4.3.0/debian/control2003-06-01 13:09:24.0 +0200
@@ -4,7 +4,7 @@
Maintainer: Debian X Strike Force debian-x@lists.debian.org
Uploaders: Branden Robinson [EMAIL PROTECTED]
Standards-Version: 3.5.8
-Build-Depends: dpkg (= 1.7.0), flex, bison, bsdmainutils, m4, groff,
zlib1g-dev | libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev |
libpam-dev, libfreetype6-dev, libpaperg, tetex-bin, po-debconf, debhelper (=
4.1.16), html2text, libglide2-dev ( 2001.01.26) [i386], libglide3-dev (
2001.01.26) [i386], libglide3-alpha-dev [alpha], kernel-headers-2.4 | hurd |
freebsd | netbsd | openbsd, libpng12-0-dev | libpng-dev (= 1.2.1),
libexpat1-dev, libfontconfig1-dev, fontconfig, bzip2, libxft2-dev,
libstdc++5-dev
+Build-Depends: dpkg (= 1.7.0), flex, bison, bsdmainutils, m4, groff,
zlib1g-dev | libz-dev, libncurses5-dev | libncurses-dev, libpam0g-dev |
libpam-dev, libfreetype6-dev, libpaperg, tetex-bin, po-debconf, debhelper (=
4.1.16), html2text, libglide2-dev ( 2001.01.26) [i386], libglide3-dev (
2001.01.26) [i386], libglide3-alpha-dev [alpha], kernel-headers-2.4 [alpha arm
hppa i386 ia64 m68k mips mipsel powerpc s390 sh sparc], libpng12-0-dev |
libpng-dev (= 1.2.1), libexpat1-dev, libfontconfig1-dev, fontconfig, bzip2,
libxft2-dev, libstdc++5-dev
Package: lbxproxy
Architecture: any
adds GNU/FreeBSD build defines to xc/config/cf. they're basicaly
copied and adapted from the defines for GNU OS.
not for submitting upstream yet, the defines in linux.cf, gnu.cf
and gnu-freebsd.cf (specialy the last two) share a large amount
of common lines. i want to split these into a gnu-common.cf file
so gnu.cf and gnu-freebsd.cf don't get easily outdated.
also the debian-specific lines in linux.cf should be moved somewhere
else. i suggested using site.def. --Robert Millan [EMAIL PROTECTED]
diff -Nur xc/config/cf.old/Imake.cf xc/config/cf/Imake.cf
--- xc/config/cf.old/Imake.cf 2003-02-27 07:34:03.0 +0100
+++ xc/config/cf/Imake.cf 2003-05-31 15:00:51.0 +0200
@@ -213,6 +213,12 @@
# endif
#endif /* NetBSD */
+#ifdef __GNU_FreeBSD__
+#define MacroIncludeFile gnu-freebsd.cf
+#define MacroFile gnu-freebsd.cf
+#define GNUFreeBSDArchitecture
+#endif
+
#ifdef __FreeBSD__
# define MacroIncludeFile FreeBSD.cf
# define MacroFile FreeBSD.cf
diff -Nur xc/config/cf.old/gfbLib.rules xc/config/cf/gfbLib.rules
--- xc/config/cf.old/gfbLib.rules 1970-01-01 01:00:00.0 +0100
+++ xc/config/cf/gfbLib.rules 2003-05-31 15:00:39.0 +0200
@@ -0,0 +1,181 @@
+/*
+ * GNU/Hurd shared library rules
+ *
+ * $XFree86: xc/config/cf/gnuLib.rules,v 1.5 2002/01/16 00:39:59 keithp Exp $
+ */
+
+/*
+ * GNU/FreeBSD shared library rules
+ * Cloned from GNU (ELF) shared library rules
+ *
+ */
+
+#ifndef HasSharedLibraries
+#define HasSharedLibraries YES
+#endif
+#ifndef ForceNormalLib
+#define ForceNormalLib NO
+#endif
+
+#ifndef SharedOldX
+#define SharedOldX NO
+#endif
+
+#undef SpecialMalloc
+#define SpecialMalloc NO
+
+#define BaseShLibReqs -lc
+
+#ifndef SharedDataSeparation
+#define SharedDataSeparation NO
+#endif
+#ifndef SharedCodeDef
+#define SharedCodeDef /**/
+#endif
+#ifndef SharedLibraryDef
+#define SharedLibraryDef /**/
+#endif
+#ifndef ShLibIncludeFile
+#define ShLibIncludeFile gfbLib.tmpl
+#endif
+#ifndef SharedLibraryLoadFlags
+XCOMM XXX To rpath or not to rpath...
+XCOMM #define SharedLibraryLoadFlags -shared -Wl,-rpath=$(USRLIBDIR)
+#define
X Strike Force SVN commit: rev 118 - trunk/debian
Author: branden
Date: 2003-06-01 19:00:49 -0500 (Sun, 01 Jun 2003)
New Revision: 118
Modified:
trunk/debian/changelog
trunk/debian/control
Log:
xutils depends on cpp-3.2, because imake uses cpp (thanks, James Troup)
Modified: trunk/debian/changelog
==
--- trunk/debian/changelog 2003-05-31 08:17:29 UTC (rev 117)
+++ trunk/debian/changelog 2003-06-02 00:00:49 UTC (rev 118)
@@ -13,13 +13,14 @@
- add virtual alternative libstdc++-dev to xlibmesa3-glu-dev's
dependency on libstdc++5-dev; same reasoning as above item
(Closes: #194136)
+- xutils depends on cpp-3.2, because imake uses cpp (thanks, James Troup)
- slight clarifications to xserver-xfree86, x-window-system-core, and
x-window-system package descriptions
* debian/xlibs-pic.install*: sigh; add usr/X11R6/lib/libxkbfile_pic.a so
that it's actually shipped in the package -- both LaMont and I overlooked
this subtle detail :-P
- -- Branden Robinson [EMAIL PROTECTED] Sat, 31 May 2003 00:25:59 -0500
+ -- Branden Robinson [EMAIL PROTECTED] Sun, 1 Jun 2003 18:59:51 -0500
xfree86 (4.2.1-7) unstable; urgency=medium
Modified: trunk/debian/control
==
--- trunk/debian/control2003-05-31 08:17:29 UTC (rev 117)
+++ trunk/debian/control2003-06-02 00:00:49 UTC (rev 118)
@@ -1001,7 +1001,7 @@
Package: xutils
Architecture: any
-Depends: xfree86-common ( 4.2), ${shlibs:Depends}, ${misc:Depends}
+Depends: xfree86-common ( 4.2), cpp-3.2, ${shlibs:Depends}, ${misc:Depends}
Suggests: xlibs-dev, ssh | rsh-server, ssh | rsh-client
Conflicts: rstart, rstartd, xbase-clients ( 4.0), xserver-common ( 4.0),
xbase ( 3.3.2.3a-2)
Replaces: rstart, rstartd, xbase-clients (= 4.0.1-8), xserver-common (
4.0), xbase ( 3.3.2.3a-2), xlibs-dev ( 4.1.0-12), xlib6g-dev, dpsclient,
xcontrib
X Strike Force SVN commit: rev 119 - people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches
Author: ishikawa Date: 2003-06-01 19:06:23 -0500 (Sun, 01 Jun 2003) New Revision: 119 Removed: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/453_ia64_gcc3.1_relocations.diff people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/454_ia64_no_int10.diff Modified: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/500_s390_support.diff Log: sync with current 4.3.0 branch Modified: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/500_s390_support.diff == --- people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/500_s390_support.diff 2003-06-02 00:00:49 UTC (rev 118) +++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/500_s390_support.diff 2003-06-02 00:06:23 UTC (rev 119) @@ -1,6 +1,6 @@ --- xc/config/cf/xfree86.cf.orig 2002-09-13 03:50:06.0 -0500 +++ xc/config/cf/xfree86.cf2002-09-13 03:50:41.0 -0500 -@@ -1122,6 +1122,15 @@ +@@ -1117,6 +1117,15 @@ # endif #endif Deleted: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/453_ia64_gcc3.1_relocations.diff == --- people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/453_ia64_gcc3.1_relocations.diff 2003-06-02 00:00:49 UTC (rev 118) +++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/453_ia64_gcc3.1_relocations.diff 2003-06-02 00:06:23 UTC (rev 119) @@ -1,27 +0,0 @@ -This patch from Mike A. Harris. - xc/programs/Xserver/hw/xfree86/loader/elfloader.c.ia64-gcc3.1 Thu Sep 19 09:22:02 2002 -+++ xc/programs/Xserver/hw/xfree86/loader/elfloader.c Thu Oct 10 14:47:08 2002 -@@ -2191,7 +2191,21 @@ - #endif - *dest64 = symval + rel-r_addend - (unsigned long)dest64; - break; -- -+ -+ case R_IA64_PCREL64LSB: -+ dest64=(unsigned long *)(secp+rel-r_offset); -+#ifdef ELFDEBUG -+ ELFDEBUG( R_IA64_PCREL64LSB %s\t, -+ ElfGetSymbolName(elffile,ELF_R_SYM(rel-r_info)) ); -+ ELFDEBUG( secp=%lx\t, secp ); -+ ELFDEBUG( symval=%lx\t, symval ); -+ ELFDEBUG( dest64=%lx\n, dest64 ); -+#endif -+ *dest64 = symval + rel-r_addend - ((unsigned long)dest64 -16); -+ ia64_flush_cache(dest64); -+ break; -+ -+ - case R_IA64_GPREL22: - dest128=(unsigned long *)(secp+(rel-r_offset~3)); - # ifdef ELFDEBUG Deleted: people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/454_ia64_no_int10.diff == --- people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/454_ia64_no_int10.diff 2003-06-02 00:00:49 UTC (rev 118) +++ people/ishikawa/4.3.0-0pre1v1-xrender-xcursor-split/patches/454_ia64_no_int10.diff 2003-06-02 00:06:23 UTC (rev 119) @@ -1,19 +0,0 @@ -It was never wonderful, but now with GCC 3.2 it really sucks, per Bdale -Garbee. - xc/config/cf/xfree86.cf~ 2003-03-04 15:50:15.0 -0500 -+++ xc/config/cf/xfree86.cf2003-03-04 15:51:44.0 -0500 -@@ -329,7 +329,12 @@ - # endif - /* int10 module */ - # ifndef XF86Int10 --# define XF86Int10 YES -+/* Int10 doesn't work very well on IA-64 */ -+# ifdef ia64Architecture -+# define XF86Int10 NO -+# else -+# define XF86Int10 YES -+# endif - # endif - /* vbe module */ - # ifndef XF86VBE
Bug#195646: upgrade clobbers my XF86Config-4 w/ incorrect display modes
Package: xserver-xfree86 Version: 4.2.1-7 Severity: normal Tags: sid When I upgraded from -6 to -7, my XF86Config-4 was replaced. This isn't usually a problem, but it changed the display mode to incorrect values, cutting off 2 inches from the right side of my display (I have an odd-shaped lcd monitor). I realize that I have dexconf set to manage my XF86Config-4, but shouldn't it be smart enough to know that something's incorrect, since its stored values are completely different from what's in the config file (and the ### BEGIN DEBCONF SECTION isn't even the file)? The postinst bailing out (Error: your /etc/X11/XF86Config-4 is incorrectly formatted, yet you have this package configured to manage it; please run dpkg-reconfigure xserver-xfree86 to fix this) would've been preferable, I think. More than anything else, not having my screen mode (1152x768) as an option in dexconf is a nuisance. An even better solution (imo) would be the option to manually type in your mode if it's not in the list. This is my previous, correct XF86Config-4: -- Section Files FontPath/usr/lib/X11/fonts/misc FontPath/usr/lib/X11/fonts/75dpi/:unscaled FontPath/usr/lib/X11/fonts/TrueType FontPath/usr/lib/X11/fonts/75dpi FontPath/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType #FontPath unix/:7100# local font server # if the local font server has problems, we can fall back on these #FontPath /usr/lib/X11/fonts/cyrillic #FontPath /usr/lib/X11/fonts/100dpi/:unscaled #FontPath /usr/lib/X11/fonts/Speedo #FontPath /usr/lib/X11/fonts/100dpi #FontPath /usr/lib/X11/fonts/Type1 EndSection Section Module LoadGLcore Loadbitmap Loaddbe Loadddc Loaddri Loadextmod Loadfreetype Loadglx Loadint10 Loadfb Loadrecord Loadspeedo Loadtype1 Loadvbe #Load xie # Loadpex5 EndSection Section InputDevice Identifier Generic Keyboard Driver keyboard Option CoreKeyboard Option XkbRules xfree86 Option XkbModel macintosh Option XkbLayout us EndSection Section InputDevice Identifier Configured Mouse Driver mouse Option CorePointer Option Device/dev/input/mice Option Protocol IMPS/2 Option ZAxisMapping 4 5 EndSection Section Device Identifier TiBook Internal Video Driver r128 BusID PCI:0:16:0 Option UseFBDev #true EndSection Section Monitor Identifier TiBook Panel HorizSync 30-100 VertRefresh 55-160 Option DPMS Modeline1152x768 78.741 1152 1173 1269 1440 768 769 772 800 +HSync +VSync EndSection Section Screen Identifier Default Screen Device TiBook Internal Video Monitor TiBook Panel DefaultDepth16 SubSection Display Depth 24 Modes 1152x768 EndSubSection SubSection Display Depth 8 Modes 1152x768 EndSubSection SubSection Display Depth 16 Modes 1152x768 EndSubSection EndSection Section ServerLayout Identifier Default Layout Screen Default Screen InputDevice Generic Keyboard InputDevice Configured Mouse EndSection Section DRI Group dri Mode0666 EndSection - And, here's the one the -7 packages replaced it w/: - ### BEGIN DEBCONF SECTION # XF86Config-4 (XFree86 server configuration file) generated by dexconf, the # Debian X Configuration tool, using values from the debconf database. # # Edit this file with caution, and see the XF86Config-4 manual page. # (Type man XF86Config-4 at the shell prompt.) # # If you want your changes to this file preserved by dexconf, only make changes # before the ### BEGIN DEBCONF SECTION line above, and/or after the # ### END DEBCONF SECTION line below. # # To change things within the debconf section, run the command: # dpkg-reconfigure xserver-xfree86 # as root. Also see How do I add custom sections to a dexconf-generated # XF86Config or XF86Config-4 file? in /usr/share/doc/xfree86-common/FAQ.gz. Section Module LoadGLcore Loadbitmap Loaddbe Loadddc Loaddri Loadextmod Loadfreetype Loadglx Loadint10
