File fix-fonts-path.diff of Package kdelibs3

Overview Repositories Revisions Requests Users Attributes Meta

File fix-fonts-path.diff of Package kdelibs3 (Revision 1061024dd79f8abb5e54466aad17e5f6)

Currently displaying revision 1061024dd79f8abb5e54466aad17e5f6 , Show latest

--- khtml/test_regression.cpp	2006/08/03 08:13:54	1.1
+++ khtml/test_regression.cpp	2006/08/03 08:19:08
@@ -480,7 +480,7 @@
         xvfb = fork();
         if ( !xvfb ) {
             char buffer[2000];
-            sprintf( buffer, "%s/resources,/usr/X11R6/lib/X11/fonts/75dpi:unscaled,/usr/X11R6/lib/X11/fonts/misc:unscaled,/usr/X11R6/lib/X11/fonts/Type1,/usr/share/fonts/X11/misc,/usr/share/fonts/X11/75dpi:unscaled,/usr/share/fonts/X11/Type1,"
+            sprintf( buffer, "%s/resources,/usr/X11R6/lib/X11/fonts/75dpi:unscaled,/usr/X11R6/lib/X11/fonts/misc:unscaled,/usr/X11R6/lib/X11/fonts/Type1,/usr/share/fonts/misc,/usr/share/fonts/75dpi:unscaled,/usr/share/fonts/Type1,"
             "/usr/lib/X11/fonts/75dpi:unscaled,/usr/lib/X11/fonts/misc:unscaled,/usr/lib/X11/fonts/Type1",
              (const char *)baseDir );
             execl( xvfbPath8.data(), xvfbPath8.data(), "-once", "-dpi", "100", "-screen", "0", "1024x768x16", "-ac", "-fp", buffer, ":47", (char*)NULL );
------------------------------------------------------------------------
r586510 | mueller | 2006-09-19 22:40:11 +0200 (Tue, 19 Sep 2006) | 5 lines

It seems Xorg 7.x switches to the more memory efficient
DirectColor visual by default. Too bad that Qt isn't prepared
for that, so it overruns various buffers and crashes in
at least half a dozen places. So enforce the old TrueColor visual.

------------------------------------------------------------------------
Index: khtml/test_regression.cpp
===================================================================
--- khtml/test_regression.cpp	(revision 586509)
+++ khtml/test_regression.cpp	(revision 586510)
@@ -107,8 +107,8 @@ using namespace khtml;
 using namespace DOM;
 using namespace KJS;
 
-bool visual = false;
-pid_t xvfb;
+static bool visual = false;
+static pid_t xvfb;
 
 // -------------------------------------------------------------------------
 
@@ -177,7 +177,7 @@ void PartMonitor::partCompleted()
     disconnect(m_part,SIGNAL(completed()),this,SLOT(partCompleted()));
 }
 
-void signal_handler( int )
+static void signal_handler( int )
 {
     printf( "timeout\n" );
     abort();
@@ -446,6 +446,9 @@ int main(int argc, char *argv[])
 
     signal( SIGALRM, signal_handler );
 
+    // workaround various Qt crashes by always enforcing a TrueColor visual
+    QApplication::setColorSpec( QApplication::ManyColor );
+
     KCmdLineArgs::init(argc, argv, "testregression", "TestRegression",
                        "Regression tester for khtml", "1.0");
     KCmdLineArgs::addCmdLineOptions(options);

Places

File fix-fonts-path.diff of Package kdelibs3 (Revision 1061024dd79f8abb5e54466aad17e5f6)

Places