From nobody Sun Sep 08 09:05:06 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X1kZB52Ztz5WS4k; Sun, 08 Sep 2024 09:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X1kZB4GSgz4cxM; Sun, 8 Sep 2024 09:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725786306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IiSHR11RqEVNJG318lniWz19g+Zxxw8r9EEgTvae/Oc=; b=XEEieM8u3YxIKa3lzdJki0mU5ikOczV3ZUnvxWS85lPjt0SoS9X5Mc9aaQ6zrh2Kmwh30W GzBDBZ/1qkVY+4XFyRXhk7n2qEk94ygcbq6ODfXDGbdGN6y9srJlscXelANEzkEMU+xAuB hEgzjqGdx2qOaTYdWKnXKRCyzaolGYMwN9KnVMFzPv2t6wfOtgL9G5tzcsQJi2UMiCTmtT MeLKmC8clrwLwXWs6cw6GFBuFA2ec3Ivc6yoJQPUJWFWfVC3Qcp4wKkVLfypAgWuQ7fcX0 DMcSvlLPDKkgqOtUUxrZLRA+/NBkaWb5bibStEpsrnhns8WHGgvh67NUS3o4cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725786306; a=rsa-sha256; cv=none; b=xC7lgcdRHB2Wp9OUCVAKOqR8xnggwpj1b2NjhqRzQ+wKCjS0R5fvHam9pg6Ygwo/nJql3Q W07yRZGw51N1KBZ/p136CJtRHkAkSZvNm3mX4hbXHE6Og4AvPxu9H84HNpeII1ni/Z2fcY OCEPSEoAX9WS1F08Hz7oRk0bfJzbxi+rPwHJI/AIR4DklGpuetaUQ7inEgrKZb28Yp66UW U7lL6MdPlwSM/IDbCnJXUb45hLnvrHA2YcORQjwCV17P7cSzhBTZ/CkxxTemnHjIOr5eZF 7L7c1sIBrH3HtVhNFnG1zP03OOU6f/ay0+yKn2fbPyaxEw8kfeVEF5lLWTQ+1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725786306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IiSHR11RqEVNJG318lniWz19g+Zxxw8r9EEgTvae/Oc=; b=YPZzm0tBeUwV192VVaeq/ETW5kDEYLWUW5jA9RNc0N0ujmWIDrrJ56UEqs6nuTdk8gs4kQ oCekc+ePP3fU/+bzyAHwz3Rz6Nyfc5+p1ltW/v/mWHNZuI+1uWI/ShUPitHrXby+yDZNDn V9oRmskb64lrdusUAL5B6gyBRAka3GfGptm/IipiBMQExWRlt2+i7HU1FxdS9hoH4cyH4U q8WC9GZFKuYSdIogAoy0KG/EvISse3RFNYWZDA4zh4Pu/oQIUrVl2GlOeHjjxXeBFccXJk +EQqvhy5Qv5FOtDmJb+CJyHT6TFwj3N25Uj9Pp2oIOllgFZgTak3V6dw8DWWJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4X1kZB3t6cz1Bqj; Sun, 8 Sep 2024 09:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 488956Iu043931; Sun, 8 Sep 2024 09:05:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48895638043928; Sun, 8 Sep 2024 09:05:06 GMT (envelope-from git) Date: Sun, 8 Sep 2024 09:05:06 GMT Message-Id: <202409080905.48895638043928@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 199ee8201c79 - main - www/waterfox: Update 6.0.18 =?utf-8?Q?=E2=86=92?= 6.0.19, improve port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 199ee8201c798f1f5edb8fc0fbc32e145a1483d6 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=199ee8201c798f1f5edb8fc0fbc32e145a1483d6 commit 199ee8201c798f1f5edb8fc0fbc32e145a1483d6 Author: Martin Filla AuthorDate: 2024-09-08 09:01:00 +0000 Commit: Vladimir Druzenko 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(-) diff --git a/www/waterfox/Makefile b/www/waterfox/Makefile index 186ad9941d5f..55d66706eed4 100644 --- a/www/waterfox/Makefile +++ b/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 @@ BUILD_DEPENDS= nspr>=4.32:devel/nspr \ 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 - -.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_OPTIONS+= --enable-application=browser \ 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 .if ${ARCH} == amd64 MOZ_OPTIONS+= --enable-rust-simd @@ -98,14 +92,14 @@ post-patch: @${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 diff --git a/www/waterfox/distinfo b/www/waterfox/distinfo index 686b2653ad3e..0186c2eb62bf 100644 --- a/www/waterfox/distinfo +++ b/www/waterfox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1723533515 -SHA256 (BrowserWorks-Waterfox-G6.0.18_GH0.tar.gz) = 5d2b4cabca1dd9111428d6ce64df69f93c207f1e5fc630b3e2581f4bf48b438c -SIZE (BrowserWorks-Waterfox-G6.0.18_GH0.tar.gz) = 762540446 +TIMESTAMP = 1725694141 +SHA256 (BrowserWorks-Waterfox-G6.0.19_GH0.tar.gz) = bf8eeab7720c7ca14ceab4f1efbd884a4369b428048955bd8d76b47151478a3c +SIZE (BrowserWorks-Waterfox-G6.0.19_GH0.tar.gz) = 762556046