| 1 |
commit: 85aaa6a84bc7508ae36a27149da59d81cd56208e |
| 2 |
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 1 21:38:05 2020 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 1 21:38:05 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=85aaa6a8 |
| 7 |
|
| 8 |
www-client/firefox: Add system-harfbuzz back to ebuild |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.86, Repoman-2.3.20 |
| 11 |
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> |
| 12 |
|
| 13 |
www-client/firefox/Manifest | 2 +- |
| 14 |
www-client/firefox/firefox-73.0_beta11.ebuild | 19 ++++++++++--------- |
| 15 |
www-client/firefox/metadata.xml | 2 ++ |
| 16 |
3 files changed, 13 insertions(+), 10 deletions(-) |
| 17 |
|
| 18 |
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest |
| 19 |
index bec3d0f..97076f2 100644 |
| 20 |
--- a/www-client/firefox/Manifest |
| 21 |
+++ b/www-client/firefox/Manifest |
| 22 |
@@ -1,2 +1,2 @@ |
| 23 |
-DIST firefox-73.0-patches-02.tar.xz 17092 BLAKE2B 25978230da3d7592177bd8b59fdef2c6424798ee8dcdd8677dcf8e92f332fdbf5efc9f696564e82ec4368321debf0bb43c3330e479dd92d45e579cae8963059b SHA512 bf68533b3ff8300cc6bb97fce948172411c4e7ba9dec1c5e69ad0f02dd77e98e838a88cf4b988da9a27cdda2052c7a8b1822d80264695654f61e14dae85ed44a |
| 24 |
+DIST firefox-73.0-patches-03.tar.xz 20292 BLAKE2B 0aebef5f4933990bccd5722022b9416393023badb9be29da3a7296e886484d7e937e038e88b85e246879a7d27427b4809d750a652331fb50f3405ef14f776d2c SHA512 5b4ce070b57444c7dd5acccae69eacf5c8bbe51c3ec4b52d1fda6d3d7e465ec22b73453a8bb9e9466fbd77f42bfc3631178e19019d2b1f7b8aa5024a1d4108c5 |
| 25 |
DIST firefox-73.0b11.source.tar.xz 318682128 BLAKE2B d00e2a451d6491cc889900e117eb636d8e962d9ccf0aa95095e86187b97a76704ad6cbbfe9e97bb06ef001a3dcecd2ace1055e6f28566eaf82134b28c204e067 SHA512 56aac34848aed5bfaf626c83c92c1f3432af00d7fcdb8d152c1bbd1ef35a22bfa84a1715554cccdbb4f7711702bb77a60efec27e14d1ce8368e7f157921a30b3 |
| 26 |
|
| 27 |
diff --git a/www-client/firefox/firefox-73.0_beta11.ebuild b/www-client/firefox/firefox-73.0_beta11.ebuild |
| 28 |
index 0a72f6b..884c498 100644 |
| 29 |
--- a/www-client/firefox/firefox-73.0_beta11.ebuild |
| 30 |
+++ b/www-client/firefox/firefox-73.0_beta11.ebuild |
| 31 |
@@ -27,7 +27,7 @@ if [[ ${MOZ_ESR} == 1 ]] ; then |
| 32 |
fi |
| 33 |
|
| 34 |
# Patch version |
| 35 |
-PATCH="${PN}-73.0-patches-02" |
| 36 |
+PATCH="${PN}-73.0-patches-03" |
| 37 |
|
| 38 |
MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases" |
| 39 |
MOZ_SRC_URI="${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz" |
| 40 |
@@ -55,8 +55,8 @@ LICENSE="MPL-2.0 GPL-2 LGPL-2.1" |
| 41 |
IUSE="bindist clang cpu_flags_x86_avx2 debug eme-free geckodriver |
| 42 |
+gmp-autoupdate hardened hwaccel jack lto cpu_flags_arm_neon pgo |
| 43 |
pulseaudio +screenshot selinux startup-notification +system-av1 |
| 44 |
- +system-icu +system-jpeg +system-libevent +system-sqlite +system-libvpx |
| 45 |
- +system-webp test wayland wifi" |
| 46 |
+ +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-sqlite |
| 47 |
+ +system-libvpx +system-webp test wayland wifi" |
| 48 |
|
| 49 |
REQUIRED_USE="pgo? ( lto )" |
| 50 |
|
| 51 |
@@ -105,6 +105,7 @@ CDEPEND=" |
| 52 |
>=media-libs/dav1d-0.3.0:= |
| 53 |
>=media-libs/libaom-1.0.0:= |
| 54 |
) |
| 55 |
+ system-harfbuzz? ( >=media-libs/harfbuzz-2.5.3:0= >=media-gfx/graphite2-1.3.13 ) |
| 56 |
system-icu? ( >=dev-libs/icu-64.1:= ) |
| 57 |
system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) |
| 58 |
system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) |
| 59 |
@@ -514,8 +515,8 @@ src_configure() { |
| 60 |
mozconfig_use_enable startup-notification |
| 61 |
mozconfig_use_enable system-sqlite |
| 62 |
mozconfig_use_with system-av1 |
| 63 |
- #mozconfig_use_with system-harfbuzz |
| 64 |
- #mozconfig_use_with system-harfbuzz system-graphite2 |
| 65 |
+ mozconfig_use_with system-harfbuzz |
| 66 |
+ mozconfig_use_with system-harfbuzz system-graphite2 |
| 67 |
mozconfig_use_with system-icu |
| 68 |
mozconfig_use_with system-jpeg |
| 69 |
mozconfig_use_with system-libvpx |
| 70 |
@@ -610,10 +611,10 @@ src_install() { |
| 71 |
>>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die |
| 72 |
|
| 73 |
# force the graphite pref if system-harfbuzz is enabled, since the pref cant disable it |
| 74 |
- #if use system-harfbuzz ; then |
| 75 |
- # echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \ |
| 76 |
- # >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die |
| 77 |
- #fi |
| 78 |
+ if use system-harfbuzz ; then |
| 79 |
+ echo "sticky_pref(\"gfx.font_rendering.graphite.enabled\",true);" \ |
| 80 |
+ >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" || die |
| 81 |
+ fi |
| 82 |
|
| 83 |
# force cairo as the canvas renderer on platforms without skia support |
| 84 |
if [[ $(tc-endian) == "big" ]] ; then |
| 85 |
|
| 86 |
diff --git a/www-client/firefox/metadata.xml b/www-client/firefox/metadata.xml |
| 87 |
index 0f358be..b3902c8 100644 |
| 88 |
--- a/www-client/firefox/metadata.xml |
| 89 |
+++ b/www-client/firefox/metadata.xml |
| 90 |
@@ -25,6 +25,8 @@ |
| 91 |
and <pkg>media-libs/libaom</pkg> library instead of bundled.</flag> |
| 92 |
<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg> |
| 93 |
instead of bundled.</flag> |
| 94 |
+ <flag name="system-harfbuzz">Use the system-wide <pkg>media-libs/harfbuzz</pkg> |
| 95 |
+ and <pkg>media-gfx/graphite2</pkg> instead of bundled.</flag> |
| 96 |
<flag name="system-jpeg">Use the system-wide <pkg>media-libs/libjpeg-turbo</pkg> |
| 97 |
instead of bundled.</flag> |
| 98 |
<flag name="system-libevent">Use the system-wide <pkg>dev-libs/libevent</pkg> |
Archives