Accepting request 36343 from GNOME:Factory
Copy from GNOME:Factory/gtk-doc based on submit request 36343 from user vuntz OBS-URL: https://build.opensuse.org/request/show/36343 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gtk-doc?expand=0&rev=10
This commit is contained in:
OBS User autobuild
Git OBS Bridge
parent
26fc868949
commit
2293f9d558
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:25c7fbfcd7a08995c665abe304c4da4ee6d1ea34db880f21b46fa9edb268b706
|
||||
size 644297
|
||||
3
gtk-doc-1.14.tar.bz2
Normal file
3
gtk-doc-1.14.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a92aa890d35ff9ac152d3a6957dc66d486046c1993538eaf2be13b4d4d089c03
|
||||
size 785147
|
||||
@ -1,88 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,3 +1,28 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 29 11:13:18 CEST 2010 - vuntz@opensuse.org
|
||||
|
||||
- Update to version 1.14:
|
||||
+ bgo#599514: sane support for per-page images
|
||||
+ bgo#613611: parameter descriptions with annotations truncated
|
||||
at first \n
|
||||
+ bgo#115531: add short description to index entries
|
||||
+ bgo#165425: gtk-doc fails to parse unions
|
||||
+ bgo#512155: gets confused by multiline typedef
|
||||
+ bgo#568711: undocumented enum values are not reported
|
||||
+ bgo#590625: $(DOC_MODULE)-overrides.txt is required by "make
|
||||
dist"
|
||||
+ bgo#604992: gtkdoc-fixxref broken link warning is broken for
|
||||
functions
|
||||
+ bgo#607445: gtk-doc does not support long double as returned
|
||||
value type
|
||||
+ bgo#609194: sort interface implementers
|
||||
+ Other misc. bugs fixed: bgo#593282, bgo#604892, bgo#590602,
|
||||
bgo#591975, bgo#604885, bgo#604995, bgo#604998, bgo#605052,
|
||||
bgo#605211, bgo#605281, bgo#605285, bgo#605289, bgo#605452,
|
||||
bgo#605564, bgo#606661, bgo#607531, bgo#609062, bgo#610255,
|
||||
bgo#610257, bgo#611848
|
||||
- Drop gtk-doc-fixxref-module.patch: fixed upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 22 13:12:34 CET 2009 - vuntz@opensuse.org
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package gtk-doc (Version 1.13)
|
||||
# spec file for package gtk-doc (Version 1.14)
|
||||
#
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -36,12 +36,10 @@ Obsoletes: gtkdoc
|
||||
Requires: openjade libxml2 docbook-xsl-stylesheets libxslt docbook_4
|
||||
Requires: docbook-dsssl-stylesheets
|
||||
AutoReqProv: on
|
||||
Version: 1.13
|
||||
Version: 1.14
|
||||
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
|
||||
|
||||
@ -53,7 +51,6 @@ generate the documentation for GLib, Gtk+, and GNOME.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%configure --disable-scrollkeeper
|
||||
|
||||
Loading…
Reference in New Issue
Block a user