X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=firefox.spec;h=f38a12a6d2b54319a8bb6e955326cae4856bb2bc;hb=6cb60c5b7c1f2a590013e3d304be3e349ed5a140;hp=447ddbf900f425c6385f9f5df18c01652df112b8;hpb=3bfbca3be9cdd69f2c464934a35eeece03fbafc6;p=packages%2Ffirefox.git diff --git a/firefox.spec b/firefox.spec index 447ddbf..f38a12a 100644 --- a/firefox.spec +++ b/firefox.spec @@ -14,13 +14,19 @@ %bcond_with shared_js # shared libmozjs library [broken] %bcond_without system_icu # build without system ICU %bcond_with system_cairo # build with system cairo (not supported in 60.0) -%bcond_with clang # build using Clang/LLVM -%bcond_with legacy_exts # build with legacy extensions support +%bcond_without system_libvpx # build with system libvpx +%bcond_without clang # build using Clang/LLVM +%bcond_with lowmem # lower memory requirements %if %{with lto} %define with_clang 1 %undefine with_gold %endif + +%ifarch %{ix86} %{arm} aarch64 +%define with_lowmem 1 +%endif + # On updating version, grab CVE links from: # https://www.mozilla.org/security/known-vulnerabilities/firefox.html # Release Notes: @@ -34,224 +40,209 @@ U=http://releases.mozilla.org/pub/firefox/releases/$V/linux-i686/ curl -s $U | sed -ne 's,.*href="\([^"]\+\)/".*,'"$U"'xpi/\1.xpi,p' %endif -# The actual sqlite version (see RHBZ#480989): -%define sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo ERROR) - -%define nspr_ver 4.21 -%define nss_ver 3.42 +%define nspr_ver 4.25 +%define nss_ver 3.51 Summary: Firefox web browser Summary(hu.UTF-8): Firefox web böngésző Summary(pl.UTF-8): Firefox - przeglądarka WWW Name: firefox -Version: 67.0 -Release: 0.1 +Version: 75.0 +Release: 5 License: MPL v2.0 Group: X11/Applications/Networking Source0: http://releases.mozilla.org/pub/firefox/releases/%{version}/source/firefox-%{version}.source.tar.xz -# Source0-md5: 41a5d504deaed12ebf0e25bb1420f08a +# Source0-md5: 0c36d407fe41f69e049e87e86c56ae31 Source3: %{name}.desktop Source4: %{name}.sh Source5: vendor.js Source6: vendor-ac.js Source100: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ach.xpi -# Source100-md5: 956563e5960e1914ebc74af7ecffd5c5 +# Source100-md5: 939e7ba3d44d030e059386cfa29a33c9 Source101: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/af.xpi -# Source101-md5: 3451e10a5e024056c10f0164cb8f093a +# Source101-md5: 0b9f7c895866e71c07bb09a8091281c9 Source102: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/an.xpi -# Source102-md5: 9037acfbe5f9f8e1bb3f928ae0a53c46 +# Source102-md5: e886ec74c5f74368f6e868d2e6859a44 Source103: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ar.xpi -# Source103-md5: 9934669de9d2f874673375c6bcd8c55c -Source104: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/as.xpi -# Source104-md5: 8472f2b3a3a3c528db6a12a99b2250f0 -Source105: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ast.xpi -# Source105-md5: eb47badf6ba8a1f7914a825b151a337d -Source106: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/az.xpi -# Source106-md5: e0bf74217beaa6f7e0e9dab9ce910422 -Source107: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/be.xpi -# Source107-md5: e8003812c01e352e2ffd16d6e51f5ecb -Source108: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/bg.xpi -# Source108-md5: 5718471ae0a1062af30e95aee911253a -Source109: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/bn-BD.xpi -# Source109-md5: 4d49b9970b001852e75d6d5d63665716 -Source110: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/bn-IN.xpi -# Source110-md5: e225a14e6b22116f27e2e6867811638e -Source111: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/br.xpi -# Source111-md5: 1ca290a65cc9dd18bf11b8854b401070 -Source112: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/bs.xpi -# Source112-md5: 5356c99c07710437a32f7dad7c0da95b -Source113: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ca.xpi -# Source113-md5: 9c2830a27cdd021e65557638a01a237d -Source114: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/cak.xpi -# Source114-md5: 5cb4f43fa0ffa8f675fd0d2088f364e4 -Source115: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/cs.xpi -# Source115-md5: 93e60d53db62cb54742198438d6a431c -Source116: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/cy.xpi -# Source116-md5: f89cf54601b423994ea9ee1513cdd82a -Source117: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/da.xpi -# Source117-md5: 43263942ed6a5852e769631b30087ba3 -Source118: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/de.xpi -# Source118-md5: 03a37d3a7e1b9f812c2ce18fc0265b93 -Source119: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/dsb.xpi -# Source119-md5: 0d5af0cb0051208f7f74bda25d9802a2 -Source120: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/el.xpi -# Source120-md5: f746d2830748812391b5f94dee9d1d84 -Source121: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/en-CA.xpi -# Source121-md5: d448126bab2aa74f52d72cd3b410eba6 -Source122: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/en-GB.xpi -# Source122-md5: 7871553750424a225918f99401f5e0b2 -Source123: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/en-US.xpi -# Source123-md5: 89fbbf7946cd9729122976eb5ebb8bd4 -Source124: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/en-ZA.xpi -# Source124-md5: aaa17fc601d4d827371bf86212d51574 -Source125: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/eo.xpi -# Source125-md5: 2eae53ab8aad42877d9a7c283b1cf517 -Source126: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/es-AR.xpi -# Source126-md5: 1ac768af2928409083a6a6079828dd1d -Source127: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/es-CL.xpi -# Source127-md5: 3d357e41d4ca1858fdff6271978c5aa1 -Source128: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/es-ES.xpi -# Source128-md5: 4c09230669a8cb3f632543d8ffc039d7 -Source129: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/es-MX.xpi -# Source129-md5: 4674521bab7decdc2af9f5cc9f420b85 -Source130: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/et.xpi -# Source130-md5: dcc96d0dacbb3723468a56e6e41dbee0 -Source131: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/eu.xpi -# Source131-md5: 14dc6c265aa7e134c27486a14f139218 -Source132: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/fa.xpi -# Source132-md5: fd7427044e73bd837d7687637c6ead87 -Source133: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ff.xpi -# Source133-md5: 29c91f185526f77d23fd7f544d405444 -Source134: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/fi.xpi -# Source134-md5: 90b1561a8bc3fcd2c808000507761d78 -Source135: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/fr.xpi -# Source135-md5: aa2e02ca7e93421ae367ffdef4fb75a7 -Source136: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/fy-NL.xpi -# Source136-md5: 5be206fbe809087f9723dee9b876ed34 -Source137: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ga-IE.xpi -# Source137-md5: 1940d7966ef7b6d801d4879782cb52f9 -Source138: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/gd.xpi -# Source138-md5: 473a6f61b4e9f3ebc2b322b1dad47643 -Source139: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/gl.xpi -# Source139-md5: b9c4ca3e71462bd373dd4afcd2b66883 -Source140: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/gn.xpi -# Source140-md5: dd37d2f63ab2695a1ce2c21b46f2a800 -Source141: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/gu-IN.xpi -# Source141-md5: 991797574dea971e32d32e086d50c216 -Source142: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/he.xpi -# Source142-md5: 1394cdddadbfe7d379696d85dd14b082 -Source143: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/hi-IN.xpi -# Source143-md5: cd3610e2343def7f0be10d8464f47c02 -Source144: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/hr.xpi -# Source144-md5: c0b3319f1e67d1589a295fd40700a513 -Source145: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/hsb.xpi -# Source145-md5: addc5479aeefe031f87b884fe2e8014f -Source146: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/hu.xpi -# Source146-md5: 5ca1d0e25d4fe58c69613d5881308c11 -Source147: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/hy-AM.xpi -# Source147-md5: b8fe5ff2a9dea337695ee830f587e1f3 -Source148: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ia.xpi -# Source148-md5: c86aac3088807f3ef9212ebcb6002f17 -Source149: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/id.xpi -# Source149-md5: de54eb1996fd3213190efed3c1b95e0a -Source150: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/is.xpi -# Source150-md5: 65c2cb3a8f708d5b50c878eb6177acb8 -Source151: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/it.xpi -# Source151-md5: f47e18c9f9101a3d7008cbeaf5cdfa2e -Source152: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ja.xpi -# Source152-md5: 4ab472cee8fda7fda24c61ba00e98767 -Source153: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ka.xpi -# Source153-md5: d64c667032e856278a0587c880c99030 -Source154: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/kab.xpi -# Source154-md5: 88f1d987447ddebb557a9b572920c092 -Source155: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/kk.xpi -# Source155-md5: b124e66dec24410f6fa6153bd5e043f1 -Source156: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/km.xpi -# Source156-md5: 675ab7a304858137fbe3036eec79ea1b -Source157: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/kn.xpi -# Source157-md5: c9d0adc8b951dcf9c6637b7ddd8ac1c9 -Source158: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ko.xpi -# Source158-md5: cd2db7685a1982b8cbdf92a279ae6849 -Source159: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/lij.xpi -# Source159-md5: b964a1b4c4a58b5701865de453c5d34e -Source160: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/lt.xpi -# Source160-md5: 19b20058df90a7d6ea753c20abfb6991 -Source161: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/lv.xpi -# Source161-md5: 50fd85077e3966866f0a1498261da138 -Source162: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/mai.xpi -# Source162-md5: d7cde1fa063fb0e485511b8e28141920 -Source163: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/mk.xpi -# Source163-md5: 9e6072147c5cb641e5be14233fc204af -Source164: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ml.xpi -# Source164-md5: 6649439eccf6a69dccdc1a5f5845c7c3 -Source165: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/mr.xpi -# Source165-md5: 1455d7e68269421d6efb0bab2709c28d -Source166: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ms.xpi -# Source166-md5: 9117f30a1ed57d0ed1c03dd67d302eeb -Source167: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/my.xpi -# Source167-md5: 4ff7b4fb45132662b6ad35b8c8caa5ed -Source168: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/nb-NO.xpi -# Source168-md5: 89b0bab607166711e0ea9eb12d852a49 -Source169: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ne-NP.xpi -# Source169-md5: 67f7c334ea63ad7949eabaf779a69684 -Source170: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/nl.xpi -# Source170-md5: 8b996485e3ce1a1f36fd4e03f3b1c35f -Source171: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/nn-NO.xpi -# Source171-md5: b4ffaa75e41c2975c14ee8fd7f376cc6 -Source172: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/oc.xpi -# Source172-md5: 876d45f4e4092d3a19101b0f3e3355c2 -Source173: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/or.xpi -# Source173-md5: 4a394cfc2e455ac7a6b4d65048445a57 -Source174: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/pa-IN.xpi -# Source174-md5: 9eb858f7c5e8a8d9ff317427560c2d59 -Source175: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/pl.xpi -# Source175-md5: 1884cdaafdb22a54c2942971c4bdd326 -Source176: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/pt-BR.xpi -# Source176-md5: 6ff6754969195a33fff7ca2681ba4374 -Source177: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/pt-PT.xpi -# Source177-md5: 6450ba222706db39828c9d4e37f15cf3 -Source178: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/rm.xpi -# Source178-md5: c9a806300eae1b62ce2f16bffdb925b5 -Source179: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ro.xpi -# Source179-md5: 5b834c3549a50e051f99ec9e81816f1d -Source180: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ru.xpi -# Source180-md5: afb65413fa7885d2d11adb4d462fc98f -Source181: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/si.xpi -# Source181-md5: f305c7ec23e8414529758469887fea4d -Source182: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/sk.xpi -# Source182-md5: 6459bddc90631f587a948cec79b4150d -Source183: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/sl.xpi -# Source183-md5: a0f646fd47e997aaffc7a358dd146fe0 -Source184: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/son.xpi -# Source184-md5: 5817584202e5599fb18074b62635dd73 -Source185: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/sq.xpi -# Source185-md5: 1bf0004994a852421baa0214a41b3f64 -Source186: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/sr.xpi -# Source186-md5: a6e6881e94d0b6aa8117306b9ca4b614 -Source187: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/sv-SE.xpi -# Source187-md5: d423ea9f62da4b15bba0932447b0d4fb -Source188: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ta.xpi -# Source188-md5: f443daabb6ff44bec9e0073c874f6556 -Source189: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/te.xpi -# Source189-md5: b2607210b18f02667f7965036110d13a -Source190: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/th.xpi -# Source190-md5: 6b5689c4ff843c4133113e5248333a6a -Source191: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/tr.xpi -# Source191-md5: 7a34d62d281787bedf91fb8c4ef6d275 -Source192: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/uk.xpi -# Source192-md5: 94f34a737b4413d4600eac9ff0055311 -Source193: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ur.xpi -# Source193-md5: 432bf2fb2966470bc7ac22fc93ab21dd -Source194: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/uz.xpi -# Source194-md5: 6b8e99f1d66d56a4cc99a8d5f54dcc95 -Source195: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/vi.xpi -# Source195-md5: 7b46d68b1dd4cc9d29d2a92b4e9683c1 -Source196: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/xh.xpi -# Source196-md5: f24526c097188b9c14b2585c037452e0 -Source197: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/zh-CN.xpi -# Source197-md5: 5344d7125de715bdbe18c74804a1069e -Source198: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/zh-TW.xpi -# Source198-md5: 7acabd87d13f1e5f2bf7f83000853ada +# Source103-md5: e48e0434254e3674cdcdb509e147457e +Source104: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ast.xpi +# Source104-md5: e1a33615507b70737af96e79cee447fa +Source105: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/az.xpi +# Source105-md5: 79c8762facea044d59307ea3b9383640 +Source106: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/be.xpi +# Source106-md5: 140d5e989f2031bae71ebd4df80c56e4 +Source107: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/bg.xpi +# Source107-md5: 4f6b96c47f27d76bf73384a54d6e6e73 +Source108: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/bn.xpi +# Source108-md5: 871e4d9ac4036323ccb3c35c28f088fa +Source109: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/br.xpi +# Source109-md5: 867c97861c6397f6b02f47bf6d7518b0 +Source110: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/bs.xpi +# Source110-md5: fe88e95f28869523759337eab88ffdc0 +Source111: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ca.xpi +# Source111-md5: 56bd4ed785a8ff67ff4371ca059c9d66 +Source112: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/cak.xpi +# Source112-md5: c5aa2c87a190d146fbc988e5a0dfef6d +Source113: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/cs.xpi +# Source113-md5: ceabbaa474b65d558b1ce7d88d618121 +Source114: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/cy.xpi +# Source114-md5: 5aaca694c1d835fec6d69d2327581f34 +Source115: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/da.xpi +# Source115-md5: 98488c7f610a55bf0e72702f97790bd4 +Source116: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/de.xpi +# Source116-md5: 9aa263c83179f64b54a6e80fc7cdcc96 +Source117: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/dsb.xpi +# Source117-md5: 92d7e70bab71286b9b18bb73995652ac +Source118: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/el.xpi +# Source118-md5: 0aaac2268537c24583394862b109f7a4 +Source119: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/en-CA.xpi +# Source119-md5: e86cd98dbfbeabcb8e582e3480d08141 +Source120: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/en-GB.xpi +# Source120-md5: 9342dd99e7ff39dfcb609b674e37b640 +Source121: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/en-US.xpi +# Source121-md5: 9dbfb1266a0e2cd80bdce8dfc9156949 +Source122: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/eo.xpi +# Source122-md5: 9a55195746a04128173f30e0b1625f6d +Source123: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/es-AR.xpi +# Source123-md5: f71cb9ce10dce237feaf0d0417ce5027 +Source124: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/es-CL.xpi +# Source124-md5: 2faa7426c5b3749d5eeb01e6767e7a5b +Source125: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/es-ES.xpi +# Source125-md5: a7a5b67621ad74044a2cd7d49957ccd1 +Source126: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/es-MX.xpi +# Source126-md5: 13e82728a8a1fb0457daf525f61c05ea +Source127: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/et.xpi +# Source127-md5: 33081baaa0d78f490c20c36aa1d28db1 +Source128: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/eu.xpi +# Source128-md5: 30e11087d49694250969369d84d54686 +Source129: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/fa.xpi +# Source129-md5: 1eec03ebc458637217e1d6dff7f97270 +Source130: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ff.xpi +# Source130-md5: 93e5ac0f03115da6bb797bd355674c97 +Source131: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/fi.xpi +# Source131-md5: 264d9ad43f8b120eb5587dcc6efd7acf +Source132: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/fr.xpi +# Source132-md5: 605d46b83c0224128ec07cff77461197 +Source133: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/fy-NL.xpi +# Source133-md5: 3ff292147864b606ca57d57e1e016359 +Source134: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ga-IE.xpi +# Source134-md5: d7d8a8531acb01fd7721974a7e3b073a +Source135: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/gd.xpi +# Source135-md5: 39859e8ceaba107ae98173cf9238407a +Source136: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/gl.xpi +# Source136-md5: 5d53e13b60729004a58518132e304a31 +Source137: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/gn.xpi +# Source137-md5: f460bdc5601def5675d7d02344b626d8 +Source138: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/gu-IN.xpi +# Source138-md5: 7022e5449886acfb3a2588a26a3dbc44 +Source139: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/he.xpi +# Source139-md5: 4ec93098310a91f8b4da285f7cdf51b7 +Source140: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/hi-IN.xpi +# Source140-md5: a9af175b17e220a3e05d8961310860cf +Source141: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/hr.xpi +# Source141-md5: 371ea9c0f9d13d5a2b47cd8add8a5d3f +Source142: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/hsb.xpi +# Source142-md5: 536a618696c145aa646d10797f45a548 +Source143: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/hu.xpi +# Source143-md5: aaa786dbe68f7e4e846d43b2dd3d96ef +Source144: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/hy-AM.xpi +# Source144-md5: 1b1e7135dd11ae4b1e618edab393e7cf +Source145: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ia.xpi +# Source145-md5: 46590cb73e3ca4290ff7e5e12261d8cd +Source146: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/id.xpi +# Source146-md5: f9afd53f1a6117d16e531827012a5f8e +Source147: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/is.xpi +# Source147-md5: 704a21f989dbc7d51f27ee464f5ccfcd +Source148: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/it.xpi +# Source148-md5: de5e796e93883aa9689f6b4a036f154c +Source149: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ja.xpi +# Source149-md5: 4c4e302f2a35f5fe3ce55de6ac5734da +Source150: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ka.xpi +# Source150-md5: 2498466e03a273e5a8b7ed23fdc6f318 +Source151: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/kab.xpi +# Source151-md5: dac97bc7c6d3d79d9ea73331959c9a9a +Source152: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/kk.xpi +# Source152-md5: 3fe6ee864f4707f809976238004682bf +Source153: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/km.xpi +# Source153-md5: be3bfe7ea998366dbf6f5ccaeb5a9718 +Source154: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/kn.xpi +# Source154-md5: db4ce7ed14b6921af9161f18c16077ba +Source155: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ko.xpi +# Source155-md5: d38a585471fab31b248f633e28b1494b +Source156: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/lij.xpi +# Source156-md5: a39b2c8bed3b43a4ce02f0b495fd2b6c +Source157: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/lt.xpi +# Source157-md5: cbc47f4c1c32d28b7179971cfcf97d6e +Source158: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/lv.xpi +# Source158-md5: 6b68b9ec4df08c9931262c4e84947e35 +Source159: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/mk.xpi +# Source159-md5: e0e7d4fae17663a00f24802e6e90284e +Source160: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/mr.xpi +# Source160-md5: 19cd2ee73c1fff44774aedca87b92c1b +Source161: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ms.xpi +# Source161-md5: f30432cb9ed87e41aa9390c908976903 +Source162: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/my.xpi +# Source162-md5: b88eec3d2adaecba3b4a155e6d732bda +Source163: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/nb-NO.xpi +# Source163-md5: d00cc442ea896c6c3d6f6d6c89278497 +Source164: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ne-NP.xpi +# Source164-md5: 2bddeeada6e724489e00fb55fcd73722 +Source165: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/nl.xpi +# Source165-md5: 011b5ac3f038ec2ba35312baa6b918ab +Source166: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/nn-NO.xpi +# Source166-md5: e09d1ba27a199f1546f96cf028befc15 +Source167: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/oc.xpi +# Source167-md5: 0f8631422a17e0dcf07a3230bf1aed5e +Source168: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/pa-IN.xpi +# Source168-md5: 0d1fb787d5a6741ddad19c05cc9d2ede +Source169: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/pl.xpi +# Source169-md5: 4104ebe0e20e5007a93fe2c2f1b10649 +Source170: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/pt-BR.xpi +# Source170-md5: 957d52816abc98c98223cdbf81ac4de3 +Source171: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/pt-PT.xpi +# Source171-md5: dd2aa8e492bf4508b31eef6a907dac61 +Source172: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/rm.xpi +# Source172-md5: 417120c40804a837e8a3818dc57f3dc0 +Source173: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ro.xpi +# Source173-md5: 060c4845f8c55ef5035c031c5c9e202d +Source174: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ru.xpi +# Source174-md5: 4b5e25932afb72b45919fe0c9a12b2b9 +Source175: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/si.xpi +# Source175-md5: 91d484f9aab23a4279ce52f70cd54a0a +Source176: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/sk.xpi +# Source176-md5: 3fee6f7410745c7c3320ca187286fdae +Source177: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/sl.xpi +# Source177-md5: 39b63eeeaab051426aa5765028a76393 +Source178: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/son.xpi +# Source178-md5: a40e6a711944df4f14cae2d40465053a +Source179: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/sq.xpi +# Source179-md5: 35d848568a4a42152ea054eadcf9ceee +Source180: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/sr.xpi +# Source180-md5: 8c4db34d0c2af465a8cdd3c1ac374fab +Source181: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/sv-SE.xpi +# Source181-md5: 8e5b7a3db9f97c5e920f380a6bf45a06 +Source182: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ta.xpi +# Source182-md5: f12f141305012267fa51faff9416657d +Source183: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/te.xpi +# Source183-md5: e47fed9ef222358b78751ac4d0ac790d +Source184: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/th.xpi +# Source184-md5: 5a2b4094ca325cb24a9eb76dfcae6b7c +Source185: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/tr.xpi +# Source185-md5: 432f3498c2da96b8eeb7e1aa7bdb5510 +Source186: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/uk.xpi +# Source186-md5: 3c91042cb31875981b5cd9531a4df49d +Source187: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/ur.xpi +# Source187-md5: d9b337caff616a64fa9bb603d46a371b +Source188: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/uz.xpi +# Source188-md5: 707e0b143a937045ba20d0ce516fbd20 +Source189: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/vi.xpi +# Source189-md5: 63f16c064cad8b0d803aaf95a5529676 +Source190: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/xh.xpi +# Source190-md5: 2af85bbd5132fd261fe64482b96a5071 +Source191: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/zh-CN.xpi +# Source191-md5: 7b4803f4890ee0b698403505de3546be +Source192: http://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/zh-TW.xpi +# Source192-md5: c0fcf287406101135700004203dc503c Patch4: %{name}-prefs.patch Patch5: %{name}-pld-bookmarks.patch @@ -288,7 +279,7 @@ BuildRequires: libatomic-devel BuildRequires: libevent-devel >= 1.4.7 # standalone libffi 3.0.9 or gcc's from 4.5(?)+ BuildRequires: libffi-devel >= 6:3.0.9 -%{?with_system_icu:BuildRequires: libicu-devel >= 59.1} +%{?with_system_icu:BuildRequires: libicu-devel >= 63.1} # requires libjpeg-turbo implementing at least libjpeg 6b API BuildRequires: libjpeg-devel >= 6b BuildRequires: libjpeg-turbo-devel @@ -296,11 +287,12 @@ BuildRequires: libpng(APNG)-devel >= 0.10 BuildRequires: libpng-devel >= 2:1.6.35 BuildRequires: libstdc++-devel >= 6:4.4 BuildRequires: libxcb-devel -BuildRequires: libvpx-devel >= 1.5.0 -%{?with_lto:BuildRequires: lld} +%{?with_system_libvpx:BuildRequires: libvpx-devel >= 1.7.0} +BuildRequires: libwebp-devel >= 1.0.2 +%{?with_clang:BuildRequires: lld} BuildRequires: llvm-devel >= 3.9.0 # or --disable-nodejs ? -BuildRequires: nodejs >= 8.11 +BuildRequires: nodejs >= 10.19 BuildRequires: nspr-devel >= 1:%{nspr_ver} BuildRequires: nss-devel >= 1:%{nss_ver} BuildRequires: pango-devel >= 1:1.22.0 @@ -313,13 +305,13 @@ BuildRequires: python-modules >= 1:2.5 %{?with_pgo:BuildRequires: python-modules-sqlite} BuildRequires: python-simplejson BuildRequires: python-virtualenv >= 15 +BuildRequires: python3-virtualenv >= 16 BuildRequires: readline-devel BuildRequires: rpm >= 4.4.9-56 BuildRequires: rpmbuild(macros) >= 1.601 BuildRequires: rust >= 1.32.0 -BuildRequires: rust-cbindgen >= 0.8.2 +BuildRequires: rust-cbindgen >= 0.12.0 BuildRequires: sed >= 4.0 -BuildRequires: sqlite3-devel >= 3.27.2 BuildRequires: startup-notification-devel >= 0.8 BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-lib-libXScrnSaver-devel @@ -350,17 +342,21 @@ Requires: hicolor-icon-theme Requires: libjpeg-turbo Requires: libpng >= 2:1.6.35 Requires: libpng(APNG) >= 0.10 -Requires: libvpx >= 1.5.0 +%{?with_system_libvpx:Requires: libvpx >= 1.7.0} Requires: myspell-common Requires: nspr >= 1:%{nspr_ver} Requires: nss >= 1:%{nss_ver} Requires: pango >= 1:1.22.0 Requires: pixman >= 0.19.2 -Requires: sqlite3 >= %{sqlite_build_version} Requires: startup-notification >= 0.8 Provides: xulrunner-libs = 2:%{version}-%{release} Provides: wwwbrowser Obsoletes: firefox-devel +Obsoletes: firefox-lang-as < 68.0-1 +Obsoletes: firefox-lang-en_ZA < 68.0-1 +Obsoletes: firefox-lang-mai < 68.0-1 +Obsoletes: firefox-lang-ml < 68.0-1 +Obsoletes: firefox-lang-or < 68.0-1 Obsoletes: firefox-libs Obsoletes: iceweasel Obsoletes: iceweasel-libs @@ -386,7 +382,10 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _noautoprovfiles %{_libdir}/%{name} # and as we don't provide them, don't require either -%define _noautoreq liblgpllibs.so libmozavcodec.so libmozavutil.so libmozgtk.so libmozjs.so libmozsandbox.so libxul.so +%define _noautoreq liblgpllibs.so libmozavcodec.so libmozavutil.so libmozgtk.so libmozjs.so libmozsandbox.so libmozsqlite3.so libmozwayland.so libxul.so + +# 67.0 libxul.so: debugedit: canonicalization unexpectedly shrank by one character +%define _enable_debug_packages 0 %description Firefox is an open-source web browser, designed for standards @@ -479,22 +478,6 @@ Arabic resources for Firefox. %description lang-ar -l pl.UTF-8 Arabskie pliki językowe dla Firefoksa. -%package lang-as -Summary: Assamese resources for Firefox -Summary(pl.UTF-8): Asamskie pliki językowe dla Firefoksa -Group: I18n -Requires: firefox >= %{version} -Provides: firefox-lang-resources = %{version} -Obsoletes: iceweasel-lang-as -Obsoletes: mozilla-firefox-lang-as -BuildArch: noarch - -%description lang-as -Assamese resources for Firefox. - -%description lang-as -l pl.UTF-8 -Asamskie pliki językowe dla Firefoksa. - %package lang-ast Summary: Asturian resources for Firefox Summary(pl.UTF-8): Asturyjskie pliki językowe dla Firefoksa @@ -565,6 +548,7 @@ Summary(pl.UTF-8): Bengalskie pliki językowe dla Firefoksa (wersja dla Banglade Group: I18n Requires: firefox >= %{version} Provides: firefox-lang-resources = %{version} +Obsoletes: firefox-lang-bn_IN Obsoletes: iceweasel-lang-bn Obsoletes: mozilla-firefox-lang-bn BuildArch: noarch @@ -820,23 +804,6 @@ English (American) resources for Firefox. %description lang-en_US -l pl.UTF-8 Angielskie (amerykańskie) pliki językowe dla Firefoksa. -%package lang-en_ZA -Summary: English (South Africa) resources for Firefox -Summary(pl.UTF-8): Angielskie pliki językowe dla Firefoksa (wersja dla RPA) -Group: I18n -Requires: firefox >= %{version} -Provides: firefox-lang-resources = %{version} -Obsoletes: iceweasel-lang-en_ZA -Obsoletes: mozilla-firefox-lang-en_ZA -BuildArch: noarch - -%description lang-en_ZA -English (South Africa) resources for Firefox. - -%description lang-en_ZA -l pl.UTF-8 -Angielskie pliki językowe dla Firefoksa (wersja dla Republiki -Południowej Afryki). - %package lang-eo Summary: Esperanto resources for Firefox Summary(pl.UTF-8): Pliki językowe esperanto dla Firefoksa @@ -1477,22 +1444,6 @@ Latvian resources for Firefox. %description lang-lv -l pl.UTF-8 Łotewskie pliki językowe dla Firefoksa. -%package lang-mai -Summary: Maithili resources for Firefox -Summary(pl.UTF-8): Pliki językowe maithili dla Firefoksa -Group: I18n -Requires: firefox >= %{version} -Provides: firefox-lang-resources = %{version} -Obsoletes: iceweasel-lang-mai -Obsoletes: mozilla-firefox-lang-mai -BuildArch: noarch - -%description lang-mai -Maithili resources for Firefox. - -%description lang-mai -l pl.UTF-8 -Pliki językowe maithili dla Firefoksa. - %package lang-mk Summary: Macedonian resources for Firefox Summary(pl.UTF-8): Macedońskie pliki językowe dla Firefoksa @@ -1509,22 +1460,6 @@ Macedonian resources for Firefox. %description lang-mk -l pl.UTF-8 Macedońskie pliki językowe dla Firefoksa. -%package lang-ml -Summary: Malayalam resources for Firefox -Summary(pl.UTF-8): Pliki językowe malajalam dla Firefoksa -Group: I18n -Requires: firefox >= %{version} -Provides: firefox-lang-resources = %{version} -Obsoletes: iceweasel-lang-ml -Obsoletes: mozilla-firefox-lang-ml -BuildArch: noarch - -%description lang-ml -Malayalam resources for Firefox. - -%description lang-ml -l pl.UTF-8 -Pliki językowe malajalam dla Firefoksa. - %package lang-mr Summary: Marathi resources for Firefox Summary(pl.UTF-8): Pliki językowe marathi dla Firefoksa @@ -1647,22 +1582,6 @@ Occitan resources for Firefox. %description lang-oc -l pl.UTF-8 Oksytańskie pliki językowe dla Firefoksa. -%package lang-or -Summary: Oriya resources for Firefox -Summary(pl.UTF-8): Pliki językowe orija dla Firefoksa -Group: I18n -Requires: firefox >= %{version} -Provides: firefox-lang-resources = %{version} -Obsoletes: iceweasel-lang-or -Obsoletes: mozilla-firefox-lang-or -BuildArch: noarch - -%description lang-or -Oriya resources for Firefox. - -%description lang-or -l pl.UTF-8 -Pliki językowe orija dla Firefoksa. - %package lang-pa Summary: Panjabi resources for Firefox Summary(pl.UTF-8): Pendżabskie pliki językowe dla Firefoksa @@ -2101,7 +2020,7 @@ unpack() { cp -p $file . } %define __unzip unpack -%setup -q %(seq -f '-a %g' 100 198 | xargs) +%setup -q %(seq -f '-a %g' 100 192 | xargs) %patch4 -p1 %patch5 -p1 @@ -2124,12 +2043,31 @@ cat << 'EOF' > .mozconfig %if %{with clang} export CC="clang" export CXX="clang++" +export LLVM_PROFDATA="llvm-profdata" +export AR="llvm-ar" +export NM="llvm-nm" +export RANLIB="llvm-ranlib" %else export CC="%{__cc}" export CXX="%{__cxx}" %endif +%ifarch %{ix86} +export CFLAGS="%{rpmcflags} %{!?with_system_libvpx:-mmmx} -D_FILE_OFFSET_BITS=64" +export CXXFLAGS="%{rpmcxxflags} -mmmx -D_FILE_OFFSET_BITS=64" +%else export CFLAGS="%{rpmcflags} -D_FILE_OFFSET_BITS=64" export CXXFLAGS="%{rpmcxxflags} -D_FILE_OFFSET_BITS=64" +%endif + +%if %{with lowmem} +export CFLAGS="$CFLAGS -g0" +export CXXFLAGS="$CXXFLAGS -g0" +export MOZ_DEBUG_FLAGS=" " +export LLVM_USE_SPLIT_DWARF=1 +export LLVM_PARALLEL_LINK_JOBS=1 +export MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads" +export RUSTFLAGS="-Cdebuginfo=0" +%endif mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-%{_target_cpu} @@ -2167,47 +2105,59 @@ ac_add_options --enable-default-toolkit=cairo-gtk3 ac_add_options --enable-extensions=default %{?with_geckodriver:ac_add_options --enable-geckodriver} %{?with_gold:ac_add_options --enable-linker=gold} -%if %{with lto} +%ifarch %{ix86} %{x8664} %{arm} ac_add_options --disable-elf-hack +%endif +%if %{with lto} ac_add_options --enable-lto -%else -ac_add_options --enable-elf-hack %endif +%{?with_clang:ac_add_options --enable-linker=lld} ac_add_options --enable-readline %{?with_shared_js:ac_add_options --enable-shared-js} ac_add_options --enable-startup-notification %{?with_system_cairo:ac_add_options --enable-system-cairo} ac_add_options --enable-system-ffi -ac_add_options --enable-system-sqlite %{?with_official:ac_add_options --enable-official-branding} ac_add_options --with-distribution-id=org.pld-linux ac_add_options --with-system-bz2 ac_add_options --with%{!?with_system_icu:out}-system-icu ac_add_options --with-system-jpeg ac_add_options --with-system-libevent -ac_add_options --with-system-libvpx +ac_add_options --with%{!?with_system_libvpx:out}-system-libvpx ac_add_options --with-system-nspr ac_add_options --with-system-nss ac_add_options --with-system-pixman ac_add_options --with-system-png +ac_add_options --with-system-webp ac_add_options --with-system-zlib # Workaround for mozbz#1341234 ac_add_options BINDGEN_CFLAGS="$(pkg-config nspr pixman-1 --cflags)" -%if %{with legacy_exts} -ac_add_options "MOZ_ALLOW_LEGACY_EXTENSIONS=1" -%endif EOF +%if ! %{with clang} +# On x86_64 architectures, Mozilla can build up to 4 jobs at once in parallel, +# however builds tend to fail on other arches when building in parallel. +MOZ_PARALLEL_BUILD=1 +%ifarch %{x8664} +jobs="%{__jobs}" +[ -n "$jobs" -a "$jobs" -gt 4 ] && MOZ_PARALLEL_BUILD=4 || MOZ_PARALLEL_BUILD="$jobs" +%endif +export MOZ_PARALLEL_BUILD +%else +%{?__jobs:export MOZ_PARALLEL_BUILD="%__jobs"} +%endif + +export MOZ_SERVICES_SYNC="1" %if %{with pgo} D=$(( RANDOM % (200 - 100 + 1 ) + 5 )) /usr/bin/Xvfb :${D} & XVFB_PID=$! [ -n "$XVFB_PID" ] || exit 1 export DISPLAY=:${D} -MOZ_PGO=1 AUTOCONF=/usr/bin/autoconf2_13 ./mach build -v +MOZ_PGO=1 AUTOCONF=/usr/bin/autoconf2_13 ./mach build kill $XVFB_PID %else -AUTOCONF=/usr/bin/autoconf2_13 ./mach build -v +AUTOCONF=/usr/bin/autoconf2_13 ./mach build %endif %install @@ -2260,23 +2210,6 @@ cp -a %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/defaults/preferences cp -a %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/defaults/preferences/vendor.js %endif -cat << 'EOF' > $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate -#!/bin/sh -umask 022 -rm -f %{_libdir}/%{name}/browser/components/{compreg,xpti}.dat - -# it attempts to touch files in $HOME/.mozilla -# beware if you run this with sudo!!! -export HOME=$(mktemp -d) -# also TMPDIR could be pointing to sudo user's homedir -unset TMPDIR TMP || : - -%{_libdir}/%{name}/firefox -register - -rm -rf $HOME -EOF -chmod 755 $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate - # GeckoMediaPlugin API headers install -d $RPM_BUILD_ROOT%{_includedir} cp -pr dom/media/gmp/gmp-api $RPM_BUILD_ROOT%{_includedir} @@ -2290,7 +2223,6 @@ done rm -rf $RPM_BUILD_ROOT %post -%{_sbindir}/%{name}-chrome+xpcom-generate %update_browser_plugins %update_icon_cache hicolor %update_desktop_database @@ -2304,7 +2236,6 @@ fi %files %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/%{name} -%attr(755,root,root) %{_sbindir}/%{name}-chrome+xpcom-generate %{_desktopdir}/firefox.desktop %{_iconsdir}/hicolor/*/apps/firefox.png @@ -2332,16 +2263,11 @@ fi %attr(755,root,root) %{_libdir}/%{name}/firefox-bin %attr(755,root,root) %{_libdir}/%{name}/pingsender %{_libdir}/%{name}/application.ini -%{_libdir}/%{name}/chrome.manifest %{_libdir}/%{name}/browser/blocklist.xml -%{_libdir}/%{name}/browser/chrome.manifest %{_libdir}/%{name}/browser/omni.ja -%{_libdir}/%{name}/browser/features/activity-stream@mozilla.org.xpi -%{_libdir}/%{name}/browser/features/aushelper@mozilla.org.xpi -%{_libdir}/%{name}/browser/features/firefox@getpocket.com.xpi +%{_libdir}/%{name}/browser/features/doh-rollout@mozilla.org.xpi %{_libdir}/%{name}/browser/features/formautofill@mozilla.org.xpi -%{_libdir}/%{name}/browser/features/onboarding@mozilla.org.xpi %{_libdir}/%{name}/browser/features/screenshots@mozilla.org.xpi %{_libdir}/%{name}/browser/features/webcompat@mozilla.org.xpi %{_libdir}/%{name}/browser/features/webcompat-reporter@mozilla.org.xpi @@ -2365,6 +2291,8 @@ fi %attr(755,root,root) %{_libdir}/%{name}/libmozavcodec.so %attr(755,root,root) %{_libdir}/%{name}/libmozavutil.so %attr(755,root,root) %{_libdir}/%{name}/libmozsandbox.so +%attr(755,root,root) %{_libdir}/%{name}/libmozsqlite3.so +%attr(755,root,root) %{_libdir}/%{name}/libmozwayland.so %{_libdir}/%{name}/dependentlibs.list %{_libdir}/%{name}/omni.ja %dir %{_libdir}/%{name}/gtk2 @@ -2391,10 +2319,6 @@ fi %defattr(644,root,root,755) %{_datadir}/%{name}/browser/extensions/langpack-ar@firefox.mozilla.org.xpi -%files lang-as -%defattr(644,root,root,755) -%{_datadir}/%{name}/browser/extensions/langpack-as@firefox.mozilla.org.xpi - %files lang-ast %defattr(644,root,root,755) %{_datadir}/%{name}/browser/extensions/langpack-ast@firefox.mozilla.org.xpi @@ -2413,11 +2337,7 @@ fi %files lang-bn %defattr(644,root,root,755) -%{_datadir}/%{name}/browser/extensions/langpack-bn-BD@firefox.mozilla.org.xpi - -%files lang-bn_IN -%defattr(644,root,root,755) -%{_datadir}/%{name}/browser/extensions/langpack-bn-IN@firefox.mozilla.org.xpi +%{_datadir}/%{name}/browser/extensions/langpack-bn@firefox.mozilla.org.xpi %files lang-br %defattr(644,root,root,755) @@ -2475,10 +2395,6 @@ fi %defattr(644,root,root,755) %{_datadir}/%{name}/browser/extensions/langpack-en-US@firefox.mozilla.org.xpi -%files lang-en_ZA -%defattr(644,root,root,755) -%{_datadir}/%{name}/browser/extensions/langpack-en-ZA@firefox.mozilla.org.xpi - %files lang-eo %defattr(644,root,root,755) %{_datadir}/%{name}/browser/extensions/langpack-eo@firefox.mozilla.org.xpi @@ -2631,18 +2547,10 @@ fi %defattr(644,root,root,755) %{_datadir}/%{name}/browser/extensions/langpack-lv@firefox.mozilla.org.xpi -%files lang-mai -%defattr(644,root,root,755) -%{_datadir}/%{name}/browser/extensions/langpack-mai@firefox.mozilla.org.xpi - %files lang-mk %defattr(644,root,root,755) %{_datadir}/%{name}/browser/extensions/langpack-mk@firefox.mozilla.org.xpi -%files lang-ml -%defattr(644,root,root,755) -%{_datadir}/%{name}/browser/extensions/langpack-ml@firefox.mozilla.org.xpi - %files lang-mr %defattr(644,root,root,755) %{_datadir}/%{name}/browser/extensions/langpack-mr@firefox.mozilla.org.xpi @@ -2675,10 +2583,6 @@ fi %defattr(644,root,root,755) %{_datadir}/%{name}/browser/extensions/langpack-oc@firefox.mozilla.org.xpi -%files lang-or -%defattr(644,root,root,755) -%{_datadir}/%{name}/browser/extensions/langpack-or@firefox.mozilla.org.xpi - %files lang-pa %defattr(644,root,root,755) %{_datadir}/%{name}/browser/extensions/langpack-pa-IN@firefox.mozilla.org.xpi