Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (9777a40a96d990492dbcc8e9414318e5f5defa22)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (9777a40a96d990492dbcc8e9414318e5f5defa22)
  • Date: Wed, 11 Jan 2023 11:14:08 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

devel/mujs/DETAILS |
4
devel/mujs/HISTORY |
7 +
devel/mujs/patches/0001-Compute-VERSION-using-Make.patch |
26 -----
devel/mujs/patches/0002-Use-D-instead-of-dir.patch |
51 ----------
devel/mujs/patches/0003-Enable-choice-of-library-version-for-shell.patch |
40 -------
5 files changed, 9 insertions(+), 119 deletions(-)

New commits:
commit 9777a40a96d990492dbcc8e9414318e5f5defa22
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

mujs 1.3.2

diff --git a/devel/mujs/DETAILS b/devel/mujs/DETAILS
index 820d99a..d076b79 100755
--- a/devel/mujs/DETAILS
+++ b/devel/mujs/DETAILS
@@ -1,8 +1,8 @@
SPELL=mujs
- VERSION=1.3.0
+ VERSION=1.3.2
SOURCE="$SPELL-$VERSION.tar.gz"
SOURCE_URL[0]="https://mujs.com/downloads/$SOURCE";
-
SOURCE_HASH=sha512:1e9590892b1a0b139f8959a64e4255f5695c8e2dca355858155275628345ac3bb4168779dc6115bd6ac62b8615932762d3f348a1c6d0ee8d56cb43a863c4e0c3
+
SOURCE_HASH=sha512:ccffb04171f7ecec2cfa6f0e59859acc911836370a648e4c6703db174631ce316413a64ebf4b32eea3d3b09221ff01861cda91f4b1b9bebf495168f26f90daf5
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE="https://mujs.com/";
LICENSE[0]="ISC"
diff --git a/devel/mujs/HISTORY b/devel/mujs/HISTORY
index 6d78c93..a921f35 100644
--- a/devel/mujs/HISTORY
+++ b/devel/mujs/HISTORY
@@ -1,3 +1,10 @@
+2023-01-11 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 1.3.2
+ * patches/0001-Compute-VERSION-using-Make.patch,
+ patches/0002-Use-D-instead-of-dir.patch,
+ patches/0003-Enable-choice-of-library-version-for-shell.patch:
+ removed, merged by upstream
+
2022-11-04 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 1.3.0

