Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting.git;a=commitdiff;h=951ff436234ff89bbd0858ebada0c4536a400fe3
commit 951ff436234ff89bbd0858ebada0c4536a400fe3 Author: Marius Cirsta <[email protected]> Date: Mon Apr 16 23:05:04 2012 +0000 Revert "qt4-4.8.1-3-x86_64" This reverts commit 2bce711f856afe00776e416787b62bbf2eedf6e1. diff --git a/source/xlib-extra/qt4/FrugalBuild b/source/xlib-extra/qt4/FrugalBuild index 7cee03a..171c5ff 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=3 +pkgrel=1 pkgdesc="The QT4 GUI toolkit." url="http://qt.nokia.com/products/"; depends=() @@ -22,19 +22,10 @@ _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 \ - 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) + fix-config.tests.patch) sha1sums=('a074d0f605f009e23c63e0a4cb9b71c978146ffc' \ '39b67a38c74acc9bba9940cbb39af73fef030edb' \ - 'e2522839807839f1af77de7ccd4c9e8c7df4acd0' \ - '81998944520def371e07d8bfd88bc9a5f693836b' \ - 'ac832f374a6b59c12bf4438c47845d7d6d4d1d59' \ - 'd39a3bfad54e5f73d8fc343366141ed41c42716a' \ - 'fcbde351e76daab62c6efdde81709d79809fd417') - + 'e2522839807839f1af77de7ccd4c9e8c7df4acd0') export LD_LIBRARY_PATH=$Fsrcdir/$_F_archive_name-$pkgver/lib:${LD_LIBRARY_PATH} export YACC='yacc -d' diff --git a/source/xlib-extra/qt4/no-werror.patch b/source/xlib-extra/qt4/no-werror.patch deleted file mode 100644 index ddb6233..0000000 --- a/source/xlib-extra/qt4/no-werror.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri 2012-03-14 16:01:29.000000000 +0200 -+++ qt-everywhere-opensource-src-4.8.1.new/src/3rdparty/webkit/Source/WebKit.pri 2012-04-14 01:32:42.906180630 +0300 -@@ -102,7 +102,7 @@ - - # Treat warnings as errors on x86/Linux/GCC - linux-g++* { -- !CONFIG(standalone_package):isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror -+ #!CONFIG(standalone_package):isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror - - greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) { - if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) { 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, ®isterStore + 1) - { diff --git a/source/xlib-extra/qt4/qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch b/source/xlib-extra/qt4/qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch deleted file mode 100644 index e24cb5c..0000000 --- a/source/xlib-extra/qt4/qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h ---- qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h 2011-10-04 05:44:31.000000000 +0200 -+++ qt-everywhere-opensource-src-4.8.0-qtwebkit-glib231/src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h 2011-10-28 02:12:16.000000000 +0200 -@@ -52,7 +52,7 @@ - typedef struct _GHashTable GHashTable; - typedef struct _GInputStream GInputStream; - typedef struct _GList GList; --typedef struct _GMutex GMutex; -+typedef union _GMutex GMutex; - typedef struct _GPatternSpec GPatternSpec; - typedef struct _GPollableOutputStream GPollableOutputStream; - typedef struct _GSocketClient GSocketClient; 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 <[email protected]> -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 [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
