Wed Mar 12 23:38:55 UTC 2008

Author: kkofler

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18233/devel

Modified Files:
	.cvsignore qt.spec sources 
Added Files:
	Trolltech.conf assistant.desktop designer.desktop 
	linguist.desktop qconfig-multilib.h qt-43-aliasing.diff 
	qt-copy-patches-svn_checkout.sh 
	qt-x11-opensource-src-4.2.2-multilib.patch 
	qt-x11-opensource-src-4.3.0-qassistant-qt4.patch 
	qt-x11-opensource-src-4.3.4-aliasing.patch qt4-wrapper.sh 
	qt4.csh qt4.sh qtconfig.desktop qtdemo.desktop 
Removed Files:
	0038-dragobject-dont-prefer-unknown.patch 
	0047-fix-kmenu-width.diff 0048-qclipboard_hack_80072.patch 
	0056-khotkeys_input_84434.patch 
	0073-xinerama-aware-qpopup.patch 0077-utf8-decoder-fixes.diff 
	0079-compositing-types.patch 0080-net-wm-sync-request-2.patch 
	0084-compositing-properties.patch 0088-fix-xinput-clash.diff 
	assistant3.desktop designer3.desktop linguist3.desktop 
	qt-3.0.5-nodebug.patch qt-3.1.0-makefile.patch 
	qt-3.3.3-gtkstyle.patch qt-3.3.4-print-CJK.patch 
	qt-3.3.6-fontrendering-214371.patch 
	qt-3.3.6-fontrendering-bn_IN-209975.patch 
	qt-3.3.6-fontrendering-gu-228452.patch 
	qt-3.3.6-fontrendering-ml_IN-209097.patch 
	qt-3.3.6-fontrendering-ml_IN-209974.patch 
	qt-3.3.6-fontrendering-ml_IN-217657.patch 
	qt-3.3.6-fontrendering-te_IN-211259.patch 
	qt-3.3.8-fontrendering-#214570.patch 
	qt-3.3.8-fontrendering-as_IN-209972.patch 
	qt-uic-nostdlib.patch qt-x11-free-3.3.2-quiet.patch 
	qt-x11-free-3.3.3-gl.patch qt-x11-free-3.3.3-qembed.patch 
	qt-x11-free-3.3.4-fullscreen.patch qt-x11-free-3.3.5-uic.patch 
	qt-x11-free-3.3.6-fix-key-release-event-with-imm.diff 
	qt-x11-free-3.3.6-qfontdatabase_x11.patch 
	qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch 
	qt-x11-free-3.3.6-strip.patch qt-x11-free-3.3.7-umask.patch 
	qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-post.patch 
	qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-pre.patch 
	qt-x11-free-3.3.8b-gcc4-buildkey.patch 
	qt-x11-free-3.3.8b-gcc43.patch 
	qt-x11-free-3.3.8b-uic-multilib.patch 
	qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch qt.csh 
	qt.sh qtconfig3.desktop 
Log Message:
Upgrade to Qt 4:
* remove Qt 3 files
* copy Qt 4 from qt4/devel
* Wed Mar 12 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.3.4-6
- rename to qt on Fedora >= 9

--- NEW FILE Trolltech.conf ---
[Qt]
font="Sans Serif,10,-1,5,50,0,0,0,0,0"



--- NEW FILE assistant.desktop ---
[Desktop Entry]
Name=Qt4 Assistant 
Comment=Shows Qt4 documentation and examples
Exec=assistant-qt4
Icon=assistant
Terminal=false
Encoding=UTF-8
Type=Application
Categories=Qt;Development;Documentation;


--- NEW FILE designer.desktop ---
[Desktop Entry]
Name=Qt4 Designer
GenericName=Interface Designer
Comment=Design GUIs for Qt4 applications
Exec=designer-qt4
Icon=designer
MimeType=application/x-designer;
Terminal=false
Encoding=UTF-8
Type=Application
Categories=Qt;Development;


--- NEW FILE linguist.desktop ---
[Desktop Entry]
Name=Qt4 Linguist 
Comment=Add translations to Qt4 applications
Exec=linguist-qt4
Icon=linguist4
MimeType=application/x-linguist;
Terminal=false
Encoding=UTF-8
Type=Application
Categories=Qt;Development;


--- NEW FILE qconfig-multilib.h ---
/* qconfig.h */
/* This file is here to prevent a file conflict on multiarch systems.  A
 * conflict will occur because qconfig.h has arch-specific definitions.
 *
 * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */

#if defined(__x86_64__)
# include <QtCore/qconfig-x86_64.h>
#elif defined(__i386__)
# include <QtCore/qconfig-i386.h>
#elif defined(__powerpc64__)
# include <QtCore/qconfig-ppc64.h>
#elif defined(__powerpc__)
# include <QtCore/qconfig-ppc.h>
#elif defined(__s390x__)
# include <QtCore/qconfig-s390x.h>
#elif defined(__s390__)
# include <QtCore/qconfig-s390.h> 
#elif defined(__sparc64__)
# include <QtCore/qconfig-sparc64.h>
#elif defined(__sparc__)
# include <QtCore/qconfig-sparc.h>
#else
/* Should never reach this point, if so see bugzilla.redhat.com/223663 */
#error "This qt4-devel package does not work your architecture?"
#endif


