Add missing patches, reported by tetromino

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

5 files changed, 120 insertions, 15 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/Manifest b/gnome-base/gnome-control-center/Manifest
index a84edb579d97..cf171cc77286 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -6,27 +6,30 @@ AUX gnome-control-center-2.32.1-erase-background.patch 1899 RMD160 3407e35a16bf8
 AUX gnome-control-center-2.32.1-mime-handler.patch 55290 RMD160 0001d36b7409ece4ab0b0f1ecf3f762863028c9a SHA1 9b17ebe472aabb69c768618cada7bfbd10cbe910 SHA256 49c034e437493f1639e97b31e0a38b1921536abfe31d8b3c7917d0b8495994cd
 AUX gnome-control-center-2.32.1-mime-handler2.patch 2229 RMD160 b8afdaa2b5df38ca6ba31f925bcbbb1b54f04d0e SHA1 6af85fb5fe55a8e05948338f66d79f10ca787e3e SHA256 3a49a66bb08cbcd24cf750894d156ba85686128e83561df40f8cfe88075ca99d
 AUX gnome-control-center-2.32.1-mime-handler3.patch 11957 RMD160 16e734ec1dfecc1e95cfc9ffcfe3b8cd294ee712 SHA1 b069adce19b7286e410beae4b9909ecc13485d2e SHA256 8637fdb6039d43d085cf7cf2915b46e744522b7a3976d1b64035a6be22491538
+AUX gnome-control-center-3.0.2-cups-ppd.h.patch 1534 RMD160 51b9b65a4c36beb67ece15a736a5e69abe363580 SHA1 73b7402688092c299f2f85d99ac61e344ba5a19a SHA256 ac21082f23ea4d11337e162d4b4eb410d5dbd01ca2e2e3bb82c2470c00434cad
+AUX gnome-control-center-3.0.2-delete-users-32-bit.patch 993 RMD160 4de0c576ccbf5fda4bc8508ec123816c0a9df361 SHA1 c3a24ea90fc5468777b0bc782784dbb788286f5a SHA256 1afb8d93ff9d3da24618e1da56cb36b67a3c0eb79e71bedb816f17619e3eca5c
+AUX gnome-control-center-3.0.2-https-handler.patch 1031 RMD160 0d8d7d3b00dda710e81661b89b31b14a3410e09a SHA1 e4bf47f8f3a8e49dda71bc112ac07fa22bd2f5bc SHA256 6a4a94c45e4160ef7ffd4745b653e8252a9209378edb4968923e6d22f8d12af3
 AUX org.gnome.control-center.defaultbackground.policy 836 RMD160 0e830941e4e03bd0c84ec6a352ed5df598f2ccb5 SHA1 c70e2db5e125e1236b0e796c3d9e293ecb3b58a7 SHA256 4fb135d55626e03a2b02b6c325e0fa3ee773984af2258acb3e2f1b22373dce52
 DIST gnome-control-center-2.32.1.tar.bz2 2280217 RMD160 47515f3f96d5695b457a8363bac183fb2188a256 SHA1 1e5ba3117aba7f939de25dbed13e430b90968561 SHA256 7c568b57358e5c08f4d8dd76dbac7df2539135ad081872b60514b7a8ac797e66
 DIST gnome-control-center-3.0.2.tar.bz2 4567179 RMD160 e1903c84d7f6a6662a6386e7110773ba789f634b SHA1 c0d5d203e25bc1829e25780b125efb3d9a4e741f SHA256 477b09a060a75e3664bd9cc9aac6b780067e50198217e3e11dc64980e3414896
 EBUILD gnome-control-center-2.32.1-r1.ebuild 2693 RMD160 c3151bef6177468e0ae577777e19d44c78321a38 SHA1 f7803e1b1dcd73bf481c2e14c1313cc717c592a1 SHA256 1153905bad1a7d5987d74f59dd134d49c2e787699f9b3267af63fe2b9c9b773f
 EBUILD gnome-control-center-3.0.2-r2.ebuild 3140 RMD160 c28823a5ef2095a04a3dd2ab9a324c1cb4dbfb69 SHA1 dbc71cd95a2a4675f4848083e78561b8c90a9147 SHA256 3d7e355cbaceaab28857b273d8ac6011316fb5799665135414d74358a52bcd99
