[Frugalware-git] frugalware-current: qt4-4.8.1-2-x86_64

[Marius Cirsta]

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

commit cc8d26029ddeab21814b45232429cf8ac147710a
Author: Marius Cirsta <mcir...@frugalware.org>
Date:   Thu Apr 12 21:02:00 2012 +0000

qt4-4.8.1-2-x86_64

* patches for Calligra and gcc 4.7

diff --git a/source/xlib-extra/qt4/FrugalBuild 
b/source/xlib-extra/qt4/FrugalBuild
index 171c5ff..633f470 100644
--- a/source/xlib-extra/qt4/FrugalBuild
+++ b/source/xlib-extra/qt4/FrugalBuild
@@ -7,7 +7,7 @@ USE_DETECTDEPENDS=${USE_DETECTDEPENDS:-"n"}
pkgname=qt4
_F_archive_name=qt-everywhere-opensource-src
pkgver=4.8.1
-pkgrel=1
+pkgrel=2
pkgdesc="The QT4 GUI toolkit."
url="http://qt.nokia.com/products/";
depends=()
@@ -22,10 +22,15 @@ _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 \
frugalware.patch \
-       fix-config.tests.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)
sha1sums=('a074d0f605f009e23c63e0a4cb9b71c978146ffc' \
'39b67a38c74acc9bba9940cbb39af73fef030edb' \
-          'e2522839807839f1af77de7ccd4c9e8c7df4acd0')
+          'e2522839807839f1af77de7ccd4c9e8c7df4acd0' \
+          '81998944520def371e07d8bfd88bc9a5f693836b' \
+          'ac832f374a6b59c12bf4438c47845d7d6d4d1d59')
+
export LD_LIBRARY_PATH=$Fsrcdir/$_F_archive_name-$pkgver/lib:${LD_LIBRARY_PATH}
export YACC='yacc -d'

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
new file mode 100644
index 0000000..62c436e
--- /dev/null
+++ b/source/xlib-extra/qt4/qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch
@@ -0,0 +1,27 @@
+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
new file mode 100644
index 0000000..431141f
--- /dev/null
+++ b/source/xlib-extra/qt4/qt-gui-4.8.1-fix-calligra-crash.patch
@@ -0,0 +1,28 @@
+commit cac12f4592477d99ef6fffaad40345bf85ef53b5
+Author: Jiang Jiang <jiang.ji...@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
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git