diff options
Diffstat (limited to 'app-doc')
| -rw-r--r-- | app-doc/doxygen/ChangeLog | 12 | ||||
| -rw-r--r-- | app-doc/doxygen/doxygen-1.8.2.ebuild | 241 | ||||
| -rw-r--r-- | app-doc/doxygen/doxygen-1.8.3.1.ebuild (renamed from app-doc/doxygen/doxygen-1.8.1.2.ebuild) | 5 | ||||
| -rw-r--r-- | app-doc/doxygen/files/doxygen-1.8.3.1-empty-line-sigsegv.patch | 20 |
4 files changed, 33 insertions, 245 deletions
diff --git a/app-doc/doxygen/ChangeLog b/app-doc/doxygen/ChangeLog index 4c26fb5e1380..0051e1c25104 100644 --- a/app-doc/doxygen/ChangeLog +++ b/app-doc/doxygen/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-doc/doxygen -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.232 2012/10/07 08:54:33 pacho Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/ChangeLog,v 1.233 2013/01/28 08:15:02 xarthisius Exp $ + +*doxygen-1.8.3.1 (28 Jan 2013) + + 28 Jan 2013; Kacper Kowalik <xarthisius@gentoo.org> +doxygen-1.8.3.1.ebuild, + +files/doxygen-1.8.3.1-empty-line-sigsegv.patch, -doxygen-1.8.1.2.ebuild, + -doxygen-1.8.2.ebuild: + Version bump including fixes for #454348 by Sebastian Pipping + <sping@gentoo.org>. Drop old 07 Oct 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml: Drop maintainer due retirement, #24135. diff --git a/app-doc/doxygen/doxygen-1.8.2.ebuild b/app-doc/doxygen/doxygen-1.8.2.ebuild deleted file mode 100644 index c552d2744cb4..000000000000 --- a/app-doc/doxygen/doxygen-1.8.2.ebuild +++ /dev/null @@ -1,241 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.8.2.ebuild,v 1.1 2012/08/11 17:29:15 xarthisius Exp $ - -EAPI=4 - -inherit eutils fdo-mime flag-o-matic python qt4-r2 toolchain-funcs - -DESCRIPTION="Documentation system for most programming languages" -HOMEPAGE="http://www.doxygen.org/" -SRC_URI="http://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz - http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" -IUSE="debug doc dot qt4 latex elibc_FreeBSD userland_GNU" - -#missing SerbianCyrilic, JapaneseEn, KoreanEn, Chinesetraditional - -LANGS=(hy ar pt_BR ca zh cs de da eo es fa fi fr el hr hu id it ja ko lt mk -nl nb pl pt ro ru sl sk sr sv tr uk vi af) -for X in "${LANGS[@]}" ; do - IUSE="${IUSE} linguas_${X}" -done - -RDEPEND="qt4? ( x11-libs/qt-gui:4 ) - latex? ( app-text/texlive[extra] ) - dev-lang/perl - virtual/libiconv - media-libs/libpng - app-text/ghostscript-gpl - dot? ( - media-gfx/graphviz - media-libs/freetype - )" - -DEPEND="sys-apps/sed - sys-devel/flex - sys-devel/bison - doc? ( =dev-lang/python-2* ) - ${RDEPEND}" - -RESTRICT="mirror" -EPATCH_SUFFIX="patch" - -get_langs() { - # using only user set linguas also fixes #263641 - my_linguas=() - for lingua in ${LINGUAS}; do - if has ${lingua} "${LANGS[@]}"; then - case ${lingua} in - hy) lingua=am ;; - pt_BR) lingua=br ;; - zh*) lingua=cn ;; - cs) lingua=cz ;; - da) lingua=dk ;; - el*) lingua=gr ;; - ja*) lingua=jp ;; - ko) lingua=kr ;; - nb) lingua=no ;; - sl) lingua=si ;; - tr*) lingua=tr ;; - uk) lingua=ua ;; - af) lingua=za ;; - esac - has ${lingua} "${my_linguas[@]}" || - my_linguas+=(${lingua}) - fi - done - f_langs="${my_linguas[@]}" - echo ${f_langs// /,} -} - -pkg_setup() { - tc-export CC CXX - if use doc; then - python_set_active_version 2 - python_pkg_setup - fi -} - -src_prepare() { - # use CFLAGS, CXXFLAGS, LDFLAGS - export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}" - - sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \ - -e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \ - -e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \ - -e "s:^\(TMAKE_CXX\s*\)=.*$:\1= $(tc-getCXX):" \ - -e "s:^\(TMAKE_LINK\s*\)=.*$:\1= $(tc-getCXX):" \ - -e "s:^\(TMAKE_LINK_SHLIB\s*\)=.*$:\1= $(tc-getCXX):" \ - -e "s:^\(TMAKE_CXX\s*\)=.*$:\1= $(tc-getCC):" \ - tmake/lib/{{linux,gnu,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++,linux-64}/tmake.conf \ - || die - - # Ensure we link to -liconv - if use elibc_FreeBSD; then - for pro in */*.pro.in */*/*.pro.in; do - echo "unix:LIBS += -liconv" >> "${pro}" - done - fi - - # Call dot with -Teps instead of -Tps for EPS generation - bug #282150 - sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die - - # prefix search tools patch, plus OSX fixes - epatch "${FILESDIR}"/${PN}-1.8.1-prefix-misc-alt.patch - - # fix final DESTDIR issue - sed -i.orig -e "s:\$(INSTALL):\$(DESTDIR)/\$(INSTALL):g" \ - -e "s/all: Makefile.doxywizard/all:/g" \ - addon/doxywizard/Makefile.in || die - - # fix pdf doc - sed -i.orig -e "s:g_kowal:g kowal:" \ - doc/maintainers.txt || die - - # old value is not enough for codes written in modern Fortran - sed -i -e '/define MAX_INCLUDE_DEPTH/ s/10/20/g' \ - src/fortranscanner.* || die - - sed -e "s/\$(DATE)/$(LC_ALL="C" LANG="C" date)/g" \ - -i Makefile.in || die #428280 - - if is-flagq "-O3" ; then - echo - ewarn "Compiling with -O3 is known to produce incorrectly" - ewarn "optimized code which breaks doxygen." - echo - elog "Continuing with -O2 instead ..." - echo - replace-flags "-O3" "-O2" - fi -} - -src_configure() { - # set ./configure options (prefix, Qt based wizard, docdir) - - local my_conf="--shared --enable-langs $(get_langs)" - - if use debug ; then - my_conf="${my_conf} --debug" - else - my_conf="${my_conf} --release " - fi - - use ppc64 && my_conf="${my_conf} --english-only" #263641 - - use qt4 && my_conf="${my_conf} --with-doxywizard" - - # On non GNU userland (e.g. BSD), configure script picks up make and bails - # out because it is not GNU make, so we force the right value. - use userland_GNU || my_conf="${my_conf} --make ${MAKE} --install install" - - export LINK="${QMAKE_LINK}" - export LINK_SHLIB="${QMAKE_CXX}" - - if use qt4 ; then - pushd addon/doxywizard &> /dev/null - eqmake4 doxywizard.pro -o Makefile.doxywizard - popd &> /dev/null - fi - - ./configure --prefix "${EPREFIX}/usr" ${my_conf} \ - || die -} - -src_compile() { - - emake CFLAGS+="${ECFLAGS}" CXXFLAGS+="${ECXXFLAGS}" \ - LFLAGS+="${ELDFLAGS}" all - - # generate html and pdf (if tetex in use) documents. - # errors here are not considered fatal, hence the ewarn message - # TeX's font caching in /var/cache/fonts causes sandbox warnings, - # so we allow it. - if use doc; then - if ! use dot; then - sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \ - {Doxyfile,doc/Doxyfile} \ - || ewarn "disabling dot failed" - fi - if use latex; then - addwrite /var/cache/fonts - addwrite /var/cache/fontconfig - addwrite /usr/share/texmf/fonts/pk - addwrite /usr/share/texmf/ls-R - make pdf || ewarn '"make pdf docs" failed.' - else - cp doc/Doxyfile doc/Doxyfile.orig - cp doc/Makefile doc/Makefile.orig - sed -i.orig -e "s/GENERATE_LATEX = YES/GENERATE_LATEX = NO/" \ - doc/Doxyfile - sed -i.orig -e "s/@epstopdf/# @epstopdf/" \ - -e "s/@cp Makefile.latex/# @cp Makefile.latex/" \ - -e "s/@sed/# @sed/" doc/Makefile - make docs || ewarn '"make docs" failed.' - fi - fi -} - -src_install() { - emake DESTDIR="${D}" MAN1DIR=share/man/man1 install - - if use qt4; then - doicon "${DISTDIR}/doxywizard.png" - make_desktop_entry doxywizard "DoxyWizard ${PV}" \ - "/usr/share/pixmaps/doxywizard.png" \ - "Application;Development" - fi - - dodoc INSTALL LANGUAGE.HOWTO README - - # pdf and html manuals - if use doc; then - dohtml -r html/* - use latex && dodoc latex/doxygen_manual.pdf - fi -} - -pkg_postinst() { - fdo-mime_desktop_database_update - - elog - elog "The USE flags qt4, doc, and latex will enable doxywizard, or" - elog "the html and pdf documentation, respectively. For examples" - elog "and other goodies, see the source tarball. For some example" - elog "output, run doxygen on the doxygen source using the Doxyfile" - elog "provided in the top-level source dir." - elog - elog "Disabling the dot USE flag will remove the GraphViz dependency," - elog "along with Doxygen's ability to generate diagrams in the docs." - elog "See the Doxygen homepage for additional helper tools to parse" - elog "more languages." - elog -} - -pkg_postrm() { - fdo-mime_desktop_database_update -} diff --git a/app-doc/doxygen/doxygen-1.8.1.2.ebuild b/app-doc/doxygen/doxygen-1.8.3.1.ebuild index c50cff251005..d0a73461f05a 100644 --- a/app-doc/doxygen/doxygen-1.8.1.2.ebuild +++ b/app-doc/doxygen/doxygen-1.8.3.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.8.1.2.ebuild,v 1.3 2012/08/11 09:30:03 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.8.3.1.ebuild,v 1.1 2013/01/28 08:15:02 xarthisius Exp $ EAPI=4 @@ -106,6 +106,7 @@ src_prepare() { # prefix search tools patch, plus OSX fixes epatch "${FILESDIR}"/${PN}-1.8.1-prefix-misc-alt.patch + epatch "${FILESDIR}"/${P}-empty-line-sigsegv.patch #454348 # fix final DESTDIR issue sed -i.orig -e "s:\$(INSTALL):\$(DESTDIR)/\$(INSTALL):g" \ diff --git a/app-doc/doxygen/files/doxygen-1.8.3.1-empty-line-sigsegv.patch b/app-doc/doxygen/files/doxygen-1.8.3.1-empty-line-sigsegv.patch new file mode 100644 index 000000000000..4b51ce95bc1a --- /dev/null +++ b/app-doc/doxygen/files/doxygen-1.8.3.1-empty-line-sigsegv.patch @@ -0,0 +1,20 @@ +removeEmptyLines() segfaults on empty string + +https://bugs.gentoo.org/show_bug.cgi?id=454348 +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676423 + +Patch written by Thibaut Paumard <paumard@users.sourceforge.net> +--- a/src/htmlgen.cpp ++++ b/src/htmlgen.cpp +@@ -1022,6 +1022,11 @@ + static QCString removeEmptyLines(const QCString &s) + { + BufStr out(s.length()+1); ++ if (s.length()==0) ++ { ++ out.addChar('\0'); ++ return out.data(); ++ } + char *p=s.data(); + if (p) + { |