From 57457a7e5330d913a11dcb6eaad619ecd8296ea8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E5=85=83=E5=90=89?= Date: Wed, 3 Aug 2022 03:08:29 +0000 Subject: [PATCH 1/4] The problem that the firefox browser cannot play audio and video The problem that the firefox browser cannot play audio and video --- firefox.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/firefox.spec b/firefox.spec index 80913a4..51c3059 100644 --- a/firefox.spec +++ b/firefox.spec @@ -88,7 +88,7 @@ Summary: Mozilla Firefox Web browser Name: firefox Version: 79.0 -Release: 13 +Release: 14 URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}/source/firefox-%{version}.source.tar.xz @@ -190,6 +190,7 @@ Patch645: 0001-fix-wl_proxy_marshal_flags.patch Patch646: 0002-fix-from-collections-import-Iterable.patch Patch647: fix-attribute-error-module-distutils-has-no-attribute-sysconfig.patch +Requires: ffmpeg %if %{?system_nss} BuildRequires: pkgconfig(nspr) >= %{nspr_version} pkgconfig(nss) >= %{nss_version} BuildRequires: nss-static >= %{nss_version} @@ -813,6 +814,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %endif %changelog +* Wed Aug 3 2022 caoyuanji - 79.0-14 +- The problem that the firefox browser cannot play audio and video + * Thu Jul 21 2022 xu_ping - 79.0-13 - Fix attribute error module distutils has no attribute sysconfig -- Gitee From b67e08eaff5d21839d2b57c2011df3391f4ab82e Mon Sep 17 00:00:00 2001 From: caoyuanji Date: Thu, 25 Aug 2022 15:08:07 +0800 Subject: [PATCH 2/4] Close the corresponding implementation to solve the openEuler compilation error --- ...ponding-implementation-to-solve-the-.patch | 29 +++++++++++++++++++ firefox.spec | 3 ++ 2 files changed, 32 insertions(+) create mode 100644 0001-Close-the-corresponding-implementation-to-solve-the-.patch diff --git a/0001-Close-the-corresponding-implementation-to-solve-the-.patch b/0001-Close-the-corresponding-implementation-to-solve-the-.patch new file mode 100644 index 0000000..c9d28c3 --- /dev/null +++ b/0001-Close-the-corresponding-implementation-to-solve-the-.patch @@ -0,0 +1,29 @@ +From f1c5017042d5e6d1a4e5be7788eb4a6db9c83c9a Mon Sep 17 00:00:00 2001 +From: caoyuanji +Date: Thu, 25 Aug 2022 15:03:05 +0800 +Subject: [PATCH] Close the corresponding implementation to solve the openEuler + compilation error + +--- + .../src/third_party/libevent/linux/event2/event-config.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h b/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h +index dd64dc6210..c03f3493c8 100644 +--- a/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h ++++ b/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h +@@ -26,8 +26,10 @@ + /* Define to 1 if you have the `accept4' function. */ + #define EVENT__HAVE_ACCEPT4 1 + ++#ifdef HAVE_ARC4RANDOM + /* Define to 1 if you have the `arc4random' function. */ +-/* #undef EVENT__HAVE_ARC4RANDOM */ ++#define EVENT__HAVE_ARC4RANDOM 1 ++#endif + + /* Define to 1 if you have the `arc4random_buf' function. */ + /* #undef EVENT__HAVE_ARC4RANDOM_BUF */ +-- +2.18.1 + diff --git a/firefox.spec b/firefox.spec index 51c3059..a032cba 100644 --- a/firefox.spec +++ b/firefox.spec @@ -189,6 +189,7 @@ Patch644: Deny-clone3-to-force-glibc-fallback.patch Patch645: 0001-fix-wl_proxy_marshal_flags.patch Patch646: 0002-fix-from-collections-import-Iterable.patch Patch647: fix-attribute-error-module-distutils-has-no-attribute-sysconfig.patch +Patch648: 0001-Close-the-corresponding-implementation-to-solve-the-.patch Requires: ffmpeg %if %{?system_nss} @@ -372,6 +373,7 @@ tar -xf %{SOURCE3} %patch645 -p1 %patch646 -p1 %patch647 -p1 +%patch648 -p1 %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -816,6 +818,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog * Wed Aug 3 2022 caoyuanji - 79.0-14 - The problem that the firefox browser cannot play audio and video +- Close the corresponding implementation to solve the openEuler compilation error * Thu Jul 21 2022 xu_ping - 79.0-13 - Fix attribute error module distutils has no attribute sysconfig -- Gitee From fe3dccf0ff99e4d41b8b50453f5b99fa14da622d Mon Sep 17 00:00:00 2001 From: caoyuanji Date: Mon, 29 Aug 2022 10:12:05 +0800 Subject: [PATCH 3/4] Avoid build bustage when building against glibc 2.36 or newer. r=RyanVM --- ...age-when-building-against-glibc-2.36.patch | 41 +++++++++++++++---- firefox.spec | 4 +- 2 files changed, 34 insertions(+), 11 deletions(-) rename 0001-Close-the-corresponding-implementation-to-solve-the-.patch => 0001-Avoid-build-bustage-when-building-against-glibc-2.36.patch (31%) diff --git a/0001-Close-the-corresponding-implementation-to-solve-the-.patch b/0001-Avoid-build-bustage-when-building-against-glibc-2.36.patch similarity index 31% rename from 0001-Close-the-corresponding-implementation-to-solve-the-.patch rename to 0001-Avoid-build-bustage-when-building-against-glibc-2.36.patch index c9d28c3..ff96b2b 100644 --- a/0001-Close-the-corresponding-implementation-to-solve-the-.patch +++ b/0001-Avoid-build-bustage-when-building-against-glibc-2.36.patch @@ -1,18 +1,35 @@ -From f1c5017042d5e6d1a4e5be7788eb4a6db9c83c9a Mon Sep 17 00:00:00 2001 +From c654575e855174f787c9b9be3197a96e8a2f6c70 Mon Sep 17 00:00:00 2001 From: caoyuanji -Date: Thu, 25 Aug 2022 15:03:05 +0800 -Subject: [PATCH] Close the corresponding implementation to solve the openEuler - compilation error +Date: Mon, 29 Aug 2022 10:10:52 +0800 +Subject: [PATCH] Avoid build bustage when building against glibc 2.36 or + newer. r=RyanVM --- - .../src/third_party/libevent/linux/event2/event-config.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) + ipc/chromium/src/third_party/libevent/README.mozilla | 5 +++++ + .../src/third_party/libevent/linux/event2/event-config.h | 8 ++++++-- + 2 files changed, 11 insertions(+), 2 deletions(-) +diff --git a/ipc/chromium/src/third_party/libevent/README.mozilla b/ipc/chromium/src/third_party/libevent/README.mozilla +index 262a6228e4..2ed837e978 100644 +--- a/ipc/chromium/src/third_party/libevent/README.mozilla ++++ b/ipc/chromium/src/third_party/libevent/README.mozilla +@@ -21,6 +21,11 @@ distinguish the two cases. If you get something wrong, the CHECK_EVENT_SIZEOF + static assertions in message_pump_libevent.cc will fail. If a new constant is + added, also add a static assertion for it to message_pump_libevent.cc. + ++You also need to modify the EVENT__HAVE_ARC4RANDOM and EVENT__HAVE_ARC4RANDOM_BUF ++constants in the generated Linux header to account for the results of the arc4random ++and arc4random_buf configure checks. ++ ++ + 2. Apply the following patches from + ipc/chromium/src/third_party/libevent/patches/: + diff --git a/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h b/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h -index dd64dc6210..c03f3493c8 100644 +index dd64dc6210..2844bcac67 100644 --- a/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h +++ b/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h -@@ -26,8 +26,10 @@ +@@ -26,11 +26,15 @@ /* Define to 1 if you have the `accept4' function. */ #define EVENT__HAVE_ACCEPT4 1 @@ -22,8 +39,14 @@ index dd64dc6210..c03f3493c8 100644 +#define EVENT__HAVE_ARC4RANDOM 1 +#endif ++#ifdef HAVE_ARC4RANDOM_BUF /* Define to 1 if you have the `arc4random_buf' function. */ - /* #undef EVENT__HAVE_ARC4RANDOM_BUF */ +-/* #undef EVENT__HAVE_ARC4RANDOM_BUF */ ++#define EVENT__HAVE_ARC4RANDOM_BUF 1 ++#endif + + /* Define to 1 if you have the header file. */ + #define EVENT__HAVE_ARPA_INET_H 1 -- 2.18.1 diff --git a/firefox.spec b/firefox.spec index a032cba..147633a 100644 --- a/firefox.spec +++ b/firefox.spec @@ -189,7 +189,7 @@ Patch644: Deny-clone3-to-force-glibc-fallback.patch Patch645: 0001-fix-wl_proxy_marshal_flags.patch Patch646: 0002-fix-from-collections-import-Iterable.patch Patch647: fix-attribute-error-module-distutils-has-no-attribute-sysconfig.patch -Patch648: 0001-Close-the-corresponding-implementation-to-solve-the-.patch +Patch648: 0001-Avoid-build-bustage-when-building-against-glibc-2.36.patch Requires: ffmpeg %if %{?system_nss} @@ -818,7 +818,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog * Wed Aug 3 2022 caoyuanji - 79.0-14 - The problem that the firefox browser cannot play audio and video -- Close the corresponding implementation to solve the openEuler compilation error +- Avoid build bustage when building against glibc 2.36 or newer. r=RyanVM * Thu Jul 21 2022 xu_ping - 79.0-13 - Fix attribute error module distutils has no attribute sysconfig -- Gitee From 334198e0f2f117e73dcdbe3d97c9af66e0fba514 Mon Sep 17 00:00:00 2001 From: caoyuanji <874768263@qq..com> Date: Mon, 5 Sep 2022 16:50:07 +0800 Subject: [PATCH 4/4] test1 --- firefox.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firefox.spec b/firefox.spec index 147633a..b4b5d70 100644 --- a/firefox.spec +++ b/firefox.spec @@ -316,7 +316,7 @@ tar -xf %{SOURCE3} %patch215 -p1 -b .addons %patch219 -p1 -b .rhbz-1173156 %patch224 -p1 -b .1170092 -%ifarch aarch64 +%ifarch x86_64 aarch64 %patch226 -p1 -b .1354671 %endif %patch227 -p1 -b .locale-debug -- Gitee