From df15bc126d248dec6f2742619a49eff8ca15287c Mon Sep 17 00:00:00 2001 From: Stuart Herbert Date: Tue, 6 Sep 2005 07:36:52 +0000 Subject: [PATCH] Replaced corrupted patch file Package-Manager: portage-2.0.51.22-r2 --- dev-php4/pecl-mailparse/ChangeLog | 6 +- dev-php4/pecl-mailparse/Manifest | 2 +- .../files/cvs-mailparse.c-fix.diff | 58 +++++ dev-php4/pecl-pdflib/ChangeLog | 5 +- dev-php4/pecl-pdflib/Manifest | 2 +- dev-php4/pecl-pdflib/files/ifgd-patch.diff | 209 ++++++++++++++++++ 6 files changed, 278 insertions(+), 4 deletions(-) create mode 100644 dev-php4/pecl-mailparse/files/cvs-mailparse.c-fix.diff create mode 100644 dev-php4/pecl-pdflib/files/ifgd-patch.diff diff --git a/dev-php4/pecl-mailparse/ChangeLog b/dev-php4/pecl-mailparse/ChangeLog index 201c9fde1b24..52b3b0da8508 100644 --- a/dev-php4/pecl-mailparse/ChangeLog +++ b/dev-php4/pecl-mailparse/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-php4/pecl-mailparse # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php4/pecl-mailparse/ChangeLog,v 1.1 2005/09/04 15:35:56 stuart Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php4/pecl-mailparse/ChangeLog,v 1.2 2005/09/06 07:34:11 stuart Exp $ + + 06 Sep 2005; Stuart Herbert + +files/cvs-mailparse.c-fix.diff: + Replaced corrupted patchfile 18 Aug 2005; ChangeLog: Initial version; replaces older dev-php/* packages diff --git a/dev-php4/pecl-mailparse/Manifest b/dev-php4/pecl-mailparse/Manifest index 90d2d55392f8..c5a117725a51 100644 --- a/dev-php4/pecl-mailparse/Manifest +++ b/dev-php4/pecl-mailparse/Manifest @@ -2,4 +2,4 @@ MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157 MD5 e690d4ce557f01fdb2997717a77ac1af ChangeLog 319 MD5 e612a6e0a85afaceb497d566ae0ef1a7 pecl-mailparse-2.1.1.ebuild 706 MD5 0e0417ccc35d51d676d71b0cf958ec46 files/digest-pecl-mailparse-2.1.1 63 -MD5 bdc498b0d5339c27d330aa8c383b99e2 files/cvs-mailparse.c-fix.diff 1942 +MD5 35dd19f4a7b42bb6210dc30fc9897d63 files/cvs-mailparse.c-fix.diff 1914 diff --git a/dev-php4/pecl-mailparse/files/cvs-mailparse.c-fix.diff b/dev-php4/pecl-mailparse/files/cvs-mailparse.c-fix.diff new file mode 100644 index 000000000000..349853a29902 --- /dev/null +++ b/dev-php4/pecl-mailparse/files/cvs-mailparse.c-fix.diff @@ -0,0 +1,58 @@ +--- mailparse.c 2005-02-28 07:21:45.000000000 +0100 ++++ mailparse.c 2005-08-28 13:38:08.000000000 +0200 +@@ -15,7 +15,7 @@ + | Author: Wez Furlong | + +----------------------------------------------------------------------+ + */ +-/* $Id: mailparse.c,v 1.48 2005/02/28 05:51:40 wez Exp $ */ ++/* $Id: mailparse.c,v 1.49 2005/05/12 13:02:41 wez Exp $ */ + + #ifdef HAVE_CONFIG_H + #include "config.h" +@@ -70,7 +70,7 @@ + {NULL, NULL, NULL} + }; + +-static zend_class_entry mimemsg_class_entry; ++static zend_class_entry *mimemsg_class_entry; + + function_entry mailparse_functions[] = { + PHP_FE(mailparse_msg_parse_file, NULL) +@@ -138,6 +138,8 @@ + + PHP_MINIT_FUNCTION(mailparse) + { ++ zend_class_entry mmce; ++ + #ifdef ZTS + zend_mailparse_globals *mailparse_globals; + +@@ -145,8 +147,8 @@ + mailparse_globals = ts_resource(mailparse_globals_id); + #endif + +- INIT_CLASS_ENTRY(mimemsg_class_entry, "mimemessage", mimemessage_methods); +- zend_register_internal_class(&mimemsg_class_entry TSRMLS_CC); ++ INIT_CLASS_ENTRY(mmce, "mimemessage", mimemessage_methods); ++ mimemsg_class_entry = zend_register_internal_class(&mmce TSRMLS_CC); + + + le_mime_part = zend_register_list_destructors_ex(mimepart_dtor, NULL, mailparse_msg_name, module_number); +@@ -211,7 +213,7 @@ + MAKE_STD_ZVAL(zpart); + php_mimepart_to_zval(zpart, part); + +- object_init_ex(object, &mimemsg_class_entry); ++ object_init_ex(object, mimemsg_class_entry); + PZVAL_IS_REF(object) = 1; + ZVAL_REFCOUNT(object) = 1; + +@@ -654,7 +656,7 @@ + php_info_print_table_start(); + php_info_print_table_header(2, "mailparse support", "enabled"); + php_info_print_table_row(2, "Extension Version", mailparse_module_entry.version); +- php_info_print_table_row(2, "Revision", "$Revision: 1.48 $"); ++ php_info_print_table_row(2, "Revision", "$Revision: 1.49 $"); + php_info_print_table_end(); + + DISPLAY_INI_ENTRIES(); diff --git a/dev-php4/pecl-pdflib/ChangeLog b/dev-php4/pecl-pdflib/ChangeLog index d6fcc1d0224e..aed6044467a6 100644 --- a/dev-php4/pecl-pdflib/ChangeLog +++ b/dev-php4/pecl-pdflib/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-php4/pecl-pdflib # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-php4/pecl-pdflib/ChangeLog,v 1.1 2005/09/04 15:44:55 stuart Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-php4/pecl-pdflib/ChangeLog,v 1.2 2005/09/06 07:36:52 stuart Exp $ + + 06 Sep 2005; Stuart Herbert +files/ifgd-patch.diff: + Replaced corrupted patch file 18 Aug 2005; ChangeLog: Initial version; replaces older dev-php/* packages diff --git a/dev-php4/pecl-pdflib/Manifest b/dev-php4/pecl-pdflib/Manifest index 596d74320ad0..a75132c6a6b4 100644 --- a/dev-php4/pecl-pdflib/Manifest +++ b/dev-php4/pecl-pdflib/Manifest @@ -2,4 +2,4 @@ MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157 MD5 82dcfaf28a567e384d7017bd6f201c89 ChangeLog 313 MD5 338f351828e3e88d2be914b8b4468c2b pecl-pdflib-2.0.4-r1.ebuild 638 MD5 1ffaf58e4d052d47b48b8490ca92efaf files/digest-pecl-pdflib-2.0.4-r1 60 -MD5 63cd710d307c4faac3fec2c6a1cfd940 files/ifgd-patch.diff 5891 +MD5 f1d1195704d3132b7878446eba109903 files/ifgd-patch.diff 5798 diff --git a/dev-php4/pecl-pdflib/files/ifgd-patch.diff b/dev-php4/pecl-pdflib/files/ifgd-patch.diff new file mode 100644 index 000000000000..824bbd2298d0 --- /dev/null +++ b/dev-php4/pecl-pdflib/files/ifgd-patch.diff @@ -0,0 +1,209 @@ +--- pdf.c 2005-08-02 17:43:36.000000000 +0200 ++++ pdf.c 2005-08-02 17:45:33.000000000 +0200 +@@ -17,12 +17,12 @@ + +----------------------------------------------------------------------+ + */ + +-/* $Id: pdf.c,v 1.143 2004/11/30 11:42:13 rjs Exp $ */ ++/* $Id: pdf.c,v 1.144 2005/03/08 12:02:19 rjs Exp $ */ + + /* {{{ Comments about the module */ + + /* derived from: +- $Id: pdf.c,v 1.143 2004/11/30 11:42:13 rjs Exp $ ++ $Id: pdf.c,v 1.144 2005/03/08 12:02:19 rjs Exp $ + synced with pdflib.h 1.237 */ + + /* PDFlib 2.02 ... 4.0.x is subject to the ALADDIN FREE PUBLIC LICENSE. +@@ -63,8 +63,12 @@ + + /* Bootstrap of PDFlib Feature setup */ + #define PDF_FEATURE_INTERNAL ++#define PDFLIB_PECL_VERSIONSTRING "2.0.4-r1" + +-#define PDFLIB_PECL_VERSIONSTRING "2.0.3" ++/* set this define if you want to include GD support ++ * this adds the (unofficial) function pdf_open_memory_image() ++#define PDFLIB_WITH_GD_SUPPORT ++*/ + + /* }}} */ + +@@ -87,6 +91,7 @@ + # include "Zend/zend_exceptions.h" + #endif /* PHP_MAJOR_VERSION >= 5 */ + ++#if PDFLIB_WITH_GD_SUPPORT + #if HAVE_LIBGD13 + # include "ext/gd/php_gd.h" + # if HAVE_GD_BUNDLED +@@ -96,6 +101,7 @@ + # endif /* HAVE_GD_BUNDLED */ + static int le_gd; + #endif /* HAVE_LIBGD13 */ ++#endif /* PDFLIB_WITH_GD_SUPPORT */ + + #ifdef HAVE_UNISTD_H + # include +@@ -299,10 +305,12 @@ + + /* End of the official PDFLIB API */ + ++#if PDFLIB_WITH_GD_SUPPORT + #if HAVE_LIBGD13 + /* not supported by PDFlib GmbH */ + PHP_FE(pdf_open_memory_image, NULL) + #endif /* HAVE_LIBGD13 */ ++#endif /* PDFLIB_WITH_GD_SUPPORT */ + + {NULL, NULL, NULL} + }; +@@ -491,10 +499,12 @@ + + /* End of the official PDFLIB API */ + ++#if PDFLIB_WITH_GD_SUPPORT + #if HAVE_LIBGD13 + /* not supported by PDFlib GmbH */ + /* PHP_ME_MAPPING(open_memory_image, pdf_open_memory_image, NULL) */ + #endif /* HAVE_LIBGD13 */ ++#endif /* PDFLIB_WITH_GD_SUPPORT */ + + {NULL, NULL, NULL} + }; +@@ -768,7 +778,7 @@ + php_info_print_table_row(2, "PDF Support", "enabled" ); + php_info_print_table_row(2, "PDFlib GmbH Version", PDFLIB_VERSIONSTRING ); + php_info_print_table_row(2, "PECL Version", PDFLIB_PECL_VERSIONSTRING); +- php_info_print_table_row(2, "Revision", "$Revision: 1.143 $" ); ++ php_info_print_table_row(2, "Revision", "$Revision: 1.144 $" ); + php_info_print_table_end(); + + } +@@ -7197,6 +7207,7 @@ + + + ++#if PDFLIB_WITH_GD_SUPPORT + #if HAVE_LIBGD13 + /* {{{ proto int pdf_open_memory_image(resource p, int image) + Takes an GD image and returns an image for placement in a PDF document */ +@@ -7276,6 +7287,7 @@ + } + /* }}} */ + #endif /* HAVE_LIBGD13 */ ++#endif /* PDFLIB_WITH_GD_SUPPORT */ + + #else /* PDFLIB_MAJORVERSION < 5 */ + /* use the old wrapper for PDFlib 4 and earlier */ +--- pdf4.c 2005-08-02 17:43:43.000000000 +0200 ++++ pdf4.c 2005-08-02 17:47:52.000000000 +0200 +@@ -17,7 +17,7 @@ + +----------------------------------------------------------------------+ + */ + +-/* $Id: pdf4.c,v 1.2 2004/11/30 11:42:13 rjs Exp $ */ ++/* $Id: pdf4.c,v 1.4 2005/07/08 06:22:03 steinm Exp $ */ + + /* pdflib 2.02 ... 3.0x is subject to the ALADDIN FREE PUBLIC LICENSE. + Copyright (C) 1997-1999 Thomas Merz. 2000-2001 PDFlib GmbH */ +@@ -40,6 +40,7 @@ + #include "ext/standard/file.h" + #include "php_streams.h" + ++#if PDFLIB_WITH_GD_SUPPORT + #if HAVE_LIBGD13 + #include "ext/gd/php_gd.h" + #if HAVE_GD_BUNDLED +@@ -49,6 +50,7 @@ + #endif + static int le_gd; + #endif ++#endif / * PDFLIB_WITH_GD_SUPPORT * / + + #ifdef HAVE_UNISTD_H + # include +@@ -187,9 +189,11 @@ + + /* some more stuff for compatibility */ + PHP_FE(pdf_add_annotation, NULL) ++#if PDFLIB_WITH_GD_SUPPORT + #if HAVE_LIBGD13 + PHP_FE(pdf_open_memory_image, NULL) + #endif ++#endif + /* depreciatet after V4.0 of PDFlib */ + PHP_FE(pdf_setgray_fill, NULL) + PHP_FE(pdf_setgray_stroke, NULL) +@@ -334,7 +338,7 @@ + #else + php_info_print_table_row(2, "PDFlib GmbH Version", tmp ); + #endif +- php_info_print_table_row(2, "Revision", "$Revision: 1.2 $" ); ++ php_info_print_table_row(2, "Revision", "$Revision: 1.4 $" ); + php_info_print_table_end(); + + } +@@ -1949,6 +1953,7 @@ + } + /* }}} */ + ++#if PDFLIB_WITH_GD_SUPPORT + #if HAVE_LIBGD13 + /* {{{ proto int pdf_open_memory_image(int pdf, int image) + Takes an GD image and returns an image for placement in a PDF document */ +@@ -2015,6 +2020,7 @@ + } + /* }}} */ + #endif /* HAVE_LIBGD13 */ ++#endif /* PDFLIB_WITH_GD_SUPPORT */ + + /* {{{ proto void pdf_close_image(int pdf, int pdfimage) + Closes the PDF image */ +--- php_pdf.h 2005-08-02 17:44:20.000000000 +0200 ++++ php_pdf.h 2005-08-02 17:49:15.000000000 +0200 +@@ -16,7 +16,7 @@ + +----------------------------------------------------------------------+ + */ + +-/* $Id: php_pdf.h,v 1.30 2004/11/30 11:42:13 rjs Exp $ */ ++/* $Id: php_pdf.h,v 1.31 2005/03/08 12:02:19 rjs Exp $ */ + /* Derived from: + Id: php_pdf.h,v 1.22 2001/11/30 04:46:35 sniper Exp */ + +@@ -201,10 +201,12 @@ + #endif /* PDFlib >= 6.0.0 */ + + ++#if PDFLIB_WITH_GD_SUPPORT + #if HAVE_LIBGD13 + /* not supported by PDFlib GmbH */ + PHP_FUNCTION(pdf_open_memory_image); + #endif ++#endif /* PDFLIB_WITH_GD_SUPPORT */ + + #ifdef ZTS + #define PDFG(v) TSRMG(pdf_globals_id, php_pdf_globals *, v) +--- php_pdf4.h 2005-08-02 17:44:26.000000000 +0200 ++++ php_pdf4.h 2005-08-02 17:50:39.000000000 +0200 +@@ -16,7 +16,7 @@ + +----------------------------------------------------------------------+ + */ + +-/* $Id: php_pdf4.h,v 1.2 2004/11/30 11:42:13 rjs Exp $ */ ++/* $Id: php_pdf4.h,v 1.3 2005/03/08 12:02:20 rjs Exp $ */ + + #ifndef PHP_PDF_H + #define PHP_PDF_H +@@ -140,9 +140,11 @@ + + /* some more stuff for compatibility */ + PHP_FUNCTION(pdf_add_annotation); ++#if PDFLIB_WITH_GD_SUPPORT + #if HAVE_LIBGD13 + PHP_FUNCTION(pdf_open_memory_image); + #endif ++#endif /* PDFLIB_WITH_GD_SUPPORT */ + + #if (PDFLIB_MAJORVERSION >= 4) + /* support for new functions in PDFlib V4.0 */ -- 2.26.2