summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2010-01-27 11:31:13 -0800
committerEric Sandall2010-01-30 09:42:07 -0800
commit5bbebbfc9da0f6a3c70da6861b131af5763a8233 (patch)
tree74af0223a330e77ef955d29c583e9cdd3bf7d840
parentf3611d67aaae688085b45b30e3d6119001f0c557 (diff)
Revert "qt4 4.6.1"
This reverts commit c5a9def0593caeb97924225720bd30fa580f73d2. qt4 4.6.x causes issues with KDE 4.3 e.g. http://bugs.sourcemage.org/show_bug.cgi?id=15031 Upstream recommends using qt 4.5 for KDE 4.3. Conflicts: x11-toolkits/qt4/HISTORY
-rwxr-xr-xx11-toolkits/qt4/DETAILS4
-rw-r--r--x11-toolkits/qt4/HISTORY3
2 files changed, 2 insertions, 5 deletions
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index 7dbc0a5ccc..09a1fb7bff 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -4,8 +4,8 @@ if [[ $QT_TMPFS == n ]]; then
TMPFS=off
fi
SPELLX=qt-everywhere-opensource-src
- VERSION=4.6.1
- SOURCE_HASH=sha512:a3c16a138a578e4016279627e933bdbb87923770e5c877c83a3cbdb15a5575fe7fefcb63c39faaed30cdb7d36aeec0d1bc3b5d8d3902a6ce5763c5f9e91919bc
+ VERSION=4.6.0
+ SOURCE_HASH=sha512:fb67e20426565723757cd12fbe130352fb04817b508bf35df79ba5545d3b7bfd7af4016206d8070ce4a85209849886968db2519621f3b96e2f5c6a28934b2386
SOURCE=$SPELLX-$VERSION.tar.gz
URI=qt/source/$SOURCE
SECURITY_PATCH=3
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 04aa80f69c..575922abc8 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -4,9 +4,6 @@
2010-01-21 Eric Sandall <sandalle@sourcemage.org>
* CONFLICTS: Looks like qt4 needs to conflict even for minor revisions
-2010-01-22 Ladislav Hagara <hgr@vabo.cz>
- * DETAILS: 4.6.1
-
2009-12-01 Eric Sandall <sandalle@sourcemage.org>
* CONFLICTS: SELF -> SPELL, there is no SELF
Remove debug message, corrupted conflict message to: