From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1195419-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 321FD138359
for <garchives@archives.gentoo.org>; Mon, 10 Aug 2020 17:09:42 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 52EBFE0824;
Mon, 10 Aug 2020 17:09:41 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 2BD62E0824
for <gentoo-commits@lists.gentoo.org>; Mon, 10 Aug 2020 17:09:41 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id B53E334EC49
for <gentoo-commits@lists.gentoo.org>; Mon, 10 Aug 2020 17:09:38 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 3A4732F2
for <gentoo-commits@lists.gentoo.org>; Mon, 10 Aug 2020 17:09:37 +0000 (UTC)
From: "Jeroen Roovers" <jer@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" <jer@gentoo.org>
Message-ID: <1597079370.0887cc03be7e334a3f542c8074dca4d0c4fbfea7.jer@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/otter/, www-client/otter/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: www-client/otter/files/otter-1.0.01-qtgui-5.15.0.patch www-client/otter/files/otter-1.0.01-webengine.patch www-client/otter/otter-1.0.01-r1.ebuild www-client/otter/otter-9999.ebuild
X-VCS-Directories: www-client/otter/ www-client/otter/files/
X-VCS-Committer: jer
X-VCS-Committer-Name: Jeroen Roovers
X-VCS-Revision: 0887cc03be7e334a3f542c8074dca4d0c4fbfea7
X-VCS-Branch: master
Date: Mon, 10 Aug 2020 17:09:37 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 99fbafaf-803f-4985-aee8-b32e4b7793f1
X-Archives-Hash: 5141014cdf2e03fe957028e92e45bc63
commit: 0887cc03be7e334a3f542c8074dca4d0c4fbfea7
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 10 17:05:51 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Aug 10 17:09:30 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0887cc03
www-client/otter: Drop support for dev-qt/qtwebkit
- Add upstream patch for qtgui 5.15.0
- Drop USE="webengine webkit" and use only dev-qt/qtwebengine
- EAPI=7
- cmake-utils.eclass => cmake.eclass
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Closes: https://bugs.gentoo.org/649170
Closes: https://bugs.gentoo.org/show_bug.cgi?id=712172
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
.../otter/files/otter-1.0.01-qtgui-5.15.0.patch | 10 ++++++++
.../otter/files/otter-1.0.01-webengine.patch | 11 +++++++++
.../{otter-9999.ebuild => otter-1.0.01-r1.ebuild} | 28 ++++++++++++++++------
www-client/otter/otter-9999.ebuild | 24 ++++++++++++++-----
4 files changed, 60 insertions(+), 13 deletions(-)
diff --git a/www-client/otter/files/otter-1.0.01-qtgui-5.15.0.patch b/www-client/otter/files/otter-1.0.01-qtgui-5.15.0.patch
new file mode 100644
index 00000000000..ec60a4b2c42
--- /dev/null
+++ b/www-client/otter/files/otter-1.0.01-qtgui-5.15.0.patch
@@ -0,0 +1,10 @@
+--- a/src/modules/windows/web/StartPageWidget.cpp
++++ b/src/modules/windows/web/StartPageWidget.cpp
+@@ -41,6 +41,7 @@
+ #include <QtGui/QGuiApplication>
+ #include <QtGui/QMouseEvent>
+ #include <QtGui/QPainter>
++#include <QtGui/QPainterPath>
+ #include <QtGui/QPixmapCache>
+ #include <QtWidgets/QDesktopWidget>
+ #include <QtWidgets/QGridLayout>
diff --git a/www-client/otter/files/otter-1.0.01-webengine.patch b/www-client/otter/files/otter-1.0.01-webengine.patch
new file mode 100644
index 00000000000..f8029d95f26
--- /dev/null
+++ b/www-client/otter/files/otter-1.0.01-webengine.patch
@@ -0,0 +1,11 @@
+--- a/src/core/SettingsManager.cpp
++++ b/src/core/SettingsManager.cpp
+@@ -73,7 +73,7 @@ void SettingsManager::createInstance(con
+ registerOption(AddressField_SuggestSearchOption, BooleanType, true);
+ registerOption(AddressField_SuggestSpecialPagesOption, BooleanType, true);
+ registerOption(Backends_PasswordsOption, EnumerationType, QLatin1String("file"), {QLatin1String("file")});
+- registerOption(Backends_WebOption, EnumerationType, QLatin1String("qtwebkit"), {QLatin1String("qtwebkit")}, (OptionDefinition::IsEnabledFlag | OptionDefinition::IsVisibleFlag | OptionDefinition::RequiresRestartFlag));
++ registerOption(Backends_WebOption, EnumerationType, QLatin1String("qtwebengine"), {QLatin1String("qtwebengine")}, (OptionDefinition::IsEnabledFlag | OptionDefinition::IsVisibleFlag | OptionDefinition::RequiresRestartFlag));
+ registerOption(Browser_AlwaysAskWhereToSaveDownloadOption, BooleanType, true);
+ registerOption(Browser_EnableMouseGesturesOption, BooleanType, true);
+ registerOption(Browser_EnableSingleKeyShortcutsOption, BooleanType, true);
diff --git a/www-client/otter/otter-9999.ebuild b/www-client/otter/otter-1.0.01-r1.ebuild
similarity index 69%
copy from www-client/otter/otter-9999.ebuild
copy to www-client/otter/otter-1.0.01-r1.ebuild
index dd20d3231ae..2efa58e6f14 100644
--- a/www-client/otter/otter-9999.ebuild
+++ b/www-client/otter/otter-1.0.01-r1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit cmake-utils desktop git-r3 xdg-utils
+inherit cmake desktop xdg-utils
DESCRIPTION="Project aiming to recreate classic Opera (12.x) UI using Qt5"
HOMEPAGE="https://otter-browser.org/"
-EGIT_REPO_URI="https://github.com/OtterBrowser/otter-browser"
+SRC_URI="https://github.com/OtterBrowser/${PN}-browser/archive/v${PV/_p/-dev}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE="spell"
DEPEND="
@@ -25,18 +25,23 @@ DEPEND="
dev-qt/qtscript:5
dev-qt/qtsql:5
dev-qt/qtsvg:5
- dev-qt/qtwebkit:5
dev-qt/qtwidgets:5
dev-qt/qtxmlpatterns:5
spell? ( kde-frameworks/sonnet )
+ >=dev-qt/qtwebengine-5.9:5[widgets]
"
RDEPEND="
${DEPEND}
"
DOCS=( CHANGELOG CONTRIBUTING.md TODO )
+S=${WORKDIR}/${PN}-browser-${PV/_p/-dev}
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.0.01-qtgui-5.15.0.patch
+ "${FILESDIR}"/${PN}-1.0.01-webengine.patch
+)
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
if [[ -n ${LINGUAS} ]]; then
local lingua
@@ -55,8 +60,17 @@ src_prepare() {
fi
}
+src_configure() {
+ mycmakeargs=(
+ -DENABLE_QTWEBENGINE=true
+ -DENABLE_QTWEBKIT=false
+ )
+
+ cmake_src_configure
+}
+
src_install() {
- cmake-utils_src_install
+ cmake_src_install
domenu ${PN}-browser.desktop
}
diff --git a/www-client/otter/otter-9999.ebuild b/www-client/otter/otter-9999.ebuild
index dd20d3231ae..7b5172796e7 100644
--- a/www-client/otter/otter-9999.ebuild
+++ b/www-client/otter/otter-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit cmake-utils desktop git-r3 xdg-utils
+inherit cmake desktop git-r3 xdg-utils
DESCRIPTION="Project aiming to recreate classic Opera (12.x) UI using Qt5"
HOMEPAGE="https://otter-browser.org/"
-EGIT_REPO_URI="https://github.com/OtterBrowser/otter-browser"
+EGIT_REPO_URI="https://github.com/OtterBrowser/${PN}-browser"
LICENSE="GPL-3"
SLOT="0"
@@ -25,18 +25,21 @@ DEPEND="
dev-qt/qtscript:5
dev-qt/qtsql:5
dev-qt/qtsvg:5
- dev-qt/qtwebkit:5
dev-qt/qtwidgets:5
dev-qt/qtxmlpatterns:5
spell? ( kde-frameworks/sonnet )
+ >=dev-qt/qtwebengine-5.9:5[widgets]
"
RDEPEND="
${DEPEND}
"
DOCS=( CHANGELOG CONTRIBUTING.md TODO )
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.0.01-webengine.patch
+)
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
if [[ -n ${LINGUAS} ]]; then
local lingua
@@ -55,8 +58,17 @@ src_prepare() {
fi
}
+src_configure() {
+ mycmakeargs=(
+ -DENABLE_QTWEBENGINE=true
+ -DENABLE_QTWEBKIT=false
+ )
+
+ cmake_src_configure
+}
+
src_install() {
- cmake-utils_src_install
+ cmake_src_install
domenu ${PN}-browser.desktop
}