1 --- XFree86-driver-firegl-2.9.8/panel_src/Makefile.fix Wed May 7 00:12:45 2003
2 +++ XFree86-driver-firegl-2.9.8/panel_src/Makefile Wed May 7 00:17:42 2003
4 $(error environment missing: MK_QTDIR=$(MK_QTDIR))
7 -ifeq ($(shell test -e $(MK_QTDIR)/include/qglobal.h$(colon) echo $$?),1)
8 +ifeq ($(shell test -e $(MK_QTDIR)/include/qt/qglobal.h$(colon) echo $$?),1)
9 $(error environment incomplete: MK_QTDIR=$(MK_QTDIR))
13 -QT_VER=$(shell grep QT_VERSION_STR $(MK_QTDIR)/include/qglobal.h | cut -d'"' -f2 | cut -d'.' -f1)
14 +QT_VER=$(shell grep QT_VERSION_STR $(MK_QTDIR)/include/qt/qglobal.h | cut -d'"' -f2 | cut -d'.' -f1)
20 CINCDIR = -I/usr/X11R6/include -I. -I./include_dummy
26 CFLAGS = $(CDEBFLAGS) -O2 -fno-strength-reduce -funsigned-char $(CDEFINES)
28 LFLAGS = $(CDEBFLAGS) -L/usr/X11R6/$(LIB_DIR) -lXaw -lXmu -lXt -lXext -lX11
31 -CCINCDIR = -I$(MK_QTDIR)/include -I. -I./include_dummy
32 +CCINCDIR = -I$(MK_QTDIR)/include -I. -I./include_dummy -I/usr/include/qt
33 CCDEFINES = $(DEFINES)
36 --- XFree86-driver-firegl-2.9.8/panel_src/main.cpp.fix Wed May 7 00:19:12 2003
37 +++ XFree86-driver-firegl-2.9.8/panel_src/main.cpp Wed May 7 00:20:06 2003
39 // printf ( "%s\n", lpath.data() ) ;
40 // printf ( "%s\n", lfile.data() ) ;
42 - QApplication::setStyle ( new QWindowsStyle ) ;
43 + QApplication::setStyle ( "Windows" ) ;
45 QApplication a( argc, argv );