Merge branch 'master' into f17
This commit is contained in:
commit
fa6c900f93
|
@ -10,3 +10,4 @@
|
||||||
/qt-everywhere-opensource-src-4.7.4.tar.gz
|
/qt-everywhere-opensource-src-4.7.4.tar.gz
|
||||||
/qt-everywhere-opensource-src-4.8.0.tar.gz
|
/qt-everywhere-opensource-src-4.8.0.tar.gz
|
||||||
/qt-everywhere-opensource-src-4.8.1.tar.gz
|
/qt-everywhere-opensource-src-4.8.1.tar.gz
|
||||||
|
/qt-everywhere-opensource-src-4.8.2.tar.gz
|
||||||
|
|
|
@ -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)
|
|
||||||
{
|
|
|
@ -1,12 +0,0 @@
|
||||||
diff -up qt-everywhere-opensource-src-4.8.0/tools/qvfb/qvfb.pro.qvfb qt-everywhere-opensource-src-4.8.0/tools/qvfb/qvfb.pro
|
|
||||||
--- qt-everywhere-opensource-src-4.8.0/tools/qvfb/qvfb.pro.qvfb 2011-12-27 21:02:19.765512041 -0600
|
|
||||||
+++ qt-everywhere-opensource-src-4.8.0/tools/qvfb/qvfb.pro 2011-12-27 21:02:39.271268187 -0600
|
|
||||||
@@ -38,8 +38,6 @@ SOURCES = qvfb.cpp \
|
|
||||||
|
|
||||||
!embedded {
|
|
||||||
DEFINES += QT_NO_QWS_SIGNALHANDLER
|
|
||||||
- HEADERS += ../../src/gui/embedded/qlock_p.h
|
|
||||||
- SOURCES += ../../src/gui/embedded/qlock.cpp
|
|
||||||
}
|
|
||||||
|
|
||||||
include(../shared/deviceskin/deviceskin.pri)
|
|
|
@ -1,14 +0,0 @@
|
||||||
diff -up qt-everywhere-opensource-src-4.8.1/src/gui/text/qtextlayout.cpp.QTBUG-24718 qt-everywhere-opensource-src-4.8.1/src/gui/text/qtextlayout.cpp
|
|
||||||
--- qt-everywhere-opensource-src-4.8.1/src/gui/text/qtextlayout.cpp.QTBUG-24718 2012-03-14 15:01:14.000000000 +0100
|
|
||||||
+++ qt-everywhere-opensource-src-4.8.1/src/gui/text/qtextlayout.cpp 2012-04-03 10:53:12.973058622 +0200
|
|
||||||
@@ -2508,6 +2508,10 @@ qreal QTextLine::cursorToX(int *cursorPo
|
|
||||||
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) {
|
|
23
qt.spec
23
qt.spec
|
@ -7,7 +7,7 @@
|
||||||
# See http://bugzilla.redhat.com/223663
|
# See http://bugzilla.redhat.com/223663
|
||||||
%define multilib_archs x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparcv9
|
%define multilib_archs x86_64 %{ix86} ppc64 ppc s390x s390 sparc64 sparcv9
|
||||||
|
|
||||||
%if 0%{?fedora} > 16
|
%if 0%{?fedora} > 16 || 0%{?rhel} > 6
|
||||||
# use external qt_settings pkg
|
# use external qt_settings pkg
|
||||||
%define qt_settings 1
|
%define qt_settings 1
|
||||||
%endif
|
%endif
|
||||||
|
@ -15,14 +15,14 @@
|
||||||
Summary: Qt toolkit
|
Summary: Qt toolkit
|
||||||
Name: qt
|
Name: qt
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 4.8.1
|
Version: 4.8.2
|
||||||
Release: 15%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
|
||||||
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
|
License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
Url: http://qt.nokia.com/
|
Url: http://qt.nokia.com/
|
||||||
Source0: http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-%{version}.tar.gz
|
Source0: http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-%{version}.tar.gz
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
Obsoletes: qt4 < %{version}-%{release}
|
Obsoletes: qt4 < %{version}-%{release}
|
||||||
|
@ -108,21 +108,12 @@ Patch76: qt-everywhere-opensource-src-4.8.0-s390-atomic.patch
|
||||||
# don't spam in release/no_debug mode if libicu is not present at runtime
|
# don't spam in release/no_debug mode if libicu is not present at runtime
|
||||||
Patch77: qt-everywhere-opensource-src-4.8.1-icu_no_debug.patch
|
Patch77: qt-everywhere-opensource-src-4.8.1-icu_no_debug.patch
|
||||||
|
|
||||||
# fix qvfb build
|
|
||||||
Patch79: qt-everywhere-opensource-src-4.8.0-qvfb.patch
|
|
||||||
|
|
||||||
# gcc doesn't support flag -fuse-ld=gold
|
# gcc doesn't support flag -fuse-ld=gold
|
||||||
Patch80: qt-everywhere-opensource-src-4.8.0-ld-gold.patch
|
Patch80: qt-everywhere-opensource-src-4.8.0-ld-gold.patch
|
||||||
|
|
||||||
# gcc-4.7 build issue
|
|
||||||
Patch81: qt-everywhere-opensource-src-4.8.0-gcc-4.7.patch
|
|
||||||
|
|
||||||
# upstream patches
|
# upstream patches
|
||||||
# http://codereview.qt-project.org/#change,22006
|
# http://codereview.qt-project.org/#change,22006
|
||||||
Patch100: qt-everywhere-opensource-src-4.8.1-qtgahandle.patch
|
Patch100: qt-everywhere-opensource-src-4.8.1-qtgahandle.patch
|
||||||
# Fix a crash in cursorToX() when new block is added
|
|
||||||
# http://codereview.qt-project.org/22142
|
|
||||||
Patch101: qt-everywhere-opensource-src-4.8.1-QTBUG-24718.patch
|
|
||||||
# fix crash on big endian machines
|
# fix crash on big endian machines
|
||||||
# https://bugreports.qt-project.org/browse/QTBUG-22960
|
# https://bugreports.qt-project.org/browse/QTBUG-22960
|
||||||
Patch102: qt-everywhere-opensource-src-4.8.1-type.patch
|
Patch102: qt-everywhere-opensource-src-4.8.1-type.patch
|
||||||
|
@ -462,13 +453,10 @@ rm -fv mkspecs/linux-g++*/qmake.conf.multilib-optflags
|
||||||
%patch74 -p1 -b .tds_no_strict_aliasing
|
%patch74 -p1 -b .tds_no_strict_aliasing
|
||||||
%patch76 -p1 -b .s390-atomic
|
%patch76 -p1 -b .s390-atomic
|
||||||
%patch77 -p1 -b .icu_no_debug
|
%patch77 -p1 -b .icu_no_debug
|
||||||
%patch79 -p1 -b .qvfb
|
|
||||||
%patch80 -p1 -b .ld.gold
|
%patch80 -p1 -b .ld.gold
|
||||||
%patch81 -p1 -b .gcc-4.7
|
|
||||||
|
|
||||||
# upstream patches
|
# upstream patches
|
||||||
%patch100 -p1 -b .QTgaHandler
|
%patch100 -p1 -b .QTgaHandler
|
||||||
%patch101 -p1 -b .QTBUG-24718
|
|
||||||
%patch102 -p1 -b .bigendian
|
%patch102 -p1 -b .bigendian
|
||||||
|
|
||||||
# security fixes
|
# security fixes
|
||||||
|
@ -1101,6 +1089,9 @@ fi
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue May 22 2012 Than Ngo <than@redhat.com> - 4.8.2-1
|
||||||
|
- 4.8.2
|
||||||
|
|
||||||
* Fri May 18 2012 Than Ngo <than@redhat.com> - 4.8.1-15
|
* Fri May 18 2012 Than Ngo <than@redhat.com> - 4.8.1-15
|
||||||
- add rhel/fedora condition
|
- add rhel/fedora condition
|
||||||
|
|
||||||
|
|
2
sources
2
sources
|
@ -1,3 +1,3 @@
|
||||||
d9f511e4b51983b4e10eb58b320416d5 hi128-app-qt4-logo.png
|
d9f511e4b51983b4e10eb58b320416d5 hi128-app-qt4-logo.png
|
||||||
6dcc0672ff9e60a6b83f95c5f42bec5b hi48-app-qt4-logo.png
|
6dcc0672ff9e60a6b83f95c5f42bec5b hi48-app-qt4-logo.png
|
||||||
7960ba8e18ca31f0c6e4895a312f92ff qt-everywhere-opensource-src-4.8.1.tar.gz
|
3c1146ddf56247e16782f96910a8423b qt-everywhere-opensource-src-4.8.2.tar.gz
|
||||||
|
|
Loading…
Reference in New Issue