diff options
| author | ohfp <1813007-ohfp@users.noreply.gitlab.com> | 2021-07-15 15:05:22 +0200 |
|---|---|---|
| committer | ohfp <1813007-ohfp@users.noreply.gitlab.com> | 2021-07-15 15:05:22 +0200 |
| commit | d93998bbc16fa493a3670679d4c74267aefe7cd7 (patch) | |
| tree | e386ce758e98533385fc6194c435ed591c2a6b28 | |
| parent | parentheses need escaping with sed -r, it seems (diff) | |
| download | librewolf-debian-d93998bbc16fa493a3670679d4c74267aefe7cd7.tar.gz librewolf-debian-d93998bbc16fa493a3670679d4c74267aefe7cd7.tar.bz2 librewolf-debian-d93998bbc16fa493a3670679d4c74267aefe7cd7.zip | |
this time, let us try it with including cbindgen in OBS instead
| -rw-r--r-- | cbindgen.patch | 20 | ||||
| -rwxr-xr-x | scripts/prep-librewolf-dpkg.sh | 10 |
2 files changed, 10 insertions, 20 deletions
diff --git a/cbindgen.patch b/cbindgen.patch index eddce0f..33af6fa 100644 --- a/cbindgen.patch +++ b/cbindgen.patch @@ -22,23 +22,3 @@ index b6acf1b..089cbf7 100644 %if DIST == stretch nodejs-mozilla (>= 10), %else -diff --git a/rules b/rules -index 117197e..e1b7858 100755 ---- a/rules -+++ b/rules -@@ -239,11 +239,14 @@ stamps/configure-$(PRODUCT):: stamps/prepare-configure debian/$($(PRODUCT)).mozc - $(COMMON_CONFIGURE_FLAGS) \ - $(CONFIGURE_FLAGS) - --stamps/build-$(PRODUCT):: stamps/configure-check-$(PRODUCT) -+stamps/build-$(PRODUCT):: $(CARGO_HOME)/bin/cbindgen stamps/configure-check-$(PRODUCT) - +dh_auto_build --parallel --builddirectory=build-$(PRODUCT) -- \ - LD_LIBS=-Wl,--no-gc-sections \ - _LEAKTEST_FILES=leaktest.py - -+$(CARGO_HOME)/bin/cbindgen: -+ cargo install --version 0.19.0 cbindgen -+ - L10N_BUILD_STAMPS = $(foreach lang,$(L10N_LANGS),stamps/build-l10n-$(lang)) - stamps/build-l10n:: $(L10N_BUILD_STAMPS) - diff --git a/scripts/prep-librewolf-dpkg.sh b/scripts/prep-librewolf-dpkg.sh index f2815ed..ae3e3ef 100755 --- a/scripts/prep-librewolf-dpkg.sh +++ b/scripts/prep-librewolf-dpkg.sh @@ -96,6 +96,16 @@ cd "${debian_dir}" patch -Np1 -i "${CI_PROJECT_DIR}"/cbindgen.patch cd "${work_dir}" +cat <<'EOF' >> "${debian_dir}"/Cargo.toml +[package] +name = "debian" +version = "0.1.0" +edition = "2018" + +[dependencies] +cbindgen = "0.19.0" +EOF + # update debian/control file # update fields and add libjack-dev |