sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-05-13 15:51:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

www/waterfox: Update 6.0.18 → 6.0.19, improve port

Browse source 
Update 6.0.18 → 6.0.19 are trivial - just change version.

Improve port:
 - Make Makefile more look like www/librewolf/Makefile and
   www/firefox-esr/Makefile
 - Remove doubles of USE_GECKO and BUILD_DEPENDS+=devel/wasi-*
 - Fix warnings from portclippy

Changelog:
https://github.com/BrowserWorks/Waterfox/releases/tag/G6.0.19

PR:	281330
This commit is contained in:
Martin Filla 2024-09-08 12:01:00 +03:00 • committed by Vladimir Druzenko
parent 169433d89d
commit 199ee8201c
2 changed files with 22 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
www/waterfox/Makefile
View file

@ -1,7 +1,6 @@
PORTNAME= waterfox PORTNAME= waterfox
DISTVERSIONPREFIX= G DISTVERSIONPREFIX= G
DISTVERSION= 6.0.18 DISTVERSION= 6.0.19
PORTREVISION= 1
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= www CATEGORIES= www
@ -28,28 +27,23 @@ BUILD_DEPENDS= nspr>=4.32:devel/nspr \
yasm:devel/yasm \ yasm:devel/yasm \
zip:archivers/zip zip:archivers/zip
USE_GECKO= gecko
USE_GITHUB= yes USE_GITHUB= yes
GH_ACCOUNT= BrowserWorks GH_ACCOUNT= BrowserWorks
GH_PROJECT= Waterfox GH_PROJECT= Waterfox
.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 USE_MOZILLA= -sqlite
CFLAGS_powerpc64le= -DSQLITE_BYTEORDER=1234
# work around bindgen not finding ICU, e.g. # 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 # 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" \
MOZ_REQUIRE_SIGNING=""
CFLAGS_powerpc64le= -DSQLITE_BYTEORDER=1234
BINARY_ALIAS+= python3=${PYTHON_CMD}
MOZILLA_CAP= ${MOZILLA:C/^(.).*/\1/:tu}${MOZILLA:C/^.//} MOZILLA_CAP= ${MOZILLA:C/^(.).*/\1/:tu}${MOZILLA:C/^.//}
CONFIGURE_ENV+= BINDGEN_CFLAGS="-I${LOCALBASE}/include" \
MOZ_REQUIRE_SIGNING=""
MOZ_EXPORT+= MOZ_TELEMETRY_REPORTING="" \ MOZ_EXPORT+= MOZ_TELEMETRY_REPORTING="" \
MOZILLA_OFFICIAL="1" \ MOZILLA_OFFICIAL="1" \
MOZ_OFFICIAL_BRANDING="1" \ MOZ_OFFICIAL_BRANDING="1" \
@ -72,13 +66,13 @@ MOZ_OPTIONS+= --enable-application=browser \
MOZ_CRASHREPORTER=0 \ MOZ_CRASHREPORTER=0 \
MOZ_DATA_REPORTING=0 MOZ_DATA_REPORTING=0
BINARY_ALIAS+= python3=${PYTHON_CMD} 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
USE_GECKO= gecko .include "${.CURDIR}/../../www/firefox/Makefile.options"
WATERFOX_ICON= ${MOZILLA}.png .include <bsd.port.options.mk>
WATERFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png
WATERFOX_DESKTOP= ${MOZSRC}/taskcluster/docker/firefox-snap/firefox.desktop
.if ${ARCH} == amd64 .if ${ARCH} == amd64
MOZ_OPTIONS+= --enable-rust-simd MOZ_OPTIONS+= --enable-rust-simd
@ -98,14 +92,14 @@ post-patch:
@${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \ @${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \
-e 's/firefox/${MOZILLA}/' \ -e 's/firefox/${MOZILLA}/' \
-e 's/Firefox/${MOZILLA_CAP}/' \ -e 's/Firefox/${MOZILLA_CAP}/' \
-e '/^Icon/s/=.*/=${WATERFOX_ICON:R}/' \ -e '/^Icon/s/=.*/=${FIREFOX_ICON:R}/' \
${WATERFOX_DESKTOP} ${FIREFOX_DESKTOP}
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/browser/app/nsBrowserApp.cpp ${WRKSRC}/browser/app/nsBrowserApp.cpp
post-install: post-install:
${INSTALL_DATA} ${WATERFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/${MOZILLA}.desktop ${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
${LN} -sf ${WATERFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${WATERFOX_ICON} ${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON}
.include <bsd.port.mk> .include <bsd.port.mk>

6
www/waterfox/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1723533515 TIMESTAMP = 1725694141
SHA256 (BrowserWorks-Waterfox-G6.0.18_GH0.tar.gz) = 5d2b4cabca1dd9111428d6ce64df69f93c207f1e5fc630b3e2581f4bf48b438c SHA256 (BrowserWorks-Waterfox-G6.0.19_GH0.tar.gz) = bf8eeab7720c7ca14ceab4f1efbd884a4369b428048955bd8d76b47151478a3c
SIZE (BrowserWorks-Waterfox-G6.0.18_GH0.tar.gz) = 762540446 SIZE (BrowserWorks-Waterfox-G6.0.19_GH0.tar.gz) = 762556046