<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[133338] trunk/dports/php/php-amqp</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/133338">133338</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2015-02-26 09:47:14 -0800 (Thu, 26 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>php-amqp: update to 1.6.0beta2 and add patches to fix build failure on OS X and with rabbitmq-c 0.6.0 (#46972)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsphpphpamqpPortfile">trunk/dports/php/php-amqp/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/php/php-amqp/files/</li>
<li><a href="#trunkdportsphpphpamqpfilespatchamqp_exchangecdiff">trunk/dports/php/php-amqp/files/patch-amqp_exchange.c.diff</a></li>
<li><a href="#trunkdportsphpphpamqpfilespatchduplicatesymbolsdiff">trunk/dports/php/php-amqp/files/patch-duplicate-symbols.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsphpphpamqpPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/php/php-amqp/Portfile (133337 => 133338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/php/php-amqp/Portfile 2015-02-26 17:09:46 UTC (rev 133337)
+++ trunk/dports/php/php-amqp/Portfile 2015-02-26 17:47:14 UTC (rev 133338)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup php 1.1
</span><span class="cx">
</span><span class="cx"> name php-amqp
</span><del>-version 1.4.0
</del><ins>+version 1.6.0beta2
</ins><span class="cx"> categories php net
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers ryandesign openmaintainer
</span><span class="lines">@@ -13,6 +13,7 @@
</span><span class="cx">
</span><span class="cx"> php.branches 5.3 5.4 5.5 5.6
</span><span class="cx"> php.pecl yes
</span><ins>+php.pecl.prerelease yes
</ins><span class="cx">
</span><span class="cx"> description AMQP interface for PHP
</span><span class="cx">
</span><span class="lines">@@ -22,9 +23,12 @@
</span><span class="cx"> and queues, as well as publish to any exchange and \
</span><span class="cx"> consume from any queue.
</span><span class="cx">
</span><del>-checksums rmd160 8d55af5bc24b45d09aa2c4476b8ee02701f52830 \
- sha256 e6553154acbffeaacfad83edf94a7b94e2e50a850ec953d15537016267720f25
</del><ins>+checksums rmd160 229dba4e5fa0bd6c5e6ea776964812a35b500558 \
+ sha256 ae897db025f2f493293f08fc09ecd61cef3f4d1d781cf32113bef7a91ab6128c
</ins><span class="cx">
</span><span class="cx"> depends_lib-append port:rabbitmq-c
</span><span class="cx">
</span><ins>+patchfiles-append patch-amqp_exchange.c.diff
+patchfiles-append patch-duplicate-symbols.diff
+
</ins><span class="cx"> configure.args-append --with-amqp --with-librabbitmq-dir=${prefix}
</span></span></pre></div>
<a id="trunkdportsphpphpamqpfilespatchamqp_exchangecdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/php/php-amqp/files/patch-amqp_exchange.c.diff (0 => 133338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/php/php-amqp/files/patch-amqp_exchange.c.diff (rev 0)
+++ trunk/dports/php/php-amqp/files/patch-amqp_exchange.c.diff 2015-02-26 17:47:14 UTC (rev 133338)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+Fix rabbitmq-c version number interpretation
+https://github.com/pdezwart/php-amqp/pull/153
+https://github.com/pinepain/php-amqp/commit/b954faa9162b91b3a44fd8aa7ae66b862ef9bcd9
+--- amqp_exchange.c.orig
++++ amqp_exchange.c
+@@ -469,7 +469,7 @@ PHP_METHOD(amqp_exchange_class, declareExchange)
+
+ arguments = convert_zval_to_amqp_table(exchange->arguments TSRMLS_CC);
+
+-#if AMQP_VERSION_MAJOR == 0 && AMQP_VERSION_MINOR >= 5 && AMQP_VERSION_PATCH > 2
++#if AMQP_VERSION_MAJOR * 100 + AMQP_VERSION_MINOR * 10 + AMQP_VERSION_PATCH > 52
+ amqp_exchange_declare(
+ connection->connection_resource->connection_state,
+ channel->channel_id,
</ins></span></pre></div>
<a id="trunkdportsphpphpamqpfilespatchduplicatesymbolsdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/php/php-amqp/files/patch-duplicate-symbols.diff (0 => 133338)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/php/php-amqp/files/patch-duplicate-symbols.diff (rev 0)
+++ trunk/dports/php/php-amqp/files/patch-duplicate-symbols.diff 2015-02-26 17:47:14 UTC (rev 133338)
</span><span class="lines">@@ -0,0 +1,59 @@
</span><ins>+Fix duplicate symbols
+https://github.com/pdezwart/php-amqp/issues/141
+https://github.com/pdezwart/php-amqp/pull/142
+--- amqp_connection.c.orig
++++ amqp_connection.c
+@@ -50,6 +50,7 @@
+ #endif
+
+ #include "php_amqp.h"
++#include "amqp_channel.h"
+ #include "amqp_connection_resource.h"
+
+ #ifndef E_DEPRECATED
+--- amqp_connection_resource.c.orig
++++ amqp_connection_resource.c
+@@ -57,6 +57,9 @@
+ #define E_DEPRECATED E_WARNING
+ #endif
+
++int le_amqp_connection_resource;
++int le_amqp_connection_resource_persistent;
++
+ static void connection_resource_destructor(amqp_connection_resource *resource, int persistent TSRMLS_DC);
+
+
+--- amqp_connection_resource.h.orig
++++ amqp_connection_resource.h
+@@ -28,8 +28,8 @@
+ #define PHP_AMQP_RESOURCE_RESPONSE_ERROR_CHANNEL_CLOSED -2
+ #define PHP_AMQP_RESOURCE_RESPONSE_ERROR_CONNECTION_CLOSED -3
+
+-int le_amqp_connection_resource;
+-int le_amqp_connection_resource_persistent;
++extern int le_amqp_connection_resource;
++extern int le_amqp_connection_resource_persistent;
+
+ /* Figure out what's going on connection and handle protocol exceptions, if any */
+ int php_amqp_connection_resource_error(amqp_rpc_reply_t reply, char **message, amqp_connection_resource *resource, amqp_channel_t channel_id TSRMLS_DC);
+--- php_amqp.h.orig
++++ php_amqp.h
+@@ -311,9 +311,6 @@ extern zend_class_entry *amqp_exception_class_entry,
+ } while (0);
+ #endif
+
+-extern int le_amqp_connection_resource;
+-extern int le_amqp_connection_resource_persistent;
+-
+ typedef struct _amqp_channel_object {
+ zend_object zo;
+ zval *connection;
+@@ -432,7 +429,7 @@ typedef struct _amqp_envelope_object {
+ #endif
+
+ void php_amqp_error(amqp_rpc_reply_t reply, char **message, amqp_connection_object *connection, amqp_channel_object *channel TSRMLS_DC);
+-void amqp_exception(amqp_rpc_reply_t reply, zend_class_entry *exception_ce, const char *message, long code TSRMLS_DC);
++void php_amqp_zend_throw_exception(amqp_rpc_reply_t reply, zend_class_entry *exception_ce, const char *message, long code TSRMLS_DC);
+
+ void php_amqp_maybe_release_buffers_on_channel(amqp_connection_object *connection, amqp_channel_object *channel);
+
</ins></span></pre>
</div>
</div>
</body>
</html>