diff --git a/resources/packaging/debian/minimal.patch b/resources/packaging/debian/minimal.patch index 59deb279..7a24efdf 100644 --- a/resources/packaging/debian/minimal.patch +++ b/resources/packaging/debian/minimal.patch @@ -65,7 +65,7 @@ libharfbuzz-dev, --- a/rules.in +++ b/rules.in -@@ -42,10 +42,6 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +@@ -42,12 +42,8 @@ njobs=-j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) endif @@ -74,8 +74,11 @@ - /usr/share/javascript/jquery-flot/*min.js \ - %: - dh $@ +- dh $@ ++ dh $@ --parallel + $ungoog{build_output}/gn: + mkdir -p $ungoog{build_output} || true @@ -56,13 +52,6 @@ $ungoog{build_output}/gn: override_dh_auto_configure: # output compiler information diff --git a/resources/packaging/debian/standard/rules.in b/resources/packaging/debian/standard/rules.in index 02ef3cc1..a367a442 100755 --- a/resources/packaging/debian/standard/rules.in +++ b/resources/packaging/debian/standard/rules.in @@ -51,7 +51,7 @@ flotpaths=/usr/share/javascript/jquery/*min.js \ $ungoog{build_output}/gn: mkdir -p $ungoog{build_output} || true - ./tools/gn/bootstrap/bootstrap.py -o $ungoog{build_output}/gn -s -j $(njobs) + ./tools/gn/bootstrap/bootstrap.py -o $ungoog{build_output}/gn -s $(njobs) override_dh_auto_configure: # output compiler information diff --git a/utilikit/substitute_domains.py b/utilikit/substitute_domains.py index 0fc5fdba..c924fd58 100755 --- a/utilikit/substitute_domains.py +++ b/utilikit/substitute_domains.py @@ -72,7 +72,7 @@ def substitute_domains_in_patches(regex_list, file_list, patch_list, root_dir, l file_set = set(file_list) for patch_path_str in patch_list: - with (root_dir / patch_path_str).open('r+') as file_obj: + with (root_dir / patch_path_str).open('r+', encoding='UTF-8') as file_obj: try: patchset = unidiff.PatchSet(file_obj.read()) except Exception as e: