Добавил патч в сборку, который предварительно протестировал через
--dry-run. Но сборщик не принимает этот патч, будто бы он не корректен. Подскажите в чем дело? Есть какая то особая процедура сборки и добавления патча?
checking file modules/libpref/Preferences.cpp
Hunk #1 succeeded at 89 (offset 1 line).
Hunk #2 succeeded at 4848 with fuzz 2 (offset 24 lines).
Hunk #3 succeeded at 4950 (offset 41 lines).
checking file modules/libpref/moz.build
Hunk #1 succeeded at 122 (offset 1 line).
checking file python/mozbuild/mozpack/chrome/flags.py
checking file python/mozbuild/mozpack/chrome/manifest.py
checking file toolkit/components/downloads/moz.build
checking file toolkit/mozapps/downloads/HelperAppDlg.jsm
Hunk #1 succeeded at 1239 (offset -26 lines).
checking file toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
Hunk #2 succeeded at 36 (offset 1 line).
Hunk #3 succeeded at 392 (offset 10 lines).
checking file toolkit/xre/moz.build
checking file toolkit/xre/nsKDEUtils.cpp
checking file toolkit/xre/nsKDEUtils.h
checking file uriloader/exthandler/HandlerServiceParent.cpp
checking file uriloader/exthandler/moz.build
checking file uriloader/exthandler/unix/nsCommonRegistry.cpp
checking file uriloader/exthandler/unix/nsCommonRegistry.h
checking file uriloader/exthandler/unix/nsKDERegistry.cpp
checking file uriloader/exthandler/unix/nsKDERegistry.h
checking file uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
checking file uriloader/exthandler/unix/nsOSHelperAppService.cpp
checking file widget/gtk/moz.build
checking file widget/gtk/nsFilePicker.cpp
Hunk #2 succeeded at 22 with fuzz 1 (offset -1 lines).
Hunk #3 succeeded at 238 (offset -1 lines).
Hunk #4 succeeded at 350 (offset -1 lines).
Hunk #5 succeeded at 602 (offset -1 lines).
checking file widget/gtk/nsFilePicker.h
checking file xpcom/components/ManifestParser.cpp
checking file xpcom/components/moz.build
Hunk #1 succeeded at 66 with fuzz 1.
checking file xpcom/io/nsLocalFileUnix.cpp
Hunk #2 succeeded at 2095 (offset 11 lines).
Hunk #3 succeeded at 2129 (offset 11 lines).
dpkg-source: инфо: накладывается kde-plasma-integration.patch
patching file modules/libpref/Preferences.cpp
Hunk #1 succeeded at 89 (offset 1 line).
Hunk #2 FAILED at 4824.
Hunk #3 succeeded at 4939 (offset 41 lines).
1 out of 3 hunks FAILED
patching file modules/libpref/moz.build
Hunk #1 succeeded at 122 (offset 1 line).
patching file python/mozbuild/mozpack/chrome/flags.py
patching file python/mozbuild/mozpack/chrome/manifest.py
patching file toolkit/components/downloads/moz.build
patching file toolkit/mozapps/downloads/HelperAppDlg.jsm
Hunk #1 succeeded at 1239 (offset -26 lines).
patching file toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
Hunk #2 succeeded at 36 (offset 1 line).
Hunk #3 succeeded at 392 (offset 10 lines).
patching file toolkit/xre/moz.build
patching file toolkit/xre/nsKDEUtils.cpp
patching file toolkit/xre/nsKDEUtils.h
patching file uriloader/exthandler/HandlerServiceParent.cpp
patching file uriloader/exthandler/moz.build
patching file uriloader/exthandler/unix/nsCommonRegistry.cpp
patching file uriloader/exthandler/unix/nsCommonRegistry.h
patching file uriloader/exthandler/unix/nsKDERegistry.cpp
patching file uriloader/exthandler/unix/nsKDERegistry.h
patching file uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
patching file uriloader/exthandler/unix/nsOSHelperAppService.cpp
patching file widget/gtk/moz.build
patching file widget/gtk/nsFilePicker.cpp
Hunk #2 FAILED at 23.
Hunk #3 succeeded at 236 (offset -1 lines).
Hunk #4 succeeded at 348 (offset -1 lines).
Hunk #5 succeeded at 600 (offset -1 lines).
1 out of 5 hunks FAILED
patching file widget/gtk/nsFilePicker.h
patching file xpcom/components/ManifestParser.cpp
patching file xpcom/components/moz.build
Hunk #1 FAILED at 66.
1 out of 1 hunk FAILED
patching file xpcom/io/nsLocalFileUnix.cpp
Hunk #2 succeeded at 2095 (offset 11 lines).
Hunk #3 succeeded at 2129 (offset 11 lines).
dpkg-source: инфо: заплата содержит неточность (fuzz), что запрещено, или имеет некорректный формат
dpkg-source: инфо: если заплата «kde-plasma-integration.patch» корректно накладывается quilt, используйте «quilt refresh» для её обновления
dpkg-source: инфо: if the file is present in the unpacked source, make sure it is also present in the orig tarball
dpkg-source: инфо: восстановление резервных копий файлов quilt для kde-plasma-integration.patch
dpkg-source: ошибка: LC_ALL=C patch -t -F 0 -N -p1 -u -V never -E -b -B .pc/kde-plasma-integration.patch/ --reject-file=- < firefox-108.0.2+build1/debian/patches/kde-plasma-integration.patch subprocess returned exit status 1
dpkg-buildpackage: ошибка: dpkg-source --before-build . subprocess returned exit status 2
Пользователь добавил сообщение 08 Января 2023, 10:29:08:
Проблему с патчем решил. Но далее получаю ошибку при сборке:
cargo build --release; \
export CARGO_HOME=/home/nihi1ist/.src/firefox/108.0.2/firefox-108.0.2+build1/third_party/cbindgen/.cargo; \
cargo install --path . --bin cbindgen --root ../../cbindgen
error: rustup could not choose a version of cargo to run, because one wasn't specified explicitly, and no default is configured.
help: run 'rustup default stable' to download the latest stable release of Rust and set it as your default toolchain.
error: rustup could not choose a version of cargo to run, because one wasn't specified explicitly, and no default is configured.
help: run 'rustup default stable' to download the latest stable release of Rust and set it as your default toolchain.
make: *** [/home/nihi1ist/.src/firefox/108.0.2/firefox-108.0.2+build1/debian/build/rules.mk:238: cbindgen/bin/cbindgen] Ошибка 1
dpkg-buildpackage: ошибка: debian/rules build subprocess returned exit status 2
Хотя указанные действия (rustup default stable) были проведены. Ниже показаны версии rust и cargo.
rustc --version
rustc 1.66.0 (69f9c33d7 2022-12-12)
cargo --version
cargo 1.66.0 (d65d197ad 2022-11-15)
Участок кода debian/build/rules.mk:238, вторая строка именно та самая 238:
cbindgen/bin/cbindgen: third_party/cbindgen/Cargo.toml
export RUST_BACKTRACE=full; \
export CC=clang-$(DEB_LLVM_VERSION); \
export CXX=clang++-$(DEB_LLVM_VERSION); \
cd $(CURDIR)/third_party/cbindgen; \
cargo build --release; \
export CARGO_HOME=$(CURDIR)/third_party/cbindgen/.cargo; \
cargo install --path . --bin cbindgen --root ../../cbindgen
clean::
rm -rf $(CURDIR)/cbindgen
rm -rf $(CURDIR)/third_party/cbindgen/target