From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- www-client/otter/Manifest | 5 +- .../otter/files/otter-1.0.01-qtgui-5.15.0.patch | 10 +++ .../otter/files/otter-1.0.01-webengine.patch | 11 +++ www-client/otter/otter-1.0.01-r1.ebuild | 85 ++++++++++++++++++++++ www-client/otter/otter-9999.ebuild | 24 ++++-- 5 files changed, 128 insertions(+), 7 deletions(-) create mode 100644 www-client/otter/files/otter-1.0.01-qtgui-5.15.0.patch create mode 100644 www-client/otter/files/otter-1.0.01-webengine.patch create mode 100644 www-client/otter/otter-1.0.01-r1.ebuild (limited to 'www-client/otter') diff --git a/www-client/otter/Manifest b/www-client/otter/Manifest index e660808d0afb..da729e66a5bd 100644 --- a/www-client/otter/Manifest +++ b/www-client/otter/Manifest @@ -1,4 +1,7 @@ +AUX otter-1.0.01-qtgui-5.15.0.patch 342 BLAKE2B f28197b1ccc6ed970594638228e1345cebdc50bb3db809fa0dfe8038b74f2e7ae89b3d7c2291e66089afc709bcc51d6cd6dc2f93dd902a893a2d0883358dd7a3 SHA512 6462158bd09f86867644a25a78579db7c7d6669b9c917f6c02fba817e3b69cf9e62038e8f0e6fab232af13b4f1a3649249ee6ba60601f9fcd28b004fa46c0f77 +AUX otter-1.0.01-webengine.patch 1062 BLAKE2B f3387e091afacf07c305e965c1d571658a49c924c484312cc89212d636fa3cfd8fde74477feab974def25ad93d2f01437d5c82896cac33ccddc879fdbaf41543 SHA512 cab5895aa92fa09415d4c60f75501a8e319dd24810319cc8ac50b872d153525b710ad32a9a5398a62fb9305653c21710b5dd181470938de339a547248bbb8bfb DIST otter-1.0.01.tar.gz 4866820 BLAKE2B 7e23654142f35e17b4c4a240c4f8b897826229bae7cd5dabebc352a438881ff912829325547ee2a4bc7ec0a2b7c20640cb5e26ba7babb35435e987ebd86d2e75 SHA512 594bbdcbbc3b5fea903cc0beb749cf76be402cb1c2766706750bdbd6aad84f3d9f48687e1b12945f30e40b3876b9fbf511f41915fd276473b259d7311e33f19d +EBUILD otter-1.0.01-r1.ebuild 1743 BLAKE2B febc145b4cd0a7839ceb21375750fb4ba6b7faf58101528ac02dc7e9a09bedb1762e5fce62093dcbbe6bf4b1c7139d8512a863d11995b3aee8d4d86f7d20f07b SHA512 30e09797cc1194a89bf165af51d2606b731477ee16d3b4fb37c421aa8b015801893853133453708d226d12c748789cd5390a29aaab9090451f681c948135ff31 EBUILD otter-1.0.01.ebuild 1796 BLAKE2B e8b3717ef5019739ff4d02b44873e63fe9a029357e195d3c564d10951d368aadc6aaf1a7d2b5123a0310ce3e4589d1e0649b2c298e530ca29f83e3430c468bc7 SHA512 e954204e02f322ffae48c79df169aea0d50928efeb6aaeaef43d24a2fea8d720a5577cd919f65f35b45cd5b2ec937822070b12ce198064df69f9ba91b2e836a0 -EBUILD otter-9999.ebuild 1434 BLAKE2B f58eaa95c7f6705fb5b00278569f1fe5242643f2c82e2efa22d1383f68fbb2de1387c9970ded8f195afe77417f4828be235e959d5a82f82fb5dc8ff9274146dc SHA512 632cc90d091fdebc593ad30d0e3250133d1077200543a8e87607640894e7aa5ff408585805f52ce8734a465293fcbdb446760fa22dd6dabe3f88bc110acafb71 +EBUILD otter-9999.ebuild 1605 BLAKE2B 8218d52a3e8c3a024b62637d98467ed7277e5a7af4433be86be91b15ff54d6766f6851e4f095abfe4bfd6a5ae61119b502a69d3e9184f0f466e9ab12304a5625 SHA512 8268abe9942fc4df8aec7abcd894b6eae6f26a341b8548abbab12883e5e563db53e9e6ee6bc4aae1e47e49c8e6998425a85a339306d4be48dd3477c28a423ba8 MISC metadata.xml 466 BLAKE2B 95a6b3f8c4a297c6a57f514173a99b2e6a6dda37cd90c0b9a3bb9069a272daad73dc7b9c3a054741331e813b625e14f1a395263409255ad12692f049f557d5ff SHA512 3c07f030c4ae6777cca5e122f32a6b2f5844a2dc5bba27a6ea17b36ae56ef43174deefe0460128a6e31d709857e5b915d340b8e6e50049e43c87bfcf58f95f22 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 000000000000..ec60a4b2c42b --- /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 + #include + #include ++#include + #include + #include + #include 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 000000000000..f8029d95f26e --- /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-1.0.01-r1.ebuild b/www-client/otter/otter-1.0.01-r1.ebuild new file mode 100644 index 000000000000..2efa58e6f140 --- /dev/null +++ b/www-client/otter/otter-1.0.01-r1.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit cmake desktop xdg-utils + +DESCRIPTION="Project aiming to recreate classic Opera (12.x) UI using Qt5" +HOMEPAGE="https://otter-browser.org/" +SRC_URI="https://github.com/OtterBrowser/${PN}-browser/archive/v${PV/_p/-dev}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" +IUSE="spell" + +DEPEND=" + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtprintsupport:5 + dev-qt/qtscript:5 + dev-qt/qtsql:5 + dev-qt/qtsvg: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_src_prepare + + if [[ -n ${LINGUAS} ]]; then + local lingua + for lingua in resources/translations/*.qm; do + lingua=$(basename ${lingua}) + lingua=${lingua/otter-browser_/} + lingua=${lingua/.qm/} + if ! has ${lingua} ${LINGUAS}; then + rm resources/translations/otter-browser_${lingua}.qm || die + fi + done + fi + + if ! use spell; then + sed -i -e '/find_package(KF5Sonnet)/d' CMakeLists.txt || die + fi +} + +src_configure() { + mycmakeargs=( + -DENABLE_QTWEBENGINE=true + -DENABLE_QTWEBKIT=false + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + domenu ${PN}-browser.desktop +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/www-client/otter/otter-9999.ebuild b/www-client/otter/otter-9999.ebuild index dd20d3231ae6..7b5172796e7e 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 } -- cgit v1.2.3