Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 10 Jul 2024 22:26:45 GMT
From:      Vladimir Druzenko <vvd@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 3a9378356f85 - 2024Q3 - www/librewolf: update 127.0.1-1 =?utf-8?Q?=E2=86=92?= 127.0.2-2
Message-ID:  <202407102226.46AMQjmH014058@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2024Q3 has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3a9378356f85f403421ff0bc4946e78510393996

commit 3a9378356f85f403421ff0bc4946e78510393996
Author:     Martin Filla <freebsd@sysctl.cz>
AuthorDate: 2024-07-10 22:08:30 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-07-10 22:26:38 +0000

    www/librewolf: update 127.0.1-1 → 127.0.2-2
    
    Based on Firefox 127.0.2:
    https://www.mozilla.org/en-US/firefox/127.0.2/releasenotes/
    
    While here: make the Makefile more like www/firefox/Makefile.
    
    PR:     280214
    MFH:    2024Q3
    (cherry picked from commit 49447045b4dac36c4aa6467fd3d75c4426ea8c76)
---
 www/librewolf/Makefile | 69 +++++++++++++++++++++++++-------------------------
 www/librewolf/distinfo |  6 ++---
 2 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/www/librewolf/Makefile b/www/librewolf/Makefile
index b6f798376372..3384642d6443 100644
--- a/www/librewolf/Makefile
+++ b/www/librewolf/Makefile
@@ -1,9 +1,8 @@
 PORTNAME=	librewolf
-DISTVERSION=	127.0.1
+DISTVERSION=	127.0.2-2
+DISTVERSIONSUFFIX=	.source
 CATEGORIES=	www wayland
-MASTER_SITES=	https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/${DISTVERSION:R}-1/
-DISTNAME=	${PORTNAME}-${DISTVERSION:R}-1.source.
-EXTRACT_SUFX=	tar.gz
+MASTER_SITES=	https://gitlab.com/api/v4/projects/32320088/packages/generic/${PORTNAME}-source/${DISTVERSION}/
 
 MAINTAINER=	freebsd@sysctl.cz
 COMMENT=	Custom version of Firefox, focused on privacy, security and freedom
@@ -13,12 +12,12 @@ LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
-		nss>=3.95:security/nss \
+		nss>=3.101:security/nss \
 		icu>=73.1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
-		harfbuzz>=8.3.0:print/harfbuzz \
+		harfbuzz>=8.5.0:print/harfbuzz \
 		graphite2>=1.3.14:graphics/graphite2 \
-		png>=1.6.39:graphics/png \
+		png>=1.6.43:graphics/png \
 		dav1d>=1.0.0:multimedia/dav1d \
 		libvpx>=1.14.0:multimedia/libvpx \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
@@ -28,31 +27,26 @@ BUILD_DEPENDS=	nspr>=4.32:devel/nspr \
 		yasm:devel/yasm \
 		zip:archivers/zip
 
