Accepting request 27839 from GNOME:Factory

Copy from GNOME:Factory/gtk-doc based on submit request 27839 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/27839
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gtk-doc?expand=0&rev=8
This commit is contained in:
OBS User autobuild 2009-12-29 18:02:06 +00:00 committed by Git OBS Bridge
parent beaf55b49d
commit e5c0586827
5 changed files with 126 additions and 157 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:92135cdf89c48a52baa8920f69d702b22d1a7556af410709d2172b90ec33ff23
size 453459

3
gtk-doc-1.13.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:25c7fbfcd7a08995c665abe304c4da4ee6d1ea34db880f21b46fa9edb268b706
size 644297

View File

@ -0,0 +1,88 @@
From 9205ac8259016e7f07ee2fb608a81a4fad635032 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@gnome.org>
Date: Tue, 22 Dec 2009 12:54:31 +0100
Subject: [PATCH] gtkdoc-fixxref: make it work again without --module argument
This restores a compatible behavior with previous versions of gtk-doc,
which is required by many tarballs.
https://bugzilla.gnome.org/show_bug.cgi?id=605211
---
gtkdoc-fixxref.in | 58 ++++++++++++++++++++++++++++------------------------
1 files changed, 31 insertions(+), 27 deletions(-)
diff --git a/gtkdoc-fixxref.in b/gtkdoc-fixxref.in
index 8f166ef..cd784d3 100755
--- a/gtkdoc-fixxref.in
+++ b/gtkdoc-fixxref.in
@@ -168,36 +168,40 @@ foreach my $dir (@EXTRA_DIRS) {
}
}
-open (INPUT, "$MODULE-sections.txt")
- || die "Can't open $MODULE-sections.txt: $!";
-my $subsection = "";
-while (<INPUT>) {
- if (m/^#/) {
- next;
-
- } elsif (m/^<SECTION>/) {
- $subsection = "";
- } elsif (m/^<SUBSECTION\s*(.*)>/i) {
- $subsection = $1;
- } elsif (m/^<SUBSECTION>/) {
- next;
- } elsif (m/^<TITLE>(.*)<\/TITLE>/) {
- next;
- } elsif (m/^<FILE>(.*)<\/FILE>/) {
- next;
- } elsif (m/^<INCLUDE>(.*)<\/INCLUDE>/) {
- next;
- } elsif (m/^<\/SECTION>/) {
- next;
- } elsif (m/^(\S+)/) {
- my $symbol=CreateValidSGMLID($1);
-
- if ($subsection eq "Standard" || $subsection eq "Private") {
- $NoLinks{$symbol} = 1;
+if (defined($MODULE)) {
+ open (INPUT, "$MODULE-sections.txt")
+ || die "Can't open $MODULE-sections.txt: $!";
+ my $subsection = "";
+ while (<INPUT>) {
+ if (m/^#/) {
+ next;
+
+ } elsif (m/^<SECTION>/) {
+ $subsection = "";
+ } elsif (m/^<SUBSECTION\s*(.*)>/i) {
+ $subsection = $1;
+ } elsif (m/^<SUBSECTION>/) {
+ next;
+ } elsif (m/^<TITLE>(.*)<\/TITLE>/) {
+ next;
+ } elsif (m/^<FILE>(.*)<\/FILE>/) {
+ next;
+ } elsif (m/^<INCLUDE>(.*)<\/INCLUDE>/) {
+ next;
+ } elsif (m/^<\/SECTION>/) {
+ next;
+ } elsif (m/^(\S+)/) {
+ my $symbol=CreateValidSGMLID($1);
+
+ if ($subsection eq "Standard" || $subsection eq "Private") {
+ $NoLinks{$symbol} = 1;
+ }
}
}
+ close (INPUT);
+} else {
+ print "WARNING: Please fix your gtk-doc setup to use --module when calling gtkdoc-fixxref.\n"
}
-close (INPUT);
&FixCrossReferences ($MODULE_DIR);
--
1.6.4.2

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Tue Dec 22 13:12:34 CET 2009 - vuntz@opensuse.org
- Add gtk-doc-fixxref-module.patch to fix build for various
packages that do not call gtkdoc-fixxref the right way.
-------------------------------------------------------------------
Mon Dec 21 11:24:40 CET 2009 - vuntz@opensuse.org
- Update to version 1.13:
+ bgo#604891 : gtk-doc tarball does not build
- Use makeinstall macro.
-------------------------------------------------------------------
Fri Dec 18 11:13:06 CET 2009 - dimstar@opensuse.org
- Update to version 1.12:
+ Bugs fixed: bgo#591450, bgo#466535, bgo#502191, bgo#532395
bgo#536928, bgo#562064, bgo#562310, bgo#562655, bgo#565126
bgo#565835, bgo#566911, bgo#567132, bgo#568702, bgo#568706
bgo#568708, bgo#568714, bgo#568732, bgo#568734, bgo#569339
bgo#572396, bgo#572612, bgo#572967, bgo#574654, bgo#575574
bgo#575623, bgo#575711, bgo#576313, bgo#577059, bgo#577774
bgo#580206, bgo#580300, bgo#580622, bgo#581237, bgo#584952
bgo#587103, bgo#587196, bgo#589426, bgo#591789, bgo#594224
bgo#596730, bgo#596731, bgo#602026, bgo#602518, bgo#604798
-------------------------------------------------------------------
Fri Jan 23 01:19:35 CET 2009 - vuntz@novell.com

View File

@ -1,5 +1,5 @@
#
# spec file for package gtk-doc (Version 1.11)
# spec file for package gtk-doc (Version 1.13)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -28,7 +28,7 @@ BuildRequires: pkg-config
BuildRequires: python
BuildRequires: sgml-skel
BuildRequires: gnome-doc-utils-devel
License: GPL v2 or later
License: GPLv2+
Group: Productivity/Publishing/SGML
# Old for <= 10.2 & CODE10
Provides: gtkdoc = %{version}
@ -36,10 +36,12 @@ Obsoletes: gtkdoc
Requires: openjade libxml2 docbook-xsl-stylesheets libxslt docbook_4
Requires: docbook-dsssl-stylesheets
AutoReqProv: on
Version: 1.11
Version: 1.13
Release: 1
Summary: GTK+ DocBook Documentation Generator
Source: %{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM gtk-doc-fixxref-module.patch bgo605211 vuntz@opensuse.org -- Fix build of packages using gtk-doc, when they don't use it correctly
Patch0: gtk-doc-fixxref-module.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@ -49,26 +51,20 @@ documentation in DocBook format. It can extract documentation from
source code comments in a manner similar to Java-doc. It is used to
generate the documentation for GLib, Gtk+, and GNOME.
Authors:
--------
Damon Chaplin <damon@karuna.freeserve.co.uk>
Owen Taylor <otaylor@redhat.com>
%prep
%setup -q
%patch0 -p1
%build
%configure --disable-scrollkeeper
make %{?jobs:-j%jobs}
%install
make DESTDIR=$RPM_BUILD_ROOT install
%makeinstall
mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html
mv -v doc/README doc/doc.README
%files
%files
%defattr(-,root,root)
%doc AUTHORS COPYING COPYING-DOCS ChangeLog NEWS README TODO doc/*
%{_bindir}/*
@ -88,145 +84,3 @@ mv -v doc/README doc/doc.README
rm -rf $RPM_BUILD_ROOT
%changelog
* Fri Jan 23 2009 vuntz@novell.com
- Clean up file list in the spec file.
* Mon Dec 29 2008 mboman@suse.de
- Update to version 1.11:
+ Bugs fixed: bgo#531572, bgo#448879, bgo#311857, bgo#335239, bgo#460753,
bgo#473342, bgo#487727, bgo#523669, bgo#530758, bgo#533262, bgo#534627,
bgo#542137, bgo#543855, bgo#544172, bgo#552822, bgo#553407, bgo#554718,
bgo#554833, bgo#558082, bgo#559281
* Wed Apr 02 2008 maw@suse.de
- Add a note for future packagers.
* Tue Apr 01 2008 rodrigo@suse.de
- Update to version 1.10:
- http://mail.gnome.org/archives/gtk-doc-list/2008-March/msg00001.html
- Added python as a build dependency
* Fri Nov 23 2007 maw@suse.de
- Update to version 1.9
- Bugs (bugzilla.gnome.org) fixed: #419308, #449618, #453717,
[#457173], #465920, #467773, #141869, #156643, #322035, #323938,
[#324535], #355352, #379466, #380824, #383456, #411739, #415388,
[#418027], #419997, #428596, #434134, #436565, #445596, #445693,
[#450338], #454916, #457077, #459225, #459725, #460127, #465365,
[#466559], #471014, #477532, #479913, and #479923.
* Wed Mar 21 2007 maw@suse.de
- Update to version 1.8
- Various bug fixes.
* Fri Sep 01 2006 sbrabec@suse.cz
- Package renamed to gtk-doc.
- Prefix changed to /usr.
- Spec file cleanup.
* Thu Aug 17 2006 jhargadon@suse.de
- update to version 1.7
- Fixed bug that resulted in empty "@:" lines in the templates.
- Fixed a few bugs with the XSL code.
- Supported a few more variations of C syntax.
- Remove the internally-used '-struct' suffix from links to widget
structs.
- Fixed a few missing build dependencies.
- Added a new "C-x4s" binding to the emacs lisp code, to insert a blank
section header in the source code.
- Fixed bug that ignored inline section header docs with '-' in
their names.
- Added a 'make docs' target that can be used to build the docs even
when gtk-doc has been disabled at configure time.
* Fri Jul 21 2006 gekker@suse.de
- Update to version 1.6
o Removed the hard dependancy on openjade or jade, since XML is used mainly
now rather than SGML.
o Install the .pc file in $(datadir) rather than $(libdir) since gtk-doc is
architecture-independant.
o Added "--ignore-decorators" option to ignore a list of declarators in
function declarations.
o Support '#Object::signal'/'#Object:property' to link to signals/properties
o Fixed missing index terms.
- Update to version 1.5
o Output the new version of devhelp2 information, but still generate the old
devhelp files so older versions of DevHelp still work OK.
o Fixed the initial creation of the *-sections.txt file so the object
hierarchy, signals and properties all work automatically.
o Show information about signal flags (run first/last).
o Support a --source-suffixes argument specifying which source files to scan.
o Support other root object types besides GObject and GInterface.
o Use a fixed navigation bar for the generated documentation.
o New documentation from Stefan Kost.
o Handle more variations of C syntax.
* Tue Mar 14 2006 gekker@suse.de
- Require docbook-dsssl-stylesheets for SGML output (#152467)
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Thu Jul 21 2005 gekker@suse.de
- Update to version 1.4.
* Tue May 17 2005 sbrabec@suse.cz
- Added noarch and moved pkgconfig file to datadir (#83201).
* Wed May 11 2005 sbrabec@suse.cz
- Removed noarch (#83201).
* Mon Jan 17 2005 clahey@suse.de
- Updated to version 1.3.
* Tue Feb 24 2004 hmacht@suse.de
- building as non-root
* Thu Feb 19 2004 sbrabec@suse.cz
- Updated to version 1.2.
* Tue Jul 15 2003 sbrabec@suse.cz
- GNOME prefix change to /opt/gnome.
* Tue Jun 17 2003 sbrabec@suse.cz
- Fixed head usage for new coreutils.
- Fixed neededforbuild.
* Tue Jun 17 2003 coolo@suse.de
- package directories
* Wed May 28 2003 ke@suse.de
- Use DESTDIR
- Add sgml-skel to #neededforbuild.
* Mon May 26 2003 sbrabec@suse.cz
- Updated to version 1.1.
- Package marked as noarch.
- Fixed Requires.
* Fri Jan 17 2003 sbrabec@suse.cz
- Fixed %%clean.
* Thu Jan 16 2003 sbrabec@suse.cz
- Updated to version 0.10.
* Tue Jan 14 2003 ro@suse.de
- fix newlines printed from perl-code generating gconf-scan
* Mon Nov 11 2002 ro@suse.de
- adapted requires
* Mon Nov 11 2002 ro@suse.de
- changed neededforbuild <jade_dsl> to <openjade>
- changed neededforbuild <sp> to <opensp>
- changed neededforbuild <sp-devel> to <>
* Sun Aug 18 2002 ro@suse.de
- don't overwrite READMEs with each other
* Fri Nov 30 2001 ro@suse.de
- changed neededforbuild <docbktls> to <docbook-toys>
* Mon Nov 26 2001 hhetter@suse.de
- fixed filelist
* Mon Aug 13 2001 ro@suse.de
- changed neededforbuild <sp_libs> to <sp-devel>
* Wed Aug 08 2001 hhetter@suse.de
- updated to version 0.7
* Tue Mar 27 2001 ro@suse.de
- changed neededforbuild <docbkdsl> to <docbook-dsssl-stylesheets>
* Tue Mar 13 2001 ro@suse.de
- changed neededforbuild <docbk30> to <docbook_3>
* Mon Jan 01 2001 egger@suse.de
- Updated to the real 0.4 instead of using a CVS snapshot.
- Fixed specfile and use BuildRoot.
- Cleaned up neededforbuild.
- Recompressed with bzip2.
- Added proper group tag.
* Wed Nov 01 2000 egger@suse.de
- Updated specfile to new long packagenames.
- Reworked specfile.
- Probably needs some more work; I'm taking care of that.
* Thu Jun 08 2000 egger@suse.de
- Try whether an additional gtk_signal_init() solves our
misterious problems.
* Wed May 10 2000 egger@suse.de
- Changed version on request of bk@suse.de.
* Mon Apr 10 2000 egger@suse.de
- Reenabled the package.
Please note due to general confusion: This is != gtkref!
* Thu Mar 30 2000 egger@suse.de
- Renamed also the dir to gtkdoc.
* Thu Mar 23 2000 egger@suse.de
- Inital version.