From 03cef4b2e4e056cc905da9c53cc79b9e4f0b5504 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 21 Apr 2026 08:05:30 +0200 Subject: update to 2.6.39 (no change) --- php-tecnickcom-tc-lib-pdf-font-rpm.patch | 39 ++++++++++++++++---------------- 1 file changed, 20 insertions(+), 19 deletions(-) (limited to 'php-tecnickcom-tc-lib-pdf-font-rpm.patch') diff --git a/php-tecnickcom-tc-lib-pdf-font-rpm.patch b/php-tecnickcom-tc-lib-pdf-font-rpm.patch index 90cf22f..57a8e2a 100644 --- a/php-tecnickcom-tc-lib-pdf-font-rpm.patch +++ b/php-tecnickcom-tc-lib-pdf-font-rpm.patch @@ -1,20 +1,21 @@ diff -up ./src/Load.php.rpm ./src/Load.php ---- ./src/Load.php.rpm 2026-04-11 18:57:51.000000000 +0200 -+++ ./src/Load.php 2026-04-14 12:16:20.395083087 +0200 -@@ -359,6 +359,10 @@ abstract class Load - { - $dir = new Dir(); - $dirs = ['']; -+ $glb = \glob('/usr/share/php-tecnickcom-tc-lib-pdf-font/*', GLOB_ONLYDIR); -+ if ($glb !== false) { -+ $dirs = [...$dirs, ...$glb]; -+ } - if (\defined('K_PATH_FONTS')) { - $dirs[] = K_PATH_FONTS; - $glb = \glob(K_PATH_FONTS . DIRECTORY_SEPARATOR . '*', GLOB_ONLYDIR); +--- ./src/Load.php.rpm 2026-04-20 09:18:14.000000000 +0200 ++++ ./src/Load.php 2026-04-21 08:01:40.439250910 +0200 +@@ -365,6 +365,11 @@ abstract class Load + if ($glb !== false) { + $dirs = [...$dirs, ...$glb]; + } ++ } else { ++ $glb = \glob('/usr/share/php-tecnickcom-tc-lib-pdf-font/*', GLOB_ONLYDIR); ++ if ($glb !== false) { ++ $dirs = [...$dirs, ...$glb]; ++ } + } + + $parent_font_dir = $dir->findParentDir('fonts', __DIR__); diff -up ./test/OutputTest.php.rpm ./test/OutputTest.php ---- ./test/OutputTest.php.rpm 2026-04-14 12:18:43.369505233 +0200 -+++ ./test/OutputTest.php 2026-04-14 12:19:26.395635970 +0200 +--- ./test/OutputTest.php.rpm 2026-04-20 09:18:14.000000000 +0200 ++++ ./test/OutputTest.php 2026-04-21 08:00:25.977554452 +0200 @@ -75,7 +75,7 @@ class OutputTest extends TestUtil $encrypt = new \Com\Tecnick\Pdf\Encrypt\Encrypt(); $output = new \Com\Tecnick\Pdf\Font\Output($fonts, $objnum, $encrypt); @@ -25,8 +26,8 @@ diff -up ./test/OutputTest.php.rpm ./test/OutputTest.php $this->assertNotEmpty($output->getFontsBlock()); diff -up ./util/bulk_convert.php.rpm ./util/bulk_convert.php ---- ./util/bulk_convert.php.rpm 2026-04-11 18:57:51.000000000 +0200 -+++ ./util/bulk_convert.php 2026-04-14 12:16:20.395188715 +0200 +--- ./util/bulk_convert.php.rpm 2026-04-20 09:18:14.000000000 +0200 ++++ ./util/bulk_convert.php 2026-04-21 08:00:25.977634131 +0200 @@ -86,7 +86,7 @@ if (!\is_writable($options['outpath'])) exit(2); } @@ -46,8 +47,8 @@ diff -up ./util/bulk_convert.php.rpm ./util/bulk_convert.php $fontdir = \array_diff(\scandir($ttfdir), array('.', '..', '.git')); diff -up ./util/convert.php.rpm ./util/convert.php ---- ./util/convert.php.rpm 2026-04-11 18:57:51.000000000 +0200 -+++ ./util/convert.php 2026-04-14 12:16:20.395243397 +0200 +--- ./util/convert.php.rpm 2026-04-20 09:18:14.000000000 +0200 ++++ ./util/convert.php 2026-04-21 08:00:25.977686323 +0200 @@ -224,7 +224,7 @@ if (empty($options['fonts'])) { $convert_errors = 0; $convert_success = 0; -- cgit