summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Stack <bgstack15@gmail.com>2022-06-28 08:28:19 -0400
committerB. Stack <bgstack15@gmail.com>2022-06-28 08:28:19 -0400
commit06112b4f01c75207bb19262d92b78b87b6330760 (patch)
tree305a36dbb089a06a5571707b3aa155e92af9d899
parentv101.0.1 initial commit (diff)
downloadlibrewolf-debian-06112b4f01c75207bb19262d92b78b87b6330760.tar.gz
librewolf-debian-06112b4f01c75207bb19262d92b78b87b6330760.tar.bz2
librewolf-debian-06112b4f01c75207bb19262d92b78b87b6330760.zip
add the webrender ffi patch
-rwxr-xr-xscripts/prep-librewolf-dpkg.sh25
1 files changed, 25 insertions, 0 deletions
diff --git a/scripts/prep-librewolf-dpkg.sh b/scripts/prep-librewolf-dpkg.sh
index e6fa6fe..01b9a89 100755
--- a/scripts/prep-librewolf-dpkg.sh
+++ b/scripts/prep-librewolf-dpkg.sh
@@ -194,6 +194,8 @@ librewolf/remove-internal-plugin-certs.patch -p1
librewolf/allow-searchengines-non-esr.patch -p1
librewolf/stop-undesired-requests.patch -p1
librewolf/about-dialog.patch -p1
+# Added v101.0.1
+librewolf/webrender_ffi.patch -p1
EOF
else
# the vpn-ad was disabled at v99.0 because it was broken
@@ -201,6 +203,29 @@ else
"${debian_dir}"/patches/librewolf/
awk -F'/' '{print "librewolf/"$NF}' "${git_source_dir}"/source/assets/patches.txt | \
sed -r -e 's@$@ -p1@' -e '/vpn-ad/d' >> "${debian_dir}"/patches/series
+ # added 101.0.1
+ # ref: https://raw.githubusercontent.com/canonical/firefox-snap/5622734942524846fb0eb7108918c8cd8557fde3/patches/fix-ftbfs-newer-cbindgen.patch
+ # ref: https://bugzilla.mozilla.org/show_bug.cgi?id=1773630
+ # ref: https://gitlab.com/librewolf-community/browser/gentoo/-/issues/42#note_985094574
+ # ref: https://forums.gentoo.org/viewtopic-p-8718512.html?sid=b090546e8d9bcd60ff775c32d04e1743
+ # ref: https://www.google.com/search?hl=en&q=build%2Dbrowser%2Fdist%2Finclude%2Fmozilla%2Fwebrender%2Fwebrender_ffi.h%3A103
+ test -n "1" && cat <<EOF >"${debian_dir}/patches/librewolf/webrender_ffi.patch"
+Description: Remove an extra constant definition that is now being generated by newer versions of cbindgen (0.24), and causing build failures because it is defined in several places.
+Author: Olivier Tilloy <olivier.tilloy@canonical.com>
+Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1773259
+Forwarded: not-needed
+
+--- a/gfx/webrender_bindings/webrender_ffi.h
++++ b/gfx/webrender_bindings/webrender_ffi.h
+@@ -73,8 +73,6 @@ struct WrPipelineInfo;
+ struct WrPipelineIdAndEpoch;
+ using WrPipelineIdEpochs = nsTArray<WrPipelineIdAndEpoch>;
+
+-const uint64_t ROOT_CLIP_CHAIN = ~0;
+-
+ } // namespace wr
+ } // namespace mozilla
+EOF
# For 100.0 to fix this patch.
test -n "1" && cat <<EOF >"${debian_dir}/patches/librewolf/remove-branding-urlbar.patch"
--- a/browser/locales/en-US/browser/browser.ftl.orig 2022-03-22 12:57:21.330016999 -0400
bgstack15