Skip to content

Moved tcpdf_add_font calls from bootstrap, to package step (3.21)#1695

Merged
craigcomstock merged 1 commit into3.21.xfrom
ENT-12777/3.21
Apr 29, 2025
Merged

Moved tcpdf_add_font calls from bootstrap, to package step (3.21)#1695
craigcomstock merged 1 commit into3.21.xfrom
ENT-12777/3.21

Conversation

@craigcomstock
Copy link
Contributor

@craigcomstock craigcomstock commented Apr 25, 2025

tcpdf >= 6.8.0 requires php 7.1+ but we bootstrap for 3.21.x on debian-9 and sury.org has no stretch packages of newer php versions.

Use built php instead.
Ticket: ENT-12777
Changelog: none

ubu16hub only build: Build Status

@cf-bottom
Copy link

Thank you for submitting a pull request! Maybe @craigcomstock can review this?

tcpdf >= 6.8.0 requires php 7.1+ but we bootstrap for 3.21.x on debian-9 and sury.org has no stretch packages of newer php versions.

Use built php instead.
Ticket: ENT-12777
Changelog: none
@craigcomstock
Copy link
Contributor Author

@cf-bottom jenkins no tests please, mostly just see if bootstrap-pr works and then might kill the rest of the build

@cf-bottom
Copy link

@craigcomstock
Copy link
Contributor Author

craigcomstock commented Apr 28, 2025

installed ubu20hub package and looks good!

root@ubuntu2004:/var/cfengine/httpd/htdocs/public/themes/default/bootstrap/cfengine/font/rht# ls
RedHatText-BoldItalic.ttf  RedHatText-Italic.ttf        RedHatText-Medium.ttf
RedHatText-Bold.ttf        RedHatText-MediumItalic.ttf  RedHatText-Regular.ttf

Will check they function properly in compliance report PDF generation. Seems to look good.

@craigcomstock craigcomstock marked this pull request as ready for review April 28, 2025 16:36
@craigcomstock
Copy link
Contributor Author

cherry picks:
3.24.x - #1696
reverting previous fix in master - #1697

@craigcomstock
Copy link
Contributor Author

Almost.

Maybe need to be more careful about the ubu16hub build.

21:48:06 patch -p0 < /home/jenkins/workspace/testing-pr/label/PACKAGES_HUB_x86_64_linux_ubuntu_16/php/pkg/old-gcc-check-avx512-better.patch
21:48:06 patching file configure
21:48:06 Hunk #1 FAILED at 18114.
21:48:06 Hunk #2 FAILED at 18152.
21:48:06 2 out of 2 hunks FAILED -- saving rejects to file configure.rej

@craigcomstock craigcomstock changed the title Moved tcpdf_add_font calls from bootstrap, to package step Moved tcpdf_add_font calls from bootstrap, to package step (3.21) Apr 29, 2025
@craigcomstock
Copy link
Contributor Author

I will fix ubu16hub on 3.21.x in a separate PR. Will merge this PR to get bootstrap-pr working again in nightlies. :)

@craigcomstock craigcomstock merged commit a4d2986 into 3.21.x Apr 29, 2025
35 of 38 checks passed
@craigcomstock craigcomstock deleted the ENT-12777/3.21 branch April 29, 2025 16:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants