Author: rmh Date: 2004-07-28 14:34:21 -0500 (Wed, 28 Jul 2004) New Revision: 1691
Modified: branches/4.3.0/sid/debian/changelog branches/4.3.0/sid/debian/patches/031_glxinfo_makefile.diff Log: Undo commit 1674, which was done in the wrong branch. Modified: branches/4.3.0/sid/debian/changelog =================================================================== --- branches/4.3.0/sid/debian/changelog 2004-07-28 16:49:31 UTC (rev 1690) +++ branches/4.3.0/sid/debian/changelog 2004-07-28 19:34:21 UTC (rev 1691) @@ -1,12 +1,3 @@ -xfree86 (4.3.0.dfsg.1-7) unstable; urgency=low - - Changes by Robert Millan: - - * Get glxinfo to link properly with g++ (instead of adding -lstdc++). - - 031_glxinfo_makefile.diff: Replace with patch from Branden. - - -- Robert Millan <[EMAIL PROTECTED]> Mon, 19 Jul 2004 16:39:53 +0200 - xfree86 (4.3.0.dfsg.1-6) unstable; urgency=low * Apply patch by David S. Miller via Ben Collins to add RENDER and X Modified: branches/4.3.0/sid/debian/patches/031_glxinfo_makefile.diff =================================================================== --- branches/4.3.0/sid/debian/patches/031_glxinfo_makefile.diff 2004-07-28 16:49:31 UTC (rev 1690) +++ branches/4.3.0/sid/debian/patches/031_glxinfo_makefile.diff 2004-07-28 19:34:21 UTC (rev 1691) @@ -1,15 +1,15 @@ $Id$ -Use g++ for glxinfo, since it links against C++ libraries and otherwise -breaks on GNU/kFreeBSD (I can't tell why this used to work on GNU/Linux, -broken as it was..); patch by Branden. - -- Robert Millan +This patch fixes linking of glxinfo on systems by explicitly dragging in +libstdc++; patch by Robert Millan. ---- xc/programs/glxinfo/Imakefile.old 2002-11-22 23:56:03.000000000 +0100 -+++ xc/programs/glxinfo/Imakefile 2004-07-19 13:40:22.000000000 +0200 -@@ -17,4 +17,4 @@ +--- xc/programs/glxinfo/Imakefile.old 2003-04-03 18:51:56.000000000 +0200 ++++ xc/programs/glxinfo/Imakefile 2003-04-03 18:52:04.000000000 +0200 +@@ -15,6 +15,6 @@ - SYS_LIBRARIES = MathLibrary + #endif --SimpleProgramTarget(glxinfo) -+SimpleCplusplusProgramTarget(glxinfo) +- SYS_LIBRARIES = MathLibrary ++ SYS_LIBRARIES = MathLibrary -lstdc++ + + SimpleProgramTarget(glxinfo)
