diff options
author | Andy Postnikov <apostnikov@gmail.com> | 2020-06-17 23:20:34 +0300 |
---|---|---|
committer | Andy Postnikov <apostnikov@gmail.com> | 2020-06-17 23:52:46 +0300 |
commit | 9bdefbb0b22d00a98855facc6b61b76b6cb94c00 (patch) | |
tree | da88673439bdff5f2301475ef8896d531f987697 | |
parent | 32fdb95942174d852bb25ff5a2eedb2b6d56dd41 (diff) |
testing/php7-pecl-xlswriter: upgrade to 1.3.6
-rw-r--r-- | testing/php7-pecl-xlswriter/APKBUILD | 12 | ||||
-rw-r--r-- | testing/php7-pecl-xlswriter/fix-musl.patch | 40 |
2 files changed, 5 insertions, 47 deletions
diff --git a/testing/php7-pecl-xlswriter/APKBUILD b/testing/php7-pecl-xlswriter/APKBUILD index 49b67aa668e..97c3d28af06 100644 --- a/testing/php7-pecl-xlswriter/APKBUILD +++ b/testing/php7-pecl-xlswriter/APKBUILD @@ -2,16 +2,15 @@ # Maintainer: viest <dev@service.viest.me> pkgname=php7-pecl-xlswriter _pkgreal=xlswriter -pkgver=1.3.5 -pkgrel=1 +pkgver=1.3.6 +pkgrel=0 pkgdesc="A PHP Extension for creating and reader XLSX files. " url="https://pecl.php.net/package/xlswriter" arch="all !s390x !mips !mips64" # Test failure license="BSD-2-Clause" depends="php7-common" -makedepends="php7-dev zlib-dev re2c" -source="$pkgname-$pkgver.tar.gz::https://pecl.php.net/get/$_pkgreal-$pkgver.tgz - fix-musl.patch" +makedepends="php7-dev zlib-dev" +source="$pkgname-$pkgver.tar.gz::https://pecl.php.net/get/$_pkgreal-$pkgver.tgz" builddir="$srcdir"/$_pkgreal-$pkgver build() { @@ -33,5 +32,4 @@ package() { echo "extension=$_pkgreal.so" > "$pkgdir"/etc/php7/conf.d/$_pkgreal.ini } -sha512sums="95a25cf90d0da6e4732c8700cad858fbeaf0ecaf1ecfd184b563aaffe784aad138490a28312b4f802c2babbf1a6deb5f8ae8f270c857df974b6924976817fc39 php7-pecl-xlswriter-1.3.5.tar.gz -477813b2b62bf1d2d181342d8dcb72a85d6920c14993b7500bd1dd53100f8ec697efe1acf3cef1f46b252563192b03c2b37f8fa667e7db7a8273e18363fbe952 fix-musl.patch" +sha512sums="b4dc55ec55032361157753aed8f66cdde2c34b4cf5d9c86c33799dd157025ba648fff7aa7f545c17c43ba177f0194787cdf07a4b718d33e81f84c47f0f17a878 php7-pecl-xlswriter-1.3.6.tar.gz" diff --git a/testing/php7-pecl-xlswriter/fix-musl.patch b/testing/php7-pecl-xlswriter/fix-musl.patch deleted file mode 100644 index 1165860f3ff..00000000000 --- a/testing/php7-pecl-xlswriter/fix-musl.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 34f537554492d0a3f6fbea0e4a13a0ced5203108 Mon Sep 17 00:00:00 2001 -From: viest <dev@service.viest.me> -Date: Tue, 26 May 2020 16:22:19 +0800 -Subject: [PATCH] Fix: musl libc - ---- - .gitignore | 2 ++ - kernel/read.c | 5 +++-- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/kernel/read.c b/kernel/read.c -index 17aa47a..76779f9 100644 ---- a/kernel/read.c -+++ b/kernel/read.c -@@ -12,6 +12,7 @@ - - #include "xlswriter.h" - #include "ext/date/php_date.h" -+#include "ext/standard/php_math.h" - - /* {{{ */ - xlsxioreader file_open(const char *directory, const char *file_name) { -@@ -106,7 +107,7 @@ void data_to_custom_type(const char *string_value, const size_t string_value_len - return; - } - -- double value = strtod(string_value, NULL); -+ double value = zend_strtod(string_value, NULL); - double days, partDay, hours, minutes, seconds; - - days = floor(value); -@@ -115,7 +116,7 @@ void data_to_custom_type(const char *string_value, const size_t string_value_len - partDay = partDay * 24 - hours; - minutes = floor(partDay * 60); - partDay = partDay * 60 - minutes; -- seconds = round(partDay * 60); -+ seconds = _php_math_round(partDay * 60, 0, PHP_ROUND_HALF_UP); - - zval datetime; - php_date_instantiate(php_date_get_date_ce(), &datetime); |