qtwebkit-2.2-week28 snapshot
This commit is contained in:
Rex Dieter
parent
6b628e5d2b
commit
a0919c6a00
|
|
@ -1,4 +1,2 @@
|
|||
/qtwebkit-developers-qtwebkit-qtwebkit-2.1.1.tar.xz
|
||||
/webkit-qtwebkit-2.2-20110513.tar.xz
|
||||
/webkit-qtwebkit-2.2-20110603.tar.xz
|
||||
/webkit-qtwebkit-2.2-20110621.tar.xz
|
||||
/qtwebkit-2.2-week28.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,37 +1,33 @@
|
|||
|
||||
%define snap 20110621
|
||||
%define snap week28
|
||||
|
||||
Name: qtwebkit
|
||||
Version: 2.2
|
||||
Release: 8.%{snap}%{?dist}
|
||||
Release: 9.%{snap}%{?dist}
|
||||
Summary: Qt WebKit bindings
|
||||
Group: System Environment/Libraries
|
||||
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
||||
URL: http://trac.webkit.org/wiki/QtWebKit
|
||||
# git archive \
|
||||
# --remote git://gitorious.org/+qtwebkit-developers/webkit/qtwebkit.git \
|
||||
# --prefix=webkit-qtwebkit/ qtwebkit-2.2 autogen.sh ChangeLog configure.ac GNUmakefile.am Makefile Source/ Tools/ | xz -9
|
||||
Source0: webkit-qtwebkit-2.2-%{snap}.tar.xz
|
||||
# --prefix=webkit-qtwebkit/ qtwebkit-2.2-%{snap} \
|
||||
# autogen.sh ChangeLog configure.ac GNUmakefile.am Makefile Source/ Tools/ | xz -9
|
||||
Source0: qtwebkit-2.2-%{snap}.tar.xz
|
||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||
|
||||
# search /usr/lib{,64}/mozilla/plugins-wrapped for browser plugins too
|
||||
Patch1: webkit-qtwebkit-2.2-tp1-pluginpath.patch
|
||||
|
||||
# type casting
|
||||
Patch2: webkit-qtwebkit-type-casting.patch
|
||||
|
||||
# include -debuginfo except on s390(x) during linking of libQtWebKit
|
||||
Patch3: webkit-qtwebkit-2.2-debuginfo.patch
|
||||
|
||||
# don't use -Werror
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=63941
|
||||
# -Wall + -Werror = fail
|
||||
Patch4: webkit-qtwebkit-2.2-no_Werror.patch
|
||||
|
||||
# fix for qt-4.6.x
|
||||
Patch5: webkit-qtwebkit-2.2tp1-qt46.patch
|
||||
|
||||
# shared
|
||||
Patch6: webkit-qtwebkit-2.2-shared.patch
|
||||
|
||||
BuildRequires: bison
|
||||
BuildRequires: chrpath
|
||||
BuildRequires: flex
|
||||
|
|
@ -77,11 +73,10 @@ Provides: qt4-webkit-devel%{?_isa} = 2:%{version}-%{release}
|
|||
%setup -q -n webkit-qtwebkit
|
||||
|
||||
%patch1 -p1 -b .pluginpath
|
||||
%patch2 -p1 -b .type-cast
|
||||
%patch3 -p1 -b .debuginfo
|
||||
%patch4 -p1 -b .no_Werror
|
||||
%patch5 -p1 -b .qt46
|
||||
%patch6 -p1 -b .shared
|
||||
|
||||
|
||||
%build
|
||||
|
||||
|
|
@ -136,6 +131,9 @@ rm -rf %{buildroot}
|
|||
|
||||
|
||||
%changelog
|
||||
* Wed Jul 20 2011 Rex Dieter <rdieter@fedoraproject.org> 2.2-9.week28
|
||||
- qtwebkit-2.2-week28 snapshot
|
||||
|
||||
* Wed Jul 20 2011 Rex Dieter <rdieter@fedoraproject.org> 2.2-8.20110621
|
||||
- rebuild (qt48)
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
b88fdcaf1d71dc7d8eeacab01b20cdde webkit-qtwebkit-2.2-20110621.tar.xz
|
||||
e9a056a8477c70367f401cba6147d576 qtwebkit-2.2-week28.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
diff -up webkit-qtwebkit/Source/WebKit.pri.shared webkit-qtwebkit/Source/WebKit.pri
|
||||
--- webkit-qtwebkit/Source/WebKit.pri.shared 2011-05-24 11:17:56.000000000 +0200
|
||||
+++ webkit-qtwebkit/Source/WebKit.pri 2011-05-24 11:19:09.000000000 +0200
|
||||
@@ -27,7 +27,7 @@ CONFIG(standalone_package): DEFINES *= N
|
||||
CONFIG += depend_includepath
|
||||
DEPENDPATH += $$OUT_PWD
|
||||
|
||||
-DEFINES += BUILDING_QT__=1
|
||||
+DEFINES += QT_SHARED BUILDING_QT__=1
|
||||
building-libs {
|
||||
win32-msvc*|win32-icc: INCLUDEPATH += $$PWD/JavaScriptCore/os-win32
|
||||
} else {
|
||||
|
|
@ -1,131 +0,0 @@
|
|||
diff -up webkit-qtwebkit/Source/WebCore/bindings/js/JSDocumentCustom.cpp.type-cast webkit-qtwebkit/Source/WebCore/bindings/js/JSDocumentCustom.cpp
|
||||
--- webkit-qtwebkit/Source/WebCore/bindings/js/JSDocumentCustom.cpp.type-cast 2011-05-12 16:42:28.000000000 +0200
|
||||
+++ webkit-qtwebkit/Source/WebCore/bindings/js/JSDocumentCustom.cpp 2011-05-19 15:07:35.000000000 +0200
|
||||
@@ -118,7 +118,7 @@ JSValue JSDocument::createTouchList(Exec
|
||||
{
|
||||
RefPtr<TouchList> touchList = TouchList::create();
|
||||
|
||||
- for (int i = 0; i < exec->argumentCount(); i++)
|
||||
+ for (uint i = 0; i < exec->argumentCount(); i++)
|
||||
touchList->append(toTouch(exec->argument(i)));
|
||||
|
||||
return toJS(exec, globalObject(), touchList.release());
|
||||
diff -up webkit-qtwebkit/Source/WebCore/editing/qt/SmartReplaceQt.cpp.type-cast webkit-qtwebkit/Source/WebCore/editing/qt/SmartReplaceQt.cpp
|
||||
--- webkit-qtwebkit/Source/WebCore/editing/qt/SmartReplaceQt.cpp.type-cast 2011-05-12 16:42:28.000000000 +0200
|
||||
+++ webkit-qtwebkit/Source/WebCore/editing/qt/SmartReplaceQt.cpp 2011-05-19 15:07:35.000000000 +0200
|
||||
@@ -55,8 +55,8 @@ bool isCharacterSmartReplaceExempt(UChar
|
||||
const char prev[] = "([\"\'#$/-`{\0";
|
||||
const char next[] = ")].,;:?\'!\"%*-/}\0";
|
||||
const char* str = (isPreviousCharacter) ? prev : next;
|
||||
- for (int i = 0; i < strlen(str); ++i) {
|
||||
- if (str[i] == c)
|
||||
+ for (uint i = 0; i < strlen(str); ++i) {
|
||||
+ if ((UChar32)str[i] == c)
|
||||
return true;
|
||||
}
|
||||
|
||||
diff -up webkit-qtwebkit/Source/WebCore/page/Frame.cpp.type-cast webkit-qtwebkit/Source/WebCore/page/Frame.cpp
|
||||
--- webkit-qtwebkit/Source/WebCore/page/Frame.cpp.type-cast 2011-05-12 16:42:28.000000000 +0200
|
||||
+++ webkit-qtwebkit/Source/WebCore/page/Frame.cpp 2011-05-19 15:07:35.000000000 +0200
|
||||
@@ -969,7 +969,7 @@ void Frame::tiledBackingStorePaintEnd(co
|
||||
return;
|
||||
unsigned size = paintedArea.size();
|
||||
// Request repaint from the system
|
||||
- for (int n = 0; n < size; ++n)
|
||||
+ for (uint n = 0; n < size; ++n)
|
||||
m_page->chrome()->invalidateContentsAndWindow(m_view->contentsToWindow(paintedArea[n]), false);
|
||||
}
|
||||
|
||||
diff -up webkit-qtwebkit/Source/WebCore/platform/graphics/qt/ImageDecoderQt.cpp.type-cast webkit-qtwebkit/Source/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
|
||||
--- webkit-qtwebkit/Source/WebCore/platform/graphics/qt/ImageDecoderQt.cpp.type-cast 2011-05-12 16:42:28.000000000 +0200
|
||||
+++ webkit-qtwebkit/Source/WebCore/platform/graphics/qt/ImageDecoderQt.cpp 2011-05-19 15:07:35.000000000 +0200
|
||||
@@ -184,7 +184,7 @@ void ImageDecoderQt::internalReadImage(s
|
||||
setFailed();
|
||||
|
||||
// Attempt to return some memory
|
||||
- for (int i = 0; i < m_frameBufferCache.size(); ++i) {
|
||||
+ for (uint i = 0; i < m_frameBufferCache.size(); ++i) {
|
||||
if (m_frameBufferCache[i].status() != ImageFrame::FrameComplete)
|
||||
return;
|
||||
}
|
||||
diff -up webkit-qtwebkit/Source/WebCore/platform/graphics/TiledBackingStore.cpp.type-cast webkit-qtwebkit/Source/WebCore/platform/graphics/TiledBackingStore.cpp
|
||||
--- webkit-qtwebkit/Source/WebCore/platform/graphics/TiledBackingStore.cpp.type-cast 2011-05-12 16:42:28.000000000 +0200
|
||||
+++ webkit-qtwebkit/Source/WebCore/platform/graphics/TiledBackingStore.cpp 2011-05-19 15:07:35.000000000 +0200
|
||||
@@ -76,8 +76,8 @@ void TiledBackingStore::invalidate(const
|
||||
Tile::Coordinate topLeft = tileCoordinateForPoint(dirtyRect.location());
|
||||
Tile::Coordinate bottomRight = tileCoordinateForPoint(IntPoint(dirtyRect.maxX(), dirtyRect.maxY()));
|
||||
|
||||
- for (unsigned yCoordinate = topLeft.y(); yCoordinate <= bottomRight.y(); ++yCoordinate) {
|
||||
- for (unsigned xCoordinate = topLeft.x(); xCoordinate <= bottomRight.x(); ++xCoordinate) {
|
||||
+ for (signed yCoordinate = topLeft.y(); yCoordinate <= bottomRight.y(); ++yCoordinate) {
|
||||
+ for (signed xCoordinate = topLeft.x(); xCoordinate <= bottomRight.x(); ++xCoordinate) {
|
||||
RefPtr<Tile> currentTile = tileAt(Tile::Coordinate(xCoordinate, yCoordinate));
|
||||
if (!currentTile)
|
||||
continue;
|
||||
@@ -135,8 +135,8 @@ void TiledBackingStore::paint(GraphicsCo
|
||||
Tile::Coordinate topLeft = tileCoordinateForPoint(dirtyRect.location());
|
||||
Tile::Coordinate bottomRight = tileCoordinateForPoint(IntPoint(dirtyRect.maxX(), dirtyRect.maxY()));
|
||||
|
||||
- for (unsigned yCoordinate = topLeft.y(); yCoordinate <= bottomRight.y(); ++yCoordinate) {
|
||||
- for (unsigned xCoordinate = topLeft.x(); xCoordinate <= bottomRight.x(); ++xCoordinate) {
|
||||
+ for (signed yCoordinate = topLeft.y(); yCoordinate <= bottomRight.y(); ++yCoordinate) {
|
||||
+ for (signed xCoordinate = topLeft.x(); xCoordinate <= bottomRight.x(); ++xCoordinate) {
|
||||
Tile::Coordinate currentCoordinate(xCoordinate, yCoordinate);
|
||||
RefPtr<Tile> currentTile = tileAt(currentCoordinate);
|
||||
if (currentTile && currentTile->isReadyToPaint())
|
||||
@@ -231,8 +231,8 @@ void TiledBackingStore::createTiles()
|
||||
unsigned requiredTileCount = 0;
|
||||
Tile::Coordinate topLeft = tileCoordinateForPoint(coverRect.location());
|
||||
Tile::Coordinate bottomRight = tileCoordinateForPoint(IntPoint(coverRect.maxX(), coverRect.maxY()));
|
||||
- for (unsigned yCoordinate = topLeft.y(); yCoordinate <= bottomRight.y(); ++yCoordinate) {
|
||||
- for (unsigned xCoordinate = topLeft.x(); xCoordinate <= bottomRight.x(); ++xCoordinate) {
|
||||
+ for (signed yCoordinate = topLeft.y(); yCoordinate <= bottomRight.y(); ++yCoordinate) {
|
||||
+ for (signed xCoordinate = topLeft.x(); xCoordinate <= bottomRight.x(); ++xCoordinate) {
|
||||
Tile::Coordinate currentCoordinate(xCoordinate, yCoordinate);
|
||||
if (tileAt(currentCoordinate))
|
||||
continue;
|
||||
diff -up webkit-qtwebkit/Source/WebCore/platform/network/MIMESniffing.cpp.type-cast webkit-qtwebkit/Source/WebCore/platform/network/MIMESniffing.cpp
|
||||
--- webkit-qtwebkit/Source/WebCore/platform/network/MIMESniffing.cpp.type-cast 2011-05-12 16:42:28.000000000 +0200
|
||||
+++ webkit-qtwebkit/Source/WebCore/platform/network/MIMESniffing.cpp 2011-05-19 15:07:35.000000000 +0200
|
||||
@@ -223,7 +223,7 @@ const size_t imageTypesSize = sizeof(ima
|
||||
static inline size_t dataSizeNeededForImageSniffing()
|
||||
{
|
||||
size_t result = 0;
|
||||
- for (int i = 0; i < imageTypesSize; ++i) {
|
||||
+ for (uint i = 0; i < imageTypesSize; ++i) {
|
||||
if (imageTypes[i].size > result)
|
||||
result = imageTypes[i].size;
|
||||
}
|
||||
diff -up webkit-qtwebkit/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp.type-cast webkit-qtwebkit/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
|
||||
--- webkit-qtwebkit/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp.type-cast 2011-05-12 16:42:28.000000000 +0200
|
||||
+++ webkit-qtwebkit/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp 2011-05-19 15:07:35.000000000 +0200
|
||||
@@ -71,7 +71,7 @@ FormDataIODevice::~FormDataIODevice()
|
||||
|
||||
qint64 FormDataIODevice::computeSize()
|
||||
{
|
||||
- for (int i = 0; i < m_formElements.size(); ++i) {
|
||||
+ for (uint i = 0; i < m_formElements.size(); ++i) {
|
||||
const FormDataElement& element = m_formElements[i];
|
||||
if (element.m_type == FormDataElement::data)
|
||||
m_dataSize += element.m_data.size();
|
||||
@@ -124,7 +124,7 @@ qint64 FormDataIODevice::readData(char*
|
||||
m_currentDelta += toCopy;
|
||||
copied += toCopy;
|
||||
|
||||
- if (m_currentDelta == element.m_data.size())
|
||||
+ if ((unsigned)m_currentDelta == element.m_data.size())
|
||||
moveToNextElement();
|
||||
} else {
|
||||
const QByteArray data = m_currentFile->read(available);
|
||||
diff -up webkit-qtwebkit/Source/WebCore/platform/network/qt/QtMIMETypeSniffer.cpp.type-cast webkit-qtwebkit/Source/WebCore/platform/network/qt/QtMIMETypeSniffer.cpp
|
||||
--- webkit-qtwebkit/Source/WebCore/platform/network/qt/QtMIMETypeSniffer.cpp.type-cast 2011-05-12 16:42:28.000000000 +0200
|
||||
+++ webkit-qtwebkit/Source/WebCore/platform/network/qt/QtMIMETypeSniffer.cpp 2011-05-19 15:07:35.000000000 +0200
|
||||
@@ -44,7 +44,7 @@ bool QtMIMETypeSniffer::sniff()
|
||||
// See QNetworkReplyWrapper::setFinished().
|
||||
const bool isReplyFinished = m_reply->property("_q_isFinished").toBool();
|
||||
|
||||
- if (!isReplyFinished && m_reply->bytesAvailable() < m_sniffer.dataSize())
|
||||
+ if (!isReplyFinished && (unsigned)m_reply->bytesAvailable() < m_sniffer.dataSize())
|
||||
return false;
|
||||
|
||||
QByteArray data = m_reply->peek(m_sniffer.dataSize());
|
||||
Loading…
Reference in New Issue