From b0d0fcd84ef912ccfe2748b246234e4c46529766 Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Sun, 9 Mar 2025 01:59:13 +0530 Subject: [PATCH 01/12] Added xfonts-base for wkhtmltopdf --- script/get-generic-sys-util/meta.yaml | 11 +++++++++++ script/get-wkhtmltopdf/meta.yaml | 1 + 2 files changed, 12 insertions(+) diff --git a/script/get-generic-sys-util/meta.yaml b/script/get-generic-sys-util/meta.yaml index 4516a506a..a3faa4254 100644 --- a/script/get-generic-sys-util/meta.yaml +++ b/script/get-generic-sys-util/meta.yaml @@ -743,6 +743,17 @@ variations: wkhtmltopdf: apt: wkhtmltopdf brew: wkhtmltopdf + xfonts-base: + env: + MLC_SYS_UTIL_NAME: xfonts_base + new_env_keys: + - MLC_XFONTS_BASE_VERSION + state: + xfonts_base: + apt: xfonts-base + dnf: xorg-x11-fonts-misc + yum: xorg-x11-fonts-misc + zypper: xorg-x11-fonts xz: env: MLC_SYS_UTIL_NAME: xz diff --git a/script/get-wkhtmltopdf/meta.yaml b/script/get-wkhtmltopdf/meta.yaml index eca50da63..96c8f2525 100755 --- a/script/get-wkhtmltopdf/meta.yaml +++ b/script/get-wkhtmltopdf/meta.yaml @@ -8,6 +8,7 @@ tags: deps: - tags: detect,os - tags: detect,sudo + - tags: get,generic-sys-util,_xfonts-base uid: 67ec874a3dfe4b87 variations: with-qt: From 38df1e24505b8e5c4f7bbc4f81121603ddfb3079 Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Sun, 9 Mar 2025 02:09:49 +0530 Subject: [PATCH 02/12] Fix wkhtmltopdf install --- script/get-wkhtmltopdf/run-ubuntu.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/script/get-wkhtmltopdf/run-ubuntu.sh b/script/get-wkhtmltopdf/run-ubuntu.sh index 13a1c642a..2c52c22b6 100644 --- a/script/get-wkhtmltopdf/run-ubuntu.sh +++ b/script/get-wkhtmltopdf/run-ubuntu.sh @@ -3,3 +3,5 @@ wget -nc https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/w test $? -eq 0 || exit $? ${MLC_SUDO} dpkg -i wkhtmltox_0.12.6.1-2.jammy_amd64.deb test $? -eq 0 || exit $? +${MLC_SUDO} apt-get install -f + From 0de6dddc669e33906c01e3f189acb395401bdbd9 Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Sun, 9 Mar 2025 02:10:56 +0530 Subject: [PATCH 03/12] Fix wkhtmltopdf install --- script/get-wkhtmltopdf/meta.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/script/get-wkhtmltopdf/meta.yaml b/script/get-wkhtmltopdf/meta.yaml index 96c8f2525..a2815e0d9 100755 --- a/script/get-wkhtmltopdf/meta.yaml +++ b/script/get-wkhtmltopdf/meta.yaml @@ -10,6 +10,9 @@ deps: - tags: detect,sudo - tags: get,generic-sys-util,_xfonts-base uid: 67ec874a3dfe4b87 +docker: + pre_run_cmds: + - mlc pull repo variations: with-qt: group: qt From 07e73c174479a26081e012d4cbf4612bf57526a3 Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Sun, 9 Mar 2025 02:13:13 +0530 Subject: [PATCH 04/12] Fix wkhtmltopdf install --- script/get-wkhtmltopdf/run-ubuntu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/get-wkhtmltopdf/run-ubuntu.sh b/script/get-wkhtmltopdf/run-ubuntu.sh index 2c52c22b6..40ed22905 100644 --- a/script/get-wkhtmltopdf/run-ubuntu.sh +++ b/script/get-wkhtmltopdf/run-ubuntu.sh @@ -2,6 +2,6 @@ wget -nc https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.jammy_amd64.deb test $? -eq 0 || exit $? ${MLC_SUDO} dpkg -i wkhtmltox_0.12.6.1-2.jammy_amd64.deb -test $? -eq 0 || exit $? ${MLC_SUDO} apt-get install -f +test $? -eq 0 || exit $? From ecc8333846a748ca20db82879c169924ef4eff48 Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Sun, 9 Mar 2025 02:14:42 +0530 Subject: [PATCH 05/12] Fix wkhtmltopdf install --- script/get-wkhtmltopdf/run-ubuntu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/get-wkhtmltopdf/run-ubuntu.sh b/script/get-wkhtmltopdf/run-ubuntu.sh index 40ed22905..ebafe84ef 100644 --- a/script/get-wkhtmltopdf/run-ubuntu.sh +++ b/script/get-wkhtmltopdf/run-ubuntu.sh @@ -2,6 +2,6 @@ wget -nc https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-2/wkhtmltox_0.12.6.1-2.jammy_amd64.deb test $? -eq 0 || exit $? ${MLC_SUDO} dpkg -i wkhtmltox_0.12.6.1-2.jammy_amd64.deb -${MLC_SUDO} apt-get install -f +${MLC_SUDO} DEBIAN_FRONTEND=noninteractive apt-get install -f -y test $? -eq 0 || exit $? From e222f54c4253655e7631d04e2c0963e80a556f1f Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Sun, 9 Mar 2025 02:21:11 +0530 Subject: [PATCH 06/12] Fix wkhtmltopdf install on RHEL --- script/get-wkhtmltopdf/run-fedora.sh | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/script/get-wkhtmltopdf/run-fedora.sh b/script/get-wkhtmltopdf/run-fedora.sh index cd3c713a6..8966e7793 100644 --- a/script/get-wkhtmltopdf/run-fedora.sh +++ b/script/get-wkhtmltopdf/run-fedora.sh @@ -5,12 +5,4 @@ wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox-0.12.6-1.centos6.x86_64.rpm # Install the package -sudo yum localinstall -y wkhtmltox-0.12.6-1.centos6.x86_64.rpm - -# Install dependencies -sudo yum install -y xorg-x11-fonts-75dpi - -# Verify the installation -wkhtmltopdf --version - - +${MLC_SUDO} yum localinstall -y wkhtmltox-0.12.6-1.centos6.x86_64.rpm From cdcdf5d7dd429d1af03fb25058d5bd59c3a55869 Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Sun, 9 Mar 2025 02:21:59 +0530 Subject: [PATCH 07/12] Fix wkhtmltopdf install on RHEL --- script/get-wkhtmltopdf/run-fedora.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/get-wkhtmltopdf/run-fedora.sh b/script/get-wkhtmltopdf/run-fedora.sh index 8966e7793..844af30d8 100644 --- a/script/get-wkhtmltopdf/run-fedora.sh +++ b/script/get-wkhtmltopdf/run-fedora.sh @@ -5,4 +5,4 @@ wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox-0.12.6-1.centos6.x86_64.rpm # Install the package -${MLC_SUDO} yum localinstall -y wkhtmltox-0.12.6-1.centos6.x86_64.rpm +${MLC_SUDO} yum localinstall -y wkhtmltox-0.12.6-1.centos6.x86_64.rpm --no-best From be8467fb51070cb69306d2335d8744d0135051da Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Sun, 9 Mar 2025 02:22:39 +0530 Subject: [PATCH 08/12] Fix wkhtmltopdf install on RHEL --- script/get-wkhtmltopdf/run-fedora.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/get-wkhtmltopdf/run-fedora.sh b/script/get-wkhtmltopdf/run-fedora.sh index 844af30d8..2be9e1619 100644 --- a/script/get-wkhtmltopdf/run-fedora.sh +++ b/script/get-wkhtmltopdf/run-fedora.sh @@ -5,4 +5,4 @@ wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox-0.12.6-1.centos6.x86_64.rpm # Install the package -${MLC_SUDO} yum localinstall -y wkhtmltox-0.12.6-1.centos6.x86_64.rpm --no-best +${MLC_SUDO} yum localinstall -y wkhtmltox-0.12.6-1.centos6.x86_64.rpm --nobest From 7a17bb7c322ba1bcc45dbe06669d46ba23af395a Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Sun, 9 Mar 2025 02:23:22 +0530 Subject: [PATCH 09/12] Fix wkhtmltopdf install on RHEL --- script/get-wkhtmltopdf/run-fedora.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/get-wkhtmltopdf/run-fedora.sh b/script/get-wkhtmltopdf/run-fedora.sh index 2be9e1619..04d9d5c9f 100644 --- a/script/get-wkhtmltopdf/run-fedora.sh +++ b/script/get-wkhtmltopdf/run-fedora.sh @@ -5,4 +5,4 @@ wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox-0.12.6-1.centos6.x86_64.rpm # Install the package -${MLC_SUDO} yum localinstall -y wkhtmltox-0.12.6-1.centos6.x86_64.rpm --nobest +${MLC_SUDO} yum localinstall -y wkhtmltox-0.12.6-1.centos6.x86_64.rpm --nobest --skip-broken From 9c74b11d77d2a31bbb19c18bc90b1c8df5c18962 Mon Sep 17 00:00:00 2001 From: Arjun Suresh Date: Sun, 9 Mar 2025 02:24:07 +0530 Subject: [PATCH 10/12] Fix wkhtmltopdf install on RHEL --- script/get-wkhtmltopdf/run-fedora.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/script/get-wkhtmltopdf/run-fedora.sh b/script/get-wkhtmltopdf/run-fedora.sh index 04d9d5c9f..d91b05b34 100644 --- a/script/get-wkhtmltopdf/run-fedora.sh +++ b/script/get-wkhtmltopdf/run-fedora.sh @@ -6,3 +6,6 @@ wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmlt # Install the package ${MLC_SUDO} yum localinstall -y wkhtmltox-0.12.6-1.centos6.x86_64.rpm --nobest --skip-broken + +wkhtmltopdf --version +test $? -eq 0 || exit $? From d9e705dabb226ad697e094f448dc5588369409a3 Mon Sep 17 00:00:00 2001 From: mlcommons-bot Date: Sat, 8 Mar 2025 21:52:49 +0000 Subject: [PATCH 11/12] skip detect-sudo on windows --- script/get-wkhtmltopdf/meta.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/script/get-wkhtmltopdf/meta.yaml b/script/get-wkhtmltopdf/meta.yaml index a2815e0d9..3b3b13677 100755 --- a/script/get-wkhtmltopdf/meta.yaml +++ b/script/get-wkhtmltopdf/meta.yaml @@ -8,7 +8,9 @@ tags: deps: - tags: detect,os - tags: detect,sudo - - tags: get,generic-sys-util,_xfonts-base + skip_if_env: + MLC_HOST_OS_TYPE: + - windows uid: 67ec874a3dfe4b87 docker: pre_run_cmds: From d376d35584d18852e923d1dd3de61b7ef750ccb5 Mon Sep 17 00:00:00 2001 From: Arjun Date: Sat, 8 Mar 2025 22:28:09 +0000 Subject: [PATCH 12/12] Use brew version for wkhtmltopdf --- script/get-wkhtmltopdf/meta.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/script/get-wkhtmltopdf/meta.yaml b/script/get-wkhtmltopdf/meta.yaml index 3b3b13677..b1802dd45 100755 --- a/script/get-wkhtmltopdf/meta.yaml +++ b/script/get-wkhtmltopdf/meta.yaml @@ -11,6 +11,10 @@ deps: skip_if_env: MLC_HOST_OS_TYPE: - windows + - tags: get,generic-sys-util,_wkhtmltopdf + enable_if_env: + MLC_HOST_OS_TYPE: + - darwin uid: 67ec874a3dfe4b87 docker: pre_run_cmds: