Date: Sat, 07 Sep 2024 13:15:56 +0000 From: bugzilla-noreply@freebsd.org To: ports-bugs@FreeBSD.org Subject: [Bug 281330] www/waterfox: update to 6.0.19 Message-ID: <bug-281330-7788-z7dUaKfLYQ@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-281330-7788@https.bugs.freebsd.org/bugzilla/> References: <bug-281330-7788@https.bugs.freebsd.org/bugzilla/>
next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D281330 Vladimir Druzenko <vvd@FreeBSD.org> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |vvd@FreeBSD.org Severity|Affects Only Me |Affects Some People Status|New |In Progress Assignee|ports-bugs@FreeBSD.org |vvd@FreeBSD.org --- Comment #2 from Vladimir Druzenko <vvd@FreeBSD.org> --- I suggest to make Makefile more look like www/librewolf/Makefile and www/firefox-esr/Makefile, remove doubles USE_GECKO and BUILD_DEPENDS+=3Ddevel/wasi-*, fix warnings from portclippy: --- www/waterfox/Makefile.orig +++ www/waterfox/Makefile @@ -1,7 +1,6 @@ PORTNAME=3D waterfox DISTVERSIONPREFIX=3D G -DISTVERSION=3D 6.0.18 -PORTREVISION=3D 1 +DISTVERSION=3D 6.0.19 PORTEPOCH=3D 1 CATEGORIES=3D www @@ -28,28 +27,23 @@ yasm:devel/yasm \ zip:archivers/zip +USE_GECKO=3D gecko USE_GITHUB=3D yes GH_ACCOUNT=3D BrowserWorks GH_PROJECT=3D Waterfox - -.include "${.CURDIR}/../../www/firefox/Makefile.options" -.include <bsd.port.options.mk> - -.if ${ARCH} !=3D powerpc64 -BUILD_DEPENDS+=3D=20=20=20=20=20=20=20 ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a:devel/wasi-libc= xx${LLVM_VERSION} \ -=20=20=20=20=20=20=20=20=20=20=20=20=20=20 ${LOCALBASE}/share/wasi-sysroot/lib/wasm32-wasi/libc.a:devel/wasi-libc \ -=20=20=20=20=20=20=20=20=20=20=20=20=20=20 wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION} -.endif - -USE_GECKO=3D gecko USE_MOZILLA=3D -sqlite -CFLAGS_powerpc64le=3D -DSQLITE_BYTEORDER=3D1234 # 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+=3D BINDGEN_CFLAGS=3D"-I${LOCALBASE}/include"= \ + MOZ_REQUIRE_SIGNING=3D"" + +CFLAGS_powerpc64le=3D -DSQLITE_BYTEORDER=3D1234 + +BINARY_ALIAS+=3D python3=3D${PYTHON_CMD} + MOZILLA_CAP=3D ${MOZILLA:C/^(.).*/\1/:tu}${MOZILLA:C/^.//} -CONFIGURE_ENV+=3D BINDGEN_CFLAGS=3D"-I${LOCALBASE}/include" \ - MOZ_REQUIRE_SIGNING=3D"" + MOZ_EXPORT+=3D MOZ_TELEMETRY_REPORTING=3D"" \ MOZILLA_OFFICIAL=3D"1" \ MOZ_OFFICIAL_BRANDING=3D"1" \ @@ -72,13 +66,13 @@ MOZ_CRASHREPORTER=3D0 \ MOZ_DATA_REPORTING=3D0 -BINARY_ALIAS+=3D python3=3D${PYTHON_CMD} +FIREFOX_ICON=3D ${MOZILLA}.png +FIREFOX_ICON_SRC=3D=20=20=20=20=20 ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png +FIREFOX_DESKTOP=3D=20=20=20=20=20=20 ${MOZSRC}/taskcluster/docker/firefox-snap/firefox.desktop -USE_GECKO=3D gecko +.include "${.CURDIR}/../../www/firefox/Makefile.options" -WATERFOX_ICON=3D ${MOZILLA}.png -WATERFOX_ICON_SRC=3D=20=20=20=20 ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png -WATERFOX_DESKTOP=3D=20=20=20=20=20 ${MOZSRC}/taskcluster/docker/firefox-snap/firefox.desktop +.include <bsd.port.options.mk> .if ${ARCH} =3D=3D amd64 MOZ_OPTIONS+=3D --enable-rust-simd @@ -98,14 +92,14 @@ @${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \ -e 's/firefox/${MOZILLA}/' \ -e 's/Firefox/${MOZILLA_CAP}/' \ - -e '/^Icon/s/=3D.*/=3D${WATERFOX_ICON:R}/' \ - ${WATERFOX_DESKTOP} + -e '/^Icon/s/=3D.*/=3D${FIREFOX_ICON:R}/' \ + ${FIREFOX_DESKTOP} @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/browser/app/nsBrowserApp.cpp 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 - ${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> --=20 You are receiving this mail because: You are the assignee for the bug.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-281330-7788-z7dUaKfLYQ>