[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, master, updated. 03289e2f4aa5d2647a53c4f7424e7e5653a5a01f

[Michael Gilbert]

The following commit has been merged in the master branch:
commit 3aed8cab5bbec8257ac378d8266d5d14da9cf8e6
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date:   Thu Aug 18 17:45:23 2011 -0400

    fix build failure due to cups 1.5

diff --git a/debian/changelog b/debian/changelog
index 7baeda6..b0b4c7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ chromium-browser (13.0.782.107~r94237-2) UNRELEASED; urgency=low
     it possible to build from source twice in a row now).
   * Bump standards version to 3.9.2.
   * Fix an obsolete character encoding in debian/copyright.
+  * Fix build failure with cups >= 1.5.0.
+  * Don't support lenny's cups anymore.
   * Clean up package short descriptions.
 
  -- Michael Gilbert <michael.s.gilbert at gmail.com>  Sun, 07 Aug 2011 02:25:23 -0400
diff --git a/debian/control b/debian/control
index 541e86d..f694cc6 100644
--- a/debian/control
+++ b/debian/control
@@ -54,7 +54,7 @@ Build-Depends: cdbs,
 	protobuf-compiler,
 	libglewmx1.5-dev,
 	libvpx-dev,
-	libcups2-dev | libcupsys2-dev,
+	libcups2-dev (>= 1.5.0),
 	libgnome-keyring-dev,
 	libgconf2-dev,
 	libspeex-dev,
diff --git a/debian/patches/cups1.5.patch b/debian/patches/cups1.5.patch
new file mode 100644
index 0000000..4f72eb5
--- /dev/null
+++ b/debian/patches/cups1.5.patch
@@ -0,0 +1,32 @@
+Description: Fix build failure due to cups 1.5 header changes
+Author: Michael Gilbert <michael.s.gilbert at gmail.com>
+--- chromium-browser-13.0.782.107~r94237.orig/src/printing/backend/cups_helper.h
++++ chromium-browser-13.0.782.107~r94237/src/printing/backend/cups_helper.h
+@@ -7,6 +7,7 @@
+ #pragma once
+ 
+ #include <cups/cups.h>
++#include <cups/ppd.h>
+ 
+ class GURL;
+ 
+--- chromium-browser-13.0.782.107~r94237.orig/src/chrome/service/cloud_print/print_system_cups.cc
++++ chromium-browser-13.0.782.107~r94237/src/chrome/service/cloud_print/print_system_cups.cc
+@@ -5,6 +5,7 @@
+ #include "chrome/service/cloud_print/print_system.h"
+ 
+ #include <cups/cups.h>
++#include <cups/ppd.h>
+ #include <dlfcn.h>
+ #include <errno.h>
+ #include <pthread.h>
+--- chromium-browser-13.0.782.107~r94237.orig/src/chrome/browser/ui/webui/print_preview_handler.cc
++++ chromium-browser-13.0.782.107~r94237/src/chrome/browser/ui/webui/print_preview_handler.cc
+@@ -37,6 +37,7 @@
+ 
+ #if defined(USE_CUPS)
+ #include <cups/cups.h>
++#include <cups/ppd.h>
+ 
+ #include "base/file_util.h"
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index b3ea9d5..f682890 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,4 @@ gcc46.patch
 #javascript-i18n.patch
 #icu.patch
 #system_v8.patch
+cups1.5.patch

-- 
Git repository for pkg-chromium