From 89097f51f6540040c5ab2ba44c67b39cd6148344 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sat, 2 Aug 2025 11:19:34 +1000 Subject: [PATCH] floorp: bump version --- www-client/floorp/additional-files/mozconfig | 4 ---- ...orp-11.26.0.recipe => floorp-12.0.15.recipe} | 17 ++++++++++++----- ...11.26.0.patchset => floorp-12.0.15.patchset} | 0 3 files changed, 12 insertions(+), 9 deletions(-) rename www-client/floorp/{floorp-11.26.0.recipe => floorp-12.0.15.recipe} (93%) rename www-client/floorp/patches/{floorp-11.26.0.patchset => floorp-12.0.15.patchset} (100%) diff --git a/www-client/floorp/additional-files/mozconfig b/www-client/floorp/additional-files/mozconfig index 5817c6c81..d7ebf42d5 100644 --- a/www-client/floorp/additional-files/mozconfig +++ b/www-client/floorp/additional-files/mozconfig @@ -36,10 +36,6 @@ mk_add_options MOZ_TELEMETRY_REPORTING=0 # Enable ac_add_options --enable-webrtc -# Linker -export LD="lld" -export LDFLAGS="-fuse-ld=lld -Wl,--no-keep-memory -Wl,--undefined-version" - # Optimize ac_add_options --enable-jit ac_add_options --enable-optimize=-O3 diff --git a/www-client/floorp/floorp-11.26.0.recipe b/www-client/floorp/floorp-12.0.15.recipe similarity index 93% rename from www-client/floorp/floorp-11.26.0.recipe rename to www-client/floorp/floorp-12.0.15.recipe index c9b8dd741..99a368c55 100644 --- a/www-client/floorp/floorp-11.26.0.recipe +++ b/www-client/floorp/floorp-12.0.15.recipe @@ -16,11 +16,11 @@ COPYRIGHT="1995-2025 Mozilla Developers, Floorp Projects & Ablaze" LICENSE="MPL v2.0" REVISION="1" SOURCE_URI="https://github.com/Floorp-Projects/Floorp/archive/refs/tags/v$portVersion.tar.gz" -CHECKSUM_SHA256="7123659c4290b0162ef1cfd1defda0b692b3471d17a35c7608db6a88c945315d" +CHECKSUM_SHA256="3784e31f42cec861c2597ba7ac2f3005822a1fb29043d3f2457fdd25a507cf3f" SOURCE_DIR="Floorp-$portVersion" -srcGitRev2="af5e7227fdd96c64c10abc731e4b9bbc44cd7f5a" +srcGitRev2="41d0b3f178657964fad54feadfb43946df131664" SOURCE_URI_2="https://github.com/Floorp-Projects/Floorp-core/archive/$srcGitRev2.tar.gz" -CHECKSUM_SHA256_2="4c86f44e0fdd606545bf314925935e44baaa04586830b5210eb735f3c2d56fc1" +CHECKSUM_SHA256_2="40491e4064da89ef52334c58f351d2fa7cb9c6e470fda45da6defa50a032de09" SOURCE_DIR_2="Floorp-core-$srcGitRev2" srcGitRev3="29bb9bed37ae970fbac4c8222010328b7fbf7e15" SOURCE_URI_3="https://github.com/Floorp-Projects/Unified-l10n-central/archive/$srcGitRev3.tar.gz" @@ -43,6 +43,9 @@ PROVIDES=" floorp= $portVersion app:Floorp= $portVersion " +CONFLICTS=" + floorp_bin + " REQUIRES=" haiku lib:libatk_1.0 @@ -57,6 +60,7 @@ REQUIRES=" lib:libharfbuzz lib:libintl lib:libmediahelpers + lib:libnotify lib:libnspr4 lib:libnss3 lib:libpango_1.0 @@ -73,6 +77,7 @@ BUILD_REQUIRES=" devel:libglib_2.0 devel:libgtk_3 devel:libmediahelpers + devel:libnotify devel:libnspr4 devel:libnss3 devel:libpng16 @@ -81,7 +86,7 @@ BUILD_REQUIRES=" devel:libzstd " BUILD_PREREQUIRES=" - llvm18 + llvm20 nodejs20 rust_bin cmd:autoconf_2.13 @@ -91,7 +96,7 @@ BUILD_PREREQUIRES=" cmd:gcc cmd:git cmd:gn - cmd:lld >= 18 + cmd:lld >= 20 cmd:m4 cmd:make cmd:nasm @@ -125,6 +130,7 @@ BUILD() rm -rf floorp/browser/locales/l10n-central ln -s $sourceDir3 floorp/browser/locales/l10n-central + export DISABLE_ASLR=1 export MOZBUILD_STATE_PATH="$sourceDir/.buildstate" ./mach -vv \ @@ -142,6 +148,7 @@ BUILD() INSTALL() { + export DISABLE_ASLR=1 export MOZBUILD_STATE_PATH="$sourceDir/.buildstate" ./mach install diff --git a/www-client/floorp/patches/floorp-11.26.0.patchset b/www-client/floorp/patches/floorp-12.0.15.patchset similarity index 100% rename from www-client/floorp/patches/floorp-11.26.0.patchset rename to www-client/floorp/patches/floorp-12.0.15.patchset