Hello community,
here is the log from the commit of package libqt5-qtwebkit-examples for
openSUSE:Factory checked in at 2013-10-04 13:55:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebkit-examples (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtwebkit-examples.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtwebkit-examples"
Changes:
--------
---
/work/SRC/openSUSE:Factory/libqt5-qtwebkit-examples/libqt5-qtwebkit-examples.changes
2013-10-01 08:14:56.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.libqt5-qtwebkit-examples.new/libqt5-qtwebkit-examples.changes
2013-10-04 13:55:03.000000000 +0200
@@ -1,0 +2,10 @@
+Thu Aug 29 21:11:50 UTC 2013 - [email protected]
+
+- Update to version 5.1.1:
+ * Bugfix release, please see
+ http://blog.qt.digia.com/blog/2013/08/28/qt-5-1-1-released/
+ http://qt.gitorious.org/qt/qtwebkit-examples/blobs/release/dist/changes-5.1.1
+ and http://qt-project.org/wiki/Qt511KnownIssues for known issues
+- Small spec cleanup
+
+-------------------------------------------------------------------
Old:
----
qtwebkit-examples-opensource-src-5.1.0.tar.xz
New:
----
qtwebkit-examples-opensource-src-5.1.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtwebkit-examples.spec ++++++
--- /var/tmp/diff_new_pack.8Ra4hZ/_old 2013-10-04 13:55:04.000000000 +0200
+++ /var/tmp/diff_new_pack.8Ra4hZ/_new 2013-10-04 13:55:04.000000000 +0200
@@ -17,24 +17,25 @@
Name: libqt5-qtwebkit-examples
-Version: 5.1.0
+Version: 5.1.1
Release: 0
-%define base_name libqt5
-%define real_version 5.1.0
-%define tar_version qtwebkit-examples-opensource-src-%{real_version}
-BuildRequires: libqt5-qttools-devel >= %version
-BuildRequires: xz
-Requires: libqt5-qttools-devel >= %version
-Url: http://qt.digia.com
-Summary: Qt 5 QtWebKit Examples and Demos
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
+Summary: Qt 5 QtWebKit Examples and Demos
+Url: http://qt.digia.com
Group: Development/Libraries/X11
-Provides: libqt5-qtwebkit-examples-and-demos = %version
-Obsoletes: libqt5-qtwebkit-examples-and-demos < %version
Source: %{tar_version}.tar.xz
+# PATCH-MISSING-TAG -- See
http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch0: build-examples.diff
# to get mtime of file:
Source1: libqt5-qtwebkit-examples.changes
+%define base_name libqt5
+%define real_version 5.1.1
+%define tar_version qtwebkit-examples-opensource-src-%{real_version}
+BuildRequires: libqt5-qttools-devel >= %{version}
+BuildRequires: xz
+Requires: libqt5-qttools-devel >= %{version}
+Provides: libqt5-qtwebkit-examples-and-demos = %{version}
+Obsoletes: libqt5-qtwebkit-examples-and-demos < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -44,33 +45,31 @@
This package contains base tools, like string, xml, and network
handling.
-
-
%prep
%setup -q -n qtwebkit-examples-opensource-src-%{real_version}
%patch0
%build
-export PATH=%_libqt5_bindir:$PATH
+export PATH=%{_libqt5_bindir}:$PATH
%ifarch ppc64
- RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc"
+ RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
%endif
-export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF"
-export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF"
-export MAKEFLAGS="%{?jobs:-j %jobs}"
+export CXXFLAGS="$CXXFLAGS %{optflags} -DOPENSSL_LOAD_CONF"
+export CFLAGS="$CFLAGS %{optflags} -DOPENSSL_LOAD_CONF"
+export MAKEFLAGS="%{?_smp_mflags}"
qmake
make
%install
-make INSTALL_ROOT=$RPM_BUILD_ROOT install
+make INSTALL_ROOT=%{buildroot} install
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%files
%defattr(-,root,root,755)
-%dir %_libqt5_examplesdir
-%_libqt5_examplesdir/webkitwidgets
-%_libqt5_examplesdir/webkitqml
+%dir %{_libqt5_examplesdir}
+%{_libqt5_examplesdir}/webkitwidgets
+%{_libqt5_examplesdir}/webkitqml
%changelog
++++++ qtwebkit-examples-opensource-src-5.1.0.tar.xz ->
qtwebkit-examples-opensource-src-5.1.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtwebkit-examples-opensource-src-5.1.0/.qmake.conf
new/qtwebkit-examples-opensource-src-5.1.1/.qmake.conf
--- old/qtwebkit-examples-opensource-src-5.1.0/.qmake.conf 2013-07-02
09:10:27.000000000 +0200
+++ new/qtwebkit-examples-opensource-src-5.1.1/.qmake.conf 2013-08-25
20:05:10.000000000 +0200
@@ -1,4 +1,4 @@
load(qt_build_config)
CONFIG += qt_example_installs
-MODULE_VERSION = 5.1.0
+MODULE_VERSION = 5.1.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtwebkit-examples-opensource-src-5.1.0/.tag
new/qtwebkit-examples-opensource-src-5.1.1/.tag
--- old/qtwebkit-examples-opensource-src-5.1.0/.tag 2013-07-02
09:10:27.000000000 +0200
+++ new/qtwebkit-examples-opensource-src-5.1.1/.tag 2013-08-25
20:05:10.000000000 +0200
@@ -1 +1 @@
-bb4c9761d2746fa26c67ed07821fdb38bb0a3c9b
+3e4d8aa8f0dd63ba67b3c484bcd070dba8c87e13
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebkit-examples-opensource-src-5.1.0/dist/changes-5.1.1
new/qtwebkit-examples-opensource-src-5.1.1/dist/changes-5.1.1
--- old/qtwebkit-examples-opensource-src-5.1.0/dist/changes-5.1.1
1970-01-01 01:00:00.000000000 +0100
+++ new/qtwebkit-examples-opensource-src-5.1.1/dist/changes-5.1.1
2013-08-25 20:05:10.000000000 +0200
@@ -0,0 +1,22 @@
+Qt 5.1 introduces many new features and improvements as well as bugfixes
+over the 5.0.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+ http://qt-project.org/doc/qt-5.1
+
+The Qt version 5.1 series is binary compatible with the 5.0.x series.
+Applications compiled for 5.0 will continue to run with 5.1.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+ http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+* General *
+****************************************************************************
+
+ - This release contains only minor code improvements.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebkit-examples-opensource-src-5.1.0/examples/webkitwidgets/browser/history.cpp
new/qtwebkit-examples-opensource-src-5.1.1/examples/webkitwidgets/browser/history.cpp
---
old/qtwebkit-examples-opensource-src-5.1.0/examples/webkitwidgets/browser/history.cpp
2013-07-02 09:10:27.000000000 +0200
+++
new/qtwebkit-examples-opensource-src-5.1.1/examples/webkitwidgets/browser/history.cpp
2013-08-25 20:05:10.000000000 +0200
@@ -513,7 +513,7 @@
return bumpedItems + folders;
}
- if (parent.internalId() == -1) {
+ if (parent.internalId() == quintptr(-1)) {
if (parent.row() < bumpedRows())
return 0;
}
@@ -538,7 +538,7 @@
if (!proxyIndex.isValid())
return QModelIndex();
- if (proxyIndex.internalId() == -1) {
+ if (proxyIndex.internalId() == quintptr(-1)) {
int bumpedItems = bumpedRows();
if (proxyIndex.row() < bumpedItems)
return m_treeModel->index(proxyIndex.row(), proxyIndex.column(),
m_treeModel->index(0, 0));
@@ -559,7 +559,7 @@
|| parent.column() > 0)
return QModelIndex();
if (!parent.isValid())
- return createIndex(row, column, -1);
+ return createIndex(row, column, quintptr(-1));
QModelIndex treeIndexParent = mapToSource(parent);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebkit-examples-opensource-src-5.1.0/examples/webkitwidgets/browser/networkaccessmanager.cpp
new/qtwebkit-examples-opensource-src-5.1.1/examples/webkitwidgets/browser/networkaccessmanager.cpp
---
old/qtwebkit-examples-opensource-src-5.1.0/examples/webkitwidgets/browser/networkaccessmanager.cpp
2013-07-02 09:10:27.000000000 +0200
+++
new/qtwebkit-examples-opensource-src-5.1.1/examples/webkitwidgets/browser/networkaccessmanager.cpp
2013-08-25 20:05:10.000000000 +0200
@@ -112,12 +112,12 @@
if (requestFinishedCount % 10)
return;
+#ifdef QT_DEBUG
double pctCached = (double(requestFinishedFromCacheCount) * 100.0/
double(requestFinishedCount));
double pctPipelined = (double(requestFinishedPipelinedCount) * 100.0/
double(requestFinishedCount));
double pctSecure = (double(requestFinishedSecureCount) * 100.0/
double(requestFinishedCount));
double pctDownloadBuffer = (double(requestFinishedDownloadBufferCount) *
100.0/ double(requestFinishedCount));
-#ifdef QT_DEBUG
qDebug("STATS [%lli requests total] [%3.2f%% from cache] [%3.2f%%
pipelined] [%3.2f%% SSL/TLS] [%3.2f%% Zerocopy]", requestFinishedCount,
pctCached, pctPipelined, pctSecure, pctDownloadBuffer);
#endif
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebkit-examples-opensource-src-5.1.0/examples/webkitwidgets/browser/searchlineedit.cpp
new/qtwebkit-examples-opensource-src-5.1.1/examples/webkitwidgets/browser/searchlineedit.cpp
---
old/qtwebkit-examples-opensource-src-5.1.0/examples/webkitwidgets/browser/searchlineedit.cpp
2013-07-02 09:10:27.000000000 +0200
+++
new/qtwebkit-examples-opensource-src-5.1.1/examples/webkitwidgets/browser/searchlineedit.cpp
2013-08-25 20:05:10.000000000 +0200
@@ -65,7 +65,6 @@
int height = this->height();
painter.setRenderHint(QPainter::Antialiasing, true);
- QColor color = palette().color(QPalette::Mid);
painter.setBrush(isDown()
? palette().color(QPalette::Dark)
: palette().color(QPalette::Mid));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebkit-examples-opensource-src-5.1.0/examples/webkitwidgets/browser/settings.cpp
new/qtwebkit-examples-opensource-src-5.1.1/examples/webkitwidgets/browser/settings.cpp
---
old/qtwebkit-examples-opensource-src-5.1.0/examples/webkitwidgets/browser/settings.cpp
2013-07-02 09:10:27.000000000 +0200
+++
new/qtwebkit-examples-opensource-src-5.1.1/examples/webkitwidgets/browser/settings.cpp
2013-08-25 20:05:10.000000000 +0200
@@ -135,9 +135,8 @@
// Privacy
settings.beginGroup(QLatin1String("cookies"));
- CookieJar *jar = BrowserApplication::cookieJar();
QByteArray value = settings.value(QLatin1String("acceptCookies"),
QLatin1String("AcceptOnlyFromSitesNavigatedTo")).toByteArray();
- QMetaEnum acceptPolicyEnum =
jar->staticMetaObject.enumerator(jar->staticMetaObject.indexOfEnumerator("AcceptPolicy"));
+ QMetaEnum acceptPolicyEnum =
CookieJar::staticMetaObject.enumerator(CookieJar::staticMetaObject.indexOfEnumerator("AcceptPolicy"));
CookieJar::AcceptPolicy acceptCookies = acceptPolicyEnum.keyToValue(value)
== -1 ?
CookieJar::AcceptOnlyFromSitesNavigatedTo :
static_cast<CookieJar::AcceptPolicy>(acceptPolicyEnum.keyToValue(value));
@@ -154,7 +153,7 @@
}
value = settings.value(QLatin1String("keepCookiesUntil"),
QLatin1String("Expire")).toByteArray();
- QMetaEnum keepPolicyEnum =
jar->staticMetaObject.enumerator(jar->staticMetaObject.indexOfEnumerator("KeepPolicy"));
+ QMetaEnum keepPolicyEnum =
CookieJar::staticMetaObject.enumerator(CookieJar::staticMetaObject.indexOfEnumerator("KeepPolicy"));
CookieJar::KeepPolicy keepCookies = keepPolicyEnum.keyToValue(value) == -1
?
CookieJar::KeepUntilExpire :
static_cast<CookieJar::KeepPolicy>(keepPolicyEnum.keyToValue(value));
@@ -237,8 +236,7 @@
keepCookies = CookieJar::KeepUntilTimeLimit;
break;
}
- CookieJar *jar = BrowserApplication::cookieJar();
- QMetaEnum acceptPolicyEnum =
jar->staticMetaObject.enumerator(jar->staticMetaObject.indexOfEnumerator("AcceptPolicy"));
+ QMetaEnum acceptPolicyEnum =
CookieJar::staticMetaObject.enumerator(CookieJar::staticMetaObject.indexOfEnumerator("AcceptPolicy"));
settings.setValue(QLatin1String("acceptCookies"),
QLatin1String(acceptPolicyEnum.valueToKey(keepCookies)));
CookieJar::KeepPolicy keepPolicy;
@@ -255,7 +253,7 @@
break;
}
- QMetaEnum keepPolicyEnum =
jar->staticMetaObject.enumerator(jar->staticMetaObject.indexOfEnumerator("KeepPolicy"));
+ QMetaEnum keepPolicyEnum =
CookieJar::staticMetaObject.enumerator(CookieJar::staticMetaObject.indexOfEnumerator("KeepPolicy"));
settings.setValue(QLatin1String("keepCookiesUntil"),
QLatin1String(keepPolicyEnum.valueToKey(keepPolicy)));
settings.endGroup();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtwebkit-examples-opensource-src-5.1.0/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/queries/statisticsInHTML.xq
new/qtwebkit-examples-opensource-src-5.1.1/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/queries/statisticsInHTML.xq
---
old/qtwebkit-examples-opensource-src-5.1.0/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/queries/statisticsInHTML.xq
2013-07-02 09:10:27.000000000 +0200
+++
new/qtwebkit-examples-opensource-src-5.1.1/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/queries/statisticsInHTML.xq
2013-08-25 20:05:10.000000000 +0200
@@ -1,6 +1,6 @@
<html>
<head>
- <title></title>
+ <title>Generated statistics</title>
</head>
<body>
<p>In total the tree has {count($root//QObject)} QObject instances.</p>
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
