[arch-commits] Commit in php-mongodb/trunk (3 files)

[Ike Devolder]

    Date: Friday, January 8, 2016 @ 09:57:56
  Author: idevolder
Revision: 155713

upgpkg: php-mongodb 1.1.2-2

Added:
  php-mongodb/trunk/php-mongodb.install
Modified:
  php-mongodb/trunk/PKGBUILD
Deleted:
  php-mongodb/trunk/php7-i686.patch

---------------------+
 PKGBUILD            |   16 +++++-----------
 php-mongodb.install |   12 ++++++++++++
 php7-i686.patch     |   40 ----------------------------------------
 3 files changed, 17 insertions(+), 51 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-01-08 07:53:54 UTC (rev 155712)
+++ PKGBUILD	2016-01-08 08:57:56 UTC (rev 155713)
@@ -5,8 +5,8 @@
 # Contributor: Jarek Sedlacek <jareksedlacek at gmail.com>
 
 pkgname=php-mongodb
-pkgver=1.1.1
-pkgrel=1
+pkgver=1.1.2
+pkgrel=2
 pkgdesc="MongoDB driver for PHP"
 arch=("i686" "x86_64")
 url="http://mongodb.github.io/mongo-php-driver"
@@ -14,20 +14,14 @@
 depends=('php' 'libmongoc')
 makedepends=('re2c')
 backup=("etc/php/conf.d/mongodb.ini")
+install=php-mongodb.install
 source=(
 	"http://pecl.php.net/get/mongodb-$pkgver.tgz"
 	"mongodb.ini"
-    "php7-i686.patch"
 )
-sha256sums=('0899b00435edf143ddc0ededd8027013c86bf59214d63ae1f3c7be0eaae11ceb'
-            '242b9ffea6bd84f813c7fc2a767eaa89f83577c5ff10ff36aecec2ca308ff72b'
-            'cc1925bc6f6c92d13494823d354cf340c6cc1486b4e0e711af2219739ac4270b')
+sha256sums=('4cb80002dfb6be0805457ef0c9f4e91fd03c2e54baedac958ad1e498c741484d'
+            '242b9ffea6bd84f813c7fc2a767eaa89f83577c5ff10ff36aecec2ca308ff72b')
 
-prepare() {
-    cd mongodb-$pkgver
-    patch -p1 -i ../php7-i686.patch
-}
-
 build() {
 	cd mongodb-$pkgver
 	phpize

Added: php-mongodb.install
===================================================================
--- php-mongodb.install	                        (rev 0)
+++ php-mongodb.install	2016-01-08 08:57:56 UTC (rev 155713)
@@ -0,0 +1,12 @@
+post_install() {
+  warning
+}
+
+post_upgrade() {
+  warning
+}
+
+warning() {
+  printf "WARNING:\nWhen moving from 'php-mongo' to 'php-mongodb' keep into mind the extension's api is not compatible\n\n"
+  return 0
+}

Deleted: php7-i686.patch
===================================================================
--- php7-i686.patch	2016-01-08 07:53:54 UTC (rev 155712)
+++ php7-i686.patch	2016-01-08 08:57:56 UTC (rev 155713)
@@ -1,40 +0,0 @@
-diff --git a/phongo_compat.h b/phongo_compat.h
-index da4aed1..adbf21c 100644
---- a/phongo_compat.h
-+++ b/phongo_compat.h
-@@ -99,7 +99,8 @@
- 		int tmp_len; \
- 		mongoc_log(MONGOC_LOG_LEVEL_WARNING, MONGOC_LOG_DOMAIN, "Integer overflow detected on your platform: %lld", value); \
- 		tmp_len = spprintf(&tmp, 0, "%lld", value); \
--		add_index_stringl(zval, index, tmp, tmp_len, 0); \
-+		ADD_INDEX_STRINGL(zval, index, tmp, tmp_len); \
-+		efree(tmp); \
- 	} else { \
- 		add_index_long(zval, index, val); \
- 	}
-@@ -109,7 +110,8 @@
- 		int tmp_len; \
- 		mongoc_log(MONGOC_LOG_LEVEL_WARNING, MONGOC_LOG_DOMAIN, "Integer overflow detected on your platform: %lld", value); \
- 		tmp_len = spprintf(&tmp, 0, "%lld", value); \
--		add_assoc_stringl(zval, key, tmp, tmp_len, 0); \
-+		ADD_ASSOC_STRINGL(zval, key, tmp, tmp_len); \
-+		efree(tmp); \
- 	} else { \
- 		add_assoc_long(zval, key, value); \
- 	}
-@@ -167,6 +167,7 @@
- # define ADD_ASSOC_ZVAL(_zv, _key, _value) add_assoc_zval(_zv, _key, _value);
- # define ADD_ASSOC_NULL_EX(_zv, _key) add_assoc_null_ex(_zv, ZEND_STRL(_key));
- # define ADD_ASSOC_BOOL_EX(_zv, _key, _value) add_assoc_bool_ex(_zv, ZEND_STRL(_key), _value);
-+# define ADD_INDEX_STRINGL(_zv, _ind, _value, _len) add_index_stringl(_zv, _ind, _value, _len);
- # define phongo_free_object_arg zend_object
- # define phongo_zpp_char_len size_t
- # define ZEND_HASH_APPLY_COUNT(ht) (ht)->u.v.nApplyCount
-@@ -193,6 +194,7 @@
- # define ADD_ASSOC_ZVAL(_zv, _key, _value) add_assoc_zval(_zv, _key, _value);
- # define ADD_ASSOC_NULL_EX(_zv, _key) add_assoc_null_ex(_zv, ZEND_STRS(_key));
- # define ADD_ASSOC_BOOL_EX(_zv, _key, _value) add_assoc_bool_ex(_zv, ZEND_STRS(_key), _value);
-+# define ADD_INDEX_STRINGL(_zv, _ind, _value, _len) add_index_stringl(_zv, _ind, _value, _len, 0);
- # define Z_PHPDATE_P(object) zend_object_store_get_object(object TSRMLS_CC)
- # define Z_ISUNDEF(x) !x
- # define phongo_free_object_arg void