cups-filters-dbus.patch

   1 diff -up cups-filters-1.0.41/Makefile.am.dbus cups-filters-1.0.41/Makefile.am
   2 --- cups-filters-1.0.41/Makefile.am.dbus        2013-10-25 14:12:56.000000000 +0100
   3 +++ cups-filters-1.0.41/Makefile.am     2013-11-06 17:16:58.504234619 +0000
   4 @@ -474,9 +474,11 @@ gstoraster_SOURCES = \
   5         cupsfilters/raster.h
   6  gstoraster_CFLAGS = \
   7         $(CUPS_CFLAGS) \
   8 +       $(DBUS_CFLAGS) \
   9         -I$(srcdir)/cupsfilters/
  10  gstoraster_LDADD = \
  11         $(CUPS_LIBS) \
  12 +       $(DBUS_LIBS) \
  13         libcupsfilters.la
  14
  15  imagetopdf_SOURCES = \
  16 diff -up cups-filters-1.0.41/config.h.in.dbus cups-filters-1.0.41/config.h.in
  17 diff -up cups-filters-1.0.41/configure.ac.dbus cups-filters-1.0.41/configure.ac
  18 --- cups-filters-1.0.41/configure.ac.dbus       2013-10-30 07:21:44.000000000 +0000
  19 +++ cups-filters-1.0.41/configure.ac    2013-11-06 17:23:07.619921079 +0000
  20 @@ -114,6 +114,18 @@ AX_COMPARE_VERSION([$CUPS_VERSION],[gt],
  21  AC_DEFINE(PDFTOPDF, [], [Needed for pdftopdf filter compilation])
  22  AC_DEFINE_DIR(BANNERTOPDF_DATADIR, "{CUPS_DATADIR}/data", [Directory where bannertopdf finds its data files (PDF templates)])
  23
  24 +dnl DBus support
  25 +DBUS_CFLAGS=""
  26 +DBUS_LIBS=""
  27 +AC_ARG_ENABLE([dbus], AC_HELP_STRING([--disable-dbus],
  28 +    [Do not use dbus to communicate with external services]))
  29 +if test "$enable_dbus" != "no"; then
  30 +        PKG_CHECK_MODULES(DBUS, [dbus-1], [HAVE_DBUS=-DHAVE_DBUS])
  31 +        AC_DEFINE([HAVE_DBUS], [], [Defines if dbus is available.])
  32 +fi
  33 +AC_SUBST(DBUS_CFLAGS)
  34 +AC_SUBST(DBUS_LIBS)
  35 +
  36  AC_SEARCH_LIBS([dlopen],
  37         [dl],
  38         [AS_IF([test "$ac_cv_search_dlopen" != "none required"], [
  39 @@ -640,6 +652,7 @@ Build configuration:
  40         php-config:      ${with_php_config}
  41         test-font:       ${with_test_font_path}
  42         tiff:            ${with_tiff}
  43 +       dbus:            ${HAVE_DBUS}
  44         avahi:           ${enable_avahi}
  45         browsing:        ${with_browseremoteprotocols}
  46         werror:          ${enable_werror}
  47 --- cups-filters-1.0.42/cupsfilters/colord.c.orig       2013-11-27 00:40:41.000000000 +0100
  48 +++ cups-filters-1.0.42/cupsfilters/colord.c    2013-12-01 14:33:00.854197621 +0100
  49 @@ -32,12 +32,12 @@ MIT Open Source License  -  http://www.o
  50  #include <stdio.h>
  51  #include <sys/types.h>
  52
  53 +#include "colord.h"
  54 +
  55  #ifdef HAVE_DBUS
  56    #include <dbus/dbus.h>
  57  #endif
  58
  59 -#include "colord.h"
  60 -
  61  #define QUAL_COLORSPACE   0
  62  #define QUAL_MEDIA        1
  63  #define QUAL_RESOLUTION   2