From 052e5cdaf1054cb4432b3d77245f503a352038e5 Mon Sep 17 00:00:00 2001 From: kamil Date: Sat, 20 Aug 2016 19:00:31 +0000 Subject: Update otter-browser from 0.9.9 to 0.9.10 Local changes ============= Start to depend on textproc/hunspell. Upstream changelog ================== Emdek released 0.9.10 on 1 May 2016 added initial support for User Scripts; added Addons Manager; added alternative display mode and support for optional headers for URL completion in address field; many enhancements in experimental backend for QtWebEngine (Blink): added support for entering full screen mode; added support for content blocking; added support for several missing actions; several fixes and improvements in content blocking; improved CMake build system (also now it is the only officially supported); added new backend for storing browsing history; many other fixes and improvements. --- www/otter-browser/Makefile | 6 ++-- www/otter-browser/PLIST | 4 ++- www/otter-browser/distinfo | 14 ++++----- www/otter-browser/patches/patch-src_ui_Dialog.cpp | 35 ---------------------- .../patches/patch-src_ui_OptionDelegate.cpp | 31 ------------------- .../patches/patch-src_ui_OptionDelegate.h | 17 ----------- www/otter-browser/patches/patch-src_ui_Window.cpp | 18 ----------- 7 files changed, 11 insertions(+), 114 deletions(-) delete mode 100644 www/otter-browser/patches/patch-src_ui_Dialog.cpp delete mode 100644 www/otter-browser/patches/patch-src_ui_OptionDelegate.cpp delete mode 100644 www/otter-browser/patches/patch-src_ui_OptionDelegate.h delete mode 100644 www/otter-browser/patches/patch-src_ui_Window.cpp (limited to 'www') diff --git a/www/otter-browser/Makefile b/www/otter-browser/Makefile index 36b442efdc7..7ac20068549 100644 --- a/www/otter-browser/Makefile +++ b/www/otter-browser/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2016/08/04 17:03:39 ryoon Exp $ +# $NetBSD: Makefile,v 1.7 2016/08/20 19:00:31 kamil Exp $ -DISTNAME= otter-browser-0.9.09 -PKGREVISION= 4 +DISTNAME= otter-browser-0.9.10 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_GITHUB:=OtterBrowser/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -16,6 +15,7 @@ USE_LANGUAGES= c c++ .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../textproc/hunspell/buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" .include "../../x11/qt5-qtmultimedia/buildlink3.mk" .include "../../x11/qt5-qtscript/buildlink3.mk" diff --git a/www/otter-browser/PLIST b/www/otter-browser/PLIST index 8487ad10b11..38f5d2be304 100644 --- a/www/otter-browser/PLIST +++ b/www/otter-browser/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2015/12/12 05:04:19 kamil Exp $ +@comment $NetBSD: PLIST,v 1.2 2016/08/20 19:00:31 kamil Exp $ bin/otter-browser man/man1/otter-browser.1 share/applications/otter-browser.desktop @@ -8,6 +8,7 @@ share/icons/hicolor/256x256/apps/otter-browser.png share/icons/hicolor/32x32/apps/otter-browser.png share/icons/hicolor/48x48/apps/otter-browser.png share/icons/hicolor/64x64/apps/otter-browser.png +share/otter-browser/locale/otter-browser_ar.qm share/otter-browser/locale/otter-browser_bg.qm share/otter-browser/locale/otter-browser_cs.qm share/otter-browser/locale/otter-browser_da.qm @@ -21,6 +22,7 @@ share/otter-browser/locale/otter-browser_es_MX.qm share/otter-browser/locale/otter-browser_et.qm share/otter-browser/locale/otter-browser_fi.qm share/otter-browser/locale/otter-browser_fr.qm +share/otter-browser/locale/otter-browser_he.qm share/otter-browser/locale/otter-browser_hr.qm share/otter-browser/locale/otter-browser_hu.qm share/otter-browser/locale/otter-browser_id.qm diff --git a/www/otter-browser/distinfo b/www/otter-browser/distinfo index 005f2517c2a..27856a685db 100644 --- a/www/otter-browser/distinfo +++ b/www/otter-browser/distinfo @@ -1,10 +1,6 @@ -$NetBSD: distinfo,v 1.2 2016/01/03 23:37:39 kamil Exp $ +$NetBSD: distinfo,v 1.3 2016/08/20 19:00:31 kamil Exp $ -SHA1 (otter-browser-0.9.09.tar.gz) = f0ee5031f09243d5c78cd638d95655b04fada05c -RMD160 (otter-browser-0.9.09.tar.gz) = 4368fe02e58178f78419c53c8969ff97b1e15a3b -SHA512 (otter-browser-0.9.09.tar.gz) = 269d896784f6cdcc051c4d6c1b182910d62c10998b10993cb90387cc81a8ca032a36cbe0182695d441b3e470a7a5ba7f54ffb5436cbf566a3ccd9bf3911734b1 -Size (otter-browser-0.9.09.tar.gz) = 3197615 bytes -SHA1 (patch-src_ui_Dialog.cpp) = 25b1edcfe270420f257ab7c40ad09f1b4c2894c8 -SHA1 (patch-src_ui_OptionDelegate.cpp) = 10177e96e516ed6f2d28d574ad0026e64161c4ba -SHA1 (patch-src_ui_OptionDelegate.h) = f1118416e8252fb97576be5fd8558450df346144 -SHA1 (patch-src_ui_Window.cpp) = 4c3dd60a09800a7d3155693474ef451086648a1e +SHA1 (otter-browser-0.9.10.tar.gz) = fe9657c4533ba363d5cbe777a0d0547697052e9f +RMD160 (otter-browser-0.9.10.tar.gz) = e708fd4d8b8616c16e42b6a02f7845b7a5e75134 +SHA512 (otter-browser-0.9.10.tar.gz) = 04372d082a31bee906abee0d10e5489763b3f0a72d7e20b4c0fcbe85be0c29142294d4e32e9af56b6d7f4c529ffddc20347c0be6104bb6a64d8245724e20d96f +Size (otter-browser-0.9.10.tar.gz) = 3521313 bytes diff --git a/www/otter-browser/patches/patch-src_ui_Dialog.cpp b/www/otter-browser/patches/patch-src_ui_Dialog.cpp deleted file mode 100644 index e94bf2d9090..00000000000 --- a/www/otter-browser/patches/patch-src_ui_Dialog.cpp +++ /dev/null @@ -1,35 +0,0 @@ -$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); diff --git a/www/otter-browser/patches/patch-src_ui_OptionDelegate.cpp b/www/otter-browser/patches/patch-src_ui_OptionDelegate.cpp deleted file mode 100644 index 94617bb2906..00000000000 --- a/www/otter-browser/patches/patch-src_ui_OptionDelegate.cpp +++ /dev/null @@ -1,31 +0,0 @@ -$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 -+* Copyright (C) 2013 - 2016 Michal Dutkiewicz aka Emdek - * - * 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) diff --git a/www/otter-browser/patches/patch-src_ui_OptionDelegate.h b/www/otter-browser/patches/patch-src_ui_OptionDelegate.h deleted file mode 100644 index c815430df4a..00000000000 --- a/www/otter-browser/patches/patch-src_ui_OptionDelegate.h +++ /dev/null @@ -1,17 +0,0 @@ -$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 -+* Copyright (C) 2013 - 2016 Michal Dutkiewicz aka Emdek - * - * 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 diff --git a/www/otter-browser/patches/patch-src_ui_Window.cpp b/www/otter-browser/patches/patch-src_ui_Window.cpp deleted file mode 100644 index db1e28e95c3..00000000000 --- a/www/otter-browser/patches/patch-src_ui_Window.cpp +++ /dev/null @@ -1,18 +0,0 @@ -$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) -- cgit v1.2.3