Received: by mail.netbsd.org (Postfix, from userid 605) id 1880C84D6A; Sun, 5 Jan 2020 02:20:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9673D84D27 for ; Sun, 5 Jan 2020 02:20:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id A-voeBJFhRBs for ; Sun, 5 Jan 2020 02:20:08 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id D9C9684CDF for ; Sun, 5 Jan 2020 02:20:08 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D7BD1FA97; Sun, 5 Jan 2020 02:20:08 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_157819080858590" MIME-Version: 1.0 Date: Sun, 5 Jan 2020 02:20:08 +0000 From: "Ryo ONODERA" Subject: CVS commit: pkgsrc/mail/thunderbird60 To: pkgsrc-changes@NetBSD.org Reply-To: ryoon@netbsd.org X-Mailer: log_accum Message-Id: <20200105022008.D7BD1FA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_157819080858590 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: ryoon Date: Sun Jan 5 02:20:08 UTC 2020 Modified Files: pkgsrc/mail/thunderbird60: Makefile distinfo Added Files: pkgsrc/mail/thunderbird60/patches: patch-third__party_rust_url_src_form__urlencoded.rs patch-third__party_rust_url_src_lib.rs Log Message: thunderbird60: Fix build with rust-1.40.0, bump PKGREVISION To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/thunderbird60/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/thunderbird60/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/mail/thunderbird60/patches/patch-third__party_rust_url_src_form__urlencoded.rs \ pkgsrc/mail/thunderbird60/patches/patch-third__party_rust_url_src_lib.rs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_157819080858590 Content-Disposition: inline Content-Length: 6147 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mail/thunderbird60/Makefile diff -u pkgsrc/mail/thunderbird60/Makefile:1.3 pkgsrc/mail/thunderbird60/Makefile:1.4 --- pkgsrc/mail/thunderbird60/Makefile:1.3 Sat Dec 28 05:55:53 2019 +++ pkgsrc/mail/thunderbird60/Makefile Sun Jan 5 02:20:08 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2019/12/28 05:55:53 ryoon Exp $ +# $NetBSD: Makefile,v 1.4 2020/01/05 02:20:08 ryoon Exp $ DISTNAME= thunderbird-${TB_VER}.source PKGNAME= thunderbird60-${TB_VER} +PKGREVISION= 1 TB_VER= 60.9.1 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/} @@ -50,6 +51,12 @@ post-extract: ${CAT} ${WRKSRC}/third_party/rust/cssparser/.cargo-checksum.json.orig | \ ${SED} -e 's/9ed4aec998221eb2d2ba99db2f9f82a02399fb0c3b8500627f68f5aab872adde/a90050bca85b7d52e976278752484ec47f1d0aebc0509afc8f40861f9a557e1a/' \ > ${WRKSRC}/third_party/rust/cssparser/.cargo-checksum.json + ${CP} ${WRKSRC}/third_party/rust/url/.cargo-checksum.json \ + ${WRKSRC}/third_party/rust/url/.cargo-checksum.json.orig + ${CAT} ${WRKSRC}/third_party/rust/url/.cargo-checksum.json.orig | \ + ${SED} -e 's/894cc76c31357fb588292e990a87f4e951043e32ea3d9f38fddc145302d0b318/f132a35fdade0a52f1022792bb8a430dae1e50a34f5c05faeb84d386e7f50397/' \ + -e 's/320418526c4564a4469581d426e7467bcefe504eecd098e1eb90a2663a75fd80/d8c35e92375cafcd7e12c4f0d5374bab62aa1f333629d55b007a9c3d5c3cb615/' \ + > ${WRKSRC}/third_party/rust/url/.cargo-checksum.json # Use pre-generated binding files (generated by rust-1.37.0). # Original file is not up-to-date and rust-1.39.0 generates # incorrect files. Fix build with rust-1.39.0. Index: pkgsrc/mail/thunderbird60/distinfo diff -u pkgsrc/mail/thunderbird60/distinfo:1.2 pkgsrc/mail/thunderbird60/distinfo:1.3 --- pkgsrc/mail/thunderbird60/distinfo:1.2 Sat Dec 28 05:55:53 2019 +++ pkgsrc/mail/thunderbird60/distinfo Sun Jan 5 02:20:08 2020 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2019/12/28 05:55:53 ryoon Exp $ +$NetBSD: distinfo,v 1.3 2020/01/05 02:20:08 ryoon Exp $ SHA1 (thunderbird-60.9.1.source.tar.xz) = ce6b4e411e8f5da3e217122e9bf61553ce76b1a7 RMD160 (thunderbird-60.9.1.source.tar.xz) = 9e771f2540e34d222cfb85f3ae9e108364881209 @@ -44,6 +44,8 @@ SHA1 (patch-servo_components_style__trai SHA1 (patch-servo_components_style_build__gecko.rs) = 3fd66ec7c6af23a3e2b3299b68c48777ab62b48b SHA1 (patch-servo_components_style_lib.rs) = 1df2f6580da3c4a2fadd7ddcead000fa3c8a6a14 SHA1 (patch-third__party_rust_cssparser_src_parser.rs) = 97d89ca616271dea3dd564b1e96f0087c21e8be0 +SHA1 (patch-third__party_rust_url_src_form__urlencoded.rs) = 803c9501d2aec0ad1588cd05d625f679581841f6 +SHA1 (patch-third__party_rust_url_src_lib.rs) = 97730d2d9a1b6e3b42687da4cdb04b4ac1bd903b SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = 11201c556ceb111ccf028df10fdda335e8fdb0c3 SHA1 (patch-toolkit_library_moz.build) = 429745ec028ce71d8ba2457679b715ac14b6e2d3 SHA1 (patch-toolkit_moz.configure) = 994c8ff526984482b0e5fa26176ed6c20380a97d Added files: Index: pkgsrc/mail/thunderbird60/patches/patch-third__party_rust_url_src_form__urlencoded.rs diff -u /dev/null pkgsrc/mail/thunderbird60/patches/patch-third__party_rust_url_src_form__urlencoded.rs:1.1 --- /dev/null Sun Jan 5 02:20:08 2020 +++ pkgsrc/mail/thunderbird60/patches/patch-third__party_rust_url_src_form__urlencoded.rs Sun Jan 5 02:20:08 2020 @@ -0,0 +1,26 @@ +$NetBSD: patch-third__party_rust_url_src_form__urlencoded.rs,v 1.1 2020/01/05 02:20:08 ryoon Exp $ + +* Fix build with rust-1.40.0 + From: https://docs.freebsd.org/cgi/getmsg.cgi?fetch=1073761+0+/usr/local/www/mailindex/archive/2019/svn-ports-head/20191222.svn-ports-head + +--- third_party/rust/url/src/form_urlencoded.rs.orig 2019-09-01 13:10:20.000000000 +0000 ++++ third_party/rust/url/src/form_urlencoded.rs +@@ -257,8 +257,16 @@ impl<'a> Target for &'a mut String { + // * `Serializer` keeps its target in a private field + // * Unlike in other `Target` impls, `UrlQuery::finished` does not return `Self`. + impl<'a> Target for ::UrlQuery<'a> { +- fn as_mut_string(&mut self) -> &mut String { &mut self.url.serialization } +- fn finish(self) -> &'a mut ::Url { self.url } ++ fn as_mut_string(&mut self) -> &mut String { ++ &mut self.url.as_mut().unwrap().serialization ++ } ++ ++ fn finish(mut self) -> &'a mut ::Url { ++ let url = self.url.take().unwrap(); ++ url.restore_already_parsed_fragment(self.fragment.take()); ++ url ++ } ++ + type Finished = &'a mut ::Url; + } + Index: pkgsrc/mail/thunderbird60/patches/patch-third__party_rust_url_src_lib.rs diff -u /dev/null pkgsrc/mail/thunderbird60/patches/patch-third__party_rust_url_src_lib.rs:1.1 --- /dev/null Sun Jan 5 02:20:08 2020 +++ pkgsrc/mail/thunderbird60/patches/patch-third__party_rust_url_src_lib.rs Sun Jan 5 02:20:08 2020 @@ -0,0 +1,34 @@ +$NetBSD: patch-third__party_rust_url_src_lib.rs,v 1.1 2020/01/05 02:20:08 ryoon Exp $ + +* Fix build with rust-1.40.0 + From: https://docs.freebsd.org/cgi/getmsg.cgi?fetch=1073761+0+/usr/local/www/mailindex/archive/2019/svn-ports-head/20191222.svn-ports-head + +--- third_party/rust/url/src/lib.rs.orig 2019-09-01 13:10:20.000000000 +0000 ++++ third_party/rust/url/src/lib.rs +@@ -1304,7 +1304,7 @@ impl Url { + self.serialization.push('?'); + } + +- let query = UrlQuery { url: self, fragment: fragment }; ++ let query = UrlQuery { url: Some(self), fragment: fragment }; + form_urlencoded::Serializer::for_suffix(query, query_start + "?".len()) + } + +@@ -2373,13 +2373,15 @@ fn io_error(reason: &str) -> io::Resu + /// Implementation detail of `Url::query_pairs_mut`. Typically not used directly. + #[derive(Debug)] + pub struct UrlQuery<'a> { +- url: &'a mut Url, ++ url: Option<&'a mut Url>, + fragment: Option, + } + + impl<'a> Drop for UrlQuery<'a> { + fn drop(&mut self) { +- self.url.restore_already_parsed_fragment(self.fragment.take()) ++ if let Some(url) = self.url.take() { ++ url.restore_already_parsed_fragment(self.fragment.take()) ++ } + } + } + --_----------=_157819080858590--