summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2010-01-31 22:36:46 -0800
committerEric Sandall2010-01-31 22:39:13 -0800
commit4fc29733cc88baac23d78e53fc549dadb00f6490 (patch)
treef3b5a994607ebaf254f9d9046b402eb8f1313608
parent1d1a673004616943c59c37aaa3a32301bed8069c (diff)
Revert "Revert "qt4: => 4.6.0""
This reverts commit 541ab0e9f66fde875eaf7fd0d35fa84f1e09ca2c. 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/HISTORY4
2 files changed, 6 insertions, 2 deletions
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index 2c770a2c52..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.0-rc1
- SOURCE_HASH=sha512:69d41b8ae38a281f7a9c755e9aa0a30b75dab513332dbddb2a2a55bcd10abd2ec4373fcb6824e29f58b6c6296cfe0bcd6e2bf1a6970b0ce0bc20c882f69f4cbf
+ 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 d44724d856..575922abc8 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -11,6 +11,10 @@
Instead of:
qt4 conflicts with qt4. Dispel qt4? [y]
+2009-12-01 Treeve Jelbert <treeve@sourcemage.org>
+ * DETAILS: version 4.6.0
+ * CONFLICTS: check old version before forcing conflict
+
2009-11-25 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: zlib is always required now