[packages/qt4] - up to 4.8.4

[arekm]

commit 4b7e9ab42612f166964287f5628cf302b13f6ab2
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Dec 4 12:31:24 2012 +0100

    - up to 4.8.4

 ...erywhere-opensource-src-4.8.3-QTBUG-27322.patch | 14 ----------
 qt4-git.patch                                      | 31 ----------------------
 qt4-locale.patch                                   |  2 +-
 qt4.spec                                           | 12 ++++-----
 4 files changed, 6 insertions(+), 53 deletions(-)
---
diff --git a/qt4.spec b/qt4.spec
index 3ca24f3..02af2c0 100644
--- a/qt4.spec
+++ b/qt4.spec
@@ -52,12 +52,12 @@ Summary(es.UTF-8):	Biblioteca para ejecutar aplicaciones GUI Qt
 Summary(pl.UTF-8):	Biblioteka Qt do tworzenia GUI
 Summary(pt_BR.UTF-8):	Estrutura para rodar aplicações GUI Qt
 Name:		qt4
-Version:	4.8.3
-Release:	9
+Version:	4.8.4
+Release:	1
 License:	LGPL v2.1 or GPL v3.0
 Group:		X11/Libraries
 Source0:	http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-%{version}.tar.gz
-# Source0-md5:	a663b6c875f8d7caa8ac9c30e4a4ec3b
+# Source0-md5:	89c5ecba180cae74c66260ac732dc5cb
 Source2:	%{name}-qtconfig.desktop
 Source3:	%{name}-designer.desktop
 Source4:	%{name}-assistant.desktop
@@ -81,8 +81,7 @@ Patch10:	webkit-no_Werror.patch
 Patch11:	moc-boost148.patch
 Patch12:	fix-crash-in-assistant.patch
 Patch13:	improve-cups-support.patch
-Patch14:	qt4-git.patch
-Patch15:	qt-everywhere-opensource-src-4.8.3-QTBUG-27322.patch
+
 Patch16:	qt-everywhere-opensource-src-4.8.3-QTBUG-4862.patch
 URL:		http://qt.nokia.com/
 %{?with_ibase:BuildRequires:	Firebird-devel}
@@ -1458,8 +1457,7 @@ Programas exemplo para o Qt versão.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%patch14 -p1
-%patch15 -p1
+
 %patch16 -p1
 
 %{__sed} -i -e 's,usr/X11R6/,usr/g,' mkspecs/linux-g++-64/qmake.conf \
diff --git a/qt-everywhere-opensource-src-4.8.3-QTBUG-27322.patch b/qt-everywhere-opensource-src-4.8.3-QTBUG-27322.patch
deleted file mode 100644
index 764e77e..0000000
--- a/qt-everywhere-opensource-src-4.8.3-QTBUG-27322.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up qt-everywhere-opensource-src-4.8.3/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp.QTBUG-27322 qt-everywhere-opensource-src-4.8.3/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
---- qt-everywhere-opensource-src-4.8.3/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp.QTBUG-27322	2012-10-24 09:52:55.183430410 -0500
-+++ qt-everywhere-opensource-src-4.8.3/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp	2012-10-24 09:53:49.996758727 -0500
-@@ -305,8 +305,8 @@ public:
-         randomLocation += (1 << 24);
-         randomLocation <<= 21;
- #endif
--        m_base = mmap(reinterpret_cast<void*>(randomLocation), m_totalHeapSize, INITIAL_PROTECTION_FLAGS, MAP_PRIVATE | MAP_ANON, VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0);
--        if (!m_base)
-+        m_base = mmap(reinterpret_cast<void*>(randomLocation), m_totalHeapSize, INITIAL_PROTECTION_FLAGS, MAP_PRIVATE | MAP_ANON | MAP_NORESERVE, VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0);
-+        if (m_base == MAP_FAILED)
-             CRASH();
- 
-         // For simplicity, we keep all memory in m_freeList in a 'released' state.
diff --git a/qt4-git.patch b/qt4-git.patch
deleted file mode 100644
index b32d686..0000000
--- a/qt4-git.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 3a13f3f16e45288f7717dcfe3e968e5cccc05d90
-Author: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt at nokia.com>
-Date:   Wed Sep 12 12:13:35 2012 +0200
-
-    Fix regression in QTextDocument::toHtml() with font pixel size
-    
-    Introduced by 2e0003eda4783f69a40fb4b31e7084c761d9640d. We were
-    missing a attributesEmitted=true which caused the output from
-    toHtml() to sometimes be invalid when using pixel sizes to
-    specify the font size.
-    
-    This is a back-port of e640ebacb97f6eea9614925b1da3b97a0ff51409
-    from Qt 5.
-    
-    Task-number: QTBUG-25778
-    Change-Id: Ied61fcaef425a590d71c0b52292ac676cb88ba52
-    Reviewed-by: Jiang Jiang <gzjjgod at gmail.com>
-
-diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
-index a1cae54..5d8ff97 100644
---- a/src/gui/text/qtextdocument.cpp
-+++ b/src/gui/text/qtextdocument.cpp
-@@ -2187,6 +2187,7 @@ bool QTextHtmlExporter::emitCharFormatStyle(const QTextCharFormat &format)
-         html += QLatin1String(" font-size:");
-         html += QString::number(format.intProperty(QTextFormat::FontPixelSize));
-         html += QLatin1String("px;");
-+        attributesEmitted = true;
-     }
- 
-     if (format.hasProperty(QTextFormat::FontWeight)
-
diff --git a/qt4-locale.patch b/qt4-locale.patch
index 09d75d5..55ddb5d 100644
--- a/qt4-locale.patch
+++ b/qt4-locale.patch
@@ -33,10 +33,10 @@ diff -Nur qt-x11-opensource-src-4.2.1.orig/tools/linguist/linguist/main.cpp qt-x
 --- qt-everywhere-opensource-src-4.7.0/src/corelib/kernel/qtranslator.cpp.orig	2010-09-10 11:05:25.000000000 +0200
 +++ qt-everywhere-opensource-src-4.7.0/src/corelib/kernel/qtranslator.cpp	2010-09-21 21:36:42.645202096 +0200
 @@ -55,6 +55,7 @@
- #include "qhash.h"
  #include "qtranslator_p.h"
  #include "qlocale.h"
 +#include <qlibraryinfo.h>
+ #include "qresource.h"
  
  #if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
  #define QT_USE_MMAP
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qt4.git/commitdiff/4b7e9ab42612f166964287f5628cf302b13f6ab2