-MISC ChangeLog 52809 RMD160 92c1889d8352387f88b748a2d77fc277cbf4f25c SHA1 8bbe08202ba7e62faa977fe3218c7c1d5f6fcfd4 SHA256 022c3519d9d0ee96ecbc938cdab1dbcb3011588833e2f8b125c4351a2b5998bd
+MISC ChangeLog 53083 RMD160 4bb89c176332141f4e04bad49f4f878a403a1699 SHA1 a229f47f96111c72c19849102aa07a768eaa6032 SHA256 d43ba494bdef6bae4597a26b0a2ad2bde9fc56c711fa0fa2f1e61ee97706490c
 MISC metadata.xml 432 RMD160 ca0967b543d638817a2516a6104e792afa87539e SHA1 1f62656bbef63f5a89f78ac2c264bc6569441b81 SHA256 c39726081beb40c71a16163367bc95daf005268814a4eb0182563821176e5f76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOTK+PAAoJEO/kOhxWD91k+ksP/RNwgkLAKhbcHE0UXsHTjbqo
-atTB6kW4HYEcs8UjPKUSYbxLYbUUaCOiCxWdxbM9cv76Iq01CquV8VxZAXnRqIMp
-bOzic+XEdCHgKl1CyQmUW8aWbSrOsPwgvGaFGjWw65OJYcLTPN4CMlLWaHIVIhYM
-0ThVTggeZ4bnhtpZHlIIRwB0xzg0FZ5PkpKcNb54kns5nd1Bk8FCsgSm1JGyTZIX
-XMg04fKzirj82kcNTdRcWgTSbrepgVjfVlr4cSm2i8AZAnbg5eULz1t6cEXIJU/B
-biDgk2j3T+h1qFqCqzI9H9TJdx+KVFd5cfTHIw1h2OV3MetAsnShozNYiPjxk+hb
-nDvE5gYFNJHrUwBGbZQMd8E41o30wYOS7Ehl7bD+uk65aTtIDBcjB1o8GEGEmH72
-j4sl4Vp8IGGmMfXwjrUvFYP4XQFQ22NAzZ/ykKDOyTIs3w2KSPf4bdZlVgsLMvO+
-m9gYYya/sBgF1g3M4dKgKtVj/6DsWq+chBKXB+WHaKD5PY/FffigVrpTOQJKkN70
-jWluuns5p+6hiBV2XbnUzjLp+l6bsOabh5D9yRe94BkV7iGt94x2JyfJLPM8peUT
-GIyrED48p+jpFJ42kSj6MQ+t2d4/+ZwUrm0DXtFW+My5jEADmHQbXdLx7cVSxyT/
-00eHadDc6o+OpZaShkk/
-=mLgg
+iQIcBAEBAgAGBQJOTT5TAAoJEO/kOhxWD91kyFUP/iqwEZ5b/BvxyIKzZMPhYjIS
+57zHRuKZV/06e9Ox+3J/vo4Mz2ZP/YQG8uUSzCKBITOgHFr2XD/Gsizwc27IITFO
+0UZnSQVdbYd7HnE/LIJHOsUe7d+uN+OarltvHYr6e0OPm4HwWX4eBuberv0vvnu5
+BFsmUpSR9R8pCMAL/yTl1YVjpdxmHhQMx7VmN4MvbAf/99AqE+NeNLoInHqV3cbY
+LTv4M6tiMy0ZZmyIxcpHI16m3LNXNJSfiX7UvgYxzkPmDfuC8XVQ4o56lw/PraRq
+BicV06ZM2ojBQqVuevFAKHMo5oDIfVHbqo8KgQ3a/tMbVFuCMBDXkLby3Taad466
+X4KayM6vW1RC2sbuWSUw8XUjFpLVgYrnj2ixMyw8UiZruEharv9ScILwS7GJ9a0H
+KDAEFxVd1hjGwl0LSmgRAeIclYaIGuFn5ALhcqd10wxuYlc+Poh28IfgRGNBZCJM
+u8ENKYT2bkGkA0+RjUfWBx3HNLtII9fzHB9Bu3Bu5gk4sIpOGbu3Ta0aAah2q7Df
+q1Ni+uy0AWPEIv+A+x82xvT7s2e7RHCdUOWkiEIB52gx5TjsjlEWQUcttU2fGSiL
+/dqaFraPP/5qBqzxZY/A2xPRMFU6RyhUZlW1ZJKkgJ1AEs4hPYb4H1tZ5sH+j0SD
+HC4IdqLgTJFcNFCkFr3t
+=/5iL
 -----END PGP SIGNATURE-----
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
+