[arch-commits] Commit in mujs/trunk (010-mujs-use-arch-flags.patch PKGBUILD)

[Daniel Bermond]

    Date: Monday, February 15, 2021 @ 12:23:33
  Author: dbermond
Revision: 861115

upgpkg: mujs 1.1.0-1

Modified:
  mujs/trunk/010-mujs-use-arch-flags.patch
  mujs/trunk/PKGBUILD

-------------------------------+
 010-mujs-use-arch-flags.patch |   36 +-----------------------------------
 PKGBUILD                      |   10 +++++-----
 2 files changed, 6 insertions(+), 40 deletions(-)

Modified: 010-mujs-use-arch-flags.patch
===================================================================
--- 010-mujs-use-arch-flags.patch	2021-02-15 12:23:12 UTC (rev 861114)
+++ 010-mujs-use-arch-flags.patch	2021-02-15 12:23:33 UTC (rev 861115)
@@ -1,46 +1,12 @@
-diff --git a/Makefile b/Makefile
-index eacdc49..7b24457 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -15,7 +15,7 @@ endif
- 
- # Compiler flags for various configurations:
- 
--CFLAGS := -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter
-+CFLAGS += -std=c99 -pedantic -Wall -Wextra -Wno-unused-parameter
- 
- ifeq "$(CC)" "clang"
-   CFLAGS += -Wunreachable-code
 @@ -30,9 +30,6 @@ ifeq "$(build)" "debug"
  else ifeq "$(build)" "sanitize"
    CFLAGS += -pipe -g -fsanitize=address -fno-omit-frame-pointer
    LDFLAGS += -fsanitize=address
--else
+-else ifeq "$(build)" "release"
 -  CFLAGS += -Os
 -  LDFLAGS += -Wl,-s
  endif
  
  ifeq "$(HAVE_READLINE)" "yes"
-@@ -67,11 +64,11 @@ jsdump.c: astnames.h opnames.h
- 
- $(OUT)/%.o: %.c $(HDRS)
- 	@ mkdir -p $(dir $@)
--	$(CC) $(CFLAGS) -o $@ -c $<
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
- 
- $(OUT)/libmujs.o: one.c $(HDRS)
- 	@ mkdir -p $(dir $@)
--	$(CC) $(CFLAGS) -o $@ -c $<
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
- 
- $(OUT)/libmujs.a: $(OUT)/libmujs.o
- 	@ mkdir -p $(dir $@)
-@@ -79,7 +76,7 @@ $(OUT)/libmujs.a: $(OUT)/libmujs.o
- 
- $(OUT)/libmujs.so: one.c $(HDRS)
- 	@ mkdir -p $(dir $@)
--	$(CC) $(CFLAGS) -fPIC -shared -o $@ $< -lm
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -fPIC -shared $(LDFLAGS) -o $@ $< -lm
- 
- $(OUT)/mujs: $(OUT)/libmujs.o $(OUT)/main.o
- 	@ mkdir -p $(dir $@)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-02-15 12:23:12 UTC (rev 861114)
+++ PKGBUILD	2021-02-15 12:23:33 UTC (rev 861115)
@@ -1,7 +1,7 @@
 # Maintainer: Daniel Bermond <dbermond at archlinux.org>
 
 pkgname=mujs
-pkgver=1.0.9
+pkgver=1.1.0
 pkgrel=1
 pkgdesc='An embeddable Javascript interpreter in C'
 arch=('x86_64')
@@ -8,10 +8,10 @@
 url='https://mujs.com/'
 license=('ISC')
 depends=('readline')
-source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ccxvii/mujs/archive/${pkgver}.tar.gz"
+source=("https://github.com/ccxvii/mujs/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz"
         '010-mujs-use-arch-flags.patch')
-sha256sums=('32990e739403004c936e5c4de1b83a753129020804a0e13bb13ed46c75ea575f'
-            '93ad3ba48675cf9da33a764742c8188a6b32a27ad4d88f2507252f9ddcd13e37')
+sha256sums=('8e43a38fdea75f036a9f3213e346a6c304206b4e3d00886564fb6bf70c1c2807'
+            '2302a94a9a46135223320b7f824e0528017cfe3031d63028d5d65d6c9305b91b')
 
 prepare() {
     patch -d "${pkgname}-${pkgver}" -Np1 -i "${srcdir}/010-mujs-use-arch-flags.patch"
@@ -23,6 +23,6 @@
 
 package() {
     make -C "${pkgname}-${pkgver}" DESTDIR="$pkgdir" prefix='/usr' install-shared
+    install -D -m644 "${pkgname}-${pkgver}/docs"/* -t "${pkgdir}/usr/share/doc/${pkgname}"
     install -D -m644 "${pkgname}-${pkgver}/COPYING" "${pkgdir}/usr/share/licenses/mujs/LICENSE"
-    install -D -m644 "${pkgname}-${pkgver}/docs/"* -t "${pkgdir}/usr/share/doc/${pkgname}"
 }