From e48940194aa34212765439f2c552fd8e5b34cc69f7abe4919dd533d7682f800f Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Mon, 13 Nov 2023 06:43:33 +0000 Subject: [PATCH] Accepting request 1125152 from home:matwey:branches:devel:languages:erlang - Update to Elixir 1.15.7: * Fix build for Erlang 26 * Changelog available at https://hexdocs.pm/elixir/1.15.7/changelog.html - Add 0001-Use-PID-valid-for-32-bit-systems-closes-12741.patch: * Fix build for 32bit - Add 0001-Use-PID-valid-for-32-bit-systems-followup-to-12741-1.patch: * Fix build for 32bit OBS-URL: https://build.opensuse.org/request/show/1125152 OBS-URL: https://build.opensuse.org/package/show/devel:languages:erlang/elixir?expand=0&rev=88 --- ...alid-for-32-bit-systems-closes-12741.patch | 28 +++++++++++++ ...r-32-bit-systems-followup-to-12741-1.patch | 39 +++++++++++++++++++ elixir-1.14.2.tar.gz | 3 -- elixir-1.15.7.tar.gz | 3 ++ elixir-doc.spec | 2 +- elixir.changes | 11 ++++++ elixir.spec | 10 +++-- 7 files changed, 89 insertions(+), 7 deletions(-) create mode 100644 0001-Use-PID-valid-for-32-bit-systems-closes-12741.patch create mode 100644 0001-Use-PID-valid-for-32-bit-systems-followup-to-12741-1.patch delete mode 100644 elixir-1.14.2.tar.gz create mode 100644 elixir-1.15.7.tar.gz diff --git a/0001-Use-PID-valid-for-32-bit-systems-closes-12741.patch b/0001-Use-PID-valid-for-32-bit-systems-closes-12741.patch new file mode 100644 index 0000000..9515aef --- /dev/null +++ b/0001-Use-PID-valid-for-32-bit-systems-closes-12741.patch @@ -0,0 +1,28 @@ +From 8bc67d384b0c21d9bbc7145829ecd49e128038b3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Valim?= +Date: Sun, 2 Jul 2023 10:28:58 +0200 +Subject: [PATCH] Use PID valid for 32-bit systems, closes #12741 + +--- + lib/logger/test/logger/formatter_test.exs | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/logger/test/logger/formatter_test.exs b/lib/logger/test/logger/formatter_test.exs +index 82a2ac6a9..2ea4ca08b 100644 +--- a/lib/logger/test/logger/formatter_test.exs ++++ b/lib/logger/test/logger/formatter_test.exs +@@ -116,9 +116,9 @@ test "format with format string" do + format = format(compiled, :error, nil, nil, meta: :data) + assert IO.chardata_to_string(format) == "meta=data " + +- pid = :erlang.list_to_pid(~c"<0.123.4>") ++ pid = :erlang.list_to_pid(~c"<0.123.0>") + format = format(compiled, :error, nil, nil, meta: :data, pid: pid) +- assert IO.chardata_to_string(format) == "meta=data pid=<0.123.4> " ++ assert IO.chardata_to_string(format) == "meta=data pid=<0.123.0> " + + # Hack to get the same predictable reference for every test run. + ref = +-- +2.35.3 + diff --git a/0001-Use-PID-valid-for-32-bit-systems-followup-to-12741-1.patch b/0001-Use-PID-valid-for-32-bit-systems-followup-to-12741-1.patch new file mode 100644 index 0000000..9b39450 --- /dev/null +++ b/0001-Use-PID-valid-for-32-bit-systems-followup-to-12741-1.patch @@ -0,0 +1,39 @@ +From e00524ba5b0e682488fa99bca4aa89e4e7071aa0 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Fri, 7 Jul 2023 20:47:26 +0200 +Subject: [PATCH] Use PID valid for 32-bit systems, followup to #12741 (#12772) + +Signed-off-by: Peter Lemenkov +--- + lib/iex/test/iex/helpers_test.exs | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/lib/iex/test/iex/helpers_test.exs b/lib/iex/test/iex/helpers_test.exs +index 31984a390..ed5190e82 100644 +--- a/lib/iex/test/iex/helpers_test.exs ++++ b/lib/iex/test/iex/helpers_test.exs +@@ -1364,8 +1364,8 @@ test "reloads Erlang modules" do + + describe "pid/1,3" do + test "builds a PID from string" do +- assert inspect(pid("0.32767.3276")) == "#PID<0.32767.3276>" +- assert inspect(pid("0.5.6")) == "#PID<0.5.6>" ++ assert inspect(pid("0.32767.0")) == "#PID<0.32767.0>" ++ assert inspect(pid("0.5.0")) == "#PID<0.5.0>" + + assert_raise ArgumentError, fn -> + pid("0.6.-6") +@@ -1381,8 +1381,8 @@ test "builds a PID from atom" do + end + + test "builds a PID from integers" do +- assert inspect(pid(0, 32767, 3276)) == "#PID<0.32767.3276>" +- assert inspect(pid(0, 5, 6)) == "#PID<0.5.6>" ++ assert inspect(pid(0, 32767, 0)) == "#PID<0.32767.0>" ++ assert inspect(pid(0, 5, 0)) == "#PID<0.5.0>" + + assert_raise FunctionClauseError, fn -> + pid(0, 6, -6) +-- +2.35.3 + diff --git a/elixir-1.14.2.tar.gz b/elixir-1.14.2.tar.gz deleted file mode 100644 index 7908473..0000000 --- a/elixir-1.14.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3f79e384706495725119f60982fa16ea82d510c3fbeacfc6ee1a77c792bf152a -size 3085613 diff --git a/elixir-1.15.7.tar.gz b/elixir-1.15.7.tar.gz new file mode 100644 index 0000000..bf8ae6a --- /dev/null +++ b/elixir-1.15.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78bde2786b395515ae1eaa7d26faa7edfdd6632bfcfcd75bccb6341a18e8798f +size 3151775 diff --git a/elixir-doc.spec b/elixir-doc.spec index 1030414..8ed318e 100644 --- a/elixir-doc.spec +++ b/elixir-doc.spec @@ -17,7 +17,7 @@ Name: elixir-doc -Version: 1.14.2 +Version: 1.15.7 Release: 0 Summary: Documentation for elixir License: Apache-2.0 diff --git a/elixir.changes b/elixir.changes index c807ec8..fd00b3c 100644 --- a/elixir.changes +++ b/elixir.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Nov 11 10:23:18 UTC 2023 - Matwey Kornilov + +- Update to Elixir 1.15.7: + * Fix build for Erlang 26 + * Changelog available at https://hexdocs.pm/elixir/1.15.7/changelog.html +- Add 0001-Use-PID-valid-for-32-bit-systems-closes-12741.patch: + * Fix build for 32bit +- Add 0001-Use-PID-valid-for-32-bit-systems-followup-to-12741-1.patch: + * Fix build for 32bit + ------------------------------------------------------------------- Thu May 4 11:26:04 UTC 2023 - Dominique Leuenberger diff --git a/elixir.spec b/elixir.spec index 5e4d9e8..654ed73 100644 --- a/elixir.spec +++ b/elixir.spec @@ -17,7 +17,7 @@ Name: elixir -Version: 1.14.2 +Version: 1.15.7 Release: 0 Summary: Functional meta-programming aware language built atop Erlang License: Apache-2.0 @@ -25,10 +25,12 @@ Group: Development/Languages/Other URL: http://elixir-lang.org Source0: https://github.com/elixir-lang/elixir/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source2: macros.elixir +Patch0: 0001-Use-PID-valid-for-32-bit-systems-closes-12741.patch +Patch1: 0001-Use-PID-valid-for-32-bit-systems-followup-to-12741-1.patch BuildRequires: gcc BuildRequires: make -Requires: erlang >= 23 -BuildRequires: erlang >= 23 +Requires: erlang >= 24 +BuildRequires: erlang >= 24 BuildRequires: erlang-dialyzer BuildRequires: erlang-src # required by Mix.SCM.Git see also (https://github.com/elixir-lang/elixir/issues/1386) @@ -64,6 +66,8 @@ Elixir source code. %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build # Elixir wants UTF-8 locale, force it