diff options
| author | B. Stack <bgstack15@gmail.com> | 2021-07-07 23:41:46 +0000 |
|---|---|---|
| committer | B. Stack <bgstack15@gmail.com> | 2021-07-07 23:41:46 +0000 |
| commit | 6fc4955d6f96aac9f63555b1d5c09e8f94377eae (patch) | |
| tree | feb7699ef51dd1e444cd8e30b13b46dbef8b96a2 /scripts | |
| parent | Merge branch 'include_new_patches' into 'master' (diff) | |
| parent | use cargo-installed cbindgen 0.19.0 until in upstream repos (diff) | |
| download | librewolf-debian-6fc4955d6f96aac9f63555b1d5c09e8f94377eae.tar.gz librewolf-debian-6fc4955d6f96aac9f63555b1d5c09e8f94377eae.tar.bz2 librewolf-debian-6fc4955d6f96aac9f63555b1d5c09e8f94377eae.zip | |
Merge branch 'cbindgen0190' into 'master'
Use cargo-installed cbindgen 0.19.0 until it's available in the upstream repos
See merge request librewolf-community/browser/debian!4
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/prep-librewolf-dpkg.sh | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/scripts/prep-librewolf-dpkg.sh b/scripts/prep-librewolf-dpkg.sh index ecf4b6f..c0c220c 100755 --- a/scripts/prep-librewolf-dpkg.sh +++ b/scripts/prep-librewolf-dpkg.sh @@ -91,6 +91,12 @@ 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 \ @@ -151,6 +157,9 @@ 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/debian/.cargo/bin/cbindgen + EOF test "$( uname -p )" = "x86_64" && { echo "ac_add_options --disable-elf-hack" >> "${debian_dir}${_mozconfig}" ; } cat <<EOF >> "${debian_dir}${_mozconfig}" @@ -164,12 +173,6 @@ cat <<EOF >> "${debian_dir}${_mozconfig}" ac_add_options --enable-optimize EOF -# workaround to allow an older cargo version until 0.48 is available in SID -sed -i 's/cargo (>= 0.47),/cargo (>= 0.46),/g' "${debian_dir}"/control.in -sed -i 's/cargo (>= 0.47),/cargo (>= 0.46),/g' "${debian_dir}"/control -sed -i 's/rustc (>= 1.47),/rustc (>= 1.41),/g' "${debian_dir}"/control -sed -i 's/rustc (>= 1.47),/rustc (>= 1.41),/g' "${debian_dir}"/control.in - # add patches to debian/patches mkdir -p "${debian_dir}"/patches/librewolf @@ -370,8 +373,7 @@ sed -r \ -e '/libasound2-dev/s/libasound2-dev,/libasound2-dev, libjack-dev,/;' \ -e '/^Vcs-/d' \ -e '/^ firefox/s/firefox/librewolf/g' \ - -e 's/cargo \(>= 0\.47\),/cargo \(>= 0\.46\),/' \ - -e 's/rustc \(>= 1\.47\),/rustc \(>= 1\.41\),/' \ + -e 's/cbindgen (>= 0.19.0), //' \ firefox_"${distro_firefox_version}".dsc > librewolf_"${distro_firefox_version}".dsc { echo "Files:" |