From 5f79824ad8c41866133f7797b158e8a9e9efc986 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 19 2015 15:37:47 +0000 Subject: import glib2-2.42.2-5.el7 --- diff --git a/.gitignore b/.gitignore index b664cd7..09403eb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/glib-2.40.0.tar.xz +SOURCES/glib-2.42.2.tar.xz diff --git a/.glib2.metadata b/.glib2.metadata index 0aefa1d..822f28b 100644 --- a/.glib2.metadata +++ b/.glib2.metadata @@ -1 +1 @@ -44e1442ed4d1bf3fa89138965deb35afc1335a65 SOURCES/glib-2.40.0.tar.xz +87113de4096377fab1129da44f38a0da0f7f0fb4 SOURCES/glib-2.42.2.tar.xz diff --git a/SOURCES/add-back-g-memmove.patch b/SOURCES/add-back-g-memmove.patch index 499054b..f44cc16 100644 --- a/SOURCES/add-back-g-memmove.patch +++ b/SOURCES/add-back-g-memmove.patch @@ -1,49 +1,17 @@ -From f13fb775ddc9bd62c6f67ca3fab54197af8fa3e7 Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Wed, 3 Sep 2014 11:08:57 -0400 -Subject: [PATCH] configure: don't hide g_memmove and g_ATEXIT +From 9ce4aab38747c80d043de5f907c7b514e2547df7 Mon Sep 17 00:00:00 2001 +From: rpm-build +Date: Sat, 21 Mar 2015 11:18:05 -0400 +Subject: [PATCH] Add back g_memmove -While they are deprected in 2.40, they weren't -in 2.36, and we want apps that were compilable -before 7.1 to stay compiling (even if they have -wrongly have -DG_DISABLE_DEPRECATED in their build -flags. --- configure.ac | 2 -- 1 file changed, 2 deletions(-) diff --git a/configure.ac b/configure.ac -index a01e58d..8461d81 100644 +index 67a766f..cdf800a 100644 --- a/configure.ac +++ b/configure.ac -@@ -2898,64 +2898,62 @@ typedef gint64 goffset; - - #define G_GOFFSET_MODIFIER G_GINT64_MODIFIER - #define G_GOFFSET_FORMAT G_GINT64_FORMAT - #define G_GOFFSET_CONSTANT(val) G_GINT64_CONSTANT(val) - - _______EOF - - if test -z "$glib_unknown_void_p"; then - cat >>$outfile <<_______EOF - - #define GPOINTER_TO_INT(p) ((gint) ${glib_gpi_cast} (p)) - #define GPOINTER_TO_UINT(p) ((guint) ${glib_gpui_cast} (p)) - - #define GINT_TO_POINTER(i) ((gpointer) ${glib_gpi_cast} (i)) - #define GUINT_TO_POINTER(u) ((gpointer) ${glib_gpui_cast} (u)) - - typedef signed $glib_intptr_type_define gintptr; - typedef unsigned $glib_intptr_type_define guintptr; - - #define G_GINTPTR_MODIFIER $gintptr_modifier - #define G_GINTPTR_FORMAT $gintptr_format - #define G_GUINTPTR_FORMAT $guintptr_format - _______EOF - else - echo '#error SIZEOF_VOID_P unknown - This should never happen' >>$outfile - fi - +@@ -2928,10 +2928,8 @@ _______EOF cat >>$outfile <<_______EOF @@ -54,33 +22,6 @@ index a01e58d..8461d81 100644 $glib_defines $glib_os $glib_static_compilation - - $glib_vacopy - - #ifdef __cplusplus - #define G_HAVE_INLINE 1 - #else /* !__cplusplus */ - $glib_inline - #endif /* !__cplusplus */ - - #ifdef __cplusplus - #define G_CAN_INLINE 1 - _______EOF - - if test x$g_can_inline = xyes ; then - cat >>$outfile <<_______EOF - #else /* !__cplusplus */ - #define G_CAN_INLINE 1 - _______EOF - fi - - cat >>$outfile <<_______EOF - #endif - - _______EOF - - if test x$g_have_iso_c_varargs = xyes ; then - cat >>$outfile <<_______EOF -- -2.0.1 +1.8.3.1 diff --git a/SOURCES/ffi-marshal-flags-like-enums.patch b/SOURCES/ffi-marshal-flags-like-enums.patch new file mode 100644 index 0000000..cde22ac --- /dev/null +++ b/SOURCES/ffi-marshal-flags-like-enums.patch @@ -0,0 +1,36 @@ +From cde19e1cf575d33f7cd34bc0b6a4daea5d91cdc5 Mon Sep 17 00:00:00 2001 +From: Ray Strode +Date: Wed, 16 Sep 2015 18:01:04 +0200 +Subject: [PATCH] ffi: Marshal flags like enums + +Flags are enums. +Fixes broken marshalling on BE 64bit architectures. + +https://bugzilla.gnome.org/show_bug.cgi?id=754882 +--- + gobject/gclosure.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/gobject/gclosure.c b/gobject/gclosure.c +index 014e40a..3c6894a 100644 +--- a/gobject/gclosure.c ++++ b/gobject/gclosure.c +@@ -1186,9 +1186,15 @@ value_to_ffi_type (const GValue *gvalue, + *value = enum_tmpval; + *tmpval_used = TRUE; + break; ++ case G_TYPE_FLAGS: ++ g_assert (enum_tmpval != NULL); ++ rettype = &ffi_type_uint; ++ *enum_tmpval = g_value_get_flags (gvalue); ++ *value = enum_tmpval; ++ *tmpval_used = TRUE; ++ break; + case G_TYPE_UCHAR: + case G_TYPE_UINT: +- case G_TYPE_FLAGS: + rettype = &ffi_type_uint; + *value = (gpointer)&(gvalue->data[0].v_uint); + break; +-- +2.4.3 \ No newline at end of file diff --git a/SOURCES/gdbus-silence-exit-on-close.patch b/SOURCES/gdbus-silence-exit-on-close.patch new file mode 100644 index 0000000..a689c5f --- /dev/null +++ b/SOURCES/gdbus-silence-exit-on-close.patch @@ -0,0 +1,48 @@ +From 66bc9660c44b71c8bff47b4f7e16a801169a9f23 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Mon, 5 Jan 2015 09:40:37 -0500 +Subject: gdbusconnection: Don't g_printerr() when exiting + +exit-on-close for a DBus connection is a completely normal thing. On +a regular GNOME login, gdm retains the X server, but terminates the +session login bus and associated helpers like gnome-settings-dameon, +the a11y tools, etc. + +I've seen several downstream reports of confusion as to what these +apparent error messages mean in the system log. It doesn't help +that they're so obtuse. + +We're also printing them to stderr, when this is not an error. + +The reason this was introduced is presumably some people were confused +as to why their process exited when the system bus did. But the +solution for that I believe is documentation, not printing stuff to +everyone's system log in normal operation. + +https://bugzilla.gnome.org/show_bug.cgi?id=742386 + +diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c +index 7b71bd0..9824ad9 100644 +--- a/gio/gdbusconnection.c ++++ b/gio/gdbusconnection.c +@@ -804,17 +804,6 @@ g_dbus_connection_real_closed (GDBusConnection *connection, + (flags & FLAG_INITIALIZED) != 0 && + connection->initialization_error == NULL) + { +- if (error != NULL) +- { +- g_printerr ("%s: Remote peer vanished with error: %s (%s, %d). Exiting.\n", +- G_STRFUNC, +- error->message, +- g_quark_to_string (error->domain), error->code); +- } +- else +- { +- g_printerr ("%s: Remote peer vanished. Exiting.\n", G_STRFUNC); +- } + raise (SIGTERM); + } + } +-- +cgit v0.10.2 + diff --git a/SOURCES/revert-g-source-remove-critical.patch b/SOURCES/revert-g-source-remove-critical.patch index 37b42e3..af3932e 100644 --- a/SOURCES/revert-g-source-remove-critical.patch +++ b/SOURCES/revert-g-source-remove-critical.patch @@ -1,79 +1,17 @@ -From c2ff9875185b49cae573c72dbbf419dbb2c4aaca Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Wed, 3 Sep 2014 10:36:14 -0400 +From 7b125e2e70c9de222feccae4e8931f943c8ef0cc Mon Sep 17 00:00:00 2001 +From: rpm-build +Date: Sat, 21 Mar 2015 11:16:29 -0400 Subject: [PATCH] Revert "gmain: Warn when g_source_remove() fails" -This reverts commit a919be3d39150328874ff647fb2c2be7af3df996. --- - glib/gmain.c | 19 ++++++++----------- - 1 file changed, 8 insertions(+), 11 deletions(-) + glib/gmain.c | 2 -- + 1 file changed, 2 deletions(-) diff --git a/glib/gmain.c b/glib/gmain.c -index 45ed402..085fb2b 100644 +index 30fac70..c5f5218 100644 --- a/glib/gmain.c +++ b/glib/gmain.c -@@ -2137,88 +2137,85 @@ g_main_context_find_source_by_user_data (GMainContext *context, - if (context == NULL) - context = g_main_context_default (); - - LOCK_CONTEXT (context); - - g_source_iter_init (&iter, context, FALSE); - while (g_source_iter_next (&iter, &source)) - { - if (!SOURCE_DESTROYED (source) && - source->callback_funcs) - { - GSourceFunc callback; - gpointer callback_data = NULL; - - source->callback_funcs->get (source->callback_data, source, &callback, &callback_data); - - if (callback_data == user_data) - break; - } - } - g_source_iter_clear (&iter); - - UNLOCK_CONTEXT (context); - - return source; - } - - /** - * g_source_remove: - * @tag: the ID of the source to remove. -- * -- * Removes the source with the given id from the default main context. -- * -- * The id of a #GSource is given by g_source_get_id(), or will be -- * returned by the functions g_source_attach(), g_idle_add(), -- * g_idle_add_full(), g_timeout_add(), g_timeout_add_full(), -- * g_child_watch_add(), g_child_watch_add_full(), g_io_add_watch(), and -- * g_io_add_watch_full(). -+ * -+ * Removes the source with the given id from the default main context. -+ * The id of -+ * a #GSource is given by g_source_get_id(), or will be returned by the -+ * functions g_source_attach(), g_idle_add(), g_idle_add_full(), -+ * g_timeout_add(), g_timeout_add_full(), g_child_watch_add(), -+ * g_child_watch_add_full(), g_io_add_watch(), and g_io_add_watch_full(). - * - * See also g_source_destroy(). You must use g_source_destroy() for sources - * added to a non-default main context. - * - * It is a programmer error to attempt to remove a non-existent source. - * - * Returns: For historical reasons, this function always returns %TRUE - **/ - gboolean - g_source_remove (guint tag) - { - GSource *source; -- -+ - g_return_val_if_fail (tag > 0, FALSE); - +@@ -2237,8 +2237,6 @@ g_source_remove (guint tag) source = g_main_context_find_source_by_id (NULL, tag); if (source) g_source_destroy (source); @@ -82,33 +20,6 @@ index 45ed402..085fb2b 100644 return source != NULL; } - - /** - * g_source_remove_by_user_data: - * @user_data: the user_data for the callback. - * - * Removes a source from the default main loop context given the user - * data for the callback. If multiple sources exist with the same user - * data, only one will be destroyed. - * - * Returns: %TRUE if a source was found and removed. - **/ - gboolean - g_source_remove_by_user_data (gpointer user_data) - { - GSource *source; - - source = g_main_context_find_source_by_user_data (NULL, user_data); - if (source) - { - g_source_destroy (source); - return TRUE; - } - else - return FALSE; - } - - /** -- -2.0.1 +1.8.3.1 diff --git a/SPECS/glib2.spec b/SPECS/glib2.spec index a8b8078..169ed82 100644 --- a/SPECS/glib2.spec +++ b/SPECS/glib2.spec @@ -1,13 +1,14 @@ Summary: A library of handy utility functions Name: glib2 -Version: 2.40.0 -Release: 4%{?dist} +Version: 2.42.2 +Release: 5%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org #VCS: git:git://git.gnome.org/glib -Source: http://download.gnome.org/sources/glib/2.40/glib-%{version}.tar.xz +Source: http://download.gnome.org/sources/glib/2.42/glib-%{version}.tar.xz +BuildRequires: git BuildRequires: pkgconfig BuildRequires: gettext BuildRequires: libattr-devel @@ -27,6 +28,8 @@ BuildRequires: chrpath Patch0: revert-g-source-remove-critical.patch Patch1: add-back-g-memmove.patch +Patch2: gdbus-silence-exit-on-close.patch +Patch3: ffi-marshal-flags-like-enums.patch # required for GIO content-type support Requires: shared-mime-info @@ -41,8 +44,8 @@ as an event loop, threads, dynamic loading, and an object system. %package devel Summary: A library of handy utility functions Group: Development/Libraries -Requires: %{name} = %{version}-%{release} Obsoletes: glib2-static < 2.32.1-2 +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel The glib2-devel package includes the header files for the GLib library. @@ -59,16 +62,14 @@ The glib2-doc package includes documentation for the GLib library. %package fam Summary: FAM monitoring module for GIO Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} BuildRequires: gamin-devel %description fam The glib2-fam package contains the FAM (File Alteration Monitor) module for GIO. %prep -%setup -q -n glib-%{version} -%patch0 -p1 -b .revert-g-source-remove-critical -%patch1 -p1 -b .add-back-g-memmove +%autosetup -Sgit -n glib-%{version} autoreconf -i -f @@ -194,6 +195,22 @@ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules %{_libdir}/gio/modules/libgiofam.so %changelog +* Tue Sep 29 2015 Colin Walters - 2.42.2-5 +- Add patch to fix FFI marshaling on BE architectures +- Resolves: #1260577 + +* Thu Aug 06 2015 Colin Walters - 2.42.2-4 +- Add patch to silence gdbus exit-on-disconnect; Resolves #1177076 + +* Thu Jul 02 2015 Colin Walters - 2.42.2-3 +- rebuilt; Resolves #1238463 + +* Thu Mar 19 2015 Richard Hughes - 2.42.2-2 +- Update to 2.42.2 +- [walters] Switch to autosetup -Sgit for less painful patch management +- [walters] Actually forward port patches +- Resolves: #1203755 + * Wed Sep 03 2014 Ray Strode 2.40.0-4 - Add back g_memmove define for backward compat Related: #1104372