[gentoo-commits] repo/gentoo:master commit in: dev-php/geos-php/, dev-php/geos-php/files/1.0.0/
commit: 731ea1fd1a18c905a92b155c9c98a153b73b1a31
Author: Brian Evans gentoo org>
AuthorDate: Mon Dec 12 17:08:26 2022 +
Commit: Brian Evans gentoo org>
CommitDate: Mon Dec 12 17:08:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=731ea1fd
dev-php/pecl-geos: Drop old
Signed-off-by: Brian Evans gentoo.org>
dev-php/geos-php/Manifest | 1 -
.../0001-fix-test-for-7.3-int-vs-integer.patch | 34 --
...essage-with-php-7-Wformat-warnings-raised.patch | 37 --
...ll-arginfo-and-fix-build-with-PHP-8-part2.patch | 422 -
...-add-all-arginfo-and-fix-build-with-PHP-8.patch | 341 -
.../files/1.0.0/0004-fix-for-8.0.0RC1.patch| 25 --
...nd_parse_parameters-call-to-use-zend_long.patch | 123 --
dev-php/geos-php/geos-php-1.0.0-r1.ebuild | 36 --
8 files changed, 1019 deletions(-)
diff --git a/dev-php/geos-php/Manifest b/dev-php/geos-php/Manifest
index 85c773361b2a..4aeef013a477 100644
--- a/dev-php/geos-php/Manifest
+++ b/dev-php/geos-php/Manifest
@@ -1,2 +1 @@
-DIST geos-php-1.0.0.tar.gz 40870 BLAKE2B
c6d526470bdb7e4aecce6ce5f2132f90a6c40e5a2b3a8169bbb7ae101394340aad8a23309130c7f1421e19162b5559f9e87e58fb704e91b1fc03b612543551e8
SHA512
4ceb9e1152d0b534bc3a5e372be0b98770b1883ec4dda1177c9399d95d947b9feee412accf003d27b55b1a901c90259a9b38792b453dac11cb8af26af3cd91ec
DIST geos-php-1.0.0_p20220909.tar.gz 43257 BLAKE2B
b1ee853e6d09f2bcc2bc32ad5eea29c3cb35d742d3037f836c575099de0b806519dc23a1fc9c322d377eb39c4b935029b47043c3ee5ab232537196686c627feb
SHA512
4beae67902eaf1201d997db4ccf8e332e98699da031377878e0e144ae2f488bdf00b4a4d58b87082140ee18a4c04211f61de029fd523db90531245a450839001
diff --git
a/dev-php/geos-php/files/1.0.0/0001-fix-test-for-7.3-int-vs-integer.patch
b/dev-php/geos-php/files/1.0.0/0001-fix-test-for-7.3-int-vs-integer.patch
deleted file mode 100644
index e08f1b739051..
--- a/dev-php/geos-php/files/1.0.0/0001-fix-test-for-7.3-int-vs-integer.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d9eb2378092d39678d1e2cf834c555f83d85b1a1 Mon Sep 17 00:00:00 2001
-From: Remi Collet
-Date: Fri, 22 Jun 2018 11:43:23 +0200
-Subject: [PATCH 1/2] fix test for 7.3 (int vs integer)
-
- tests/004_WKBWriter.phpt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/004_WKBWriter.phpt b/tests/004_WKBWriter.phpt
-index d2b3c85..3a72e2d 100644
a/tests/004_WKBWriter.phpt
-+++ b/tests/004_WKBWriter.phpt
-@@ -139,7 +139,7 @@ class WKBWriterTest extends GEOSTest
- $writer->write(1);
- $this->assertTrue(false);
- } catch (ErrorException $e) {
--$this->assertContains('expects parameter 1 to be object, integer
given', $e->getMessage());
-+$this->assertContains('expects parameter 1 to be object, int',
$e->getMessage());
- }
- }
-
-@@ -151,7 +151,7 @@ class WKBWriterTest extends GEOSTest
- $writer->writeHEX(1);
- $this->assertTrue(false);
- } catch (ErrorException $e) {
--$this->assertContains('expects parameter 1 to be object, integer
given', $e->getMessage());
-+$this->assertContains('expects parameter 1 to be object, int',
$e->getMessage());
- }
- }
- }
---
-2.14.4
-
diff --git
a/dev-php/geos-php/files/1.0.0/0002-fix-error-message-with-php-7-Wformat-warnings-raised.patch
b/dev-php/geos-php/files/1.0.0/0002-fix-error-message-with-php-7-Wformat-warnings-raised.patch
deleted file mode 100644
index 78509b766224..
---
a/dev-php/geos-php/files/1.0.0/0002-fix-error-message-with-php-7-Wformat-warnings-raised.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From f881f614f11472090394538d4424f408cb61d581 Mon Sep 17 00:00:00 2001
-From: Remi Collet
-Date: Fri, 22 Jun 2018 11:44:27 +0200
-Subject: [PATCH 2/2] fix error message with php 7+ (-Wformat warnings raised
- by 7.3)
-
- geos.c | 8
- 1 file changed, 8 insertions(+)
-
-diff --git a/geos.c b/geos.c
-index 2c81428..fc679e8 100755
a/geos.c
-+++ b/geos.c
-@@ -189,11 +189,19 @@ getRelay(zval* val, zend_class_entry* ce) {
-
- if ( proxy->std.ce != ce ) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR,
-+#if PHP_VERSION_ID >= 7
-+"Relay object is not an %s", ZSTR_VAL(ce->name));
-+#else
- "Relay object is not an %s", ce->name);
-+#endif
- }
- if ( ! proxy->relay ) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR,
-+#if PHP_VERSION_ID >= 7
-+"Relay object for object of type %s is not set",
ZSTR_VAL(ce->name));
-+#else
- "Relay object for object of type %s is not set", ce->name);
-+#endif
- }
- return proxy->relay;
- }
---
-2.14.4
-
diff --git
a/dev-php/geos-php/files/1.0.0/0003-add-all-arginfo-and-fix-build-with-PHP-8-part2.patch
b/dev-php/geos-php/files/1.0.0/0003-add-all-arginfo-and-fix-build-with-PHP-8-part2.patch
deleted file mode 100644
index a1ab29fb4a70
[gentoo-commits] repo/gentoo:master commit in: dev-php/geos-php/, dev-php/geos-php/files/1.0.0/
commit: f75c1ebc0d71b566fbf114b686126a3cf10ac8f9
Author: Brian Evans gentoo org>
AuthorDate: Fri Jan 8 01:26:36 2021 +
Commit: Brian Evans gentoo org>
CommitDate: Fri Jan 8 01:35:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f75c1ebc
dev-php/geos-php: Revbump for new PHP version support
Uses patches found on their issue tracker
Signed-off-by: Brian Evans gentoo.org>
.../0001-fix-test-for-7.3-int-vs-integer.patch | 34 ++
...essage-with-php-7-Wformat-warnings-raised.patch | 37 ++
...ll-arginfo-and-fix-build-with-PHP-8-part2.patch | 422 +
...-add-all-arginfo-and-fix-build-with-PHP-8.patch | 341 +
.../files/1.0.0/0004-fix-for-8.0.0RC1.patch| 25 ++
...nd_parse_parameters-call-to-use-zend_long.patch | 123 ++
...s-php-1.0.0.ebuild => geos-php-1.0.0-r1.ebuild} | 15 +-
7 files changed, 992 insertions(+), 5 deletions(-)
diff --git
a/dev-php/geos-php/files/1.0.0/0001-fix-test-for-7.3-int-vs-integer.patch
b/dev-php/geos-php/files/1.0.0/0001-fix-test-for-7.3-int-vs-integer.patch
new file mode 100644
index 000..e08f1b73905
--- /dev/null
+++ b/dev-php/geos-php/files/1.0.0/0001-fix-test-for-7.3-int-vs-integer.patch
@@ -0,0 +1,34 @@
+From d9eb2378092d39678d1e2cf834c555f83d85b1a1 Mon Sep 17 00:00:00 2001
+From: Remi Collet
+Date: Fri, 22 Jun 2018 11:43:23 +0200
+Subject: [PATCH 1/2] fix test for 7.3 (int vs integer)
+
+---
+ tests/004_WKBWriter.phpt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/004_WKBWriter.phpt b/tests/004_WKBWriter.phpt
+index d2b3c85..3a72e2d 100644
+--- a/tests/004_WKBWriter.phpt
b/tests/004_WKBWriter.phpt
+@@ -139,7 +139,7 @@ class WKBWriterTest extends GEOSTest
+ $writer->write(1);
+ $this->assertTrue(false);
+ } catch (ErrorException $e) {
+-$this->assertContains('expects parameter 1 to be object, integer
given', $e->getMessage());
++$this->assertContains('expects parameter 1 to be object, int',
$e->getMessage());
+ }
+ }
+
+@@ -151,7 +151,7 @@ class WKBWriterTest extends GEOSTest
+ $writer->writeHEX(1);
+ $this->assertTrue(false);
+ } catch (ErrorException $e) {
+-$this->assertContains('expects parameter 1 to be object, integer
given', $e->getMessage());
++$this->assertContains('expects parameter 1 to be object, int',
$e->getMessage());
+ }
+ }
+ }
+--
+2.14.4
+
diff --git
a/dev-php/geos-php/files/1.0.0/0002-fix-error-message-with-php-7-Wformat-warnings-raised.patch
b/dev-php/geos-php/files/1.0.0/0002-fix-error-message-with-php-7-Wformat-warnings-raised.patch
new file mode 100644
index 000..78509b76622
--- /dev/null
+++
b/dev-php/geos-php/files/1.0.0/0002-fix-error-message-with-php-7-Wformat-warnings-raised.patch
@@ -0,0 +1,37 @@
+From f881f614f11472090394538d4424f408cb61d581 Mon Sep 17 00:00:00 2001
+From: Remi Collet
+Date: Fri, 22 Jun 2018 11:44:27 +0200
+Subject: [PATCH 2/2] fix error message with php 7+ (-Wformat warnings raised
+ by 7.3)
+
+---
+ geos.c | 8
+ 1 file changed, 8 insertions(+)
+
+diff --git a/geos.c b/geos.c
+index 2c81428..fc679e8 100755
+--- a/geos.c
b/geos.c
+@@ -189,11 +189,19 @@ getRelay(zval* val, zend_class_entry* ce) {
+
+ if ( proxy->std.ce != ce ) {
+ php_error_docref(NULL TSRMLS_CC, E_ERROR,
++#if PHP_VERSION_ID >= 7
++"Relay object is not an %s", ZSTR_VAL(ce->name));
++#else
+ "Relay object is not an %s", ce->name);
++#endif
+ }
+ if ( ! proxy->relay ) {
+ php_error_docref(NULL TSRMLS_CC, E_ERROR,
++#if PHP_VERSION_ID >= 7
++"Relay object for object of type %s is not set",
ZSTR_VAL(ce->name));
++#else
+ "Relay object for object of type %s is not set", ce->name);
++#endif
+ }
+ return proxy->relay;
+ }
+--
+2.14.4
+
diff --git
a/dev-php/geos-php/files/1.0.0/0003-add-all-arginfo-and-fix-build-with-PHP-8-part2.patch
b/dev-php/geos-php/files/1.0.0/0003-add-all-arginfo-and-fix-build-with-PHP-8-part2.patch
new file mode 100644
index 000..a1ab29fb4a7
--- /dev/null
+++
b/dev-php/geos-php/files/1.0.0/0003-add-all-arginfo-and-fix-build-with-PHP-8-part2.patch
@@ -0,0 +1,422 @@
+From bfef69aca744295719dc8f859005ff83e17ac48c Mon Sep 17 00:00:00 2001
+From: Remi Collet
+Date: Fri, 28 Aug 2020 15:21:36 +0200
+Subject: [PATCH] add all arginfo and fix build with PHP 8
+
+---
+ arginfo.h| 319 +++
+ geos.c | 190 ---
+ php_geos.h | 9 ++
+ tests/002_WKTWriter.phpt | 2 +
+ tests/003_WKTReader.phpt | 2 +
+ tests/004_WKBWriter.phpt | 6 +-
+ 6 files changed, 435 insertions(+), 93 deletions(-)
+ create mode 100644 arginfo.h
+
+diff --git a/geos.c b/geos.c
+index fc679e8..ffa27b8 100755
+--- a/geos.c
b/geos.c
+@@ -32,6 +32,7 @@
+
+
