[packages/mujs] - up to 1.0.4

[baggins]

commit ce8426b6637f4e4b0d086f2f32beae1a784c49c7
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Aug 17 00:48:41 2018 +0200

    - up to 1.0.4

 mujs-shared.patch | 80 ++++++++++++++++++++++++++++++-------------------------
 mujs.spec         | 17 ++++++------
 2 files changed, 51 insertions(+), 46 deletions(-)
---
diff --git a/mujs.spec b/mujs.spec
index b729ad4..6213f83 100644
--- a/mujs.spec
+++ b/mujs.spec
@@ -1,15 +1,12 @@
 Summary:	MuJS - lightweight, embeddable JavaScript interpreter in C
 Summary(pl.UTF-8):	MuJS - lekki, osadzalny interpreter JavaScriptu napisany w C
 Name:		mujs
-Version:	0
-%define	snap	20160302
-Release:	0.%{snap}.1
+Version:	1.0.4
+Release:	1
 License:	AGPL v3+
 Group:		Development/Languages
-# git clone git://git.ghostscript.com/mujs.git
-# tar cJf mujs.tar.xz mujs
-Source0:	%{name}.tar.xz
-# Source0-md5:	9ef58e75f0cc240141ca8b51d6909aad
+Source0:	https://www.mujs.com/downloads/%{name}-%{version}.tar.xz
+# Source0-md5:	1f73227ae19fbbf3944c97df3b9e7018
 Patch0:		%{name}-shared.patch
 URL:		http://www.mujs.com/
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -47,7 +44,7 @@ Static MuJS library.
 Statyczna biblioteka MuJS.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -p1
 
 %build
@@ -65,6 +62,8 @@ rm -rf $RPM_BUILD_ROOT
 	prefix=%{_prefix} \
 	libdir=%{_libdir}
 
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libmujs.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -81,8 +80,8 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libmujs.so
-%{_libdir}/libmujs.la
 %{_includedir}/mujs.h
+/usr/lib64/pkgconfig/mujs.pc
 
 %files static
 %defattr(644,root,root,755)
diff --git a/mujs-shared.patch b/mujs-shared.patch
index 0a9fef9..cb76bdb 100644
--- a/mujs-shared.patch
+++ b/mujs-shared.patch
@@ -1,49 +1,55 @@
 --- mujs/Makefile.orig	2016-04-14 21:02:05.000000000 +0200
 +++ mujs/Makefile	2016-04-14 21:20:51.139270570 +0200
-@@ -1,6 +1,6 @@
- SRCS := $(wildcard js*.c utf*.c regexp.c)
- HDRS := $(wildcard js*.h mujs.h utf.h regexp.h)
--OBJS := $(SRCS:%.c=build/%.o)
-+LOBJS := $(SRCS:%.c=build/%.o)
- 
- prefix ?= /usr/local
- bindir ?= $(prefix)/bin
-@@ -8,6 +8,8 @@
- libdir ?= $(prefix)/lib
+@@ -16,6 +16,8 @@
+ # Compiler flags for various configurations:
  
  CFLAGS := -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter
 +LTCC = libtool --mode=compile --tag=CC $(CC)
 +LTLINK = libtool --mode=link --tag=CC $(CC)
  
  ifeq "$(CC)" "clang"
- CFLAGS += -Wunreachable-code
-@@ -44,11 +46,14 @@
- build/%.o: %.c $(HDRS)
- 	$(CC) $(CFLAGS) -o $@ -c $<
- 
--build/libmujs.a: $(OBJS)
--	$(AR) cru $@ $^
-+build/%.lo: %.c $(HDRS)
+   CFLAGS += -Wunreachable-code
+@@ -53,7 +55,7 @@
+ 
+ default: static
+ static: $(OUT)/mujs-pp $(OUT)/mujs $(OUT)/libmujs.a $(OUT)/mujs.pc
+-shared: static $(OUT)/libmujs.so
++shared: static $(OUT)/libmujs.la
+ 
+ astnames.h: jsparse.h
+ 	grep -E '(AST|EXP|STM)_' jsparse.h | sed 's/^[^A-Z]*\(AST_\)*/"/;s/,.*/",/' | tr A-Z a-z > $@
+@@ -78,13 +80,14 @@
+ 	@ mkdir -p $(dir $@)
+ 	$(AR) cr $@ $^
+ 
+-$(OUT)/libmujs.so: one.c $(HDRS)
+-	@ mkdir -p $(dir $@)
+-	$(CC) $(CFLAGS) -fPIC -shared -o $@ $< -lm
+-
+-$(OUT)/mujs: $(OUT)/libmujs.o $(OUT)/main.o
+-	@ mkdir -p $(dir $@)
+-	$(CC) $(LDFLAGS) -o $@ $^ $(LIBREADLINE) -lm
++$(OUT)/%.lo: one.c $(HDRS)
 +	$(LTCC) $(CFLAGS) -o $@ -c $<
- 
--build/mujs: build/main.o build/libmujs.a
--	$(CC) $(LDFLAGS) -o $@ $^ -lm
-+build/libmujs.la: $(LOBJS)
++
++$(OUT)/libmujs.la: $(OUT)/libmujs.o
 +	$(LTLINK) $(LDFLAGS) -o $@ $^ -rpath $(libdir) -lm
 +
-+build/mujs: build/main.o build/libmujs.la
-+	$(LTLINK) $(LDFLAGS) -o $@ $^ -lm
- 
- build/mujsone: build/main.o build/one.o
- 	$(CC) $(LDFLAGS) -o $@ $^ -lm
-@@ -58,8 +63,8 @@
- 	install -d $(DESTDIR)$(libdir)
- 	install -d $(DESTDIR)$(bindir)
- 	install mujs.h $(DESTDIR)$(incdir)
--	install build/libmujs.a $(DESTDIR)$(libdir)
--	install build/mujs $(DESTDIR)$(bindir)
-+	libtool --mode=install install build/libmujs.la $(DESTDIR)$(libdir)
-+	libtool --mode=install install build/mujs $(DESTDIR)$(bindir)
- 
- VERSION = $(shell git describe --tags --always)
++$(OUT)/mujs: $(OUT)/libmujs.la $(OUT)/main.o
++	$(LTLINK) $(LDFLAGS) -o $@ $^ $(LIBREADLINE) -lm
+ 
+ $(OUT)/mujs-pp: $(OUT)/libmujs.o $(OUT)/pp.o
+ 	@ mkdir -p $(dir $@)
+@@ -118,9 +124,10 @@
+ 	install -m 644 build/release/libmujs.a $(DESTDIR)$(libdir)
+ 
+ install-shared: install-common
+-	install -m 755 build/release/libmujs.so $(DESTDIR)$(libdir)
++	libtool --mode=install install build/release/libmujs.la $(DESTDIR)$(libdir)
++	libtool --mode=install install build/release/mujs $(DESTDIR)$(bindir)
+ 
+-install: install-static
++install: install-static install-shared
  
+ tarball:
+ 	git archive --format=zip --prefix=mujs-$(VERSION)/ HEAD > mujs-$(VERSION).zip
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mujs.git/commitdiff/ce8426b6637f4e4b0d086f2f32beae1a784c49c7