cups-filters-php.patch

   1 --- cups-filters-1.0.41/configure.ac.orig       2013-12-01 10:26:49.834817503 +0100
   2 +++ cups-filters-1.0.41/configure.ac    2013-12-01 10:37:48.081456545 +0100
   3 @@ -568,6 +568,8 @@
   4         ])
   5         PHPDIR="`$PHPCONFIG --extension-dir`"
   6         AC_SUBST(PHPDIR)
   7 +       PHP_CFLAGS="`$PHPCONFIG --includes`"
   8 +       AC_SUBST(PHP_CFLAGS)
   9  ])
  10
  11  # =========
  12 --- cups-filters-1.0.41/Makefile.am.orig        2013-12-01 10:26:49.831484169 +0100
  13 +++ cups-filters-1.0.41/Makefile.am     2013-12-01 10:37:08.568124870 +0100
  14 @@ -696,8 +696,8 @@
  15         scripting/php/phpcups.c \
  16         scripting/php/phpcups.h
  17  libphpcups_la_LIBADD = $(CUPS_LIBS)
  18 -libphpcups_la_CFLAGS = $(CUPS_CFLAGS)
  19 -libphpcups_la_LDFLAGS = -no-undefined
  20 +libphpcups_la_CFLAGS = $(CUPS_CFLAGS) $(PHP_CFLAGS)
  21 +libphpcups_la_LDFLAGS = -module -avoid-version -shared -no-undefined
  22
  23  EXTRA_DIST += \
  24         scripting/perl \
  25 --- cups-filters-1.0.41/scripting/php/phpcups.c.orig    2012-06-22 18:10:47.000000000 +0200
  26 +++ cups-filters-1.0.41/scripting/php/phpcups.c 2013-12-01 10:50:16.171425151 +0100
  27 @@ -29,12 +29,16 @@
  28   * Include necessary headers...
  29   */
  30
  31 -#include <cups/string-private.h>
  32 +#include <cups/cups.h>
  33  #include "php.h"
  34  #include "php_ini.h"
  35  #include "ext/standard/info.h"
  36  #include "phpcups.h"
  37
  38 +#ifndef CUPS_SVERSION
  39 +#  define CPPSTR(x) #x
  40 +#  define CUPS_SVERSION CPPSTR(CUPS_VERSION_MAJOR) "." CPPSTR(CUPS_VERSION_MINOR) "." CPPSTR(CUPS_VERSION_PATCH)
  41 +#endif
  42
  43  /*
  44   * PHP function list...
  45 --- cups-filters-1.0.41/scripting/php/phpcups.h.orig    2012-06-22 18:10:47.000000000 +0200
  46 +++ cups-filters-1.0.41/scripting/php/phpcups.h 2013-12-01 10:42:51.171443826 +0100
  47 @@ -22,7 +22,6 @@
  48
  49  #  include <cups/cups.h>
  50  #  include <cups/language.h>
  51 -#  include <cups/debug-private.h>
  52  #  include <fcntl.h>
  53  #  include <sys/stat.h>
  54  #  if defined(WIN32) || defined(__EMX__)
  55 diff -urN cups-filters-1.0.53.orig/scripting/php/phpcups.c cups-filters-1.0.53/scripting/php/phpcups.c
  56 --- cups-filters-1.0.53.orig/scripting/php/phpcups.c    2014-05-01 18:48:49.622212848 +0200
  57 +++ cups-filters-1.0.53/scripting/php/phpcups.c 2014-05-01 18:49:21.228878551 +0200
  58 @@ -44,7 +44,7 @@
  59   * PHP function list...
  60   */
  61
  62 -function_entry phpcups_functions[] =
  63 +zend_function_entry phpcups_functions[] =
  64  {
  65    PHP_FE(cups_cancel_job, NULL)
  66    PHP_FE(cups_get_dests, NULL)