Add missing patches, reported by tetromino

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

4 files changed, 103 insertions, 1 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index 3e89c07fd32f..b44c97f3aa9c 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-control-center
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.88 2011/08/18 06:22:02 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.89 2011/08/18 16:31:09 nirbheek Exp $
+
+  18 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +files/gnome-control-center-3.0.2-cups-ppd.h.patch,
+  +files/gnome-control-center-3.0.2-delete-users-32-bit.patch,
+  +files/gnome-control-center-3.0.2-https-handler.patch:
+  Add missing patches, reported by tetromino
 
 *gnome-control-center-3.0.2-r2 (18 Aug 2011)
 
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-cups-ppd.h.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-cups-ppd.h.patch
new file mode 100644
index 000000000000..ce2a75dc1366
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-cups-ppd.h.patch
@@ -0,0 +1,46 @@
+From 246dfbcca4906db9c2ef01990ad482270324309e Mon Sep 17 00:00:00 2001
+From: Marek Kasik <mkasik@redhat.com>
+Date: Mon, 20 Jun 2011 15:04:25 +0000
+Subject: Printers: Include cups/ppd.h explicitly
+
+cups/ppd.h is not included by cups/cups.h since CUPS 1.5.
+---
+diff --git a/configure.ac b/configure.ac
+index b26fb7c..b7e6259 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -145,7 +145,7 @@ if test x"$enable_cups" != x"no" ; then
+   CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 1`
+   CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 2`
+ 
+-  AC_CHECK_HEADERS([cups/cups.h cups/http.h cups/ipp.h],,
++  AC_CHECK_HEADERS([cups/cups.h cups/http.h cups/ipp.h cups/ppd.h],,
+                    AC_MSG_ERROR([CUPS headers not found but CUPS support requested]))
+ 
+   if ! test $CUPS_API_MAJOR -gt 1 -o \
+diff --git a/panels/printers/pp-new-printer-dialog.c b/panels/printers/pp-new-printer-dialog.c
+index 0b9ece9..69372c2 100644
+--- a/panels/printers/pp-new-printer-dialog.c
++++ b/panels/printers/pp-new-printer-dialog.c
+@@ -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"
+diff --git a/panels/printers/pp-utils.c b/panels/printers/pp-utils.c
+index 8dbe04f..cb7c29f 100644
+--- a/panels/printers/pp-utils.c
++++ b/panels/printers/pp-utils.c
+@@ -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"
+--
+cgit v0.9
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-delete-users-32-bit.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-delete-users-32-bit.patch
new file mode 100644
index 000000000000..d773408a3160
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-delete-users-32-bit.patch
@@ -0,0 +1,22 @@
+From 6ee7b75e0f87bc39baa262b270c73f7de699c406 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Sat, 11 Jun 2011 11:40:39 +0000
+Subject: user-accounts: Fix deleting users on 32-bit systems
+
+https://bugzilla.gnome.org/show_bug.cgi?id=652073
+---
+diff --git a/panels/user-accounts/um-user-manager.c b/panels/user-accounts/um-user-manager.c
+index 6bf8b42..442809a 100644
+--- a/panels/user-accounts/um-user-manager.c
++++ b/panels/user-accounts/um-user-manager.c
+@@ -577,7 +577,7 @@ um_user_manager_delete_user (UmUserManager       *manager,
+                                  delete_user_done,
+                                  data,
+                                  async_user_op_data_free,
+-                                 G_TYPE_INT64, um_user_get_uid (user),
++                                 G_TYPE_INT64, (gint64) um_user_get_uid (user),
+                                  G_TYPE_BOOLEAN, remove_files,
+                                  G_TYPE_INVALID);
+ }
+--
+cgit v0.9
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-https-handler.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-https-handler.patch
new file mode 100644
index 000000000000..45e3e5035129
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-https-handler.patch
@@ -0,0 +1,28 @@
+From 6a6a8583803464d4b56870c7faf4db035b97e12d Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Thu, 23 Jun 2011 00:05:34 -0400
+Subject: [PATCH] Fix https scheme handler app setting (bug #653211)
+
+default_app_changed() contains a typo: we need to set the https
+handler app when the user changes the http app chooser, not the
+(non-existent) https app chooser.
+---
+ panels/info/cc-info-panel.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/panels/info/cc-info-panel.c b/panels/info/cc-info-panel.c
+index 2283896..f4dba1b 100644
+--- a/panels/info/cc-info-panel.c
++++ b/panels/info/cc-info-panel.c
+@@ -922,7 +922,7 @@ default_app_changed (GtkAppChooserButton *button,
+     }
+ 
+   /* Set https support for the browser as well */
+-  if (g_str_equal (content_type, "x-scheme-handler/https"))
++  if (g_str_equal (content_type, "x-scheme-handler/http"))
+     {
+       if (g_app_info_set_as_default_for_type (info, "x-scheme-handler/https", &error) == FALSE)
+         {
+-- 
+1.7.5.3
+