summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorB. Stack <bgstack15@gmail.com>2021-10-01 19:56:50 -0400
committerB. Stack <bgstack15@gmail.com>2021-10-01 19:56:50 -0400
commit475f5e7b8bfec5434a084466a206d3dd5aecfc89 (patch)
tree8ff2d2fc235794e71efb38a32688edf658f2b2c0 /scripts
parentdebian: disable search-config.patch (diff)
downloadlibrewolf-debian-475f5e7b8bfec5434a084466a206d3dd5aecfc89.tar.gz
librewolf-debian-475f5e7b8bfec5434a084466a206d3dd5aecfc89.tar.bz2
librewolf-debian-475f5e7b8bfec5434a084466a206d3dd5aecfc89.zip
do not remove cbindgen requirement
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/prep-librewolf-dpkg.sh9
1 files changed, 0 insertions, 9 deletions
diff --git a/scripts/prep-librewolf-dpkg.sh b/scripts/prep-librewolf-dpkg.sh
index 1c9b4d0..30f050e 100755
--- a/scripts/prep-librewolf-dpkg.sh
+++ b/scripts/prep-librewolf-dpkg.sh
@@ -91,11 +91,6 @@ test -z "${SKIP_EXTRACT}" && {
#####################################
# Script 1 tasks
-# some direct patching to use the bundled cbindgen until cbindgen >= 0.19.0 is in the debian sid repos
-#cd "${debian_dir}"
-#patch -Np1 -i "${CI_PROJECT_DIR}"/cbindgen.patch
-#cd "${work_dir}"
-
# update debian/control file
# update fields and add libjack-dev
sed -i -r "${debian_dir}"/control \
@@ -156,9 +151,6 @@ mk_add_options MOZ_DATA_REPORTING=0
mk_add_options MOZ_SERVICES_HEALTHREPORT=0
mk_add_options MOZ_TELEMETRY_REPORTING=0
-# workaround to use bundled cbindgen
-ac_add_options CBINDGEN=\$topsrcdir/.cargo/bin/cbindgen
-
EOF
test "$( uname -p )" = "x86_64" && { echo "ac_add_options --disable-elf-hack" >> "${debian_dir}${_mozconfig}" ; }
cat <<EOF >> "${debian_dir}${_mozconfig}"
@@ -371,7 +363,6 @@ sed -r \
-e '/libasound2-dev/s/libasound2-dev,/libasound2-dev, libjack-dev,/;' \
-e '/^Vcs-/d' \
-e '/^ firefox/s/firefox/librewolf/g' \
- -e 's/cbindgen \(>= 0.19.0\), //' \
firefox_"${distro_firefox_version}".dsc > librewolf_"${distro_firefox_version}".dsc
{
echo "Files:"
bgstack15