From 896cda31c52828648b227f3fe90122ae18b91eca Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Tue, 1 Sep 2026 15:31:28 +0100 Subject: [PATCH 1/1] www/librewolf: run make update-patches, bump SO_VERSION my earlier 155.0-1 update patch was merged, but I later sent an updated version of the patch that properly updates SO_VERSION and rebases the patches. the old version of the update patch was merged anyway. these changes, in this diff, implement what was missed when the old version of the librewolf update was merged. Landry *did* merge my fix updating the PLIST, though without changing the REVISION in the Makefile; I've simply set REVISION=0 in this patch. Signed-off-by: Leah Rowe --- www/librewolf/Makefile | 3 ++- www/librewolf/patches/patch-config_makefiles_rust_mk | 2 +- www/librewolf/patches/patch-mozconfig | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/www/librewolf/Makefile b/www/librewolf/Makefile index da124b8664e..b892a47885f 100644 --- a/www/librewolf/Makefile +++ b/www/librewolf/Makefile @@ -19,6 +19,7 @@ MOZILLA_VERSION = ${MOZILLA_DIST_VERSION:C/-([0-9]+)$/pl\1/} MOZILLA_PROJECT = librewolf MOZILLA_CODENAME = browser MAINTAINER = Leah Rowe +REVISION = 0 # LibreWolf doesn't provide PGO data, but we use the data # provided by FireFox releases, re-using the OpenBSD distfile @@ -28,7 +29,7 @@ FFDIST = firefox-${FFVERSION}.source DISTFILES.profdata = ${FFDIST}-profdata.tar.xz{profdata.tar.xz} HOMEPAGE = https://librewolf.net/ -SO_VERSION = 3.0 +SO_VERSION = 4.0 # Bump minor ver if shlibs deleted in components dir to avoid pkg_add -r issues MOZILLA_LIBS = mozavcodec mozavutil mozgtk mozinference mozwayland xul \ clearkey gkcodecs lgpllibs mozsqlite3 diff --git a/www/librewolf/patches/patch-config_makefiles_rust_mk b/www/librewolf/patches/patch-config_makefiles_rust_mk index 6956d2ba803..177aa8e43ee 100644 --- a/www/librewolf/patches/patch-config_makefiles_rust_mk +++ b/www/librewolf/patches/patch-config_makefiles_rust_mk @@ -5,7 +5,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1640982 Index: config/makefiles/rust.mk --- config/makefiles/rust.mk.orig +++ config/makefiles/rust.mk -@@ -118,7 +118,8 @@ ifndef rustflags_sancov +@@ -91,7 +91,8 @@ ifeq (,$(RUST_SANCOV_FLAGS)) # Never enable when coverage is enabled to work around https://github.com/rust-lang/rust/issues/90045. ifndef MOZ_CODE_COVERAGE ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE))) diff --git a/www/librewolf/patches/patch-mozconfig b/www/librewolf/patches/patch-mozconfig index 51454968286..327fa7440ef 100644 --- a/www/librewolf/patches/patch-mozconfig +++ b/www/librewolf/patches/patch-mozconfig @@ -29,7 +29,7 @@ Index: mozconfig ac_add_options --disable-updater ac_add_options --disable-cargo-incremental ac_add_options --enable-hardening -@@ -13,8 +20,9 @@ +@@ -13,8 +20,9 @@ ac_add_options --enable-release ac_add_options --enable-rust-simd # allow replacing malloc manually, will not affect regular systems # not compatible with ac_add_options --disable-jemalloc, which only works when preloading custom malloc @@ -41,7 +41,7 @@ Index: mozconfig ac_add_options --with-app-name=librewolf ac_add_options --with-branding=browser/branding/librewolf -@@ -33,7 +41,19 @@ +@@ -33,7 +41,19 @@ mk_add_options MOZ_TELEMETRY_REPORTING=0 export CFLAGS="-ftrivial-auto-var-init=zero -fwrapv -Wno-backend-plugin $CFLAGS" export CXXFLAGS="-ftrivial-auto-var-init=zero -fwrapv -Wno-backend-plugin $CXXFLAGS" -- 2.47.3