x11-libs/qt: delete old extraversions, rebase to current portage ebuilds.
[gentoo-soor-overlay.git] / x11-libs / qt / files / qt-3.3.4-gcc4.patch
1 diff -Nur qt-x11-free-3.3.4.orig/configure qt-x11-free-3.3.4/configure
2 --- qt-x11-free-3.3.4.orig/configure    2004-10-18 19:17:00.000000000 +0200
3 +++ qt-x11-free-3.3.4/configure 2005-07-19 17:17:35.000000000 +0200
4 @@ -3030,6 +3030,9 @@
5      *3.*)
6         COMPILER_VERSION="3.*"
7         ;;
8 +    *4.*)
9 +        COMPILER_VERSION="4.*"
10 +        ;;
11      *)
12         ;;
13      esac
14 diff -Nur qt-x11-free-3.3.4.orig/src/kernel/qsizepolicy.h qt-x11-free-3.3.4/src/kernel/qsizepolicy.h
15 --- qt-x11-free-3.3.4.orig/src/kernel/qsizepolicy.h     2005-01-21 18:16:12.000000000 +0100
16 +++ qt-x11-free-3.3.4/src/kernel/qsizepolicy.h  2005-07-19 17:17:22.000000000 +0200
17 @@ -88,7 +88,7 @@
18      }
19  
20      void setHorData( SizeType d ) { data = (Q_UINT32)(data & ~HMask) | d; }
21 -    void setVerData( SizeType d ) { data = (Q_UINT32)(data & ~(HMask << HSize)) |
22 +    void setVerData( SizeType d ) { data = (Q_UINT32)(data & ~VMask) |
23                                            (d << HSize); }
24                 
25      void setHeightForWidth( bool b ) { data = b ? (Q_UINT32)( data | ( 1 << 2*HSize ) )