pkg/35065: gtk2 does not support cups, no cups printing with evince and epiphany

["Joachim Koenig-Baltes" <joachim.koenig-baltes%emesgarten.de@localhost>]

>Number:         35065
>Category:       pkg
>Synopsis:       gtk2 does not support cups, no cups printing with evince and 
>epiphany
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Nov 17 14:45:00 +0000 2006
>Originator:     Joachim Koenig-Baltes
>Release:        NetBSD 4.99.3 i386
>Organization:
>Environment:


System: NetBSD 4.99.3 (JOACHIM_ACPI) #0: Wed Nov  1 17:32:58 CET 2006
        joachim@joachim:/usr/src/sys/arch/i386/compile/JOACHIM_ACPI



>Description:


gtk2 explicitely disables cups support in patch-ai due to problems
on MacOSX.

However, print/evince and www/epiphany have moved from
libgnomeprintui to the gtk printing ui, so you cannot access
the cups managed printers in these (and possibly other)
applications


>How-To-Repeat:


build meta-pkgs/gnome and try to print from evince or epiphany
and see that the cups managed printers do not show up 8-(


>Fix:


I created an option for cups and only enable it in configure if
it is enabled. This does not fix the Mac OS X problems hower,
so perhaps, the option should be disabled there.

I also renamed the options variable from PKG_OPTIONS.gtk2+
to PKG_OPTIONS.gtk2, it looks a bit strange to have
PKG_OPTIONS.gtk2+= cups in /etc/mk.conf, but YMMV.

Here's the fix:

--- options.mk.orig     2006-11-17 11:15:18.000000000 +0100
+++ options.mk  2006-11-17 11:19:39.000000000 +0100
@@ -1,10 +1,14 @@
 # $NetBSD: options.mk,v 1.1 2005/11/25 21:31:06 wiz Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.gtk2+
-PKG_SUPPORTED_OPTIONS= debug
+PKG_OPTIONS_VAR=       PKG_OPTIONS.gtk2
+PKG_SUPPORTED_OPTIONS= debug cups
 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mdebug)
 CONFIGURE_ARGS+=       --enable-debug=yes
 .endif
+
+.if !empty(PKG_OPTIONS:Mcups)
+.include "../../print/cups/buildlink3.mk"
+.endif


--- Makefile.orig       2006-11-06 12:18:39.000000000 +0100
+++ Makefile    2006-11-17 13:34:42.000000000 +0100
@@ -66,6 +66,13 @@
 
 .include "../../mk/compiler.mk"
 
+.if ${PKG_OPTIONS.gtk2:Mcups} == "cups"
+CONFIGURE_ENV+=                ENABLE_CUPS=yes
+PLIST_SUBST+=          CUPS=
+.else
+PLIST_SUBST+=          CUPS='@comment '
+.endif
+
 .if ${OPSYS} == "IRIX" && !empty(CC_VERSION:Mgcc*)
 USE_TOOLS+=            gawk
 .endif


--- PLIST.orig  2006-09-15 21:01:11.000000000 +0200
+++ PLIST       2006-11-17 13:33:42.000000000 +0100
@@ -275,6 +275,7 @@
 lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.la
 lib/gtk-2.0/2.10.0/printbackends/libprintbackend-file.la
 lib/gtk-2.0/2.10.0/printbackends/libprintbackend-lpr.la
+${CUPS}lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.la
 lib/gtk-2.0/include/gdkconfig.h
 lib/libgdk-x11-2.0.la
 lib/libgdk_pixbuf-2.0.la


--- patch-ai.orig       2006-09-24 20:19:37.000000000 +0200
+++ patch-ai    2006-11-17 13:26:20.000000000 +0100
@@ -1,12 +1,12 @@
-$NetBSD: patch-ai,v 1.17 2006/09/22 21:27:11 tron Exp $
-
---- configure.orig     2006-09-05 04:40:15.000000000 +0200
-+++ configure
-@@ -32042,6 +32042,7 @@ _ACEOF
+--- configure.orig     2006-10-03 18:55:29.000000000 +0200
++++ configure  2006-11-17 13:25:34.000000000 +0100
+@@ -31026,6 +31026,9 @@
  fi
  
  
-+CUPS_CONFIG=no
++if test "x$ENABLE_CUPS"  != "xyes"; then
++  CUPS_CONFIG=no
++fi
  if test "x$CUPS_CONFIG" != "xno"; then
    HAVE_CUPS_TRUE=
    HAVE_CUPS_FALSE='#'