From 2c73c3eee55f36c67b8a165b43504121450bc47a Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 29 Oct 2013 20:26:50 -0400
Subject: [PATCH] fix annotation glossary sorting

---
 ...oc-mkdb-sort-entries-in-the-glossary.patch | 31 +++++++++++++++++++
 gtk-doc.spec                                  | 10 +++++-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 0001-gtkdoc-mkdb-sort-entries-in-the-glossary.patch

diff --git a/0001-gtkdoc-mkdb-sort-entries-in-the-glossary.patch b/0001-gtkdoc-mkdb-sort-entries-in-the-glossary.patch
new file mode 100644
index 0000000..39ebf65
--- /dev/null
+++ b/0001-gtkdoc-mkdb-sort-entries-in-the-glossary.patch
@@ -0,0 +1,31 @@
+From bd2b3769684a7f7ebdee1d32c0fe280ef0e75e86 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Mon, 21 Oct 2013 15:52:08 -0400
+Subject: [PATCH] gtkdoc-mkdb: sort entries in the glossary
+
+The entries in the glossary were in pseudo-random order, varying
+even between gtk-doc runs.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=711111
+
+https://bugzilla.gnome.org/show_bug.cgi?id=711112
+---
+ gtkdoc-mkdb.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gtkdoc-mkdb.in b/gtkdoc-mkdb.in
+index e448ed7..faffaf4 100755
+--- a/gtkdoc-mkdb.in
++++ b/gtkdoc-mkdb.in
+@@ -1119,7 +1119,7 @@ $header
+   <title>Annotation Glossary</title>
+ EOF
+ 
+-    foreach my $annotation (keys(%AnnotationsUsed)) {
++    foreach my $annotation (sort(keys(%AnnotationsUsed))) {
+         if(defined($AnnotationDefinition{$annotation})) {
+             my $def = $AnnotationDefinition{$annotation};
+             my $curletter = uc(substr($annotation,0,1));
+-- 
+1.8.3.1
+
diff --git a/gtk-doc.spec b/gtk-doc.spec
index 157eb68..65fe025 100644
--- a/gtk-doc.spec
+++ b/gtk-doc.spec
@@ -1,11 +1,15 @@
 Summary: API documentation generation tool for GTK+ and GNOME
 Name: gtk-doc
 Version: 1.19
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and GFDL
 Group: Development/Tools
 #VCS: git:git://git.gnome.org/gtk-doc
 Source: http://download.gnome.org/sources/gtk-doc/1.18/gtk-doc-%{version}.tar.xz
+
+# upstream fix
+Patch0: 0001-gtkdoc-mkdb-sort-entries-in-the-glossary.patch
+
 BuildArch: noarch
 URL: http://www.gtk.org/gtk-doc
 
@@ -39,6 +43,7 @@ and GNOME.
 
 %prep
 %setup -q
+%patch0 -p1
 # Move this doc file to avoid name collisions
 mv doc/README doc/README.docs
 
@@ -63,6 +68,9 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html
 %{_datadir}/help/*/gtk-doc-manual/
 
 %changelog
+* Tue Oct 29 2013 Matthias Clasen <mclasen@redhat.com> - 1.19-4
+- Fix sorting of the annotation glossary 
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.19-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild