From 3e14252681c2cb40a3a9cd7163a356bf9190b46c Mon Sep 17 00:00:00 2001 From: caoyuanji <874768263@qq..com> Date: Tue, 6 Sep 2022 15:54:02 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81Add=20ffmpeg=20compilation=20dependen?= =?UTF-8?q?cy=20to=20solve=20the=20problem=20that=20firefox=20browser=20ca?= =?UTF-8?q?nnot=20play=20audio=20and=20video=202=E3=80=81Avoid=20build=20b?= =?UTF-8?q?ustage=20when=20building=20against=20glibc=202.36=20or=20newer.?= =?UTF-8?q?=20r=3DRyanVM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...age-when-building-against-glibc-2.36.patch | 52 +++++++++++++++++++ firefox.spec | 9 +++- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 0001-Avoid-build-bustage-when-building-against-glibc-2.36.patch diff --git a/0001-Avoid-build-bustage-when-building-against-glibc-2.36.patch b/0001-Avoid-build-bustage-when-building-against-glibc-2.36.patch new file mode 100644 index 0000000..ff96b2b --- /dev/null +++ b/0001-Avoid-build-bustage-when-building-against-glibc-2.36.patch @@ -0,0 +1,52 @@ +From c654575e855174f787c9b9be3197a96e8a2f6c70 Mon Sep 17 00:00:00 2001 +From: caoyuanji +Date: Mon, 29 Aug 2022 10:10:52 +0800 +Subject: [PATCH] Avoid build bustage when building against glibc 2.36 or + newer. r=RyanVM + +--- + 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..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,11 +26,15 @@ + /* 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 + ++#ifdef HAVE_ARC4RANDOM_BUF + /* Define to 1 if you have the `arc4random_buf' function. */ +-/* #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 80913a4..147633a 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 @@ -189,7 +189,9 @@ 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-Avoid-build-bustage-when-building-against-glibc-2.36.patch +Requires: ffmpeg %if %{?system_nss} BuildRequires: pkgconfig(nspr) >= %{nspr_version} pkgconfig(nss) >= %{nss_version} BuildRequires: nss-static >= %{nss_version} @@ -371,6 +373,7 @@ tar -xf %{SOURCE3} %patch645 -p1 %patch646 -p1 %patch647 -p1 +%patch648 -p1 %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -813,6 +816,10 @@ 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 +- 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