rpms/pygobject2/devel pygobject-gio-load-contents.patch, 1.1, 1.2 pygobject2.spec, 1.42, 1.43

Bastien Nocera hadess at fedoraproject.org
Tue Oct 21 18:31:11 UTC 2008


Author: hadess

Update of /cvs/pkgs/rpms/pygobject2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10973

Modified Files:
	pygobject-gio-load-contents.patch pygobject2.spec 
Log Message:
* Tue Oct 21 2008 - Bastien Nocera <bnocera at redhat.com> - 2.15.4-3.fc10
- Add patch to fix typos breaking compilation


pygobject-gio-load-contents.patch:

Index: pygobject-gio-load-contents.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/pygobject-gio-load-contents.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pygobject-gio-load-contents.patch	21 Oct 2008 18:20:35 -0000	1.1
+++ pygobject-gio-load-contents.patch	21 Oct 2008 18:30:41 -0000	1.2
@@ -20,3 +20,41 @@
      else {
          Py_INCREF(Py_None);
          return Py_None;
+--- gio/gfile.override	2008/09/07 01:05:15	965
++++ gio/gfile.override	2008/09/07 14:46:42	966
+@@ -176,7 +176,7 @@
+     GCancellable *cancellable;
+     PyGObject *pycancellable = NULL;
+     gchar *contents, *etag_out;
+-    gsize lenght;
++    gsize length;
+     GError *error = NULL;
+     gboolean ret;
+ 
+@@ -190,7 +190,7 @@
+ 	return NULL;
+ 
+     ret = g_file_load_contents(G_FILE(self->obj), cancellable,
+-                               &contents, &lenght, &etag_out, &error);
++                               &contents, &length, &etag_out, &error);
+ 
+     if (pyg_error_check(&error))
+         return NULL;
+@@ -251,7 +251,7 @@
+     static char *kwlist[] = { "res", NULL };
+     PyGObject *res;
+     gchar *contents, *etag_out;
+-    gsize lenght;
++    gsize length;
+     GError *error = NULL;
+     gboolean ret;
+ 
+@@ -264,7 +264,7 @@
+ 
+     ret = g_file_load_contents_finish(G_FILE(self->obj),
+                                       G_ASYNC_RESULT(res->obj), &contents,
+-                                      &lenght, &etag_out, &error);
++                                      &length, &etag_out, &error);
+ 
+     if (pyg_error_check(&error))
+         return NULL;


Index: pygobject2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/pygobject2.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- pygobject2.spec	21 Oct 2008 18:20:35 -0000	1.42
+++ pygobject2.spec	21 Oct 2008 18:30:41 -0000	1.43
@@ -8,7 +8,7 @@
 
 Name: pygobject2
 Version: 2.15.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: Development/Languages
 Summary: Python bindings for GObject
@@ -21,6 +21,7 @@
 # RH bug #544946
 Patch0: pygobject-2.15.2-threads-init.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=551059
+# http://bugzilla.gnome.org/show_bug.cgi?id=551212
 Patch1: pygobject-gio-load-contents.patch
 
 ### Build Dependencies ###
@@ -119,6 +120,9 @@
 %{_datadir}/pygobject/xsl
 
 %changelog
+* Tue Oct 21 2008 - Bastien Nocera <bnocera at redhat.com> - 2.15.4-3.fc10
+- Add patch to fix typos breaking compilation
+
 * Tue Oct 21 2008 - Bastien Nocera <bnocera at redhat.com> - 2.15.4-2.fc10
 - Add 2-liner fixing the load_contents functions not working appropriately
 




More information about the scm-commits mailing list