Date: Thu, 20 Jun 2002 17:22:28 +0200 From: Michael Nottebrock <michaelnottebrock@gmx.net> To: Ollivier Robert <roberto@keltia.freenix.fr> Cc: freebsd-current@FreeBSD.ORG Subject: Re: konqueror 3.0.1 eats all CPU Message-ID: <3D11F334.30300@gmx.net> References: <20020620141525.GA2818@tara.freenix.org>
next in thread | previous in thread | raw e-mail | index | archive | help
The following is an OpenPGP/MIME signed message
created by Enigmail/Mozilla, following RFC 2440 and RFC 2015
--------------enigA1127618ED7515380B7C1CB1
Content-Type: multipart/mixed;
boundary="------------070403080701050603030902"
This is a multi-part message in MIME format.
--------------070403080701050603030902
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Ollivier Robert wrote:
> On my vaio laptop running current from 2 days ago and recompiling kde 3.0.1 to
> have it all compiled with gcc/g++ 3.1, everytime I run konqueror, kdeinit goes
> south and starts eating all CPU... Sometimes, it starts loading the page,
> begin to display part of it and then puf, eats all CPU again.
At least on -CURRENT, this stems from QT being compiled with the
system-gcc3, which breaks the gif-loader of QT. Here is a patch for the
qt30-port to depend on gcc31 from the the ports for the time being (for
-CURRENT > 500034)
(uncc'd kde@freebsd.org because I already posted the patch there)
Regards,
--
Michael Nottebrock
"The circumstance ends uglily in the cruel result." - Babelfish
--------------070403080701050603030902
Content-Type: text/plain;
name="qt30.patch.txt"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="qt30.patch.txt"
diff -urN qt30.orig/Makefile qt30/Makefile
--- qt30.orig/Makefile Sat Jun 15 18:16:30 2002
+++ qt30/Makefile Thu Jun 20 00:47:44 2002
@@ -63,6 +63,21 @@
.include <bsd.port.pre.mk>
+.if ${OSVERSION} > 500034
+BUILD_DEPENDS+= gcc31:${PORTSDIR}/lang/gcc31
+#CONFIGURE_ARGS+= -platform freebsd-portbld-g++31
+CONFIGURE_ARGS= -prefix ${QT_PREFIX} \
+ -shared -qt-gif -system-zlib \
+ -no-g++-exceptions -thread -no-stl \
+ -${IMAGELIB_TYPE}-imgfmt-png \
+ -${IMAGELIB_TYPE}-imgfmt-jpeg \
+ -${IMAGELIB_TYPE}-imgfmt-mng \
+ -system-libpng -system-libjpeg -system-libmng \
+ -no-nas-sound -sm -remote \
+ -docdir ${QT_PREFIX}/share/doc/qt \
+ -platform freebsd-portbld-g++31
+.endif
+
.if ${MACHINE_ARCH} == "alpha"
CFLAGS+= -O0
.endif
@@ -99,6 +114,7 @@
@cd ${WRKSRC}/extensions/nsplugin/src; \
${RM} -f jri.h jri_md.h jritypes.h npapi.h npupp.h \
npunix.c npwin.cpp
+ @${CP} -R ${FILESDIR}/freebsd-portbld-g++31 ${WRKSRC}/mkspecs
# Work around qmake generated dependencies
pre-install:
diff -urN qt30.orig/files/freebsd-portbld-g++31/qmake.conf qt30/files/freebsd-portbld-g++31/qmake.conf
--- qt30.orig/files/freebsd-portbld-g++31/qmake.conf Thu Jan 1 01:00:00 1970
+++ qt30/files/freebsd-portbld-g++31/qmake.conf Thu Jun 20 00:48:39 2002
@@ -0,0 +1,80 @@
+#
+# $Id$
+#
+# qmake configuration for freebsd-g++
+#
+
+MAKEFILE_GENERATOR = UNIX
+TEMPLATE = app
+CONFIG += qt warn_on release
+
+QMAKE_CC = gcc31
+QMAKE_LEX = flex
+QMAKE_LEXFLAGS =
+QMAKE_YACC = yacc
+QMAKE_YACCFLAGS = -d
+QMAKE_CFLAGS = -pipe
+QMAKE_CFLAGS_DEPS = -M
+QMAKE_CFLAGS_WARN_ON = -Wall -W
+QMAKE_CFLAGS_WARN_OFF = -w
+QMAKE_CFLAGS_RELEASE = -O2
+QMAKE_CFLAGS_DEBUG = -g
+QMAKE_CFLAGS_SHLIB = -fPIC
+QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
+QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE
+
+QMAKE_CXX = g++31
+QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
+QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
+QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
+QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
+QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
+QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG
+QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB
+QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
+QMAKE_CXXFLAGS_THREAD = -pthread -D_THREAD_SAFE
+
+# Addon software goes into /usr/local on the BSDs, by default we will look there
+#QMAKE_INCDIR = /usr/local/include
+#QMAKE_LIBDIR = /usr/local/lib
+QMAKE_INCDIR_X11 = /usr/X11R6/include
+QMAKE_LIBDIR_X11 = /usr/X11R6/lib
+QMAKE_INCDIR_QT = $(QTDIR)/include
+QMAKE_LIBDIR_QT = $(QTDIR)/lib
+QMAKE_INCDIR_OPENGL = /usr/X11R6/include
+QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
+
+QMAKE_LINK = g++31
+QMAKE_LINK_SHLIB = g++31
+QMAKE_LFLAGS =
+QMAKE_LFLAGS_RELEASE =
+QMAKE_LFLAGS_DEBUG =
+QMAKE_LFLAGS_SHLIB = -shared
+QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
+QMAKE_LFLAGS_SONAME = -Wl,-soname,
+QMAKE_LFLAGS_THREAD = -pthread
+QMAKE_RPATH = -Wl,-rpath,
+
+QMAKE_LIBS =
+QMAKE_LIBS_X11 = -lXext -lX11 -lm
+QMAKE_LIBS_X11SM = -lICE -lSM
+QMAKE_LIBS_QT = -lqt
+QMAKE_LIBS_QT_THREAD = -lqt-mt
+QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu
+QMAKE_LIBS_OPENGL_QT = -lGL -lXmu
+QMAKE_LIBS_THREAD =
+
+QMAKE_MOC = $(QTDIR)/bin/moc
+QMAKE_UIC = $(QTDIR)/bin/uic
+
+QMAKE_AR = ar cqs
+QMAKE_RANLIB =
+
+QMAKE_TAR = tar -cf
+QMAKE_GZIP = gzip -9f
+
+QMAKE_COPY = cp -f
+QMAKE_MOVE = mv -f
+QMAKE_DEL_FILE = rm -f
+QMAKE_DEL_DIR = rmdir
+
diff -urN qt30.orig/files/freebsd-portbld-g++31/qplatformdefs.h qt30/files/freebsd-portbld-g++31/qplatformdefs.h
--- qt30.orig/files/freebsd-portbld-g++31/qplatformdefs.h Thu Jan 1 01:00:00 1970
+++ qt30/files/freebsd-portbld-g++31/qplatformdefs.h Wed Jun 19 23:52:45 2002
@@ -0,0 +1,89 @@
+#ifndef QPLATFORMDEFS_H
+#define QPLATFORMDEFS_H
+
+// Get Qt defines/settings
+
+#include "qglobal.h"
+
+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+
+#include <unistd.h>
+
+
+// We are hot - unistd.h should have turned on the specific APIs we requested
+
+
+#ifdef QT_THREAD_SUPPORT
+#include <pthread.h>
+#endif
+
+#include <dirent.h>
+#include <fcntl.h>
+#include <grp.h>
+#include <pwd.h>
+#include <signal.h>
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/ipc.h>
+#include <sys/time.h>
+#include <sys/shm.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+
+// DNS header files are not fully covered by X/Open specifications.
+// In particular nothing is said about res_* :/
+// On BSDs header files <netinet/in.h> and <arpa/nameser.h> are not
+// included by <resolv.h>. Note that <arpa/nameser.h> must be included
+// before <resolv.h>.
+#include <netinet/in.h>
+#define class c_class // FreeeBSD 3.x
+#include <arpa/nameser.h>
+#undef class
+#include <resolv.h>
+
+
+#define QT_STATBUF struct stat
+#define QT_STATBUF4TSTAT struct stat
+#define QT_STAT ::stat
+#define QT_FSTAT ::fstat
+#define QT_STAT_REG S_IFREG
+#define QT_STAT_DIR S_IFDIR
+#define QT_STAT_MASK S_IFMT
+#define QT_STAT_LNK S_IFLNK
+#define QT_FILENO fileno
+#define QT_OPEN ::open
+#define QT_CLOSE ::close
+#define QT_LSEEK ::lseek
+#define QT_READ ::read
+#define QT_WRITE ::write
+#define QT_ACCESS ::access
+#define QT_GETCWD ::getcwd
+#define QT_CHDIR ::chdir
+#define QT_MKDIR ::mkdir
+#define QT_RMDIR ::rmdir
+#define QT_OPEN_RDONLY O_RDONLY
+#define QT_OPEN_WRONLY O_WRONLY
+#define QT_OPEN_RDWR O_RDWR
+#define QT_OPEN_CREAT O_CREAT
+#define QT_OPEN_TRUNC O_TRUNC
+#define QT_OPEN_APPEND O_APPEND
+
+#define QT_SIGNAL_RETTYPE void
+#define QT_SIGNAL_ARGS int
+#define QT_SIGNAL_IGNORE SIG_IGN
+
+#if __FreeBSD_version < 400000
+// FreeBSD 1.0 - 3.5.1
+# define QT_SOCKLEN_T int
+#else
+// FreeBSD 4.0 - 5.0
+# define QT_SOCKLEN_T socklen_t
+#endif
+
+#define QT_SNPRINTF ::snprintf
+#define QT_VSNPRINTF ::vsnprintf
+
+
+#endif // QPLATFORMDEFS_H
--------------070403080701050603030902--
--------------enigA1127618ED7515380B7C1CB1
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (FreeBSD)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQE9EfM5Xhc68WspdLARArwBAKCjxk9gtBrJLFBInGcgAoIFLP8GsQCfVfZH
YlHayMh7vMCPNn0Cm0nwnns=
=ul9u
-----END PGP SIGNATURE-----
--------------enigA1127618ED7515380B7C1CB1--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3D11F334.30300>