diff --git a/devel/mujs/patches/0001-Compute-VERSION-using-Make.patch
b/devel/mujs/patches/0001-Compute-VERSION-using-Make.patch
deleted file mode 100644
index 4fe3578..0000000
--- a/devel/mujs/patches/0001-Compute-VERSION-using-Make.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0a1a39a3ceb6d813005b0b16314fd3f3d008139a Mon Sep 17 00:00:00 2001
-From: Ismael Luceno <ismael AT iodev.co.uk>
-Date: Fri, 18 Mar 2022 17:58:32 +0100
-Subject: [PATCH 1/3] Compute VERSION using Make
-
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index e3767161e8ad..eb6e99d6124c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -12,7 +12,7 @@ libdir ?= $(prefix)/lib
- ifeq "$(wildcard .git)" ".git"
- VERSION := $(shell git describe --tags --always)
- else
-- VERSION := $(shell basename $$PWD | sed -e s,^mujs-,,)
-+ VERSION := $(patsubst mujs-%,%,$(notdir $(CURDIR)))
- endif
-
- ifeq ($(shell uname),Darwin)
---
-2.35.1
-
diff --git a/devel/mujs/patches/0002-Use-D-instead-of-dir.patch
b/devel/mujs/patches/0002-Use-D-instead-of-dir.patch
deleted file mode 100644
index 4072f45..0000000
--- a/devel/mujs/patches/0002-Use-D-instead-of-dir.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From c24501d2c139ff8e4fceb51e961e24c7848be0ec Mon Sep 17 00:00:00 2001
-From: Ismael Luceno <ismael AT iodev.co.uk>
-Date: Fri, 18 Mar 2022 18:04:53 +0100
-Subject: [PATCH 2/3] Use $(@D) instead of $(dir $@)
-
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
----
- Makefile | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index eb6e99d6124c..2d6fb959b6b2 100644
---- a/Makefile
-+++ b/Makefile
-@@ -75,27 +75,27 @@ one.c: $(SRCS)
- jsdump.c: astnames.h opnames.h
-
- $(OUT)/%.o: %.c $(HDRS)
-- @ mkdir -p $(dir $@)
-+ @ mkdir -p $(@D)
- $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
-
- $(OUT)/libmujs.o: one.c $(HDRS)
-- @ mkdir -p $(dir $@)
-+ @ mkdir -p $(@D)
- $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
-
- $(OUT)/libmujs.a: $(OUT)/libmujs.o
-- @ mkdir -p $(dir $@)
-+ @ mkdir -p $(@D)
- $(AR) cr $@ $^
-
- $(OUT)/libmujs.$(SO_EXT): one.c $(HDRS)
-- @ mkdir -p $(dir $@)
-+ @ mkdir -p $(@D)
- $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared $(LDFLAGS) -o $@ $< -lm
-
- $(OUT)/mujs: $(OUT)/libmujs.o $(OUT)/main.o
-- @ mkdir -p $(dir $@)
-+ @ mkdir -p $(@D)
- $(CC) $(LDFLAGS) -o $@ $^ $(LIBREADLINE) -lm
-
- $(OUT)/mujs-pp: $(OUT)/libmujs.o $(OUT)/pp.o
-- @ mkdir -p $(dir $@)
-+ @ mkdir -p $(@D)
- $(CC) $(LDFLAGS) -o $@ $^ -lm
-
- .PHONY: $(OUT)/mujs.pc
---
-2.35.1
-
diff --git
a/devel/mujs/patches/0003-Enable-choice-of-library-version-for-shell.patch
b/devel/mujs/patches/0003-Enable-choice-of-library-version-for-shell.patch
deleted file mode 100644
index c30f933..0000000
--- a/devel/mujs/patches/0003-Enable-choice-of-library-version-for-shell.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From bcca489771f5c91286d661eb5c26e586a15f7cdb Mon Sep 17 00:00:00 2001
-From: Ismael Luceno <ismael AT iodev.co.uk>
-Date: Fri, 18 Mar 2022 18:51:28 +0100
-Subject: [PATCH 3/3] Enable choice of library version for shell
-
-Default behavior is unchanged, but enables to choose the dynamic version by
-passing "libmujs=libmujs.so" to make.
-
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
----
- Makefile | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 2d6fb959b6b2..c026325fdb7b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -90,13 +90,15 @@ $(OUT)/libmujs.$(SO_EXT): one.c $(HDRS)
- @ mkdir -p $(@D)
- $(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared $(LDFLAGS) -o $@ $< -lm
-
--$(OUT)/mujs: $(OUT)/libmujs.o $(OUT)/main.o
-+libmujs ?= libmujs.a
-+
-+$(OUT)/mujs: $(OUT)/main.o $(OUT)/$(libmujs)
- @ mkdir -p $(@D)
-- $(CC) $(LDFLAGS) -o $@ $^ $(LIBREADLINE) -lm
-+ $(CC) $(LDFLAGS) -o $@ $< -L$(OUT) -l:$(libmujs) $(LIBREADLINE) -lm
-
--$(OUT)/mujs-pp: $(OUT)/libmujs.o $(OUT)/pp.o
-+$(OUT)/mujs-pp: $(OUT)/pp.o $(OUT)/$(libmujs)
- @ mkdir -p $(@D)
-- $(CC) $(LDFLAGS) -o $@ $^ -lm
-+ $(CC) $(LDFLAGS) -o $@ $< -L$(OUT) -l:$(libmujs) -lm
-
- .PHONY: $(OUT)/mujs.pc
- $(OUT)/mujs.pc:
---
-2.35.1
-



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (9777a40a96d990492dbcc8e9414318e5f5defa22), Ismael Luceno, 01/11/2023

Archive powered by MHonArc 2.6.24.

Top of Page