diff --git a/pool.sh b/pool.sh index 3765ce8..97491a1 100644 --- a/pool.sh +++ b/pool.sh @@ -2,3 +2,4 @@ NAME="desktop" MAINTAINER="ngn" PUBKEY="F9E70878C2FB389AEC2BA34CA3654DF5AD9F641D" SRCDIR="src" +IGNORE=("librewolf") diff --git a/src/librewolf/changes.md b/src/librewolf/changes.md index c6f47f6..4b72125 100644 --- a/src/librewolf/changes.md +++ b/src/librewolf/changes.md @@ -1,5 +1,5 @@ -# 129.0.1-1 -Updated to the latest upstream release +# 120.0-1 +Updated to a newer upstream release # 118.0.1-1 First version diff --git a/src/librewolf/pkg.sh b/src/librewolf/pkg.sh index 0a3b871..2a08510 100644 --- a/src/librewolf/pkg.sh +++ b/src/librewolf/pkg.sh @@ -1,14 +1,16 @@ NAME="librewolf" DESC="LibreWolf is a custom and independent version of Firefox, with the primary goals of privacy, security and user freedom" -VERSION="129.0.1-1" +VERSION="120.0-1" FILES=( "https://gitlab.com/api/v4/projects/32320088/packages/generic/librewolf-source/${VERSION}/librewolf-${VERSION}.source.tar.gz" + "with-icu-74-fix.patch" "librewolf.desktop" "mozconfig" ) HASHES=( - "0ec41d7fc79bc64aa303fc6a4b362f0fc8b8c3be6266252540bae6382b0bd8d75a07760c6e8c23a6064801393ea111b7015e385204bf96129b43e8c4991ed688" + "9654cf9ee9083193b5e4311c136735c23a834cba740fc65dd7da72c790119283" + "be296d7c5ad66144ebbca4656b548728eb4917a91c5f1e2d8dbc665b60cebd07" "d1d4fb76689405df792bdb1130be471f3ed6090c4fed634dfc1365c1495fb637" "80b09c546c037994d6b022e0a9075c3c165d6790a0ee35fdb67ac6dc8fc2bc84" ) @@ -30,12 +32,14 @@ PACKAGE() { tar xf "${NAME}-${VERSION}.source.tar.gz" cd "${NAME}-${VERSION}" + patch -Np1 -i "../with-icu-74-fix.patch" cp "${ROOTDIR}/mozconfig" . - export MOZ_DEBUG_FLAGS=" " - export CFLAGS+=" -g0 -std=gnu89" - export CXXFLAGS+=" -g0 -std=gnu89" + export CFLAGS+=" -g0" + export CXXFLAGS+=" -g0" + export RUSTFLAGS="-Cdebuginfo=0" + export MOZ_DEBUG_FLAGS=" " export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none export MOZBUILD_STATE_PATH="${PWD}/mozbuild" diff --git a/src/librewolf/with-icu-74-fix.patch b/src/librewolf/with-icu-74-fix.patch new file mode 100644 index 0000000..4f59529 --- /dev/null +++ b/src/librewolf/with-icu-74-fix.patch @@ -0,0 +1,27 @@ +--- a/intl/lwbrk/LineBreaker.cpp ++++ b/intl/lwbrk/LineBreaker.cpp +@@ -443,17 +443,23 @@ static int8_t GetClass(uint32_t u, LineB + /* JT = 34, [JT] */ CLASS_CHARACTER, + /* JV = 35, [JV] */ CLASS_CHARACTER, + /* CLOSE_PARENTHESIS = 36, [CP] */ CLASS_CLOSE_LIKE_CHARACTER, + /* CONDITIONAL_JAPANESE_STARTER = 37, [CJ] */ CLASS_CLOSE, + /* HEBREW_LETTER = 38, [HL] */ CLASS_CHARACTER, + /* REGIONAL_INDICATOR = 39, [RI] */ CLASS_CHARACTER, + /* E_BASE = 40, [EB] */ CLASS_BREAKABLE, + /* E_MODIFIER = 41, [EM] */ CLASS_CHARACTER, +- /* ZWJ = 42, [ZWJ]*/ CLASS_CHARACTER}; ++ /* ZWJ = 42, [ZWJ]*/ CLASS_CHARACTER, ++ /* AKSARA = 43, [AK] */ CLASS_CHARACTER, ++ /* AKSARA_PREBASE = 44, [AP] */ CLASS_CHARACTER, ++ /* AKSARA_START = 45, [AS] */ CLASS_CHARACTER, ++ /* VIRAMA_FINAL = 46, [VF] */ CLASS_CHARACTER, ++ /* VIRAMA = 47, [VI] */ CLASS_CHARACTER, ++ }; + + static_assert(U_LB_COUNT == mozilla::ArrayLength(sUnicodeLineBreakToClass), + "Gecko vs ICU LineBreak class mismatch"); + + auto cls = GetLineBreakClass(u); + MOZ_ASSERT(cls < mozilla::ArrayLength(sUnicodeLineBreakToClass)); + + // Overrides based on rules for the different line-break values given in