rpms/qt4/F-7 qt-43-aliasing.diff, NONE, 1.1 qt-copy-patches-svn_checkout.sh, NONE, 1.1 qt-x11-opensource-src-4.3.4-aliasing.patch, NONE, 1.1 qt-x11-opensource-src-4.3.4-as_IN-437440.patch, NONE, 1.1 qt-x11-opensource-src-4.3.4-openssl.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 Trolltech.conf, 1.1, 1.2 qt4.spec, 1.53, 1.54 sources, 1.16, 1.17 qt-x11-opensource-src-4.3.2-rh#334281.patch, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Wed Apr 16 15:54:58 UTC 2008
- Previous message (by thread): comps/po sl.po,1.7,1.8
- Next message (by thread): rpms/qt4/F-8 qt-43-aliasing.diff, NONE, 1.1 qt-copy-patches-svn_checkout.sh, NONE, 1.1 qt-x11-opensource-src-4.3.4-aliasing.patch, NONE, 1.1 qt-x11-opensource-src-4.3.4-as_IN-437440.patch, NONE, 1.1 qt-x11-opensource-src-4.3.4-openssl.patch, NONE, 1.1 .cvsignore, 1.22, 1.23 Trolltech.conf, 1.1, 1.2 qt4.spec, 1.74, 1.75 sources, 1.18, 1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/qt4/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30504/F-7
Modified Files:
.cvsignore Trolltech.conf qt4.spec sources
Added Files:
qt-43-aliasing.diff qt-copy-patches-svn_checkout.sh
qt-x11-opensource-src-4.3.4-aliasing.patch
qt-x11-opensource-src-4.3.4-as_IN-437440.patch
qt-x11-opensource-src-4.3.4-openssl.patch
Removed Files:
qt-x11-opensource-src-4.3.2-rh#334281.patch
Log Message:
sync with qt/F-9 branch (qt-4.3.4)
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.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
qt-x11-opensource-src-4.3.4-as_IN-437440.patch:
--- NEW FILE qt-x11-opensource-src-4.3.4-as_IN-437440.patch ---
--- qt-x11-opensource-src-4.3.4/src/gui/text/qscriptengine.cpp 2008-02-19 23:17:19.000000000 +0530
+++ qscriptengine.cpp_mod 2008-04-01 17:39:48.000000000 +0530
@@ -2174,7 +2174,7 @@ static const unsigned char indicPosition
None, None, None, None,
None, None, None, None,
- None, None, None, None,
+ Below, None, None, None,
None, None, None, None,
None, None, None, None,
None, None, None, None,
@@ -2814,7 +2814,7 @@ static bool indic_shape_syllable(QOpenTy
int script = item->script;
Q_ASSERT(script >= QUnicodeTables::Devanagari && script <= QUnicodeTables::Sinhala);
const unsigned short script_base = 0x0900 + 0x80*(script-QUnicodeTables::Devanagari);
- const unsigned short ra = script_base + 0x30;
+ unsigned short ra = script_base + 0x30;
const unsigned short halant = script_base + 0x4d;
const unsigned short nukta = script_base + 0x3c;
@@ -2856,6 +2856,19 @@ static bool indic_shape_syllable(QOpenTy
unsigned short *uc = reordered.data();
bool beginsWithRa = false;
+ // Exception in Bengali Script
+ //
+ // Bengali script supports two languages bengali and assamese
+ // Unfortunately for both languages there is different ra defined in same script chart
+ // for Bengali it ra is 'Base+ 0x30' and for assamese 'Base+0x70'
+ // Base is same 0x0980
+ // To handle this exception we need to change ra to from const to normal variable
+ // and aslo need to change ra to 'Base+0x70' whenever we will get assamese language
+ //character in data
+ if((script == QUnicodeTables::Bengali) && (*uc==0x09F0)){
+ ra = script_base + 0x70;
+ }
+
// Rule 1: find base consonant
//
// The shaping engine finds the base consonant of the
qt-x11-opensource-src-4.3.4-openssl.patch:
--- NEW FILE qt-x11-opensource-src-4.3.4-openssl.patch ---
diff -ur qt-x11-opensource-src-4.3.4/src/network/qsslsocket_openssl_symbols.cpp qt-x11-opensource-src-4.3.4-openssl/src/network/qsslsocket_openssl_symbols.cpp
--- qt-x11-opensource-src-4.3.4/src/network/qsslsocket_openssl_symbols.cpp 2008-02-19 18:47:39.000000000 +0100
+++ qt-x11-opensource-src-4.3.4-openssl/src/network/qsslsocket_openssl_symbols.cpp 2008-04-02 04:55:24.000000000 +0200
@@ -254,7 +254,7 @@
return false;
}
#else
- QLibrary libssl(QLatin1String("ssl"));
+ QLibrary libssl(QLatin1String("libssl.so." SHLIB_VERSION_NUMBER));
if (!libssl.load()) {
// Cannot find libssl
qWarning("QSslSocket: cannot find ssl library: %s.",
@@ -262,7 +262,7 @@
return false;
}
- QLibrary libcrypto(QLatin1String("crypto"));
+ QLibrary libcrypto(QLatin1String("libcrypto.so." SHLIB_VERSION_NUMBER));
if (!libcrypto.load()) {
// Cannot find libcrypto
qWarning("QSslSocket: cannot find crypto library: %s.",
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-7/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore 9 Dec 2007 04:09:43 -0000 1.20
+++ .cvsignore 16 Apr 2008 15:54:17 -0000 1.21
@@ -1,6 +1,4 @@
-clog
hi128-app-qt4-logo.png
hi48-app-qt4-logo.png
-qt-x11-opensource-src-4.3.1.tar.gz
-qt-x11-opensource-src-4.3.2.tar.gz
-qt-x11-opensource-src-4.3.3.tar.gz
+qt-copy-patches-20080305svn.tar.bz2
+qt-x11-opensource-src-4.3.4.tar.gz
Index: Trolltech.conf
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-7/Trolltech.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Trolltech.conf 14 Mar 2007 13:17:14 -0000 1.1
+++ Trolltech.conf 16 Apr 2008 15:54:17 -0000 1.2
@@ -1,3 +1,3 @@
[Qt]
-font="Sans Serif,9,-1,5,50,0,0,0,0,0"
+font="Sans Serif,10,-1,5,50,0,0,0,0,0"
Index: qt4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-7/qt4.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- qt4.spec 9 Dec 2007 04:09:43 -0000 1.53
+++ qt4.spec 16 Apr 2008 15:54:17 -0000 1.54
@@ -2,12 +2,16 @@
# Fedora Review: http://bugzilla.redhat.com/188180
Summary: Qt toolkit
-Name: qt4
-Version: 4.3.3
-Release: 1%{?dist}
+%if 0%{?fedora} > 8
+Name: qt
+%else
+Name: qt4
+%endif
+Version: 4.3.4
+Release: 11%{?dist}
-# GPLv2+exceptions(see GPL_EXCEPTIONS*.txt)
-License: GPLv2
+# 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
@@ -19,7 +23,7 @@
Provides: qt4 = %{version}-%{release}
%endif
-Source1: Trolltech.conf
+Source4: Trolltech.conf
# See http://bugzilla.redhat.com/223663
%define multilib_archs x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparc
@@ -29,7 +33,19 @@
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
+
## 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
@@ -63,7 +79,9 @@
# See http://bugzilla.redhat.com/196901
%define _qt4_prefix %{_libdir}/qt4
%define _qt4_bindir %{_qt4_prefix}/bin
-%define _qt4_datadir %{_datadir}/qt4
+# _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
@@ -71,7 +89,7 @@
%define _qt4_libdir %{_libdir}
%define _qt4_plugindir %{_qt4_prefix}/plugins
%define _qt4_sysconfdir %{_sysconfdir}
-%define _qt4_translationdir %{_qt4_datadir}/translations
+%define _qt4_translationdir %{_datadir}/qt4/translations
%if "%{_qt4_libdir}" != "%{_libdir}"
Prereq: /etc/ld.so.conf.d
@@ -124,8 +142,8 @@
%endif
%endif
-Obsoletes: %{name}-config < %{version}-%{release}
-Provides: %{name}-config = %{version}-%{release}
+Obsoletes: qt4-config < %{version}-%{release}
+Provides: qt4-config = %{version}-%{release}
## libQtScript Obsoletes libqsa ?
# Obsoletes: qt4-qsa
@@ -138,14 +156,14 @@
%package devel
Summary: Development files for the Qt toolkit
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: %{name}-x11
Requires: %{x_deps}
Requires: libpng-devel
Requires: libjpeg-devel
Requires: pkgconfig
-Obsoletes: %{name}-designer < %{version}-%{release}
-Provides: %{name}-designer = %{version}-%{release}
+Obsoletes: qt4-designer < %{version}-%{release}
+Provides: qt4-designer = %{version}-%{release}
%if "%{name}" != "qt4"
Obsoletes: qt4-devel < %{version}-%{release}
Provides: qt4-devel = %{version}-%{release}
@@ -159,8 +177,12 @@
%package doc
Summary: API documentation, demos and example programs for %{name}
Group: Documentation
-Requires: %{name} = %{version}-%{release}
-Provides: %{name}-assistant = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name}-assistant
+%if "%{name}" != "qt4"
+Obsoletes: qt4-doc < %{version}-%{release}
+Provides: qt4-doc = %{version}-%{release}
+%endif
%description doc
%{summary}. Includes:
@@ -169,9 +191,13 @@
%package odbc
Summary: ODBC driver for Qt's SQL classes
Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-Obsoletes: %{name}-ODBC < %{version}-%{release}
-Provides: %{name}-ODBC = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: qt4-ODBC < %{version}-%{release}
+Provides: qt4-ODBC = %{version}-%{release}
+%if "%{name}" != "qt4"
+Obsoletes: qt4-odbc < %{version}-%{release}
+Provides: qt4-odbc = %{version}-%{release}
+%endif
%description odbc
%{summary}.
@@ -179,9 +205,13 @@
%package mysql
Summary: MySQL driver for Qt's SQL classes
Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-Obsoletes: %{name}-MySQL < %{version}-%{release}
-Provides: %{name}-MySQL = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: qt4-MySQL < %{version}-%{release}
+Provides: qt4-MySQL = %{version}-%{release}
+%if "%{name}" != "qt4"
+Obsoletes: qt4-mysql < %{version}-%{release}
+Provides: qt4-mysql = %{version}-%{release}
+%endif
%description mysql
%{summary}.
@@ -189,9 +219,13 @@
%package postgresql
Summary: PostgreSQL driver for Qt's SQL classes
Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-Obsoletes: %{name}-PostgreSQL < %{version}-%{release}
-Provides: %{name}-PostgreSQL = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: qt4-PostgreSQL < %{version}-%{release}
+Provides: qt4-PostgreSQL = %{version}-%{release}
+%if "%{name}" != "qt4"
+Obsoletes: qt4-postgresql < %{version}-%{release}
+Provides: qt4-postgresql = %{version}-%{release}
+%endif
%description postgresql
%{summary}.
@@ -199,9 +233,13 @@
%package sqlite
Summary: SQLite driver for Qt's SQL classes
Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-Obsoletes: %{name}-SQLite < %{version}-%{release}
-Provides: %{name}-SQLite = %{version}-%{release}
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: qt4-SQLite < %{version}-%{release}
+Provides: qt4-SQLite = %{version}-%{release}
+%if "%{name}" != "qt4"
+Obsoletes: qt4-sqlite < %{version}-%{release}
+Provides: qt4-sqlite = %{version}-%{release}
+%endif
%description sqlite
%{summary}.
@@ -209,8 +247,16 @@
%package x11
Summary: Qt GUI-related libraries
Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
+Provides: qt4-assistant = %{version}-%{release}
+%if "%{name}" != "qt4"
+Provides: %{name}-assistant = %{version}-%{release}
+%endif
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: redhat-rpm-config rpm
+%if "%{name}" != "qt4"
+Obsoletes: qt4-x11 < %{version}-%{release}
+Provides: qt4-x11 = %{version}-%{release}
+%endif
%description x11
Qt libraries which are used for drawing widgets and OpenGL items.
@@ -220,12 +266,31 @@
%if "%{?snap:1}" == "1"
%setup -q -n qt-x11%{?preview}-opensource-src-%{version}-%{snap}
%else
-%setup -q -n qt-x11%{?preview}-opensource-src-%{version}%{?beta}
+%setup -q -n qt-x11%{?preview}-opensource-src-%{version}%{?beta} %{?qt_copy:-a 2}
+%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
+
+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
+# 0.9.8b is the version in both F7 and F8
+%if 0%{?fedora} < 9
+sed -i -e 's/SHLIB_VERSION_NUMBER/"0.9.8b"/g' src/network/qsslsocket_openssl_symbols.cpp
+%endif
# drop -fexceptions from $RPM_OPT_FLAGS
RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'`
@@ -327,7 +392,7 @@
# Add desktop file(s)
desktop-file-install \
--dir %{buildroot}%{_datadir}/applications \
- --vendor="%{name}" \
+ --vendor="qt4" \
%{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24}
## pkg-config
@@ -353,9 +418,6 @@
rm -rf %{buildroot}%{_qt4_prefix}/doc
ln -s ../../share/doc/qt4 %{buildroot}%{_qt4_prefix}/doc
-# put LICENSE.* files in %%_qt4_prefix, some apps' configure scripts expect to find them here
-install -p -m644 LICENSE.GPL %{buildroot}%{_qt4_prefix}/
-
## Make symlinks in %%_bindir
%if "%{_bindir}" != "%{_qt4_bindir}"
mkdir -p %{buildroot}%{_bindir}
@@ -394,29 +456,28 @@
install -p -m644 -D %{SOURCE5} %{buildroot}%{_qt4_headerdir}/QtCore/qconfig-multilib.h
ln -sf qconfig-multilib.h %{buildroot}%{_qt4_headerdir}/QtCore/qconfig.h
ln -sf ../QtCore/qconfig.h %{buildroot}%{_qt4_headerdir}/Qt/qconfig.h
-%endif
%if "%{_qt4_datadir}" != "%{_qt4_prefix}"
-# multilib: mkspecs. TODO: consider moving this to ifarch multilib_archs block above
+# multilib: mkspecs hacks, unfortunately, breaks some stuff
mkdir %{buildroot}%{_qt4_prefix}/mkspecs
mv %{buildroot}%{_qt4_datadir}/mkspecs/{default,linux-g++*,qconfig.pri} \
%{buildroot}%{_qt4_prefix}/mkspecs/
ln -s %{_qt4_datadir}/mkspecs/common %{buildroot}%{_qt4_prefix}/mkspecs/common
%endif
-
+%endif
# qt4.(sh|csh), currently unused
-#install -p -m755 -D %{SOURCE11} %{buildroot}/etc/profile.d/%{name}-%{_arch}.sh
-#install -p -m755 -D %{SOURCE12} %{buildroot}/etc/profile.d/%{name}-%{_arch}.csh
-#sed -i -e "s|@@QMAKESPEC@@|%{platform}|" %{buildroot}/etc/profile.d/%{name}-%{_arch}.*
+#install -p -m755 -D %{SOURCE11} %{buildroot}/etc/profile.d/qt4-%{_arch}.sh
+#install -p -m755 -D %{SOURCE12} %{buildroot}/etc/profile.d/qt4-%{_arch}.csh
+#sed -i -e "s|@@QMAKESPEC@@|%{platform}|" %{buildroot}/etc/profile.d/qt4-%{_arch}.*
%if "%{_qt4_libdir}" != "%{_libdir}"
mkdir -p %{buildroot}/etc/ld.so.conf.d
- echo "%{_qt4_libdir}" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
+ echo "%{_qt4_libdir}" > %{buildroot}/etc/ld.so.conf.d/qt4-%{_arch}.conf
%endif
# Trolltech.conf
-install -p -m644 -D %{SOURCE1} %{buildroot}%{_qt4_sysconfdir}/Trolltech.conf
+install -p -m644 -D %{SOURCE4} %{buildroot}%{_qt4_sysconfdir}/Trolltech.conf
# qt4-logo (generic) icons
install -p -m644 -D %{SOURCE30} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/qt4-logo.png
@@ -435,7 +496,7 @@
prefix=%{_qt4_prefix}
bindir=%{_qt4_bindir}
datadir=%{_qt4_datadir}
-demosdir=%{qt4_demosdir}
+demosdir=%{_qt4_demosdir}
docdir=%{_qt4_docdir}
examplesdir=%{_qt4_examplesdir}
headerdir=%{_qt4_headerdir}
@@ -503,15 +564,20 @@
%defattr(-,root,root,-)
%doc README*
%{!?beta:%doc OPENSOURCE-NOTICE.TXT}
-%doc LICENSE.GPL GPL_EXCEPTION*.TXT
-%{_qt4_prefix}/LICENSE.GPL
+%doc LICENSE.GPL2 GPL_EXCEPTION*.TXT
+%doc LICENSE.GPL3
+%doc LICENSE.QPL
%if "%{_qt4_libdir}" != "%{_libdir}"
/etc/ld.so.conf.d/*
%dir %{_qt4_libdir}
%endif
%dir %{_qt4_prefix}
%dir %{_qt4_bindir}
+%if "%{_qt4_datadir}" != "%{_datadir}/qt4"
+%dir %{_datadir}/qt4
+%else
%dir %{_qt4_datadir}
+%endif
%if "%{_qt4_sysconfdir}" != "%{_sysconfdir}"
%dir %{_qt4_sysconfdir}
%endif
@@ -519,8 +585,12 @@
%{_qt4_datadir}/phrasebooks/
%{_qt4_libdir}/libQtCore.so.*
%if "%{?qdbus}" == "-qdbus"
-%{_bindir}/qdbus*
-%{_qt4_bindir}/qdbus*
+%{_bindir}/qdbus
+%{_bindir}/qdbuscpp2xml
+%{_bindir}/qdbusxml2cpp
+%{_qt4_bindir}/qdbus
+%{_qt4_bindir}/qdbuscpp2xml
+%{_qt4_bindir}/qdbusxml2cpp
%{_qt4_libdir}/libQtDBus.so.*
%endif
%{_qt4_libdir}/libQtNetwork.so.*
@@ -545,12 +615,12 @@
%{_qt4_plugindir}/*
%exclude %{_qt4_plugindir}/designer
%exclude %{_qt4_plugindir}/sqldrivers
-# Qt Assistant
-%{_qt4_bindir}/assistant*
%{_bindir}/assistant*
-#-config bits
-%{_qt4_bindir}/qt*config*
+%{_bindir}/qdbusviewer
%{_bindir}/qt*config*
+%{_qt4_bindir}/assistant*
+%{_qt4_bindir}/qdbusviewer
+%{_qt4_bindir}/qt*config*
%{_datadir}/applications/*qtconfig*.desktop
%{_datadir}/icons/hicolor/*/apps/qt4-logo.*
@@ -603,9 +673,7 @@
%{_qt4_prefix}/doc
%{_qt4_demosdir}/
%{_qt4_examplesdir}/
-# Qt Assistant
-%{_qt4_bindir}/assistant*
-%{_bindir}/assistant*
+# Qt Assistant (bin moved to -x11)
%{_datadir}/applications/*assistant*.desktop
# Qt Demo
%{_qt4_bindir}/qt*demo*
@@ -638,6 +706,68 @@
%changelog
+* Tue Apr 08 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.3.4-11
+- updated patch for #437440 ([as-IN] Consonant combination issue) by Pravin Satpute
+
+* Wed Apr 02 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.3.4-10
+- look for OpenSSL using versioned sonames (#432271)
+
+* Wed Mar 26 2008 Than Ngo <than at redhat.com> 4.3.4-9
+- apply patch bz#437440 to fix [as-IN] Consonant combination issue, thanks to Pravin Satpute
+
+* Sun Mar 23 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.3.4-8
+- -x11: add missing Provides: qt4-assistant when building as qt
+
+* Thu Mar 13 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.3.4-7
+- fix Requires of main package to include Epoch (thanks to Christopher Aillon)
+
+* Wed Mar 12 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.3.4-6
+- rename to qt on Fedora >= 9
+
+* Mon Mar 10 2008 Rex Dieter <rdieter at fedoraproject.org> 4.3.4-5
+- -x11: move qdbusviewer here
+
+* Wed Mar 05 2008 Than Ngo <than at redhat.com> 4.3.4-4
+- upstream patch to fix 4.3 regression
+
+* Fri Feb 29 2008 Than Ngo <than at redhat.com> 4.3.4-3
+- respin aliasing.patch, it's safer
+
+* Thu Feb 28 2008 Than Ngo <than at redhat.com> 4.3.4-2
+- fix aliasing violations that caused qmake crash
+
+* Fri Feb 22 2008 Rex Dieter <rdieter at fedoraproject.org> 4.3.4-1
+- qt-4.3.4
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 4.3.3-9
+- Autorebuild for GCC 4.3
+
+* Tue Feb 19 2008 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-8
+- qt-copy patches 20080219
+- drop -optimized-qmake, for now, to avoid qmake segfaults (gcc43 issue?)
+
+* Fri Feb 15 2008 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-7
+- %%qt_datadir: %%_datadir/qt4 -> %%_libdir/qt4
+
+* Wed Jan 30 2008 Rex Dieter <rdieter at fedoraproject.org> 4.3.3-6
+- qt-copy 20080130 patch set (helps address previous 0180-window-role BIC)
+- Trolltech.conf: (default) fontsize=10
+- License: GPLv2 with exceptions or QPL
+
+* Thu Jan 24 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.3-5
+- License: GPLv2 or QPL
+- qt-copy patches
+
+* Thu Jan 17 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.3-4
+- Qt.pc: fix typo for demosdir (use %%_qt4_demosdir)
+
+* Mon Jan 07 2008 Than Ngo <than at redhat.com> 4.3.3-3
+- apply patch from Dirk Müller to fix strict aliasing violations in tool classes
+
+* Fri Dec 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.3-2
+- -doc: Requires: %%name-assistant, omit assistant bin,
+ -x11: Provides: %%name-assistant (#147948)
+
* Wed Dec 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.3.3-1
- qt-4.3.3
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qt4/F-7/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 9 Dec 2007 04:09:43 -0000 1.16
+++ sources 16 Apr 2008 15:54:17 -0000 1.17
@@ -1,3 +1,4 @@
d9f511e4b51983b4e10eb58b320416d5 hi128-app-qt4-logo.png
6dcc0672ff9e60a6b83f95c5f42bec5b hi48-app-qt4-logo.png
-19678fe35170559cd6a6fa531c57799c qt-x11-opensource-src-4.3.3.tar.gz
+e07759e773b8ec38ce222b6fd5e9f0c5 qt-copy-patches-20080305svn.tar.bz2
+9499101ec54eb7b0de195b3c5e3ffa93 qt-x11-opensource-src-4.3.4.tar.gz
--- qt-x11-opensource-src-4.3.2-rh#334281.patch DELETED ---
- Previous message (by thread): comps/po sl.po,1.7,1.8
- Next message (by thread): rpms/qt4/F-8 qt-43-aliasing.diff, NONE, 1.1 qt-copy-patches-svn_checkout.sh, NONE, 1.1 qt-x11-opensource-src-4.3.4-aliasing.patch, NONE, 1.1 qt-x11-opensource-src-4.3.4-as_IN-437440.patch, NONE, 1.1 qt-x11-opensource-src-4.3.4-openssl.patch, NONE, 1.1 .cvsignore, 1.22, 1.23 Trolltech.conf, 1.1, 1.2 qt4.spec, 1.74, 1.75 sources, 1.18, 1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list