- updated to 3.2.3

- cups-auth patch applied upstream

Changed files:
    gtk+3-cups-auth.patch -> 1.2
    gtk+3.spec -> 1.48

diff --git a/gtk+3-cups-auth.patch b/gtk+3-cups-auth.patch
deleted file mode 100644 (file)
index f0f2e38..0000000
--- a/gtk+3-cups-auth.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff -ur gtk+-3.2.2/modules/printbackends/cups.orig/gtkcupsutils.c gtk+-3.2.2/modules/printbackends/cups/gtkcupsutils.c
---- gtk+-3.2.2/modules/printbackends/cups.orig/gtkcupsutils.c  2011-11-07 19:47:37.000000000 +0100
-+++ gtk+-3.2.2/modules/printbackends/cups/gtkcupsutils.c       2011-11-23 11:50:56.413671604 +0100
-@@ -265,6 +265,10 @@
-       else if (request->type == GTK_CUPS_GET)
-         get_states[request->state] (request);
- 
-+      if (gtk_cups_result_is_error (request->result)) {
-+          request->state = GTK_CUPS_REQUEST_DONE;
-+      }
-+
-       if (request->attempts > _GTK_CUPS_MAX_ATTEMPTS &&
-           request->state != GTK_CUPS_REQUEST_DONE)
-         {
-@@ -918,8 +922,8 @@
-  * The callback sets cups_password to NULL to signal that the 
-  * password has been used.
-  */
--static char *cups_password;
--static char *cups_username;
-+static char *cups_password = NULL;
-+static char *cups_username = NULL;
- 
- static const char *
- passwordCB (const char *prompt)
-@@ -955,6 +959,7 @@
- 
-       if (request->password_state == GTK_CUPS_PASSWORD_APPLIED)
-         {
-+          request->poll_state = GTK_CUPS_HTTP_IDLE;
-           request->password_state = GTK_CUPS_PASSWORD_NOT_VALID;
-           request->state = GTK_CUPS_POST_AUTH;
-           request->need_password = TRUE;
-@@ -972,7 +976,6 @@
-         {
-           if (request->password_state == GTK_CUPS_PASSWORD_NONE)
-             {
--              cups_password = g_strdup ("");
-               cups_username = request->username;
-               cupsSetPasswordCB (passwordCB);
- 
-@@ -984,6 +987,7 @@
-                   /* move to AUTH state to let the backend 
-                    * ask for a password
-                    */ 
-+                  request->poll_state = GTK_CUPS_HTTP_IDLE;
-                   request->state = GTK_CUPS_POST_AUTH;
-                   request->need_password = TRUE;
- 
-@@ -1247,6 +1287,7 @@
- 
-       if (request->password_state == GTK_CUPS_PASSWORD_APPLIED)
-         {
-+          request->poll_state = GTK_CUPS_HTTP_IDLE;
-           request->password_state = GTK_CUPS_PASSWORD_NOT_VALID;
-           request->state = GTK_CUPS_GET_AUTH;
-           request->need_password = TRUE;
-@@ -1264,7 +1311,6 @@
-         {
-           if (request->password_state == GTK_CUPS_PASSWORD_NONE)
-             {
--              cups_password = g_strdup ("");
-               cups_username = request->username;
-               cupsSetPasswordCB (passwordCB);
- 
-@@ -1284,6 +1331,7 @@
-                   /* move to AUTH state to let the backend
-                    * ask for a password
-                    */
-+                  request->poll_state = GTK_CUPS_HTTP_IDLE;
-                   request->state = GTK_CUPS_GET_AUTH;
-                   request->need_password = TRUE;
- 
-@@ -1324,7 +1385,7 @@
-           return;
-         }
- 
--      request->state = GTK_CUPS_GET_SEND;
-+      request->state = GTK_CUPS_GET_CONNECT;
-       request->last_status = HTTP_CONTINUE;
- 
-      return;

diff --git a/gtk+3.spec b/gtk+3.spec
index 33487d0ddb5157faa2dcb1f74302f8d5c1856620..cbcc0a254e7d1744979beded4995b0e8e507cf09 100644 (file)
--- a/gtk+3.spec
+++ b/gtk+3.spec
@@ -14,13 +14,12 @@ Summary(it.UTF-8):  Il toolkit per GIMP
 Summary(pl.UTF-8):     GIMP Toolkit
 Summary(tr.UTF-8):     GIMP ToolKit arayüz kitaplığı
 Name:          gtk+3
-Version:       3.2.2
-Release:       2
+Version:       3.2.3
+Release:       1
 License:       LGPL v2+
 Group:         X11/Libraries
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/gtk+/3.2/gtk+-%{version}.tar.xz
-# Source0-md5: 447e4f452eff459b81c1591a0adfd791
-Patch0:                %{name}-cups-auth.patch
+# Source0-md5: b4edcc69e39159dd7be17828249afb46
 URL:           http://www.gtk.org/
 BuildRequires: atk-devel >= 1:2.1.5
 BuildRequires: autoconf >= 2.62
@@ -226,7 +225,6 @@ Moduł GTK+ do drukowania przez CUPS.
 
 %prep
 %setup -q -n gtk+-%{version}
-%patch0 -p1
 
 # for packaging clean examples
 # TODO: add am patch to do it like demos/gtk-demo via some configurable dir