diff options
| author | Treeve Jelbert | 2009-10-01 17:32:54 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2009-10-01 17:32:54 +0200 |
| commit | 9d78c3ffd73a8010d1ba6c2dac4c016eaaa284e0 (patch) | |
| tree | 64fe5f93eeeca935d1a75493c2cb214fa8fdc159 | |
| parent | 14da4228e68bc8cbb11aae65b1e9a2aeb93b6aab (diff) | |
qt4: => 4.5.3
| -rwxr-xr-x | x11-toolkits/qt4/DETAILS | 29 | ||||
| -rw-r--r-- | x11-toolkits/qt4/HISTORY | 7 | ||||
| -rwxr-xr-x | x11-toolkits/qt4/PRE_BUILD | 3 | ||||
| -rw-r--r-- | x11-toolkits/qt4/nokia.diff | 11 |
4 files changed, 12 insertions, 38 deletions
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS index 4210cde72c..fe3a6a7490 100755 --- a/x11-toolkits/qt4/DETAILS +++ b/x11-toolkits/qt4/DETAILS @@ -4,33 +4,14 @@ if [[ $QT_TMPFS == n ]]; then TMPFS=off fi SPELLX=qt-x11-opensource-src -#case $QT_VER in -# snapshot) -# VERSION=4.5.0-snapshot-$(date +%Y%m%d) -# SOURCE_IGNORE=volatile -# SOURCE=$SPELLX-$VERSION.tar.gz -# URI=qt/snapshots/$SOURCE -#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION -# ;; -# prerelease) -# VERSION= -# SOURCE_HASH=sha512: -# SOURCE=${SPELLX}-$VERSION.tar.gz -# URI=qt/source/$SOURCE -# SECURITY_PATCH=2 -#SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELLX}-$VERSION -# ;; -# *) #stable - VERSION=4.5.2 - PATCHLEVEL=2 - SOURCE_HASH=sha512:385f4a30959a67864f05e6192fbd05755a12319dfbf30507d8757b9cf515cb70eba063e0eb356c583bbd90538434c41ab08336daf10b3ce43016b85f1e462735 - SOURCE=$SPELLX-$VERSION.tar.bz2 + VERSION=4.5.3 + SOURCE_HASH=sha512:aa1051f3a5cab0ffe225eb03cd50b8bf34bcc28f89dd4bda6b80c9769395dbaec31b8d3b365e1a8aa0407be5e4cdd51c788706daebdfab8420e8f2853d8226a2 + SOURCE=$SPELLX-$VERSION.tar.gz URI=qt/source/$SOURCE SECURITY_PATCH=3 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION -#esac - SOURCE_URL[0]=http://download.qtsoftware.com/$URI - WEB_SITE=http://www.qtsoftware.com//products + SOURCE_URL[0]=http://download.qt.nokia.com/$URI + WEB_SITE=http://www.qtsoftware.com/products ENTERED=20020410 LICENSE[0]=LGPL DOCS="FAQ README README-QT.TXT" diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY index 1490a8899d..6964cdee18 100644 --- a/x11-toolkits/qt4/HISTORY +++ b/x11-toolkits/qt4/HISTORY @@ -1,3 +1,10 @@ +2009-10-01 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: version 4.5.3 + new url + cleanup + * PRE_BUILD: don't apply nokia patch + * nokia.diff: deleted + 2009-09-22 Peng Chang (Charles) <chp@sourcemage.org> * DETAILS: optionally turn TMPFS=off, 1GB RAM is insufficient * PREPARE: if RAM < 1GB auto disable tmpfs, else query whether to diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD index 58941c6dc5..27d53a021b 100755 --- a/x11-toolkits/qt4/PRE_BUILD +++ b/x11-toolkits/qt4/PRE_BUILD @@ -1,9 +1,6 @@ default_pre_build && cd $SOURCE_DIRECTORY && -# upstream patch -patch -p0 < $SPELL_DIRECTORY/nokia.diff && - # add better optimisation flags sed -i "s|-O2||" mkspecs/common/g++.conf \ mkspecs/linux-cxx/qmake.conf && diff --git a/x11-toolkits/qt4/nokia.diff b/x11-toolkits/qt4/nokia.diff deleted file mode 100644 index 5d365b3bb0..0000000000 --- a/x11-toolkits/qt4/nokia.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- src/network/ssl/qsslcertificate.cpp 2009-09-05 11:24:45.000000000 +0200 -+++ src/network/ssl/qsslcertificate.cpp.cp 2009-09-05 11:54:28.000000000 +0200 -@@ -377,7 +377,7 @@ - } - - const char *altNameStr = reinterpret_cast<const char *>(q_ASN1_STRING_data(genName->d.ia5)); -- const QString altName = QLatin1String(QByteArray(altNameStr, len)); -+ const QString altName = QString::fromLatin1(altNameStr, len); - if (genName->type == GEN_DNS) - result.insert(QSsl::DnsEntry, altName); - else if (genName->type == GEN_EMAIL) |