Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (b8e802151beb7ca1024ddf5fadfe2d35ab20226b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (b8e802151beb7ca1024ddf5fadfe2d35ab20226b)
  • Date: Wed, 17 Apr 2013 08:55:32 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

graphics/imagemagick/BUILD | 3 -
graphics/imagemagick/DEPENDS | 10 +--
graphics/imagemagick/DETAILS | 4 -
graphics/imagemagick/HISTORY | 4 +
php-pear/imagick/DETAILS | 4 -
php-pear/imagick/HISTORY | 6 ++
php-pear/imagick/PRE_BUILD | 8 ++
php-pear/imagick/header.patch | 13 ++++
php-pear/imagick/php54.patch | 113
++++++++++++++++++++++++++++++++++++++++++
9 files changed, 153 insertions(+), 12 deletions(-)

New commits:
commit 9b841a25d6ca6c541f750620478ca91c61328c86
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

imagemagick: => 6.8.4-10, reenabled ghostscript support

commit ca90dd02385c918ac14daf4ca95cff4a28f379a1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

imagick: => 3.0.1

diff --git a/graphics/imagemagick/BUILD b/graphics/imagemagick/BUILD
index d76777d..4fc9739 100755
--- a/graphics/imagemagick/BUILD
+++ b/graphics/imagemagick/BUILD
@@ -2,10 +2,9 @@ if [[ "$IMAGEMAGICK_X" != "y" ]]; then
OPTS="--without-x $OPTS"
fi &&

-# GS is broken with jpeg 8, so disable it
OPTS="--enable-shared \
--without-autotrace \
- --without-gslib \
$IMAGEMAGICK_HDRI \
$OPTS" &&
+
default_build
diff --git a/graphics/imagemagick/DEPENDS b/graphics/imagemagick/DEPENDS
index db29756..bee5d3c 100755
--- a/graphics/imagemagick/DEPENDS
+++ b/graphics/imagemagick/DEPENDS
@@ -70,12 +70,10 @@ optional_depends 'librsvg2' \
'--without-rsvg' \
'for Scalable Vector Graphics support' &&

-# broken with jpeg 8
-#
-#optional_depends POSTSCRIPT-INTERPRETER \
-# "--with-gslib" \
-# "--without-gslib" \
-# "for generating Postscript and PDF output" &&
+optional_depends POSTSCRIPT-INTERPRETER \
+ "--with-gslib" \
+ "--without-gslib" \
+ "for generating Postscript and PDF output" &&

optional_depends 'djvulibre' \
'--with-djvu' \
diff --git a/graphics/imagemagick/DETAILS b/graphics/imagemagick/DETAILS
index 40365c8..6c8ee21 100755
--- a/graphics/imagemagick/DETAILS
+++ b/graphics/imagemagick/DETAILS
@@ -1,5 +1,5 @@
SPELL=imagemagick
- VERSION=6.8.4-9
+ VERSION=6.8.4-10
SECURITY_PATCH=1
SOURCE=ImageMagick-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/ImageMagick-${VERSION}
SOURCE_URL[1]=ftp://ftp.surfnet.nl/pub/ImageMagick/$SOURCE
SOURCE_URL[2]=ftp://ftp.nluug.nl/pub/ImageMagick/$SOURCE
SOURCE_URL[3]=http://image_magick.veidrodis.com/image_magick/$SOURCE
-
SOURCE_HASH=sha512:039e5c59d1c9fb2495d417e093bcfcc32e689e0850df4e21702e98e4ae986acfba564e4bcb37e7d03cc4c761bdfcf4f783663627d5714f989a672272aa57fe2e
+
SOURCE_HASH=sha512:89a1072d8a7d7871c67c2b161d077bcc5560b6ae5fa951d4f4de1f5b83f8a85a23a5a588d23e88a61a1341fe29a6585c20e03b2ae13f175db3ab2a75720cb0c5
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
CCACHE="off"
WEB_SITE=http://www.imagemagick.org/
diff --git a/graphics/imagemagick/HISTORY b/graphics/imagemagick/HISTORY
index a5e6bbb..47460be 100644
--- a/graphics/imagemagick/HISTORY
+++ b/graphics/imagemagick/HISTORY
@@ -1,3 +1,7 @@
+2013-04-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 6.8.4-10
+ * BUILD, DEPENDS: reenabled ghostscript support
+
2013-04-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 6.8.4-9

diff --git a/php-pear/imagick/DETAILS b/php-pear/imagick/DETAILS
index c1b1cf1..4ee24d9 100755
--- a/php-pear/imagick/DETAILS
+++ b/php-pear/imagick/DETAILS
@@ -1,8 +1,8 @@
SPELL=imagick
- VERSION=2.3.0
+ VERSION=3.0.1
SOURCE=$SPELL-$VERSION.tgz
SOURCE_URL[0]=http://pecl.php.net/get/$SOURCE
-
SOURCE_HASH=sha512:4ba1528398a0d7db547d9243c028ebaffc5d469942d830102da5f422a9d9cb7d6285ba6292503219183e0c5be20aad24c4eb376eda31edc0c1d84b6cef4c3c59
+
SOURCE_HASH=sha512:a8a9872662a8657a91dec793e8dd86ea492fa523f362cc9489f73b5f5f666872db95a929259dfde32b5370133fa4672b39007b08a7fec32be6a462873d7e6a4c
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://pecl.php.net/package/imagick/
LICENSE[0]=PHP
diff --git a/php-pear/imagick/HISTORY b/php-pear/imagick/HISTORY
index 760ed85..3858b98 100644
--- a/php-pear/imagick/HISTORY
+++ b/php-pear/imagick/HISTORY
@@ -1,3 +1,9 @@
+2013-04-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.0.1
+ * PRE_BUILD: apply patches
+ * php54.patch: added, to fix build with PHP >=5.4
+ * header.patch: added, to use proper path for include files
+
2009-09-14 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added missing dependency

diff --git a/php-pear/imagick/PRE_BUILD b/php-pear/imagick/PRE_BUILD
index 4e954a3..ddeaff0 100755
--- a/php-pear/imagick/PRE_BUILD
+++ b/php-pear/imagick/PRE_BUILD
@@ -1,6 +1,14 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

+patch -p1 < "$SPELL_DIRECTORY/header.patch" &&
+
+if spell_ok php && is_version_less 5.3.9999 $(installed_version php); then
+ patch -p1 < "$SPELL_DIRECTORY/php54.patch"
+fi &&
+
rm -f "$BUILD_DIRECTORY/package.xml" &&

phpize
diff --git a/php-pear/imagick/header.patch b/php-pear/imagick/header.patch
new file mode 100644
index 0000000..59a0174
--- /dev/null
+++ b/php-pear/imagick/header.patch
@@ -0,0 +1,13 @@
+--- imagick-305615/config.m4 2010/11/21 17:00:04
++++ imagick-329769/config.m4 2013/03/13 13:14:23
+@@ -52,7 +52,9 @@
+ else
+ AC_MSG_CHECKING(for MagickWand.h header file)
+
+- if test -r $WAND_DIR/include/ImageMagick/wand/MagickWand.h; then
++ if test -r $WAND_DIR/include/ImageMagick-6/wand/MagickWand.h; then
++ AC_MSG_RESULT(found in
$WAND_DIR/include/ImageMagick-6/wand/MagickWand.h)
++ elif test -r $WAND_DIR/include/ImageMagick/wand/MagickWand.h; then
+ AC_MSG_RESULT(found in
$WAND_DIR/include/ImageMagick/wand/MagickWand.h)
+ else
+ AC_MSG_ERROR(Cannot locate header file MagickWand.h)
diff --git a/php-pear/imagick/php54.patch b/php-pear/imagick/php54.patch
new file mode 100644
index 0000000..596388e
--- /dev/null
+++ b/php-pear/imagick/php54.patch
@@ -0,0 +1,113 @@
+Common subdirectories: imagick-3.0.1/examples and imagick-3.0.1-3/examples
+diff -u imagick-3.0.1/imagick.c imagick-3.0.1-3/imagick.c
+--- imagick-3.0.1/imagick.c 2010-11-19 05:16:01.000000000 +0800
++++ imagick-3.0.1-3/imagick.c 2012-05-10 09:05:51.000000000 +0800
+@@ -2374,7 +2374,11 @@
+ /* ALLOC_HASHTABLE(intern->zo.properties); */
+
+ zend_object_std_init(&intern->zo, class_type TSRMLS_CC);
++#if PHP_VERSION_ID < 50399
+ zend_hash_copy(intern->zo.properties,
&class_type->default_properties, (copy_ctor_func_t) zval_add_ref,(void *)
&tmp, sizeof(zval *));
++#else
++ object_properties_init(&(intern->zo), class_type);
++#endif
+
+ retval.handle = zend_objects_store_put(intern, NULL,
(zend_objects_free_object_storage_t) php_imagick_object_free_storage, NULL
TSRMLS_CC);
+ retval.handlers = (zend_object_handlers *) &imagick_object_handlers;
+@@ -2409,7 +2413,11 @@
+ /* ALLOC_HASHTABLE(intern->zo.properties); */
+
+ zend_object_std_init(&intern->zo, class_type TSRMLS_CC);
++#if PHP_VERSION_ID < 50399
+ zend_hash_copy(intern->zo.properties,
&class_type->default_properties, (copy_ctor_func_t) zval_add_ref,(void *)
&tmp, sizeof(zval *));
++#else
++ object_properties_init(&(intern->zo), class_type);
++#endif
+
+ retval.handle = zend_objects_store_put(intern, NULL,
(zend_objects_free_object_storage_t) php_imagickdraw_object_free_storage,
NULL TSRMLS_CC);
+ retval.handlers = (zend_object_handlers *)
&imagickdraw_object_handlers;
+@@ -2443,7 +2451,11 @@
+ /* ALLOC_HASHTABLE(intern->zo.properties); */
+
+ zend_object_std_init(&intern->zo, class_type TSRMLS_CC);
++#if PHP_VERSION_ID < 50399
+ zend_hash_copy(intern->zo.properties,
&class_type->default_properties, (copy_ctor_func_t) zval_add_ref,(void *)
&tmp, sizeof(zval *));
++#else
++ object_properties_init(&(intern->zo), class_type);
++#endif
+
+ retval.handle = zend_objects_store_put(intern, NULL,
(zend_objects_free_object_storage_t)
php_imagickpixeliterator_object_free_storage, NULL TSRMLS_CC);
+ retval.handlers = (zend_object_handlers *)
&imagickpixeliterator_object_handlers;
+@@ -2471,7 +2483,11 @@
+ /* ALLOC_HASHTABLE(intern->zo.properties); */
+
+ zend_object_std_init(&intern->zo, class_type TSRMLS_CC);
++#if PHP_VERSION_ID < 50399
+ zend_hash_copy(intern->zo.properties,
&class_type->default_properties, (copy_ctor_func_t) zval_add_ref,(void *)
&tmp, sizeof(zval *));
++#else
++ object_properties_init(&(intern->zo), class_type);
++#endif
+
+ retval.handle = zend_objects_store_put(intern, NULL,
(zend_objects_free_object_storage_t) php_imagickpixel_object_free_storage,
NULL TSRMLS_CC);
+ retval.handlers = (zend_object_handlers *)
&imagickpixel_object_handlers;
+diff -u imagick-3.0.1/imagick_helpers.c imagick-3.0.1-3/imagick_helpers.c
+--- imagick-3.0.1/imagick_helpers.c 2010-11-19 05:16:01.000000000 +0800
++++ imagick-3.0.1-3/imagick_helpers.c 2012-05-10 09:02:42.000000000 +0800
+@@ -723,9 +723,11 @@
+
+ int php_imagick_safe_mode_check(const char *filename TSRMLS_DC)
+ {
++#if PHP_VERSION_ID < 50399
+ if (PG(safe_mode) && (!php_checkuid_ex(filename, NULL,
CHECKUID_CHECK_FILE_AND_DIR, CHECKUID_NO_ERRORS))) {
+ return IMAGICK_READ_WRITE_SAFE_MODE_ERROR;
+ }
++#endif
+
+ if (PG(open_basedir) && php_check_open_basedir_ex(filename, 0
TSRMLS_CC)) {
+ return IMAGICK_READ_WRITE_OPEN_BASEDIR_ERROR;
+diff -u imagick-3.0.1/imagick_read.c imagick-3.0.1-3/imagick_read.c
+--- imagick-3.0.1/imagick_read.c 2010-11-19 05:16:01.000000000 +0800
++++ imagick-3.0.1-3/imagick_read.c 2012-05-10 09:03:18.000000000 +0800
+@@ -176,7 +176,11 @@
+ {
+ int status = IMAGICK_READ_WRITE_NO_ERROR;
+
++#if PHP_VERSION_ID < 50399
+ if (PG(open_basedir) || PG(safe_mode)) {
++#else
++ if (PG(open_basedir)) {
++#endif
+ char *absolute = php_imagick_get_absolute_filename(filename,
filename_len TSRMLS_CC);
+
+ if (absolute) {
+diff -u imagick-3.0.1/php_imagick_macros.h
imagick-3.0.1-3/php_imagick_macros.h
+--- imagick-3.0.1/php_imagick_macros.h 2010-11-19 05:16:01.000000000 +0800
++++ imagick-3.0.1-3/php_imagick_macros.h 2012-05-10 09:02:07.000000000
+0800
+@@ -145,6 +145,7 @@
+ value = (type)NULL; \
+ } \
+
++#if PHP_VERSION_ID < 50399
+ #define IMAGICK_SAFE_MODE_CHECK(filename_, status_)\
+ if (filename_) { \
+ if (strlen(filename_) > MAXPATHLEN) { \
+@@ -156,7 +157,18 @@
+ if (php_check_open_basedir_ex(filename_, 0 TSRMLS_CC)) { \
+ status_ = IMAGICK_READ_WRITE_OPEN_BASEDIR_ERROR; \
+ } \
+- } \
++ }
++#else
++#define IMAGICK_SAFE_MODE_CHECK(filename_, status_)\
++ if (filename_) { \
++ if (strlen(filename_) > MAXPATHLEN) { \
++ status_ = IMAGICK_READ_WRITE_FILENAME_TOO_LONG; \
++ } \
++ if (php_check_open_basedir_ex(filename_, 0 TSRMLS_CC)) { \
++ status_ = IMAGICK_READ_WRITE_OPEN_BASEDIR_ERROR; \
++ } \
++ }
++#endif
+
+ #define IMAGICK_HAS_FORMAT(buffer, magick_wand, free_buffer)\
+ buffer = MagickGetImageFormat(magick_wand);\



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (b8e802151beb7ca1024ddf5fadfe2d35ab20226b), Vlad Glagolev, 04/17/2013

Archive powered by MHonArc 2.6.24.

Top of Page