From 7fa8a1e3f149eea4c844c47cfe26136ed7614c58 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 15 Apr 2024 12:04:03 +0100 Subject: gentoo auto-resync : 15:04:2024 - 12:04:02 --- www-client/Manifest.gz | Bin 6044 -> 6038 bytes www-client/epiphany/Manifest | 4 +- www-client/epiphany/epiphany-44.6.ebuild | 7 +- www-client/epiphany/epiphany-45.3.ebuild | 5 - www-client/firefox/Manifest | 2 +- www-client/firefox/firefox-115.9.1.ebuild | 8 +- www-client/qutebrowser/Manifest | 4 +- www-client/qutebrowser/qutebrowser-3.1.0-r1.ebuild | 217 ++++++++ www-client/qutebrowser/qutebrowser-3.1.0.ebuild | 217 -------- www-client/qutebrowser/qutebrowser-9999.ebuild | 5 +- www-client/seamonkey/Manifest | 3 + www-client/seamonkey/seamonkey-2.53.18.2.ebuild | 568 +++++++++++++++++++++ 12 files changed, 805 insertions(+), 235 deletions(-) create mode 100644 www-client/qutebrowser/qutebrowser-3.1.0-r1.ebuild delete mode 100644 www-client/qutebrowser/qutebrowser-3.1.0.ebuild create mode 100644 www-client/seamonkey/seamonkey-2.53.18.2.ebuild (limited to 'www-client') diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz index d1c6c15e57a2..7d84a17603e7 100644 Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest index 1a6a420b535c..71239b0c265c 100644 --- a/www-client/epiphany/Manifest +++ b/www-client/epiphany/Manifest @@ -1,5 +1,5 @@ DIST epiphany-44.6.tar.xz 3994776 BLAKE2B e73fc66d7138961b61085538daf15c0d93a13827a9fcef62f111ddee87541a0fb61a9fb8fba7814c613da8179c895ddedcc22e2838885aa9222c327609968dfb SHA512 9af157db0f7a68d64fec9fd17465ee8cc900879a3613c3f3e03ea27938a84c0dda6be30b4d1d2cc0f9ddba5cf5d41de3d3156b0580fdce03b1d8f920bb96536c DIST epiphany-45.3.tar.xz 4005168 BLAKE2B 9f8965d310efcfa21e133a24a29ce97ffff94e0b202be599bb83085095c77f93f81e6ef248d9b844e0790d35712471c2f27dd31fc808d6244b59251df26ae468 SHA512 4fac6b21dc40f77312e7c9367cb4d0e4ef292d1a30c3759405543fc372b044f9de98523854a0da7a4024a1429ce35b5513160a2977fb361d71a7a86d94dbf596 -EBUILD epiphany-44.6.ebuild 1924 BLAKE2B c1e93221bc5c8679fdca26712c939b5accc74a62cf5b644063f4456d90ed8b31082bb379225b811378dd1a15fd762a68c85bf191afd7db5da4b7a92ad96fed23 SHA512 23c5430b788b01c53df6e3b6a0d65f609af134aee981bf64081680842d793ff308a25dbe3e46feee2e917dd9dee8bb503d15fb9f480a93fa9314c5e074f7f243 -EBUILD epiphany-45.3.ebuild 1927 BLAKE2B 20d54389db3c6fe74337b8ac0c99a2e6e25e0611650ea2f345ceaeeb9fb5fd1398202cdbd20d16e53bd620a29d059e5512703eb349855af28eb116a012b184ef SHA512 cbc866c93cc44784c96eea326dab024a16d1632fc23da48d75eeb92f0be86a55c121997359c1b4983a4e58a82507d24389e4d9946bcb3683aa68bd8bfc5f8cf1 +EBUILD epiphany-44.6.ebuild 1741 BLAKE2B 6edd7d4bfdf34503ef1691d0f75b373ec2a6c83d60c1dc4b967b60717d2962dcd7870fd7b222d0e312e4d6273d11f67c6376d33ca17e5b5507c0ebce11c011a3 SHA512 84a12388cabb1a4c8098c02935dab00947b68365251504d24751d5fcbcebbe352ef2f8a66b98f2ca2cd8b6ee49d6bd2ea5f69c6e6db60ef48bedd24efb1036d3 +EBUILD epiphany-45.3.ebuild 1744 BLAKE2B 8400ac7789deb5e43c9d164ace17d342487316a48bc13e1b3deac1e9460dfd22dad54fd475a5e026eefe5b7bcb16df83384ae261cc11d7df364c85ccf6f9eaa3 SHA512 3dbeb59d7016e721842e34b008b818e06b3122b291e5214ec94e5b8b7350357c263094ad6cee92af3aee3a88b490c3203b96e9a80f7fda967d531a19e634686f MISC metadata.xml 349 BLAKE2B 3d863d6eb39cc99c7587d53af80d4df96f5c1bb534e406ee904d3b39f947c24e1153707581473e1477d984cd7be541925b4ff002d546f5d50f1115d1ad639362 SHA512 10d54acb787b2d9dab84b43fcc0e578d7afcae36142bef5028ac3838bfce6ae63348a4e05ee97eaa2f7d90204457990c9cf604c8df0dd714d62b907bf4da3019 diff --git a/www-client/epiphany/epiphany-44.6.ebuild b/www-client/epiphany/epiphany-44.6.ebuild index f7647709f9ef..efc43b73e33e 100644 --- a/www-client/epiphany/epiphany-44.6.ebuild +++ b/www-client/epiphany/epiphany-44.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -74,11 +74,6 @@ src_test() { pkg_postinst() { xdg_pkg_postinst gnome2_schemas_update - - if ! has_version net-libs/webkit-gtk:6[jpeg2k]; then - ewarn "Your net-libs/webkit-gtk:6 is built without USE=jpeg2k." - ewarn "Various image galleries/managers may be broken." - fi } pkg_postrm() { diff --git a/www-client/epiphany/epiphany-45.3.ebuild b/www-client/epiphany/epiphany-45.3.ebuild index db78c1770324..98647618d095 100644 --- a/www-client/epiphany/epiphany-45.3.ebuild +++ b/www-client/epiphany/epiphany-45.3.ebuild @@ -74,11 +74,6 @@ src_test() { pkg_postinst() { xdg_pkg_postinst gnome2_schemas_update - - if ! has_version net-libs/webkit-gtk:6[jpeg2k]; then - ewarn "Your net-libs/webkit-gtk:6 is built without USE=jpeg2k." - ewarn "Various image galleries/managers may be broken." - fi } pkg_postrm() { diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest index 0420d92ca06e..28223ba4d2ac 100644 --- a/www-client/firefox/Manifest +++ b/www-client/firefox/Manifest @@ -513,7 +513,7 @@ DIST firefox-124.0.2-zh-CN.xpi 640173 BLAKE2B 981d6819da6600b28fd3fb10b7adc6fbd1 DIST firefox-124.0.2-zh-TW.xpi 642118 BLAKE2B 56be8d7c6c780688b0160ec0bbab7258ee9d88b1087a0faf95b40f11dfd18acbf676eedecef7a9c45a5fe82d09f5f9a815ca69aab4a44fcbcadb81bb6909671e SHA512 5bc8540068fcdec6728d743f123db6a4d7936b63b1dbf1a669d1dc7745b9e9ba1512860408acb3adebb987cfbcda0ea8c23eb998bc3e056dee5799092a0a8fe5 DIST firefox-124.0.2.source.tar.xz 555223648 BLAKE2B eaa35c3967514cb9f9ca48e32414bdecead3147a3d5ba8e9648be32f04b5d9e209ce71e02029851e1654c66d5cefd9a7b1a2a0fa68558a856c2ae3b1112d04d6 SHA512 8cf340de6e34812f8ae3363265859a263330af770d981c3dd1ca1e7e0cfe513604d3e68184d4aa1446569aefbdf359d561fbc200faf19a5ed020a1709d9ef10e EBUILD firefox-115.9.0.ebuild 40131 BLAKE2B 075005b8f056a3220b0e25860e87698e377388471f90e156dff30fa0c554d48317ec5b0784f9058cf8e6e109ad290eea7db4bc2ee0df63d6b0d17a493f6fa7b1 SHA512 cda2b831f8738e2fc67894ac22e913cbda202d1e72f204655fcd7169b12cb1a7aa7c10a1b24ca61328ea4bdf0427a8b76a497d1be3d3fee77539caf4e2b573a3 -EBUILD firefox-115.9.1.ebuild 39878 BLAKE2B 1c8242b63ac72dfce4a84263ba4c359101058b6c3acbe43e57635e310efc3cb16542c1cdb68442de919f20a530ae31d486682dafd4988f5d76c53fd4dd3a6a64 SHA512 df531c94778f63d8a65d52713a97cbafc042d85bd3218e1c4fd3b20ec79f6ae12bb58e863b8a2756f87023b9d533acba399368e666a67316cc699b437b53f534 +EBUILD firefox-115.9.1.ebuild 39990 BLAKE2B b6b31a6e12d1bccb7daa3bd5f7ecf97b83fa0b3f773b44a2250fb82af90bebb4258458970da7c09499a6a904fd50daf6ca58257b6b37e53baf4f6c97fba19641 SHA512 243d25d96dd8885134c4a1dbcd2889c6e34ea7b26c1e7a5549d0904885075edd5773ec75ef7604c6e165ce2f3869e4207596903fc7b1a00fd251fd55353b591e EBUILD firefox-122.0.1.ebuild 43363 BLAKE2B d215e52ef1a0c12c36c1956ce551ffb80fef00c8dadc60b0a8d4e08f22308fc4216a0c02abf81490b9ee54abdc9a8c2edbdab4939df9282608a427d19cae9423 SHA512 0195715e17e34da674ef69785af0261ef4a229f55679b088cbdfff25e89cebe5f965a3f42ad48226c9eb47ab3951c88969e256a26f6639ba3d74d42ed7b21fe7 EBUILD firefox-124.0.1.ebuild 42533 BLAKE2B d0463da13e3e8f3c38ca8890186352e69e18ab39bc2143bb6fc4fabbe17af777ee14624f5c4b9a11449cdba7062f2331cf82a11ab26a34cd9d1bf4b376e98244 SHA512 9de09b56d40257d7c9aabc5806a61235ba66b5701ed7c329d5e0cd0544d9e64f85ccdc2923b7f51996e489e42cf4064c3b3675fd4918f1c9d0d1e0cd6a013833 EBUILD firefox-124.0.2.ebuild 42502 BLAKE2B ca5f240f42aef91eecf304094e207a34cd9db86eb86eb8388c3511e8d7e9ee84feb8f3c4082ac590f5bf93da3487b8a0b5fccc97b8e66d55a351e508566fac32 SHA512 4d65170821d54af501d76f6012c5f1f338b4e9f958a9419a08398e4d3fcf534484854c63b5c2375db06d8c0f135450c5e7ced2b3d6839518162cf35ce97346b5 diff --git a/www-client/firefox/firefox-115.9.1.ebuild b/www-client/firefox/firefox-115.9.1.ebuild index 2216b95968a4..c433643b1f37 100644 --- a/www-client/firefox/firefox-115.9.1.ebuild +++ b/www-client/firefox/firefox-115.9.1.ebuild @@ -1061,7 +1061,13 @@ src_configure() { # With Firefox-115esr elf-hack=relr isn't available (only in rapid). # Solution: Disable build system's elf-hack completely, and add "-z,pack-relative-relocs" # manually with gcc. - mozconfig_add_options_ac 'elf-hack disabled' --disable-elf-hack + # + # elf-hack configure option isn't available on ppc64, #916259, #929244. + if use ppc64; then + :; + else + mozconfig_add_options_ac 'elf-hack disabled' --disable-elf-hack + fi if use amd64 || use x86 ; then ! use clang && append-ldflags "-z,pack-relative-relocs" diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest index b6a3f6c6c388..4a3dd8be6828 100644 --- a/www-client/qutebrowser/Manifest +++ b/www-client/qutebrowser/Manifest @@ -1,6 +1,6 @@ AUX qutebrowser-3.1.0-qt663-tests.patch 622 BLAKE2B 6829a8c915f21d5cd28a2b867ad64f188837e915d64ddc3446421bc7a3b23657fee1ccd1758d242e9264eda0dc068f8e0473269c1e02c74adced530acf613a6c SHA512 8dc10dbb95e859861c06e57802e52dce634364d80b521aa398597161442388cef3f01b0fbeb96157f8189ce3b669132f4ef3e1dad23cd35c6abd72865e018e40 DIST qutebrowser-3.1.0.tar.gz 6045747 BLAKE2B d0cca696dd85bb99b8514331a392e1cb54fcbeff32fcf13e058739ef5a20ef1725980fbabef187a226f1cc29be9943784ba1f93275047586827922c3e98d0a64 SHA512 79dff3cf4ff93c75150e5cb9ada835ed5faf0343f03854266c6138fb8e6cceb921c868e1e408432da61b85ebe37e7e1657f634771ff73f1395d1b6e169138d98 DIST qutebrowser-3.1.0.tar.gz.asc 659 BLAKE2B 023916e83cf2ac084f013ad750acf1ddb02a146197e92f703a96c54bceafcabf9d09a398c43e1679d0e425d54f13726c576c1b2e13707888e097952abef9797b SHA512 f89369b0c61852c0ee22a476fcce0c8fc236920a2c6fbcfb945e010275650bdd133b6714ec2b64c1156789eb3f6f897cbf9a31441e913afcf9f19ea3113611f7 -EBUILD qutebrowser-3.1.0.ebuild 7169 BLAKE2B 9a7fa3bc0ef916c082dbe055ad8b3d335998b4a7edecb047eb90d45728222054c3a647f6b4211a0ea055b48bdc71f34f8e2811785ca93491416966225dbb0bd7 SHA512 9e100d9eef285a2edf3bd4fee87f0fc6e7d26955b40d3eadf1c08c2d01f956a5f7b2399608ae3d994460595b88c10df2ab1cc3b2989386a8ee7df845666512d5 -EBUILD qutebrowser-9999.ebuild 5314 BLAKE2B 6b586f4821f8618ad8541bb95f7a988bcf9e58d1e8eb9958677934de842368324415064a37d14210f303afa422d134a1e447daf769a4a884a5d1be09bcd80743 SHA512 a2d623b24f7b8d631f6e30192ec384caf831a7565d398b951ca3de366997c35d3c4b2c8d46db6ea011017179d56a27f128d3187b5b1a35f2c33a28471b4d75ed +EBUILD qutebrowser-3.1.0-r1.ebuild 7174 BLAKE2B a540a43d7c76adbb07b9d7b798fbd194f1c0c9c4edfbde248c2ac577d485adb2b1cf4758436c8b181936741ac67b4134de86659bdb4ce0df3f5d751d0ef3ce78 SHA512 add55d37d96f5b22091cf48bc0fc9588b64fc0787f923f125711c8ff562dca2bb1168e175cefce3bbbb9a4b9f5bc9269c2aaa7186ef84c981d202030aeaeb2d6 +EBUILD qutebrowser-9999.ebuild 5519 BLAKE2B 5f8e8c44ac7ea3a6dd6c94f55dd228cba91705e9ad95eb25f28eee9e3eeddacf55b79f9531a836ab21ba0da6273dae549528adb3e7236a9a16f809dfad3ba6e3 SHA512 6f1c073f264c243f43d55ef971e243c9043626ec7c62c5f003d0d8147b7a50c85112cc999ec141bb93662f8ac77ed359546249fc29f575ed3e3c6f22ca2224e7 MISC metadata.xml 1018 BLAKE2B 9d0c406995b2036671113b6513c3ed2fdb5021eae9d1dde5c186efeccdde6dae127857e3e5898f7809edcc27eca4b47f37965155ac0ff21bedb78e242421fd54 SHA512 2af79f18d31f9efe8df852f4bca132caf1d79fc06f6388959deb367470d4975af541a75c70831b549d944112bcd0bc7e11510a81bce4ef1391fbf1354425b769 diff --git a/www-client/qutebrowser/qutebrowser-3.1.0-r1.ebuild b/www-client/qutebrowser/qutebrowser-3.1.0-r1.ebuild new file mode 100644 index 000000000000..f40f5009dff3 --- /dev/null +++ b/www-client/qutebrowser/qutebrowser-3.1.0-r1.ebuild @@ -0,0 +1,217 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) +inherit distutils-r1 xdg + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git" +else + inherit verify-sig + SRC_URI=" + https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz + verify-sig? ( https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz.asc ) + " + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qutebrowser.gpg + KEYWORDS="amd64 ~arm64" +fi + +DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt" +HOMEPAGE="https://qutebrowser.org/" + +LICENSE="GPL-3+" +SLOT="0" +IUSE="+adblock pdf +qt6 widevine" + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/colorama[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/markupsafe[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/zipp[${PYTHON_USEDEP}] + adblock? ( dev-python/adblock[${PYTHON_USEDEP}] ) + qt6? ( + dev-qt/qtbase:6[icu,sqlite] + dev-python/PyQt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets] + dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets] + pdf? ( 124 in /var/tmp/portage) due to Linux limitations, + # skip rather than bother using /tmp+cleanup over ${T} (end2end tests + # are important, but the other tests should be enough for downstream) + tests/end2end + tests/unit/misc/test_ipc.py + # python eclasses provide a fake "failing" python2 and trips this test + tests/unit/misc/test_checkpyver.py::test_old_python + # not worth running dbus over + tests/unit/browser/test_notification.py::TestDBus + # fails in ebuild, seems due to saving fake downloads in the wrong location + tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround + # may fail if environment is very large (bug #819393) + tests/unit/commands/test_userscripts.py::test_custom_env\[_POSIXUserscriptRunner\] + # needs _WRAPPER_OVERRIDE = None, but we have changed it + tests/unit/test_qt_machinery.py::TestSelectWrapper::test_autoselect_by_default + tests/unit/test_qt_machinery.py::TestInit::test_none_available_{implicit,explicit} + # fails if chromium version is unrecognized (aka newer qtwebengine) + tests/unit/utils/test_version.py::TestWebEngineVersions::test_real_chromium_version + ) + + # tests known failing with Qt5 which is considered a 2nd class citizen + # and, unless completely broken, new tests issues may not be pursued + use qt6 || EPYTEST_DESELECT+=( + tests/unit/mainwindow/test_tabwidget.py::TestTabWidget::test_tab_text_not_edlided_for_wide_tabs + ) + + local epytestargs=( + # prefer pytest-xvfb over virtx given same upstream and is expected + -p xvfb + # skip warning tests broken by -Wdefault, and benchmarks + -k 'not _bench and not _matches_tree and not _warning' + # override eclass' settings, tempdirs are re-used by Qt + -o tmp_path_retention_policy=all + ) + + epytest "${epytestargs[@]}" +} + +python_install_all() { + emake -f misc/Makefile DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install + + rm "${ED}"/usr/share/${PN}/scripts/{mkvenv,utils}.py || die + fperms -x /usr/share/${PN}/{scripts/cycle-inputs.js,userscripts/README.md} + python_fix_shebang "${ED}"/usr/share/${PN} + + einstalldocs +} + +pkg_preinst() { + xdg_pkg_preinst + + has_version "${CATEGORY}/${PN}[qt6]" && QUTEBROWSER_HAD_QT6= +} + +pkg_postinst() { + xdg_pkg_postinst + + if [[ ! ${REPLACING_VERSIONS} ]]; then + elog "Note that optional scripts in ${EROOT}/usr/share/${PN}/{user,}scripts" + elog "have additional dependencies not covered by this ebuild, for example" + elog "view_in_mpv needs media-video/mpv[lua] and net-misc/yt-dlp." + fi + + if [[ ! -v QUTEBROWSER_HAD_QT6 && ${REPLACING_VERSIONS} ]] && use qt6; then + ewarn + ewarn "Be warned that starting the Qt6 version of ${PN} performs a one-way" + ewarn "conversion of ~/.local/share/${PN}/webengine to Qt6. There will also" + ewarn "be a warning on startup, and may optionally want to backup first." + fi + + if use !qt6; then + ewarn + ewarn "USE=qt6 is disabled, be warned that Qt5's WebEngine uses an older" + ewarn "chromium version. While it is relatively maintained for security, it will" + ewarn "cause issues for sites/features designed with a newer version in mind." + fi + + if { use qt6 && has_version 'dev-qt/qtwebengine:6[bindist]'; } || + { use !qt6 && has_version 'dev-qt/qtwebengine:5[bindist]'; } + then + ewarn + ewarn "USE=bindist is set on dev-qt/qtwebengine, be warned that this" + ewarn "will prevent playback of proprietary media formats (e.g. h264)." + fi +} diff --git a/www-client/qutebrowser/qutebrowser-3.1.0.ebuild b/www-client/qutebrowser/qutebrowser-3.1.0.ebuild deleted file mode 100644 index a8f02d769926..000000000000 --- a/www-client/qutebrowser/qutebrowser-3.1.0.ebuild +++ /dev/null @@ -1,217 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} ) -inherit distutils-r1 xdg - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git" -else - inherit verify-sig - SRC_URI=" - https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz - verify-sig? ( https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz.asc ) - " - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qutebrowser.gpg - KEYWORDS="amd64 ~arm64" -fi - -DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt" -HOMEPAGE="https://qutebrowser.org/" - -LICENSE="GPL-3+" -SLOT="0" -IUSE="+adblock pdf +qt6 widevine" - -RDEPEND=" - $(python_gen_cond_dep ' - dev-python/colorama[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/markupsafe[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/zipp[${PYTHON_USEDEP}] - adblock? ( dev-python/adblock[${PYTHON_USEDEP}] ) - qt6? ( - dev-qt/qtbase:6[icu,sqlite] - dev-python/PyQt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets] - dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets] - pdf? ( www-plugins/pdfjs ) - ) - !qt6? ( - dev-qt/qtcore:5[icu] - dev-qt/qtgui:5[png] - dev-qt/qtsql:5[sqlite] - dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,gui,network,opengl,printsupport,sql,widgets] - dev-python/PyQtWebEngine[${PYTHON_USEDEP}] - pdf? ( 124 in /var/tmp/portage) due to Linux limitations, - # skip rather than bother using /tmp+cleanup over ${T} (end2end tests - # are important, but the other tests should be enough for downstream) - tests/end2end - tests/unit/misc/test_ipc.py - # python eclasses provide a fake "failing" python2 and trips this test - tests/unit/misc/test_checkpyver.py::test_old_python - # not worth running dbus over - tests/unit/browser/test_notification.py::TestDBus - # fails in ebuild, seems due to saving fake downloads in the wrong location - tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround - # may fail if environment is very large (bug #819393) - tests/unit/commands/test_userscripts.py::test_custom_env\[_POSIXUserscriptRunner\] - # needs _WRAPPER_OVERRIDE = None, but we have changed it - tests/unit/test_qt_machinery.py::TestSelectWrapper::test_autoselect_by_default - tests/unit/test_qt_machinery.py::TestInit::test_none_available_{implicit,explicit} - # fails if chromium version is unrecognized (aka newer qtwebengine) - tests/unit/utils/test_version.py::TestWebEngineVersions::test_real_chromium_version - ) - - # tests known failing with Qt5 which is considered a 2nd class citizen - # and, unless completely broken, new tests issues may not be pursued - use qt6 || EPYTEST_DESELECT+=( - tests/unit/mainwindow/test_tabwidget.py::TestTabWidget::test_tab_text_not_edlided_for_wide_tabs - ) - - local epytestargs=( - # prefer pytest-xvfb over virtx given same upstream and is expected - -p xvfb - # skip warning tests broken by -Wdefault, and benchmarks - -k 'not _bench and not _matches_tree and not _warning' - # override eclass' settings, tempdirs are re-used by Qt - -o tmp_path_retention_policy=all - ) - - epytest "${epytestargs[@]}" -} - -python_install_all() { - emake -f misc/Makefile DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install - - rm "${ED}"/usr/share/${PN}/scripts/{mkvenv,utils}.py || die - fperms -x /usr/share/${PN}/{scripts/cycle-inputs.js,userscripts/README.md} - python_fix_shebang "${ED}"/usr/share/${PN} - - einstalldocs -} - -pkg_preinst() { - xdg_pkg_preinst - - has_version "${CATEGORY}/${PN}[qt6]" && QUTEBROWSER_HAD_QT6= -} - -pkg_postinst() { - xdg_pkg_postinst - - if [[ ! ${REPLACING_VERSIONS} ]]; then - elog "Note that optional scripts in ${EROOT}/usr/share/${PN}/{user,}scripts" - elog "have additional dependencies not covered by this ebuild, for example" - elog "view_in_mpv needs media-video/mpv[lua] and net-misc/yt-dlp." - fi - - if [[ ! -v QUTEBROWSER_HAD_QT6 && ${REPLACING_VERSIONS} ]] && use qt6; then - ewarn - ewarn "Be warned that starting the Qt6 version of ${PN} performs a one-way" - ewarn "conversion of ~/.local/share/${PN}/webengine to Qt6. There will also" - ewarn "be a warning on startup, and may optionally want to backup first." - fi - - if use !qt6; then - ewarn - ewarn "USE=qt6 is disabled, be warned that Qt5's WebEngine uses an older" - ewarn "chromium version. While it is relatively maintained for security, it will" - ewarn "cause issues for sites/features designed with a newer version in mind." - fi - - if { use qt6 && has_version 'dev-qt/qtwebengine:6[bindist]'; } || - { use !qt6 && has_version 'dev-qt/qtwebengine:5[bindist]'; } - then - ewarn - ewarn "USE=bindist is set on dev-qt/qtwebengine, be warned that this" - ewarn "will prevent playback of proprietary media formats (e.g. h264)." - fi -} diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild index 63c251546529..c5e8c1d91fae 100644 --- a/www-client/qutebrowser/qutebrowser-9999.ebuild +++ b/www-client/qutebrowser/qutebrowser-9999.ebuild @@ -28,6 +28,9 @@ LICENSE="GPL-3+" SLOT="0" IUSE="+adblock pdf widevine" +# TODO: keep an eye on fixes for pdfjs-4.1, may potentially be solved by +# newer qtwebengine, qutebrowser upstream workarounds, pdfjs changes, or +# if our pdfjs ebuild ever switch to the legacy sdist RDEPEND=" $(python_gen_cond_dep ' dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets] @@ -40,7 +43,7 @@ RDEPEND=" dev-python/zipp[${PYTHON_USEDEP}] dev-qt/qtbase:6[icu,sqlite] adblock? ( dev-python/adblock[${PYTHON_USEDEP}] ) - pdf? ( www-plugins/pdfjs ) + pdf? ( &2 + return 1 + fi + + einfo "Using LLVM slot ${LLVM_SLOT} to build." >&2 +} + +pkg_setup() { + if [[ ${PV} == *_beta* ]] || [[ ${PV} == *_pre* ]] ; then + ewarn + ewarn "You're using an unofficial release of ${PN}. Don't file any bug in" + ewarn "Gentoo's Bugtracker against this package in case it breaks for you." + ewarn "Those belong to upstream: https://bugzilla.mozilla.org" + fi + + llvm_pkg_setup + + moz_pkgsetup +} + +pkg_pretend() { + # Ensure we have enough disk space to compile + if use lto || use test ; then + CHECKREQS_DISK_BUILD="16G" + else + CHECKREQS_DISK_BUILD="12G" + fi + check-reqs_pkg_setup +} + +spkg_setup() { + # Ensure we have enough disk space to compile + if use lto || use test ; then + CHECKREQS_DISK_BUILD="16G" + else + CHECKREQS_DISK_BUILD="12G" + fi + check-reqs_pkg_setup +} + +src_unpack() { + local l10n_sources="${P}.source-l10n.tar.xz" + unpack ${A/ ${l10n_sources}} + + mkdir "${S}/${P}-l10n" || die + cd "${S}/${P}-l10n" || die + unpack ${l10n_sources} +} + +src_prepare() { + # Apply our patches + eapply "${PATCH_S}/${PN}" + + # Shell scripts sometimes contain DOS line endings; bug 391889 + grep -rlZ --include="*.sh" $'\r$' . | + while read -r -d $'\0' file ; do + einfo edos2unix "${file}" + edos2unix "${file}" + done + + if use system-libvpx ; then + eapply -p2 "${PATCH_S}/USE_flag/1009_seamonkey-2.53.3-system_libvpx-1.8.patch" + fi + + # Fix for building on x86 https://bugs.gentoo.org/915336 (x86-only) + if use x86 ; then + eapply -p1 "${PATCH_S}/USE_flag/2021_seamonkey_2.53.17-floating-point_normalization_on_x86_build_fix.patch" + fi + + # Patch for people who use their systems ICU 74 + if has_version ">=dev-libs/icu-74.1" && use system-icu ; then + eapply -p1 "${PATCH_S}/USE_flag/2022-bmo-1862601-system-icu-74.patch" + fi + + # Allow user to apply any additional patches without modifing ebuild + eapply_user + + # Fix wrong include, as suggested by SM upstream. + sed -e 's|#include \"RemoteSpellCheckEngineChild.h\"|#include \"mozilla/RemoteSpellCheckEngineChild.h\"|' \ + -i extensions/spellcheck/src/mozSpellChecker.h || die + + # Ensure that are plugins dir is enabled as default + sed -i -e "s:/usr/$(get_libdir)/mozilla/plugins:/usr/$(get_libdir)/${PN}/plugins:" \ + xpcom/io/nsAppFileLocationProvider.cpp || die + + # Don't exit with error when some libs are missing which we have in + # system. + sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \ + -i comm/suite/installer/Makefile.in || die + # Don't error out when there's no files to be removed: + sed 's@\(xargs rm\)$@\1 -f@' \ + -i toolkit/mozapps/installer/packager.mk || die + + # Don't build libs-% locale files for chatzilla if we are not building chatzilla + # (this is hard-coded in the build system at present rather than being based on configuration) + if ! use chatzilla ; then + sed '/extensions\/irc\/locales libs-/s@^@#@' \ + -i comm/suite/locales/Makefile.in || die + fi + + eautoreconf old-configure.in + cd js/src || die + eautoconf old-configure.in +} + +src_configure() { + # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) + # Note: These are for Gentoo Linux use ONLY. For your own distribution, please + # get your own set of keys. + _google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc + + ###################################### + # + # mozconfig, CFLAGS and CXXFLAGS setup + # + ###################################### + + mozconfig_init + + ################################## + # Former mozconfig_config() part # + ################################## + + # Migrated from mozcoreconf-2 + mozconfig_annotate 'system_libs' --with-system-bz2 + mozconfig_annotate 'system_libs' --with-system-zlib + mozconfig_annotate 'system_libs' --enable-system-pixman + + # Disable for testing purposes only + mozconfig_annotate 'Upstream bug 1341234' --disable-stylo + + # Must pass release in order to properly select linker via gold useflag + mozconfig_annotate 'Enable by Gentoo' --enable-release + + # Broken on PPC64, but outdated and should not be used according to upstream. + mozconfig_annotate 'Outdated and broken, disabled' --disable-jemalloc + + # Must pass --enable-gold if using ld.gold + if tc-ld-is-gold ; then + mozconfig_annotate 'tc-ld-is-gold=true' --enable-gold + else + mozconfig_annotate 'tc-ld-is-gold=false' --disable-gold + fi + + # Debug is broken, disable debug symbols + mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols + + mozconfig_use_enable startup-notification + + # wifi pulls in dbus so manage both here + mozconfig_use_enable wifi necko-wifi + if use kernel_linux && use wifi && ! use dbus ; then + echo "Enabling dbus support due to wifi request" + mozconfig_annotate 'dbus required by necko-wifi on linux' --enable-dbus + else + mozconfig_use_enable dbus + mozconfig_annotate 'disabled' --disable-necko-wifi + fi + + # These are enabled by default in all mozilla applications + mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${ESYSROOT}"/usr + mozconfig_annotate '' --with-system-nss --with-nss-prefix="${ESYSROOT}"/usr + mozconfig_annotate '' --x-includes="${ESYSROOT}"/usr/include --x-libraries="${ESYSROOT}"/usr/$(get_libdir) + if use system-libevent ; then + mozconfig_annotate '' --with-system-libevent="${ESYSROOT}"/usr + fi + mozconfig_annotate '' --prefix="${EPREFIX}"/usr + mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir) + mozconfig_annotate '' --disable-crashreporter + mozconfig_annotate '' --enable-system-ffi + mozconfig_annotate '' --disable-gconf + mozconfig_annotate '' --with-intl-api + + # default toolkit is cairo-gtk3, optional use flags can change this + mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3 + + # Instead of the standard --build= and --host=, mozilla uses --host instead + # of --build, and --target intstead of --host. + # Note, mozilla also has --build but it does not do what you think it does. + # Set both --target and --host as mozilla uses python to guess values otherwise + mozconfig_annotate '' --target="${CHOST}" + mozconfig_annotate '' --host="${CBUILD:-${CHOST}}" + + mozconfig_use_enable pulseaudio + # force the deprecated alsa sound code if pulseaudio is disabled + if use kernel_linux && ! use pulseaudio ; then + mozconfig_annotate '-pulseaudio' --enable-alsa + fi + + # For testing purpose only + mozconfig_annotate 'Sandbox' --enable-content-sandbox + + mozconfig_use_enable system-sqlite + mozconfig_use_with system-jpeg + mozconfig_use_with system-icu + mozconfig_use_with system-libvpx + mozconfig_use_with system-png + mozconfig_use_with system-harfbuzz + mozconfig_use_with system-harfbuzz system-graphite2 + mozconfig_use_with system-av1 + + # Modifications to better support ARM, bug 553364 + if use cpu_flags_arm_neon ; then + mozconfig_annotate '' --with-fpu=neon + mozconfig_annotate '' --with-thumb=yes + mozconfig_annotate '' --with-thumb-interwork=no + fi + if [[ ${CHOST} == armv* ]] ; then + mozconfig_annotate '' --with-float-abi=hard + if ! use system-libvpx ; then + sed -i -e "s|softfp|hard|" media/libvpx/moz.build || die + fi + fi + + if use lto ; then + # Linking only works when using ld.gold when LTO is enabled + mozconfig_annotate "forcing ld=gold due to USE=lto" --enable-linker=gold + # ThinLTO is currently broken, see bmo#1644409 + mozconfig_annotate '+lto' --enable-lto=full + else + if tc-ld-is-gold ; then + mozconfig_annotate "linker is set to gold" --enable-linker=gold + else + mozconfig_annotate "linker is set to bfd" --enable-linker=bfd + fi + fi + # LTO flag was handled via configure + filter-lto + + ################################## + # Former mozconfig_config() end # + ################################## + + # enable JACK, bug 600002 + mozconfig_use_enable jack + + # It doesn't compile on alpha without this LDFLAGS + use alpha && append-ldflags "-Wl,--no-relax" + + # Linking fails without this due to memory exhaustion + use x86 && append-ldflags "-Wl,--no-keep-memory" + + # Setup api key for location services + printf '%s' "${_google_api_key}" > "${S}"/google-api-key + mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key" + mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key" + + mozconfig_use_enable chatzilla irc + mozconfig_annotate '' --enable-dominspector + + # use startup-cache for faster startup time + mozconfig_annotate '' --enable-startupcache + + # Elf-hack is known to be broken on multiple archs. + # Disable it by default, because on the archs that still work, + # it also gives more problems than it solves. + # https://bugs.gentoo.org/851933 + # https://bugzilla.mozilla.org/show_bug.cgi?id=1706264 + if use x86 || use arm64 || use arm || use amd64 ; then + mozconfig_annotate 'elf-hack is broken' --disable-elf-hack + fi + + # Disabled by default. See bug 836319 , comment 17. + if ! use webrtc ; then + mozconfig_annotate "disabled by Gentoo" --disable-webrtc + fi + + # Use an objdir to keep things organized. + echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig || die + echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig || die + + mozlinguas_mozconfig + + # Finalize and report settings + mozconfig_final + + # Work around breakage in makeopts with --no-print-directory + MAKEOPTS="${MAKEOPTS/--no-print-directory/}" + + if use amd64 || use x86 ; then + append-flags -mno-avx + fi + + # Pass $MAKEOPTS to build system + export MOZ_MAKE_FLAGS="${MAKEOPTS}" + # Use system's Python environment + export MACH_USE_SYSTEM_PYTHON=1 + # Disable notification when build system has finished + export MOZ_NOSPAM=1 + + # workaround for funky/broken upstream configure... + export SHELL="${SHELL:-${EPREFIX}/bin/bash}" + #emake V=1 -f client.mk configure + ./mach configure || die +} + +src_compile() { + #MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \ + #emake V=1 -f client.mk + ./mach build --verbose || die + + mozlinguas_src_compile +} + +src_install() { + MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" + DICTPATH="\"${EPREFIX}/usr/share/myspell\"" + + local emid + pushd "${BUILD_OBJ_DIR}" &>/dev/null || die + + # Pax mark xpcshell for hardened support, only used for startupcache creation. + pax-mark m dist/bin/xpcshell + + # Copy our preference before omnijar is created. + sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \ + dist/bin/defaults/pref/all-gentoo.js \ + || die + + # Set default path to search for dictionaries. + echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \ + >> dist/bin/defaults/pref/all-gentoo.js \ + || die + + echo 'pref("extensions.autoDisableScopes", 3);' >> \ + dist/bin/defaults/pref/all-gentoo.js \ + || die + + local plugin + if ! use gmp-autoupdate ; then + for plugin in "${GMP_PLUGIN_LIST[@]}" ; do + echo "pref(\"media.${plugin}.autoupdate\", false);" >> \ + dist/bin/defaults/pref/all-gentoo.js || die + done + fi + + popd &>/dev/null || die + + #MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" \ + #emake DESTDIR="${D}" install + DESTDIR="${D}" ./mach install || die + MOZ_P="${MY_MOZ_P}" mozlinguas_src_install + + cp "${FILESDIR}"/${PN}.desktop "${T}" || die + + sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \ + -i "${T}"/${PN}.desktop || die + sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \ + || die + + # Install icon and .desktop for menu entry + newicon "${S}"/comm/suite/branding/${PN}/default64.png ${PN}.png + domenu "${T}"/${PN}.desktop + + # Required in order to use plugins and even run seamonkey on hardened. + pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container} + + if use chatzilla ; then + local emid='{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}' + + # remove the en_US-only xpi file so a version with all requested locales can be installed + if [[ -e "${ED}"/${MOZILLA_FIVE_HOME}/extensions/${emid}.xpi ]] ; then + rm -f "${ED}"/${MOZILLA_FIVE_HOME}/extensions/${emid}.xpi || die + fi + + # merge the extra locales into the main extension + mozlinguas_xpistage_langpacks dist/xpi-stage/chatzilla + + # install the merged extension + mkdir -p "${T}/${emid}" || die + cp -RLp -t "${T}/${emid}" dist/xpi-stage/chatzilla/* || die + insinto ${MOZILLA_FIVE_HOME}/extensions + doins -r "${T}/${emid}" + fi + + # Provide a place for plugins + keepdir "${MOZILLA_FIVE_HOME}/plugins" + + # revdep-rebuild entry + insinto /etc/revdep-rebuild + echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> "${T}"/11${PN} || die + doins "${T}"/11${PN} +} + +pkg_preinst() { + SEAMONKEY_PLUGINS_DIR="${EROOT}/usr/$(get_libdir)/${PN}/plugins" + + if [[ -L "${SEAMONKEY_PLUGINS_DIR}" ]] ; then + rm "${SEAMONKEY_PLUGINS_DIR}" || die + fi +} + +pkg_postinst() { + # Update mimedb for the new .desktop file + xdg_desktop_database_update + + if ! use gmp-autoupdate ; then + elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or" + elog "installing into new profiles:" + local plugin + for plugin in "${GMP_PLUGIN_LIST[@]}"; do + elog "\t ${plugin}" ; + done + fi + + if use chatzilla ; then + elog "chatzilla is now an extension which can be en-/disabled and configured via" + elog "the Add-on manager." + fi +} + +pkg_postrm() { + xdg_desktop_database_update +} -- cgit v1.2.3