summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2010-01-31 22:37:23 -0800
committerEric Sandall2010-01-31 22:39:13 -0800
commita0c980afe16a01d804981034f46b5f0fd1a7ba23 (patch)
tree8448eb1ffa51bbb71afe13316c0b050370fbd865
parent4fc29733cc88baac23d78e53fc549dadb00f6490 (diff)
Revert "Revert "qt4 4.6.1""
This reverts commit 5bbebbfc9da0f6a3c70da6861b131af5763a8233. Seems this will require more work to properly downgrade to qt4 4.5.x, leaves many applications broken just reverting with a quick fix of `cast -c $(gaze depends --fast qt4 1)` (which we could do with triggers). I hear KDE 4.4 will come out this week, which will also fix Bug #15031 without all this mess. Sorry for the noise.
-rwxr-xr-xx11-toolkits/qt4/DETAILS4
-rw-r--r--x11-toolkits/qt4/HISTORY3
2 files changed, 5 insertions, 2 deletions
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index 09a1fb7bff..7dbc0a5ccc 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.0
- SOURCE_HASH=sha512:fb67e20426565723757cd12fbe130352fb04817b508bf35df79ba5545d3b7bfd7af4016206d8070ce4a85209849886968db2519621f3b96e2f5c6a28934b2386
+ VERSION=4.6.1
+ SOURCE_HASH=sha512:a3c16a138a578e4016279627e933bdbb87923770e5c877c83a3cbdb15a5575fe7fefcb63c39faaed30cdb7d36aeec0d1bc3b5d8d3902a6ce5763c5f9e91919bc
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 575922abc8..04aa80f69c 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -4,6 +4,9 @@
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: