summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLadislav Hagara2010-01-22 02:35:27 +0100
committerEric Sandall2010-02-06 17:58:37 -0800
commit84de0e67120d4d32ae5a1c0b3206fbe6707cec1f (patch)
treeb81fe005589b2af4dbea2104d6f57f733dff4b8c
parent772223f233abf0fc54cf6575fafb15ac437cbd7a (diff)
qt4 4.6.1
I had problem to cast it, eventually i dispelled it and then cast it without problems. Seems it need conflicts itself not only if updating 4.5 -> 4.6. If qt4 doesn't cast for you, please try to dispel it and try to cast it again. (cherry picked from commit c5a9def0593caeb97924225720bd30fa580f73d2)
-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 efdade3c57..ac137a530a 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,6 @@
+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: