diff options
| author | Eric Sandall | 2010-10-06 15:36:33 -0700 |
|---|---|---|
| committer | Eric Sandall | 2010-10-06 15:37:16 -0700 |
| commit | dca20b38089c9413815da76bcc3501486aa0a506 (patch) | |
| tree | 59a64348f7b853f97bc9b6fe2a977bcc0b02a544 | |
| parent | 82937929f8f0dc76e6b8df0135bf29475d1f1714 (diff) | |
gtk-doc: Fix https://bugzilla.gnome.org/show_bug.cgi?id=612028
Fixes eggdbus compilation, even when using '--disable-gtk-doc'
PATCHLEVEL++
readline() on closed filehandle NEWFILE at /usr/bin/gtkdoc-fixxref line 470.
Use of uninitialized value in substitution (s///) at /usr/bin/gtkdoc-fixxref line 473.
Use of uninitialized value in substitution (s///) at /usr/bin/gtkdoc-fixxref line 474.
Use of uninitialized value in substitution (s///) at /usr/bin/gtkdoc-fixxref line 478.
Use of uninitialized value in substitution (s///) at /usr/bin/gtkdoc-fixxref line 479.
Use of uninitialized value in substitution (s///) at /usr/bin/gtkdoc-fixxref line 480.
Use of uninitialized value in substitution (s///) at /usr/bin/gtkdoc-fixxref line 481.
Use of uninitialized value in substitution (s///) at /usr/bin/gtkdoc-fixxref line 482.
Use of uninitialized value in substitution (s///) at /usr/bin/gtkdoc-fixxref line 483.
Use of uninitialized value in substitution (s///) at /usr/bin/gtkdoc-fixxref line 484.
Can't delete html/_temp_src.29581.h.html: No such file or directory at /usr/bin/gtkdoc-fixxref line 489.
| -rwxr-xr-x | gnome2-libs/gtk-doc/DETAILS | 1 | ||||
| -rw-r--r-- | gnome2-libs/gtk-doc/HISTORY | 6 | ||||
| -rwxr-xr-x | gnome2-libs/gtk-doc/PRE_BUILD | 3 | ||||
| -rw-r--r-- | gnome2-libs/gtk-doc/bug612028.patch | 18 |
4 files changed, 28 insertions, 0 deletions
diff --git a/gnome2-libs/gtk-doc/DETAILS b/gnome2-libs/gtk-doc/DETAILS index fd55bcc616..0420f0f787 100755 --- a/gnome2-libs/gtk-doc/DETAILS +++ b/gnome2-libs/gtk-doc/DETAILS @@ -6,6 +6,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE SOURCE_GPG="gurus.gpg:${SOURCE}.sig" LICENSE[0]=GPL + PATCHLEVEL=1 WEB_SITE=http://www.gtk.org/gtk-doc/ ENTERED=20020509 KEYWORDS="gnome2 libs" diff --git a/gnome2-libs/gtk-doc/HISTORY b/gnome2-libs/gtk-doc/HISTORY index 908f4e20e2..51a66c4caa 100644 --- a/gnome2-libs/gtk-doc/HISTORY +++ b/gnome2-libs/gtk-doc/HISTORY @@ -1,3 +1,9 @@ +2010-10-06 Eric Sandall <sandalle@sourcemage.org> + * DETAILS: PATCHLEVEL++ + * PRE_BUILD: Apply bug612028.patch + * bug612028.patch: Fix https://bugzilla.gnome.org/show_bug.cgi?id=612028 + Fixes eggdbus compilation, even when using '--disable-gtk-doc' + 2010-05-23 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 1.15 diff --git a/gnome2-libs/gtk-doc/PRE_BUILD b/gnome2-libs/gtk-doc/PRE_BUILD new file mode 100755 index 0000000000..0ae4d00304 --- /dev/null +++ b/gnome2-libs/gtk-doc/PRE_BUILD @@ -0,0 +1,3 @@ +default_pre_build && +patch $SOURCE_DIRECTORY/gtkdoc-fixxref.in \ + $SPELL_DIRECTORY/bug612028.patch diff --git a/gnome2-libs/gtk-doc/bug612028.patch b/gnome2-libs/gtk-doc/bug612028.patch new file mode 100644 index 0000000000..275e1db62b --- /dev/null +++ b/gnome2-libs/gtk-doc/bug612028.patch @@ -0,0 +1,18 @@ +# +# From http://git.gnome.org/browse/gtk-doc/commit/?id=2bffebcf9c125f5610b8fb660d42c3c5b9dfd4f0 +# to fix https://bugzilla.gnome.org/show_bug.cgi?id=612028 +# + +diff --git a/gtkdoc-fixxref.in b/gtkdoc-fixxref.in +index 33a31b8..9f53852 100755 +--- a/gtkdoc-fixxref.in ++++ b/gtkdoc-fixxref.in +@@ -464,7 +464,7 @@ sub HighlightSourceVim { + close (NEWFILE); + + # format source +- system "echo 'let html_number_lines=0|let html_use_css=1|let use_xhtml=1|syn on|e $temp_source_file|run! syntax/2html.vim|wa!|qa!' | @HIGHLIGHT@ -n -e -u /dev/null -T xterm >/dev/null"; ++ system "echo 'let html_number_lines=0|let html_use_css=1|let use_xhtml=1|syn on|e $temp_source_file|run! syntax/2html.vim|w! $temp_source_file.html|qa!' | @HIGHLIGHT@ -n -e -u NONE -T xterm >/dev/null"; + + my $highlighted_source; + { |