commit moonjit for openSUSE:Factory
Hello community,
here is the log from the commit of package moonjit for openSUSE:Factory checked
in at 2020-04-04 12:18:23
Comparing /work/SRC/openSUSE:Factory/moonjit (Old)
and /work/SRC/openSUSE:Factory/.moonjit.new.3248 (New)
Package is "moonjit"
Sat Apr 4 12:18:23 2020 rev:5 rq:789857 version:2.2.0
Changes:
--- /work/SRC/openSUSE:Factory/moonjit/moonjit.changes 2020-03-19
19:48:55.544136538 +0100
+++ /work/SRC/openSUSE:Factory/.moonjit.new.3248/moonjit.changes
2020-04-04 12:18:31.223577507 +0200
@@ -1,0 +2,6 @@
+Mon Mar 30 12:31:09 UTC 2020 - Matej Cepl
+
+- Add moonjit105-string_gsub.patch to fix gsub method, which breaks
+ other packages (namely neovim).
+
+---
New:
moonjit105-string_gsub.patch
Other differences:
--
++ moonjit.spec ++
--- /var/tmp/diff_new_pack.C7yotc/_old 2020-04-04 12:18:34.831580607 +0200
+++ /var/tmp/diff_new_pack.C7yotc/_new 2020-04-04 12:18:34.831580607 +0200
@@ -26,6 +26,9 @@
URL:https://github.com/moonjit/moonjit
Source0:https://github.com/moonjit/moonjit/archive/%{version}.tar.gz
Source1:baselibs.conf
+# PATCH-FIX-UPSTREAM moonjit105-string_gsub.patch gh#moonjit/moonjit#105
mc...@suse.com
+# fix string_gsub
+Patch0: moonjit105-string_gsub.patch
BuildRequires: pkgconfig
Conflicts: luajit
Provides: lua51-luajit
@@ -53,6 +56,7 @@
%prep
%setup -q -n moonjit-%{version}
+%autopatch -p1
# Fix variables
sed -i "s,PREFIX= %{_prefix}/local,PREFIX= %{_prefix}," Makefile
++ moonjit105-string_gsub.patch ++
>From cabe3b3cbddc1d3657af451ab0ed82416117cbc7 Mon Sep 17 00:00:00 2001
From: Francois Perrad
Date: Sun, 26 Jan 2020 14:54:14 +0100
Subject: [PATCH] fix string_gsub
see https://github.com/moonjit/moonjit/issues/86
Signed-off-by: Francois Perrad
---
src/lib_string.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/lib_string.c b/src/lib_string.c
index 5e2891a9e..a90e189ba 100644
--- a/src/lib_string.c
+++ b/src/lib_string.c
@@ -621,7 +621,7 @@ LJLIB_CF(string_gsub)
const char *p = luaL_checklstring(L, 2, );
int tr = lua_type(L, 3);
int max_s = luaL_optint(L, 4, (int)(srcl+1));
- int anchor = (*p == '^') ? (p++, 1) : 0;
+ int anchor = (*p == '^');
int n = 0;
MatchState ms;
luaL_Buffer b;
@@ -629,6 +629,9 @@ LJLIB_CF(string_gsub)
tr == LUA_TFUNCTION || tr == LUA_TTABLE))
lj_err_arg(L, 3, LJ_ERR_NOSFT);
luaL_buffinit(L, );
+ if (anchor) {
+p++; lp--; /* skip anchor character */
+ }
ms.L = L;
ms.src_init = src;
ms.src_end = src+srcl;
commit moonjit for openSUSE:Factory
Hello community,
here is the log from the commit of package moonjit for openSUSE:Factory checked
in at 2020-03-19 19:45:06
Comparing /work/SRC/openSUSE:Factory/moonjit (Old)
and /work/SRC/openSUSE:Factory/.moonjit.new.3160 (New)
Package is "moonjit"
Thu Mar 19 19:45:06 2020 rev:4 rq:784307 version:2.2.0
Changes:
--- /work/SRC/openSUSE:Factory/moonjit/moonjit.changes 2019-12-18
14:48:14.525936523 +0100
+++ /work/SRC/openSUSE:Factory/.moonjit.new.3160/moonjit.changes
2020-03-19 19:48:55.544136538 +0100
@@ -1,0 +2,18 @@
+Thu Mar 12 12:09:34 UTC 2020 - Tomáš Chvátal
+
+- No need to namespace luajit with update-alternatives, we really
+ want just one version of it to be provided to keep things
+ simple
+
+---
+Thu Mar 12 11:42:21 UTC 2020 - Tomáš Chvátal
+
+- Update to 2.2.0:
+ * The v2.2 release of moonjit brings many new features that bring the
+project closer to its aim of unifying LuaJIT forks and compatibility
+with Lua.
+- Do not suffix the version anymore as we support all lua variants,
+ removes the patch:
+ * luajit-lua-versioned.patch
+
+---
Old:
2.1.2.tar.gz
luajit-lua-versioned.patch
New:
2.2.0.tar.gz
Other differences:
--
++ moonjit.spec ++
--- /var/tmp/diff_new_pack.UClueD/_old 2020-03-19 19:48:56.916137330 +0100
+++ /var/tmp/diff_new_pack.UClueD/_new 2020-03-19 19:48:56.920137333 +0100
@@ -1,7 +1,7 @@
#
# spec file for package moonjit
#
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,17 +19,14 @@
%define lua_suffix 5_1
%define lib_suffix 2
Name: moonjit
-Version:2.1.2
+Version:2.2.0
Release:0
Summary:JIT compiler for Lua language
License:MIT
URL:https://github.com/moonjit/moonjit
Source0:https://github.com/moonjit/moonjit/archive/%{version}.tar.gz
Source1:baselibs.conf
-Patch0: luajit-lua-versioned.patch
BuildRequires: pkgconfig
-Requires(post): update-alternatives
-Requires(preun): update-alternatives
Conflicts: luajit
Provides: lua51-luajit
Provides: luajit = %{version}
@@ -56,13 +53,12 @@
%prep
%setup -q -n moonjit-%{version}
-%autopatch -p1
# Fix variables
sed -i "s,PREFIX= %{_prefix}/local,PREFIX= %{_prefix}," Makefile
%build
-CFLAGS="%{optflags}" \
+export CFLAGS="%{optflags} -DLUAJIT_ENABLE_LUA52COMPAT"
make %{?_smp_mflags} \
Q= \
DYNAMIC_CC="cc -fPIC" \
@@ -83,14 +79,8 @@
rm %{buildroot}/%{_libdir}/*.a
# Beta version make install does not do this
-ln -sf luajit-%{lua_suffix}-%{version}
%{buildroot}/%{_bindir}/luajit-%{lua_suffix}
-
-# update-alternatives
-mkdir -p %{buildroot}%{_sysconfdir}/alternatives/
-touch %{buildroot}%{_sysconfdir}/alternatives/luajit
-touch %{buildroot}%{_sysconfdir}/alternatives/luajit.1%{ext_man}
-ln -sf %{_sysconfdir}/alternatives/luajit %{buildroot}%{_bindir}/luajit
-ln -sf %{_sysconfdir}/alternatives/luajit.1%{ext_man}
%{buildroot}%{_mandir}/man1/luajit.1%{ext_man}
+ln -sf moonjit-%{version} %{buildroot}/%{_bindir}/moonjit
+ln -sf moonjit-%{version} %{buildroot}/%{_bindir}/luajit
%check
%ifarch %arm ppc ppc64 ppc64le
@@ -99,33 +89,21 @@
make %{?_smp_mflags} check
%endif
-%post
-%{_sbindir}/update-alternatives --install %{_bindir}/luajit luajit
%{_bindir}/luajit-%{lua_suffix}-%{version} 60 \
- --slave %{_mandir}/man1/luajit.1%{ext_man} luajit.1%{ext_man}
%{_mandir}/man1/luajit-%{lua_suffix}.1%{ext_man}
-
-%preun
-if [ "$1" = 0 ] ; then
- %{_sbindir}/update-alternatives --remove luajit
%{_bindir}/luajit-%{lua_suffix}-%{version}
-fi
-
%post -n libluajit-%{lua_suffix}-%{lib_suffix} -p /sbin/ldconfig
%postun -n libluajit-%{lua_suffix}-%{lib_suffix} -p /sbin/ldconfig
%files
-%ghost %{_sysconfdir}/alternatives/luajit
-%ghost %{_sysconfdir}/alternatives/luajit.1%{ext_man}
%{_bindir}/luajit
-%{_bindir}/luajit-%{lua_suffix}
-%{_bindir}/luajit-%{lua_suffix}-%{version}
+%{_bindir}/moonjit
+%{_bindir}/moonjit-%{version}
%{_mandir}/man1/luajit.1%{?ext_man}
-%{_mandir}/man1/luajit-%{lua_suffix}.1%{?ext_man}
-%{_datadir}/luajit-%{lua_suffix}-%{version}/
+%{_datadir}/moonjit-%{version}/
%files -n libluajit-%{lua_suffix}-%{lib_suffix}
%{_libdir}/libluajit-5.1.so.*
%files devel
-%{_includedir}/luajit-%{lua_suffix}-2.1/
+%{_includedir}/moonjit-2.2/
%{_libdir}/libluajit-5.1.so
%{_libdir}/pkgconfig/luajit.pc
++ 2.1.2.tar.gz -> 2.2.0.tar.gz ++
7950 lines of diff (skipped)
commit moonjit for openSUSE:Factory
Hello community,
here is the log from the commit of package moonjit for openSUSE:Factory checked
in at 2019-12-18 14:44:34
Comparing /work/SRC/openSUSE:Factory/moonjit (Old)
and /work/SRC/openSUSE:Factory/.moonjit.new.4691 (New)
Package is "moonjit"
Wed Dec 18 14:44:34 2019 rev:3 rq:757694 version:2.1.2
Changes:
--- /work/SRC/openSUSE:Factory/moonjit/moonjit.changes 2019-12-09
21:36:42.134063209 +0100
+++ /work/SRC/openSUSE:Factory/.moonjit.new.4691/moonjit.changes
2019-12-18 14:48:14.525936523 +0100
@@ -1,0 +2,18 @@
+Wed Dec 18 09:05:04 UTC 2019 - Michel Normand
+
+- Ignore make check error for PowerPC until upstream solved issue
+ https://github.com/moonjit/moonjit/issues/40
+- do the same for %arm rather than to disable all %check.
+
+---
+Mon Dec 16 09:07:37 UTC 2019 - Guillaume GARDET
+
+- Disable %check on %arm until the following issue is fixed:
+ https://github.com/moonjit/moonjit/issues/9
+
+---
+Thu Dec 12 14:12:25 UTC 2019 - Andreas Schwab
+
+- Use %_lib
+
+---
Other differences:
--
++ moonjit.spec ++
--- /var/tmp/diff_new_pack.melopI/_old 2019-12-18 14:48:15.001936740 +0100
+++ /var/tmp/diff_new_pack.melopI/_new 2019-12-18 14:48:15.005936742 +0100
@@ -18,9 +18,6 @@
%define lua_suffix 5_1
%define lib_suffix 2
-%ifarch x86_64 aarch64 s390x ppc64 ppc64le
-%global multilib_flag MULTILIB=lib64
-%endif
Name: moonjit
Version:2.1.2
Release:0
@@ -72,7 +69,7 @@
LDCONFIG="true" \
TARGET_AR="ar rcus" \
TARGET_STRIP=: \
- %{?multilib_flag}
+ MULTILIB=%{_lib}
%install
make DESTDIR=%{buildroot} install \
@@ -81,7 +78,7 @@
LDCONFIG="true" \
TARGET_AR="ar rcus" \
TARGET_STRIP=: \
- %{?multilib_flag}
+ MULTILIB=%{_lib}
# remove static lib, not needed
rm %{buildroot}/%{_libdir}/*.a
@@ -96,7 +93,11 @@
ln -sf %{_sysconfdir}/alternatives/luajit.1%{ext_man}
%{buildroot}%{_mandir}/man1/luajit.1%{ext_man}
%check
+%ifarch %arm ppc ppc64 ppc64le
+make %{?_smp_mflags} check || { echo -e "WARNING: ignore check error
for\narm*: https://github.com/moonjit/moonjit/issues/9\nppc*:
https://github.com/moonjit/moonjit/issues/40;; }
+%else
make %{?_smp_mflags} check
+%endif
%post
%{_sbindir}/update-alternatives --install %{_bindir}/luajit luajit
%{_bindir}/luajit-%{lua_suffix}-%{version} 60 \
commit moonjit for openSUSE:Factory
Hello community,
here is the log from the commit of package moonjit for openSUSE:Factory checked
in at 2019-12-09 21:36:27
Comparing /work/SRC/openSUSE:Factory/moonjit (Old)
and /work/SRC/openSUSE:Factory/.moonjit.new.4691 (New)
Package is "moonjit"
Mon Dec 9 21:36:27 2019 rev:2 rq:755235 version:2.1.2
Changes:
--- /work/SRC/openSUSE:Factory/moonjit/moonjit.changes 2019-12-06
12:11:56.544037627 +0100
+++ /work/SRC/openSUSE:Factory/.moonjit.new.4691/moonjit.changes
2019-12-09 21:36:42.134063209 +0100
@@ -1,0 +2,5 @@
+Mon Dec 9 12:54:59 UTC 2019 - Tomáš Chvátal
+
+- Obsolete/provide lua51-luajit as it was the old luajit name
+
+---
Other differences:
--
++ moonjit.spec ++
--- /var/tmp/diff_new_pack.u0ZCnC/_old 2019-12-09 21:36:42.590063030 +0100
+++ /var/tmp/diff_new_pack.u0ZCnC/_new 2019-12-09 21:36:42.590063030 +0100
@@ -34,7 +34,9 @@
Requires(post): update-alternatives
Requires(preun): update-alternatives
Conflicts: luajit
+Provides: lua51-luajit
Provides: luajit = %{version}
+Obsoletes: lua51-luajit
%description
A Just-In-Time Compiler for Lua language
