diff options
| -rw-r--r-- | www-client/seamonkey/Manifest | 3 | ||||
| -rw-r--r-- | www-client/seamonkey/metadata.xml | 4 | ||||
| -rw-r--r-- | www-client/seamonkey/seamonkey-2.53.11.ebuild (renamed from www-client/seamonkey/seamonkey-2.53.11_beta1.ebuild) | 47 |
3 files changed, 14 insertions, 40 deletions
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest index 6735a43a7343..edf151732910 100644 --- a/www-client/seamonkey/Manifest +++ b/www-client/seamonkey/Manifest @@ -1,4 +1,7 @@ DIST seamonkey-2.53.10.2-patches-01.tar.gz 77910 BLAKE2B 9f75470936c15a6c6be27a4751f0ed32dbd7629017b1f142250ef80ecf1adfc6fc7d88c3d1e4a44efaee93b9e15d0171910582ac4a7abcae65fa26bdb6950469 SHA512 ddb0984aaa5e16ced69dad59bb812fbc3ba14c3de96edfea8778ff5450f4f520657031470b80492226fc273fedb7195361c9f56352a53d381061a1171e830d5b DIST seamonkey-2.53.10.2.source-l10n.tar.xz 13616204 BLAKE2B 75e3efd51fa4628b3853c2fc86357d1a44addd11ea5409ee10fcce5114fb2a92a9f70af24e3e5fb955a15f8568149cd4c7af67a321716313ad71c474a3caeb2a SHA512 9796ac45203e91d1531ed88239ff8771cd666027a1dbf41885b3626ec03e4289854704cac53a56a68f3df9dd82232321cafde24b5f1c49b22722812bf8781a36 DIST seamonkey-2.53.10.2.source.tar.xz 284350364 BLAKE2B 15ff60b5728b84c00831d4dccde7600648889d56ecbe034708390cd83d096f760157d84f5df266ede2d4388302b0df83684397c276e1a0f6d1dfe3e799265ca1 SHA512 59233c2bfc0cf3c9e290e1165fea4cd285cabb339f66dbad7bdbe0b7fd9b2acbc37c385b775d2a3d045d1a6648012488cc018eb3f879139c2a582e7d37e01d7a +DIST seamonkey-2.53.11-patches-02.tar.gz 90646 BLAKE2B 047beb0a9c73c9d85d628139d4169ce91451df71e24aa4f920d5d509c53458e19b71b9cb58254707512445639a1aaf606e96b1c0d4e9eda67240217d36501b9e SHA512 5584fd0b565c56bf2223389bdbf11ff9df424e9eeac44105f1d493d958068e0fae2235bf34ea174600f85efecc1dd06b746f7b86f99d56f375b4127a3a933684 +DIST seamonkey-2.53.11.source-l10n.tar.xz 13626448 BLAKE2B 4dc2de15273b8b5a5e2572c7275d4172151d551348bb8481006d6917faf2814b582796ec6a74cc147299a9466d5de2c3cf3305ed61c70543e7e20047de0612ed SHA512 a20f692366a000418161521a18d696880b62f2f9a8aab95d470626fcfe52798cf5da41df4ba61d2598fdf6ec0d54218988351b3c778fd189957c791442eb6d44 +DIST seamonkey-2.53.11.source.tar.xz 287567152 BLAKE2B 96f89360948169a6ac650cec331f29026ac5dea40e953422f54ff2410dab0c49f883ca650f12514db2bc458bc2d58e6e3f3b6c9e75717ed2f8818cd35529215e SHA512 5a9b1f0f638dd08654b8e0654f5a87cc269e29cfe1efe7b9707fe306398354c95018317c826f7523e33bec50cf72e1ba33a0a1eb216568f62f02bd95eb1eaf16 DIST seamonkey-2.53.3-system_libvpx-1.8.patch.gz 3197 BLAKE2B 7a84d2184f4812eabfe3626eb6b2364f2f8c0ba24d4e53440e9d38658b89a3f1c23bdcbd623fd9aca3bfd04743e582587e9c42ba3d983cc9ec4059ea9503830a SHA512 ffc6f179f07cb9dcce2924c64bfed84a5cc724d857b32e5e349967e72022536c5192c3966e1089bab8efd91671584d6474334730ebefe1c4398f564a5f1753be diff --git a/www-client/seamonkey/metadata.xml b/www-client/seamonkey/metadata.xml index f3fa056f0caa..dc1f1e09bd66 100644 --- a/www-client/seamonkey/metadata.xml +++ b/www-client/seamonkey/metadata.xml @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="person"> + <email>gentoo-bugs@habets-dobben.nl</email> + <name>Myckel Habets</name> + </maintainer> <maintainer type="project"> <email>mozilla@gentoo.org</email> <name>Gentoo Mozilla Team</name> diff --git a/www-client/seamonkey/seamonkey-2.53.11_beta1.ebuild b/www-client/seamonkey/seamonkey-2.53.11.ebuild index afe28408be0f..c98faf96474e 100644 --- a/www-client/seamonkey/seamonkey-2.53.11_beta1.ebuild +++ b/www-client/seamonkey/seamonkey-2.53.11.ebuild @@ -21,7 +21,7 @@ MOZ_PV="${MOZ_PV/_beta/b}" MOZ_PV="${MOZ_PV/_rc/rc}" MOZ_P="${P}" MY_MOZ_P="${PN}-${MOZ_PV}" -PATCH="${PN}-2.53.11-patches-01" +PATCH="${PN}-2.53.11-patches-02" if [[ ${PV} == *_pre* ]] ; then MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}" @@ -31,8 +31,7 @@ fi SRC_URI="${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz ${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source-l10n.tar.xz -> ${P}.source-l10n.tar.xz - https://github.com/BioMike/gentoo-${PN}-patches/archive/refs/tags/${PV}.tar.gz -> ${PATCH}.tar.gz - system-libvpx? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.53.3-system_libvpx-1.8.patch.gz )" + https://github.com/BioMike/gentoo-${PN}-patches/archive/refs/tags/${PV}-r1.tar.gz -> ${PATCH}.tar.gz" S="${WORKDIR}/${MY_MOZ_P}" @@ -53,8 +52,6 @@ KEYWORDS="~amd64 ~ppc64 ~x86" RESTRICT="!test? ( test )" -ASM_DEPEND=">=dev-lang/yasm-1.1" - BDEPEND=" app-arch/unzip app-arch/zip @@ -63,9 +60,9 @@ BDEPEND=" >=sys-devel/binutils-2.16.1 virtual/pkgconfig >=virtual/rust-1.58.1 - amd64? ( ${ASM_DEPEND} ) + amd64? ( >=dev-lang/yasm-1.1 ) lto? ( sys-devel/binutils[gold] ) - x86? ( ${ASM_DEPEND} ) + x86? ( >=dev-lang/yasm-1.1 ) " COMMON_DEPEND=" app-arch/bzip2 @@ -81,7 +78,6 @@ COMMON_DEPEND=" >=sys-libs/zlib-1.2.3 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf - >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3 x11-libs/libX11 x11-libs/libXcomposite @@ -90,6 +86,7 @@ COMMON_DEPEND=" x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt + x11-libs/libxcb:= >=x11-libs/pango-1.22.0 >=x11-libs/pixman-0.19.2 media-video/ffmpeg @@ -192,37 +189,8 @@ src_unpack() { } src_prepare() { - SM_PATCHDIR="${WORKDIR}/mozilla" # Apply our patches - eapply "${SM_PATCHDIR}/1000_fix-preferences-gentoo.patch" - eapply "${SM_PATCHDIR}/1001_gentoo_prefs.patch" - eapply "${SM_PATCHDIR}/1002_drop_build_id.patch" - eapply "${SM_PATCHDIR}/1003_gentoo_specific_pgo.patch" - eapply "${SM_PATCHDIR}/1004_fix_pie_detection.patch" - eapply "${SM_PATCHDIR}/1005_fix_fortify_sources.patch" - eapply "${SM_PATCHDIR}/1007_re-add_system_sqlite.patch" - eapply "${SM_PATCHDIR}/2000_system_harfbuzz.patch" - eapply "${SM_PATCHDIR}/2001_system_graphite2.patch" - eapply "${SM_PATCHDIR}/2002_bmo-1559213-Support-system-av1.patch" - eapply "${SM_PATCHDIR}/2003_nICER_implicit_decls.patch" - eapply "${SM_PATCHDIR}/2004_fix_lto_builds.patch" - eapply "${SM_PATCHDIR}/2006_musl_sys_auxv.patch" - eapply "${SM_PATCHDIR}/2009_upstream-bug_1461221.patch" - eapply "${SM_PATCHDIR}/2010_blessings-TERM.patch" - eapply "${SM_PATCHDIR}/2011_missing-errno_h-in-SandboxOpenedFiles_cpp.patch" - eapply "${SM_PATCHDIR}/2012_make-MOZ_SIGNAL_TRAMPOLINE-Android-only_bug1434526.patch" - eapply "${SM_PATCHDIR}/2014_dont_use_gconf_service_mozilla_bug1526243.patch" - eapply "${SM_PATCHDIR}/2015_dont_use_gconf_for_proxy_configuration_bug1540145.patch" - eapply "${SM_PATCHDIR}/2018_audio_device_backends.patch" - eapply "${SM_PATCHDIR}/6001_add_missing_header_for_basename.patch" - eapply "${SM_PATCHDIR}/6002_add_alternate_name_for_private_siginfo_struct_member.patch" - eapply "${SM_PATCHDIR}/6003_fix_syscall_wrappers_on_musl.patch" - eapply "${SM_PATCHDIR}/6004_musl_drop_alloc_hooks.patch" - eapply "${SM_PATCHDIR}/6005_musl_memory_report.patch" - eapply "${SM_PATCHDIR}/6006_musl_pthread_setname.patch" - eapply "${SM_PATCHDIR}/6007_musl_fix_tools.patch" - eapply "${SM_PATCHDIR}/6008_musl_fix_toolkit.patch" - eapply "${SM_PATCHDIR}/6018_audio_backend_update_generated_files.patch" + eapply "${WORKDIR}"/gentoo-${PN}-patches-${PV}-r1/${PN} # Shell scripts sometimes contain DOS line endings; bug 391889 grep -rlZ --include="*.sh" $'\r$' . | @@ -232,8 +200,7 @@ src_prepare() { done use system-libvpx \ - && eapply -p2 "${WORKDIR}/${PN}-2.53.3-system_libvpx-1.8.patch" - #&& eapply -p2 "${SM_PATCHDIR}/1009_seamonkey-2.53.3-system_libvpx-1.8.patch" + && eapply -p2 ""${WORKDIR}"/gentoo-${PN}-patches-${PV}-r1/USE_flag/1009_seamonkey-2.53.3-system_libvpx-1.8.patch" # Allow user to apply any additional patches without modifing ebuild eapply_user |