diff options
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/cjs/Makefile | 33 | ||||
| -rw-r--r-- | lang/cjs/distinfo | 6 | ||||
| -rw-r--r-- | lang/cjs/pkg-descr | 4 | ||||
| -rw-r--r-- | lang/swift510/Makefile | 9 | ||||
| -rw-r--r-- | lang/swift510/files/start-build.sh | 19 |
5 files changed, 45 insertions, 26 deletions
diff --git a/lang/cjs/Makefile b/lang/cjs/Makefile index 260b0200c4ef..a752893bd4ea 100644 --- a/lang/cjs/Makefile +++ b/lang/cjs/Makefile @@ -1,14 +1,10 @@ PORTNAME= cjs -PORTVERSION= 5.4.1 -PORTREVISION= 2 +DISTVERSION= 6.4.0 CATEGORIES= lang gnome DIST_SUBDIR= gnome -PATCH_SITES= https://gitlab.gnome.org/GNOME/gjs/-/commit/ -PATCHFILES= f93880c356108cfdbc8f9ebe318d18f256d7128d.patch:-p1 # https://gitlab.gnome.org/GNOME/gjs/-/issues/514 - MAINTAINER= gnome@FreeBSD.org -COMMENT= JavaScript bindings based on gobject-introspection +COMMENT= Cinnamon Javascript interpreter WWW= https://github.com/linuxmint/cjs LICENSE= MIT LGPL20+ @@ -17,14 +13,14 @@ LICENSE_FILE_MIT= ${WRKSRC}/LICENSES/MIT.txt LICENSE_FILE_LGPL20+ = ${WRKSRC}/LICENSES/LGPL-2.0-or-later.txt LIB_DEPENDS= libffi.so:devel/libffi \ - libmozjs-78.so:lang/spidermonkey78 + libmozjs-115.so:lang/spidermonkey115 -USES= compiler:c++17-lang gettext gnome localbase meson pkgconfig \ - python:build readline shebangfix xorg -USE_GNOME= cairo gdkpixbuf gtk30 introspection +USES= compiler:c++17-lang gnome meson pkgconfig \ + python:build shebangfix xorg +USE_GNOME= cairo glib20 introspection USE_XORG= x11 xext -MESON_ARGS= -Dinstalled_tests=false \ - -Dprofiler=disabled +MESON_ARGS= -Dprofiler=disabled + USE_LDCONFIG= yes USE_GITHUB= yes @@ -34,8 +30,15 @@ SHEBANG_GLOB= *.py PORTSCOUT= limit:^[0-9.]+$$ # ignore master.mint* tags -post-patch: - ${REINPLACE_CMD} -e 's|--warn-error||g' \ - ${WRKSRC}/meson.build +OPTIONS_DEFINE= READLINE TEST +OPTIONS_DEFAULT= READLINE + +READLINE_MESON_ENABLED= readline +READLINE_USES= readline + +TEST_BUILD_DEPENDS= dbus-run-session:devel/dbus \ + gtk3>0:x11-toolkits/gtk30 \ + gtk4>0:x11-toolkits/gtk40 +TEST_MESON_FALSE= skip_dbus_tests skip_gtk_tests .include <bsd.port.mk> diff --git a/lang/cjs/distinfo b/lang/cjs/distinfo index 9c843f20af8a..4c513062cc1f 100644 --- a/lang/cjs/distinfo +++ b/lang/cjs/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1677355395 -SHA256 (gnome/linuxmint-cjs-5.4.1_GH0.tar.gz) = 212fa302f15ea955af6dc87fdba3898f751d078df91cb84b0e6615d5a2b84e15 -SIZE (gnome/linuxmint-cjs-5.4.1_GH0.tar.gz) = 794618 +TIMESTAMP = 1735624742 +SHA256 (gnome/linuxmint-cjs-6.4.0_GH0.tar.gz) = 55d730fdb331a9778a0d569e45c968ac68c8f218876e5d2d475cb5af21b6935a +SIZE (gnome/linuxmint-cjs-6.4.0_GH0.tar.gz) = 874506 SHA256 (gnome/f93880c356108cfdbc8f9ebe318d18f256d7128d.patch) = 254299e1b39987c53c3c4943fcc3c4e0b00a27442192243e3c7c1589969f2811 SIZE (gnome/f93880c356108cfdbc8f9ebe318d18f256d7128d.patch) = 1674 diff --git a/lang/cjs/pkg-descr b/lang/cjs/pkg-descr index 64609dc99656..58569c1f2562 100644 --- a/lang/cjs/pkg-descr +++ b/lang/cjs/pkg-descr @@ -1 +1,3 @@ -This module contains JavaScript bindings based on gobject-introspection. +CJS fork of GJS for Cinnamon. It is functionally identical, and is only +to maintain stability with the Cinnamon release cycle, and between various +distributions. diff --git a/lang/swift510/Makefile b/lang/swift510/Makefile index 711f5df85914..6b82bc9d9045 100644 --- a/lang/swift510/Makefile +++ b/lang/swift510/Makefile @@ -1,6 +1,6 @@ PORTNAME= swift510 DISTVERSION= 5.10.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang DIST_SUBDIR= ${PORTNAME} @@ -95,7 +95,9 @@ post-patch: do-build: @${MKDIR} ${early_stage_dir} ${SETENV} \ - CCACHE_WRAPPER_PATH=${CCACHE_WRAPPER_PATH} \ + CCACHE_ENABLED=${CCACHE_ENABLED} \ + CCACHE_BIN=${CCACHE_BIN} \ + CCACHE_DIR=${CCACHE_DIR} \ MAKE_JOBS_NUMBER=${MAKE_JOBS_NUMBER} \ ${SH} -x ${FILESDIR}/start-build.sh ${WRKSRC} ${early_stage_dir} \ ${swift_install_prefix} ${WRKDIR}/clang-module-cache @@ -107,7 +109,6 @@ do-install: ${COPYTREE_BIN} .${swift_install_prefix}/bin ${STAGEDIR} ; \ for subdir in include lib local share; do \ ${COPYTREE_SHARE} .${swift_install_prefix}/$${subdir} ${STAGEDIR} ; \ - done ; \ - ${RM} ${STAGEDIR}/var/run/libuuid/* + done .include <bsd.port.post.mk> diff --git a/lang/swift510/files/start-build.sh b/lang/swift510/files/start-build.sh index da8e7fbbe0b2..c5f741292f4e 100644 --- a/lang/swift510/files/start-build.sh +++ b/lang/swift510/files/start-build.sh @@ -8,13 +8,26 @@ export PATH="/sbin:/bin:/usr/sbin:/usr/bin:${PATH}" export CLANG_MODULE_CACHE_PATH=${clang_module_cache_path} +if [ ${CCACHE_ENABLED} = yes ] ; then + ccache_fragment="--cmake-c-launcher ${CCACHE_BIN} --cmake-cxx-launcher ${CCACHE_BIN}" +else + ccache_fragment= +fi + +if [ -n "${MAKE_JOBS_NUMBER}" ] ; then + jobs_fragment="--jobs ${MAKE_JOBS_NUMBER}" +else + jobs_fragment= +fi + cd ${swift_project_dir}/swift && utils/build-script --bootstrapping bootstrapping \ --release \ --assertions \ -${MAKE_JOBS_NUMBER+--jobs} ${MAKE_JOBS_NUMBER} \ ---host-cc ${CCACHE_WRAPPER_PATH:-/usr/bin}/clang \ ---host-cxx ${CCACHE_WRAPPER_PATH:-/usr/bin}/clang++ \ +--host-cc /usr/bin/clang \ +--host-cxx /usr/bin/clang++ \ +${ccache_fragment} \ +${jobs_fragment} \ --llvm-targets-to-build 'AArch64;X86' \ --skip-early-swift-driver \ --skip-early-swiftsyntax \ |