From 2295879dba4920af805a6f391965d27558339d8c Mon Sep 17 00:00:00 2001 From: Cockpit Project Date: Fri, 7 Feb 2025 12:37:54 +0000 Subject: [PATCH] Makefile: Update Cockpit lib to 54f87df7b7b5428c66bae8c1b91f3096 Move to Python version of html2po. Closes #1995 --- Makefile | 4 ++-- node_modules | 2 +- package.json | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 4841b104..5fb82e4a 100644 --- a/Makefile +++ b/Makefile @@ -50,7 +50,7 @@ COCKPIT_REPO_FILES = \ $(NULL) COCKPIT_REPO_URL = https://github.com/cockpit-project/cockpit.git -COCKPIT_REPO_COMMIT = 1cc67cefe33c58b33016655f329a1b3f26a5bbf0 # 332 + 36 commits +COCKPIT_REPO_COMMIT = 54f87df7b7b5428c66bae8c1b91f30963c8bdb45 # 332 + 41 commits $(COCKPIT_REPO_FILES): $(COCKPIT_REPO_STAMP) COCKPIT_REPO_TREE = '$(strip $(COCKPIT_REPO_COMMIT))^{tree}' @@ -76,7 +76,7 @@ po/$(PACKAGE_NAME).js.pot: sed '/^#/ s/, c-format//' > $@ po/$(PACKAGE_NAME).html.pot: $(NODE_MODULES_TEST) $(COCKPIT_REPO_STAMP) - pkg/lib/html2po.js -o $@ $$(find src -name '*.html') + pkg/lib/html2po -o $@ $$(find src -name '*.html') po/$(PACKAGE_NAME).manifest.pot: $(COCKPIT_REPO_STAMP) pkg/lib/manifest2po -o $@ src/manifest.json diff --git a/node_modules b/node_modules index 93b67fe8..bcf68a2a 160000 --- a/node_modules +++ b/node_modules @@ -1 +1 @@ -Subproject commit 93b67fe84a4151e34eadbc9eb38af2df9dc5b85b +Subproject commit bcf68a2a49a70c3aabe342ff2358661e547184e0 diff --git a/package.json b/package.json index 92aa2883..cdc2211f 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,6 @@ "eslint-plugin-react-hooks": "4.6.2", "gettext-parser": "8.0.0", "glob": "11.0.1", - "htmlparser": "1.7.7", "jed": "1.1.1", "sass": "1.79.6", "sizzle": "2.3.10",