diff options
Diffstat (limited to 'dev-util/gtk-doc/files')
4 files changed, 24 insertions, 126 deletions
diff --git a/dev-util/gtk-doc/files/gtk-doc-1.13-fixxref-vim-u-NONE.patch b/dev-util/gtk-doc/files/gtk-doc-1.13-fixxref-vim-u-NONE.patch deleted file mode 100644 index 6d608fcd9061..000000000000 --- a/dev-util/gtk-doc/files/gtk-doc-1.13-fixxref-vim-u-NONE.patch +++ /dev/null @@ -1,16 +0,0 @@ -Call vim with -u NONE instead of -u /dev/null -This prevents plugins from being loaded, and fixes -http://bugs.gentoo.org/show_bug.cgi?id=306569 - ---- ---- gtkdoc-fixxref.in -+++ gtkdoc-fixxref.in -@@ -455,7 +455,7 @@ - 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|wa!|qa!' | @HIGHLIGHT@ -n -e -u NONE -T xterm >/dev/null"; - - my $highlighted_source; - { diff --git a/dev-util/gtk-doc/files/gtk-doc-1.15-allow-selection-highlighter.patch b/dev-util/gtk-doc/files/gtk-doc-1.15-allow-selection-highlighter.patch deleted file mode 100644 index a3b2b9d1835a..000000000000 --- a/dev-util/gtk-doc/files/gtk-doc-1.15-allow-selection-highlighter.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 8506e3b61dca2861b594c3cea2dc4e0470aad4fc Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Sun, 26 Sep 2010 18:48:04 +0200 -Subject: [PATCH 01/13] Allow selection of a specific syntax highlighter, bug #628611. - ---- - configure.ac | 53 +++++++++++++++++++++++++++++++++++++++++++---------- - 1 files changed, 43 insertions(+), 10 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 3d7c8e1..9dada11 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -100,26 +100,59 @@ JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/html/ch - dnl - dnl Check for syntax highlighters - dnl -+AC_ARG_WITH([highlight], -+ AS_HELP_STRING([--with-highlight], [Select source code syntax highlighter (no|source-highlight|highlight|vim|auto)]), -+ , [with_highlight=auto]) -+ -+case $with_highlight in -+ no|source-highlight|highlight|vim|auto) ;; -+ *) AC_MSG_ERROR([Invalid value for syntax highlighting option.]) ;; -+esac -+ - HIGHLIGHT_OPTIONS="" --AC_PATH_PROG([HIGHLIGHT], [source-highlight]) --if test -n "$HIGHLIGHT"; then -- HIGHLIGHT_OPTIONS="-t4 -sc -cstyle.css --no-doc -i" --else -- AC_PATH_PROG([HIGHLIGHT], [highlight]) -+if test "$with_highlight" = "auto"; then -+ AC_PATH_PROG([HIGHLIGHT], [source-highlight]) - if test -n "$HIGHLIGHT"; then -- HIGHLIGHT_OPTIONS="-X -f --class-name=gtkdoc " -+ HIGHLIGHT_OPTIONS="-t4 -sc -cstyle.css --no-doc -i" - else -- AC_PATH_PROG([HIGHLIGHT], [vim]) -+ AC_PATH_PROG([HIGHLIGHT], [highlight]) - if test -n "$HIGHLIGHT"; then -- dnl vim is useless if it does not support syntax highlighting -+ HIGHLIGHT_OPTIONS="-X -f --class-name=gtkdoc " -+ else -+ AC_PATH_PROG([HIGHLIGHT], [vim]) -+ if test -n "$HIGHLIGHT"; then -+ dnl vim is useless if it does not support syntax highlighting -+ AC_MSG_CHECKING([whether vim has +syntax feature]) -+ if $HIGHLIGHT --version | grep '+syntax' >/dev/null; then -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_RESULT([no]) -+ HIGHLIGHT= -+ fi -+ fi -+ fi -+ fi -+else -+ if test "$with_highlight" != "no"; then -+ AC_PATH_PROG([HIGHLIGHT], [$with_highlight], [no]) -+ fi -+ -+ case $with_highlight in -+ source-highlight) HIGHLIGHT_OPTIONS="-t4 -sc -cstyle.css --no-doc -i";; -+ highlight) HIGHLIGHT_OPTIONS="-X -f --class-name=gtkdoc ";; -+ vim) - AC_MSG_CHECKING([whether vim has +syntax feature]) - if $HIGHLIGHT --version | grep '+syntax' >/dev/null; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) -- HIGHLIGHT= -+ HIGHLIGHT=no - fi -- fi -+ ;; -+ esac -+ -+ if test "$HIGHLIGHT" = "no" && test "$with_highlight" != "no"; then -+ AC_MSG_ERROR([Could not find requested syntax highlighter]) - fi - fi - AC_SUBST([HIGHLIGHT_OPTIONS]) --- -1.7.3.1 - diff --git a/dev-util/gtk-doc/files/gtk-doc-1.15-fixxref-vim-fixes.patch b/dev-util/gtk-doc/files/gtk-doc-1.15-fixxref-vim-fixes.patch deleted file mode 100644 index ae29570487ef..000000000000 --- a/dev-util/gtk-doc/files/gtk-doc-1.15-fixxref-vim-fixes.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 2bffebcf9c125f5610b8fb660d42c3c5b9dfd4f0 Mon Sep 17 00:00:00 2001 -From: Stefan Kost <ensonic@users.sf.net> -Date: Thu, 19 Aug 2010 14:45:54 +0000 -Subject: fixxref: tweak the vim invocation - -Use specific output-filename to ensure we get what we'll late use. Use "-u NONE" -instead of -u /dev/null. -Fixes #627223 ---- -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; - { --- -cgit v0.8.3.1 diff --git a/dev-util/gtk-doc/files/gtk-doc-1.17-buildir-docs.patch b/dev-util/gtk-doc/files/gtk-doc-1.17-buildir-docs.patch new file mode 100644 index 000000000000..2935f4b68cf4 --- /dev/null +++ b/dev-util/gtk-doc/files/gtk-doc-1.17-buildir-docs.patch @@ -0,0 +1,24 @@ +--- gtk-doc.make~ 2011-02-02 23:11:15.000000000 +0100 ++++ gtk-doc.make 2011-09-10 18:55:53.441311194 +0200 +@@ -208,8 +208,8 @@ + rm -rf xml html + + install-data-local: +- @installfiles=`echo $(srcdir)/html/*`; \ +- if test "$$installfiles" = '$(srcdir)/html/*'; \ ++ @installfiles=`echo $(builddir)/html/*`; \ ++ if test "$$installfiles" = '$(builddir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ + if test -n "$(DOC_MODULE_VERSION)"; then \ +--- gtk-doc.notmpl.make~ 2011-02-02 23:11:09.000000000 +0100 ++++ gtk-doc.notmpl.make 2011-09-10 18:57:06.305169389 +0200 +@@ -187,7 +187,7 @@ + + install-data-local: + @installfiles=`echo $(builddir)/html/*`; \ +- if test "$$installfiles" = '$(srcdir)/html/*'; \ ++ if test "$$installfiles" = '$(builddir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ + if test -n "$(DOC_MODULE_VERSION)"; then \ |