--- php-imlib-0.7.orig/config.m4 +++ php-imlib-0.7/config.m4 @@ -25,6 +25,16 @@ IMLIB2_LIBDIR=$IMLIB2_DIR/lib IMLIB2_INCDIR=$IMLIB2_DIR/include + dnl In theory we should be able to use imlib2-config --cflags, but + dnl it's not smart enough to know when Imlib2 was built without X + dnl support anyway -- might as well use AC_PATH_X and skip + dnl path-hunting for imlib2-config itself... + + AC_PATH_X([X], [X11/Xlib.h], [XOpenDisplay(NULL)]) + if test "x$have_x" = "xyes"; then + PHP_ADD_INCLUDE($x_includes) + fi + AC_TEMP_LDFLAGS(-L$IMLIB2_LIBDIR,[ AC_CHECK_LIB(Imlib2, imlib_load_image, [AC_DEFINE(HAVE_IMLIB2,1,[ ])], [AC_MSG_ERROR(Imlib2 module requires CVS Imlib2)]) --- php-imlib-0.7.orig/debian/changelog +++ php-imlib-0.7/debian/changelog @@ -0,0 +1,167 @@ +php-imlib (0.7-4.1build2) trusty; urgency=medium + + * No change rebuild for phpapi-20121212+lfs (LFS ABI break on 32-bit + arches). + + -- Robie Basak Wed, 19 Feb 2014 08:22:37 +0000 + +php-imlib (0.7-4.1build1) saucy; urgency=low + + * Rebuild for PHP 5.5. + + -- Colin Watson Tue, 16 Jul 2013 01:29:56 +0100 + +php-imlib (0.7-4.1) unstable; urgency=low + + * Non-maintainer upload. + * Remove pass by references (Closes: #658954). + + -- Luk Claes Wed, 04 Jul 2012 23:08:46 +0000 + +php-imlib (0.7-4) unstable; urgency=high + + * Fix FTBFS with PHP 5.4. Thanks to Lior Kaplan for the patch. + Closes: #656481. + + -- Steve Langasek Sat, 17 Mar 2012 20:26:42 -0700 + +php-imlib (0.7-3) unstable; urgency=low + + * convert to dpkg-buildflags to avoid hard-coding of policy flags and to + pick up hardening flags. + * further reduce debian/rules, for things that debhelper already does + right by default. + * Add Vcs-Bzr, Vcs-Browser fields. + + -- Steve Langasek Mon, 24 Oct 2011 22:52:31 -0700 + +php-imlib (0.7-2) unstable; urgency=low + + * imlib.c: update for compatibility with php 5.3; thanks to Michael Bienia + for the patch. Closes: #569118, #591530, LP: #555567. + * debian/rules: don't ignore errors from make distclean. + * update package section from web to php. + * drop postinst script for migration from php4, no longer a concern. + * Standards-Version: 3.9.2. + * update suggested font packages to match what's currently available in + the archive. Closes: #490036, #619722. + * fix /usr/share/common-licenses reference in debian/copyright. + * jump to dh. + + -- Steve Langasek Wed, 27 Apr 2011 17:33:55 +0000 + +php-imlib (0.7-1) unstable; urgency=low + + * New upstream release + * Switch to php5 for the impending removal of php4 from unstable. + Closes: #418307. + * Drop the debconf templates in favor of the new /etc/php5/conf.d/ + structure; with apologies to the Portuguese translation team for + their work on an unapplied translation. Closes: #420210. + + -- Steve Langasek Fri, 06 Jul 2007 01:27:42 -0700 + +php-imlib (0.6-1) unstable; urgency=high + + * New upstream release + - remove Microsoft Arial in favor of Vera Sans for the examples. + Closes: #393660. + * High-urgency upload for RC bugfix. + * Add Swedish translation, thanks to Daniel Nylander + (closes: #330758). + + -- Steve Langasek Wed, 18 Oct 2006 20:46:51 -0700 + +php-imlib (0.5-3) unstable; urgency=low + + * Rebuild for the PHP ABI transition (closes: #329608). + * Use the new php-config4 --phpapi option, and Build-Depend on a new + enough version of php4-dev to make sure it's available. + * Fix a bashism in the prerm script. + * Add support for DEB_BUILD_OPTIONS=noopt, and enable debugging symbols + by default; with this change, we should be compliant with + Standards-Version 3.6.2. + + -- Steve Langasek Thu, 22 Sep 2005 03:32:28 -0700 + +php-imlib (0.5-2) unstable; urgency=low + + * Add Vietnamese translation, thanks to Clytie Siddall + (closes: #316820). + + -- Steve Langasek Thu, 7 Jul 2005 03:34:07 -0700 + +php-imlib (0.5-1) unstable; urgency=low + + * New upstream release + - removed duplicate third_arg_force_ref symbol, so that the build + succeeds with gcc 4.0. Closes: #287912. + + -- Steve Langasek Mon, 6 Jun 2005 02:31:10 -0700 + +php-imlib (0.4-3) unstable; urgency=high + + * Rebuild again against the latest php4-dev, which reverts the ZTS + ABI. + + -- Steve Langasek Thu, 24 Mar 2005 20:36:24 -0800 + +php-imlib (0.4-2) unstable; urgency=low + + * Fix buggy version comparison in php-imlib.config. + * Do explicit path checking for X, which is a good idea in general and + works around current buildd breakage. + + -- Steve Langasek Thu, 17 Feb 2005 17:01:49 -0800 + +php-imlib (0.4-1) unstable; urgency=low + + * New upstream release. + * Update + * Rebuild against the new PHP ABI now that ZTS is enabled. + Closes: #294010. + * Kill off suggests of ttf-openoffice, which is no longer available + * Add the common PHP debconf goo to the package, so that we can stop + prompting the user directly. + + -- Steve Langasek Wed, 9 Feb 2005 03:27:56 -0800 + +php-imlib (0.3-6) unstable; urgency=low + + * Fix package build rules so they work with php 4.3's phpize. + + -- Steve Langasek Thu, 4 Sep 2003 08:18:57 -0500 + +php-imlib (0.3-5) unstable; urgency=low + + * Rebuild against the latest PHP4 ABI so that the package is + installable again in unstable. + + -- Steve Langasek Wed, 3 Sep 2003 12:59:32 -0500 + +php-imlib (0.3-4) unstable; urgency=low + + * Migrate from /usr/share/pear/ to /usr/share/php/, in the expectation + that this will be the preferred directory in the near future. + + -- Steve Langasek Mon, 3 Jun 2002 17:03:58 -0500 + +php-imlib (0.3-3) unstable; urgency=low + + * Force a recompile against the latest PHP4 ABI. + + -- Steve Langasek Sun, 2 Jun 2002 15:27:08 -0500 + +php-imlib (0.3-2) unstable; urgency=low + + * Reduce relationship with contrib packages from 'Recommends' to + 'Suggests', to conform with policy. + + -- Steve Langasek Tue, 23 Apr 2002 13:58:07 -0500 + +php-imlib (0.3-1) unstable; urgency=low + + * Initial Release (closes: #135300). + + -- Steve Langasek Fri, 22 Feb 2002 19:59:39 -0600 + --- php-imlib-0.7.orig/debian/clean +++ php-imlib-0.7/debian/clean @@ -0,0 +1,19 @@ +configure +acinclude.m4 +aclocal.m4 +config.guess +config.h.in +config.sub +configure.in +dynlib.m4 +install-sh +libs.mk +ltmain.sh +missing +mkinstalldirs +.deps +conftest* +config.h +config.nice +Makefile.global +run-tests.php --- php-imlib-0.7.orig/debian/compat +++ php-imlib-0.7/debian/compat @@ -0,0 +1 @@ +9 --- php-imlib-0.7.orig/debian/control +++ php-imlib-0.7/debian/control @@ -0,0 +1,18 @@ +Source: php-imlib +Section: php +Priority: optional +Maintainer: Steve Langasek +Build-Depends: debhelper (>> 8.9.4~), php5-dev, libimlib2-dev +Standards-Version: 3.9.2 +Vcs-Bzr: nosmart+http://bzr.debian.org/bzr/users/vorlon/php-imlib/trunk/ +Vcs-Browser: http://anonscm.debian.org/loggerhead/users/vorlon/php-imlib/trunk/ + +Package: php-imlib +Architecture: any +Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends} +Suggests: ttf-thryomanes | ttf-liberation | ttf-mscorefonts-installer +Description: PHP Imlib2 Extension + php_imlib is an extension for PHP5 that provides access to Rasterman's + image manipulation library, Imlib2, from within PHP scripts. It + currently implements most of the Imlib2 API, except for some + X11-specific functions. --- php-imlib-0.7.orig/debian/copyright +++ php-imlib-0.7/debian/copyright @@ -0,0 +1,92 @@ +This package was debianized by Steve Langasek on +Fri, 22 Feb 2002 19:59:39 -0600. + +It was downloaded from http://mmcc.cx/php_imlib/downloads.php + +Upstream Authors: Matt McClanahan + Steve Langasek + +Copyright: + +This software is made available under the terms of the GNU LGPL. On +Debian GNU/Linux systems, the complete text of the GNU Lesser General +Public License can be found in /usr/share/common-licenses/LGPL-2.1. + +The software may also be distributed and modified under the terms of +version 2.02 of the PHP License, as follows: + +-------------------------------------------------------------------- + The PHP License, version 2.02 +Copyright (c) 1999, 2000 The PHP Group. All rights reserved. +-------------------------------------------------------------------- + +Redistribution and use in source and binary forms, with or without +modification, is permitted provided that the following conditions +are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + 3. The name "PHP" must not be used to endorse or promote products + derived from this software without prior permission from the + PHP Group. This does not apply to add-on libraries or tools + that work in conjunction with PHP. In such a case the PHP + name may be used to indicate that the product supports PHP. + + 4. The PHP Group may publish revised and/or new versions of the + license from time to time. Each version will be given a + distinguishing version number. + Once covered code has been published under a particular version + of the license, you may always continue to use it under the + terms of that version. You may also choose to use such covered + code under the terms of any subsequent version of the license + published by the PHP Group. No one other than the PHP Group has + the right to modify the terms applicable to covered code created + under this License. + + 5. Redistributions of any form whatsoever must retain the following + acknowledgment: + "This product includes PHP, freely available from + http://www.php.net/". + + 6. The software incorporates the Zend Engine, a product of Zend + Technologies, Ltd. ("Zend"). The Zend Engine is licensed to the + PHP Association (pursuant to a grant from Zend that can be + found at http://www.php.net/license/ZendGrant/) for + distribution to you under this license agreement, only as a + part of PHP. In the event that you separate the Zend Engine + (or any portion thereof) from the rest of the software, or + modify the Zend Engine, or any portion thereof, your use of the + separated or modified Zend Engine software shall not be governed + by this license, and instead shall be governed by the license + set forth at http://www.zend.com/license/ZendLicense/. + + + +THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND +ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP +DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED +OF THE POSSIBILITY OF SUCH DAMAGE. + +-------------------------------------------------------------------- + +This software consists of voluntary contributions made by many +individuals on behalf of the PHP Group. + +The PHP Group can be contacted via Email at group@php.net. + +For more information on the PHP Group and the PHP project, +please see . --- php-imlib-0.7.orig/debian/dirs +++ php-imlib-0.7/debian/dirs @@ -0,0 +1 @@ +usr/lib/php5/20090626 --- php-imlib-0.7.orig/debian/docs +++ php-imlib-0.7/debian/docs @@ -0,0 +1,2 @@ +README +TODO --- php-imlib-0.7.orig/debian/examples +++ php-imlib-0.7/debian/examples @@ -0,0 +1,5 @@ +examples/draw.php +examples/flip.php +examples/gradtest.php +examples/scale.php +examples/text.php --- php-imlib-0.7.orig/debian/php-imlib.install +++ php-imlib-0.7/debian/php-imlib.install @@ -0,0 +1,2 @@ +docs/*.php /usr/share/php/Imlib +usr/lib --- php-imlib-0.7.orig/debian/php-imlib.lintian-overrides +++ php-imlib-0.7/debian/php-imlib.lintian-overrides @@ -0,0 +1,3 @@ +# LGPL | PHP is not a bug. +php-imlib: copyright-refers-to-bad-php-license + --- php-imlib-0.7.orig/debian/php5-imlib.ini +++ php-imlib-0.7/debian/php5-imlib.ini @@ -0,0 +1,2 @@ +# configuration for php Imlib module +extension=imlib.so --- php-imlib-0.7.orig/debian/rules +++ php-imlib-0.7/debian/rules @@ -0,0 +1,19 @@ +#!/usr/bin/make -f + +%: + dh $@ + +override_dh_auto_configure: + phpize + dh_auto_configure + +override_dh_auto_clean: + dh_auto_clean + rm -rf modules build autom4te.cache + +override_dh_auto_install: + $(MAKE) install INSTALL_ROOT=$(CURDIR)/debian/tmp + +override_dh_gencontrol: + echo "php:Depends=phpapi-`php-config5 --phpapi`" >> debian/php-imlib.substvars + dh_gencontrol --- php-imlib-0.7.orig/docs/class.ImlibImage.php +++ php-imlib-0.7/docs/class.ImlibImage.php @@ -237,7 +237,7 @@ if (!is_resource($this->id)) return false; - if (!imlib_dump_image($this->id,&$err,$quality)) + if (!imlib_dump_image($this->id,$err,$quality)) return false; else return true; --- php-imlib-0.7.orig/docs/class.ImlibPoly.php +++ php-imlib-0.7/docs/class.ImlibPoly.php @@ -147,7 +147,7 @@ if (!is_resource($this->poly)) return false; - imlib_polygon_get_bounds($this->poly,&$x1,&$y1,&$x2,&$y2); + imlib_polygon_get_bounds($this->poly,$x1,$y1,$x2,$y2); } /** --- php-imlib-0.7.orig/docs/class.ImlibText.php +++ php-imlib-0.7/docs/class.ImlibText.php @@ -102,7 +102,7 @@ if (!is_resource($this->fnt)) return false; - return imlib_get_text_size($this->fnt,$str,&$fw,&$fh,$dir); + return imlib_get_text_size($this->fnt,$str,$fw,$fh,$dir); } /** --- php-imlib-0.7.orig/imlib.c +++ php-imlib-0.7/imlib.c @@ -42,7 +42,17 @@ ZEND_DECLARE_MODULE_GLOBALS(imlib); -static + ZEND_BEGIN_ARG_INFO(second_arg_force_ref, 0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(1) + ZEND_END_ARG_INFO(); + + ZEND_BEGIN_ARG_INFO(third_arg_force_ref, 0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(0) + ZEND_ARG_PASS_INFO(1) + ZEND_END_ARG_INFO(); + ZEND_BEGIN_ARG_INFO(third_and_fourth_arg_force_ref, 0) ZEND_ARG_PASS_INFO(0) ZEND_ARG_PASS_INFO(0) @@ -50,7 +60,6 @@ ZEND_ARG_PASS_INFO(1) ZEND_END_ARG_INFO(); -static ZEND_BEGIN_ARG_INFO(second_through_fifth_arg_force_ref, 0) ZEND_ARG_PASS_INFO(0) ZEND_ARG_PASS_INFO(1) @@ -64,7 +73,7 @@ static int le_imlib_img; static int le_imlib_poly; -function_entry imlib_functions[] = { +zend_function_entry imlib_functions[] = { PHP_FE(imlib_add_color_to_color_range,NULL) PHP_FE(imlib_blend_image_onto_image,NULL) PHP_FE(imlib_clone_image,NULL) @@ -121,7 +130,7 @@ PHP_INI_BEGIN() STD_PHP_INI_ENTRY("imlib.font_path", - "/usr/local/share/fonts", + "/usr/share/fonts/truetype", PHP_INI_SYSTEM|PHP_INI_PERDIR, OnUpdateString, font_path,