summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandall2010-01-27 11:33:24 -0800
committerEric Sandall2010-01-30 09:42:07 -0800
commit6b2ad3c77ca9860f60eca3973f93549b41604401 (patch)
tree310cf811276c0f50b252c27f32bf17ba2bb37f6a
parent541ab0e9f66fde875eaf7fd0d35fa84f1e09ca2c (diff)
Revert "qt4: => 4.6.0-rc1"
This reverts commit 023e80df99efc2b63e3886988aa5383d7928cb8c. 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 2c770a2c52..b897f6aeed 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-beta1
+ SOURCE_HASH=sha512:6b54375ea8672056030447dec3b4fabcae507d401a61d75be1d2609c42e6e12d6637787e4cec3f55fb15255f903e1663a5e0e170f179a2918a311e8fc2615316
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..5992c15378 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -14,9 +14,6 @@
2009-11-25 Treeve Jelbert <treeve@sourcemage.org>
* DEPENDS: zlib is always required now
-2009-11-17 Treeve Jelbert <treeve@sourcemage.org>
- * DETAILS: version 4.6.0-rc1
-
2009-10-16 Treeve Jelbert <treeve@sourcemage.org>
* SUB_DEPENDS, PRE_SUB_DEPENDS: add ACCESS