diff --git a/firefox.spec b/firefox.spec index aad6d936056168886d2ff9e710cedeadcf3b1565..913eb853d380f8c1806799cc45dc1743e567f2a0 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,7 +1,7 @@ Name: firefox Summary: Mozilla Firefox Web browser Version: 62.0.3 -Release: 4 +Release: 5 URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Source0: http://download-origin.cdn.mozilla.net/pub/firefox/releases/62.0.3/source/firefox-62.0.3.source.tar.xz @@ -28,6 +28,7 @@ Patch0012: mozilla-1353817.patch Patch0016: mozilla-1467125.patch Patch0017: mozilla-1467128.patch Patch0018: mozilla-1415078.patch +Patch0019: openeuler-20200525.patch BuildRequires: pkgconfig(nspr) >= 4.19 pkgconfig(nss) >= 3.37.3 pkgconfig(libpng) pkgconfig(libffi) BuildRequires: pkgconfig(zlib) pkgconfig(libIDL-2.0) pkgconfig(gtk+-3.0) pkgconfig(gtk+-2.0) pkgconfig(krb5) @@ -315,5 +316,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/applications/firefox-wayland.desktop %changelog +* Mon May 25 2020 Captain Wei - 62.0.3-5 +- fix unstable_name_collisions problem when compile + * Wen Feb 26 2020 xuxijian - 62.0.3-4 - Package init diff --git a/firefox.yaml b/firefox.yaml new file mode 100644 index 0000000000000000000000000000000000000000..6992b05641ce129eb3c49889b2b3d2192da0afeb --- /dev/null +++ b/firefox.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: mozilla/gecko-dev +tag_prefix: ^B2G_ +seperator: _ diff --git a/openeuler-20200525.patch b/openeuler-20200525.patch new file mode 100644 index 0000000000000000000000000000000000000000..3f69e72533123c8408626f3e41a577069a6556bd --- /dev/null +++ b/openeuler-20200525.patch @@ -0,0 +1,44 @@ +diff -ur firefox-62.0.3/media/libcubeb/cubeb-pulse-rs/pulse-rs/src/lib.rs firefox-62.0.3-20200525/media/libcubeb/cubeb-pulse-rs/pulse-rs/src/lib.rs +--- firefox-62.0.3/media/libcubeb/cubeb-pulse-rs/pulse-rs/src/lib.rs 2018-10-02 02:35:25.000000000 +0800 ++++ firefox-62.0.3-20200525/media/libcubeb/cubeb-pulse-rs/pulse-rs/src/lib.rs 2020-05-22 12:46:32.000000000 +0800 +@@ -636,11 +636,11 @@ + } + + pub trait USecExt { +- fn to_bytes(self, spec: &SampleSpec) -> usize; ++ fn use_to_bytes(self, spec: &SampleSpec) -> usize; + } + + impl USecExt for USec { +- fn to_bytes(self, spec: &SampleSpec) -> usize { ++ fn use_to_bytes(self, spec: &SampleSpec) -> usize { + unsafe { ffi::pa_usec_to_bytes(self, spec) } + } + } +diff -ur firefox-62.0.3/media/libcubeb/cubeb-pulse-rs/src/backend/stream.rs firefox-62.0.3-20200525/media/libcubeb/cubeb-pulse-rs/src/backend/stream.rs +--- firefox-62.0.3/media/libcubeb/cubeb-pulse-rs/src/backend/stream.rs 2018-10-02 02:35:24.000000000 +0800 ++++ firefox-62.0.3-20200525/media/libcubeb/cubeb-pulse-rs/src/backend/stream.rs 2020-05-22 12:49:15.000000000 +0800 +@@ -438,7 +438,7 @@ + let stm = self.output_stream.as_ref().unwrap(); + let r = match stm.get_time() { + Ok(r_usec) => { +- let bytes = r_usec.to_bytes(&self.output_sample_spec); ++ let bytes = r_usec.use_to_bytes(&self.output_sample_spec); + Ok((bytes / self.output_sample_spec.frame_size()) as u64) + } + Err(_) => Err(Error::error()), +diff -ur firefox-62.0.3/xpcom/base/Logging.h firefox-62.0.3-20200525/xpcom/base/Logging.h +--- firefox-62.0.3/xpcom/base/Logging.h 2018-10-02 02:35:35.000000000 +0800 ++++ firefox-62.0.3-20200525/xpcom/base/Logging.h 2020-05-22 16:51:42.480111146 +0800 +@@ -247,6 +247,11 @@ + // MOZ_LOG even when logging is disabled to ensure the compiler sees that + // variables only used during logging code are actually used, even if the + // code will never be executed.) Hence, the following code. ++#if defined(__GNUC__) ++# pragma GCC diagnostic push ++# pragma GCC diagnostic ignored "-Wformat-security" ++#endif ++ + #if MOZ_LOGGING_ENABLED + #define MOZ_LOG(_module,_level,_args) \ + do { \