From f01c24b8c5d399744e74052cd2778ac52de72af1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Tue, 2 Feb 2021 12:32:43 -0300 Subject: [PATCH 1/4] duktape: update to 2.6.0. Also clean up template. --- common/shlibs | 2 +- srcpkgs/duktape/template | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/common/shlibs b/common/shlibs index 35263ec4744..a5173711b2d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3087,7 +3087,7 @@ libbrotlienc.so.1 brotli-1.0.2_1 libfilteraudio.so filter_audio-0.0.1_1 libgstreamermm-1.0.so.1 gstreamermm-1.8.0_1 libmovit.so.8 movit-1.6.0_1 -libduktape.so.204 duktape-2.4.0_1 +libduktape.so.206 duktape-2.6.0_1 libccgnu2-1.8.so.0 commoncpp2-1.8.1_1 libccext2-1.8.so.0 commoncpp2-1.8.1_1 libucommon.so.8 ucommon-7.0.0_1 diff --git a/srcpkgs/duktape/template b/srcpkgs/duktape/template index c7d5a957a18..7b2e9f7dab6 100644 --- a/srcpkgs/duktape/template +++ b/srcpkgs/duktape/template @@ -1,6 +1,6 @@ # Template file for 'duktape' pkgname=duktape -version=2.4.0 +version=2.6.0 revision=1 build_style=gnu-makefile make_build_args="-f Makefile.sharedlibrary" @@ -8,17 +8,17 @@ make_install_args="-f Makefile.sharedlibrary INSTALL_PREFIX=\${DESTDIR}/usr" short_desc="Embeddable JavaScript engine" maintainer="Christopher Brannon " license="MIT" -homepage="http://duktape.org" -distfiles="https://github.com/svaarala/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.xz" -checksum=86a89307d1633b5cedb2c6e56dc86e92679fc34b05be551722d8cc69ab0771fc +homepage="https://duktape.org" +distfiles="https://github.com/svaarala/duktape/releases/download/v${version}/${pkgname}-${version}.tar.xz" +checksum=96f4a05a6c84590e53b18c59bb776aaba80a205afbbd92b82be609ba7fe75fa7 -pre_build() { - sed -i 's|^CC.*||g' Makefile.sharedlibrary +post_patch() { + vsed -i 's|^CC.*||g' Makefile.sharedlibrary } pre_install() { - vmkdir /usr/lib - vmkdir /usr/include + vmkdir usr/lib + vmkdir usr/include } post_install() { @@ -26,8 +26,7 @@ post_install() { # Two libraries were installed, one with debugging symbols, one # without. Maybe that makes sense on a distro without debug # splitting, but not on Void. Replace libduktape. - cd "${DESTDIR}/usr/lib" - rm libduktaped.* + rm ${DESTDIR}/usr/lib/libduktaped.* } duktape-devel_package() { From acb49a30bb427f78d516e2618701baac85f24618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Tue, 2 Feb 2021 12:32:35 -0300 Subject: [PATCH 2/4] OpenRCT2: revbump for duktape-2.6.0. --- srcpkgs/OpenRCT2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template index 5dc6d249853..c99234aaa55 100644 --- a/srcpkgs/OpenRCT2/template +++ b/srcpkgs/OpenRCT2/template @@ -5,7 +5,7 @@ pkgname=OpenRCT2 _objects_version=1.0.18 _titles_version=0.1.2c version=0.3.2 -revision=1 +revision=2 build_style=cmake configure_args=" -DOPENRCT2_VERSION_TAG=${version} From 174a7490d37449a437baa8292bace1d458d73a62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Tue, 2 Feb 2021 12:32:35 -0300 Subject: [PATCH 3/4] edbrowse: revbump for duktape-2.6.0. Also xlint. --- srcpkgs/edbrowse/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/edbrowse/template b/srcpkgs/edbrowse/template index 7c8fb265e29..e6718922902 100644 --- a/srcpkgs/edbrowse/template +++ b/srcpkgs/edbrowse/template @@ -1,16 +1,16 @@ # Template file for 'edbrowse' pkgname=edbrowse version=3.7.7 -revision=1 -hostmakedepends="perl pkg-config" +revision=2 build_style=cmake +hostmakedepends="perl pkg-config" makedepends="duktape-devel libcurl-devel libtidy5-devel pcre-devel readline-devel" short_desc="Line-oriented text editor, web browser and mail client similar to ed(1)" maintainer="Leah Neukirchen " -license="GPL-3.0-or-later" +license="GPL-3.0-or-later, MIT" homepage="http://edbrowse.org/" -distfiles="https://github.com/CMB/${pkgname}/archive/v${version}.tar.gz" +distfiles="https://github.com/CMB/edbrowse/archive/v${version}.tar.gz" checksum=bc015decc022d90f482a7f1028e9a56aa84f17406879f9aa1060e1dc175ed00f CFLAGS="-fcommon" From 24dc051c0a78cdf9a02e85c0247376bdf5a1120e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Tue, 2 Feb 2021 12:32:35 -0300 Subject: [PATCH 4/4] gerbera: revbump for duktape-2.6.0. --- srcpkgs/gerbera/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template index 0c2cae408e1..451f9eff539 100644 --- a/srcpkgs/gerbera/template +++ b/srcpkgs/gerbera/template @@ -1,7 +1,7 @@ # Template file for 'gerbera' pkgname=gerbera version=1.6.4 -revision=1 +revision=2 build_style=cmake configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1" hostmakedepends="pkg-config"