Created attachment 253392 [details] 0001-www-waterfox-update-to-6.0.19.patch Hi, this is update 6.0.19, poudriere ok. ===> Deinstalling waterfox-6.0.19,1 Updating database digests format: .......... done Checking integrity... done (0 conflicting) Deinstallation has been requested for the following 1 packages (of 0 packages in the universe): Installed packages to be REMOVED: waterfox: 6.0.19,1 Number of packages to be removed: 1 The operation will free 254 MiB. [133amd64-default] [1/1] Deinstalling waterfox-6.0.19,1... [133amd64-default] [1/1] Deleting files for waterfox-6.0.19,1: .......... done ==> Running trigger: desktop-file-utils.ucl Building cache database of MIME types =========================================================================== =>> Checking for extra files and directories [01:00:39] Installing from package [133amd64-default] Installing waterfox-6.0.19,1... [133amd64-default] Extracting waterfox-6.0.19,1: .......... done ==> Running trigger: desktop-file-utils.ucl Building cache database of MIME types ===== Message from waterfox-6.0.19,1: -- ## Missing features Some features found on Windows, macOS and Linux are not implemented: - Encrypted Media Extensions (requires Widevine CDM binary) - Process sandboxing (requires Capsicum backend) - Reduced memory usage (requires mozjemalloc) - Crash Reporter (requires Google Breakpad and reproducible builds) - WebVR (requires open source runtime) - TCP fast open - `about:networking` (requires link state notification) ## Audio backend Currently used audio backend can be inspected on `about:support` page. Supported backends and default probing order is as follows: - `pulse-rust` if `pulseaudio` package is installed (PULSEAUDIO option) - `jack` if `jackit` package is installed (JACK option) - `sndio` if `sndio` package is installed (SNDIO option) - `alsa` if `alsa-lib` package is installed (ALSA option) - `oss` (always available) To force a specific backend open `about:config` page and create `media.cubeb.backend` preference. Microphone selection only works in `oss`, `pulse`, `pulse-rust` backends. Other backends are limited to `default` which is usually `/dev/dsp`, so use virtual_oss to reroute microphones from non-default devices. ## Gamepad API Requires evdev(4) joystick support. On FreeBSD 13.0 enable hgame(4) while older versions can use sysutils/iichid or multimedia/webcamd. ## smb:// issues Network group, machine, and share browsing does not work correctly. ## sftp:// Only sftp access using public key authentication works. To easily setup public key authentication to `remote_host`: $ ssh-keygen $ cat ~/.ssh/id_rsa.pub | ssh remote_host "cat >> .ssh/authorized_keys" The SSH server on `remote_host` must allow pub key authentication. [01:00:57] Cleaning up ===> Cleaning for waterfox-6.0.19,1 [01:04:04] Deinstalling package Updating database digests format: . done Checking integrity... done (0 conflicting) Deinstallation has been requested for the following 1 packages (of 0 packages in the universe): Installed packages to be REMOVED: waterfox: 6.0.19,1 Number of packages to be removed: 1 The operation will free 254 MiB. [133amd64-default] [1/1] Deinstalling waterfox-6.0.19,1... [133amd64-default] [1/1] Deleting files for waterfox-6.0.19,1: .......... done ==> Running trigger: desktop-file-utils.ucl Building cache database of MIME types build of www/waterfox | waterfox-6.0.19,1 ended at Sat Sep 7 09:23:56 CEST 2024 build time: 01:03:52
Created attachment 253393 [details] 0001-www-waterfox-update-to-6.0.19.patch
I suggest to make Makefile more look like www/librewolf/Makefile and www/firefox-esr/Makefile, remove doubles USE_GECKO and BUILD_DEPENDS+=devel/wasi-*, fix warnings from portclippy: --- www/waterfox/Makefile.orig +++ www/waterfox/Makefile @@ -1,7 +1,6 @@ PORTNAME= waterfox DISTVERSIONPREFIX= G -DISTVERSION= 6.0.18 -PORTREVISION= 1 +DISTVERSION= 6.0.19 PORTEPOCH= 1 CATEGORIES= www @@ -28,28 +27,23 @@ yasm:devel/yasm \ zip:archivers/zip +USE_GECKO= gecko USE_GITHUB= yes GH_ACCOUNT= BrowserWorks 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 -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" \ + MOZ_REQUIRE_SIGNING="" + +CFLAGS_powerpc64le= -DSQLITE_BYTEORDER=1234 + +BINARY_ALIAS+= python3=${PYTHON_CMD} + MOZILLA_CAP= ${MOZILLA:C/^(.).*/\1/:tu}${MOZILLA:C/^.//} -CONFIGURE_ENV+= BINDGEN_CFLAGS="-I${LOCALBASE}/include" \ - MOZ_REQUIRE_SIGNING="" + MOZ_EXPORT+= MOZ_TELEMETRY_REPORTING="" \ MOZILLA_OFFICIAL="1" \ MOZ_OFFICIAL_BRANDING="1" \ @@ -72,13 +66,13 @@ MOZ_CRASHREPORTER=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 -WATERFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png -WATERFOX_DESKTOP= ${MOZSRC}/taskcluster/docker/firefox-snap/firefox.desktop +.include <bsd.port.options.mk> .if ${ARCH} == amd64 MOZ_OPTIONS+= --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/=.*/=${WATERFOX_ICON:R}/' \ - ${WATERFOX_DESKTOP} + -e '/^Icon/s/=.*/=${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>
(In reply to Vladimir Druzenko from comment #2) How do you apply your diff ?
Created attachment 253410 [details] Makefile v1 (In reply to Martin Filla from comment #3) No way. I don't apply it, I just showed it. If you want, it's easier for me to post the Makefile itself than to mess around with patches. If you want, you can compare my Makefile with yours locally.
Created attachment 253418 [details] 0001-www-waterfox-update-to-6.0.19.patch
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=199ee8201c798f1f5edb8fc0fbc32e145a1483d6 commit 199ee8201c798f1f5edb8fc0fbc32e145a1483d6 Author: Martin Filla <freebsd@sysctl.cz> AuthorDate: 2024-09-08 09:01:00 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2024-09-08 09:01:00 +0000 www/waterfox: Update 6.0.18 → 6.0.19, improve port 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 www/waterfox/Makefile | 44 +++++++++++++++++++------------------------- www/waterfox/distinfo | 6 +++--- 2 files changed, 22 insertions(+), 28 deletions(-)
Thanks.