diff --git a/0001-introspection-add-annotations-for-g_file_load_conten.patch b/0001-introspection-add-annotations-for-g_file_load_conten.patch new file mode 100644 index 0000000..bfd2185 --- /dev/null +++ b/0001-introspection-add-annotations-for-g_file_load_conten.patch @@ -0,0 +1,62 @@ +From 3ce857f9a489ef3dbfda685623aaea108e53c89a Mon Sep 17 00:00:00 2001 +From: Jonathan Matthew +Date: Sun, 27 Mar 2011 10:44:31 +1000 +Subject: [PATCH] introspection: add annotations for g_file_load_contents and friends + +https://bugzilla.gnome.org/show_bug.cgi?id=645789 +--- + gio/gfile.c | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/gio/gfile.c b/gio/gfile.c +index da3477b..4cecc8a 100644 +--- a/gio/gfile.c ++++ b/gio/gfile.c +@@ -6124,7 +6124,7 @@ g_file_query_default_handler (GFile *file, + * g_file_load_contents: + * @file: input #GFile. + * @cancellable: optional #GCancellable object, %NULL to ignore. +- * @contents: (out) (transfer full): a location to place the contents of the file. ++ * @contents: (out) (transfer full) (element-type guint8) (array length=length): a location to place the contents of the file. + * @length: (out) (allow-none): a location to place the length of the contents of the file, + * or %NULL if the length is not needed + * @etag_out: (out) (allow-none): a location to place the current entity tag for the file, +@@ -6431,7 +6431,7 @@ g_file_load_partial_contents_async (GFile *file, + * g_file_load_partial_contents_finish: + * @file: input #GFile. + * @res: a #GAsyncResult. +- * @contents: (out) (transfer full): a location to place the contents of the file. ++ * @contents: (out) (transfer full) (element-type guint8) (array length=length): a location to place the contents of the file. + * @length: (out) (allow-none): a location to place the length of the contents of the file, + * or %NULL if the length is not needed + * @etag_out: (out) (allow-none): a location to place the current entity tag for the file, +@@ -6537,7 +6537,7 @@ g_file_load_contents_async (GFile *file, + * g_file_load_contents_finish: + * @file: input #GFile. + * @res: a #GAsyncResult. +- * @contents: (out) (transfer full): a location to place the contents of the file. ++ * @contents: (out) (transfer full) (element-type guint8) (array length=length): a location to place the contents of the file. + * @length: (out) (allow-none): a location to place the length of the contents of the file, + * or %NULL if the length is not needed + * @etag_out: (out) (allow-none): a location to place the current entity tag for the file, +@@ -6572,7 +6572,7 @@ g_file_load_contents_finish (GFile *file, + /** + * g_file_replace_contents: + * @file: input #GFile. +- * @contents: a string containing the new contents for @file. ++ * @contents: (element-type guint8) (array length=length): a string containing the new contents for @file. + * @length: the length of @contents in bytes. + * @etag: (allow-none): the old entity tag + * for the document, or %NULL +@@ -6785,7 +6785,7 @@ replace_contents_open_callback (GObject *obj, + /** + * g_file_replace_contents_async: + * @file: input #GFile. +- * @contents: string of contents to replace the file with. ++ * @contents: (element-type guint8) (array length=length): string of contents to replace the file with. + * @length: the length of @contents in bytes. + * @etag: (allow-none): a new entity tag for the @file, or %NULL + * @make_backup: %TRUE if a backup should be created. +-- +1.7.4.2 + diff --git a/glib2.spec b/glib2.spec index 35f3744..94c061f 100644 --- a/glib2.spec +++ b/glib2.spec @@ -11,6 +11,9 @@ URL: http://www.gtk.org Source: http://download.gnome.org/sources/glib/2.28/glib-%{version}.tar.bz2 Source2: glib2.sh Source3: glib2.csh + +# upstream fix +Patch0: 0001-introspection-add-annotations-for-g_file_load_conten.patch BuildRequires: pkgconfig BuildRequires: gamin-devel BuildRequires: gettext @@ -56,7 +59,7 @@ The glib2-static package includes static libraries of the GLib library. %prep %setup -q -n glib-%{version} - +%patch0 -p1 -b .annotations %build # Support builds of both git snapshots and tarballs packed with autogoo @@ -160,6 +163,9 @@ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules %changelog +* Tue Mar 29 2011 Matthias Clasen - 2.28.4-2 +- Fix some introspection annotations + * Mon Mar 21 2011 Matthias Clasen - 2.28.4-1 - Update to 2.28.4