Attachment 246207 Details for Bug 274973 – Git Patch File

[patch] Git Patch File

0001-lang-pharo-update-to-10.0.8.patch.txt (text/plain), 4.96 KB, created by Daniel Ziltener on 2023-11-08 20:46:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Ziltener

Created: 2023-11-08 20:46:03 UTC

Size: 4.96 KB

patch

obsolete

>From 26b3cf947ba5aa43b0515e99822db7479ea893be Mon Sep 17 00:00:00 2001
>From: Daniel Ziltener <dziltener@lyrion.ch>
>Date: Wed, 8 Nov 2023 20:35:59 +0000
>Subject: [PATCH] lang/pharo: update to 10.0.8
>
>---
> lang/pharo/Makefile                           | 56 +++++++++++--------
> lang/pharo/distinfo                           |  5 +-
> .../patch-packaging_linux_bin_launch.sh.in    | 18 ++++++
> lang/pharo/pkg-descr                          |  1 -
> 4 files changed, 54 insertions(+), 26 deletions(-)
> create mode 100644 lang/pharo/files/patch-packaging_linux_bin_launch.sh.in
>
>diff --git a/lang/pharo/Makefile b/lang/pharo/Makefile
>index c17b31547..30371df1c 100644
>--- a/lang/pharo/Makefile
>+++ b/lang/pharo/Makefile
>@@ -1,37 +1,47 @@
> PORTNAME=	pharo
>-DISTVERSION=	1.4
>-PORTREVISION=	3
>+DISTVERSION=	10.0.8
>+DISTVERSIONSUFFIX=	b323c5f
>+PORTREVISION=	1
> CATEGORIES=	lang
>-MASTER_SITES=	https://gforge.inria.fr/frs/download.php/30620/
>-DISTNAME=	Pharo-${DISTVERSION}-${SVNVERSION}
>-EXTRACT_ONLY=	Pharo-${DISTVERSION}-${SVNVERSION}.zip
>+MASTER_SITES=	http://files.pharo.org/vm/pharo-spur64-headless/Linux-x86_64/source/
>+DISTNAME=	PharoVM-${DISTVERSION}-${DISTVERSIONSUFFIX}-Linux-x86_64-c-src
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Smalltalk-inspired language and environment
>-WWW=		http://www.pharo-project.org/
>+WWW=		http://www.pharo.org/
> 
>-LICENSE=	APACHE20 MIT
>-LICENSE_COMB=	multi
>+LICENSE=	MIT
> 
>-RUN_DEPENDS=	squeak:lang/squeak
>+USES=		zip cmake
> 
>-SVNVERSION=	14438
>+USE_GCC=	yes
>+USE_SDL=	sdl image
>+WRKSRC=		${WRKDIR}/pharo-vm
> 
>-NO_BUILD=	yes
>-USES=		zip
>+LIB_DEPENDS+=	libffi.so:devel/libffi
>+LIB_DEPENDS+=	libgit2.so:devel/libgit2
>+LIB_DEPENDS+=	libcairo.so:graphics/cairo
>+LIB_DEPENDS+=	libfreetype.so:print/freetype2
>+LIB_DEPENDS+=	libssl.so:security/openssl
>+LIB_DEPENDS+=	libpixman-1.so:x11/pixman
>+LIB_DEPENDS+=	libpng.so:graphics/png
>+LIB_DEPENDS+=	libuuid.so:misc/e2fsprogs-libuuid
> 
>-DIST_SUBDIR=	squeak
>-
>-FILES_DIR=	${WRKDIR}/Pharo-${DISTVERSION}-${SVNVERSION}/
>-FILES_TO_INSTALL=Pharo-${DISTVERSION}.image \
>-		Pharo-${DISTVERSION}.changes \
>-		PharoV10.sources
>-PLIST_FILES=	lib/squeak/Pharo-${DISTVERSION}.image \
>-		lib/squeak/Pharo-${DISTVERSION}.changes \
>-		lib/squeak/PharoV10.sources
>+CMAKE_ARGS+=	-DFLAVOUR=CoInterpreter
>+CMAKE_ARGS+=	-DPHARO_BIN_LOCATION=${PREFIX}/libexec/pharo10
>+CMAKE_ARGS+=	-DGENERATED_SOURCE_DIR=.
>+CMAKE_ON=	ALWAYS_INTERACTIVE BUILD_IS_RELEASE
>+CMAKE_OFF=	GENERATE_SOURCES BUILD_BUNDLE
> 
> do-install:
>-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/squeak
>-	${INSTALL_DATA} ${FILES_TO_INSTALL:S,^,${FILES_DIR}/,} ${STAGEDIR}${PREFIX}/lib/squeak
>+	${MKDIR} ${DESTDIR}${PREFIX}/libexec/pharo10
>+	cd ${WRKDIR}/.build/build/packaging/linux/bin && \
>+		${INSTALL_SCRIPT} pharo ${DESTDIR}${PREFIX}/bin/pharo10
>+	cd ${WRKDIR}/.build/build/vm && \
>+		${INSTALL_PROGRAM} pharo ${DESTDIR}${PREFIX}/libexec/pharo10/pharo
>+	cd ${WRKDIR}/.build/build/vm && \
>+		${FIND} . -type f -name "*.so" | while read file; do \
>+		${INSTALL_LIB} $$file ${DESTDIR}${PREFIIX}/lib/pharo10; \
>+		done
> 
> .include <bsd.port.mk>
>diff --git a/lang/pharo/distinfo b/lang/pharo/distinfo
>index 336094d99..aed216793 100644
>--- a/lang/pharo/distinfo
>+++ b/lang/pharo/distinfo
>@@ -1,2 +1,3 @@
>-SHA256 (squeak/Pharo-1.4-14438.zip) = 7f1a3fa43f44f3f4d05955cd1b1191abcdb8f3ee9692eeb55d67ef0122324f1d
>-SIZE (squeak/Pharo-1.4-14438.zip) = 13324537
>+TIMESTAMP = 1699467105
>+SHA256 (PharoVM-10.0.8-b323c5f-Linux-x86_64-c-src.zip) = e481f29a4eb2977a4c2c6dc578ce27aa8b34c8b60c6b7076fa1616d3c628d55d
>+SIZE (PharoVM-10.0.8-b323c5f-Linux-x86_64-c-src.zip) = 4094082
>diff --git a/lang/pharo/files/patch-packaging_linux_bin_launch.sh.in b/lang/pharo/files/patch-packaging_linux_bin_launch.sh.in
>new file mode 100644
>index 000000000..24184d8e2
>--- /dev/null
>+++ b/lang/pharo/files/patch-packaging_linux_bin_launch.sh.in
>@@ -0,0 +1,18 @@
>+--- packaging/linux/bin/launch.sh.in.orig	2023-11-08 20:05:43 UTC
>++++ packaging/linux/bin/launch.sh.in
>+@@ -27,13 +27,13 @@ fi
>+ # and so it should take precedence over /lib libc.  This is done by setting
>+ # LD_LIBRARY_PATH appropriately, based on ldd's idea of the libc use by the VM.
>+ #Try extracting Libc
>+-LIBC_SO="`/usr/bin/ldd "$BIN/@VM_EXECUTABLE_NAME@" | /bin/fgrep /libc. | sed 's/^.*=> $[^ ]*$.*/\1/'`"
>++LIBC_SO="`ldd "$BIN/@VM_EXECUTABLE_NAME@" | grep /libc. | sed 's/^.*=> $[^ ]*$.*/\1/'`"
>+ PLATFORMLIBDIR=`expr "$LIBC_SO" : '$.*$/libc.*'`
>+ 
>+ #If empty try extracting Musl
>+ if [ "$PLATFORMLIBDIR" = "" ]; then
>+ {
>+-	LIBC_SO="`/usr/bin/ldd "$BIN/@VM_EXECUTABLE_NAME@" | /bin/fgrep libc. | sed 's/^.*=> $[^ ]*$.*/\1/'`"
>++	LIBC_SO="`ldd "$BIN/@VM_EXECUTABLE_NAME@" | grep libc. | sed 's/^.*=> $[^ ]*$.*/\1/'`"
>+ 	PLATFORMLIBDIR=`expr "$LIBC_SO" : '$.*$/ld-musl.*'`
>+ }
>+ fi
>diff --git a/lang/pharo/pkg-descr b/lang/pharo/pkg-descr
>index d7ffa82e5..1f8cbca56 100644
>--- a/lang/pharo/pkg-descr
>+++ b/lang/pharo/pkg-descr
>@@ -6,4 +6,3 @@ Pharo is a clean, innovative, open-source Smalltalk-inspired environment.
> - good developer tools
> - low memory footprint
> 
>-It runs under squeak virtual machine.
>-- 
>2.42.0
>

Actions: View | Diff

Attachments on bug 274973: 246207 | 246505