qt-43-aliasing.diff:

--- NEW FILE qt-43-aliasing.diff ---
--- src/corelib/tools/qmap.h
+++ src/corelib/tools/qmap.h
@@ -185,6 +185,7 @@ public:
 
     class iterator
     {
+        friend class const_iterator;
         QMapData::Node *i;
 
     public:
@@ -240,9 +241,9 @@ public:
     public:
 #endif
         inline bool operator==(const const_iterator &o) const
-            { return i == reinterpret_cast<const iterator &>(o).i; }
+            { return i == o.i; }
         inline bool operator!=(const const_iterator &o) const
-            { return i != reinterpret_cast<const iterator &>(o).i; }
+            { return i != o.i; }
 
     private:
         // ### Qt 5: remove
@@ -252,6 +253,7 @@ public:
 
     class const_iterator
     {
+        friend class iterator;
         QMapData::Node *i;
 
     public:
@@ -270,7 +272,7 @@ public:
 #else
         inline const_iterator(const iterator &o)
 #endif
-        { i = reinterpret_cast<const const_iterator &>(o).i; }
+        { i = o.i; }
 
         inline const Key &key() const { return concrete(i)->key; }
         inline const T &value() const { return concrete(i)->value; }
--- src/corelib/tools/qset.h
+++ src/corelib/tools/qset.h
@@ -84,6 +84,7 @@ public:
     {
         typedef QHash<T, QHashDummyValue> Hash;
         typename Hash::iterator i;
+        friend class const_iterator;
 
     public:
         typedef std::bidirectional_iterator_tag iterator_category;
@@ -101,9 +102,9 @@ public:
         inline bool operator==(const iterator &o) const { return i == o.i; }
         inline bool operator!=(const iterator &o) const { return i != o.i; }
         inline bool operator==(const const_iterator &o) const
-            { return i == reinterpret_cast<const iterator &>(o).i; }
+            { return i == o.i; }
         inline bool operator!=(const const_iterator &o) const
-            { return i != reinterpret_cast<const iterator &>(o).i; }
+            { return i != o.i; }
         inline iterator &operator++() { ++i; return *this; }
         inline iterator operator++(int) { iterator r = *this; ++i; return r; }
         inline iterator &operator--() { --i; return *this; }
@@ -118,6 +119,7 @@ public:
     {
         typedef QHash<T, QHashDummyValue> Hash;
         typename Hash::const_iterator i;
+        friend class iterator;
 
     public:
         typedef std::bidirectional_iterator_tag iterator_category;
@@ -130,7 +132,7 @@ public:
         inline const_iterator(typename Hash::const_iterator o) : i(o) {}
         inline const_iterator(const const_iterator &o) : i(o.i) {}
         inline const_iterator(const iterator &o)
-            : i(reinterpret_cast<const const_iterator &>(o).i) {}
+            : i(o.i) {}
         inline const_iterator &operator=(const const_iterator &o) { i = o.i; return *this; }
         inline const T &operator*() const { return i.key(); }
         inline const T *operator->() const { return &i.key(); }
--- src/corelib/tools/qhash.h
+++ src/corelib/tools/qhash.h
@@ -291,6 +291,7 @@ public:
 
     class iterator
     {
+        friend class const_iterator;
         QHashData::Node *i;
 
     public:
@@ -343,9 +344,9 @@ public:
     public:
 #endif
         inline bool operator==(const const_iterator &o) const
-            { return i == reinterpret_cast<const iterator &>(o).i; }
+            { return i == o.i; }
         inline bool operator!=(const const_iterator &o) const
-            { return i != reinterpret_cast<const iterator &>(o).i; }
+            { return i != o.i; }
 
     private:
         // ### Qt 5: remove
@@ -355,6 +356,7 @@ public:
 
     class const_iterator
     {
+        friend class iterator;
         QHashData::Node *i;
 
     public:
@@ -374,7 +376,7 @@ public:
 #else
         inline const_iterator(const iterator &o)
 #endif
-        { i = reinterpret_cast<const const_iterator &>(o).i; }
+        { i = o.i; }
 
         inline const Key &key() const { return concrete(i)->key; }
         inline const T &value() const { return concrete(i)->value; }
--- src/corelib/tools/qlist.h
+++ src/corelib/tools/qlist.h
@@ -162,17 +162,17 @@ public:
         inline bool operator>=(const iterator& other) const { return i >= other.i; }
 #ifndef QT_STRICT_ITERATORS
         inline bool operator==(const const_iterator &o) const
-            { return i == reinterpret_cast<const iterator &>(o).i; }
+            { return i == o.i; }
         inline bool operator!=(const const_iterator &o) const
-            { return i != reinterpret_cast<const iterator &>(o).i; }
+            { return i != o.i; }
         inline bool operator<(const const_iterator& other) const
-            { return i < reinterpret_cast<const iterator &>(other).i; }
+            { return i < other.i; }
         inline bool operator<=(const const_iterator& other) const
-            { return i <= reinterpret_cast<const iterator &>(other).i; }
+            { return i <= other.i; }
         inline bool operator>(const const_iterator& other) const
-            { return i > reinterpret_cast<const iterator &>(other).i; }
+            { return i > other.i; }
         inline bool operator>=(const const_iterator& other) const
-            { return i >= reinterpret_cast<const iterator &>(other).i; }
+            { return i >= other.i; }
 #endif
         inline iterator &operator++() { ++i; return *this; }
         inline iterator operator++(int) { Node *n = i; ++i; return n; }
--- src/corelib/tools/qlinkedlist.h
+++ src/corelib/tools/qlinkedlist.h
@@ -119,9 +119,9 @@ public:
         inline bool operator==(const iterator &o) const { return i == o.i; }
         inline bool operator!=(const iterator &o) const { return i != o.i; }
         inline bool operator==(const const_iterator &o) const
-            { return i == reinterpret_cast<const iterator &>(o).i; }
+            { return i == o.i; }
         inline bool operator!=(const const_iterator &o) const
-            { return i != reinterpret_cast<const iterator &>(o).i; }
+            { return i != o.i; }
         inline iterator &operator++() { i = i->n; return *this; }
         inline iterator operator++(int) { Node *n = i; i = i->n; return n; }
         inline iterator &operator--() { i = i->p; return *this; }



--- NEW FILE qt-copy-patches-svn_checkout.sh ---
#!/bin/bash

DATE=$(date +%Y%m%d)
EXPORT_DIR=qt-copy

set -x
rm -rf $EXPORT_DIR

# app
svn export --non-recursive svn://anonsvn.kde.org/home/kde/branches/qt/4.3 $EXPORT_DIR/
svn export svn://anonsvn.kde.org/home/kde/branches/qt/4.3/patches $EXPORT_DIR/patches

pushd $EXPORT_DIR
rm -f ../qt-copy-patches-${DATE}svn.tar.bz2
tar cjf ../qt-copy-patches-${DATE}svn.tar.bz2 \
  .applied_patches apply_patches README.qt-copy patches/ 
popd

# cleanup
rm -rf $EXPORT_DIR


qt-x11-opensource-src-4.2.2-multilib.patch:

--- NEW FILE qt-x11-opensource-src-4.2.2-multilib.patch ---
--- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-64/qmake.conf.multilib	2006-11-27 11:26:42.000000000 -0600
+++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-64/qmake.conf	2007-02-26 15:01:02.000000000 -0600
@@ -14,6 +14,8 @@
 QMAKE_CFLAGS		= -m64
 QMAKE_LFLAGS		= -m64
 
+QMAKE_CFLAGS_RELEASE	+= -O2
+
 include(../common/g++.conf)
 include(../common/linux.conf)
 
--- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-32/qmake.conf.multilib	2006-11-27 11:26:42.000000000 -0600
+++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++-32/qmake.conf	2007-02-26 15:01:34.000000000 -0600
@@ -11,6 +11,8 @@
 QMAKE_CFLAGS		= -m32
 QMAKE_LFLAGS		= -m32
 
+QMAKE_CFLAGS_RELEASE	+= -O2
+
 include(../common/g++.conf)
 include(../common/linux.conf)
 load(qt_config)
--- qt-x11-opensource-src-4.2.2/mkspecs/linux-g++/qmake.conf.multilib	2006-11-27 11:26:42.000000000 -0600
+++ qt-x11-opensource-src-4.2.2/mkspecs/linux-g++/qmake.conf	2007-02-26 15:01:26.000000000 -0600
@@ -8,6 +8,8 @@
 QT			+= core gui
 QMAKE_INCREMENTAL_STYLE = sublib
 
+QMAKE_CFLAGS_RELEASE	+= -O2
+
 include(../common/g++.conf)
 include(../common/linux.conf)
 load(qt_config)
--- qt-x11-opensource-src-4.2.2/qmake/project.cpp.QMAKEPATH	2006-11-27 11:26:03.000000000 -0600
+++ qt-x11-opensource-src-4.2.2/qmake/project.cpp	2007-02-26 13:45:39.000000000 -0600
@@ -498,6 +498,7 @@
             ret << ((*it) + concat);
     }
     ret << QLibraryInfo::location(QLibraryInfo::DataPath) + concat;
+    ret << QLibraryInfo::location(QLibraryInfo::PrefixPath) + concat;
 
     return ret;
 }

qt-x11-opensource-src-4.3.0-qassistant-qt4.patch:

--- NEW FILE qt-x11-opensource-src-4.3.0-qassistant-qt4.patch ---
--- qt-x11-opensource-src-4.3.0beta/tools/assistant/lib/qassistantclient.cpp.assistant4	2007-03-19 15:15:06.000000000 -0500
+++ qt-x11-opensource-src-4.3.0beta/tools/assistant/lib/qassistantclient.cpp	2007-03-21 14:02:59.000000000 -0500
@@ -172,7 +172,7 @@
     : QObject( parent ), host ( QLatin1String("localhost") )
 {
     if ( path.isEmpty() )
-        assistantCommand = QLatin1String("assistant");
+        assistantCommand = QLatin1String("assistant-qt4");
     else {
         QFileInfo fi( path );
         if ( fi.isDir() )

qt-x11-opensource-src-4.3.4-aliasing.patch:

--- NEW FILE qt-x11-opensource-src-4.3.4-aliasing.patch ---
diff -up qt-x11-opensource-src-4.3.4/src/corelib/thread/qatomic.h.me qt-x11-opensource-src-4.3.4/src/corelib/thread/qatomic.h
--- qt-x11-opensource-src-4.3.4/src/corelib/thread/qatomic.h.me	2008-02-29 16:32:54.000000000 +0100
+++ qt-x11-opensource-src-4.3.4/src/corelib/thread/qatomic.h	2008-02-29 17:05:03.000000000 +0100
@@ -178,8 +178,13 @@ struct QBasicAtomicPointer
 #endif // Q_SPECIALIZED_QATOMIC
 
 template <typename T>
+#if defined(QT_MOC) || defined(QT_BUILD_QMAKE) || defined(QT_UIC)
+inline T qAtomicSetPtr(T *ptr, T newval)
+{ T ret = *ptr; *ptr = newval; return ret; }
+#else
 inline T qAtomicSetPtr(volatile T *ptr, T newval)
 { return static_cast<T>(q_atomic_set_ptr(ptr, newval)); }
+#endif
 
 // High-level atomic integer operations
 class QAtomic : public QBasicAtomic


--- NEW FILE qt4-wrapper.sh ---
#!/bin/bash

if [ -z "$QT4DIR" ] ; then
  # rpm is more correct multilib-wise, provided /etc/rpm/platform doesn't get in the way.
  QT4DIR="$(/bin/rpm --eval "%{_libdir}/qt4" 2>/dev/null || /usr/bin/pkg-config --variable=prefix QtCore )"
  export QT4DIR
fi

if ! echo ${PATH} | /bin/grep -q $QT4DIR/bin ; then
 PATH=${QT4DIR}/bin:${PATH}
 export PATH
fi

exec $QT4DIR/bin/`basename $0` ${1+"$@"}



--- NEW FILE qt4.csh ---
# Qt4 initialization script (csh)

if ( $?QMAKESPEC ) then
   exit
endif

setenv QMAKESPEC @@QMAKESPEC@@ 



--- NEW FILE qt4.sh ---
# Qt4 initialization script (sh)

if [ -z "$QMAKESPEC" ] ; then
  QMAKESPEC=@@QMAKESPEC@@ 
  export QMAKESPEC

fi



--- NEW FILE qtconfig.desktop ---
[Desktop Entry]
Name=Qt4 Config 
Comment=Configure Qt4 behavior, styles, fonts
Exec=qtconfig-qt4
Icon=qt4-logo
Terminal=false
Encoding=UTF-8
Type=Application
Categories=Qt;Settings;


--- NEW FILE qtdemo.desktop ---
[Desktop Entry]
Name=Qt4 Demo 
Comment=Show Qt4 demos and programming examples
Exec=qtdemo-qt4
Icon=qt4-logo
Terminal=false
Encoding=UTF-8
Type=Application
Categories=Qt;Development;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore	23 Jan 2008 15:58:17 -0000	1.27
+++ .cvsignore	12 Mar 2008 23:38:15 -0000	1.28
@@ -1,10 +1,4 @@
-qt-x11-free-3.3.3.tar.bz2
-qt-x11-immodule-unified-qt3.3.3-20040910.diff.bz2
-qt-x11-immodule-unified-qt3.3.4-20041203.diff.bz2
-qt-x11-free-3.3.4.tar.bz2
-qt-x11-free-3.3.5.tar.bz2
-qt-x11-immodule-unified-qt3.3.5-20051012.diff.bz2
-qt-x11-immodule-unified-qt3.3.5-20051018.diff.bz2
-qt-x11-immodule-unified-qt3.3.7-20061229.diff.bz2
-qt-x11-free-3.3.8.tar.bz2
-qt-x11-free-3.3.8b.tar.gz
+hi128-app-qt4-logo.png
+hi48-app-qt4-logo.png
+qt-copy-patches-20080305svn.tar.bz2
+qt-x11-opensource-src-4.3.4.tar.gz


View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.161 -r 1.162 qt.spec
Index: qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- qt.spec	11 Mar 2008 17:17:16 -0000	1.161
+++ qt.spec	12 Mar 2008 23:38:15 -0000	1.162
@@ -1,1811 +1,1107 @@
-Summary: The shared library for the Qt 3 GUI toolkit
-%if 0
-#if 0%{?fedora} > 8
-Name: qt3
-Obsoletes: qt < 1:%{version}-%{release}
-Provides: qt = 1:%{version}-%{release}
+
+# Fedora Review: http://bugzilla.redhat.com/188180
+
+Summary: Qt toolkit
+%if 0%{?fedora} > 8
+Name:    qt
 %else
-Name: qt
-Epoch: 1
-Obsoletes: qt3 < %{version}-%{release}
-Provides: qt3 = %{version}-%{release}
+Name:    qt4
 %endif
-Version: 3.3.8b
-Release: 8%{?dist}
-License: QPL or GPLv2 or GPLv3
+Version: 4.3.4
+Release: 6%{?dist}
+
+# GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
+License: GPLv3 or GPLv2 with exceptions or QPL
 Group: System Environment/Libraries
+Url: http://www.trolltech.com/products/qt/
+Source0: ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Url: http://www.troll.no
-Source0: ftp://ftp.troll.no/qt/source/qt-x11-free-%{version}.tar.gz
-Source2: qt.sh
-Source3: qt.csh
-Source4: designer3.desktop
-Source5: assistant3.desktop
-Source6: linguist3.desktop
-Source7: qtconfig3.desktop
-
-Patch1: qt-3.3.4-print-CJK.patch
-Patch2: qt-3.0.5-nodebug.patch
-Patch3: qt-3.1.0-makefile.patch
-Patch4: qt-x11-free-3.3.7-umask.patch
-Patch5: qt-x11-free-3.3.6-strip.patch
-Patch7: qt-x11-free-3.3.2-quiet.patch
-Patch8: qt-x11-free-3.3.3-qembed.patch
-Patch12: qt-uic-nostdlib.patch
-Patch13: qt-x11-free-3.3.6-qfontdatabase_x11.patch
-Patch14: qt-x11-free-3.3.3-gl.patch
-Patch19: qt-3.3.3-gtkstyle.patch 
-Patch20: qt-x11-free-3.3.8b-gcc4-buildkey.patch
-Patch24: qt-x11-free-3.3.5-uic.patch
-Patch25: qt-x11-free-3.3.8b-uic-multilib.patch
-Patch27: qt-3.3.6-fontrendering-ml_IN-209097.patch
-Patch29: qt-3.3.8-fontrendering-as_IN-209972.patch
-Patch31: qt-3.3.6-fontrendering-te_IN-211259.patch
-Patch32: qt-3.3.6-fontrendering-214371.patch
-Patch33: qt-3.3.8-fontrendering-#214570.patch
-Patch34: qt-3.3.6-fontrendering-ml_IN-209974.patch
-Patch35: qt-3.3.6-fontrendering-ml_IN-217657.patch
-Patch37: qt-3.3.6-fontrendering-gu-228452.patch
-
-# immodule patches
-Patch50: qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-pre.patch
-Patch51: qt-x11-immodule-unified-qt3.3.7-20061229.diff.bz2
-Patch52: qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-post.patch
-Patch53: qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch
-Patch54: qt-x11-free-3.3.6-fix-key-release-event-with-imm.diff
-Patch55: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch
-
-# qt-copy patches
-Patch100: 0038-dragobject-dont-prefer-unknown.patch
-Patch101: 0047-fix-kmenu-width.diff
-Patch102: 0048-qclipboard_hack_80072.patch
-Patch103: 0056-khotkeys_input_84434.patch
-patch105: 0073-xinerama-aware-qpopup.patch
-Patch107: 0079-compositing-types.patch
-Patch108: 0080-net-wm-sync-request-2.patch
-Patch110: 0084-compositing-properties.patch
-Patch111: 0088-fix-xinput-clash.diff
-
-# upstream patches
-Patch200: qt-x11-free-3.3.4-fullscreen.patch
-Patch201: qt-x11-free-3.3.8b-gcc43.patch
-
-%define qt_dirname qt-3.3
-%define qtdir %{_libdir}/%{qt_dirname}
-%define qt_docdir %{_docdir}/qt-devel-%{version}
-
-%define smp 1
-%define immodule 1
-%define debug 0
-
-# MySQL plugins
-%define plugin_mysql -plugin-sql-mysql
-%define mysql_include_dir %{_includedir}/mysql
-%define mysql_lib_dir %{_libdir}/mysql
-
-# Postgres plugins
-%define plugin_psql -plugin-sql-psql
-
-# ODBC plugins
-%define plugin_odbc -plugin-sql-odbc
-
-# sqlite plugins
-%define plugin_sqlite -plugin-sql-sqlite
-
-%define plugins_style -qt-style-cde -qt-style-motifplus -qt-style-platinum -qt-style-sgi -qt-style-windows -qt-style-compact -qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng
-%define plugins %{plugin_mysql} %{plugin_psql} %{plugin_odbc} %{plugin_sqlite} %{plugins_style}
-
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-Requires: fileutils
-Requires: fontconfig >= 2.0
-Requires: /etc/ld.so.conf.d
-Requires: pkgconfig
 
+%if "%{name}" != "qt4"
+Epoch: 1
+Obsoletes: qt4 < %{version}-%{release}
+Provides: qt4 = %{version}-%{release}
+%endif
+
+Source4: Trolltech.conf
+
+# See http://bugzilla.redhat.com/223663
+%define multilib_archs x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparc
+Source5: qconfig-multilib.h
+
+# search for assistant-qt4 instead of (qt3's) assistant in $PATH 
+Patch1: qt-x11-opensource-src-4.3.0-qassistant-qt4.patch
+# multilib hacks 
+Patch2: qt-x11-opensource-src-4.2.2-multilib.patch
+# strict aliasing violations in tool classes
+Patch3: qt-43-aliasing.diff
+Patch4: qt-x11-opensource-src-4.3.4-aliasing.patch
+
+## qt-copy patches
+%define qt_copy 20080305
+Source1: qt-copy-patches-svn_checkout.sh
+Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2
+%{?qt_copy:Provides: qt-copy = %{qt_copy}}
+%{?qt_copy:Provides: qt4-copy = %{qt_copy}}
+
+Source10: qt4-wrapper.sh
+Source11: qt4.sh
+Source12: qt4.csh
+
+Source20: assistant.desktop
+Source21: designer.desktop
+Source22: linguist.desktop
+Source23: qtdemo.desktop
+Source24: qtconfig.desktop
+
+# upstream qt4-logo, http://trolltech.com/images/products/qt/qt4-logo
+Source30: hi128-app-qt4-logo.png
+Source31: hi48-app-qt4-logo.png
+
+## optional plugin bits
+# set to -no-sql-<driver> to disable
+# set to -qt-sql-<driver> to enable *in* qt library
+%define mysql -plugin-sql-mysql
+%define odbc -plugin-sql-odbc 
+%define psql -plugin-sql-psql 
+%define sqlite -plugin-sql-sqlite 
+
+# undefine to disable these
+%define nas -system-nas-sound
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+%define qdbus -qdbus
+BuildRequires: dbus-devel >= 0.62
+%endif
+
+# See http://bugzilla.redhat.com/196901
+%define _qt4_prefix %{_libdir}/qt4
+%define _qt4_bindir %{_qt4_prefix}/bin
+# _qt4_datadir is not multilib clean, and hacks to workaround that breaks stuff.
+#define _qt4_datadir %{_datadir}/qt4
+%define _qt4_datadir %{_qt4_prefix}
+%define _qt4_demosdir %{_qt4_prefix}/demos
+%define _qt4_docdir %{_docdir}/qt4
+%define _qt4_examplesdir %{_qt4_prefix}/examples
+%define _qt4_headerdir %{_includedir} 
+%define _qt4_libdir %{_libdir}
+%define _qt4_plugindir %{_qt4_prefix}/plugins
+%define _qt4_sysconfdir %{_sysconfdir}
+%define _qt4_translationdir %{_datadir}/qt4/translations
+
+%if "%{_qt4_libdir}" != "%{_libdir}"
+Prereq: /etc/ld.so.conf.d
[...2405 lines suppressed...]
+- - ./configure -xfixes, BR: libXfixes-devel
+
+* Mon Aug 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.5.tp1
+- fix empty -debuginfo
+- use $RPM_OPT_FLAGS
+
+* Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.4.tp1
+- strip -laudio, -ldbus-1, -lglib-2.0 from .pc files
+
+* Thu Jul 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.3.tp1
+- -no-reduce-exports (for now)
+- -fno-strict-aliasing (fc5+)
+
+* Fri Jul 07 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.2.tp1
+- -system-nas-sound, BR: nas-devel (bug # 197937)
+- -qdbus (fc6+, BR: dbus-devel >= 0.62)
+- -glib (BR: glib2-devel)
+
+* Fri Jun 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.2.0-0.1.tp1
+- 4.2.0-tp1 (technology preview 1)
+
+* Thu Jun 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-5
+- make FHS-friendly (bug #196901)
+- cleanup %%_bindir symlinks, (consistently) use qt4 postfix
+
+* Wed Jun 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-4
+- x11: split-out gui(x11) from non-gui bits (bug #196899)
+
+* Mon Jun 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-3
+- -debug: drop, adds nothing over -debuginfo, make lib..._debug 
+  symlinks instead (bug #196513)
+- assistant.desktop: fix tooltip (bug #197039)
+
+* Mon Jun 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-2
+- -devel: include -debug libs (bug #196513)
+- -devel: move libQtDesigner here
+- -config: mash into main pkg, should be multilib friendly now
+
+* Fri Jun 23 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-1
+- 4.1.4
+
+* Tue Jun 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.3-9
+- make each sql plugin optional
+
+* Fri Jun 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.3-8
+- qmake.conf: undefine QMAKE_STRIP to get useful -debuginfo (bug #193602)
+- move (not symlink) .pc files into %%_libdir/pkgconfig
+
+* Thu Jun 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.3-7
+- *really* fix qt4-wrapper.sh for good this time.
+
+* Mon May 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.3-6
+- make qt4-wrapper.sh use rpm when pkg-config/qt4-devel isn't
+  installed (#193369)
+
+* Fri May 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.3-5
+- strip -lXi from .pc files (#193258)
+- simplify sql plugin builds via %%buildSQL macro
+- -libdir %%qt_libdir 
+
+* Wed May 24 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.3-4
+- move (most) %%dir ownership (back) to main pkg
+
+* Sun May 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.3-3
+- fix %%mysql_libs macro
+
+* Sat May 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.3-2
+- -mysql: use mysql_config for setting cflags/ldflags.
+- -mysql: BR: mysql-devel > 4.0
+
+* Sat May 20 2006 Laurent Rineau <laurent.rineau__fc_extra at normalesup.org>
+- Fix the last reference to %{qtdir}/lib: use %{_lib} instead of "lib".
+- Fix the ownership of subpackages: they need to own parents of directories they install files in.
+
+* Fri May 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.3-1
+- 4.1.3
+- %%qtdir/lib/*.pc -> %%qtdir/%%_lib/*.pc 
+  (hopefully, the last hardcoded reference to %%qtdir/lib)
+
+* Fri May 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-20
+- fix some unowned dirs
+- try harder to purge %%builddir from .pc,.prl files
+- -docdir %%_docdir/%%name-doc-%%version, since we use %%doc macro in main pkg
+- -doc: own %%qt_docdir
+- use qt4-wrapper.sh to ensure launch of qt4 versions of apps that
+  (may) overlap with those from qt3 
+- use %%qtdir/%%_lib in ld.so.conf.d/*.conf files too
+
+* Tue May 16 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-19
+- drop libQtAssistantClient,libQtUiTools shlib patches
+
+* Tue May 16 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-18
+- %%_bindir symlinks: qtconfig4 -> qt4config, qtdemo4 -> qt4demo
+- -libdir %%qtdir/%%_lib, simplifies %%_lib != lib case
+- -docdir %%_docdir/%%name-%%version
+- build shared versions of libQtAssistantClient,libQtUiTools too
+- strip extraneous -L paths, libs from *.prl files too
+
+* Tue May 16 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-17
+- .desktop: Qt -> Qt4, and Comment= (where missing)
+- -devel: include -designer here, Obsoletes/Provides: %%name-designer.
+   It's small, simplifies things... one less subpkg to worry about.
+- -doc: include %%qtdir/doc symlink here
+- -docdir %%_docdir/%%name-doc-%%version
+
+* Mon May 15 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-16
+- set/use RPM_OPT_FLAGS only for our platform
+- (really) don't give %%_bindir symlink for qt3to4 another "4" suffix
+- don't add 4 suffix to uic3, rcc (they don't conflict with qt(3)-devel)
+- -devel: add  linguist.desktop
+- -doc: move assistant here, Provides: %%{name}-assistant, add assistant.desktop
+- -doc: add qtdemo.desktop
+- -doc: Requires qt4 (instead of qt4-devel)
+- assistant4.patch: search for assistant4 instead of (qt3's) assistant in $PATH 
+- -qtconfig: add qtconfig.desktop
+- updated %%sumaries to mention where (some) tools are, including assistant, linguist,
+  qtdemo
+
+* Mon May 15 2006 Laurent Rineau <laurent.rineau__fc_extra at normalesup.org> - 4.1.2-15
+- Rename -docs to -doc.
+- Files in the -doc subpackage are no longer in %%doc.
+- Move qtdemo to the subpackage -doc.
+- Fix symlinks in %%{_bindir}.
+- Only modify mkspecs/linux-g++*/qmake.conf, instead of all mkspecs/*/qmake.conf.
+
+* Sun May 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-14
+- remove MapNotify from .desktop file(s).
+- install -m644 LICENSE.*
+- -docs: don't mark examples as %doc
+- drop unused %%debug macro
+
+* Sat May 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-13
+- include unpackaged pkgconfig files
+
+* Sat May 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-12
+- fix typos so it actually builds.
+
+* Sat May 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-11
+- drop optional ld.so.conf.d usage, make mandatory
+- make %%_bindir symlinks to all %%qtdir/bin stuff (even qt3to4)
+- pkgconfig files: hardlinks -> relative symlinks, strip -L%{_libdir}/mysql
+  and -L%%{_builddir}/qt-x11-opensource-src-%%version/lib
+- cleanup/simplify Summary/%%description entries
+- $RPM_BUILD_ROOT -> %%buildroot, $RPM_BUILD_DIR -> %%_builddir
+
+* Sat May 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-10
+- cleanup/simplify license bits, include LICENSE.QPL
+- drop unused -styles/-Xt subpkg reference
+- drop unused motif extention bits
+- drop initialpreference from .desktop files
+
+* Fri May 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-9
+- drop reference to non-existent config.test/unix/checkavail
+
+* Fri May 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-8
+- simplify build* macros
+- lower-case all subpkgs (ie, -MySQL -> -mysql )
+- drop BR: perl, sed
+
+* Thu May 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-7
+- rework %%post/%%postun, mostly to placate rpmlint
+- drop Prefix:
+- drop use of qt4.(sh|csh), they're empty atm anyway
+- use Source'd designer.desktop (instead of inline cat/echo)
+- symlinks to %%_bindir: qmake4, designer4, qtconfig4
+- drop qtrc, qt4 doesn't use it.
+- -docs subpkg for API html docs, demos, examples.
+- BR: libXcursor-devel libXi-devel (fc5+)
+
+* Thu Apr 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-6
+- devel: Requires: pkgconfig
+
+* Sat Apr 15 2006 Simon Perreault <nomis80 at nomis80.org> 4.1.2-5
+- Disable C++ exceptions.
+
+* Mon Apr 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-4
+- qt4.(sh|csh): place-holders only, don't define QTDIR (and QTLIB)
+  as that (potentially) conflicts with qt-3.x.
+
+* Thu Apr 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-2
+- -devel: Drop (artificial) Conflicts: qt-devel
+- fix %%ld_so_conf_d usage
+- %%qtdir/%%_lib symlink
+
+* Wed Apr 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.2-1
+- drop Epoch
+- cleanup (a lot!)
 
-* Mon Jan 04 1999 Preston Brown <pbrown at redhat.com>
-- made setup phase silent.
+* Tue Dec 20 2005 Than Ngo <than at redhat.com> 1:4.1.0-0.1
+- update to 4.1.0
 
-* Fri Dec 04 1998 Preston Brown <pbrown at redhat.com>
-- upgraded to qt 1.42, released today.
+* Fri Sep 09 2005 Than Ngo <than at redhat.com> 1:4.0.1-0.1
+- update to 4.0.1
 
-* Tue Dec 01 1998 Preston Brown <pbrown at redhat.com>
-- took Arnts RPM and made some minor changes for Red Hat.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	23 Jan 2008 15:58:17 -0000	1.28
+++ sources	12 Mar 2008 23:38:15 -0000	1.29
@@ -1,2 +1,4 @@
-91adfea39f17a64b86497bce32782cf3  qt-x11-immodule-unified-qt3.3.7-20061229.diff.bz2
-9f05b4125cfe477cc52c9742c3c09009  qt-x11-free-3.3.8b.tar.gz
+d9f511e4b51983b4e10eb58b320416d5  hi128-app-qt4-logo.png
+6dcc0672ff9e60a6b83f95c5f42bec5b  hi48-app-qt4-logo.png
+e07759e773b8ec38ce222b6fd5e9f0c5  qt-copy-patches-20080305svn.tar.bz2
+9499101ec54eb7b0de195b3c5e3ffa93  qt-x11-opensource-src-4.3.4.tar.gz


--- 0038-dragobject-dont-prefer-unknown.patch DELETED ---


--- 0047-fix-kmenu-width.diff DELETED ---


--- 0048-qclipboard_hack_80072.patch DELETED ---


--- 0056-khotkeys_input_84434.patch DELETED ---


--- 0073-xinerama-aware-qpopup.patch DELETED ---


--- 0077-utf8-decoder-fixes.diff DELETED ---


--- 0079-compositing-types.patch DELETED ---


--- 0080-net-wm-sync-request-2.patch DELETED ---


--- 0084-compositing-properties.patch DELETED ---


--- 0088-fix-xinput-clash.diff DELETED ---


--- assistant3.desktop DELETED ---


--- designer3.desktop DELETED ---


--- linguist3.desktop DELETED ---


--- qt-3.0.5-nodebug.patch DELETED ---


--- qt-3.1.0-makefile.patch DELETED ---


--- qt-3.3.3-gtkstyle.patch DELETED ---


--- qt-3.3.4-print-CJK.patch DELETED ---


--- qt-3.3.6-fontrendering-214371.patch DELETED ---


--- qt-3.3.6-fontrendering-bn_IN-209975.patch DELETED ---


--- qt-3.3.6-fontrendering-gu-228452.patch DELETED ---


--- qt-3.3.6-fontrendering-ml_IN-209097.patch DELETED ---


--- qt-3.3.6-fontrendering-ml_IN-209974.patch DELETED ---


--- qt-3.3.6-fontrendering-ml_IN-217657.patch DELETED ---


--- qt-3.3.6-fontrendering-te_IN-211259.patch DELETED ---


--- qt-3.3.8-fontrendering-#214570.patch DELETED ---


--- qt-3.3.8-fontrendering-as_IN-209972.patch DELETED ---


--- qt-uic-nostdlib.patch DELETED ---


--- qt-x11-free-3.3.2-quiet.patch DELETED ---


--- qt-x11-free-3.3.3-gl.patch DELETED ---


--- qt-x11-free-3.3.3-qembed.patch DELETED ---


--- qt-x11-free-3.3.4-fullscreen.patch DELETED ---


--- qt-x11-free-3.3.5-uic.patch DELETED ---


--- qt-x11-free-3.3.6-fix-key-release-event-with-imm.diff DELETED ---


--- qt-x11-free-3.3.6-qfontdatabase_x11.patch DELETED ---


--- qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch DELETED ---


--- qt-x11-free-3.3.6-strip.patch DELETED ---


--- qt-x11-free-3.3.7-umask.patch DELETED ---


--- qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-post.patch DELETED ---


--- qt-x11-free-3.3.8-qt-x11-immodule-unified-qt3.3.7-20061229-pre.patch DELETED ---


--- qt-x11-free-3.3.8b-gcc4-buildkey.patch DELETED ---


--- qt-x11-free-3.3.8b-gcc43.patch DELETED ---


--- qt-x11-free-3.3.8b-uic-multilib.patch DELETED ---


--- qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch DELETED ---


--- qt.csh DELETED ---


--- qt.sh DELETED ---


--- qtconfig3.desktop DELETED ---


