Sun Jan 3 23:37:39 2016 UTC ()
Update otter-browser to 0.9.09
Upstream changes since 0.9.08:
added initial support for spell checking;
added support for selecting allowed and rejected domains for third-party cookies;
added support for customizing visible columns and their order in most of views;
added support for customizing text and icon of toolbar entries;
added support for adding arbitrary menus to toolbars;
some other fixes and minor improvements.
Cherry-picked changes suggested by upstream:
Always mark dialogs as restored (67c2ae72cc57c)
Fallback to QItemDelegate::paint() if type is unknown (fd7380a9eec7)
Try to return first address field from the list if none was matched (d1a1b0bbc8d80d0)
(kamil)
diff -r1.1 -r1.2 pkgsrc/www/otter-browser/Makefile
diff -r1.1 -r1.2 pkgsrc/www/otter-browser/distinfo
diff -r0 -r1.1 pkgsrc/www/otter-browser/patches/patch-src_ui_Dialog.cpp
diff -r0 -r1.1 pkgsrc/www/otter-browser/patches/patch-src_ui_OptionDelegate.cpp
diff -r0 -r1.1 pkgsrc/www/otter-browser/patches/patch-src_ui_OptionDelegate.h
diff -r0 -r1.1 pkgsrc/www/otter-browser/patches/patch-src_ui_Window.cpp
--- pkgsrc/www/otter-browser/Makefile 2015/12/12 05:04:19 1.1
+++ pkgsrc/www/otter-browser/Makefile 2016/01/03 23:37:39 1.2
| @@ -1,16 +1,16 @@ | | | @@ -1,16 +1,16 @@ |
1 | # $NetBSD: Makefile,v 1.1 2015/12/12 05:04:19 kamil Exp $ | | 1 | # $NetBSD: Makefile,v 1.2 2016/01/03 23:37:39 kamil Exp $ |
2 | | | 2 | |
3 | DISTNAME= otter-browser-0.9.08 | | 3 | DISTNAME= otter-browser-0.9.09 |
4 | CATEGORIES= www | | 4 | CATEGORIES= www |
5 | MASTER_SITES= ${MASTER_SITE_GITHUB:=OtterBrowser/} | | 5 | MASTER_SITES= ${MASTER_SITE_GITHUB:=OtterBrowser/} |
6 | GITHUB_TAG= v${PKGVERSION_NOREV} | | 6 | GITHUB_TAG= v${PKGVERSION_NOREV} |
7 | | | 7 | |
8 | MAINTAINER= pkgsrc-users@NetBSD.org | | 8 | MAINTAINER= pkgsrc-users@NetBSD.org |
9 | HOMEPAGE= http://otter-browser.org/ | | 9 | HOMEPAGE= http://otter-browser.org/ |
10 | COMMENT= Project aiming to recreate classic Opera (12.x) UI using Qt5 | | 10 | COMMENT= Project aiming to recreate classic Opera (12.x) UI using Qt5 |
11 | LICENSE= gnu-gpl-v3 | | 11 | LICENSE= gnu-gpl-v3 |
12 | | | 12 | |
13 | USE_CMAKE= yes | | 13 | USE_CMAKE= yes |
14 | USE_LANGUAGES= c c++ | | 14 | USE_LANGUAGES= c c++ |
15 | | | 15 | |
16 | .include "../../graphics/hicolor-icon-theme/buildlink3.mk" | | 16 | .include "../../graphics/hicolor-icon-theme/buildlink3.mk" |
--- pkgsrc/www/otter-browser/distinfo 2015/12/12 05:04:19 1.1
+++ pkgsrc/www/otter-browser/distinfo 2016/01/03 23:37:39 1.2
| @@ -1,6 +1,10 @@ | | | @@ -1,6 +1,10 @@ |
1 | $NetBSD: distinfo,v 1.1 2015/12/12 05:04:19 kamil Exp $ | | 1 | $NetBSD: distinfo,v 1.2 2016/01/03 23:37:39 kamil Exp $ |
2 | | | 2 | |
3 | SHA1 (otter-browser-0.9.08.tar.gz) = 1d9a9be6afd361e59b6828221c6d20b97b01b262 | | 3 | SHA1 (otter-browser-0.9.09.tar.gz) = f0ee5031f09243d5c78cd638d95655b04fada05c |
4 | RMD160 (otter-browser-0.9.08.tar.gz) = 821237e7f3fe68de73c67c51b91433b6096075af | | 4 | RMD160 (otter-browser-0.9.09.tar.gz) = 4368fe02e58178f78419c53c8969ff97b1e15a3b |
5 | SHA512 (otter-browser-0.9.08.tar.gz) = 9244a84490bb8dda12b932f6b39a41000a96740ef9c194e8f52a31122d763f857462e88219f086e8ad886dd6e0d79d4143060ddb801aaeb30c2952cef283e5ff | | 5 | SHA512 (otter-browser-0.9.09.tar.gz) = 269d896784f6cdcc051c4d6c1b182910d62c10998b10993cb90387cc81a8ca032a36cbe0182695d441b3e470a7a5ba7f54ffb5436cbf566a3ccd9bf3911734b1 |
6 | Size (otter-browser-0.9.08.tar.gz) = 3124966 bytes | | 6 | Size (otter-browser-0.9.09.tar.gz) = 3197615 bytes |
| | | 7 | SHA1 (patch-src_ui_Dialog.cpp) = 25b1edcfe270420f257ab7c40ad09f1b4c2894c8 |
| | | 8 | SHA1 (patch-src_ui_OptionDelegate.cpp) = 10177e96e516ed6f2d28d574ad0026e64161c4ba |
| | | 9 | SHA1 (patch-src_ui_OptionDelegate.h) = f1118416e8252fb97576be5fd8558450df346144 |
| | | 10 | SHA1 (patch-src_ui_Window.cpp) = 4c3dd60a09800a7d3155693474ef451086648a1e |
$NetBSD: patch-src_ui_Dialog.cpp,v 1.1 2016/01/03 23:37:39 kamil Exp $
Always mark dialogs as restored
cherry-pick from https://github.com/OtterBrowser/otter-browser/commit/67c2ae72cc57c80412bc5701e5fb7f89cb0ba9da
Suggested by upstream
--- src/ui/Dialog.cpp.orig 2016-01-01 20:14:29.000000000 +0000
+++ src/ui/Dialog.cpp
@@ -45,12 +45,11 @@ void Dialog::showEvent(QShowEvent *event
}
else
{
+ const QString name = normalizeDialogName(objectName());
const QJsonObject object = QJsonDocument::fromJson(file.readAll()).object();
file.close();
- const QString name = normalizeDialogName(objectName());
-
if (object.contains(name))
{
QJsonObject size = object.value(name).toObject().value(QLatin1String("size")).toObject();
@@ -60,9 +59,9 @@ void Dialog::showEvent(QShowEvent *event
resize(size.value(QLatin1String("width")).toInt(), size.value(QLatin1String("height")).toInt());
}
}
-
- m_wasRestored = true;
}
+
+ m_wasRestored = true;
}
QDialog::showEvent(event);
$NetBSD: patch-src_ui_OptionDelegate.cpp,v 1.1 2016/01/03 23:37:39 kamil Exp $
Fallback to QItemDelegate::paint() if type is unknown
cherry-pick from https://github.com/OtterBrowser/otter-browser/commit/fd7380a9eec71815115e5a383eea1a7dda33a52a
Patch suggested by upstream
--- src/ui/OptionDelegate.cpp.orig 2016-01-01 20:14:29.000000000 +0000
+++ src/ui/OptionDelegate.cpp
@@ -1,6 +1,6 @@
/**************************************************************************
* Otter Browser: Web browser controlled by the user, not vice-versa.
-* Copyright (C) 2013 - 2015 Michal Dutkiewicz aka Emdek <michal@emdek.pl>
+* Copyright (C) 2013 - 2016 Michal Dutkiewicz aka Emdek <michal@emdek.pl>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -34,6 +34,13 @@ void OptionDelegate::paint(QPainter *pai
{
const OptionWidget::OptionType type = getType(index);
+ if (type == OptionWidget::UnknownType)
+ {
+ QItemDelegate::paint(painter, option, index);
+
+ return;
+ }
+
drawBackground(painter, option, index);
switch (type)
$NetBSD: patch-src_ui_OptionDelegate.h,v 1.1 2016/01/03 23:37:39 kamil Exp $
Fallback to QItemDelegate::paint() if type is unknown
cherry-pick from https://github.com/OtterBrowser/otter-browser/commit/fd7380a9eec71815115e5a383eea1a7dda33a52a
Patch suggested by upstream
--- src/ui/OptionDelegate.h.orig 2016-01-01 20:14:29.000000000 +0000
+++ src/ui/OptionDelegate.h
@@ -1,6 +1,6 @@
/**************************************************************************
* Otter Browser: Web browser controlled by the user, not vice-versa.
-* Copyright (C) 2013 - 2015 Michal Dutkiewicz aka Emdek <michal@emdek.pl>
+* Copyright (C) 2013 - 2016 Michal Dutkiewicz aka Emdek <michal@emdek.pl>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
$NetBSD: patch-src_ui_Window.cpp,v 1.1 2016/01/03 23:37:39 kamil Exp $
Try to return first address field from the list if none was matched
cherry-pick from https://github.com/OtterBrowser/otter-browser/commit/d1a1b0bbc8d80d0d7ed7a1fbbf83975a5ddea69e
Patch suggested by upstream
--- src/ui/Window.cpp.orig 2016-01-01 20:14:29.000000000 +0000
+++ src/ui/Window.cpp
@@ -596,7 +596,7 @@ AddressWidget* Window::findAddressWidget
}
}
- return NULL;
+ return m_addressWidgets.value(0, NULL);
}
Window* Window::clone(bool cloneHistory, QWidget *parent)