From 4c5989e186bb027a4011d922b201fd2df718adde Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Mon, 12 Sep 2011 17:24:56 +0000
Subject: [PATCH] Fix build with cups >=1.5.0.

---
 ...ch-panels_printers_pp-new-printer-dialog_c | 20 ++++++++++++++-----
 .../patches/patch-panels_printers_pp-utils_c  | 14 +++++++++++++
 2 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 x11/gnome/controlcenter/patches/patch-panels_printers_pp-utils_c

diff --git a/x11/gnome/controlcenter/patches/patch-panels_printers_pp-new-printer-dialog_c b/x11/gnome/controlcenter/patches/patch-panels_printers_pp-new-printer-dialog_c
index c5730427a3d..fb53ec0e79c 100644
--- a/x11/gnome/controlcenter/patches/patch-panels_printers_pp-new-printer-dialog_c
+++ b/x11/gnome/controlcenter/patches/patch-panels_printers_pp-new-printer-dialog_c
@@ -1,10 +1,20 @@
-$OpenBSD: patch-panels_printers_pp-new-printer-dialog_c,v 1.1.1.1 2011/09/12 07:29:32 ajacoutot Exp $
+$OpenBSD: patch-panels_printers_pp-new-printer-dialog_c,v 1.2 2011/09/12 17:24:56 ajacoutot Exp $
+
+Fix build with cups >=1.5.0.
 
 No PackageKit on OpenBSD.
 
 --- panels/printers/pp-new-printer-dialog.c.orig	Mon May  9 12:31:40 2011
-+++ panels/printers/pp-new-printer-dialog.c	Wed Jun  1 12:58:26 2011
-@@ -971,6 +971,7 @@ new_printer_add_button_cb (GtkButton *button,
++++ panels/printers/pp-new-printer-dialog.c	Mon Sep 12 19:12:04 2011
+@@ -31,6 +31,7 @@
+ #include <gtk/gtk.h>
+ 
+ #include <cups/cups.h>
++#include <cups/ppd.h>
+ 
+ #include "pp-new-printer-dialog.h"
+ #include "pp-utils.h"
+@@ -971,6 +972,7 @@ new_printer_add_button_cb (GtkButton *button,
                             pp->devices[device_id].device_uri,
                             pp->devices[device_id].device_location);
  
@@ -12,7 +22,7 @@ No PackageKit on OpenBSD.
            if (ppd_name == NULL || ppd_name->ppd_match_level < PPD_EXACT_MATCH)
              {
                /* Try PackageKit to install printer driver */
-@@ -1028,6 +1029,7 @@ new_printer_add_button_cb (GtkButton *button,
+@@ -1028,6 +1030,7 @@ new_printer_add_button_cb (GtkButton *button,
                    g_free (device_ids);
                  }
              }
@@ -20,7 +30,7 @@ No PackageKit on OpenBSD.
  
            /* Add the new printer */
            if (ppd_name && ppd_name->ppd_name)
-@@ -1154,8 +1156,10 @@ new_printer_add_button_cb (GtkButton *button,
+@@ -1154,8 +1157,10 @@ new_printer_add_button_cb (GtkButton *button,
  
  
                /* Set default PaperSize according to the locale */
diff --git a/x11/gnome/controlcenter/patches/patch-panels_printers_pp-utils_c b/x11/gnome/controlcenter/patches/patch-panels_printers_pp-utils_c
new file mode 100644
index 00000000000..38045361480
--- /dev/null
+++ b/x11/gnome/controlcenter/patches/patch-panels_printers_pp-utils_c
@@ -0,0 +1,14 @@
+$OpenBSD: patch-panels_printers_pp-utils_c,v 1.1 2011/09/12 17:24:56 ajacoutot Exp $
+
+Fix build with cups >=1.5.0.
+
+--- panels/printers/pp-utils.c.orig	Mon Sep 12 19:07:08 2011
++++ panels/printers/pp-utils.c	Mon Sep 12 19:07:33 2011
+@@ -25,6 +25,7 @@
+ #include <glib/gstdio.h>
+ #include <gtk/gtk.h>
+ #include <cups/cups.h>
++#include <cups/ppd.h>
+ #include <dbus/dbus-glib.h>
+ 
+ #include "pp-utils.h"