Dessa/gentoo
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

[dev-libs/Ice] prepare for 3.6.5

Browse Source
This commit is contained in:
Robert Förster
2019-08-13 11:01:19 +02:00
parent 2e7d8a3474
commit 13e756ec8b
5 changed files with 10 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
dev-libs/Ice/files/Ice-3.6.4-php72.patch
View File

@@ -1,94 +0,0 @@
From 8d39266c45d5384a5744d97897ed01b4170120ec Mon Sep 17 00:00:00 2001
From: Mark Spruiell <mes@zeroc.com>
Date: Fri, 9 Feb 2018 08:11:29 -0800
Subject: [PATCH] ICE-8636 - fixes for PHP 7.2 compatibility
---
php/src/php7/Operation.cpp | 24 +++++++++++++-----------
php/src/php7/Types.cpp | 12 ++++++++++++
2 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/php/src/php7/Operation.cpp b/php/src/php7/Operation.cpp
index 1c1d2a44ab..05625d0037 100644
--- a/php/src/php7/Operation.cpp
+++ b/php/src/php7/Operation.cpp
@@ -384,22 +384,24 @@ IcePHP::OperationI::convertParam(zval* p, int pos)
void
IcePHP::OperationI::getArgInfo(zend_internal_arg_info& arg, const ParamInfoPtr& info, bool out)
{
- arg.name = 0;
- arg.class_name = 0;
- arg.allow_null = 1;
-
- if(!info->optional)
+ const zend_uchar pass_by_ref = out ? 1 : 0;
+ const zend_bool allow_null = 1;
+ if(!info->optional && (SequenceInfoPtr::dynamicCast(info->type) || DictionaryInfoPtr::dynamicCast(info->type)))
{
- const bool isArray = SequenceInfoPtr::dynamicCast(info->type) || DictionaryInfoPtr::dynamicCast(info->type);
- arg.type_hint = isArray ? IS_ARRAY : 0;
-
+ zend_internal_arg_info ai[] =
+ {
+ ZEND_ARG_ARRAY_INFO(pass_by_ref, 0, allow_null)
+ };
+ arg = ai[0];
}
else
{
- arg.type_hint = 0;
+ zend_internal_arg_info ai[] =
+ {
+ ZEND_ARG_CALLABLE_INFO(pass_by_ref, 0, allow_null)
+ };
+ arg = ai[0];
}
-
- arg.pass_by_reference = out ? 1 : 0;
}
//
diff --git a/php/src/php7/Types.cpp b/php/src/php7/Types.cpp
index 0dc3093fa5..f08f8447a6 100644
--- a/php/src/php7/Types.cpp
+++ b/php/src/php7/Types.cpp
@@ -323,6 +323,9 @@ IcePHP::SlicedDataUtil::setMember(zval* obj, const Ice::SlicedDataPtr& slicedDat
zval slices;
array_init(&slices);
+#ifdef HT_ALLOW_COW_VIOLATION
+ HT_ALLOW_COW_VIOLATION(Z_ARRVAL(slices)); // Allow circular references.
+#endif
AutoDestroy slicesDestroyer(&slices);
if(add_property_zval(&sd, STRCAST("slices"), &slices) != SUCCESS)
@@ -388,6 +391,9 @@ IcePHP::SlicedDataUtil::setMember(zval* obj, const Ice::SlicedDataPtr& slicedDat
//
zval objects;
array_init(&objects);
+#ifdef HT_ALLOW_COW_VIOLATION
+ HT_ALLOW_COW_VIOLATION(Z_ARRVAL(objects)); // Allow circular references.
+#endif
AutoDestroy objectsDestroyer(&objects);
if(add_property_zval(&slice, STRCAST("objects"), &objects) != SUCCESS)
{
@@ -1615,6 +1621,9 @@ IcePHP::SequenceInfo::unmarshal(const Ice::InputStreamPtr& is, const UnmarshalCa
zval zv;
array_init(&zv);
+#ifdef HT_ALLOW_COW_VIOLATION
+ HT_ALLOW_COW_VIOLATION(Z_ARRVAL(zv)); // Allow circular references.
+#endif
AutoDestroy destroy(&zv);
Ice::Int sz = is->readSize();
@@ -2256,6 +2265,9 @@ IcePHP::DictionaryInfo::unmarshal(const Ice::InputStreamPtr& is, const Unmarshal
zval zv;
array_init(&zv);
+#ifdef HT_ALLOW_COW_VIOLATION
+ HT_ALLOW_COW_VIOLATION(Z_ARRVAL(zv)); // Allow circular references.
+#endif
AutoDestroy destroy(&zv);
Ice::Int sz = is->readSize();

16
dev-libs/Ice/files/Ice-3.6.4-csharp.patch → dev-libs/Ice/files/Ice-3.6.5-csharp.patch
View File

@@ -1,5 +1,5 @@
--- ice-3.6.4/csharp/src/Makefile~ 2015-06-23 17:30:20.000000000 +0200
+++ ice-3.6.4/csharp/src/Makefile 2015-06-27 20:07:04.217188211 +0200
--- ice-3.6.5/csharp/src/Makefile~ 2015-06-23 17:30:20.000000000 +0200
+++ ice-3.6.5/csharp/src/Makefile 2015-06-27 20:07:04.217188211 +0200
@@ -11,7 +11,7 @@
include $(top_srcdir)/config/Make.rules.cs
@@ -10,9 +10,9 @@
$(EVERYTHING)::
@for subdir in $(SUBDIRS); \
--- /dev/null 2015-06-27 16:44:15.733558105 +0200
+++ ice-3.6.4/csharp/lib/pkgconfig/IceSSL.pc 2015-06-27 20:19:30.731894653 +0200
+++ ice-3.6.5/csharp/lib/pkgconfig/IceSSL.pc 2015-06-27 20:19:30.731894653 +0200
@@ -0,0 +1,10 @@
+version = 3.6.4
+version = 3.6.5
+mono_root = /usr
+
+name = IceSSL
@@ -23,9 +23,9 @@
+Libs: -r:${mono_root}/lib/mono/${name}/${name}.dll
+Requires: Ice = ${version}
--- /dev/null 2015-06-27 16:44:15.733558105 +0200
+++ ice-3.6.4/csharp/lib/pkgconfig/IceDiscovery.pc 2015-06-27 20:20:44.312515987 +0200
+++ ice-3.6.5/csharp/lib/pkgconfig/IceDiscovery.pc 2015-06-27 20:20:44.312515987 +0200
@@ -0,0 +1,10 @@
+version = 3.6.4
+version = 3.6.5
+mono_root = /usr
+
+name = IceDiscovery
@@ -36,9 +36,9 @@
+Libs: -r:${mono_root}/lib/mono/${name}/${name}.dll
+Requires: Ice = ${version}
--- /dev/null 2015-06-27 16:44:15.733558105 +0200
+++ ice-3.6.4/csharp/lib/pkgconfig/IceLocatorDiscovery.pc 2015-06-27 20:21:22.206185123 +0200
+++ ice-3.6.5/csharp/lib/pkgconfig/IceLocatorDiscovery.pc 2015-06-27 20:21:22.206185123 +0200
@@ -0,0 +1,10 @@
+version = 3.6.4
+version = 3.6.5
+mono_root = /usr
+
+name = IceLocatorDiscovery

0
dev-libs/Ice/files/Ice-3.6.4-db6.patch → dev-libs/Ice/files/Ice-3.6.5-db6.patch
View File