Hi, here's a rather large and tricky diff backporting firefox 59 to 6.2-stable, which i don't feel comfortable commiting without more extensive testing - so i'm calling for it here.
Problem is, 6.2 has: - nss 3.33 - sqlite 3.20 - rust 1.20 and firefox 59 requires: - features from rust 1.22 - sqlite 3.21 (bundled) - nss 3.35 (bundled) - building with bundled cairo building with bundled nss alone isnt possible, i'd also need to build against bundled nspr (for which backporting patches is required) so to get to a point where it build (*and* runs) i've had to: - fight 3 days - revert some upstream changes to bundled rust libraries/config - disable some nss-using features - build against bundled sqlite - build against bundled cairo Hence the rather invasive changes that requires testing. A word of warning, profiles are not *always* backwards-compatible (it was the case for the 57->58 update), so if you don't want to lose data in testing, use another profile. I'll commit this to -stable once i've received enough testing. It builds on i386 & amd64, and runs fine on amd64/6.2 here. I probably won't go through this butchery for the upcoming OpenBSD releases, might only commit updates from the ESR branches (ie 52 for firefox-esr, 60 for mozilla-firefox ?), with the constant requirement for newer rust stuff it's not really sustainable on the long term. Landry
? 59-hack.log ? patches-59 Index: Makefile =================================================================== RCS file: /cvs/ports/www/mozilla-firefox/Makefile,v retrieving revision 1.329.2.9 diff -u -r1.329.2.9 Makefile --- Makefile 8 Feb 2018 15:48:35 -0000 1.329.2.9 +++ Makefile 16 Mar 2018 06:20:53 -0000 @@ -5,14 +5,19 @@ # Don't forget to bump www/firefox-i18n after updates. -MOZILLA_VERSION = 58.0.2 +MOZILLA_VERSION = 59.0 MOZILLA_PROJECT = firefox MOZILLA_CODENAME = browser +MASTER_SITES = https://distfiles.bsdfrog.org/mozilla/ +DISTNAME = ${MOZILLA_DIST}-${MOZILLA_DIST_VERSION} +EXTRACT_SUFX = .tar.bz2 +WRKDIST = ${WRKDIR}/mozilla-release-c61f5f5ead48c78a80c80db5c489bdc7cfaf8175 + SO_VERSION = 74.0 # NOTE: Must bump minor version if any shlib's are removed from the # components dir to avoid pkg_add -r issues. -MOZILLA_LIBS = mozavcodec mozavutil mozgtk xul clearkey lgpllibs +MOZILLA_LIBS = mozavcodec mozavutil mozgtk xul clearkey lgpllibs mozsqlite3 CATEGORIES = www @@ -29,6 +34,11 @@ # firefox >= 44 doesnt build with base libevent MOZILLA_USE_BUNDLED_LIBEVENT = Yes +# firefox >= 59 doesnt build with base cairo +MOZILLA_USE_BUNDLED_CAIRO = Yes +# firefox >= 59 looks for SSL_ENABLE_TLS13_COMPAT_MODE which isnt in nss 3.33 +#MOZILLA_USE_BUNDLED_NSS = Yes +MOZILLA_USE_BUNDLED_SQLITE = Yes # firefox >= 46 defaults to gtk+3 MOZILLA_USE_GTK3 = Yes # 56 requires 59.1 @@ -55,29 +65,34 @@ # bug 1341234 CONFIGURE_ARGS += --disable-stylo +pre-configure: + cp ${WRKSRC}/${CONFIGURE_SCRIPT}.in ${WRKSRC}/${CONFIGURE_SCRIPT}; \ + cp ${WRKSRC}/js/src/${CONFIGURE_SCRIPT}.in ${WRKSRC}/js/src/${CONFIGURE_SCRIPT}; \ + chmod +x ${WRKSRC}/${CONFIGURE_SCRIPT} + post-install: ${SUBST_MAN} ${FILESDIR}/mozilla-firefox.1 \ ${PREFIX}/man/man1/mozilla-firefox.1 cd ${PREFIX}/man/man1/ && ln -sf mozilla-firefox.1 firefox.1 cd ${PREFIX}/bin/ && ln -sf firefox mozilla-firefox # install prefs - ${INSTALL_DATA_DIR} ${PREFIX}/lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/defaults/preferences + ${INSTALL_DATA_DIR} ${PREFIX}/lib/${MOZILLA_PROJECT}/browser/defaults/preferences ${SUBST_DATA} ${FILESDIR}/all-openbsd.js \ - ${PREFIX}/lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/defaults/preferences/all-openbsd.js + ${PREFIX}/lib/${MOZILLA_PROJECT}/browser/defaults/preferences/all-openbsd.js # install distribution.ini file - ${INSTALL_DATA_DIR} ${PREFIX}/lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/distribution + ${INSTALL_DATA_DIR} ${PREFIX}/lib/${MOZILLA_PROJECT}/distribution echo "[Global]\nid=OpenBSD\nversion=${OSREV}\nabout=Packaged by ${MAINTAINER}\n" > \ - ${PREFIX}/lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/distribution/distribution.ini + ${PREFIX}/lib/${MOZILLA_PROJECT}/distribution/distribution.ini # install desktop file ${INSTALL_DATA_DIR} ${PREFIX}/share/applications/ ${SUBST_DATA} ${FILESDIR}/${MOZILLA_PROJECT}.desktop \ ${PREFIX}/share/applications/${MOZILLA_PROJECT}.desktop # install icon for desktop file ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps/ - ${INSTALL_DATA} ${PREFIX}/lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/icons/mozicon128.png \ + ${INSTALL_DATA} ${PREFIX}/lib/${MOZILLA_PROJECT}/browser/chrome/icons/default/default128.png \ ${PREFIX}/share/pixmaps/firefox.png # link default48.png to default.png to be used by default by non-icccm compliant wm - ln ${PREFIX}/lib/firefox-${MOZILLA_VER}/browser/chrome/icons/default/default{48,}.png + ln ${PREFIX}/lib/${MOZILLA_PROJECT}/browser/chrome/icons/default/default{48,}.png .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/www/mozilla-firefox/distinfo,v retrieving revision 1.155.2.9 diff -u -r1.155.2.9 distinfo --- distinfo 8 Feb 2018 15:48:35 -0000 1.155.2.9 +++ distinfo 16 Mar 2018 06:20:53 -0000 @@ -1,2 +1,2 @@ -SHA256 (mozilla/firefox-58.0.2.source.tar.xz) = K3eU5MKiT6OI86yylWyWuyw+rkVUZ/DjhniOuupyQMM= -SIZE (mozilla/firefox-58.0.2.source.tar.xz) = 247576952 +SHA256 (mozilla/firefox-59.0.tar.bz2) = HFkeUsqAjDv73Nm8ygyMFFf+lQP6zifN5icqO3ka/sQ= +SIZE (mozilla/firefox-59.0.tar.bz2) = 304957396 Index: patches/patch-_cargo_config_in =================================================================== RCS file: patches/patch-_cargo_config_in diff -N patches/patch-_cargo_config_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-_cargo_config_in 16 Mar 2018 06:20:53 -0000 @@ -0,0 +1,19 @@ +$OpenBSD$ + +Revert https://hg.mozilla.org/mozilla-central/rev/2ee03038f5e5 + +Index: .cargo/config.in +--- .cargo/config.in.orig ++++ .cargo/config.in +@@ -7,11 +7,6 @@ + registry = 'https://github.com/rust-lang/crates.io-index' + replace-with = 'vendored-sources' + +-[source."https://github.com/gankro/serde";] +-git = "https://github.com/gankro/serde"; +-branch = "deserialize_from_enums4" +-replace-with = "vendored-sources" +- + [source.vendored-sources] + directory = '@top_srcdir@/third_party/rust' + Index: patches/patch-build_moz_configure_rust_configure =================================================================== RCS file: /cvs/ports/www/mozilla-firefox/patches/Attic/patch-build_moz_configure_rust_configure,v retrieving revision 1.1.4.1 diff -u -r1.1.4.1 patch-build_moz_configure_rust_configure --- patches/patch-build_moz_configure_rust_configure 23 Jan 2018 19:36:15 -0000 1.1.4.1 +++ patches/patch-build_moz_configure_rust_configure 16 Mar 2018 06:20:53 -0000 @@ -5,11 +5,11 @@ Index: build/moz.configure/rust.configure --- build/moz.configure/rust.configure.orig +++ build/moz.configure/rust.configure -@@ -58,7 +58,7 @@ def rust_compiler(rustc_info, cargo_info): +@@ -67,7 +67,7 @@ def rust_compiler(rustc_info, cargo_info): You can install rust by running './mach bootstrap' or by directly running the installer from https://rustup.rs/ ''')) -- rustc_min_version = Version('1.21.0') +- rustc_min_version = Version('1.22.1') + rustc_min_version = Version('1.20.0') cargo_min_version = Version('0.{}'.format(rustc_min_version.minor + 1)) Index: patches/patch-dom_webauthn_u2f-hid-rs_Cargo_toml =================================================================== RCS file: patches/patch-dom_webauthn_u2f-hid-rs_Cargo_toml diff -N patches/patch-dom_webauthn_u2f-hid-rs_Cargo_toml --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-dom_webauthn_u2f-hid-rs_Cargo_toml 16 Mar 2018 06:20:53 -0000 @@ -0,0 +1,17 @@ +$OpenBSD$ + +Drop useless libudev dependency + +Index: dom/webauthn/u2f-hid-rs/Cargo.toml +--- dom/webauthn/u2f-hid-rs/Cargo.toml.orig ++++ dom/webauthn/u2f-hid-rs/Cargo.toml +@@ -3,9 +3,6 @@ name = "u2fhid" + version = "0.1.0" + authors = ["Kyle Machulis <k...@nonpolynomial.com>", "J.C. Jones <j...@mozilla.com>", "Tim Taubert <ttaub...@mozilla.com>"] + +-[target.'cfg(target_os = "linux")'.dependencies] +-libudev = "^0.2" +- + [target.'cfg(target_os = "macos")'.dependencies] + core-foundation-sys = "0.3.1" + Index: patches/patch-intl_icu_source_Makefile_in =================================================================== RCS file: /cvs/ports/www/mozilla-firefox/patches/patch-intl_icu_source_Makefile_in,v retrieving revision 1.5 diff -u -r1.5 patch-intl_icu_source_Makefile_in --- patches/patch-intl_icu_source_Makefile_in 28 Sep 2017 16:39:11 -0000 1.5 +++ patches/patch-intl_icu_source_Makefile_in 16 Mar 2018 06:20:53 -0000 @@ -12,7 +12,7 @@ Index: intl/icu/source/Makefile.in --- intl/icu/source/Makefile.in.orig +++ intl/icu/source/Makefile.in -@@ -329,7 +329,7 @@ $(top_builddir)/config/pkgdataMakefile: +@@ -331,7 +331,7 @@ $(top_builddir)/config/pkgdataMakefile: $(top_builddir)/config/icu-config: $(top_builddir)/Makefile $(top_srcdir)/config/icu-config-top $(top_srcdir)/config/icu-config-bottom $(top_builddir)/config/Makefile.inc @platform_make_fragment@ $(top_srcdir)/config/make2sh.sed -$(RMV) $@ Index: patches/patch-old-configure =================================================================== RCS file: patches/patch-old-configure diff -N patches/patch-old-configure --- patches/patch-old-configure 23 Jan 2018 19:36:15 -0000 1.1.2.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-old-configure,v 1.1.2.1 2018/01/23 19:36:15 landry Exp $ - -Loosen the nss version check - -Index: old-configure ---- old-configure.orig -+++ old-configure -@@ -10258,7 +10258,7 @@ else - echo "$ac_t""no" 1>&6 - fi - -- min_nss_version=3.34.1 -+ min_nss_version=3.33 - echo $ac_n "checking for NSS - version >= $min_nss_version""... $ac_c" 1>&6 - echo "configure:10264: checking for NSS - version >= $min_nss_version" >&5 - Index: patches/patch-old-configure_in =================================================================== RCS file: patches/patch-old-configure_in diff -N patches/patch-old-configure_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-old-configure_in 16 Mar 2018 06:20:53 -0000 @@ -0,0 +1,32 @@ +$OpenBSD$ + +Index: old-configure.in +--- old-configure.in.orig ++++ old-configure.in +@@ -48,7 +48,7 @@ dnl ================================================== + MOZJPEG=62 + MOZPNG=10634 + NSPR_VERSION=4 +-NSPR_MINVER=4.18 ++NSPR_MINVER=4.17 + NSS_VERSION=3 + + dnl Set the minimum version of toolkit libs used by mozilla +@@ -66,7 +66,7 @@ W32API_VERSION=3.14 + GCONF_VERSION=1.2.1 + STARTUP_NOTIFICATION_VERSION=0.8 + DBUS_VERSION=0.60 +-SQLITE_VERSION=3.21.0 ++SQLITE_VERSION=3.20.1 + + dnl Set various checks + dnl ======================================================== +@@ -1805,7 +1805,7 @@ MOZ_ARG_WITH_BOOL(system-nss, + _USE_SYSTEM_NSS=1 ) + + if test -n "$_USE_SYSTEM_NSS"; then +- AM_PATH_NSS(3.35, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) ++ AM_PATH_NSS(3.33, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) + fi + + if test -n "$MOZ_SYSTEM_NSS"; then Index: patches/patch-security_manager_pki_resources_content_exceptionDialog_js =================================================================== RCS file: /cvs/ports/www/mozilla-firefox/patches/patch-security_manager_pki_resources_content_exceptionDialog_js,v retrieving revision 1.13 diff -u -r1.13 patch-security_manager_pki_resources_content_exceptionDialog_js --- patches/patch-security_manager_pki_resources_content_exceptionDialog_js 8 Aug 2017 10:17:15 -0000 1.13 +++ patches/patch-security_manager_pki_resources_content_exceptionDialog_js 16 Mar 2018 06:20:53 -0000 @@ -3,7 +3,7 @@ Index: security/manager/pki/resources/content/exceptionDialog.js --- security/manager/pki/resources/content/exceptionDialog.js.orig +++ security/manager/pki/resources/content/exceptionDialog.js -@@ -242,6 +242,7 @@ function updateCertStatus() { +@@ -217,6 +217,7 @@ function updateCertStatus() { // In these cases, we do want to enable the "Add Exception" button gDialog.getButton("extra1").disabled = false; Index: patches/patch-security_manager_ssl_nsNSSIOLayer_cpp =================================================================== RCS file: patches/patch-security_manager_ssl_nsNSSIOLayer_cpp diff -N patches/patch-security_manager_ssl_nsNSSIOLayer_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-security_manager_ssl_nsNSSIOLayer_cpp 16 Mar 2018 06:20:53 -0000 @@ -0,0 +1,21 @@ +$OpenBSD$ + +nss 3.33 doesn't haveSSL_ENABLE_TLS13_COMPAT_MODE and TLS 1.3 isnt enabled anyway. + +Index: security/manager/ssl/nsNSSIOLayer.cpp +--- security/manager/ssl/nsNSSIOLayer.cpp.orig ++++ security/manager/ssl/nsNSSIOLayer.cpp +@@ -2576,11 +2576,12 @@ nsSSLIOLayerSetOptions(PRFileDesc* fd, bool forSTARTTL + } + + // Set TLS 1.3 compat mode. ++/* + if (SECSuccess != SSL_OptionSet(fd, SSL_ENABLE_TLS13_COMPAT_MODE, PR_TRUE)) { + MOZ_LOG(gPIPNSSLog, LogLevel::Error, + ("[%p] nsSSLIOLayerSetOptions: Setting compat mode failed\n", fd)); + } +- ++*/ + // setting TLS max version + uint32_t versionFlags = + getTLSProviderFlagMaxVersion(infoObject->GetProviderTlsFlags()); Index: patches/patch-storage_mozStorageConnection_cpp =================================================================== RCS file: /cvs/ports/www/mozilla-firefox/patches/patch-storage_mozStorageConnection_cpp,v retrieving revision 1.10.2.1 diff -u -r1.10.2.1 patch-storage_mozStorageConnection_cpp --- patches/patch-storage_mozStorageConnection_cpp 23 Jan 2018 19:36:15 -0000 1.10.2.1 +++ patches/patch-storage_mozStorageConnection_cpp 16 Mar 2018 06:20:53 -0000 @@ -6,7 +6,7 @@ Index: storage/mozStorageConnection.cpp --- storage/mozStorageConnection.cpp.orig +++ storage/mozStorageConnection.cpp -@@ -800,6 +800,13 @@ Connection::initializeInternal() +@@ -843,6 +843,13 @@ Connection::initializeInternal() return convertResultCode(srv); } Index: patches/patch-third_party_rust_serde_derive__cargo-checksum_json =================================================================== RCS file: patches/patch-third_party_rust_serde_derive__cargo-checksum_json diff -N patches/patch-third_party_rust_serde_derive__cargo-checksum_json --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-third_party_rust_serde_derive__cargo-checksum_json 16 Mar 2018 06:20:53 -0000 @@ -0,0 +1,9 @@ +$OpenBSD$ + +Index: third_party/rust/serde_derive/.cargo-checksum.json +--- third_party/rust/serde_derive/.cargo-checksum.json.orig ++++ third_party/rust/serde_derive/.cargo-checksum.json +@@ -1 +1 @@ +-{"files":{"Cargo.toml":"f4d63b1c5051b3e0e32fe70dabff07245e8d7e89381b1ed99789072083453201","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"7dc6376a88195594cd6b43cb891aad10f57144ff737178b55d046aa04739b43a","src/bound.rs":"a10e5a103ce3866f8701e80c429106aa6b67b8250026ed2c0d36977748d4cc97","src/de.rs":"991ec19db1b486c2e91bce3f097f8f247ab6122eb8900a2c9267fa9c9e493417","src/fragment.rs":"5a63181171d4d05cea9f28d8ed27a550bc8ac176ee90a911a0598fbe340eec1a","src/lib.rs":"40817849b19a73459fbe5955cf22fb73f634e54df53bb309a0b6e4750b310ea6","src/ser.rs":"0ca344ccbe227f99bb875fe583b97757beb8233dc39acb1836782937c9036bd6"},"package":null} +\ No newline at end of file ++{"files":{"Cargo.toml":"f4d63b1c5051b3e0e32fe70dabff07245e8d7e89381b1ed99789072083453201","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"7dc6376a88195594cd6b43cb891aad10f57144ff737178b55d046aa04739b43a","src/bound.rs":"a10e5a103ce3866f8701e80c429106aa6b67b8250026ed2c0d36977748d4cc97","src/de.rs":"991ec19db1b486c2e91bce3f097f8f247ab6122eb8900a2c9267fa9c9e493417","src/fragment.rs":"5a63181171d4d05cea9f28d8ed27a550bc8ac176ee90a911a0598fbe340eec1a","src/lib.rs":"40817849b19a73459fbe5955cf22fb73f634e54df53bb309a0b6e4750b310ea6","src/ser.rs":"0ca344ccbe227f99bb875fe583b97757beb8233dc39acb1836782937c9036bd6"},"package":"10552fad5500771f3902d0c5ba187c5881942b811b7ba0d8fbbfbf84d80806d3"} Index: patches/patch-third_party_rust_serde_derive_internals__cargo-checksum_json =================================================================== RCS file: patches/patch-third_party_rust_serde_derive_internals__cargo-checksum_json diff -N patches/patch-third_party_rust_serde_derive_internals__cargo-checksum_json --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-third_party_rust_serde_derive_internals__cargo-checksum_json 16 Mar 2018 06:20:53 -0000 @@ -0,0 +1,9 @@ +$OpenBSD$ + +Index: third_party/rust/serde_derive_internals/.cargo-checksum.json +--- third_party/rust/serde_derive_internals/.cargo-checksum.json.orig ++++ third_party/rust/serde_derive_internals/.cargo-checksum.json +@@ -1 +1 @@ +-{"files":{"Cargo.toml":"714507185f11d1717d52710ca58df5c6427a808590543bb3b33e9b05bb8bbf92","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"7dc6376a88195594cd6b43cb891aad10f57144ff737178b55d046aa04739b43a","src/ast.rs":"803beccc3b527f926596acfe555fcc0069beebb23ffe1fb8cc0d2faac44fa8f7","src/attr.rs":"af9afd1a768db4d272ff13ff06412eae8d5edc57be0a29b396de8895499436c1","src/case.rs":"8d50d3db3c74c569c75bcf4b285d21bf176940a2efae0656bef769334d62793c","src/check.rs":"dd9d9723bd4d21787cdcff00d6b672f16276088ff0373d20e3fb3eca61580518","src/ctxt.rs":"e842cc73bfd648f14f3bad73e3db321d6cd0f94d255d59e81ed768486fe5deda","src/lib.rs":"5546043bf2cc6d81c1f323df0bd391ad53125f759f217e46e18d035df422b981"},"package":null} +\ No newline at end of file ++{"files":{"Cargo.toml":"714507185f11d1717d52710ca58df5c6427a808590543bb3b33e9b05bb8bbf92","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"6485b8ed310d3f0340bf1ad1f47645069ce4069dcc6bb46c7d5c6faf41de1fdb","README.md":"7dc6376a88195594cd6b43cb891aad10f57144ff737178b55d046aa04739b43a","src/ast.rs":"803beccc3b527f926596acfe555fcc0069beebb23ffe1fb8cc0d2faac44fa8f7","src/attr.rs":"af9afd1a768db4d272ff13ff06412eae8d5edc57be0a29b396de8895499436c1","src/case.rs":"8d50d3db3c74c569c75bcf4b285d21bf176940a2efae0656bef769334d62793c","src/check.rs":"dd9d9723bd4d21787cdcff00d6b672f16276088ff0373d20e3fb3eca61580518","src/ctxt.rs":"e842cc73bfd648f14f3bad73e3db321d6cd0f94d255d59e81ed768486fe5deda","src/lib.rs":"5546043bf2cc6d81c1f323df0bd391ad53125f759f217e46e18d035df422b981"},"package":"37aee4e0da52d801acfbc0cc219eb1eda7142112339726e427926a6f6ee65d3a"} Index: patches/patch-toolkit_library_rust_Cargo_lock =================================================================== RCS file: patches/patch-toolkit_library_rust_Cargo_lock diff -N patches/patch-toolkit_library_rust_Cargo_lock --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-toolkit_library_rust_Cargo_lock 16 Mar 2018 06:20:53 -0000 @@ -0,0 +1,104 @@ +$OpenBSD$ + +Index: toolkit/library/rust/Cargo.lock +--- toolkit/library/rust/Cargo.lock.orig ++++ toolkit/library/rust/Cargo.lock +@@ -57,7 +57,7 @@ dependencies = [ + "mio 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", + "mio-uds 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde_derive 1.0.27 (git+https://github.com/gankro/serde?branch=deserialize_from_enums4)", ++ "serde_derive 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", + ] + + [[package]] +@@ -397,7 +397,7 @@ dependencies = [ + "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde_derive 1.0.27 (git+https://github.com/gankro/serde?branch=deserialize_from_enums4)", ++ "serde_derive 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + ] + +@@ -702,23 +702,6 @@ dependencies = [ + ] + + [[package]] +-name = "libudev" +-version = "0.2.0" +-source = "registry+https://github.com/rust-lang/crates.io-index"; +-dependencies = [ +- "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", +- "libudev-sys 0.1.3", +-] +- +-[[package]] +-name = "libudev-sys" +-version = "0.1.3" +-dependencies = [ +- "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", +- "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", +-] +- +-[[package]] + name = "log" + version = "0.3.8" + source = "registry+https://github.com/rust-lang/crates.io-index"; +@@ -1147,17 +1130,17 @@ source = "registry+https://github.com/rust-lang/crates + [[package]] + name = "serde_derive" + version = "1.0.27" +-source = "git+https://github.com/gankro/serde?branch=deserialize_from_enums4#93e24f268ab99c0df10e2183587284e02ca30e9e"; ++source = "registry+https://github.com/rust-lang/crates.io-index"; + dependencies = [ + "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde_derive_internals 0.19.0 (git+https://github.com/gankro/serde?branch=deserialize_from_enums4)", ++ "serde_derive_internals 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", + ] + + [[package]] + name = "serde_derive_internals" + version = "0.19.0" +-source = "git+https://github.com/gankro/serde?branch=deserialize_from_enums4#93e24f268ab99c0df10e2183587284e02ca30e9e"; ++source = "registry+https://github.com/rust-lang/crates.io-index"; + dependencies = [ + "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", + "synom 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -1385,7 +1368,6 @@ dependencies = [ + "core-foundation-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", +- "libudev 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", + "runloop 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +@@ -1511,7 +1493,7 @@ dependencies = [ + "dwrote 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "euclid 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", +- "serde_derive 1.0.27 (git+https://github.com/gankro/serde?branch=deserialize_from_enums4)", ++ "serde_derive 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", + ] + +@@ -1635,7 +1617,6 @@ dependencies = [ + "checksum lazycell 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce12306c4739d86ee97c23139f3a34ddf0387bbf181bc7929d287025a8c3ef6b" + "checksum libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "5ba3df4dcb460b9dfbd070d41c94c19209620c191b0340b929ce748a2bcd42d2" + "checksum libloading 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be99f814beb3e9503a786a592c909692bb6d4fc5a695f6ed7987223acfbd5194" +-"checksum libudev 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea626d3bdf40a1c5aee3bcd4f40826970cae8d80a8fec934c82a63840094dcfe" + "checksum log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "880f77541efa6e5cc74e76910c9884d9859683118839d6a1dc3b11e63512565b" + "checksum matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "100aabe6b8ff4e4a7e32c1c13523379802df0772b82466207ac25b013f193376" + "checksum memchr 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "148fab2e51b4f1cfc66da2a7c32981d1d3c083a803978268bb11fe4b86925e7a" +@@ -1678,8 +1659,8 @@ dependencies = [ + "checksum semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a3186ec9e65071a2095434b1f5bb24838d4e8e130f584c790f6033c79943537" + "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + "checksum serde 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)" = "db99f3919e20faa51bb2996057f5031d8685019b5a06139b1ce761da671b8526" +-"checksum serde_derive 1.0.27 (git+https://github.com/gankro/serde?branch=deserialize_from_enums4)" = "<none>" +-"checksum serde_derive_internals 0.19.0 (git+https://github.com/gankro/serde?branch=deserialize_from_enums4)" = "<none>" ++"checksum serde_derive 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)" = "10552fad5500771f3902d0c5ba187c5881942b811b7ba0d8fbbfbf84d80806d3" ++"checksum serde_derive_internals 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)" = "37aee4e0da52d801acfbc0cc219eb1eda7142112339726e427926a6f6ee65d3a" + "checksum simd 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a94d14a2ae1f1f110937de5fb69e494372560181c7e1739a097fcc2cee37ba0" + "checksum siphasher 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2ffc669b726f2bc9a3bcff66e5e23b56ba6bf70e22a34c3d7b6d0b3450b65b84" + "checksum slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23" Index: patches/patch-toolkit_library_rust_Cargo_toml =================================================================== RCS file: patches/patch-toolkit_library_rust_Cargo_toml diff -N patches/patch-toolkit_library_rust_Cargo_toml --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-toolkit_library_rust_Cargo_toml 16 Mar 2018 06:20:53 -0000 @@ -0,0 +1,16 @@ +$OpenBSD$ + +revert https://hg.mozilla.org/mozilla-central/rev/82c4bf2512de which breaks the build with old rust +https://hg.mozilla.org/mozilla-central/rev/2ee03038f5e5 is dropped too + +Index: toolkit/library/rust/Cargo.toml +--- toolkit/library/rust/Cargo.toml.orig ++++ toolkit/library/rust/Cargo.toml +@@ -45,7 +45,3 @@ opt-level = 2 + rpath = false + debug-assertions = false + panic = "abort" +- +-[patch.crates-io] +-libudev-sys = { path = "../../../dom/webauthn/libudev-sys" } +-serde_derive = { git = "https://github.com/gankro/serde";, branch = "deserialize_from_enums4", feature = "deserialize_in_place" } Index: patches/patch-widget_nsPrintSettingsImpl_cpp =================================================================== RCS file: /cvs/ports/www/mozilla-firefox/patches/patch-widget_nsPrintSettingsImpl_cpp,v retrieving revision 1.3 diff -u -r1.3 patch-widget_nsPrintSettingsImpl_cpp --- patches/patch-widget_nsPrintSettingsImpl_cpp 27 Apr 2016 13:50:27 -0000 1.3 +++ patches/patch-widget_nsPrintSettingsImpl_cpp 16 Mar 2018 06:20:53 -0000 @@ -1,7 +1,8 @@ $OpenBSD: patch-widget_nsPrintSettingsImpl_cpp,v 1.3 2016/04/27 13:50:27 landry Exp $ ---- widget/nsPrintSettingsImpl.cpp.orig Thu Mar 24 23:41:04 2016 -+++ widget/nsPrintSettingsImpl.cpp Sun Mar 27 12:17:44 2016 -@@ -30,7 +30,7 @@ nsPrintSettings::nsPrintSettings() : +Index: widget/nsPrintSettingsImpl.cpp +--- widget/nsPrintSettingsImpl.cpp.orig ++++ widget/nsPrintSettingsImpl.cpp +@@ -26,7 +26,7 @@ nsPrintSettings::nsPrintSettings() : mIsCancelled(false), mPrintSilent(false), mPrintPreview(false), Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/www/mozilla-firefox/pkg/PLIST,v retrieving revision 1.69.2.2 diff -u -r1.69.2.2 PLIST --- pkg/PLIST 23 Jan 2018 19:36:15 -0000 1.69.2.2 +++ pkg/PLIST 16 Mar 2018 06:20:53 -0000 @@ -11,65 +11,66 @@ @pkgpath www/mozilla-firefox,-main bin/${MOZILLA_PROJECT} bin/mozilla-${MOZILLA_PROJECT} -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/ -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/application.ini -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/ -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/blocklist.xml -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/chrome/ -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/chrome.manifest -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/chrome/icons/ -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/chrome/icons/default/ -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/chrome/icons/default/default.png -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/chrome/icons/default/default16.png -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/chrome/icons/default/default32.png -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/chrome/icons/default/default48.png -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/defaults/ -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/defaults/preferences/ -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/defaults/preferences/all-openbsd.js -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/extensions/ -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/features/ -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/features/activity-str...@mozilla.org.xpi -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/features/aushel...@mozilla.org.xpi -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/features/fire...@getpocket.com.xpi -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/features/followonsea...@mozilla.com.xpi -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/features/formautof...@mozilla.org.xpi -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/features/onboard...@mozilla.org.xpi -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/features/screensh...@mozilla.org.xpi -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/features/shield-recipe-cli...@mozilla.org.xpi -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/features/webcom...@mozilla.org.xpi -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/icons/ -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/icons/mozicon128.png -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/browser/omni.ja -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/chrome.manifest -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/defaults/ -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/defaults/pref/ -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/defaults/pref/channel-prefs.js -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/dependentlibs.list -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/dictionaries/ -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/dictionaries/en-US.aff -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/dictionaries/en-US.dic -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/distribution/ -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/distribution/distribution.ini -@bin lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/${MOZILLA_PROJECT} -@bin lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/${MOZILLA_PROJECT}-bin -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/gmp-clearkey/ -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/gmp-clearkey/0.1/ -@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/gmp-clearkey/0.1/libclearkey.so.${LIBclearkey_VERSION} -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/gmp-clearkey/0.1/manifest.json -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/gtk2/ -@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/gtk2/libmozgtk.so.${LIBmozgtk_VERSION} -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/icudt59l.dat -@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/liblgpllibs.so.${LIBlgpllibs_VERSION} -@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/libmozavcodec.so.${LIBmozavcodec_VERSION} -@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/libmozavutil.so.${LIBmozavutil_VERSION} -@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/libmozgtk.so.${LIBmozgtk_VERSION} -@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/libxul.so.${LIBxul_VERSION} -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/omni.ja -@bin lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/pingsender -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/platform.ini -@bin lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/plugin-container -lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/removed-files +lib/${MOZILLA_PROJECT}/ +lib/${MOZILLA_PROJECT}/application.ini +lib/${MOZILLA_PROJECT}/browser/ +lib/${MOZILLA_PROJECT}/browser/blocklist.xml +lib/${MOZILLA_PROJECT}/browser/chrome/ +lib/${MOZILLA_PROJECT}/browser/chrome.manifest +lib/${MOZILLA_PROJECT}/browser/chrome/icons/ +lib/${MOZILLA_PROJECT}/browser/chrome/icons/default/ +lib/${MOZILLA_PROJECT}/browser/chrome/icons/default/default.png +lib/${MOZILLA_PROJECT}/browser/chrome/icons/default/default128.png +lib/${MOZILLA_PROJECT}/browser/chrome/icons/default/default16.png +lib/${MOZILLA_PROJECT}/browser/chrome/icons/default/default32.png +lib/${MOZILLA_PROJECT}/browser/chrome/icons/default/default48.png +lib/${MOZILLA_PROJECT}/browser/chrome/icons/default/default64.png +lib/${MOZILLA_PROJECT}/browser/defaults/ +lib/${MOZILLA_PROJECT}/browser/defaults/preferences/ +lib/${MOZILLA_PROJECT}/browser/defaults/preferences/all-openbsd.js +lib/${MOZILLA_PROJECT}/browser/extensions/ +lib/${MOZILLA_PROJECT}/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi +lib/${MOZILLA_PROJECT}/browser/features/ +lib/${MOZILLA_PROJECT}/browser/features/activity-str...@mozilla.org.xpi +lib/${MOZILLA_PROJECT}/browser/features/aushel...@mozilla.org.xpi +lib/${MOZILLA_PROJECT}/browser/features/${MOZILLA_PROJECT}@getpocket.com.xpi +lib/${MOZILLA_PROJECT}/browser/features/followonsea...@mozilla.com.xpi +lib/${MOZILLA_PROJECT}/browser/features/formautof...@mozilla.org.xpi +lib/${MOZILLA_PROJECT}/browser/features/onboard...@mozilla.org.xpi +lib/${MOZILLA_PROJECT}/browser/features/screensh...@mozilla.org.xpi +lib/${MOZILLA_PROJECT}/browser/features/shield-recipe-cli...@mozilla.org.xpi +lib/${MOZILLA_PROJECT}/browser/features/webcom...@mozilla.org.xpi +lib/${MOZILLA_PROJECT}/browser/omni.ja +lib/${MOZILLA_PROJECT}/chrome.manifest +lib/${MOZILLA_PROJECT}/defaults/ +lib/${MOZILLA_PROJECT}/defaults/pref/ +lib/${MOZILLA_PROJECT}/defaults/pref/channel-prefs.js +lib/${MOZILLA_PROJECT}/dependentlibs.list +lib/${MOZILLA_PROJECT}/dictionaries/ +lib/${MOZILLA_PROJECT}/dictionaries/en-US.aff +lib/${MOZILLA_PROJECT}/dictionaries/en-US.dic +lib/${MOZILLA_PROJECT}/distribution/ +lib/${MOZILLA_PROJECT}/distribution/distribution.ini +@bin lib/${MOZILLA_PROJECT}/${MOZILLA_PROJECT} +@bin lib/${MOZILLA_PROJECT}/${MOZILLA_PROJECT}-bin +lib/${MOZILLA_PROJECT}/gmp-clearkey/ +lib/${MOZILLA_PROJECT}/gmp-clearkey/0.1/ +@lib lib/${MOZILLA_PROJECT}/gmp-clearkey/0.1/libclearkey.so.${LIBclearkey_VERSION} +lib/${MOZILLA_PROJECT}/gmp-clearkey/0.1/manifest.json +lib/${MOZILLA_PROJECT}/gtk2/ +@lib lib/${MOZILLA_PROJECT}/gtk2/libmozgtk.so.${LIBmozgtk_VERSION} +lib/${MOZILLA_PROJECT}/icudt60l.dat +@lib lib/${MOZILLA_PROJECT}/liblgpllibs.so.${LIBlgpllibs_VERSION} +@lib lib/${MOZILLA_PROJECT}/libmozavcodec.so.${LIBmozavcodec_VERSION} +@lib lib/${MOZILLA_PROJECT}/libmozavutil.so.${LIBmozavutil_VERSION} +@lib lib/${MOZILLA_PROJECT}/libmozgtk.so.${LIBmozgtk_VERSION} +@lib lib/${MOZILLA_PROJECT}/libmozsqlite3.so.${LIBmozsqlite3_VERSION} +@lib lib/${MOZILLA_PROJECT}/libxul.so.${LIBxul_VERSION} +lib/${MOZILLA_PROJECT}/omni.ja +@bin lib/${MOZILLA_PROJECT}/pingsender +lib/${MOZILLA_PROJECT}/platform.ini +@bin lib/${MOZILLA_PROJECT}/plugin-container +lib/${MOZILLA_PROJECT}/removed-files @man man/man1/${MOZILLA_PROJECT}.1 @man man/man1/mozilla-${MOZILLA_PROJECT}.1 share/applications/${MOZILLA_PROJECT}.desktop
