diff options
author | Ladislav Hagara | 2012-05-23 10:49:25 +0200 |
---|---|---|
committer | Vlad Glagolev | 2012-06-14 17:07:14 +0400 |
commit | 220c0d8cc251833437c84a3dfa469d7e639c59c1 (patch) | |
tree | 5df05fadb9ba0016c7713f901f85c8615e017466 | |
parent | 1b137452b2fe16084dc5417c904023fa59a61d18 (diff) |
qt4 4.8.2
(cherry picked from commit 0ef3da6812caf38bcfda2df637e310b9b746c73d)
-rwxr-xr-x | x11-toolkits/qt4/DETAILS | 7 | ||||
-rw-r--r-- | x11-toolkits/qt4/HISTORY | 4 | ||||
-rwxr-xr-x | x11-toolkits/qt4/PRE_BUILD | 1 | ||||
-rw-r--r-- | x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.1-gcc_fix-1.patch | 33 |
4 files changed, 7 insertions, 38 deletions
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS index 1d03feddd5..cca3b81c04 100755 --- a/x11-toolkits/qt4/DETAILS +++ b/x11-toolkits/qt4/DETAILS @@ -2,13 +2,12 @@ persistent_remove QT_VER SPELL=qt4 TMPFS=off SPELLX=qt-everywhere-opensource-src - VERSION=4.8.1 - SOURCE_HASH=sha512:a48825a3d42c93c6d9d769d9f79b297d92b5deb9003c89c2d1f1b364b496fc6e7d307e0eb6b798ae49d7bf1928caeda6741025242499296550293518004c3d90 + VERSION=4.8.2 + SOURCE_HASH=sha512:42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62 SOURCE=$SPELLX-$VERSION.tar.gz - URI=qt/source/$SOURCE SECURITY_PATCH=4 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION - SOURCE_URL[0]=http://download.qt.nokia.com/$URI + SOURCE_URL[0]=http://releases.qt-project.org/qt4/source/$SOURCE WEB_SITE=http://www.qtsoftware.com/products ENTERED=20020410 LICENSE[0]=LGPL diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY index 0ef0938868..6215f2842e 100644 --- a/x11-toolkits/qt4/HISTORY +++ b/x11-toolkits/qt4/HISTORY @@ -1,3 +1,7 @@ +2012-05-23 Ladislav Hagara <hgr@vabo.cz> + * DETAILS: 4.8.2, URI removed, SOURCE_URL[0] updated + * qt-everywhere-opensource-src-4.8.1-gcc_fix-1.patch: removed + 2012-04-09 Ladislav Hagara <hgr@vabo.cz> * PRE_BUILD, qt-4.8-glib-2.32.patch: patch removed * PRE_BUILD: sed added diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD index 93950b578d..9ed4608120 100755 --- a/x11-toolkits/qt4/PRE_BUILD +++ b/x11-toolkits/qt4/PRE_BUILD @@ -2,7 +2,6 @@ default_pre_build && cd $SOURCE_DIRECTORY && sed -i '/-Werror/d' src/3rdparty/webkit/Source/WebKit.pri && -patch -p1 < ${SCRIPT_DIRECTORY}/qt-everywhere-opensource-src-4.8.1-gcc_fix-1.patch && patch -p1 < ${SCRIPT_DIRECTORY}/qt-everywhere-opensource-src-4.8.1-glib_fix-1.patch && # fix bad .pro file for 4.6.0-beta1 diff --git a/x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.1-gcc_fix-1.patch b/x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.1-gcc_fix-1.patch deleted file mode 100644 index 6f4985c2ea..0000000000 --- a/x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.1-gcc_fix-1.patch +++ /dev/null @@ -1,33 +0,0 @@ -Submitted By: Ragnar Thomsen <rthomsen_at_linuxfromscratch_dot_org> -Date: 2012-04-04 -Initial Package Version: 4.8.1 -Origin: OpenSUSE -Description: Fixes building with GCC 4.7 - -diff -rupN a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h ---- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h 2012-03-14 15:01:30.000000000 +0100 -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h 2012-04-04 21:40:41.287652897 +0200 -@@ -57,9 +57,7 @@ namespace JSC { - - class JSGlobalObject : public JSVariableObject { - protected: -- using JSVariableObject::JSVariableObjectData; -- -- struct JSGlobalObjectData : public JSVariableObjectData { -+ struct JSGlobalObjectData : public JSVariableObject::JSVariableObjectData { - // We use an explicit destructor function pointer instead of a - // virtual destructor because we want to avoid adding a vtable - // pointer to this struct. Adding a vtable pointer would force the -diff -rupN a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h ---- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h 2012-03-14 15:01:30.000000000 +0100 -+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h 2012-04-04 21:40:41.287652897 +0200 -@@ -32,8 +32,7 @@ namespace JSC{ - - class JSStaticScopeObject : public JSVariableObject { - protected: -- using JSVariableObject::JSVariableObjectData; -- struct JSStaticScopeObjectData : public JSVariableObjectData { -+ struct JSStaticScopeObjectData : public JSVariableObject::JSVariableObjectData { - JSStaticScopeObjectData() - : JSVariableObjectData(&symbolTable, ®isterStore + 1) - { |