[Frugalware-git] frugalware-current: qt4-4.8.2-1-x86_64

[Marius Cirsta]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bb25b0df38e35bb916e75a9af628e5a975a11cea

commit bb25b0df38e35bb916e75a9af628e5a975a11cea
Author: Marius Cirsta <mcirsta at frugalware.org>
Date:   Thu May 24 20:01:53 2012 +0000

qt4-4.8.2-1-x86_64

* version bump
* removed some patches

diff --git a/source/xlib-extra/qt4/FrugalBuild b/source/xlib-extra/qt4/FrugalBuild
index eaf1f28..4d42b80 100644
--- a/source/xlib-extra/qt4/FrugalBuild
+++ b/source/xlib-extra/qt4/FrugalBuild
@@ -6,8 +6,8 @@ USE_DETECTDEPENDS=${USE_DETECTDEPENDS:-"n"}

pkgname=qt4
_F_archive_name=qt-everywhere-opensource-src
-pkgver=4.8.1
-pkgrel=5
+pkgver=4.8.2
+pkgrel=1
pkgdesc="The QT4 GUI toolkit."
url="http://qt.nokia.com/products/"
depends=()
@@ -19,19 +19,15 @@ groups=('xlib-extra')
archs=('i686' 'x86_64')
options=('scriptlet' 'nodocs')
_F_archive_grepv="-tp"
-up2date="Flasttar ftp://ftp.qt.nokia.com/qt/source/"
-source=(ftp://ftp.qt.nokia.com/qt/source/$_F_archive_name-$pkgver.tar.gz \
+up2date="Flasttar http://origin.releases.qt-project.org/qt4/source/"
+source=(http://origin.releases.qt-project.org/qt4/source/$_F_archive_name-$pkgver.tar.gz \
frugalware.patch \
fix-config.tests.patch \
-	qt-gui-4.8.1-fix-calligra-crash.patch \
-	qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch \
no-werror.patch \
qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch)
-sha1sums=('a074d0f605f009e23c63e0a4cb9b71c978146ffc' \
+sha1sums=('e1e2edef1d63ed677d6534d32800c2e1f7ad0e73' \
'39b67a38c74acc9bba9940cbb39af73fef030edb' \
'e2522839807839f1af77de7ccd4c9e8c7df4acd0' \
-          '81998944520def371e07d8bfd88bc9a5f693836b' \
-          'ac832f374a6b59c12bf4438c47845d7d6d4d1d59' \
'd39a3bfad54e5f73d8fc343366141ed41c42716a' \
'fcbde351e76daab62c6efdde81709d79809fd417')

diff --git a/source/xlib-extra/qt4/qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch b/source/xlib-extra/qt4/qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch
deleted file mode 100644
index 62c436e..0000000
--- a/source/xlib-extra/qt4/qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h
---- qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h.me	2012-01-24 11:24:14.729942043 +0100
-+++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h	2012-01-24 14:28:39.848109534 +0100
-@@ -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 -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h
---- qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h.me	2012-01-24 11:40:07.167856677 +0100
-+++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h	2012-01-24 14:28:34.640306629 +0100
-@@ -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, &registerStore + 1)
-             {
diff --git a/source/xlib-extra/qt4/qt-gui-4.8.1-fix-calligra-crash.patch b/source/xlib-extra/qt4/qt-gui-4.8.1-fix-calligra-crash.patch
deleted file mode 100644
index 431141f..0000000
--- a/source/xlib-extra/qt4/qt-gui-4.8.1-fix-calligra-crash.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit cac12f4592477d99ef6fffaad40345bf85ef53b5
-Author: Jiang Jiang <jiang.jiang at nokia.com>
-Date:   Mon Apr 2 12:32:05 2012 +0200
-
-    Fix a crash in cursorToX() when new block is added
-
-    When an empty new block is being added, the layoutData->memory data
-    will be 0, thus QTextEngine::attributes() will return 0. We should
-    only access the attributes pointer when some text actually exist.
-
-    Task-number: QTBUG-24718
-    Change-Id: I9ce9f7b57bccf24099a02832ce30fb6cebfaad33
-
-diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
-index ee658d9..16f7150 100644
---- a/src/gui/text/qtextlayout.cpp
-+++ b/src/gui/text/qtextlayout.cpp
-@@ -2508,6 +2508,10 @@ qreal QTextLine::cursorToX(int *cursorPos, Edge edge) const
-     int pos = *cursorPos;
-     int itm;
-     const HB_CharAttributes *attributes = eng->attributes();
-+    if (!attributes) {
-+        *cursorPos = 0;
-+        return x.toReal();
-+    }
-     while (pos < line.from + line.length && !attributes[pos].charStop)
-         pos++;
-     if (pos == line.from + (int)line.length) {
\ No newline at end of file