From a757aeb5952d14b0bb8356e051d16ca674a9d670 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 30 2018 05:16:02 +0000 Subject: import gtk-doc-1.28-2.el7 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..00f8260 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/gtk-doc-1.28.tar.xz diff --git a/.gtk-doc.metadata b/.gtk-doc.metadata new file mode 100644 index 0000000..254b1ab --- /dev/null +++ b/.gtk-doc.metadata @@ -0,0 +1 @@ +f48311fd3def5b393ebb32d5480a61ec6dfd2809 SOURCES/gtk-doc-1.28.tar.xz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/0001-Fix-a-missed-variable-rename-in-ScanDirectory-caused.patch b/SOURCES/0001-Fix-a-missed-variable-rename-in-ScanDirectory-caused.patch new file mode 100644 index 0000000..0f50acb --- /dev/null +++ b/SOURCES/0001-Fix-a-missed-variable-rename-in-ScanDirectory-caused.patch @@ -0,0 +1,33 @@ +From 203785526af7308a799401c0b037db409269119c Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Thu, 10 May 2018 11:00:17 -0700 +Subject: [PATCH 1/2] Fix a missed variable rename in ScanDirectory (caused a + crash) + +halfline ran into gtk-doc crashing when he was trying to cut an +accountsservice release; looking into it we found that the first +arg to ScanDirectory was renamed from `dir` to `scan_dir` in +9292e0a (to avoid overriding a builtin, I guess) but this one +reference to it was not changed. This should fix it. + +Signed-off-by: Adam Williamson +--- + gtkdoc/rebase.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gtkdoc/rebase.py b/gtkdoc/rebase.py +index 424c3e6..2a1d495 100755 +--- a/gtkdoc/rebase.py ++++ b/gtkdoc/rebase.py +@@ -108,7 +108,7 @@ def ScanDirectory(scan_dir, options): + + if onlinedir and entry == "index.sgml": + log(options, "Reading index from index.sgml") +- onlinedir = ReadIndex(dir, entry) ++ onlinedir = ReadIndex(scan_dir, entry) + have_index = True + elif entry == "index.sgml.gz" and not os.path.exists(os.path.join(scan_dir, 'index.sgml')): + # debian/ubuntu started to compress this as index.sgml.gz :/ +-- +2.17.0 + diff --git a/SOURCES/0002-Replace-match.groups-1-with-match.group-1.patch b/SOURCES/0002-Replace-match.groups-1-with-match.group-1.patch new file mode 100644 index 0000000..e0eb7c9 --- /dev/null +++ b/SOURCES/0002-Replace-match.groups-1-with-match.group-1.patch @@ -0,0 +1,64 @@ +From 43fac1c26c9c6bdede2d32b5243e74636bda8a98 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Thu, 10 May 2018 11:08:02 -0700 +Subject: [PATCH 2/2] Replace `match.groups(1)` with `match.group(1)` + +halfline ran into a crash in gtk-doc when trying to cut an +accountsservice release, a TypeError pointing to this re.sub +call. Looking at it, the use of `match.groups(1)` is clearly +wrong. `match.groups()` returns a tuple consisting of *all* +the match subgroups; the argument it takes is the value to use +for subgroups which didn't capture anything (the default being +None). What the code here clearly actually *wants* is not that +tuple, but the contents of the first match subgroup only, as a +string. To get that you do `match.group(1)`. So, let's fix that. + +There are two other occurrences of the same error later in the +file, so let's fix that too. If I'm reading it correctly, those +ones wouldn't have caused crashes, they would only cause the +block they're in not to work properly and produce "Can't +determine package for '(something)'" log messages even when it +should have worked (because 'package' will be the tuple, not the +subgroup, and will never be 'in' `OnlineMap` or `LocalMap`). + +Note, these have been lying around for a long time, but the one +that causes the crash was not hit until 1.28, because of the +regex error fixed by b77d97b. Until that regex was fixed, +ReadDevhelp never worked on this codebase, so we never hit the +bug in ReadIndex. The crash might have happened with some other +codebase for which the ReadDevhelp regex *did* work, though. + +Signed-off-by: Adam Williamson +--- + gtkdoc/rebase.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/gtkdoc/rebase.py b/gtkdoc/rebase.py +index 2a1d495..4b0266c 100755 +--- a/gtkdoc/rebase.py ++++ b/gtkdoc/rebase.py +@@ -154,7 +154,7 @@ def ReadIndex(dir, file): + match = re.match(r'''^''', line) + if match: + # Remove trailing non-directory component. +- onlinedir = re.sub(r'''(.*/).*''', r'\1', match.groups(1)) ++ onlinedir = re.sub(r'''(.*/).*''', r'\1', match.group(1)) + return onlinedir + + +@@ -226,10 +226,10 @@ def RebaseLink(href, options): + else: + match = re.match(r'\.\./([^/]+)', href) + if match is not None: +- package = match.groups(1) ++ package = match.group(1) + elif options.aggressive: + match = re.search(r'''([^/]+)/$''', href) +- package = match.groups(1) ++ package = match.group(1) + + if package: + if options.online and package in OnlineMap: +-- +2.17.0 + diff --git a/SPECS/gtk-doc.spec b/SPECS/gtk-doc.spec new file mode 100644 index 0000000..b401b4e --- /dev/null +++ b/SPECS/gtk-doc.spec @@ -0,0 +1,282 @@ +%global debug_package %{nil} + +Name: gtk-doc +Version: 1.28 +Release: 2%{?dist} +Summary: API documentation generation tool for GTK+ and GNOME + +License: GPLv2+ and GFDL +URL: http://www.gtk.org/gtk-doc +Source0: http://download.gnome.org/sources/gtk-doc/1.28/gtk-doc-%{version}.tar.xz +# Fix a crasher bug caused by mismatched variable name: +# https://bugzilla.gnome.org/show_bug.cgi?id=796011 +Patch0: 0001-Fix-a-missed-variable-rename-in-ScanDirectory-caused.patch +# Fix another crasher bug caused by wrong use of re groups: +# https://bugzilla.gnome.org/show_bug.cgi?id=796012 +Patch1: 0002-Replace-match.groups-1-with-match.group-1.patch + +BuildRequires: dblatex +BuildRequires: docbook-utils +BuildRequires: /usr/bin/xsltproc +BuildRequires: docbook-style-xsl +BuildRequires: python2-devel +BuildRequires: python-six +BuildRequires: gettext +BuildRequires: source-highlight +BuildRequires: yelp-tools + +# Following are not automatically installed +Requires: docbook-utils /usr/bin/xsltproc docbook-style-xsl +Requires: python-six +Requires: source-highlight + +%description +gtk-doc is a tool for generating API reference documentation. +It is used for generating the documentation for GTK+, GLib +and GNOME. + +%prep +%autosetup -p1 + +# Move this doc file to avoid name collisions +mv doc/README doc/README.docs + +%build +%configure +make %{?_smp_mflags} + +%install +%make_install + +%check +# For reasons unknown first make check fails with texlive debug spew in log +# files. Just run it twice to work this around. +make check || make check + +%files +%license COPYING COPYING-DOCS +%doc AUTHORS README doc/* examples +%{_bindir}/* +%{_datadir}/aclocal/ +%{_datadir}/gtk-doc/ +%{_datadir}/pkgconfig/gtk-doc.pc +%{_datadir}/help/*/gtk-doc-manual/ +%{_libdir}/cmake/ + +%changelog +* Thu May 10 2018 Adam Williamson - 1.28-2 +- Fix a couple of crasher bugs encountered by halfline (BGO#79601{1,2)) + +* Sat Mar 24 2018 Kalev Lember - 1.28-1 +- Update to 1.28 +- Resolves: #1569971 + +* Tue Mar 22 2016 Kalev Lember - 1.25-1 +- Update to 1.25 +- Resolves: #1386981 + +* Fri Dec 27 2013 Daniel Mach - 1.19-3 +- Mass rebuild 2013-12-27 + +* Tue Oct 29 2013 Matthias Clasen - 1.19-2 +- Fix sorting of the annotation glossary + +* Wed Jun 5 2013 Matthias Clasen - 1.19-1 +- Update to 1.19 + +* Thu Feb 14 2013 Fedora Release Engineering - 1.18-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jul 19 2012 Fedora Release Engineering - 1.18-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 1.18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Sep 19 2011 Matthias Clasen - 1.18-1 +- Update to 1.18 + +* Mon Mar 7 2011 Matthias Clasen - 1.17-1 +- Update to 1.17 + +* Wed Feb 09 2011 Fedora Release Engineering - 1.16-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Jan 14 2011 Matthias Clasen - 1.16-1 +- Update to 1.16 + +* Fri Sep 24 2010 Parag Nemade - 1.15-2 +- Merge-review cleanup (#225870) + +* Sun May 23 2010 Matthias Clasen - 1.15-1 +- Update to 1.15 + +* Sun Mar 28 2010 Matthias Clasen - 1.14-1 +- Update to 1.14 + +* Wed Jan 6 2010 Matthias Clasen - 1.13-2 +- Fix issues with gtkdoc-fixxref + +* Tue Dec 22 2009 Matthias Clasen - 1.13-1 +- Update to 1.13 + +* Thu Dec 3 2009 Matthias Clasen - 1.11-6 +- Drop unnecessary BRs + +* Fri Jul 24 2009 Fedora Release Engineering - 1.11-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Feb 24 2009 Fedora Release Engineering - 1.11-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sun Nov 23 2008 Matthias Clasen - 1.11-3 +- Fix an index generation problem + +* Fri Nov 21 2008 Matthias Clasen - 1.11-2 +- Update to 1.11 + +* Fri Jul 25 2008 Tom "spot" Callaway - 1.10-2 +- fix license tag + +* Thu Apr 24 2008 Matthias Clasen - 1.10-1 +- Update to 1.10 + +* Tue Jan 8 2008 Matthias Clasen - 1.9-4 +- Try again + +* Mon Jan 7 2008 Matthias Clasen - 1.9-3 +- Improve the fix + +* Tue Dec 18 2007 Matthias Clasen - 1.9-2 +- Fix a problem in gtk-doc.make + +* Sun Nov 18 2007 Matthias Clasen - 1.9-1 +- Update to 1.9 + +* Tue Aug 7 2007 Matthias Clasen - 1.8-3 +- Update the license field + +* Thu Mar 29 2007 Matthias Clasen - 1.8-2 +- Drop a no longer needed patch + +* Wed Feb 21 2007 Matthias Clasen - 1.8-1 +- Update to 1.8 +- Fix some directory ownership issues + +* Fri Feb 2 2007 Matthias Clasen - 1.7-3 +- Fix the omf file (#223684) + +* Wed Dec 20 2006 Matthias Clasen - 1.7-2 +- Own the /usr/share/gtk-doc/html directory (#220230) + +* Wed Aug 2 2006 Matthias Clasen - 1.7-1.fc6 +- Update to 1.7 + +* Wed Jul 12 2006 Jesse Keating - 1.6-3.1 +- rebuild + +* Mon May 22 2006 Matthias Clasen 1.6-3 +- Make it build in mock + +* Mon Apr 10 2006 Matthias Clasen 1.6-2 +- Update to 1.6 + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Wed Jul 6 2005 Matthias Clasen 1.4-1 +- update to 1.4 + +* Thu May 5 2005 Matthias Clasen 1.3-1 +- accept ':' in ids + +* Wed Jan 26 2005 Matthias Clasen 1.3-1 +- update to 1.3 + +* Tue Sep 21 2004 Matthias Clasen 1.2-2 +- rebuild + +* Fri Mar 12 2004 Alex Larsson 1.2-1 +- update to 1.2 + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Aug 28 2003 Owen Taylor 1.1-3.0 +- Move gtk-doc.pc file to %%{_datadir}/pkgconfig (#98595) +- Require: /usr/bin/cmp (#88763, Thomas Vander Stichele) +- Added libxslt docbook-style-xsl to Require: and BuildPrereq + (#99143, Ken MacFarlane) + +* Tue Jul 8 2003 Owen Taylor 1.1-2.0 +- Bump for rebuild + +* Thu Jun 12 2003 Owen Taylor 1.1-1 +- Version 1.1 + +* Wed Apr 30 2003 Elliot Lee 0.10-6 +- Patch to s/head -1/head -n 1/ for ppc64 etc. + +* Wed Feb 12 2003 Elliot Lee 0.10-5 +- BuildRequires: libxslt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Mon Jan 13 2003 Owen Taylor 0.10-3 +- Clean up some spec file mess + +* Mon Jan 13 2003 Tim Powers 0.10-2 +- fiter out the broken perl dep + +* Sun Jan 12 2003 Havoc Pennington +- 0.10 + +* Wed Dec 11 2002 Tim Powers 0.9-6 +- rebuild + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 30 2002 Chip Turner +- add dependency filter for bogus perl dependencies + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Thu Apr 25 2002 Havoc Pennington +- rebuild in different environment + +* Thu Apr 4 2002 Jeremy Katz +- update to 0.9 + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Wed Jan 2 2002 Havoc Pennington +- new cvs snap 0.7.90 + +* Mon Sep 17 2001 Matt Wilson +- version 0.7 + +* Thu May 17 2001 Havoc Pennington +- upgrade to a CVS snapshot +- remove patches applied upstream + +* Tue Jan 16 2001 Tim Waugh +- Replace docbook, sgml-common, and stylesheets requirements with + docbook-utils requirement. +- Use public identifier in custom stylesheets. + +* Thu Dec 14 2000 Bill Nottingham +- rebuild because of broken fileutils + +* Mon Nov 13 2000 Owen Taylor +- Version 0.4b1 (CVS snapshot) + +* Fri Apr 23 1999 Owen Taylor +- added Requires + +* Fri Apr 23 1999 Owen Taylor +- Initial RPM, version 0.2 +