From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id WH9BI6vWwF65IgAA0tVLHw (envelope-from ) for ; Sun, 17 May 2020 06:16:11 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id SB8kH6vWwF7DNAAAbx9fmQ (envelope-from ) for ; Sun, 17 May 2020 06:16:11 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id AF8C9940142 for ; Sun, 17 May 2020 06:16:10 +0000 (UTC) Received: from localhost ([::1]:43270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaCam-0003m1-6R for larch@yhetil.org; Sun, 17 May 2020 02:16:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaCag-0003lo-CH for guix-patches@gnu.org; Sun, 17 May 2020 02:16:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58864) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaCag-0000Nr-3M for guix-patches@gnu.org; Sun, 17 May 2020 02:16:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jaCaf-00035a-UI for guix-patches@gnu.org; Sun, 17 May 2020 02:16:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41010] Upgrade Oil to 0.8.pre4 Resent-From: Ryan Prior Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 May 2020 06:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41010 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Tobias Geerinckx-Rice Cc: "41010@debbugs.gnu.org" <41010@debbugs.gnu.org> Received: via spool by 41010-submit@debbugs.gnu.org id=B41010.158969610511799 (code B ref 41010); Sun, 17 May 2020 06:16:01 +0000 Received: (at 41010) by debbugs.gnu.org; 17 May 2020 06:15:05 +0000 Received: from localhost ([127.0.0.1]:42177 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaCZl-00034F-7d for submit@debbugs.gnu.org; Sun, 17 May 2020 02:15:05 -0400 Received: from mail2.protonmail.ch ([185.70.40.22]:54317) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jaCZj-00033P-PP for 41010@debbugs.gnu.org; Sun, 17 May 2020 02:15:04 -0400 Date: Sun, 17 May 2020 06:14:55 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1589696096; bh=ZwN38Mc8IH75n70Z1dlq7AYFJHmJnAcF4t8BDbEdnLM=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=qgsO1melMtuA5YHWNz4yFpCSQ3btN0NYRqvgpJB0q+sJeZ+doghz8OuweK1k74LRw 6d2nNaRJZWigtO3tPsCpQHFbHP6cHsiGZkEoYpvfOh4LolBqM8FlzLYcUWPOjRqaRz m7gG6EJYmVIgR/P9B+Gbo4jS+8x6+9btobQYEQyQ= Message-ID: <87o8qnkrz9.fsf@protonmail.com> In-Reply-To: <87v9kwnn32.fsf@nckx> References: <87sggjfdef.fsf@nckx> <7j_T0Kf3tHwi7uYPSXZUYLjdVXe_LWrzbgE6XY7mdt-HZsxZQhTuCs8-H4kISkUui_q7IL1BrSnkCIksY62JtGWP-_gXsDC3MBnfusZzcOA=@protonmail.com> <87v9kwnn32.fsf@nckx> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="b1_d6e97bcde7a3529c5451fa017796a2d5" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.7 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Ryan Prior , Ryan Prior via Guix-patches From: Ryan Prior via Guix-patches via X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=protonmail.com header.s=protonmail header.b=qgsO1mel; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 0.09 X-TUID: SbgQI75k5lgm This is a multi-part message in MIME format. --b1_d6e97bcde7a3529c5451fa017796a2d5 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Tobias Geerinckx-Rice writes: > Unfortunately I still can't apply this onto upstream/master: I rebased my branch off of master and created a new patch, attached. Hope that helps! Ryan --b1_d6e97bcde7a3529c5451fa017796a2d5 Content-Type: text/x-diff; name="0001-gnu-oil-Update-to-0.8.pre4.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-gnu-oil-Update-to-0.8.pre4.patch RnJvbSBlYzY1ODAxOGRmNTBhNzQ2MzU2NGE1ODc3YWI2MDk0NTQ1MWM2MDUyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSeWFuIFByaW9yIDxycHJpb3JAcHJvdG9ubWFpbC5jb20+CkRh dGU6IEZyaSwgMSBNYXkgMjAyMCAxNDo0OTo0MiAtMDUwMApTdWJqZWN0OiBbUEFUQ0ggMS8xXSBn bnU6IG9pbDogVXBkYXRlIHRvIDAuOC5wcmU0CgpnbnUvcGFja2FnZXMvc2hlbGxzLnNjbSAob2ls KTogVXBkYXRlIHRvIDAuOC5wcmU0LgotLS0KIGdudS9wYWNrYWdlcy9zaGVsbHMuc2NtIHwgNTYg KysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2Vk LCAyNyBpbnNlcnRpb25zKCspLCAyOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9nbnUvcGFj a2FnZXMvc2hlbGxzLnNjbSBiL2dudS9wYWNrYWdlcy9zaGVsbHMuc2NtCmluZGV4IDVjOGM0YjVk OGEuLjE1ODIyMzY4NzMgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy9zaGVsbHMuc2NtCisrKyBi L2dudS9wYWNrYWdlcy9zaGVsbHMuc2NtCkBAIC0xNCw2ICsxNCw3IEBACiA7OzsgQ29weXJpZ2h0 IMKpIDIwMTkgTWF0aGlldSBPdGhhY2VoZSA8bS5vdGhhY2VoZUBnbWFpbC5jb20+CiA7OzsgQ29w eXJpZ2h0IMKpIDIwMTksIDIwMjAgSmFuIChqYW5uZWtlKSBOaWV1d2VuaHVpemVuIDxqYW5uZWtl QGdudS5vcmc+CiA7OzsgQ29weXJpZ2h0IMKpIDIwMjAgQnJpY2UgV2FlZ2VuZWlyZSA8YnJpY2VA d2FlZ2VuZWkucmU+Cis7OzsgQ29weXJpZ2h0IMKpIDIwMjAgUnlhbiBQcmlvciA8cnByaW9yQHBy b3Rvbm1haWwuY29tPgogOzs7CiA7OzsgVGhpcyBmaWxlIGlzIHBhcnQgb2YgR05VIEd1aXguCiA7 OzsKQEAgLTc4Myw0NyArNzg0LDQ0IEBAIFNoZWxsIChwZGtzaCkuIikKIChkZWZpbmUtcHVibGlj IG9pbAogICAocGFja2FnZQogICAgIChuYW1lICJvaWwiKQotICAgICh2ZXJzaW9uICIwLjcuMCIp Ci0gICAgKHNvdXJjZSAob3JpZ2luCi0gICAgICAgICAgICAgIChtZXRob2QgdXJsLWZldGNoKQot ICAgICAgICAgICAgICAodXJpIChzdHJpbmctYXBwZW5kICJodHRwczovL3d3dy5vaWxzaGVsbC5v cmcvZG93bmxvYWQvb2lsLSIKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB2ZXJz aW9uICIudGFyLnh6IikpCi0gICAgICAgICAgICAgIChzaGEyNTYKLSAgICAgICAgICAgICAgIChi YXNlMzIKLSAgICAgICAgICAgICAgICAiMTJjOXM0NjI4NzlhZGI2bXdkM2ZxYWZrMGRucXNtMTZz MThyaHltNmNtemZ6eTh2OHptMyIpKSkpCisgICAgKHZlcnNpb24gIjAuOC5wcmU0IikgOyBodHRw czovL3d3dy5vaWxzaGVsbC5vcmcvYmxvZy8yMDIwLzA0L3JlbGVhc2UtMC44LnByZTQuaHRtbCNj b21tZW50LW9uLXZlcnNpb24tbnVtYmVyaW5nCisgICAgKHNvdXJjZQorICAgICAob3JpZ2luCisg ICAgICAgKG1ldGhvZCB1cmwtZmV0Y2gpCisgICAgICAgKHVyaSAoc3RyaW5nLWFwcGVuZCAiaHR0 cHM6Ly93d3cub2lsc2hlbGwub3JnL2Rvd25sb2FkL29pbC0iCisgICAgICAgICAgICAgICAgICAg ICAgICAgICB2ZXJzaW9uICIudGFyLmd6IikpCisgICAgICAgKHNoYTI1NgorICAgICAgICAoYmFz ZTMyICIwbTJwOHA1aGkycjE0eHg5cHBoc2EwYXI1Nmtxc2EzM2dyMncyYmxjM2p4MDdhcWhqcHp5 IikpKSkKICAgICAoYnVpbGQtc3lzdGVtIGdudS1idWlsZC1zeXN0ZW0pCiAgICAgKGFyZ3VtZW50 cwotICAgICAnKCM6dGVzdHM/ICNmIDsgdGhlIHRlc3RzIGFyZSBub3QgZGlzdHJpYnV0ZWQgaW4g dGhlIHRhcmJhbGxzCi0gICAgICAgIzpzdHJpcC1iaW5hcmllcz8gI2YgOyB0aGUgYmluYXJpZXMg Y2Fubm90IGJlIHN0cmlwcGVkCisgICAgIGAoIzpzdHJpcC1iaW5hcmllcz8gI2YgOyBzdHJpcCBi cmVha3MgdGhlIGJpbmFyeQogICAgICAgICM6cGhhc2VzCiAgICAgICAgKG1vZGlmeS1waGFzZXMg JXN0YW5kYXJkLXBoYXNlcwotICAgICAgICAgKGFkZC1hZnRlciAndW5wYWNrICdwYXRjaC1jb21w aWxlci1pbnZvY2F0aW9uCi0gICAgICAgICAgIChsYW1iZGEgXwotICAgICAgICAgICAgIChzdWJz dGl0dXRlKiAiY29uZmlndXJlIgotICAgICAgICAgICAgICAgKCgiIGNjICIpICIgZ2NjICIpKQot ICAgICAgICAgICAgICN0KSkKICAgICAgICAgIChyZXBsYWNlICdjb25maWd1cmUKICAgICAgICAg ICAgKGxhbWJkYSogKCM6a2V5IG91dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQogICAgICAgICAg ICAgIChsZXQgKChvdXQgKGFzc29jLXJlZiBvdXRwdXRzICJvdXQiKSkpCiAgICAgICAgICAgICAg ICAoc2V0ZW52ICJDQyIgImdjYyIpCi0gICAgICAgICAgICAgICA7OyBUaGUgY29uZmlndXJlIHNj cmlwdCBkb2Vzbid0IHJlY29nbml6ZSBDT05GSUdfU0hFTEwuCi0gICAgICAgICAgICAgICAoc2V0 ZW52ICJDT05GSUdfU0hFTEwiICh3aGljaCAic2giKSkKLSAgICAgICAgICAgICAgIChpbnZva2Ug Ii4vY29uZmlndXJlIiAoc3RyaW5nLWFwcGVuZCAiLS1wcmVmaXg9IiBvdXQpCisgICAgICAgICAg ICAgICAoc3Vic3RpdHV0ZSogImNvbmZpZ3VyZSIKKyAgICAgICAgICAgICAgICAgKCgiIGNjICIp ICIgZ2NjICIpKQorICAgICAgICAgICAgICAgKGludm9rZSAiLi9jb25maWd1cmUiCisgICAgICAg ICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kICItLXByZWZpeD0iIG91dCkKICAgICAgICAg ICAgICAgICAgICAgICAgIi0td2l0aC1yZWFkbGluZSIpKSkpCi0gICAgICAgICAoYWRkLWJlZm9y ZSAnaW5zdGFsbCAnbWFrZS1kZXN0aW5hdGlvbgorICAgICAgICAgKHJlcGxhY2UgJ2NoZWNrCisg ICAgICAgICAgIDs7IFRoZSB0ZXN0cyBhcmUgbm90IGRpc3RyaWJ1dGVkIGluIHRoZSB0YXJiYWxs cyBidXQgdXBzdHJlYW0KKyAgICAgICAgICAgOzsgcmVjb21tZW5kcyBydW5uaW5nIHRoaXMgc21v a2UgdGVzdC4KKyAgICAgICAgICAgOzsgaHR0cHM6Ly9naXRodWIuY29tL29pbHNoZWxsL29pbC9i bG9iL3JlbGVhc2UvMC44LnByZTQvSU5TVEFMTC50eHQjTDM4LUw0OAogICAgICAgICAgICAobGFt YmRhIF8KLSAgICAgICAgICAgICA7OyBUaGUgYnVpbGQgc2NyaXB0cyBkb24ndCBjcmVhdGUgdGhl IGRlc3RpbmF0aW9uIGRpcmVjdG9yeS4KLSAgICAgICAgICAgICAobWtkaXItcCAoc3RyaW5nLWFw cGVuZCAoYXNzb2MtcmVmICVvdXRwdXRzICJvdXQiKSAiL2JpbiIpKSkpKSkpCisgICAgICAgICAg ICAgKGxldCogKChvaWwgIl9iaW4vb2lsLm92bSIpKQorICAgICAgICAgICAgICAgKGludm9rZS9x dWlldCBvaWwgIm9zaCIgIi1jIiAiZWNobyBoaSIpCisgICAgICAgICAgICAgICAoaW52b2tlL3F1 aWV0IG9pbCAib3NoIiAiLW4iICJjb25maWd1cmUiKSkpKSkpKQogICAgIChpbnB1dHMKICAgICAg YCgoInJlYWRsaW5lIiAscmVhZGxpbmUpKSkKLSAgICAoc3lub3BzaXMgIkJhc2gtY29tcGF0aWJs ZSBVbml4IHNoZWxsIikKLSAgICAoZGVzY3JpcHRpb24gIk9pbCBpcyBhIFVuaXggLyBQT1NJWCBz aGVsbCwgY29tcGF0aWJsZSB3aXRoIEJhc2guICBJdAotaW1wbGVtZW50cyB0aGUgT2lsIGxhbmd1 YWdlLCB3aGljaCBpcyBhIG5ldyBzaGVsbCBsYW5ndWFnZSB0byB3aGljaCBCYXNoIGNhbiBiZQot YXV0b21hdGljYWxseSB0cmFuc2xhdGVkLiAgVGhlIE9pbCBsYW5ndWFnZSBpcyBhIHN1cGVyc2V0 IG9mIEJhc2guICBJdCBhbHNvCi1pbXBsZW1lbnRzIHRoZSBPU0ggbGFuZ3VhZ2UsIGEgc3RhdGlj YWxseS1wYXJzZWFibGUgbGFuZ3VhZ2UgYmFzZWQgb24gQmFzaCBhcyBpdAotaXMgY29tbW9ubHkg d3JpdHRlbi4iKQotICAgIChob21lLXBhZ2UgImh0dHBzOi8vd3d3Lm9pbHNoZWxsLm9yZy8iKQot ICAgIChsaWNlbnNlIChsaXN0IHBzZmwgOyBUaGUgT2lsIHNvdXJjZXMgaW5jbHVkZSBhIHBhdGNo ZWQgUHl0aG9uIDIgc291cmNlIHRyZWUKKyAgICAoaG9tZS1wYWdlICJodHRwczovL3d3dy5vaWxz aGVsbC5vcmciKQorICAgIChzeW5vcHNpcyAiUHJvZ3JhbW1pbmcgbGFuZ3VhZ2UgYW5kIEJhc2gt Y29tcGF0aWJsZSBVbml4IHNoZWxsIikKKyAgICAoZGVzY3JpcHRpb24gIk9pbCBpcyBhIHByb2dy YW1taW5nIGxhbmd1YWdlIHdpdGggYXV0b21hdGljIHRyYW5zbGF0aW9uIGZvcgorQmFzaC4gIEl0 IGluY2x1ZGVzIG9zaCwgYSBVbml4L1BPU0lYIHNoZWxsIHRoYXQgcnVucyB1bm1vZGlmaWVkIEJh c2gKK3NjcmlwdHMuIikKKyAgICAobGljZW5zZSAobGlzdCBwc2ZsIDsgdGFyYmFsbCBpbmNsdWRl cyBweXRob24yLjcKICAgICAgICAgICAgICAgICAgICBhc2wyLjApKSkpCiAKIChkZWZpbmUtcHVi bGljIG9pbC1zaGVsbAotLSAKMi4xNy4xCgo= --b1_d6e97bcde7a3529c5451fa017796a2d5--