summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ded3ffc0a0485d3b34e440a293fe1fbbe14a01ff.patch40
-rw-r--r--php-zendframework-zendpdf.spec13
2 files changed, 50 insertions, 3 deletions
diff --git a/ded3ffc0a0485d3b34e440a293fe1fbbe14a01ff.patch b/ded3ffc0a0485d3b34e440a293fe1fbbe14a01ff.patch
new file mode 100644
index 0000000..b20f85f
--- /dev/null
+++ b/ded3ffc0a0485d3b34e440a293fe1fbbe14a01ff.patch
@@ -0,0 +1,40 @@
+From ded3ffc0a0485d3b34e440a293fe1fbbe14a01ff Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Mon, 15 Oct 2018 10:16:08 +0200
+Subject: [PATCH] fix PHP 7.3 warnings
+
+---
+ .../ZendPdf/BinaryParser/Font/OpenType/AbstractOpenType.php | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/library/ZendPdf/BinaryParser/Font/OpenType/AbstractOpenType.php b/library/ZendPdf/BinaryParser/Font/OpenType/AbstractOpenType.php
+index 2e3d43b..82214df 100644
+--- a/library/ZendPdf/BinaryParser/Font/OpenType/AbstractOpenType.php
++++ b/library/ZendPdf/BinaryParser/Font/OpenType/AbstractOpenType.php
+@@ -858,7 +858,7 @@ protected function _parseCMapTable()
+ if ($language != 0) {
+ $this->_debugLog('Type 0 cmap tables must be language-independent;'
+ . ' language: %d; skipping', $language);
+- continue;
++ continue 2;
+ }
+ break;
+
+@@ -877,7 +877,7 @@ protected function _parseCMapTable()
+ case 0xa: // break intentionally omitted
+ case 0xc:
+ $this->_debugLog('Format: 0x%x currently unsupported; skipping', $format);
+- continue;
++ continue 2;
+ //$this->skipBytes(2);
+ //$cmapLength = $this->readUInt(4);
+ //$language = $this->readUInt(4);
+@@ -889,7 +889,7 @@ protected function _parseCMapTable()
+
+ default:
+ $this->_debugLog('Unknown subtable format: 0x%x; skipping', $format);
+- continue;
++ continue 2;
+ }
+ $cmapType = $format;
+ break;
diff --git a/php-zendframework-zendpdf.spec b/php-zendframework-zendpdf.spec
index 045ee9f..d04cc7f 100644
--- a/php-zendframework-zendpdf.spec
+++ b/php-zendframework-zendpdf.spec
@@ -1,6 +1,6 @@
# remirepo/Fedora spec file for php-zendframework-zendpdf
#
-# Copyright (c) 2015-2017 Remi Collet
+# Copyright (c) 2015-2018 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
@@ -16,7 +16,7 @@
Name: php-%{gh_owner}-%{gh_project}
Version: 2.0.2
-Release: 6%{?dist}
+Release: 9%{?dist}
Summary: Zend Framework %{library} component
Group: Development/Libraries
@@ -25,6 +25,8 @@ URL: https://framework.zend.com/
Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz
Source1: makesrc.sh
+Patch0: https://github.com/zendframework/ZendPdf/commit/ded3ffc0a0485d3b34e440a293fe1fbbe14a01ff.patch
+
BuildArch: noarch
# Tests
%if %{with_tests}
@@ -73,6 +75,7 @@ Provides: php-autoloader(%{gh_owner}/%{gh_project}) = %{version}
%prep
%setup -q -n %{gh_project}-%{gh_commit}
+%patch0 -p1
mv LICENSE.txt LICENSE
@@ -114,7 +117,7 @@ EOF
cd tests
ret=0
-for cmd in php php56 php70 php71 php72; do
+for cmd in php php56 php70 php71 php72 php73; do
if which $cmd; then
$cmd %{_bindir}/phpunit --verbose || ret=1
fi
@@ -135,6 +138,10 @@ exit $ret
%changelog
+* Mon Oct 15 2018 Remi Collet <remi@remirepo.net> - 2.0.2-9
+- add patch for PHP 7.3 from
+ https://github.com/zendframework/ZendPdf/pull/35
+
* Wed Dec 6 2017 Remi Collet <remi@remirepo.net> - 2.0.2-6
- switch from zend-loader to fedora/autoloader