3 # Patch managed by http://www.holgerschurig.de/patcher.html
6 Index: qt-2.3.10/configure
7 ===================================================================
8 --- qt-2.3.10.orig/configure 2005-07-03 12:26:10.000000000 +0200
9 +++ qt-2.3.10/configure 2005-07-03 12:30:36.000000000 +0200
18 GPLUSPLUS_EXCEPTIONS=no
21 -visibility-hidden . Use -fvisibility=hidden as default. This requires GCC 4.0
22 or a special patched GCC to support the visibility attribute
24 + -devfs ............. Use devfs /dev paths.
26 -no-g++-exceptions . Disable exceptions on platforms using the GNU C++
27 compiler by using the -fno-exceptions flag.
29 @@ -1374,6 +1379,10 @@
31 QT_CXX="${QT_CXX} -DGCC_SUPPORTS_VISIBILITY -fvisibility=hidden"
33 +if [ "x$DEVFS" = "xyes" ]
35 + QT_CXX="${QT_CXX} -DQT_QWS_DEVFS"
37 if [ "x$THREAD" = "xyes" ]
40 Index: qt-2.3.10/src/kernel/qgfxlinuxfb_qws.cpp
41 ===================================================================
42 --- qt-2.3.10.orig/src/kernel/qgfxlinuxfb_qws.cpp 2005-07-03 12:26:13.000000000 +0200
43 +++ qt-2.3.10/src/kernel/qgfxlinuxfb_qws.cpp 2005-07-03 12:30:36.000000000 +0200
45 bool QLinuxFbScreen::connect( const QString &displaySpec )
47 // Check for explicitly specified device
49 + QRegExp r( "/dev/fb/[0-9]+" );
51 QRegExp r( "/dev/fb[0-9]+" );
54 int m = r.match( displaySpec, 0, &len );
57 + QString dev = (m>=0) ? displaySpec.mid( m, len ) : QString("/dev/fb/0");
59 QString dev = (m>=0) ? displaySpec.mid( m, len ) : QString("/dev/fb0");
62 fd=open( dev.latin1(), O_RDWR );
66 /* Get fixed screen information */
67 if (ioctl(fd, FBIOGET_FSCREENINFO, &finfo)) {
69 + perror("reading /dev/fb/0");
71 perror("reading /dev/fb0");
73 qWarning("Error reading fixed information");
77 /* Get variable screen information */
78 if (ioctl(fd, FBIOGET_VSCREENINFO, &vinfo)) {
80 + perror("reading /dev/fb/0");
82 perror("reading /dev/fb0");
84 qWarning("Error reading variable information");
90 if ((int)data == -1) {
91 - perror("mapping /dev/fb0");
93 + perror("reading /dev/fb/0");
95 + perror("reading /dev/fb0");
97 qWarning("Error: failed to map framebuffer device to memory.");
102 static void writeTerm(const char* termctl, int sizeof_termctl)
105 + const char* tt[]={"/dev/vc/1","/dev/console","/dev/tty",0};
107 const char* tt[]={"/dev/console","/dev/tty","/dev/tty0",0};
111 int tty=::open(*dev,O_WRONLY);
112 Index: qt-2.3.10/src/kernel/qkeyboard_qws.cpp
113 ===================================================================
114 --- qt-2.3.10.orig/src/kernel/qkeyboard_qws.cpp 2005-07-03 12:26:13.000000000 +0200
115 +++ qt-2.3.10/src/kernel/qkeyboard_qws.cpp 2005-07-03 12:30:36.000000000 +0200
116 @@ -1253,7 +1253,11 @@
118 QWSTtyKeyboardHandler::QWSTtyKeyboardHandler(const QString& device)
121 + kbdFD=open(device.isEmpty() ? "/dev/vc/1" : device.latin1(), O_RDWR | O_NDELAY, 0);
123 kbdFD=open(device.isEmpty() ? "/dev/tty0" : device.latin1(), O_RDWR | O_NDELAY, 0);
127 QSocketNotifier *notifier;
128 Index: qt-2.3.10/src/kernel/qwindowsystem_qws.cpp
129 ===================================================================
130 --- qt-2.3.10.orig/src/kernel/qwindowsystem_qws.cpp 2005-07-03 12:26:11.000000000 +0200
131 +++ qt-2.3.10/src/kernel/qwindowsystem_qws.cpp 2005-07-03 12:30:36.000000000 +0200
137 + int fd = ::open("/dev/sound/dsp",O_RDWR);
139 int fd = ::open("/dev/dsp",O_RDWR);
142 // For debugging purposes - defined QT_NO_SOUND if you
143 // don't have sound hardware!
144 Index: qt-2.3.10/src/kernel/qsoundqss_qws.cpp
145 ===================================================================
146 --- qt-2.3.10.orig/src/kernel/qsoundqss_qws.cpp 2005-01-23 15:00:46.000000000 +0100
147 +++ qt-2.3.10/src/kernel/qsoundqss_qws.cpp 2005-07-03 12:30:36.000000000 +0200
148 @@ -1088,7 +1088,12 @@
149 // Don't block open right away.
151 bool openOkay = false;
152 - if ((fd = ::open("/dev/dsp", O_WRONLY|O_NONBLOCK)) != -1) {
154 + if ((fd = ::open("/dev/sound/dsp", O_WRONLY|O_NONBLOCK)) != -1)
156 + if ((fd = ::open("/dev/dsp", O_WRONLY|O_NONBLOCK)) != -1)
159 int flags = fcntl(fd, F_GETFL);
160 flags &= ~O_NONBLOCK;
161 openOkay = (fcntl(fd, F_SETFL, flags) == 0);