diff -Nru glib2.0-2.39.90/build/win32/vs10/glib.vcxproj glib2.0-2.39.91/build/win32/vs10/glib.vcxproj
--- glib2.0-2.39.90/build/win32/vs10/glib.vcxproj 2014-02-17 23:37:17.000000000 +0000
+++ glib2.0-2.39.91/build/win32/vs10/glib.vcxproj 2014-03-03 21:08:56.000000000 +0000
@@ -393,6 +393,7 @@
+
diff -Nru glib2.0-2.39.90/build/win32/vs10/glib.vcxproj.filters glib2.0-2.39.91/build/win32/vs10/glib.vcxproj.filters
--- glib2.0-2.39.90/build/win32/vs10/glib.vcxproj.filters 2014-02-17 23:37:17.000000000 +0000
+++ glib2.0-2.39.91/build/win32/vs10/glib.vcxproj.filters 2014-03-03 21:08:56.000000000 +0000
@@ -86,6 +86,7 @@
Source FilesSource FilesSource Files
+ Source FilesSource FilesSource FilesSource Files
diff -Nru glib2.0-2.39.90/build/win32/vs11/glib.vcxproj glib2.0-2.39.91/build/win32/vs11/glib.vcxproj
--- glib2.0-2.39.90/build/win32/vs11/glib.vcxproj 2014-02-17 23:37:21.000000000 +0000
+++ glib2.0-2.39.91/build/win32/vs11/glib.vcxproj 2014-03-03 21:09:04.000000000 +0000
@@ -393,6 +393,7 @@
+
diff -Nru glib2.0-2.39.90/build/win32/vs11/glib.vcxproj.filters glib2.0-2.39.91/build/win32/vs11/glib.vcxproj.filters
--- glib2.0-2.39.90/build/win32/vs11/glib.vcxproj.filters 2014-02-17 23:37:21.000000000 +0000
+++ glib2.0-2.39.91/build/win32/vs11/glib.vcxproj.filters 2014-03-03 21:09:04.000000000 +0000
@@ -86,6 +86,7 @@
Source FilesSource FilesSource Files
+ Source FilesSource FilesSource FilesSource Files
diff -Nru glib2.0-2.39.90/build/win32/vs9/glib.vcproj glib2.0-2.39.91/build/win32/vs9/glib.vcproj
--- glib2.0-2.39.90/build/win32/vs9/glib.vcproj 2014-02-17 23:37:17.000000000 +0000
+++ glib2.0-2.39.91/build/win32/vs9/glib.vcproj 2014-03-03 21:08:55.000000000 +0000
@@ -342,6 +342,7 @@
+
diff -Nru glib2.0-2.39.90/ChangeLog glib2.0-2.39.91/ChangeLog
--- glib2.0-2.39.90/ChangeLog 2014-02-17 23:37:36.000000000 +0000
+++ glib2.0-2.39.91/ChangeLog 2014-03-03 21:09:22.000000000 +0000
@@ -1,3 +1,870 @@
+commit de142c0c5ad9a35e704f1fc9eeeaed3684a30adb
+Author: Ryan Lortie
+AuthorDate: Sun Mar 2 22:18:14 2014 -0500
+Commit: Ryan Lortie
+CommitDate: Mon Mar 3 16:03:00 2014 -0500
+
+ GLib 2.39.91
+
+ NEWS | 33 +++++++++++++++++++++++++++++++++
+ 1 file changed, 33 insertions(+)
+
+commit 5d5ea495b5dca3965d60556300151c75a44c5653
+Author: Ryan Lortie
+AuthorDate: Sun Mar 2 09:38:51 2014 -0500
+Commit: Ryan Lortie
+CommitDate: Mon Mar 3 16:01:27 2014 -0500
+
+ desktopappinfo: add Exec to searchable keys
+
+ Add the basename from the first component of the Exec line to the
+ list of
+ strings to search for via g_desktop_app_info_search().
+
+ We treat Exec as a fairly strong match -- just below the visible name.
+
+ Add a testcase to make sure everything is working OK.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=725023
+
+ gio/gdesktopappinfo.c | 35
+ +++++++++++++++++-----
+ gio/tests/desktop-app-info.c | 9 ++++++
+ .../desktop-files/usr/applications/eog.desktop | 2 +-
+ 3 files changed, 38 insertions(+), 8 deletions(-)
+
+commit 9ecc859f95d3a2f3faf918c96ca21a447dd33b6a
+Author: Theppitak Karoonboonyanan
+AuthorDate: Mon Mar 3 17:27:09 2014 +0700
+Commit: Theppitak Karoonboonyanan
+CommitDate: Mon Mar 3 17:27:09 2014 +0700
+
+ Updated Thai translation
+
+ po/th.po | 552
+ ++++++++++++++++++++++++++++++++-------------------------------
+ 1 file changed, 282 insertions(+), 270 deletions(-)
+
+commit 79caa3a7e151897b062f82251eec207bc1514ff3
+Author: Matthias Clasen
+AuthorDate: Sun Mar 2 19:10:00 2014 -0500
+Commit: Matthias Clasen
+CommitDate: Sun Mar 2 19:10:00 2014 -0500
+
+ Add a few tests for G_MARKUP_TREAT_CDATA_AS_TEXT
+
+ Related to
+ https://bugzilla.gnome.org/show_bug.cgi?id=725433
+
+ glib/tests/Makefile.am | 9 ++++++-
+ glib/tests/markups/valid-16.cdata-as-text | 42
+ +++++++++++++++++++++++++++++++
+ glib/tests/markups/valid-16.expected | 42
+ +++++++++++++++++++++++++++++++
+ glib/tests/markups/valid-16.gmarkup | 10 ++++++++
+ glib/tests/markups/valid-8.cdata-as-text | 5 ++++
+ 5 files changed, 107 insertions(+), 1 deletion(-)
+
+commit b93a13bb796eeb30a45bcdca9a760a9ef4c47a2e
+Author: Matthias Clasen
+AuthorDate: Sun Mar 2 19:02:23 2014 -0500
+Commit: Matthias Clasen
+CommitDate: Sun Mar 2 19:03:15 2014 -0500
+
+ Add a way to test different markup parser flags
+
+ For now, we are mainly interested in G_MARKUP_TREAT_CDATA_AS_TEXT.
+ This commit makes markup-parse look for expected output files with
+ the extension .cdata-as-text in addition to .expected, and compares
+ the output of parsing with G_MARKUP_TREAT_CDATA_AS_TEXT against
+ them. markup-parse --cdata-as-text foo.gmarkup can be used to produce
+ such expected output.
+
+ glib/tests/markup-parse.c | 81
+ +++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 57 insertions(+), 24 deletions(-)
+
+commit 49cc207e35ef6b6ce7f4954a4c067ab43145f6bf
+Author: Matthias Clasen
+AuthorDate: Sun Mar 2 18:20:37 2014 -0500
+Commit: Matthias Clasen
+CommitDate: Sun Mar 2 18:23:43 2014 -0500
+
+ docs: Ditch more markup
+
+ Some markup was hiding in docs in headers. Drop it there, too.
+
+ gio/gdbusconnection.h | 56 +++++++++---------
+ gio/gioenums.h | 15 +++--
+ gio/gsettings.h | 2 +-
+ gio/gvolume.h | 13 ++---
+ glib/gbacktrace.h | 2 +-
+ glib/gmarkup.h | 4 +-
+ glib/goption.h | 157
+ +++++++++++++++++++++-----------------------------
+ glib/gspawn.h | 91 ++++++++++++++---------------
+ gobject/gsignal.h | 5 +-
+ gobject/gtype.h | 6 +-
+ gobject/gtypeplugin.h | 8 +--
+ gobject/gvalue.h | 7 +--
+ 12 files changed, 164 insertions(+), 202 deletions(-)
+
+commit ad4d81418ecdaf53950de117710be127d53169da
+Author: Piotr Drąg
+AuthorDate: Sun Mar 2 19:24:01 2014 +0100
+Commit: Piotr Drąg
+CommitDate: Sun Mar 2 19:24:01 2014 +0100
+
+ Updated Polish translation
+
+ po/pl.po | 2052
+ ++++++++++++++++++++++++++++++++++----------------------------
+ 1 file changed, 1123 insertions(+), 929 deletions(-)
+
+commit fdf14e9e6cbd2e373988d7b9e913788a58c63388
+Author: Philip Withnall
+AuthorDate: Wed Feb 19 18:03:37 2014 +0000
+Commit: Philip Withnall
+CommitDate: Mon Feb 24 16:38:08 2014 +0000
+
+ hmac: Make unit test const-correct
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=724741
+
+ glib/tests/hmac.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit 393503ba5bdc7c09cd46b716aaf3d2c63a6c7f9c
+Author: Ryan Lortie
+AuthorDate: Sat Feb 8 12:23:46 2014 +0000
+Commit: Ryan Lortie
+CommitDate: Mon Feb 24 09:28:43 2014 -0500
+
+ gmain: simplify g_main_context_find_source_by_id()
+
+ Since we now keep a hashtable of sources, we can implement this
+ function
+ without iteration.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=724839
+
+ glib/gmain.c | 27 ++++++++++-----------------
+ 1 file changed, 10 insertions(+), 17 deletions(-)
+
+commit 9e81709012f27eebe336f40f948e9493c87fc75b
+Author: Ryan Lortie
+AuthorDate: Sat Feb 8 12:17:10 2014 +0000
+Commit: Ryan Lortie
+CommitDate: Mon Feb 24 09:28:43 2014 -0500
+
+ gmain: Simplify source id tracking
+
+ Simplify our tracking of issued source id integers and fix some bugs.
+
+ Previously the source's id was remove from the 'used' table from
+ source_remove_from_context() which was also called if the source
+ priority was changed (in which case it would never be added back
+ to the
+ table). The source id could be reissued in that case.
+
+ In the new approach, we just always keep a hash table of sources, by
+ source id. This simplifies the logic and will also allow us to
+ improve
+ performance of g_main_context_find_source_by_id() which is called
+ in some
+ fairly common cases, such as g_source_remove(). These improvements
+ will be in
+ the following commits.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=724839
+
+ glib/gmain.c | 77
+ ++++++++++++++----------------------------------------------
+ 1 file changed, 18 insertions(+), 59 deletions(-)
+
+commit e7bde4acf4499d353780b696435e1a43dee66c54
+Author: Matthias Clasen
+AuthorDate: Sun Feb 23 12:03:13 2014 -0500
+Commit: Matthias Clasen
+CommitDate: Sun Feb 23 12:11:59 2014 -0500
+
+ Test content type icons more thoroughly
+
+ Check we actually get the right icon names, and check
+ that symbolic icons fall back to non-symbolic ones.
+
+ gio/tests/contenttype.c | 71
+ +++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 71 insertions(+)
+
+commit e6af432b39ac9e0123387e5a993737073dce9153
+Author: John Lindgren
+AuthorDate: Sun Feb 23 00:52:31 2014 -0500
+Commit: Matthias Clasen
+CommitDate: Sun Feb 23 12:11:59 2014 -0500
+
+ Add non-symbolic fallback icons in g_content_type_get_symbolic_icon().
+
+ This makes the behavior consistent with
+ e.g. g_volume_get_symbolic_icon().
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=724994
+
+ gio/gcontenttype.c | 44 +++++++++++++++++++-------------------------
+ 1 file changed, 19 insertions(+), 25 deletions(-)
+
+commit 356fe2cec65ad5b531ff08c78e5c24f37017bb83
+Author: Ryan Lortie
+AuthorDate: Sun Feb 23 01:11:50 2014 -0500
+Commit: Ryan Lortie
+CommitDate: Sun Feb 23 01:14:27 2014 -0500
+
+ asyncqueue: fix timeout math on 32bit systems
+
+ 88182d375e13ae6519a288d5295220c83ca27e73 caught this issue in
+ g_async_queue_timed_pop() but failed to fix the same bug in the
+ _unlocked()
+ variant.
+
+ This is only a problem on 32bit systems. On 64bit systems, the tv_sec
+ in a timeval is already 64 bits, so no overflow occurs.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=722604
+
+ glib/gasyncqueue.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+commit 4af9b8e9cb43cbcb1f889b74b85111325aab57ba
+Author: Ryan Lortie
+AuthorDate: Sun Feb 23 00:47:29 2014 -0500
+Commit: Ryan Lortie
+CommitDate: Sun Feb 23 00:47:29 2014 -0500
+
+ mappedfile test: permit ENODEV on /dev/null
+
+ mmap() on /dev/null returns ENODEV on old Linux versions and also on
+ Hurd, so accept that in the testcase.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=722360
+
+ glib/tests/mappedfile.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 4825e819b2ca59409b93f4d6f0f742d630626887
+Author: Chun-wei Fan
+AuthorDate: Thu Feb 20 08:47:54 2014 +0800
+Commit: Chun-wei Fan
+CommitDate: Sun Feb 23 11:48:06 2014 +0800
+
+ Fix build of gio/gapplication.c on Visual C++
+
+ Visual C++ is quite zealous about checking against the types used
+ in the
+ initializing of array of structures, even up to Visual C++ 2013.
+ Fix this
+ by splitting up the initializing steps.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=724609
+
+ gio/gapplication.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+commit 8da795de4f04dad35029a36c155d0b299d739840
+Author: Ryan Lortie
+AuthorDate: Thu Feb 13 17:07:07 2014 -0500
+Commit: Ryan Lortie
+CommitDate: Sat Feb 22 10:25:42 2014 -0500
+
+ gsocket: use check/prepare only on win32
+
+ There is no longer any code left in the check/prepare functions
+ on UNIX,
+ so put %NULL in the GSourceFuncs vtable.
+
+ This also allows us to simplify some logic.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=724707
+
+ gio/gsocket.c | 27 +++++++++++++--------------
+ 1 file changed, 13 insertions(+), 14 deletions(-)
+
+commit e8f26efe0d0ddf64b4be45e61917039b98de83bf
+Author: Ryan Lortie
+AuthorDate: Thu Feb 13 16:37:49 2014 -0500
+Commit: Ryan Lortie
+CommitDate: Sat Feb 22 10:25:42 2014 -0500
+
+ gsocket: use _add_unix_fd() instead of _add_poll()
+
+ Use g_source_add_unix_fd() on UNIX instead of using a GPollFD.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=724707
+
+ gio/gsocket.c | 15 +++++++++------
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+commit 04aee2d9201551810c2f9345b5b64ed7bf4e910e
+Author: Ryan Lortie
+AuthorDate: Thu Feb 13 16:59:28 2014 -0500
+Commit: Ryan Lortie
+CommitDate: Sat Feb 22 10:25:42 2014 -0500
+
+ gsocket: make use of g_source_set_ready_time()
+
+ Drop our own hand-rolled version of the same functionality.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=724707
+
+ gio/gsocket.c | 39 ++++++++++++---------------------------
+ 1 file changed, 12 insertions(+), 27 deletions(-)
+
+commit 12d65f250987f6bea25ad38acd7c26b3f47d0ab6
+Author: Ryan Lortie
+AuthorDate: Thu Feb 20 19:05:30 2014 -0500
+Commit: Ryan Lortie
+CommitDate: Sat Feb 22 10:25:06 2014 -0500
+
+ GSource: mark some API as "implementation only"
+
+ Clarify that _add_poll() _remove_poll() _add_unix_fd(),
+ _modify_unix_fd(), _remove_unix_fd(), _query_unix_fd(),
+ _set_ready_time(), _add_child_source() and _remove_child_source()
+ are only
+ intended to be used by the implementation of a particular GSource --
+ not its
+ consumers.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=724707
+
+ glib/gmain.c | 27 +++++++++++++++++++++++++++
+ 1 file changed, 27 insertions(+)
+
+commit 1f7100506a51584e66930851c5243fd2eaee5c35
+Author: Ryan Lortie
+AuthorDate: Thu Feb 13 16:58:34 2014 -0500
+Commit: Ryan Lortie
+CommitDate: Sat Feb 22 10:24:19 2014 -0500
+
+ gsocket: don't abuse GPollFD.revents field
+
+ We are reusing the GPollFD.revents field of the source to store a
+ temporary value. Use a local variable for that instead.
+
+ This is a refactor to make the next commit easier to understand.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=724707
+
+ gio/gsocket.c | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+commit ff96f88e172d504b5aef2a852880e21341809e1f
+Author: Ryan Lortie
+AuthorDate: Thu Feb 13 16:34:29 2014 -0500
+Commit: Ryan Lortie
+CommitDate: Sat Feb 22 10:24:19 2014 -0500
+
+ gsocket: use cancellable child source
+
+ Now that GCancellable's GSource is based on _set_ready_time()
+ instead of
+ an fd, we should use it as a child source, instead of forcing the
+ creation of the fd and adding it as a poll.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=724707
+
+ gio/gsocket.c | 22 +++++++---------------
+ 1 file changed, 7 insertions(+), 15 deletions(-)
+
+commit d8263dd7930fddddc4b8158e720ce0387d445af7
+Author: Ryan Lortie
+AuthorDate: Thu Feb 13 16:16:27 2014 -0500
+Commit: Ryan Lortie
+CommitDate: Sat Feb 22 10:24:19 2014 -0500
+
+ gsocket: trivial typo fix
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=724707
+
+ gio/gsocket.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 6147d15ea256ff0aabf11fb854ef07cf0e0e3a62
+Author: Ryan Lortie
+AuthorDate: Sat Feb 22 09:22:27 2014 -0500
+Commit: Ryan Lortie
+CommitDate: Sat Feb 22 10:23:40 2014 -0500
+
+ gmain: repeat preconditions for emphasis
+
+ g_main_context_acquire() mentions that you must have called it before
+ you make any calls to _prepare(), _query(), _check() or _dispatch().
+
+ For emphasis, add a note on each of those functions pointing back
+ to the
+ fact that you must have called _acquire() before using them.
+
+ glib/gmain.c | 26 +++++++++++++++++++-------
+ 1 file changed, 19 insertions(+), 7 deletions(-)
+
+commit c0aa150cb0d362224480240b2db8ff214717bdd1
+Author: Ryan Lortie
+AuthorDate: Fri Feb 21 16:25:09 2014 -0500
+Commit: Ryan Lortie
+CommitDate: Fri Feb 21 16:42:21 2014 -0500
+
+ g_main_context_wait: add a critical to detect use
+
+ Due to its unusual interface, I suspect that nobody is using
+ g_main_context_wait() but there is no way to know.
+
+ Add a critical notice that will be displayed if anyone calls the
+ function, asking them to file a bug with us.
+
+ We'll let this go out with the 2.40 release and see if we get
+ a response
+ before we proceed with actually breaking the functionality.
+
+ glib/gmain.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+commit 5103c5d643f7e7de7983619204a25c3c774478e8
+Author: Ryan Lortie
+AuthorDate: Fri Feb 21 16:40:16 2014 -0500
+Commit: Ryan Lortie
+CommitDate: Fri Feb 21 16:42:21 2014 -0500
+
+ GCond: check result of pthread_condattr_setclock()
+
+ Make sure this call succeeds, aborting if it doesn't
+
+ This will prevent people from having to waste time chasing down
+ the problems
+ that would otherwise be caused by this silent failure.
+
+ glib/gthread-posix.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+commit 03a43c290e470c67015d01237c5d81ea81a7b129
+Author: Ryan Lortie
+AuthorDate: Fri Feb 21 10:20:11 2014 -0500
+Commit: Ryan Lortie
+CommitDate: Fri Feb 21 16:42:21 2014 -0500
+
+ gmain: abort if monotonic time is unsupported
+
+ We now depend on CLOCK_MONOTONIC, but it's possible that people may
+ attempt to run GLib on systems where it isn't supported at runtime.
+
+ Check the return value of clock_gettime() and abort() if it fails in
+ order to save these people from wasting time on debugging a tricky
+ issue.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=670144
+
+ glib/gmain.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+commit 6fcaa7aa96fc4b274a4358f2cec3a4075568d343
+Author: Xavier Claessens
+AuthorDate: Fri Feb 21 15:35:36 2014 -0500
+Commit: Xavier Claessens
+CommitDate: Fri Feb 21 15:39:31 2014 -0500
+
+ GHashTable: Explicitly document that _iter_remove() is safe while
+ iterating
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=723316
+
+ glib/ghash.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+commit 59a8ae34c01a9f5e311cb3fb6bb12fbe3e0096b0
+Author: Aurimas Černius
+AuthorDate: Fri Feb 21 22:16:16 2014 +0200
+Commit: Aurimas Černius
+CommitDate: Fri Feb 21 22:16:16 2014 +0200
+
+ Updated Lithuanian translation
+
+ po/lt.po | 1750
+ +++++++++++++++++++++++++++++++-------------------------------
+ 1 file changed, 864 insertions(+), 886 deletions(-)
+
+commit 450363321db007d1c9a6c654b245e701ccc2998a
+Author: Chun-wei Fan
+AuthorDate: Fri Feb 21 17:06:56 2014 +0800
+Commit: Chun-wei Fan
+CommitDate: Fri Feb 21 23:37:31 2014 +0800
+
+ glib/Makefile.am: Dist gtranslit-data.h
+
+ This header needs to be distributed as well, which was
+ inadvertently missed.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=724858
+
+ glib/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit 73060f5e78ea5f208275f4a7cb6183636aeef1da
+Author: Ryan Lortie
+AuthorDate: Fri Feb 21 07:56:06 2014 -0500
+Commit: Ryan Lortie
+CommitDate: Fri Feb 21 07:56:26 2014 -0500
+
+ slow-motion post-release version bump
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 061793a726df038fb8c790984c81020e14feb0bb
+Author: Ryan Lortie
+AuthorDate: Thu Feb 20 18:49:37 2014 -0500
+Commit: Ryan Lortie
+CommitDate: Thu Feb 20 18:52:33 2014 -0500
+
+ gconvert: add note to avoid transliteration
+
+ Add a note to the documentation of g_convert() advising to avoid using
+ it for transliteration. Link to g_str_to_ascii().
+
+ glib/gconvert.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+commit 0415930b499fa951f1e82d38fc60461a8bd42c4b
+Author: Ryan Lortie
+AuthorDate: Thu Feb 13 10:18:03 2014 -0500
+Commit: Ryan Lortie
+CommitDate: Thu Feb 20 18:32:42 2014 -0500
+
+ gsource: document priority of child sources
+
+ Add a note to the documentation that child sources cannot have
+ their priority
+ changed independently from their parent. Add a g_return_if_fail()
+ to the
+ public API in order to enforce this.
+
+ This was already a reality due to the check in
+ g_source_set_priority_unlocked(), but it was never explicitly
+ documented.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=724706
+
+ glib/gmain.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+commit 8491f03581b6ada1d82f29064c99b604e98c7e09
+Author: Ryan Lortie
+AuthorDate: Thu Feb 20 18:32:04 2014 -0500
+Commit: Ryan Lortie
+CommitDate: Thu Feb 20 18:32:42 2014 -0500
+
+ g_str_to_ascii(): a couple of minor tweaks
+
+ Add a precondition guard and use g_string_sized_new() to avoid some
+ reallocations.
+
+ glib/gtranslit.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+commit a8ea3dc03b203e18825aa4c8473c9ab832fbeddf
+Author: Ryan Lortie
+AuthorDate: Mon Feb 17 13:15:55 2014 -0500
+Commit: Ryan Lortie
+CommitDate: Thu Feb 20 18:27:48 2014 -0500
+
+ g_str_tokenize_and_fold: do proper transliteration
+
+ g_str_tokenize_and_fold() can now do proper locale-sensitive
+ transliteration for ascii alternatives.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=710142
+
+ glib/gstrfuncs.c | 28 ++++++++++++++++------------
+ 1 file changed, 16 insertions(+), 12 deletions(-)
+
+commit d7291760df7de8cc878cb418749cb0f6afa6c69d
+Author: Ryan Lortie
+AuthorDate: Mon Feb 17 11:55:22 2014 -0500
+Commit: Ryan Lortie
+CommitDate: Thu Feb 20 18:27:24 2014 -0500
+
+ tests: test transliteration API
+
+ Add some tests for the new transliteration API.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=710142
+
+ glib/tests/strfuncs.c | 107
+ ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 107 insertions(+)
+
+commit 941b8979d07a7d9bd1a8f581ee744c0c914e12ee
+Author: Ryan Lortie
+AuthorDate: Mon Feb 17 11:54:18 2014 -0500
+Commit: Ryan Lortie
+CommitDate: Thu Feb 20 18:27:24 2014 -0500
+
+ Add locale-sensitive ASCII transliteration API
+
+ Add a new function, g_str_to_ascii() that does locale-dependent ASCII
+ transliteration of UTF-8 strings.
+
+ This function works off of an internal database. We get the data
+ out of
+ the localedata shipped with glibc, which seems to be just about
+ the best
+ source of locale-sensitive transliteration information available
+ anywhere.
+
+ We include a update script with this commit that's not used by
+ anything
+ at all -- it will just sit in git. It is intended to be run manually
+ from time to time.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=710142
+
+ docs/reference/glib/glib-sections.txt | 1 +
+ glib/Makefile.am | 1 +
+ glib/gstrfuncs.h | 4 +
+ glib/gtranslit-data.h | 12 +
+ glib/gtranslit.c | 409
+ +++++++++++++++++++++++++++++++++
+ glib/update-gtranslit.py | 410
+ ++++++++++++++++++++++++++++++++++
+ 6 files changed, 837 insertions(+)
+
+commit 436d77f70ac9aed56d1b5f223e05a29e34378444
+Author: Ryan Lortie
+AuthorDate: Tue Feb 18 19:04:24 2014 -0500
+Commit: Ryan Lortie
+CommitDate: Thu Feb 20 17:57:57 2014 -0500
+
+ tests: add a test for g_cond_wait_until()
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=673607
+
+ glib/tests/cond.c | 38 ++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 38 insertions(+)
+
+commit 1de36e775599e77f2fe47b381f0e5b1b62e93f66
+Author: Ryan Lortie
+AuthorDate: Tue Feb 18 18:50:18 2014 -0500
+Commit: Ryan Lortie
+CommitDate: Thu Feb 20 17:55:09 2014 -0500
+
+ Fix g_cond_wait_until() vs. monotonic time
+
+ We've had a relatively rocky path with g_cond_wait_until() on systems
+ that either don't support pthread_condattr_setclock() or where
+ g_get_monotonic_time() is not based on CLOCK_MONOTONIC (ie:
+ Android and
+ Mac OS).
+
+ Fortunately, both of these platforms seem to share
+ pthread_cond_timedwait_relative_np() which allows us to implement
+ g_cond_wait_until() without races.
+
+ With this patch, we now require that one of
+ pthread_condattr_setclock()
+ or pthread_cond_timedwait_relative_np() exists. A quick look around
+ suggests that this is true for all platforms that we care about.
+
+ This patch removes our use of pthread_cond_timedwait_monotonic() and
+ pthread_cond_timedwait_monotonic_np() which were Android-only APIs.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=673607
+
+ configure.ac | 17 ++++-------------
+ glib/gthread-posix.c | 45 ++++++++++++++++++++++++++++++++++-----------
+ 2 files changed, 38 insertions(+), 24 deletions(-)
+
+commit d61431254636b9ecc250884eb34757c2504e5685
+Author: Ryan Lortie
+AuthorDate: Tue Feb 18 14:09:49 2014 -0500
+Commit: Ryan Lortie
+CommitDate: Thu Feb 20 17:52:49 2014 -0500
+
+ gmain: rework g_get_monotonic_time() a bit
+
+ We now assume the existence of clock_gettime() and CLOCK_MONOTONIC as
+ specified by POSIX.1-2001. This means that we always return truly
+ monotonic time, which will prevent problems in the case that the user
+ changes the time.
+
+ Mac OS doesn't have clock_gettime() but it does have
+ mach_absolute_time(), so we can use that there.
+
+ We keep our Windows case as well (although we should simplify it
+ once XP
+ hits EOL later this year).
+
+ This patch removes the fallback to gettimeofday() in case of missing
+ clock_gettime(). We no longer have any way to test this codepath and
+ therefore it must go.
+
+ This patch also restructures the #ifdef a bit so that we repeat the
+ entire function definition inside of #ifdef instead of just the entire
+ body of one function.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=724687
+
+ configure.ac | 3 +-
+ glib/gmain.c | 164
+ +++++++++++++++++++++++++++++++----------------------------
+ 2 files changed, 88 insertions(+), 79 deletions(-)
+
+commit 20f4d1820b8d4d0fc4447188e33efffd6d4a88d8
+Author: William Jon McCann
+AuthorDate: Wed Feb 19 19:35:23 2014 -0500
+Commit: William Jon McCann
+CommitDate: Wed Feb 19 19:41:52 2014 -0500
+
+ docs: use "Returns:" consistently
+
+ Instead of "Return value:".
+
+ gio/gactiongroup.c | 8 ++--
+ gio/gappinfo.c | 2 +-
+ gio/gcancellable.c | 2 +-
+ gio/gdesktopappinfo.c | 2 +-
+ gio/gfileenumerator.c | 4 +-
+ gio/gfilterinputstream.c | 2 +-
+ gio/gfilteroutputstream.c | 2 +-
+ gio/ginetaddressmask.c | 12 +++---
+ gio/ginetsocketaddress.c | 4 +-
+ gio/ginitable.c | 6 +--
+ gio/ginputstream.c | 12 +++---
+ gio/gioerror.c | 2 +-
+ gio/giomodule.c | 4 +-
+ gio/giostream.c | 4 +-
+ gio/gmemoryoutputstream.c | 2 +-
+ gio/gnetworkaddress.c | 12 +++---
+ gio/gnetworkmonitor.c | 6 +--
+ gio/gnetworkservice.c | 10 ++---
+ gio/goutputstream.c | 16 ++++----
+ gio/gpollableinputstream.c | 2 +-
+ gio/gpollableoutputstream.c | 2 +-
+ gio/gpollableutils.c | 6 +--
+ gio/gproxy.c | 8 ++--
+ gio/gproxyresolver.c | 8 ++--
+ gio/gresolver.c | 20 +++++-----
+ gio/gresource.c | 8 ++--
+ gio/gsocketaddressenumerator.c | 4 +-
+ gio/gsocketconnectable.c | 4 +-
+ gio/gsrvtarget.c | 14 +++----
+ gio/gtask.c | 6 +--
+ gio/gtcpwrapperconnection.c | 4 +-
+ gio/gtlsbackend.c | 12 +++---
+ gio/gtlscertificate.c | 14 +++----
+ gio/gtlsclientconnection.c | 10 ++---
+ gio/gtlsconnection.c | 24 ++++++------
+ gio/gtlsdatabase.c | 16 ++++----
+ gio/gtlsfiledatabase.c | 2 +-
+ gio/gtlspassword.c | 6 +--
+ gio/gtlsserverconnection.c | 2 +-
+ gio/gunixinputstream.c | 4 +-
+ gio/gunixoutputstream.c | 4 +-
+ gio/gwin32inputstream.c | 4 +-
+ gio/gwin32outputstream.c | 4 +-
+ gio/gwin32volumemonitor.c | 2 +-
+ gio/inotify/inotify-helper.c | 2 +-
+ glib/deprecated/gcompletion.c | 2 +-
+ glib/gasyncqueue.c | 24 ++++++------
+ glib/gbase64.c | 12 +++---
+ glib/gbookmarkfile.c | 54 +++++++++++++-------------
+ glib/gcharset.c | 6 +--
+ glib/gchecksum.c | 14 +++----
+ glib/gconvert.c | 30 +++++++-------
+ glib/gdataset.c | 2 +-
+ glib/gdatetime.c | 46 +++++++++++-----------
+ glib/gdir.c | 4 +-
+ glib/genviron.c | 8 ++--
+ glib/gerror.c | 8 ++--
+ glib/gfileutils.c | 32 +++++++--------
+ glib/ggettext.c | 2 +-
+ glib/ghash.c | 28 +++++++-------
+ glib/ghmac.c | 12 +++---
+ glib/ghostutils.c | 10 ++---
+ glib/giochannel.c | 46 +++++++++++-----------
+ glib/gkeyfile.c | 44 ++++++++++-----------
+ glib/gmain.c | 88
+ +++++++++++++++++++++---------------------
+ glib/gmappedfile.c | 6 +--
+ glib/gmarkup.c | 16 ++++----
+ glib/gmem.c | 2 +-
+ glib/gnode.c | 2 +-
+ glib/goption.c | 6 +--
+ glib/gpoll.c | 2 +-
+ glib/gqueue.c | 28 +++++++-------
+ glib/grand.c | 24 ++++++------
+ glib/gsequence.c | 48 +++++++++++------------
+ glib/gshell.c | 6 +--
+ glib/gspawn.c | 10 ++---
+ glib/gstrfuncs.c | 56 +++++++++++++--------------
+ glib/gstring.c | 18 ++++-----
+ glib/gstringchunk.c | 2 +-
+ glib/gtestutils.h | 2 +-
+ glib/gthreadpool.c | 18 ++++-----
+ glib/gtimer.c | 4 +-
+ glib/gtree.c | 18 ++++-----
+ glib/gunibreak.c | 2 +-
+ glib/gunicollate.c | 6 +--
+ glib/gunidecomp.c | 8 ++--
+ glib/guniprop.c | 60 ++++++++++++++--------------
+ glib/gutf8.c | 42 ++++++++++----------
+ glib/gutils.c | 16 ++++----
+ glib/gversion.c | 2 +-
+ glib/gwin32.c | 2 +-
+ gobject/gbinding.c | 16 ++++----
+ gobject/gbinding.h | 2 +-
+ 93 files changed, 600 insertions(+), 600 deletions(-)
+
+commit 9cb53851be2d90c804e6f31da26a11c51329f33c
+Author: Chun-wei Fan
+AuthorDate: Wed Feb 19 13:57:18 2014 +0800
+Commit: Chun-wei Fan
+CommitDate: Thu Feb 20 08:36:54 2014 +0800
+
+ gio/gresolver.c: Fix build on Windows
+
+ Windows does not come with inet_aton(), and this check on IPv4
+ addresses
+ is actually not needed on Windows as the getaddrinfo() implementation
+ on
+ Windows already rejects non-standard and non-real IPv4
+ numbers-and-dots
+ addresses.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=724609
+
+ gio/gresolver.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+commit a5ae016359ffb8634d6a12e5853e89f743eca0b9
+Author: Kjartan Maraas
+AuthorDate: Wed Feb 19 23:57:40 2014 +0100
+Commit: Kjartan Maraas
+CommitDate: Wed Feb 19 23:57:40 2014 +0100
+
+ Updated Norwegian bokmål translation
+
+ po/nb.po | 60
+ +++++++++++++++++++++++++++++++++---------------------------
+ 1 file changed, 33 insertions(+), 27 deletions(-)
+
+commit 0ffa1ea8ddb9a3c17ab0ad13a0f6685657fb41e2
+Author: Xavier Claessens
+AuthorDate: Wed Feb 19 15:51:27 2014 -0500
+Commit: Xavier Claessens
+CommitDate: Wed Feb 19 15:51:27 2014 -0500
+
+ Add G_ÂTYPE_VARIANT_DCT into the doc
+
+ docs/reference/gobject/gobject-sections.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
commit ec17605d4f62fa6b460846f30a5ea409425bee00
Author: Ryan Lortie
AuthorDate: Mon Feb 17 18:33:34 2014 -0500
diff -Nru glib2.0-2.39.90/config.h.in glib2.0-2.39.91/config.h.in
--- glib2.0-2.39.90/config.h.in 2014-02-17 23:33:59.000000000 +0000
+++ glib2.0-2.39.91/config.h.in 2014-03-03 20:58:14.000000000 +0000
@@ -268,6 +268,9 @@
/* Define to 1 if you have the `lstat' function. */
#undef HAVE_LSTAT
+/* Define to 1 if you have the header file. */
+#undef HAVE_MACH_MACH_TIME_H
+
/* Define to 1 if you have the header file. */
#undef HAVE_MALLOC_H
@@ -328,11 +331,8 @@
/* Have function pthread_condattr_setclock */
#undef HAVE_PTHREAD_CONDATTR_SETCLOCK
-/* Have function pthread_cond_timedwait_monotonic */
-#undef HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC
-
-/* Have function pthread_cond_timedwait_monotonic_np */
-#undef HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC_NP
+/* Have function pthread_cond_timedwait_relative_np */
+#undef HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE_NP
/* Define to 1 if the system has the type `ptrdiff_t'. */
#undef HAVE_PTRDIFF_T
diff -Nru glib2.0-2.39.90/config.h.win32 glib2.0-2.39.91/config.h.win32
--- glib2.0-2.39.90/config.h.win32 2014-02-17 23:37:36.000000000 +0000
+++ glib2.0-2.39.91/config.h.win32 2014-03-03 21:09:22.000000000 +0000
@@ -38,7 +38,7 @@
#define GETTEXT_PACKAGE "glib20"
/* Define to the GLIB binary age */
-#define GLIB_BINARY_AGE 3990
+#define GLIB_BINARY_AGE 3991
/* Define to the GLIB interface age */
#define GLIB_INTERFACE_AGE 0
@@ -50,7 +50,7 @@
#define GLIB_MAJOR_VERSION 2
/* Define to the GLIB micro version */
-#define GLIB_MICRO_VERSION 90
+#define GLIB_MICRO_VERSION 91
/* Define to the GLIB minor version */
#define GLIB_MINOR_VERSION 39
@@ -704,7 +704,7 @@
#define PACKAGE_NAME "glib"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "glib 2.39.90"
+#define PACKAGE_STRING "glib 2.39.91"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "glib"
@@ -713,7 +713,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "2.39.90"
+#define PACKAGE_VERSION "2.39.91"
/* define if posix_memalign() can allocate any size */
/* #undef POSIX_MEMALIGN_WITH_COMPLIANT_ALLOCS */
diff -Nru glib2.0-2.39.90/configure glib2.0-2.39.91/configure
--- glib2.0-2.39.90/configure 2014-02-17 23:33:45.000000000 +0000
+++ glib2.0-2.39.91/configure 2014-03-03 20:58:12.000000000 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for glib 2.39.90.
+# Generated by GNU Autoconf 2.69 for glib 2.39.91.
#
# Report bugs to .
#
@@ -591,8 +591,8 @@
# Identity of this package.
PACKAGE_NAME='glib'
PACKAGE_TARNAME='glib'
-PACKAGE_VERSION='2.39.90'
-PACKAGE_STRING='glib 2.39.90'
+PACKAGE_VERSION='2.39.91'
+PACKAGE_STRING='glib 2.39.91'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=glib'
PACKAGE_URL=''
@@ -1575,7 +1575,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures glib 2.39.90 to adapt to many kinds of systems.
+\`configure' configures glib 2.39.91 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1645,7 +1645,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of glib 2.39.90:";;
+ short | recursive ) echo "Configuration of glib 2.39.91:";;
esac
cat <<\_ACEOF
@@ -1825,7 +1825,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-glib configure 2.39.90
+glib configure 2.39.91
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2609,7 +2609,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by glib $as_me 2.39.90, which was
+It was created by glib $as_me 2.39.91, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3481,7 +3481,7 @@
# Define the identity of the package.
PACKAGE='glib'
- VERSION='2.39.90'
+ VERSION='2.39.91'
# Some tools Automake needs.
@@ -3708,10 +3708,10 @@
GLIB_MAJOR_VERSION=2
GLIB_MINOR_VERSION=39
-GLIB_MICRO_VERSION=90
+GLIB_MICRO_VERSION=91
GLIB_INTERFACE_AGE=0
-GLIB_BINARY_AGE=3990
-GLIB_VERSION=2.39.90
+GLIB_BINARY_AGE=3991
+GLIB_VERSION=2.39.91
@@ -3727,20 +3727,20 @@
$as_echo "#define GLIB_MINOR_VERSION 39" >>confdefs.h
-$as_echo "#define GLIB_MICRO_VERSION 90" >>confdefs.h
+$as_echo "#define GLIB_MICRO_VERSION 91" >>confdefs.h
$as_echo "#define GLIB_INTERFACE_AGE 0" >>confdefs.h
-$as_echo "#define GLIB_BINARY_AGE 3990" >>confdefs.h
+$as_echo "#define GLIB_BINARY_AGE 3991" >>confdefs.h
# libtool versioning
LT_RELEASE=2.39
-LT_CURRENT=3990
+LT_CURRENT=3991
LT_REVISION=0
-LT_AGE=3990
+LT_AGE=3991
LT_CURRENT_MINUS_AGE=0
@@ -19703,7 +19703,7 @@
Report bugs to ."
lt_cl_version="\
-glib config.lt 2.39.90
+glib config.lt 2.39.91
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -22292,7 +22292,7 @@
# check for header files
-for ac_header in sys/param.h sys/resource.h
+for ac_header in sys/param.h sys/resource.h mach/mach_time.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -26685,15 +26685,15 @@
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_cond_timedwait_monotonic" >&5
-$as_echo_n "checking for pthread_cond_timedwait_monotonic... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_cond_timedwait_relative_np" >&5
+$as_echo_n "checking for pthread_cond_timedwait_relative_np... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include
int
main ()
{
-pthread_cond_timedwait_monotonic(NULL, NULL, NULL)
+pthread_cond_timedwait_relative_np(NULL, NULL, NULL)
;
return 0;
}
@@ -26702,32 +26702,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
-$as_echo "#define HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC 1" >>confdefs.h
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_cond_timedwait_monotonic_np" >&5
-$as_echo_n "checking for pthread_cond_timedwait_monotonic_np... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include
-int
-main ()
-{
-pthread_cond_timedwait_monotonic_np(NULL, NULL, NULL)
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC_NP 1" >>confdefs.h
+$as_echo "#define HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE_NP 1" >>confdefs.h
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -26827,8 +26802,6 @@
$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
if test "x$ac_cv_lib_rt_clock_gettime" = xyes; then :
- $as_echo "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
-
G_THREAD_LIBS="$G_THREAD_LIBS -lrt"
G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS_FOR_GTHREAD -lrt"
@@ -29691,7 +29664,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by glib $as_me 2.39.90, which was
+This file was extended by glib $as_me 2.39.91, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -29757,7 +29730,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-glib config.status 2.39.90
+glib config.status 2.39.91
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -Nru glib2.0-2.39.90/configure.ac glib2.0-2.39.91/configure.ac
--- glib2.0-2.39.90/configure.ac 2014-02-17 23:32:47.000000000 +0000
+++ glib2.0-2.39.91/configure.ac 2014-03-03 20:57:19.000000000 +0000
@@ -31,7 +31,7 @@
m4_define([glib_major_version], [2])
m4_define([glib_minor_version], [39])
-m4_define([glib_micro_version], [90])
+m4_define([glib_micro_version], [91])
m4_define([glib_interface_age], [0])
m4_define([glib_binary_age],
[m4_eval(100 * glib_minor_version + glib_micro_version)])
@@ -771,7 +771,7 @@
# check for header files
-AC_CHECK_HEADERS([sys/param.h sys/resource.h])
+AC_CHECK_HEADERS([sys/param.h sys/resource.h mach/mach_time.h])
AC_CHECK_HEADERS([sys/select.h stdint.h inttypes.h sched.h malloc.h])
AC_CHECK_HEADERS([sys/vfs.h sys/vmount.h sys/statfs.h sys/statvfs.h sys/filio.h])
AC_CHECK_HEADERS([mntent.h sys/mnttab.h sys/vfstab.h sys/mntctl.h fstab.h])
@@ -2235,23 +2235,14 @@
AC_DEFINE(HAVE_PTHREAD_CONDATTR_SETCLOCK,1,
[Have function pthread_condattr_setclock])],
[AC_MSG_RESULT(no)])
- AC_MSG_CHECKING(for pthread_cond_timedwait_monotonic)
+ AC_MSG_CHECKING(for pthread_cond_timedwait_relative_np)
AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[#include ],
- [pthread_cond_timedwait_monotonic(NULL, NULL, NULL)])],
+ [pthread_cond_timedwait_relative_np(NULL, NULL, NULL)])],
[AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC,1,
- [Have function pthread_cond_timedwait_monotonic])],
- [AC_MSG_RESULT(no)])
- AC_MSG_CHECKING(for pthread_cond_timedwait_monotonic_np)
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM(
- [#include ],
- [pthread_cond_timedwait_monotonic_np(NULL, NULL, NULL)])],
- [AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC_NP,1,
- [Have function pthread_cond_timedwait_monotonic_np])],
+ AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE_NP,1,
+ [Have function pthread_cond_timedwait_relative_np])],
[AC_MSG_RESULT(no)])
CPPFLAGS="$glib_save_CPPFLAGS"
])
@@ -2296,7 +2287,6 @@
AC_CHECK_FUNCS(clock_gettime, [], [
AC_CHECK_LIB(rt, clock_gettime, [
- AC_DEFINE(HAVE_CLOCK_GETTIME, 1)
G_THREAD_LIBS="$G_THREAD_LIBS -lrt"
G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS_FOR_GTHREAD -lrt"
])
diff -Nru glib2.0-2.39.90/debian/changelog glib2.0-2.39.91/debian/changelog
--- glib2.0-2.39.90/debian/changelog 2014-02-19 11:46:34.000000000 +0000
+++ glib2.0-2.39.91/debian/changelog 2014-03-04 16:16:00.000000000 +0000
@@ -1,3 +1,20 @@
+glib2.0 (2.39.91-0ubuntu2) trusty; urgency=medium
+
+ * 0001-timer-test-use-volatile-for-locals.patch: Use 'volatile' for locals
+ in the timer tests. GCC allows excess precision to persist meaning that
+ the comparisons may fail, causing the test to fail.
+
+ -- Iain Lane Tue, 04 Mar 2014 16:16:00 +0000
+
+glib2.0 (2.39.91-0ubuntu1) trusty; urgency=medium
+
+ * New upstream release 2.39.91
+ * revert-0001-Improve-GAsyncQueue-test-coverage.patch: Drop, fixed upstream.
+ * Re-enable test_timer_stop to gather more information about the failure.
+ * debian/libglib2.0-0.symbols: Update with new symbols in this release.
+
+ -- Iain Lane Tue, 04 Mar 2014 13:08:00 +0000
+
glib2.0 (2.39.90-0ubuntu1) trusty; urgency=medium
* New upstream release
diff -Nru glib2.0-2.39.90/debian/libglib2.0-0.symbols glib2.0-2.39.91/debian/libglib2.0-0.symbols
--- glib2.0-2.39.90/debian/libglib2.0-0.symbols 2014-02-19 10:38:57.000000000 +0000
+++ glib2.0-2.39.91/debian/libglib2.0-0.symbols 2014-03-04 11:43:45.000000000 +0000
@@ -2998,6 +2998,7 @@
g_str_hash@Base 2.12.0
g_str_is_ascii@Base 2.39.1
g_str_match_string@Base 2.39.1
+ g_str_to_ascii@Base 2.39.91
g_str_tokenize_and_fold@Base 2.39.1
g_strcanon@Base 2.12.0
g_strcasecmp@Base 2.12.0
diff -Nru glib2.0-2.39.90/debian/patches/0001-timer-test-use-volatile-for-locals.patch glib2.0-2.39.91/debian/patches/0001-timer-test-use-volatile-for-locals.patch
--- glib2.0-2.39.90/debian/patches/0001-timer-test-use-volatile-for-locals.patch 1970-01-01 00:00:00.000000000 +0000
+++ glib2.0-2.39.91/debian/patches/0001-timer-test-use-volatile-for-locals.patch 2014-03-04 16:14:52.000000000 +0000
@@ -0,0 +1,41 @@
+From d470c2f1f64ea7460b26dd446a5007f9faf04f4f Mon Sep 17 00:00:00 2001
+From: Ryan Lortie
+Date: Tue, 4 Mar 2014 09:20:38 -0500
+Subject: [PATCH] timer test: use 'volatile' for locals
+
+GCC seems to be failing to follow the letter of the C spec by allowing extra
+precision in floating point values to persist across assignments which are
+optimised away.
+
+Force its hand by using 'volatile' on the locals in question.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=722604
+---
+ glib/tests/timer.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/glib/tests/timer.c b/glib/tests/timer.c
+index cb9a268..d6938f1 100644
+--- a/glib/tests/timer.c
++++ b/glib/tests/timer.c
+@@ -27,7 +27,7 @@ static void
+ test_timer_basic (void)
+ {
+ GTimer *timer;
+- gdouble elapsed;
++ volatile gdouble elapsed;
+ gulong micros;
+
+ timer = g_timer_new ();
+@@ -44,7 +44,7 @@ static void
+ test_timer_stop (void)
+ {
+ GTimer *timer;
+- gdouble elapsed, elapsed2;
++ volatile gdouble elapsed, elapsed2;
+
+ timer = g_timer_new ();
+
+--
+1.9.0
+
diff -Nru glib2.0-2.39.90/debian/patches/revert-0001-Improve-GAsyncQueue-test-coverage.patch glib2.0-2.39.91/debian/patches/revert-0001-Improve-GAsyncQueue-test-coverage.patch
--- glib2.0-2.39.90/debian/patches/revert-0001-Improve-GAsyncQueue-test-coverage.patch 2014-01-16 16:30:40.000000000 +0000
+++ glib2.0-2.39.91/debian/patches/revert-0001-Improve-GAsyncQueue-test-coverage.patch 1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-Revert the following as it fails on the Ubuntu buildds:
-
-From 6d3b83a8c131e190da5db10d81c0d3cc0e3c6768 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen
-Date: Mon, 30 Dec 2013 09:49:30 -0500
-Subject: [PATCH] Improve GAsyncQueue test coverage
-
----
- glib/tests/asyncqueue.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-reverted:
---- b/glib/tests/asyncqueue.c
-+++ a/glib/tests/asyncqueue.c
-@@ -204,19 +204,6 @@
- g_assert_cmpint (diff, >=, G_USEC_PER_SEC / 10);
- g_assert_cmpint (diff, <, G_USEC_PER_SEC);
-
-- start = end;
-- g_get_current_time (&tv);
-- g_time_val_add (&tv, G_USEC_PER_SEC / 10);
-- g_async_queue_lock (q);
-- val = g_async_queue_timed_pop_unlocked (q, &tv);
-- g_async_queue_unlock (q);
-- g_assert (val == NULL);
--
-- end = g_get_monotonic_time ();
-- diff = end - start;
-- g_assert_cmpint (diff, >=, G_USEC_PER_SEC / 10);
-- g_assert_cmpint (diff, <, G_USEC_PER_SEC);
--
- g_async_queue_unref (q);
- }
-
diff -Nru glib2.0-2.39.90/debian/patches/series glib2.0-2.39.91/debian/patches/series
--- glib2.0-2.39.90/debian/patches/series 2014-02-19 10:13:37.000000000 +0000
+++ glib2.0-2.39.91/debian/patches/series 2014-03-04 16:14:52.000000000 +0000
@@ -11,4 +11,4 @@
90_gio-modules-multiarch-compat.patch
skip-brokwn-dbus-appinfo-test.patch
skip-broken-timer-test
-revert-0001-Improve-GAsyncQueue-test-coverage.patch
+0001-timer-test-use-volatile-for-locals.patch
diff -Nru glib2.0-2.39.90/debian/patches/skip-broken-timer-test glib2.0-2.39.91/debian/patches/skip-broken-timer-test
--- glib2.0-2.39.90/debian/patches/skip-broken-timer-test 2014-01-17 10:04:59.000000000 +0000
+++ glib2.0-2.39.91/debian/patches/skip-broken-timer-test 2014-03-04 11:41:25.000000000 +0000
@@ -4,14 +4,12 @@
===================================================================
--- a/glib/tests/timer.c
+++ b/glib/tests/timer.c
-@@ -203,8 +203,8 @@
+@@ -203,7 +203,7 @@
{
g_test_init (&argc, &argv, NULL);
- g_test_add_func ("/timer/basic", test_timer_basic);
-- g_test_add_func ("/timer/stop", test_timer_stop);
+/* g_test_add_func ("/timer/basic", test_timer_basic);*/
-+/* g_test_add_func ("/timer/stop", test_timer_stop); */
+ g_test_add_func ("/timer/stop", test_timer_stop);
g_test_add_func ("/timer/continue", test_timer_continue);
g_test_add_func ("/timer/reset", test_timer_reset);
- g_test_add_func ("/timeval/add", test_timeval_add);
diff -Nru glib2.0-2.39.90/docs/reference/gio/gapplication.1 glib2.0-2.39.91/docs/reference/gio/gapplication.1
--- glib2.0-2.39.90/docs/reference/gio/gapplication.1 2014-02-17 22:18:53.000000000 +0000
+++ glib2.0-2.39.91/docs/reference/gio/gapplication.1 2014-03-03 21:04:57.000000000 +0000
@@ -2,7 +2,7 @@
.\" Title: gapplication
.\" Author: Ryan Lortie
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 02/17/2014
+.\" Date: 03/03/2014
.\" Manual: User Commands
.\" Source: GIO
.\" Language: English
diff -Nru glib2.0-2.39.90/docs/reference/gio/gdbus.1 glib2.0-2.39.91/docs/reference/gio/gdbus.1
--- glib2.0-2.39.90/docs/reference/gio/gdbus.1 2014-02-17 22:18:54.000000000 +0000
+++ glib2.0-2.39.91/docs/reference/gio/gdbus.1 2014-03-03 21:04:57.000000000 +0000
@@ -2,7 +2,7 @@
.\" Title: gdbus
.\" Author: David Zeuthen
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 02/17/2014
+.\" Date: 03/03/2014
.\" Manual: User Commands
.\" Source: GIO
.\" Language: English
diff -Nru glib2.0-2.39.90/docs/reference/gio/gdbus-codegen.1 glib2.0-2.39.91/docs/reference/gio/gdbus-codegen.1
--- glib2.0-2.39.90/docs/reference/gio/gdbus-codegen.1 2014-02-17 22:18:54.000000000 +0000
+++ glib2.0-2.39.91/docs/reference/gio/gdbus-codegen.1 2014-03-03 21:04:57.000000000 +0000
@@ -2,7 +2,7 @@
.\" Title: gdbus-codegen
.\" Author: David Zeuthen
.\" Generator: DocBook XSL Stylesheets v1.78.1
-.\" Date: 02/17/2014
+.\" Date: 03/03/2014
.\" Manual: User Commands
.\" Source: GIO
.\" Language: English
diff -Nru glib2.0-2.39.90/docs/reference/gio/gdbus-object-manager-example/html/ch01.html glib2.0-2.39.91/docs/reference/gio/gdbus-object-manager-example/html/ch01.html
--- glib2.0-2.39.90/docs/reference/gio/gdbus-object-manager-example/html/ch01.html 2014-02-17 23:37:21.000000000 +0000
+++ glib2.0-2.39.91/docs/reference/gio/gdbus-object-manager-example/html/ch01.html 2014-03-03 21:09:03.000000000 +0000
@@ -12,7 +12,7 @@
-