-.include "${.CURDIR}/../../www/firefox/Makefile.options"
-
-.include <bsd.port.options.mk>
-
-.if ${ARCH} != powerpc64
-BUILD_DEPENDS+=	${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libcxx${LLVM_VERSION} \
-		${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc \
-		wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION}
-.endif
-
 USE_GECKO=	gecko
 USE_MOZILLA=	-sqlite
 
-CFLAGS_powerpc64le=	-DSQLITE_BYTEORDER=1234
 # work around bindgen not finding ICU, e.g.
 # dist/include/mozilla/intl/ICU4CGlue.h:8:10: fatal error: 'unicode/uenum.h' file not found, err: true
 CONFIGURE_ENV+=	BINDGEN_CFLAGS="-I${LOCALBASE}/include"
 CONFIGURE_ENV+=	MOZ_REQUIRE_SIGNING=""
+CFLAGS_powerpc64le=	-DSQLITE_BYTEORDER=1234
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
+
+MOZILLA_CAP=	${MOZILLA:C/^(.).*/\1/:tu}${MOZILLA:C/^.//}
+
 MOZ_EXPORT+=	MOZ_TELEMETRY_REPORTING="" \
 		MOZILLA_OFFICIAL="1" \
 		MOZ_OFFICIAL_BRANDING="1" \
-		MOZ_APP_DISPLAYNAME="Librewolf" \
-		MOZ_APP_NAME="librewolf"
+		MOZ_APP_DISPLAYNAME="${MOZILLA_CAP}" \
+		MOZ_APP_NAME="${MOZILLA}"
 
-MOZ_OPTIONs=	--enable-application=browser \
+MOZ_OPTIONS=	--enable-application=browser \
 		--allow-addon-sideload \
 		--disable-crashreporter \
 		--disable-debug \
@@ -62,22 +56,25 @@ MOZ_OPTIONs=	--enable-application=browser \
 		--enable-hardening \
 		--enable-optimize \
 		--enable-release \
-		--enable-rust-simd \
-		--with-app-name=librewolf \
-		--with-branding=browser/branding/librewolf \
+		--with-app-name=${MOZILLA} \
+		--with-branding=browser/branding/${MOZILLA} \
 		--with-unsigned-addon-scopes=app,system \
-		--with-l10n-base=$PWD/browser/locales/l10n \
 		--enable-bootstrap \
 		MOZ_CRASHREPORTER=0 \
-		MOZ_DATA_REPORTING=0 \
-		MOZ_SERVICES_HEALTHREPORT=0
-
-# helpful when testing beta
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:R}-1
+		MOZ_DATA_REPORTING=0
 
+FIREFOX_ICON=		${MOZILLA}.png
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
 FIREFOX_DESKTOP=	${MOZSRC}/taskcluster/docker/firefox-snap/firefox.desktop
 
+.include "${.CURDIR}/../../www/firefox/Makefile.options"
+
+.include <bsd.port.options.mk>
+
+.if ${ARCH} == amd64
+MOZ_OPTIONS+=	--enable-rust-simd
+.endif
+
 .if ${ARCH} == powerpc64
 CFLAGS+=	-DHWY_COMPILE_ONLY_SCALAR
 MOZ_OPTIONS+=	--without-wasm-sandboxed-libraries
@@ -89,14 +86,18 @@ MOZ_OPTIONS+=	--with-wasi-sysroot=${LOCALBASE}/share/wasi-sysroot
 .endif
 
 post-patch:
+	@${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \
+		-e 's/firefox/${MOZILLA}/' \
+		-e 's/Firefox/${MOZILLA_CAP}/' \
+		-e '/^Icon/s/=.*/=${FIREFOX_ICON:R}/' \
+		${FIREFOX_DESKTOP}
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/browser/app/nsBrowserApp.cpp
 	@${RM} ${WRKSRC}/mozconfig
 
 post-install:
-	${CP} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/librewolf.desktop
-	${REINPLACE_CMD} -e 's|Firefox|Librewolf|g' ${STAGEDIR}${PREFIX}/share/applications/librewolf.desktop
-	${REINPLACE_CMD} -e 's|firefox|librewolf|g' ${STAGEDIR}${PREFIX}/share/applications/librewolf.desktop
-	${REINPLACE_CMD} -e 's|Icon=.*|Icon=${FIREFOX_ICON_SRC}|g' ${STAGEDIR}${PREFIX}/share/applications/librewolf.desktop
+	${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
+	${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON}
 
 .include <bsd.port.mk>
diff --git a/www/librewolf/distinfo b/www/librewolf/distinfo
index 00a1a25c7f2f..66a7364ab826 100644
--- a/www/librewolf/distinfo
+++ b/www/librewolf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1718996614
-SHA256 (librewolf-127.0-1.source.tar.gz) = eb7c03ad394dd8445110d718b90da6a0252c0533b8cb6ab27dd1a6e83b6853e7
-SIZE (librewolf-127.0-1.source.tar.gz) = 1008033344
+TIMESTAMP = 1720612011
+SHA256 (librewolf-127.0.2-2.source.tar.gz) = 876805eb81b96c61bb479ce272ba25e77e90b319db1e3a6fe59070e667d0a44c
+SIZE (librewolf-127.0.2-2.source.tar.gz) = 1008485101



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202407102226.46AMQjmH014058>