diff --git a/.cvsignore b/.cvsignore index 6b5b205..ebb2006 100644 --- a/.cvsignore +++ b/.cvsignore @@ -2,3 +2,5 @@ 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 +qt-copy-patches-20080528svn.tar.bz2 +qt-x11-opensource-src-4.3.5.tar.gz diff --git a/qt-43-aliasing.diff b/qt-43-aliasing.diff deleted file mode 100644 index dce2ff6..0000000 --- a/qt-43-aliasing.diff +++ /dev/null @@ -1,158 +0,0 @@ ---- 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(o).i; } -+ { return i == o.i; } - inline bool operator!=(const const_iterator &o) const -- { return i != reinterpret_cast(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(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 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(o).i; } -+ { return i == o.i; } - inline bool operator!=(const const_iterator &o) const -- { return i != reinterpret_cast(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 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(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(o).i; } -+ { return i == o.i; } - inline bool operator!=(const const_iterator &o) const -- { return i != reinterpret_cast(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(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(o).i; } -+ { return i == o.i; } - inline bool operator!=(const const_iterator &o) const -- { return i != reinterpret_cast(o).i; } -+ { return i != o.i; } - inline bool operator<(const const_iterator& other) const -- { return i < reinterpret_cast(other).i; } -+ { return i < other.i; } - inline bool operator<=(const const_iterator& other) const -- { return i <= reinterpret_cast(other).i; } -+ { return i <= other.i; } - inline bool operator>(const const_iterator& other) const -- { return i > reinterpret_cast(other).i; } -+ { return i > other.i; } - inline bool operator>=(const const_iterator& other) const -- { return i >= reinterpret_cast(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(o).i; } -+ { return i == o.i; } - inline bool operator!=(const const_iterator &o) const -- { return i != reinterpret_cast(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; } - diff --git a/qt-x11-opensource-src-4.3.4-aliasing.patch b/qt-x11-opensource-src-4.3.4-aliasing.patch deleted file mode 100644 index 300ae61..0000000 --- a/qt-x11-opensource-src-4.3.4-aliasing.patch +++ /dev/null @@ -1,17 +0,0 @@ -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 -+#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(q_atomic_set_ptr(ptr, newval)); } -+#endif - - // High-level atomic integer operations - class QAtomic : public QBasicAtomic diff --git a/qt.spec b/qt.spec index 173f6c4..2fc10c1 100644 --- a/qt.spec +++ b/qt.spec @@ -7,8 +7,8 @@ Name: qt %else Name: qt4 %endif -Version: 4.3.4 -Release: 14%{?dist} +Version: 4.3.5 +Release: 1%{?dist} # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt) License: GPLv3 or GPLv2 with exceptions or QPL @@ -33,9 +33,6 @@ Source5: qconfig-multilib.h 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 Patch5: qt-x11-opensource-src-4.3.4-as_IN-437440.patch # look for OpenSSL using versioned sonames Patch6: qt-x11-opensource-src-4.3.4-openssl.patch @@ -45,7 +42,7 @@ Patch7: qt4-sparc64-qvector.patch Patch8: qt-x11-opensource-src-4.3.4-no-hardcoded-font-aliases.patch ## qt-copy patches -%define qt_copy 20080305 +%define qt_copy 20080528 Source1: qt-copy-patches-svn_checkout.sh Source2: qt-copy-patches-%{qt_copy}svn.tar.bz2 %{?qt_copy:Provides: qt-copy = %{qt_copy}} @@ -274,20 +271,15 @@ Qt libraries which are used for drawing widgets and OpenGL items. %endif %if 0%{?qt_copy:1} -# 204,206,208 don't apply atm, some/most of these are already included -- Rex -echo "0204" >> patches/DISABLED -echo "0206" >> patches/DISABLED -echo "0208" >> patches/DISABLED +# dome don't apply atm, some/most of these are already included -- Rex +echo "0176" >> patches/DISABLED test -x apply_patches && ./apply_patches -%else -%patch3 -p0 %endif %patch1 -p1 -b .assistant4 # don't use -b on mkspec files, else they get installed too. %patch2 -p1 -%patch4 -p1 %patch5 -p1 -b .bz#437440-as_IN-437440 %patch6 -p1 -b .openssl # SHLIB_VERSION_NUMBER is wrong on F8 and older @@ -712,6 +704,10 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: %changelog +* Wed May 28 2008 Rex Dieter 4.3.5-1 +- qt-x11-opensource-src-4.3.5 +- qt-copy 20080528 patches + * Mon May 19 2008 Kevin Kofler 4.3.4-14 - don't hardcode incorrect font substitutions (#447298) diff --git a/sources b/sources index 8cab6ca..111405a 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 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 +c12c234097d65943603a624ea989bca5 qt-copy-patches-20080528svn.tar.bz2 +4e6234235431e768e18777ff32990cc2 qt-x11-opensource-src-4.3.5.tar.gz