Hello community,
here is the log from the commit of package arora for openSUSE:Factory
checked in at Mon Dec 7 16:25:16 CET 2009.
--------
--- KDE/arora/arora.changes 2009-10-08 23:04:02.000000000 +0200
+++ /mounts/work_src_done/STABLE/arora/arora.changes 2009-12-05 23:59:50.000000000 +0100
@@ -1,0 +2,16 @@
+Sat Dec 5 23:58:38 CET 2009 - dmueller@suse.de
+
+- update to 0.10.2:
+ - When compiling with Qt 4.6 Arora had been using some API that changes
+ shortly before the release of Qt 4.6.0 after an API review was done for
+ the new API in QtWebKit. This release changes the code to build with the
+ final API that is found in Qt 4.6.0
+ - A segfault that could occur when opening a URL on a new window from
+ the command-line.
+
+-------------------------------------------------------------------
+Sat Dec 5 22:41:58 CET 2009 - dmueller@suse.de
+
+- fix build against Qt 4.6
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
arora-0.10.1.tar.bz2
New:
----
arora-0.10.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ arora.spec ++++++
--- /var/tmp/diff_new_pack.vU3ear/_old 2009-12-07 16:24:38.000000000 +0100
+++ /var/tmp/diff_new_pack.vU3ear/_new 2009-12-07 16:24:38.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package arora (Version 0.10.1)
+# spec file for package arora (Version 0.10.2)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2009 Raymond Wooninck
@@ -23,8 +23,8 @@
Summary: Cross Platform WebKit Browser
Group: Productivity/Networking/Web/Browsers
Url: http://code.google.com/p/arora/
-License: GPL v2 or later
-Version: 0.10.1
+License: GPLv2+
+Version: 0.10.2
Release: 1
BuildRequires: libQtWebKit-devel libqt4-devel update-desktop-files
Source: %{name}-%{version}.tar.bz2
++++++ arora-0.10.1.tar.bz2 -> arora-0.10.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arora-0.10.1/AUTHORS new/arora-0.10.2/AUTHORS
--- old/arora-0.10.1/AUTHORS 2009-10-05 05:31:48.000000000 +0200
+++ new/arora-0.10.2/AUTHORS 2009-12-05 23:45:07.000000000 +0100
@@ -9,8 +9,8 @@
Christopher Eby kreed@kreed.org
Vincenzo Reale smart2128@baslug.org
Maia Kozheva sikon@ubuntu.com
-axasia axasia@gmail.com
Tor Arne Vestbø tor.arne.vestbo@nokia.com
+axasia axasia@gmail.com
Tom Gundersen teg@jklm.no
Kristof Bal kristof.bal@gmail.com
Adam Treat treat@kde.org
@@ -37,12 +37,14 @@
Pavol Rusnak stick@gk2.sk
Oscar Blumberg o.blumberg@robertlan.eu.org
ondrejcernos cernoso@gmail.com
+mwenge robert@roberthogan.net
Markus Goetz Markus.Goetz@nokia.com
Marius Bugge Monsen mariusbu@pvv.org
Kenneth Rohde Christiansen kenneth.christiansen@openbossa.org
jreznik jreznik@redhat.com
Jonas Gehring jonas.gehring@boolsoft.org
Jocelyn Turcotte jocelyn.turcotte@nokia.com
+João Abecasis joao@abecasis.name
Gergely Nagy gergely.nagy@interware.co.hu
Gegesy Zsombor gzsombor@gmail.com
Dominik Riebeling bluebrother@gmx.de
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arora-0.10.1/buildosx.sh new/arora-0.10.2/buildosx.sh
--- old/arora-0.10.1/buildosx.sh 2009-10-05 05:31:48.000000000 +0200
+++ new/arora-0.10.2/buildosx.sh 2009-12-05 23:45:07.000000000 +0100
@@ -4,7 +4,7 @@
#
APP="Arora"
-VERSION="0.10.1"
+VERSION="0.10.2"
#BACKGROUND="src/data/512x512/arora.png"
DIR="bundle"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arora-0.10.1/ChangeLog new/arora-0.10.2/ChangeLog
--- old/arora-0.10.1/ChangeLog 2009-10-05 05:31:48.000000000 +0200
+++ new/arora-0.10.2/ChangeLog 2009-12-05 23:45:07.000000000 +0100
@@ -1,3 +1,12 @@
+0.10.2
+The major issues:
+ - When compiling with Qt 4.6 Arora had been using some API that changes
+ shortly before the release of Qt 4.6.0 after an API review was done for
+ the new API in QtWebKit. This release changes the code to build with the
+ final API that is found in Qt 4.6.0
+ - A segfault that could occur when opening a URL on a new window from the command-line.
+
+
0.10.1
The major issues:
Issue: 666 Sites were showing a "SSL handshake failure". With the new NetworkAccessManagerProxy the signals were being sent to the proxy and not the primary networkaccessmanager.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arora-0.10.1/debian-upstream/changelog.in new/arora-0.10.2/debian-upstream/changelog.in
--- old/arora-0.10.1/debian-upstream/changelog.in 2009-10-05 05:31:48.000000000 +0200
+++ new/arora-0.10.2/debian-upstream/changelog.in 2009-12-05 23:45:07.000000000 +0100
@@ -1,4 +1,4 @@
-arora (0.10.1~git##DATE##-1~##DIST##1~upstream1) ##DIST##; urgency=low
+arora (0.10.2~git##DATE##-1~##DIST##1~upstream1) ##DIST##; urgency=low
* Initial release (LP: #231731)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arora-0.10.1/generateReleaseContributors new/arora-0.10.2/generateReleaseContributors
--- old/arora-0.10.1/generateReleaseContributors 2009-10-05 05:31:48.000000000 +0200
+++ new/arora-0.10.2/generateReleaseContributors 2009-12-05 23:45:07.000000000 +0100
@@ -1,5 +1,5 @@
#!/bin/bash
-./generateAuthors 0.10.0..HEAD | while read line
+./generateAuthors 0.10.1..HEAD | while read line
do
name=`echo $line | sed -e 's/ [^ ]*@[^ ]*//g'`
email=`echo $line | sed -e 's/.* //g' | tr [A-Z] [a-z]`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arora-0.10.1/src/adblock/adblockpage.cpp new/arora-0.10.2/src/adblock/adblockpage.cpp
--- old/arora-0.10.1/src/adblock/adblockpage.cpp 2009-10-05 05:31:48.000000000 +0200
+++ new/arora-0.10.2/src/adblock/adblockpage.cpp 2009-12-05 23:45:07.000000000 +0100
@@ -85,7 +85,7 @@
Q_UNUSED(page);
#if QT_VERSION >= 0x040600
QWebElement document = page->mainFrame()->documentElement();
- QList<QWebElement> elements = document.findAll(selectorQuery);
+ QWebElementCollection elements = document.findAll(selectorQuery);
#if defined(ADBLOCKPAGE_DEBUG)
if (elements.count() != 0)
qDebug() << "AdBlockPage::" << __FUNCTION__ << "blocking" << elements.count() << "items" << selectorQuery << elements.count() << "rule:" << rule->filter();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arora-0.10.1/src/browserapplication.cpp new/arora-0.10.2/src/browserapplication.cpp
--- old/arora-0.10.1/src/browserapplication.cpp 2009-10-05 05:31:48.000000000 +0200
+++ new/arora-0.10.2/src/browserapplication.cpp 2009-12-05 23:45:07.000000000 +0100
@@ -105,7 +105,7 @@
{
QCoreApplication::setOrganizationDomain(QLatin1String("arora-browser.org"));
QCoreApplication::setApplicationName(QLatin1String("Arora"));
- QString version = QLatin1String("0.10.1");
+ QString version = QLatin1String("0.10.2");
QString gitVersion = QLatin1String(GITCHANGENUMBER);
if (gitVersion != QLatin1String("0")
&& !gitVersion.isEmpty())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arora-0.10.1/src/qwebplugins/clicktoflash/clicktoflash.cpp new/arora-0.10.2/src/qwebplugins/clicktoflash/clicktoflash.cpp
--- old/arora-0.10.1/src/qwebplugins/clicktoflash/clicktoflash.cpp 2009-10-05 05:31:48.000000000 +0200
+++ new/arora-0.10.2/src/qwebplugins/clicktoflash/clicktoflash.cpp 2009-12-05 23:45:07.000000000 +0100
@@ -116,7 +116,7 @@
QWebFrame *frame = frames.takeFirst();
QWebElement docElement = frame->documentElement();
- QList<QWebElement> elements;
+ QWebElementCollection elements;
elements.append(docElement.findAll(selector.arg(QLatin1String("object"))));
elements.append(docElement.findAll(selector.arg(QLatin1String("embed"))));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arora-0.10.1/src/tabwidget.cpp new/arora-0.10.2/src/tabwidget.cpp
--- old/arora-0.10.1/src/tabwidget.cpp 2009-10-05 05:31:48.000000000 +0200
+++ new/arora-0.10.2/src/tabwidget.cpp 2009-12-05 23:45:07.000000000 +0100
@@ -618,7 +618,10 @@
m_recentlyClosedTabsAction->setEnabled(true);
m_recentlyClosedTabs.prepend(tab->url());
#if QT_VERSION >= 0x040600
- m_recentlyClosedTabsHistory.prepend(tab->history()->saveState());
+ QByteArray tabHistory;
+ QDataStream tabHistoryStream(&tabHistory, QIODevice::WriteOnly);
+ tabHistoryStream << tab->history();
+ m_recentlyClosedTabsHistory.prepend(tabHistory);
#else
m_recentlyClosedTabsHistory.prepend(QByteArray());
#endif
@@ -859,7 +862,11 @@
if (url.isValid())
return url;
+#if QT_VERSION >= 0x040600
+ url = QUrl::fromUserInput(string);
+#else
url = WebView::guessUrlFromString(string);
+#endif
if (url.scheme() == QLatin1String("about")
&& url.path() == QLatin1String("home"))
@@ -974,7 +981,9 @@
return;
WebView *webView = getView(tab, currentWebView());
if (webView) {
- locationBar(webViewIndex(webView))->setText(QString::fromUtf8(url.toEncoded()));
+ int index = webViewIndex(webView);
+ if (index != -1)
+ locationBar(index)->setText(QString::fromUtf8(url.toEncoded()));
webView->loadUrl(url, title);
}
}
@@ -1066,10 +1075,14 @@
if (WebView *tab = webView(i)) {
tabs.append(QString::fromUtf8(tab->url().toEncoded()));
#if QT_VERSION >= 0x040600
- if (tab->history()->count() != 0)
- tabsHistory.append(tab->history()->saveState());
- else
- tabsHistory.append(QByteArray());
+ if (tab->history()->count() != 0) {
+ QByteArray tabHistory;
+ QDataStream tabHistoryStream(&tabHistory, QIODevice::WriteOnly);
+ tabHistoryStream << tab->history();
+ tabsHistory.append(tabHistory);
+ } else {
+ tabsHistory << QByteArray();
+ }
#else
tabsHistory.append(QByteArray());
#endif
@@ -1131,8 +1144,10 @@
void TabWidget::createTab(const QByteArray &historyState, TabWidget::OpenUrlIn tab)
{
#if QT_VERSION >= 0x040600
- if (WebView *webView = getView(tab, currentWebView()))
- webView->history()->restoreState(historyState);
+ if (WebView *webView = getView(tab, currentWebView())) {
+ QDataStream historyStream(historyState);
+ historyStream >> *webView->history();
+ }
#else
qWarning() << "Warning: TabWidget::createTab should not be called, but it is...";
Q_UNUSED(historyState);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arora-0.10.1/src/webpage.cpp new/arora-0.10.2/src/webpage.cpp
--- old/arora-0.10.1/src/webpage.cpp 2009-10-05 05:31:48.000000000 +0200
+++ new/arora-0.10.2/src/webpage.cpp 2009-12-05 23:45:07.000000000 +0100
@@ -128,7 +128,7 @@
#if QT_VERSION >= 0x040600 || defined(WEBKIT_TRUNK)
QUrl baseUrl = mainFrame()->baseUrl();
- QList<QWebElement> linkElements = mainFrame()->findAllElements(QLatin1String("html > head > link"));
+ QWebElementCollection linkElements = mainFrame()->findAllElements(QLatin1String("html > head > link"));
foreach (const QWebElement &linkElement, linkElements) {
QString rel = linkElement.attribute(QLatin1String("rel"));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arora-0.10.1/src/webview.cpp new/arora-0.10.2/src/webview.cpp
--- old/arora-0.10.1/src/webview.cpp 2009-10-05 05:31:48.000000000 +0200
+++ new/arora-0.10.2/src/webview.cpp 2009-12-05 23:45:07.000000000 +0100
@@ -156,7 +156,7 @@
m_page->loadSettings();
}
-#if !(QT_VERSION >= 0x040600 || defined(WEBKIT_TRUNK))
+#if !(QT_VERSION >= 0x040600)
#include
// DO NOT CHANGE ANYTHING IN THIS FUNCTION
// You want to change TabWidget::guessUrlFromString()
@@ -439,7 +439,7 @@
QUrl searchUrl(page()->mainFrame()->baseUrl().resolved(QUrl(formElement.attribute(QLatin1String("action")))));
QMap searchEngines;
- QList<QWebElement> inputFields = formElement.findAll(QLatin1String("input"));
+ QWebElementCollection inputFields = formElement.findAll(QLatin1String("input"));
foreach (QWebElement inputField, inputFields) {
QString type = inputField.attribute(QLatin1String("type"), QLatin1String("text"));
QString name = inputField.attribute(QLatin1String("name"));
@@ -461,14 +461,14 @@
}
}
- QList<QWebElement> selectFields = formElement.findAll(QLatin1String("select"));
+ QWebElementCollection selectFields = formElement.findAll(QLatin1String("select"));
foreach (QWebElement selectField, selectFields) {
QString name = selectField.attribute(QLatin1String("name"));
int selectedIndex = selectField.evaluateJavaScript(QLatin1String("this.selectedIndex")).toInt();
if (selectedIndex == -1)
continue;
- QList<QWebElement> options = selectField.findAll(QLatin1String("option"));
+ QWebElementCollection options = selectField.findAll(QLatin1String("option"));
QString value = options.at(selectedIndex).toPlainText();
searchUrl.addQueryItem(name, value);
}
@@ -485,8 +485,8 @@
}
QString engineName;
- QList<QWebElement> labels = formElement.findAll(QString(QLatin1String("label[for=\"%1\"]")).arg(elementName));
- if (!labels.isEmpty())
+ QWebElementCollection labels = formElement.findAll(QString(QLatin1String("label[for=\"%1\"]")).arg(elementName));
+ if (labels.count() > 0)
engineName = labels.at(0).toPlainText();
engineName = QInputDialog::getText(this, tr("Engine name"), tr("Type in a name for the engine"),
@@ -824,7 +824,7 @@
// Priority first goes to elements with accesskey attributes
QList<QWebElement> alreadyLabeled;
foreach (const QString &elementType, supportedElement) {
- QList<QWebElement> result = page()->mainFrame()->findAllElements(elementType);
+ QList<QWebElement> result = page()->mainFrame()->findAllElements(elementType).toList();
foreach (const QWebElement &element, result) {
const QRect geometry = element.geometry();
if (geometry.size().isEmpty()
@@ -853,7 +853,7 @@
// Pick an access key first from the letters in the text and then from the
// list of unused access keys
foreach (const QString &elementType, supportedElement) {
- QList<QWebElement> result = page()->mainFrame()->findAllElements(elementType);
+ QWebElementCollection result = page()->mainFrame()->findAllElements(elementType);
foreach (const QWebElement &element, result) {
const QRect geometry = element.geometry();
if (unusedKeys.isEmpty()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arora-0.10.1/src/webview.h new/arora-0.10.2/src/webview.h
--- old/arora-0.10.1/src/webview.h 2009-10-05 05:31:48.000000000 +0200
+++ new/arora-0.10.2/src/webview.h 2009-12-05 23:45:07.000000000 +0100
@@ -84,7 +84,7 @@
WebView(QWidget *parent = 0);
WebPage *webPage() const { return m_page; }
-#if !(QT_VERSION >= 0x040600 || defined(WEBKIT_TRUNK))
+#if !(QT_VERSION >= 0x040600)
static QUrl guessUrlFromString(const QString &url);
#endif
void loadSettings();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/arora-0.10.1/windowsinstaller.nsi new/arora-0.10.2/windowsinstaller.nsi
--- old/arora-0.10.1/windowsinstaller.nsi 2009-10-05 05:31:48.000000000 +0200
+++ new/arora-0.10.2/windowsinstaller.nsi 2009-12-05 23:45:07.000000000 +0100
@@ -3,7 +3,7 @@
SetCompressor /SOLID /FINAL lzma
!define PRODUCT_NAME "Arora"
-!define /date PRODUCT_VERSION "0.10.1"
+!define /date PRODUCT_VERSION "0.10.2"
;!define /date PRODUCT_VERSION "Snapshot (%#m-%#d-%#Y)"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\arora.exe"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
