Add openssh
[kopensolaris-gnu/patches.git] / qt4-x11-4.4.0.diff
1 diff -uraN qt4-x11-4.4.0.orig/debian/patches/95_kopensolaris-gnu.diff qt4-x11-4.4.0/debian/patches/95_kopensolaris-gnu.diff
2 --- qt4-x11-4.4.0.orig/debian/patches/95_kopensolaris-gnu.diff  1969-12-31 19:00:00.000000000 -0500
3 +++ qt4-x11-4.4.0/debian/patches/95_kopensolaris-gnu.diff       2008-09-26 03:52:02.552886895 -0400
4 @@ -0,0 +1,1000 @@
5 +diff -uraN qt-x11-opensource-src-4.4.0.orig/configure qt-x11-opensource-src-4.4.0/configure
6 +--- qt-x11-opensource-src-4.4.0.orig/configure 2008-04-28 09:11:12.000000000 -0400
7 ++++ qt-x11-opensource-src-4.4.0/configure      2008-09-26 03:42:57.678464088 -0400
8 +@@ -2115,6 +2115,9 @@
9 +             - Also available for Linux: linux-kcc linux-icc linux-cxx
10 +         "
11 +         ;;
12 ++     GNU/kOpenSolaris:*)
13 ++        PLATFORM=kopensolaris-gnu-g++
14 ++        ;;
15 +      SunOS:5*)
16 +         #PLATFORM=solaris-g++
17 +         PLATFORM=solaris-cc
18 +diff -uraN qt-x11-opensource-src-4.4.0.orig/mkspecs/kopensolaris-gnu-g++/qmake.conf qt-x11-opensource-src-4.4.0/mkspecs/kopensolaris-gnu-g++/qmake.conf
19 +--- qt-x11-opensource-src-4.4.0.orig/mkspecs/kopensolaris-gnu-g++/qmake.conf   1969-12-31 19:00:00.000000000 -0500
20 ++++ qt-x11-opensource-src-4.4.0/mkspecs/kopensolaris-gnu-g++/qmake.conf        2008-09-26 03:42:57.732266422 -0400
21 +@@ -0,0 +1,13 @@
22 ++#
23 ++# qmake configuration for kopensolaris-gnu-g++
24 ++#
25 ++
26 ++MAKEFILE_GENERATOR    = UNIX
27 ++TEMPLATE              = app
28 ++CONFIG                        += qt warn_on release incremental link_prl
29 ++QT                    += core gui
30 ++QMAKE_INCREMENTAL_STYLE = sublib
31 ++
32 ++include(../common/g++.conf)
33 ++include(../common/linux.conf)
34 ++load(qt_config)
35 +diff -uraN qt-x11-opensource-src-4.4.0.orig/mkspecs/kopensolaris-gnu-g++/qplatformdefs.h qt-x11-opensource-src-4.4.0/mkspecs/kopensolaris-gnu-g++/qplatformdefs.h
36 +--- qt-x11-opensource-src-4.4.0.orig/mkspecs/kopensolaris-gnu-g++/qplatformdefs.h      1969-12-31 19:00:00.000000000 -0500
37 ++++ qt-x11-opensource-src-4.4.0/mkspecs/kopensolaris-gnu-g++/qplatformdefs.h   2008-09-26 03:42:57.732717390 -0400
38 +@@ -0,0 +1,166 @@
39 ++/****************************************************************************
40 ++**
41 ++** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved.
42 ++**
43 ++** This file is part of the qmake spec of the Qt Toolkit.
44 ++**
45 ++** This file may be used under the terms of the GNU General Public
46 ++** License versions 2.0 or 3.0 as published by the Free Software
47 ++** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
48 ++** included in the packaging of this file.  Alternatively you may (at
49 ++** your option) use any later version of the GNU General Public
50 ++** License if such license has been publicly approved by Trolltech ASA
51 ++** (or its successors, if any) and the KDE Free Qt Foundation. In
52 ++** addition, as a special exception, Trolltech gives you certain
53 ++** additional rights. These rights are described in the Trolltech GPL
54 ++** Exception version 1.2, which can be found at
55 ++** http://www.trolltech.com/products/qt/gplexception/ and in the file
56 ++** GPL_EXCEPTION.txt in this package.
57 ++**
58 ++** Please review the following information to ensure GNU General
59 ++** Public Licensing requirements will be met:
60 ++** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
61 ++** you are unsure which license is appropriate for your use, please
62 ++** review the following information:
63 ++** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
64 ++** or contact the sales department at sales@trolltech.com.
65 ++**
66 ++** In addition, as a special exception, Trolltech, as the sole
67 ++** copyright holder for Qt Designer, grants users of the Qt/Eclipse
68 ++** Integration plug-in the right for the Qt/Eclipse Integration to
69 ++** link to functionality provided by Qt Designer and its related
70 ++** libraries.
71 ++**
72 ++** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
73 ++** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
74 ++** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
75 ++** granted herein.
76 ++**
77 ++** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
78 ++** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
79 ++**
80 ++****************************************************************************/
81 ++
82 ++#ifndef QPLATFORMDEFS_H
83 ++#define QPLATFORMDEFS_H
84 ++
85 ++// Get Qt defines/settings
86 ++
87 ++#include "qglobal.h"
88 ++
89 ++// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
90 ++
91 ++// 1) need to reset default environment if _BSD_SOURCE is defined
92 ++// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
93 ++// 3) it seems older glibc need this to include the X/Open stuff
94 ++#ifndef _GNU_SOURCE
95 ++#  define _GNU_SOURCE
96 ++#endif
97 ++
98 ++#include <unistd.h>
99 ++
100 ++
101 ++// We are hot - unistd.h should have turned on the specific APIs we requested
102 ++
103 ++#include <features.h>
104 ++#include <pthread.h>
105 ++#include <dirent.h>
106 ++#include <fcntl.h>
107 ++#include <grp.h>
108 ++#include <pwd.h>
109 ++#include <signal.h>
110 ++#include <dlfcn.h>
111 ++
112 ++#include <sys/types.h>
113 ++#include <sys/ioctl.h>
114 ++#include <sys/ipc.h>
115 ++#include <sys/time.h>
116 ++#include <sys/shm.h>
117 ++#include <sys/socket.h>
118 ++#include <sys/stat.h>
119 ++#include <sys/wait.h>
120 ++#include <netinet/in.h>
121 ++#ifndef QT_NO_IPV6IFNAME
122 ++#include <net/if.h>
123 ++#endif
124 ++
125 ++#ifdef QT_LARGEFILE_SUPPORT
126 ++#define QT_STATBUF              struct stat64
127 ++#define QT_STATBUF4TSTAT        struct stat64
128 ++#define QT_STAT                 ::stat64
129 ++#define QT_FSTAT                ::fstat64
130 ++#define QT_LSTAT                ::lstat64
131 ++#define QT_OPEN                 ::open64
132 ++#define QT_TRUNCATE             ::truncate64
133 ++#define QT_FTRUNCATE            ::ftruncate64
134 ++#define QT_LSEEK                ::lseek64
135 ++#else
136 ++#define QT_STATBUF              struct stat
137 ++#define QT_STATBUF4TSTAT        struct stat
138 ++#define QT_STAT                 ::stat
139 ++#define QT_FSTAT                ::fstat
140 ++#define QT_LSTAT                ::lstat
141 ++#define QT_OPEN                 ::open
142 ++#define QT_TRUNCATE             ::truncate
143 ++#define QT_FTRUNCATE            ::ftruncate
144 ++#define QT_LSEEK                ::lseek
145 ++#endif
146 ++
147 ++#ifdef QT_LARGEFILE_SUPPORT
148 ++#define QT_FOPEN                ::fopen64
149 ++#define QT_FSEEK                ::fseeko64
150 ++#define QT_FTELL                ::ftello64
151 ++#define QT_FGETPOS              ::fgetpos64
152 ++#define QT_FSETPOS              ::fsetpos64
153 ++#define QT_FPOS_T               fpos64_t
154 ++#define QT_OFF_T                off64_t
155 ++#else
156 ++#define QT_FOPEN                ::fopen
157 ++#define QT_FSEEK                ::fseek
158 ++#define QT_FTELL                ::ftell
159 ++#define QT_FGETPOS              ::fgetpos
160 ++#define QT_FSETPOS              ::fsetpos
161 ++#define QT_FPOS_T               fpos_t
162 ++#define QT_OFF_T                long
163 ++#endif
164 ++
165 ++#define QT_STAT_REG           S_IFREG
166 ++#define QT_STAT_DIR           S_IFDIR
167 ++#define QT_STAT_MASK          S_IFMT
168 ++#define QT_STAT_LNK           S_IFLNK
169 ++#define QT_SOCKET_CONNECT     ::connect
170 ++#define QT_SOCKET_BIND                ::bind
171 ++#define QT_FILENO             fileno
172 ++#define QT_CLOSE              ::close
173 ++#define QT_READ                       ::read
174 ++#define QT_WRITE              ::write
175 ++#define QT_ACCESS             ::access
176 ++#define QT_GETCWD             ::getcwd
177 ++#define QT_CHDIR              ::chdir
178 ++#define QT_MKDIR              ::mkdir
179 ++#define QT_RMDIR              ::rmdir
180 ++#define QT_OPEN_LARGEFILE       O_LARGEFILE
181 ++#define QT_OPEN_RDONLY                O_RDONLY
182 ++#define QT_OPEN_WRONLY                O_WRONLY
183 ++#define QT_OPEN_RDWR          O_RDWR
184 ++#define QT_OPEN_CREAT         O_CREAT
185 ++#define QT_OPEN_TRUNC         O_TRUNC
186 ++#define QT_OPEN_APPEND                O_APPEND
187 ++
188 ++#define QT_SIGNAL_RETTYPE     void
189 ++#define QT_SIGNAL_ARGS                int
190 ++#define QT_SIGNAL_IGNORE      SIG_IGN
191 ++
192 ++#if defined(__GLIBC__) && (__GLIBC__ >= 2)
193 ++#define QT_SOCKLEN_T          socklen_t
194 ++#else
195 ++#define QT_SOCKLEN_T          int
196 ++#endif
197 ++
198 ++#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
199 ++#define QT_SNPRINTF           ::snprintf
200 ++#define QT_VSNPRINTF          ::vsnprintf
201 ++#endif
202 ++
203 ++
204 ++#endif // QPLATFORMDEFS_H
205 +diff -uraN qt-x11-opensource-src-4.4.0.orig/src/3rdparty/freetype/builds/unix/aclocal.m4 qt-x11-opensource-src-4.4.0/src/3rdparty/freetype/builds/unix/aclocal.m4
206 +--- qt-x11-opensource-src-4.4.0.orig/src/3rdparty/freetype/builds/unix/aclocal.m4      2008-04-28 09:11:15.000000000 -0400
207 ++++ qt-x11-opensource-src-4.4.0/src/3rdparty/freetype/builds/unix/aclocal.m4   2008-09-26 03:45:33.972279244 -0400
208 +@@ -1397,7 +1397,7 @@
209 +   dynamic_linker=no
210 +   ;;
211
212 +-kfreebsd*-gnu)
213 ++kfreebsd*-gnu | kopensolaris*-gnu)
214 +   version_type=linux
215 +   need_lib_prefix=no
216 +   need_version=no
217 +diff -uraN qt-x11-opensource-src-4.4.0.orig/src/3rdparty/freetype/builds/unix/config.guess qt-x11-opensource-src-4.4.0/src/3rdparty/freetype/builds/unix/config.guess
218 +--- qt-x11-opensource-src-4.4.0.orig/src/3rdparty/freetype/builds/unix/config.guess    2008-04-28 09:11:15.000000000 -0400
219 ++++ qt-x11-opensource-src-4.4.0/src/3rdparty/freetype/builds/unix/config.guess 2008-09-26 03:46:41.500030516 -0400
220 +@@ -1,10 +1,10 @@
221 + #! /bin/sh
222 + # Attempt to guess a canonical system name.
223 + #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
224 +-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
225 +-#   Inc.
226 ++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
227 ++#   Free Software Foundation, Inc.
228
229 +-timestamp='2007-05-17'
230 ++timestamp='2008-01-23'
231
232 + # This file is free software; you can redistribute it and/or modify it
233 + # under the terms of the GNU General Public License as published by
234 +@@ -56,8 +56,8 @@
235 + GNU config.guess ($timestamp)
236
237 + Originally written by Per Bothner.
238 +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
239 +-Free Software Foundation, Inc.
240 ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
241 ++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
242
243 + This is free software; see the source for copying conditions.  There is NO
244 + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
245 +@@ -330,7 +330,7 @@
246 +     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
247 +       echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
248 +       exit ;;
249 +-    i86pc:SunOS:5.*:* | ix86xen:SunOS:5.*:*)
250 ++    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
251 +       echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
252 +       exit ;;
253 +     sun4*:SunOS:6*:*)
254 +@@ -532,7 +532,7 @@
255 +               echo rs6000-ibm-aix3.2
256 +       fi
257 +       exit ;;
258 +-    *:AIX:*:[45])
259 ++    *:AIX:*:[456])
260 +       IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
261 +       if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
262 +               IBM_ARCH=rs6000
263 +@@ -793,12 +793,15 @@
264 +       exit ;;
265 +     *:Interix*:[3456]*)
266 +       case ${UNAME_MACHINE} in
267 +-          x86) 
268 ++          x86)
269 +               echo i586-pc-interix${UNAME_RELEASE}
270 +               exit ;;
271 +           EM64T | authenticamd)
272 +               echo x86_64-unknown-interix${UNAME_RELEASE}
273 +               exit ;;
274 ++          IA64)
275 ++              echo ia64-unknown-interix${UNAME_RELEASE}
276 ++              exit ;;
277 +       esac ;;
278 +     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
279 +       echo i${UNAME_MACHINE}-pc-mks
280 +@@ -825,6 +828,10 @@
281 +       # the GNU system
282 +       echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
283 +       exit ;;
284 ++    *:GNU/kOpenSolaris:*:*)
285 ++      # like linux, we don't need to record the version number
286 ++      echo ${UNAME_MACHINE}-unknown-kopensolaris-gnu
287 ++      exit ;;
288 +     *:GNU/*:*:*)
289 +       # other systems with GNU libc and userland
290 +       echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
291 +@@ -833,7 +840,14 @@
292 +       echo ${UNAME_MACHINE}-pc-minix
293 +       exit ;;
294 +     arm*:Linux:*:*)
295 +-      echo ${UNAME_MACHINE}-unknown-linux-gnu
296 ++      eval $set_cc_for_build
297 ++      if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
298 ++          | grep -q __ARM_EABI__
299 ++      then
300 ++          echo ${UNAME_MACHINE}-unknown-linux-gnu
301 ++      else
302 ++          echo ${UNAME_MACHINE}-unknown-linux-gnueabi
303 ++      fi
304 +       exit ;;
305 +     avr32*:Linux:*:*)
306 +       echo ${UNAME_MACHINE}-unknown-linux-gnu
307 +@@ -954,8 +968,8 @@
308 +     x86_64:Linux:*:*)
309 +       echo x86_64-unknown-linux-gnu
310 +       exit ;;
311 +-    xtensa:Linux:*:*)
312 +-      echo xtensa-unknown-linux-gnu
313 ++    xtensa*:Linux:*:*)
314 ++      echo ${UNAME_MACHINE}-unknown-linux-gnu
315 +       exit ;;
316 +     i*86:Linux:*:*)
317 +       # The BFD linker knows what the default object file format is, so
318 +@@ -1474,9 +1488,9 @@
319 + the operating system you are using. It is advised that you
320 + download the most up to date version of the config scripts from
321
322 +-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
323 ++  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
324 + and
325 +-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
326 ++  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
327
328 + If the version you run ($0) is already up to date, please
329 + send the following data and any information you think might be
330 +diff -uraN qt-x11-opensource-src-4.4.0.orig/src/3rdparty/freetype/builds/unix/config.sub qt-x11-opensource-src-4.4.0/src/3rdparty/freetype/builds/unix/config.sub
331 +--- qt-x11-opensource-src-4.4.0.orig/src/3rdparty/freetype/builds/unix/config.sub      2008-04-28 09:11:15.000000000 -0400
332 ++++ qt-x11-opensource-src-4.4.0/src/3rdparty/freetype/builds/unix/config.sub   2008-09-26 03:46:41.500247148 -0400
333 +@@ -1,10 +1,10 @@
334 + #! /bin/sh
335 + # Configuration validation subroutine script.
336 + #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
337 +-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
338 +-#   Inc.
339 ++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
340 ++#   Free Software Foundation, Inc.
341
342 +-timestamp='2007-06-28'
343 ++timestamp='2008-01-16'
344
345 + # This file is (in principle) common to ALL GNU software.
346 + # The presence of a machine in this file suggests that SOME GNU software
347 +@@ -72,8 +72,8 @@
348 + version="\
349 + GNU config.sub ($timestamp)
350
351 +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
352 +-Free Software Foundation, Inc.
353 ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
354 ++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
355
356 + This is free software; see the source for copying conditions.  There is NO
357 + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
358 +@@ -122,7 +122,7 @@
359 + case $maybe_os in
360 +   nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
361 +   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
362 +-  storm-chaos* | os2-emx* | rtmk-nova*)
363 ++  storm-chaos* | os2-emx* | rtmk-nova* | kopensolaris*-gnu* )
364 +     os=-$maybe_os
365 +     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
366 +     ;;
367 +@@ -369,10 +369,14 @@
368 +       | v850-* | v850e-* | vax-* \
369 +       | we32k-* \
370 +       | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
371 +-      | xstormy16-* | xtensa-* \
372 ++      | xstormy16-* | xtensa*-* \
373 +       | ymp-* \
374 +       | z8k-*)
375 +               ;;
376 ++      # Recognize the basic CPU types without company name, with glob match.
377 ++      xtensa*)
378 ++              basic_machine=$basic_machine-unknown
379 ++              ;;
380 +       # Recognize the various machine names and aliases which stand
381 +       # for a CPU type and a company and sometimes even an OS.
382 +       386bsd)
383 +@@ -443,6 +447,14 @@
384 +               basic_machine=ns32k-sequent
385 +               os=-dynix
386 +               ;;
387 ++      blackfin)
388 ++              basic_machine=bfin-unknown
389 ++              os=-linux
390 ++              ;;
391 ++      blackfin-*)
392 ++              basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
393 ++              os=-linux
394 ++              ;;
395 +       c90)
396 +               basic_machine=c90-cray
397 +               os=-unicos
398 +@@ -668,6 +680,14 @@
399 +               basic_machine=m68k-isi
400 +               os=-sysv
401 +               ;;
402 ++      m68knommu)
403 ++              basic_machine=m68k-unknown
404 ++              os=-linux
405 ++              ;;
406 ++      m68knommu-*)
407 ++              basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
408 ++              os=-linux
409 ++              ;;
410 +       m88k-omron*)
411 +               basic_machine=m88k-omron
412 +               ;;
413 +@@ -813,6 +833,14 @@
414 +               basic_machine=i860-intel
415 +               os=-osf
416 +               ;;
417 ++      parisc)
418 ++              basic_machine=hppa-unknown
419 ++              os=-linux
420 ++              ;;
421 ++      parisc-*)
422 ++              basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
423 ++              os=-linux
424 ++              ;;
425 +       pbd)
426 +               basic_machine=sparc-tti
427 +               ;;
428 +@@ -1021,6 +1049,10 @@
429 +               basic_machine=tic6x-unknown
430 +               os=-coff
431 +               ;;
432 ++      tile*)
433 ++              basic_machine=tile-unknown
434 ++              os=-linux-gnu
435 ++              ;;
436 +       tx39)
437 +               basic_machine=mipstx39-unknown
438 +               ;;
439 +@@ -1226,7 +1258,7 @@
440 +             | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
441 +             | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
442 +             | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
443 +-            | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
444 ++            | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -kopensolaris*-gnu* )
445 +       # Remember, each alternative MUST END IN *, to match a version number.
446 +               ;;
447 +       -qnx*)
448 +diff -uraN qt-x11-opensource-src-4.4.0.orig/src/3rdparty/freetype/builds/unix/configure qt-x11-opensource-src-4.4.0/src/3rdparty/freetype/builds/unix/configure
449 +--- qt-x11-opensource-src-4.4.0.orig/src/3rdparty/freetype/builds/unix/configure       2008-04-28 09:11:15.000000000 -0400
450 ++++ qt-x11-opensource-src-4.4.0/src/3rdparty/freetype/builds/unix/configure    2008-09-26 03:45:47.450131464 -0400
451 +@@ -10960,7 +10960,7 @@
452 +   dynamic_linker=no
453 +   ;;
454
455 +-kfreebsd*-gnu)
456 ++kfreebsd*-gnu | kopensolaris*-gnu)
457 +   version_type=linux
458 +   need_lib_prefix=no
459 +   need_version=no
460 +@@ -14879,7 +14879,7 @@
461 +   dynamic_linker=no
462 +   ;;
463
464 +-kfreebsd*-gnu)
465 ++kfreebsd*-gnu | kopensolaris*-gnu)
466 +   version_type=linux
467 +   need_lib_prefix=no
468 +   need_version=no
469 +@@ -17462,7 +17462,7 @@
470 +   dynamic_linker=no
471 +   ;;
472
473 +-kfreebsd*-gnu)
474 ++kfreebsd*-gnu | kopensolaris*-gnu)
475 +   version_type=linux
476 +   need_lib_prefix=no
477 +   need_version=no
478 +@@ -20052,7 +20052,7 @@
479 +   dynamic_linker=no
480 +   ;;
481
482 +-kfreebsd*-gnu)
483 ++kfreebsd*-gnu | kopensolaris*-gnu)
484 +   version_type=linux
485 +   need_lib_prefix=no
486 +   need_version=no
487 +diff -uraN qt-x11-opensource-src-4.4.0.orig/src/3rdparty/libtiff/config/config.guess qt-x11-opensource-src-4.4.0/src/3rdparty/libtiff/config/config.guess
488 +--- qt-x11-opensource-src-4.4.0.orig/src/3rdparty/libtiff/config/config.guess  2008-04-28 09:11:15.000000000 -0400
489 ++++ qt-x11-opensource-src-4.4.0/src/3rdparty/libtiff/config/config.guess       2008-09-26 03:46:35.138182327 -0400
490 +@@ -1,9 +1,10 @@
491 + #! /bin/sh
492 + # Attempt to guess a canonical system name.
493 + #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
494 +-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
495 ++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
496 ++#   Free Software Foundation, Inc.
497
498 +-timestamp='2006-02-23'
499 ++timestamp='2008-01-23'
500
501 + # This file is free software; you can redistribute it and/or modify it
502 + # under the terms of the GNU General Public License as published by
503 +@@ -55,8 +56,8 @@
504 + GNU config.guess ($timestamp)
505
506 + Originally written by Per Bothner.
507 +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
508 +-Free Software Foundation, Inc.
509 ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
510 ++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
511
512 + This is free software; see the source for copying conditions.  There is NO
513 + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
514 +@@ -160,6 +161,7 @@
515 +           arm*) machine=arm-unknown ;;
516 +           sh3el) machine=shl-unknown ;;
517 +           sh3eb) machine=sh-unknown ;;
518 ++          sh5el) machine=sh5le-unknown ;;
519 +           *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
520 +       esac
521 +       # The Operating System including object format, if it has switched
522 +@@ -210,7 +212,7 @@
523 +       echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
524 +       exit ;;
525 +     macppc:MirBSD:*:*)
526 +-      echo powerppc-unknown-mirbsd${UNAME_RELEASE}
527 ++      echo powerpc-unknown-mirbsd${UNAME_RELEASE}
528 +       exit ;;
529 +     *:MirBSD:*:*)
530 +       echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
531 +@@ -328,7 +330,7 @@
532 +     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
533 +       echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
534 +       exit ;;
535 +-    i86pc:SunOS:5.*:*)
536 ++    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
537 +       echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
538 +       exit ;;
539 +     sun4*:SunOS:6*:*)
540 +@@ -530,7 +532,7 @@
541 +               echo rs6000-ibm-aix3.2
542 +       fi
543 +       exit ;;
544 +-    *:AIX:*:[45])
545 ++    *:AIX:*:[456])
546 +       IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
547 +       if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
548 +               IBM_ARCH=rs6000
549 +@@ -770,6 +772,8 @@
550 +       case ${UNAME_MACHINE} in
551 +           pc98)
552 +               echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
553 ++          amd64)
554 ++              echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
555 +           *)
556 +               echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
557 +       esac
558 +@@ -777,10 +781,7 @@
559 +     i*:CYGWIN*:*)
560 +       echo ${UNAME_MACHINE}-pc-cygwin
561 +       exit ;;
562 +-    i*:MINGW*:*)
563 +-      echo ${UNAME_MACHINE}-pc-mingw32
564 +-      exit ;;
565 +-    i*:MSYS_NT-*:*:*)
566 ++    *:MINGW*:*)
567 +       echo ${UNAME_MACHINE}-pc-mingw32
568 +       exit ;;
569 +     i*:windows32*:*)
570 +@@ -790,12 +791,18 @@
571 +     i*:PW*:*)
572 +       echo ${UNAME_MACHINE}-pc-pw32
573 +       exit ;;
574 +-    x86:Interix*:[345]*)
575 +-      echo i586-pc-interix${UNAME_RELEASE}
576 +-      exit ;;
577 +-    EM64T:Interix*:[345]*)
578 +-      echo x86_64-unknown-interix${UNAME_RELEASE}
579 +-      exit ;;
580 ++    *:Interix*:[3456]*)
581 ++      case ${UNAME_MACHINE} in
582 ++          x86)
583 ++              echo i586-pc-interix${UNAME_RELEASE}
584 ++              exit ;;
585 ++          EM64T | authenticamd)
586 ++              echo x86_64-unknown-interix${UNAME_RELEASE}
587 ++              exit ;;
588 ++          IA64)
589 ++              echo ia64-unknown-interix${UNAME_RELEASE}
590 ++              exit ;;
591 ++      esac ;;
592 +     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
593 +       echo i${UNAME_MACHINE}-pc-mks
594 +       exit ;;
595 +@@ -821,6 +828,10 @@
596 +       # the GNU system
597 +       echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
598 +       exit ;;
599 ++    *:GNU/kOpenSolaris:*:*)
600 ++      # like linux, we don't need to record the version number
601 ++      echo ${UNAME_MACHINE}-unknown-kopensolaris-gnu
602 ++      exit ;;
603 +     *:GNU/*:*:*)
604 +       # other systems with GNU libc and userland
605 +       echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
606 +@@ -829,6 +840,16 @@
607 +       echo ${UNAME_MACHINE}-pc-minix
608 +       exit ;;
609 +     arm*:Linux:*:*)
610 ++      eval $set_cc_for_build
611 ++      if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
612 ++          | grep -q __ARM_EABI__
613 ++      then
614 ++          echo ${UNAME_MACHINE}-unknown-linux-gnu
615 ++      else
616 ++          echo ${UNAME_MACHINE}-unknown-linux-gnueabi
617 ++      fi
618 ++      exit ;;
619 ++    avr32*:Linux:*:*)
620 +       echo ${UNAME_MACHINE}-unknown-linux-gnu
621 +       exit ;;
622 +     cris:Linux:*:*)
623 +@@ -947,6 +968,9 @@
624 +     x86_64:Linux:*:*)
625 +       echo x86_64-unknown-linux-gnu
626 +       exit ;;
627 ++    xtensa*:Linux:*:*)
628 ++      echo ${UNAME_MACHINE}-unknown-linux-gnu
629 ++      exit ;;
630 +     i*86:Linux:*:*)
631 +       # The BFD linker knows what the default object file format is, so
632 +       # first see if it will tell us. cd to the root directory to prevent
633 +@@ -989,7 +1013,7 @@
634 +       LIBC=gnulibc1
635 +       # endif
636 +       #else
637 +-      #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
638 ++      #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
639 +       LIBC=gnu
640 +       #else
641 +       LIBC=gnuaout
642 +@@ -1205,6 +1229,15 @@
643 +     SX-6:SUPER-UX:*:*)
644 +       echo sx6-nec-superux${UNAME_RELEASE}
645 +       exit ;;
646 ++    SX-7:SUPER-UX:*:*)
647 ++      echo sx7-nec-superux${UNAME_RELEASE}
648 ++      exit ;;
649 ++    SX-8:SUPER-UX:*:*)
650 ++      echo sx8-nec-superux${UNAME_RELEASE}
651 ++      exit ;;
652 ++    SX-8R:SUPER-UX:*:*)
653 ++      echo sx8r-nec-superux${UNAME_RELEASE}
654 ++      exit ;;
655 +     Power*:Rhapsody:*:*)
656 +       echo powerpc-apple-rhapsody${UNAME_RELEASE}
657 +       exit ;;
658 +@@ -1455,9 +1488,9 @@
659 + the operating system you are using. It is advised that you
660 + download the most up to date version of the config scripts from
661
662 +-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
663 ++  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
664 + and
665 +-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
666 ++  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
667
668 + If the version you run ($0) is already up to date, please
669 + send the following data and any information you think might be
670 +diff -uraN qt-x11-opensource-src-4.4.0.orig/src/3rdparty/libtiff/config/config.sub qt-x11-opensource-src-4.4.0/src/3rdparty/libtiff/config/config.sub
671 +--- qt-x11-opensource-src-4.4.0.orig/src/3rdparty/libtiff/config/config.sub    2008-04-28 09:11:15.000000000 -0400
672 ++++ qt-x11-opensource-src-4.4.0/src/3rdparty/libtiff/config/config.sub 2008-09-26 03:46:35.148359971 -0400
673 +@@ -1,9 +1,10 @@
674 + #! /bin/sh
675 + # Configuration validation subroutine script.
676 + #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
677 +-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
678 ++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
679 ++#   Free Software Foundation, Inc.
680
681 +-timestamp='2006-02-23'
682 ++timestamp='2008-01-16'
683
684 + # This file is (in principle) common to ALL GNU software.
685 + # The presence of a machine in this file suggests that SOME GNU software
686 +@@ -71,8 +72,8 @@
687 + version="\
688 + GNU config.sub ($timestamp)
689
690 +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
691 +-Free Software Foundation, Inc.
692 ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
693 ++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
694
695 + This is free software; see the source for copying conditions.  There is NO
696 + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
697 +@@ -121,7 +122,7 @@
698 + case $maybe_os in
699 +   nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
700 +   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
701 +-  storm-chaos* | os2-emx* | rtmk-nova*)
702 ++  storm-chaos* | os2-emx* | rtmk-nova* | kopensolaris*-gnu* )
703 +     os=-$maybe_os
704 +     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
705 +     ;;
706 +@@ -240,15 +241,16 @@
707 +       | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
708 +       | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
709 +       | am33_2.0 \
710 +-      | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
711 ++      | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
712 +       | bfin \
713 +       | c4x | clipper \
714 +       | d10v | d30v | dlx | dsp16xx \
715 +-      | fr30 | frv \
716 ++      | fido | fr30 | frv \
717 +       | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
718 +       | i370 | i860 | i960 | ia64 \
719 +       | ip2k | iq2000 \
720 +-      | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
721 ++      | m32c | m32r | m32rle | m68000 | m68k | m88k \
722 ++      | maxq | mb | microblaze | mcore | mep \
723 +       | mips | mipsbe | mipseb | mipsel | mipsle \
724 +       | mips16 \
725 +       | mips64 | mips64el \
726 +@@ -274,21 +276,19 @@
727 +       | pdp10 | pdp11 | pj | pjl \
728 +       | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
729 +       | pyramid \
730 +-      | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
731 ++      | score \
732 ++      | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
733 +       | sh64 | sh64le \
734 +-      | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
735 +-      | sparcv8 | sparcv9 | sparcv9b \
736 +-      | strongarm \
737 ++      | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
738 ++      | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
739 ++      | spu | strongarm \
740 +       | tahoe | thumb | tic4x | tic80 | tron \
741 +       | v850 | v850e \
742 +       | we32k \
743 +-      | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
744 ++      | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
745 +       | z8k)
746 +               basic_machine=$basic_machine-unknown
747 +               ;;
748 +-      m32c)
749 +-              basic_machine=$basic_machine-unknown
750 +-              ;;
751 +       m6811 | m68hc11 | m6812 | m68hc12)
752 +               # Motorola 68HC11/12.
753 +               basic_machine=$basic_machine-unknown
754 +@@ -318,18 +318,18 @@
755 +       | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
756 +       | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
757 +       | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
758 +-      | avr-* \
759 ++      | avr-* | avr32-* \
760 +       | bfin-* | bs2000-* \
761 +       | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
762 +       | clipper-* | craynv-* | cydra-* \
763 +       | d10v-* | d30v-* | dlx-* \
764 +       | elxsi-* \
765 +-      | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
766 ++      | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
767 +       | h8300-* | h8500-* \
768 +       | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
769 +       | i*86-* | i860-* | i960-* | ia64-* \
770 +       | ip2k-* | iq2000-* \
771 +-      | m32r-* | m32rle-* \
772 ++      | m32c-* | m32r-* | m32rle-* \
773 +       | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
774 +       | m88110-* | m88k-* | maxq-* | mcore-* \
775 +       | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
776 +@@ -358,22 +358,24 @@
777 +       | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
778 +       | pyramid-* \
779 +       | romp-* | rs6000-* \
780 +-      | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
781 ++      | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
782 +       | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
783 +-      | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
784 ++      | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
785 +       | sparclite-* \
786 +-      | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
787 ++      | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
788 +       | tahoe-* | thumb-* \
789 +       | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
790 +       | tron-* \
791 +       | v850-* | v850e-* | vax-* \
792 +       | we32k-* \
793 +-      | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
794 +-      | xstormy16-* | xtensa-* \
795 ++      | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
796 ++      | xstormy16-* | xtensa*-* \
797 +       | ymp-* \
798 +       | z8k-*)
799 +               ;;
800 +-      m32c-*)
801 ++      # Recognize the basic CPU types without company name, with glob match.
802 ++      xtensa*)
803 ++              basic_machine=$basic_machine-unknown
804 +               ;;
805 +       # Recognize the various machine names and aliases which stand
806 +       # for a CPU type and a company and sometimes even an OS.
807 +@@ -445,6 +447,14 @@
808 +               basic_machine=ns32k-sequent
809 +               os=-dynix
810 +               ;;
811 ++      blackfin)
812 ++              basic_machine=bfin-unknown
813 ++              os=-linux
814 ++              ;;
815 ++      blackfin-*)
816 ++              basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
817 ++              os=-linux
818 ++              ;;
819 +       c90)
820 +               basic_machine=c90-cray
821 +               os=-unicos
822 +@@ -477,8 +487,8 @@
823 +               basic_machine=craynv-cray
824 +               os=-unicosmp
825 +               ;;
826 +-      cr16c)
827 +-              basic_machine=cr16c-unknown
828 ++      cr16)
829 ++              basic_machine=cr16-unknown
830 +               os=-elf
831 +               ;;
832 +       crds | unos)
833 +@@ -670,6 +680,14 @@
834 +               basic_machine=m68k-isi
835 +               os=-sysv
836 +               ;;
837 ++      m68knommu)
838 ++              basic_machine=m68k-unknown
839 ++              os=-linux
840 ++              ;;
841 ++      m68knommu-*)
842 ++              basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
843 ++              os=-linux
844 ++              ;;
845 +       m88k-omron*)
846 +               basic_machine=m88k-omron
847 +               ;;
848 +@@ -685,6 +703,10 @@
849 +               basic_machine=i386-pc
850 +               os=-mingw32
851 +               ;;
852 ++      mingw32ce)
853 ++              basic_machine=arm-unknown
854 ++              os=-mingw32ce
855 ++              ;;
856 +       miniframe)
857 +               basic_machine=m68000-convergent
858 +               ;;
859 +@@ -811,6 +833,14 @@
860 +               basic_machine=i860-intel
861 +               os=-osf
862 +               ;;
863 ++      parisc)
864 ++              basic_machine=hppa-unknown
865 ++              os=-linux
866 ++              ;;
867 ++      parisc-*)
868 ++              basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
869 ++              os=-linux
870 ++              ;;
871 +       pbd)
872 +               basic_machine=sparc-tti
873 +               ;;
874 +@@ -912,6 +942,10 @@
875 +       sb1el)
876 +               basic_machine=mipsisa64sb1el-unknown
877 +               ;;
878 ++      sde)
879 ++              basic_machine=mipsisa32-sde
880 ++              os=-elf
881 ++              ;;
882 +       sei)
883 +               basic_machine=mips-sei
884 +               os=-seiux
885 +@@ -923,6 +957,9 @@
886 +               basic_machine=sh-hitachi
887 +               os=-hms
888 +               ;;
889 ++      sh5el)
890 ++              basic_machine=sh5le-unknown
891 ++              ;;
892 +       sh64)
893 +               basic_machine=sh64-unknown
894 +               ;;
895 +@@ -1012,6 +1049,10 @@
896 +               basic_machine=tic6x-unknown
897 +               os=-coff
898 +               ;;
899 ++      tile*)
900 ++              basic_machine=tile-unknown
901 ++              os=-linux-gnu
902 ++              ;;
903 +       tx39)
904 +               basic_machine=mipstx39-unknown
905 +               ;;
906 +@@ -1128,7 +1169,7 @@
907 +       sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
908 +               basic_machine=sh-unknown
909 +               ;;
910 +-      sparc | sparcv8 | sparcv9 | sparcv9b)
911 ++      sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
912 +               basic_machine=sparc-sun
913 +               ;;
914 +       cydra)
915 +@@ -1217,7 +1258,7 @@
916 +             | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
917 +             | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
918 +             | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
919 +-            | -skyos* | -haiku* | -rdos*)
920 ++            | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -kopensolaris*-gnu* )
921 +       # Remember, each alternative MUST END IN *, to match a version number.
922 +               ;;
923 +       -qnx*)
924 +@@ -1369,6 +1410,12 @@
925 + # system, and we'll never get to this point.
926
927 + case $basic_machine in
928 ++        score-*)
929 ++              os=-elf
930 ++              ;;
931 ++        spu-*)
932 ++              os=-elf
933 ++              ;;
934 +       *-acorn)
935 +               os=-riscix1.2
936 +               ;;
937 +@@ -1378,9 +1425,9 @@
938 +       arm*-semi)
939 +               os=-aout
940 +               ;;
941 +-    c4x-* | tic4x-*)
942 +-        os=-coff
943 +-        ;;
944 ++        c4x-* | tic4x-*)
945 ++              os=-coff
946 ++              ;;
947 +       # This must come before the *-dec entry.
948 +       pdp10-*)
949 +               os=-tops20
950 +@@ -1406,6 +1453,9 @@
951 +       m68*-cisco)
952 +               os=-aout
953 +               ;;
954 ++        mep-*)
955 ++              os=-elf
956 ++              ;;
957 +       mips*-cisco)
958 +               os=-elf
959 +               ;;
960 +diff -uraN qt-x11-opensource-src-4.4.0.orig/src/3rdparty/libtiff/configure qt-x11-opensource-src-4.4.0/src/3rdparty/libtiff/configure
961 +--- qt-x11-opensource-src-4.4.0.orig/src/3rdparty/libtiff/configure    2008-04-28 09:11:15.000000000 -0400
962 ++++ qt-x11-opensource-src-4.4.0/src/3rdparty/libtiff/configure 2008-09-26 03:46:25.648220065 -0400
963 +@@ -8176,7 +8176,7 @@
964 +   dynamic_linker=no
965 +   ;;
966
967 +-kfreebsd*-gnu)
968 ++kfreebsd*-gnu | kopensolaris*-gnu)
969 +   version_type=linux
970 +   need_lib_prefix=no
971 +   need_version=no
972 +@@ -19230,7 +19230,7 @@
973 +   dynamic_linker=no
974 +   ;;
975
976 +-kfreebsd*-gnu)
977 ++kfreebsd*-gnu | kopensolaris*-gnu)
978 +   version_type=linux
979 +   need_lib_prefix=no
980 +   need_version=no
981 +diff -uraN qt-x11-opensource-src-4.4.0.orig/src/3rdparty/libtiff/m4/libtool.m4 qt-x11-opensource-src-4.4.0/src/3rdparty/libtiff/m4/libtool.m4
982 +--- qt-x11-opensource-src-4.4.0.orig/src/3rdparty/libtiff/m4/libtool.m4        2008-04-28 09:11:16.000000000 -0400
983 ++++ qt-x11-opensource-src-4.4.0/src/3rdparty/libtiff/m4/libtool.m4     2008-09-26 03:46:01.498910155 -0400
984 +@@ -2108,7 +2108,7 @@
985 +   dynamic_linker=no
986 +   ;;
987
988 +-kfreebsd*-gnu)
989 ++kfreebsd*-gnu | kopensolaris*-gnu)
990 +   version_type=linux
991 +   need_lib_prefix=no
992 +   need_version=no
993 +diff -uraN qt-x11-opensource-src-4.4.0.orig/src/corelib/global/qglobal.h qt-x11-opensource-src-4.4.0/src/corelib/global/qglobal.h
994 +--- qt-x11-opensource-src-4.4.0.orig/src/corelib/global/qglobal.h      2008-04-28 09:11:18.000000000 -0400
995 ++++ qt-x11-opensource-src-4.4.0/src/corelib/global/qglobal.h   2008-09-26 03:42:57.733578972 -0400
996 +@@ -200,7 +200,7 @@
997 + #  endif
998 + #elif defined(__MWERKS__) && defined(__INTEL__)
999 + #  define Q_OS_WIN32
1000 +-#elif defined(__sun) || defined(sun)
1001 ++#elif defined(__sun) || defined(sun) || defined(__OpenSolaris_kernel__)
1002 + #  define Q_OS_SOLARIS
1003 + #elif defined(hpux) || defined(__hpux)
1004 + #  define Q_OS_HPUX
1005 diff -uraN qt4-x11-4.4.0.orig/debian/patches/series qt4-x11-4.4.0/debian/patches/series
1006 --- qt4-x11-4.4.0.orig/debian/patches/series    2008-09-26 03:50:13.000000000 -0400
1007 +++ qt4-x11-4.4.0/debian/patches/series 2008-09-26 03:52:13.860175929 -0400
1008 @@ -50,3 +50,4 @@
1009  73_from4.4.1_no_AAAA_when_ipv6_disabled.diff
1010  80_hurd_max_path.diff
1011  90_gcc43.diff
1012 +95_kopensolaris-gnu.diff