From 712f0e23350786c458cbbae65fc1691ca5deabb2 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Sun, 9 Aug 2015 01:18:41 -0500 Subject: app-doc/doxygen: remove old; remove unused patches Package-Manager: portage-2.2.20 --- app-doc/doxygen/Manifest | 3 - app-doc/doxygen/doxygen-1.8.10.ebuild | 184 ---------------- app-doc/doxygen/doxygen-1.8.3.1.ebuild | 239 -------------------- app-doc/doxygen/doxygen-1.8.4-r2.ebuild | 242 --------------------- app-doc/doxygen/doxygen-1.8.8.ebuild | 241 -------------------- app-doc/doxygen/files/1.4.7/01_all_cp1251.patch | 35 --- .../doxygen/files/1.4.7/05_all_system-libpng.patch | 124 ----------- app-doc/doxygen/files/1.4.7/06_all_qtools.patch | 44 ---- .../doxygen/files/doxygen-1.5-legacy-patches.diff | 203 ----------------- app-doc/doxygen/files/doxygen-1.5-qtlibdir.patch | 11 - .../doxygen/files/doxygen-1.5-system-libpng.patch | 105 --------- .../files/doxygen-1.5.6-prefix-misc-alt.patch | 78 ------- app-doc/doxygen/files/doxygen-1.5.8-kdedocs.patch | 32 --- .../files/doxygen-1.8.4-infinite_loop.patch | 26 --- .../doxygen/files/doxygen-1.8.4-libreoffice.patch | 30 --- 15 files changed, 1597 deletions(-) delete mode 100644 app-doc/doxygen/doxygen-1.8.10.ebuild delete mode 100644 app-doc/doxygen/doxygen-1.8.3.1.ebuild delete mode 100644 app-doc/doxygen/doxygen-1.8.4-r2.ebuild delete mode 100644 app-doc/doxygen/doxygen-1.8.8.ebuild delete mode 100644 app-doc/doxygen/files/1.4.7/01_all_cp1251.patch delete mode 100644 app-doc/doxygen/files/1.4.7/05_all_system-libpng.patch delete mode 100644 app-doc/doxygen/files/1.4.7/06_all_qtools.patch delete mode 100644 app-doc/doxygen/files/doxygen-1.5-legacy-patches.diff delete mode 100644 app-doc/doxygen/files/doxygen-1.5-qtlibdir.patch delete mode 100644 app-doc/doxygen/files/doxygen-1.5-system-libpng.patch delete mode 100644 app-doc/doxygen/files/doxygen-1.5.6-prefix-misc-alt.patch delete mode 100644 app-doc/doxygen/files/doxygen-1.5.8-kdedocs.patch delete mode 100644 app-doc/doxygen/files/doxygen-1.8.4-infinite_loop.patch delete mode 100644 app-doc/doxygen/files/doxygen-1.8.4-libreoffice.patch diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest index e5838ebee59f..9ec16b044b4c 100644 --- a/app-doc/doxygen/Manifest +++ b/app-doc/doxygen/Manifest @@ -1,7 +1,4 @@ DIST doxygen-1.8.10.src.tar.gz 4818276 SHA256 cedf78f6d213226464784ecb999b54515c97eab8a2f9b82514292f837cf88b93 SHA512 a7f29b5f7b9f55b7e5382b7b7dc7212247a27869bc265433c0ee51480645b3f5f0732d1f5aefd54952204c8a1c98b96ec1ecc22c1ff7a072db5b2356b5981074 WHIRLPOOL 5607e1da5cf8e653ec895a7601a3a6585790a555207928bde6d154ab06173c68e088a61c1963da8d8cdc1a571b66eeaa102acc2a2e4291e0be87634d8e554962 -DIST doxygen-1.8.3.1.src.tar.gz 6196887 SHA256 0c749f68101b6c04ccb0d9696dd37836a6ba62cd8002add275058a975ee72b55 SHA512 365e553364ad61950a29477d8e751e98f4af9ce4a999c788cd25ce5a58ebbd931960689c4faddabd71cda60174777e41ed814ba633c19287c9f9696e0d7fa169 WHIRLPOOL cab6bbad971b794e07e95bee548ed9b9233b7b420dd96db8d4cb7b68a1b1232546c3976556b043e9a31c2e32e8619a57a0a7a58aa846a4806b9cc08aa1a9bc80 -DIST doxygen-1.8.4.src.tar.gz 6456090 SHA256 526442fb70bea79a4086cc98c22692cc05edc2f4cf231feb7993b5d188ef584e SHA512 984b4aa88afd3edb067e054b08de624f8afe927d31a45466349e83aa125e061c1ecac2d5f021e0d345fddf3ed7d5211509a445433af54d629a09bbb24b27e026 WHIRLPOOL d5137d0c2cbda8d1d768b1a92b6778312862d3cb4113c9be59489f061d0ad80c5162417d8bf9efef54852b23f985390791049c843a45be5eafcd586628f96d9c DIST doxygen-1.8.5.src.tar.gz 6511944 SHA256 243a8b67db12ad68d6ea5b51c6f60dc2cc3a34fa47abf1b5b4499196c3d7cc25 SHA512 56d2b262feae41fe9acf3c0c8ad3dd1d8868a52c17e2d9882a553570311482ec73548c0a70ae0ad7ccd7d1011a69968f284031beb93f915bab3a4c740b943f47 WHIRLPOOL 934cb01d7898cbdf04d2f293534ade1b8ce1c48a378fb141e063a83455ccf94c733aec525e6e6740e6b92fb473a6bc2b31dca09b0324de78801c7a2d19638182 -DIST doxygen-1.8.8.src.tar.gz 4955485 SHA256 158e7834f05e0aeea5794b23c1e775ddfebafc709543e47f6fff9d81b190ade1 SHA512 f9cdc7b5ce18321449f29ec86d0824f34d22bf41e2007224d266e68520141e8e21553dab2add361795dc23c56845f7e118b11298ecbed061b25ffabf638a79c1 WHIRLPOOL 26497b9ed9d4236d3937ac98f61593747fe1608d41dbec7649524d060adce104355f08d1a8cab19f4c93594034d2245380b3c927e3995515b4bbdcb5614a5f52 DIST doxygen-1.8.9.1.src.tar.gz 5007458 SHA256 d4ab6e28d4d45d8956cad17470aade3fbe2356e8f64b92167e738c1887feccec SHA512 b76d06fc6e22d5e8e2b73814bc99cc0cf75ddf4e5a6ad1bd79832f12ccce5ccc2681777862b9ad0dbfdf1791fd1ce1f0f5ce669a78c7d38f91b0e8d5ebda8ade WHIRLPOOL 3971ceb79619282dbf1409b71d457dbdf8cd67b7d57dc106215442237e16fed8530e637d2d712d1be2dc2d186b29e75a23522b06387913fe2584eebf8b52b44e DIST doxywizard.png 4231 SHA256 eb648ebd3a194a56d9ed6e47cc8dbf1af2e124d83c2c42af9bf86bd837984209 SHA512 5e2d26e7427b86866ebe75ec2c66c0f1100d230f3f3e4d66bac424a8dd0d42f0831d936ff03318dfa1bf73cbd9fb53717636d0c91ae3eea0f4e24641479d25d5 WHIRLPOOL bb0c13b382c4069ca310ff53a03b36499a2bf6e0e8c0647efc032530f429f483b5d6f2925b7e996d4f84c8f2b77eb883533f4b7abc88745a2cfa596d3dd4f3fb diff --git a/app-doc/doxygen/doxygen-1.8.10.ebuild b/app-doc/doxygen/doxygen-1.8.10.ebuild deleted file mode 100644 index 2696cabb0ecb..000000000000 --- a/app-doc/doxygen/doxygen-1.8.10.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - -inherit cmake-utils eutils fdo-mime flag-o-matic python-any-r1 qt4-r2 -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="git://github.com/doxygen/doxygen.git" - SRC_URI="" - KEYWORDS="" -else - SRC_URI="http://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz" - KEYWORDS="~amd64" - # KEYWORDS="~alpha ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" -fi -SRC_URI+=" http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png" - -DESCRIPTION="Documentation system for most programming languages" -HOMEPAGE="http://www.doxygen.org/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="clang debug doc dot doxysearch qt4 sqlite 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="app-text/ghostscript-gpl - dev-lang/perl - media-libs/libpng - virtual/libiconv - clang? ( sys-devel/clang ) - doc? ( app-text/texlive[extra] ) - dot? ( - media-gfx/graphviz - media-libs/freetype - ) - doxysearch? ( =dev-libs/xapian-1.2* ) - qt4? ( dev-qt/qtgui:4 ) - sqlite? ( dev-db/sqlite:3 ) - " - -DEPEND="sys-apps/sed - sys-devel/flex - sys-devel/bison - doc? ( ${PYTHON_DEPS} ) - ${RDEPEND}" - -# src_test() defaults to make -C testing but there is no such directory (bug #504448) -RESTRICT="mirror test" -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() { - use doc && python-any-r1_pkg_setup -} - -src_prepare() { - # Ensure we link to -liconv - if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; 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.9.1-empty-line-sigsegv.patch #454348 - - epatch "${FILESDIR}"/${P}-link_with_pthread.patch - - # fix pdf doc - sed -i.orig -e "s:g_kowal:g kowal:" \ - doc/maintainers.txt || die - - 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() { - local mycmakeargs=( - -DBUILD_SHARED_LIBS=YES - -DDOC_INSTALL_DIR="share/doc/${P}" - -DLANG_CODES="$(get_langs)" - $(cmake-utils_use clang use_libclang) - $(cmake-utils_use doc build_doc) - $(cmake-utils_use doxysearch build_search) - $(cmake-utils_use qt4 build_wizard) - $(cmake-utils_use sqlite use_sqlite3) - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - # generate html and pdf 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 - cd "${BUILD_DIR}" && emake docs - fi -} - -src_install() { - if use qt4; then - doicon "${DISTDIR}/doxywizard.png" - make_desktop_entry doxywizard "DoxyWizard ${PV}" \ - "/usr/share/pixmaps/doxywizard.png" \ - "Development" - fi - - dodoc LANGUAGE.HOWTO README.md - - cmake-utils_src_install -} - -pkg_postinst() { - fdo-mime_desktop_database_update - - elog - elog "For examples and other goodies, see the source tarball. For some" - elog "example output, run doxygen on the doxygen source using the" - elog "Doxyfile 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.3.1.ebuild b/app-doc/doxygen/doxygen-1.8.3.1.ebuild deleted file mode 100644 index e757ab804e9a..000000000000 --- a/app-doc/doxygen/doxygen-1.8.3.1.ebuild +++ /dev/null @@ -1,239 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -PYTHON_COMPAT=( python2_7 ) -inherit eutils fdo-mime flag-o-matic python-any-r1 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 arm64 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? ( dev-qt/qtgui: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? ( ${PYTHON_DEPS} ) - ${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 - use doc && python-any-r1_pkg_setup -} - -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_CC\s*\)=.*$:\1= $(tc-getCC):" \ - -e "s:^\(TMAKE_AR\s*\)=.*$:\1= $(tc-getAR) cqs:" \ - 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 - epatch "${FILESDIR}"/${P}-empty-line-sigsegv.patch #454348 - - # 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 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" \ - "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.4-r2.ebuild b/app-doc/doxygen/doxygen-1.8.4-r2.ebuild deleted file mode 100644 index 90a85cc815ac..000000000000 --- a/app-doc/doxygen/doxygen-1.8.4-r2.ebuild +++ /dev/null @@ -1,242 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -PYTHON_COMPAT=( python2_7 ) -inherit eutils fdo-mime flag-o-matic python-any-r1 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 ~arm64 ~hppa ~ia64 ~mips ~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 sqlite 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? ( dev-qt/qtgui:4 ) - latex? ( app-text/texlive[extra] ) - dev-lang/perl - virtual/libiconv - media-libs/libpng - app-text/ghostscript-gpl - sqlite? ( dev-db/sqlite:3 ) - dot? ( - media-gfx/graphviz - media-libs/freetype - )" - -DEPEND="sys-apps/sed - sys-devel/flex - sys-devel/bison - doc? ( ${PYTHON_DEPS} ) - ${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 - use doc && python-any-r1_pkg_setup -} - -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_CC\s*\)=.*$:\1= $(tc-getCC):" \ - -e "s:^\(TMAKE_AR\s*\)=.*$:\1= $(tc-getAR) cqs:" \ - 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 - epatch "${FILESDIR}"/${PN}-1.8.3.1-empty-line-sigsegv.patch #454348 - - # patches applied upstream - epatch "${FILESDIR}"/${P}-libreoffice.patch \ - "${FILESDIR}"/${P}-infinite_loop.patch #474716 - - # 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 - - 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 qt4 && my_conf="${my_conf} --with-doxywizard" - - use sqlite && my_conf="${my_conf} --with-sqlite3" - - # 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" \ - "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.8.ebuild b/app-doc/doxygen/doxygen-1.8.8.ebuild deleted file mode 100644 index 2c3fb7b9ddd9..000000000000 --- a/app-doc/doxygen/doxygen-1.8.8.ebuild +++ /dev/null @@ -1,241 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - -inherit eutils fdo-mime flag-o-matic python-any-r1 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" -IUSE="clang debug doc dot doxysearch qt4 latex sqlite" - -#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="app-text/ghostscript-gpl - dev-lang/perl - media-libs/libpng - virtual/libiconv - clang? ( sys-devel/clang ) - dot? ( - media-gfx/graphviz - media-libs/freetype - ) - doxysearch? ( =dev-libs/xapian-1.2* ) - latex? ( app-text/texlive[extra] ) - qt4? ( dev-qt/qtgui:4 ) - sqlite? ( dev-db/sqlite:3 ) - " - -DEPEND="sys-apps/sed - sys-devel/flex - sys-devel/bison - doc? ( ${PYTHON_DEPS} ) - ${RDEPEND}" - -# src_test() defaults to make -C testing but there is no such directory (bug #504448) -RESTRICT="mirror test" -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 - use doc && python-any-r1_pkg_setup -} - -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_CC\s*\)=.*$:\1= $(tc-getCC):" \ - -e "s:^\(TMAKE_AR\s*\)=.*$:\1= $(tc-getAR) cqs:" \ - 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 && has_version dev-libs/libiconv || use elibc_uclibc; 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 - epatch "${FILESDIR}"/${PN}-1.8.3.1-empty-line-sigsegv.patch #454348 - - # fix pdf doc - sed -i.orig -e "s:g_kowal:g kowal:" \ - doc/maintainers.txt || 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 clang && my_conf="${my_conf} --with-libclang" - - use doxysearch && my_conf="${my_conf} --with-doxysearch" - - use qt4 && my_conf="${my_conf} --with-doxywizard" - - use sqlite && my_conf="${my_conf} --with-sqlite3" - - # 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}" - - ./configure --prefix "${EPREFIX}/usr" ${my_conf} \ - || die - - if use qt4 ; then - pushd addon/doxywizard &> /dev/null - eqmake4 doxywizard.pro -o Makefile.doxywizard - popd &> /dev/null - fi -} - -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" \ - "Development" - fi - - dodoc LANGUAGE.HOWTO README.md - - # 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/files/1.4.7/01_all_cp1251.patch b/app-doc/doxygen/files/1.4.7/01_all_cp1251.patch deleted file mode 100644 index 0ffed14733e1..000000000000 --- a/app-doc/doxygen/files/1.4.7/01_all_cp1251.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- qtools/qtextcodec.cpp.orig 2003-12-14 14:00:57.000000000 -0800 -+++ qtools/qtextcodec.cpp 2005-05-29 19:13:17.000000000 -0700 -@@ -1321,7 +1321,7 @@ - - - --#ifndef QT_NO_CODECS -+// #ifndef QT_NO_CODECS - - class QSimpleTextCodec: public QTextCodec - { -@@ -1948,7 +1948,7 @@ - } - - --#endif // QT_NO_CODECS -+// #endif // QT_NO_CODECS - - class QLatin1Codec: public QTextCodec - { -@@ -2048,12 +2048,13 @@ - { - (void)new QLatin1Codec; - --#ifndef QT_NO_CODECS -+ - int i = 0; - do { - (void)new QSimpleTextCodec( i ); - } while( unicodevalues[i++].mib != LAST_MIB ); - -+#ifndef QT_NO_CODECS - (void)new QEucJpCodec; - (void)new QSjisCodec; - (void)new QJisCodec; diff --git a/app-doc/doxygen/files/1.4.7/05_all_system-libpng.patch b/app-doc/doxygen/files/1.4.7/05_all_system-libpng.patch deleted file mode 100644 index 491e3a22a801..000000000000 --- a/app-doc/doxygen/files/1.4.7/05_all_system-libpng.patch +++ /dev/null @@ -1,124 +0,0 @@ ---- doxygen-1.4.6.orig/debian/patches/system-libpng.dpatch -+++ doxygen-1.4.6/debian/patches/system-libpng.dpatch -@@ -0,0 +1,121 @@ -+#! /bin/sh -e -+ -+# DP: Use the system libpng library -+ -+dir= -+if [ $# -eq 3 -a "$2" = '-d' ]; then -+ pdir="-d $3" -+ dir="$3/" -+elif [ $# -ne 1 ]; then -+ echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" -+ exit 1 -+fi -+case "$1" in -+ -patch) -+ patch $pdir -f --no-backup-if-mismatch -p1 < $0 -+ ;; -+ -unpatch) -+ patch $pdir -f --no-backup-if-mismatch -R -p1 < $0 -+ ;; -+ *) -+ echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" -+ exit 1 -+esac -+exit 0 -+ -+diff -u ./src/pngenc.cpp.orig ./src/pngenc.cpp -+--- ./src/pngenc.cpp.orig 2004-01-06 04:40:25.000000000 +0100 -++++ ./src/pngenc.cpp 2004-09-21 09:04:40.000000000 +0200 -+@@ -25,7 +25,7 @@ -+ #endif -+ -+ #define ALL_STATIC -+-#include <../libpng/png.h> -++#include -+ #include -+ #include -+ #include -+diff -u ./Makefile.in.orig ./Makefile.in -+--- ./Makefile.in.orig 2003-11-13 04:40:21.000000000 +0100 -++++ ./Makefile.in 2004-09-21 09:04:40.000000000 +0200 -+@@ -7,7 +7,6 @@ -+ cd doc ; $(MAKE) clean -+ cd qtools ; $(MAKE) clean -+ cd src ; $(MAKE) clean -+- cd libpng ; $(MAKE) clean -+ cd libmd5 ; $(MAKE) clean -+ cd addon/doxywizard ; $(MAKE) clean -+ cd addon/doxmlparser/src ; $(MAKE) clean -+@@ -18,7 +17,6 @@ -+ -+ distclean: clean -+ cd src ; $(MAKE) distclean -+- cd libpng ; $(MAKE) distclean -+ cd libmd5 ; $(MAKE) distclean -+ cd addon/doxywizard ; $(MAKE) distclean -+ cd addon/doxmlparser/src ; $(MAKE) distclean -+@@ -31,11 +29,10 @@ -+ -rm -f objects/*.o -+ -rm -f src/Makefile.doxygen src/Makefile.libdoxygen -+ -rm -f src/Makefile.doxytag src/Makefile.libdoxycfg -+- -rm -f libpng/Makefile.libpng -+ -rm -f libmd5/Makefile.libmd5 -+ -rm -f Makefile qtools/Makefile src/Makefile examples/Makefile doc/Makefile -+ -rm -f .makeconfig .tmakeconfig -+- -rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libpng/libpng.pro libmd5/libmd5.pro -++ -rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro -+ -rm -f src/version.cpp -+ -rm -r addon/doxywizard/Makefile -+ -rm -f addon/doxywizard/Makefile.doxywizard -+diff -u ./configure.orig ./configure -+--- ./configure.orig 2004-09-14 04:40:12.000000000 +0200 -++++ ./configure 2004-09-21 09:09:06.000000000 +0200 -+@@ -457,7 +457,7 @@ -+ EOF -+ fi -+ -+-f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libpng/Makefile.in libmd5/Makefile.in" -++f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libmd5/Makefile.in" -+ -+ for i in $f_inmakefiles ; do -+ SRC=$i -+@@ -474,7 +474,6 @@ -+ echo "" >> $DST -+ echo "all: src/version.cpp " >> $DST -+ echo " \$(MAKE) -C qtools" >> $DST -+- echo " \$(MAKE) -C libpng" >> $DST -+ echo " \$(MAKE) -C libmd5" >> $DST -+ echo " \$(MAKE) -C src" >> $DST -+ if test $f_wizard = YES; then -+@@ -491,7 +490,7 @@ -+ echo " Created $DST from $SRC..." -+ done -+ -+-f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libpng/libpng.pro.in libmd5/libmd5.pro.in" -++f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in" -+ -+ for i in $f_inprofiles ; do -+ SRC=$i -+diff -u ./src/doxygen.pro.in.orig ./src/doxygen.pro.in -+--- ./src/doxygen.pro.in.orig 2004-05-18 04:40:13.000000000 +0200 -++++ ./src/doxygen.pro.in 2004-09-21 09:58:06.000000000 +0200 -+@@ -28,7 +28,7 @@ -+ win32:TMAKE_CXXFLAGS += -DQT_NODLL -+ win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5 -+ win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti -+-INCLUDEPATH += ../qtools ../libpng ../libmd5 . -++INCLUDEPATH += ../qtools ../libmd5 . -+ #win32-g++:INCLUDEPATH -= ../libpng -+ DESTDIR = ../bin -+ TARGET = doxygen -+diff -u ./src/libdoxygen.pro.in.orig ./src/libdoxygen.pro.in -+--- ./src/libdoxygen.pro.in.orig 2004-08-25 04:40:18.000000000 +0200 -++++ ./src/libdoxygen.pro.in 2004-09-21 09:58:55.000000000 +0200 -+@@ -189,7 +189,6 @@ -+ win32-msvc:TMAKE_CXXFLAGS += -Zm200 -+ win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti -+ INCLUDEPATH += ../qtools -+-INCLUDEPATH += ../libpng -+ INCLUDEPATH += ../libmd5 -+ win32:INCLUDEPATH += . -+ win32-g++:INCLUDEPATH = ../qtools /usr/include/libpng12 ../libmd5 diff --git a/app-doc/doxygen/files/1.4.7/06_all_qtools.patch b/app-doc/doxygen/files/1.4.7/06_all_qtools.patch deleted file mode 100644 index 38a4fcbf000e..000000000000 --- a/app-doc/doxygen/files/1.4.7/06_all_qtools.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- doxygen-1.4.6.orig/debian/patches/qstring-gcc40.dpatch -+++ doxygen-1.4.6/debian/patches/qstring-gcc40.dpatch -@@ -0,0 +1,41 @@ -+#! /bin/sh -e -+ -+# DP: Remove unused code that does not build with gcc 4.0 (#338099). -+ -+dir= -+if [ $# -eq 3 -a "$2" = '-d' ]; then -+ pdir="-d $3" -+ dir="$3/" -+elif [ $# -ne 1 ]; then -+ echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" -+ exit 1 -+fi -+case "$1" in -+ -patch) -+ patch $pdir -f --no-backup-if-mismatch -p0 < $0 -+ ;; -+ -unpatch) -+ patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 -+ ;; -+ *) -+ echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" -+ exit 1 -+esac -+exit 0 -+ -+--- qtools/qstring.h.orig 2004-12-01 19:26:16.000000000 +0000 -++++ qtools/qstring.h 2005-12-04 20:09:01.000000000 +0000 -+@@ -163,8 +163,13 @@ -+ bool isLetterOrNumber() const; -+ bool isDigit() const; -+ -++ // the non-const ::cell and ::row cannot be compiled with gcc 4.0 on ARM, -++ // so they have been removed; the methods are not needed for doxygen -++#if 0 -+ uchar& cell() { return cl; } -+ uchar& row() { return rw; } -++#endif -++ -+ uchar cell() const { return cl; } -+ uchar row() const { return rw; } -+ diff --git a/app-doc/doxygen/files/doxygen-1.5-legacy-patches.diff b/app-doc/doxygen/files/doxygen-1.5-legacy-patches.diff deleted file mode 100644 index 2ceb2628ac90..000000000000 --- a/app-doc/doxygen/files/doxygen-1.5-legacy-patches.diff +++ /dev/null @@ -1,203 +0,0 @@ ---- qtools/qtextcodec.cpp.orig 2003-12-14 14:00:57.000000000 -0800 -+++ qtools/qtextcodec.cpp 2005-05-29 19:13:17.000000000 -0700 -@@ -1321,7 +1321,7 @@ - - - --#ifndef QT_NO_CODECS -+// #ifndef QT_NO_CODECS - - class QSimpleTextCodec: public QTextCodec - { -@@ -1948,7 +1948,7 @@ - } - - --#endif // QT_NO_CODECS -+// #endif // QT_NO_CODECS - - class QLatin1Codec: public QTextCodec - { -@@ -2048,12 +2048,13 @@ - { - (void)new QLatin1Codec; - --#ifndef QT_NO_CODECS -+ - int i = 0; - do { - (void)new QSimpleTextCodec( i ); - } while( unicodevalues[i++].mib != LAST_MIB ); - -+#ifndef QT_NO_CODECS - (void)new QEucJpCodec; - (void)new QSjisCodec; - (void)new QJisCodec; ---- doxygen-1.4.6.orig/debian/patches/system-libpng.dpatch -+++ doxygen-1.4.6/debian/patches/system-libpng.dpatch -@@ -0,0 +1,121 @@ -+#! /bin/sh -e -+ -+# DP: Use the system libpng library -+ -+dir= -+if [ $# -eq 3 -a "$2" = '-d' ]; then -+ pdir="-d $3" -+ dir="$3/" -+elif [ $# -ne 1 ]; then -+ echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" -+ exit 1 -+fi -+case "$1" in -+ -patch) -+ patch $pdir -f --no-backup-if-mismatch -p1 < $0 -+ ;; -+ -unpatch) -+ patch $pdir -f --no-backup-if-mismatch -R -p1 < $0 -+ ;; -+ *) -+ echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" -+ exit 1 -+esac -+exit 0 -+ -+diff -u ./src/pngenc.cpp.orig ./src/pngenc.cpp -+--- ./src/pngenc.cpp.orig 2004-01-06 04:40:25.000000000 +0100 -++++ ./src/pngenc.cpp 2004-09-21 09:04:40.000000000 +0200 -+@@ -25,7 +25,7 @@ -+ #endif -+ -+ #define ALL_STATIC -+-#include <../libpng/png.h> -++#include -+ #include -+ #include -+ #include -+diff -u ./Makefile.in.orig ./Makefile.in -+--- ./Makefile.in.orig 2003-11-13 04:40:21.000000000 +0100 -++++ ./Makefile.in 2004-09-21 09:04:40.000000000 +0200 -+@@ -7,7 +7,6 @@ -+ cd doc ; $(MAKE) clean -+ cd qtools ; $(MAKE) clean -+ cd src ; $(MAKE) clean -+- cd libpng ; $(MAKE) clean -+ cd libmd5 ; $(MAKE) clean -+ cd addon/doxywizard ; $(MAKE) clean -+ cd addon/doxmlparser/src ; $(MAKE) clean -+@@ -18,7 +17,6 @@ -+ -+ distclean: clean -+ cd src ; $(MAKE) distclean -+- cd libpng ; $(MAKE) distclean -+ cd libmd5 ; $(MAKE) distclean -+ cd addon/doxywizard ; $(MAKE) distclean -+ cd addon/doxmlparser/src ; $(MAKE) distclean -+@@ -31,11 +29,10 @@ -+ -rm -f objects/*.o -+ -rm -f src/Makefile.doxygen src/Makefile.libdoxygen -+ -rm -f src/Makefile.doxytag src/Makefile.libdoxycfg -+- -rm -f libpng/Makefile.libpng -+ -rm -f libmd5/Makefile.libmd5 -+ -rm -f Makefile qtools/Makefile src/Makefile examples/Makefile doc/Makefile -+ -rm -f .makeconfig .tmakeconfig -+- -rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libpng/libpng.pro libmd5/libmd5.pro -++ -rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro -+ -rm -f src/version.cpp -+ -rm -r addon/doxywizard/Makefile -+ -rm -f addon/doxywizard/Makefile.doxywizard -+diff -u ./configure.orig ./configure -+--- ./configure.orig 2004-09-14 04:40:12.000000000 +0200 -++++ ./configure 2004-09-21 09:09:06.000000000 +0200 -+@@ -457,7 +457,7 @@ -+ EOF -+ fi -+ -+-f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libpng/Makefile.in libmd5/Makefile.in" -++f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libmd5/Makefile.in" -+ -+ for i in $f_inmakefiles ; do -+ SRC=$i -+@@ -474,7 +474,6 @@ -+ echo "" >> $DST -+ echo "all: src/version.cpp " >> $DST -+ echo " \$(MAKE) -C qtools" >> $DST -+- echo " \$(MAKE) -C libpng" >> $DST -+ echo " \$(MAKE) -C libmd5" >> $DST -+ echo " \$(MAKE) -C src" >> $DST -+ if test $f_wizard = YES; then -+@@ -491,7 +490,7 @@ -+ echo " Created $DST from $SRC..." -+ done -+ -+-f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libpng/libpng.pro.in libmd5/libmd5.pro.in" -++f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in" -+ -+ for i in $f_inprofiles ; do -+ SRC=$i -+diff -u ./src/doxygen.pro.in.orig ./src/doxygen.pro.in -+--- ./src/doxygen.pro.in.orig 2004-05-18 04:40:13.000000000 +0200 -++++ ./src/doxygen.pro.in 2004-09-21 09:58:06.000000000 +0200 -+@@ -28,7 +28,7 @@ -+ win32:TMAKE_CXXFLAGS += -DQT_NODLL -+ win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5 -+ win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti -+-INCLUDEPATH += ../qtools ../libpng ../libmd5 . -++INCLUDEPATH += ../qtools ../libmd5 . -+ #win32-g++:INCLUDEPATH -= ../libpng -+ DESTDIR = ../bin -+ TARGET = doxygen -+diff -u ./src/libdoxygen.pro.in.orig ./src/libdoxygen.pro.in -+--- ./src/libdoxygen.pro.in.orig 2004-08-25 04:40:18.000000000 +0200 -++++ ./src/libdoxygen.pro.in 2004-09-21 09:58:55.000000000 +0200 -+@@ -189,7 +189,6 @@ -+ win32-msvc:TMAKE_CXXFLAGS += -Zm200 -+ win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti -+ INCLUDEPATH += ../qtools -+-INCLUDEPATH += ../libpng -+ INCLUDEPATH += ../libmd5 -+ win32:INCLUDEPATH += . -+ win32-g++:INCLUDEPATH = ../qtools /usr/include/libpng12 ../libmd5 ---- doxygen-1.4.6.orig/debian/patches/qstring-gcc40.dpatch -+++ doxygen-1.4.6/debian/patches/qstring-gcc40.dpatch -@@ -0,0 +1,41 @@ -+#! /bin/sh -e -+ -+# DP: Remove unused code that does not build with gcc 4.0 (#338099). -+ -+dir= -+if [ $# -eq 3 -a "$2" = '-d' ]; then -+ pdir="-d $3" -+ dir="$3/" -+elif [ $# -ne 1 ]; then -+ echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" -+ exit 1 -+fi -+case "$1" in -+ -patch) -+ patch $pdir -f --no-backup-if-mismatch -p0 < $0 -+ ;; -+ -unpatch) -+ patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 -+ ;; -+ *) -+ echo >&2 "usage: `basename $0`: -patch|-unpatch [-d ]" -+ exit 1 -+esac -+exit 0 -+ -+--- qtools/qstring.h.orig 2004-12-01 19:26:16.000000000 +0000 -++++ qtools/qstring.h 2005-12-04 20:09:01.000000000 +0000 -+@@ -163,8 +163,13 @@ -+ bool isLetterOrNumber() const; -+ bool isDigit() const; -+ -++ // the non-const ::cell and ::row cannot be compiled with gcc 4.0 on ARM, -++ // so they have been removed; the methods are not needed for doxygen -++#if 0 -+ uchar& cell() { return cl; } -+ uchar& row() { return rw; } -++#endif -++ -+ uchar cell() const { return cl; } -+ uchar row() const { return rw; } -+ diff --git a/app-doc/doxygen/files/doxygen-1.5-qtlibdir.patch b/app-doc/doxygen/files/doxygen-1.5-qtlibdir.patch deleted file mode 100644 index 34aaef42d2dd..000000000000 --- a/app-doc/doxygen/files/doxygen-1.5-qtlibdir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2008-02-15 18:40:57.000000000 -0800 -+++ configure 2008-02-15 19:06:13.000000000 -0800 -@@ -276,6 +276,8 @@ - echo "QTDIR is set to $QTDIR, but library directory $QTDIR/lib does not exist!" - exit 2 - fi -+ fi -+ if test -d "$QTDIR/lib64"; then - LIBDIR=lib64 - fi - if test ! -d "$QTDIR/include"; then diff --git a/app-doc/doxygen/files/doxygen-1.5-system-libpng.patch b/app-doc/doxygen/files/doxygen-1.5-system-libpng.patch deleted file mode 100644 index dbd95b879ba4..000000000000 --- a/app-doc/doxygen/files/doxygen-1.5-system-libpng.patch +++ /dev/null @@ -1,105 +0,0 @@ -diff -ur doxygen-1.5.1/configure doxygen-fixed/configure ---- doxygen-1.5.1/configure 2006-11-01 22:52:27.711364356 +0200 -+++ doxygen-fixed/configure 2006-11-01 22:54:09.086952924 +0200 -@@ -525,7 +525,7 @@ - EOF - fi - --f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libpng/Makefile.in libmd5/Makefile.in addon/doxyapp/Makefile.in" -+f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libmd5/Makefile.in addon/doxyapp/Makefile.in" - - for i in $f_inmakefiles ; do - SRC=$i -@@ -542,7 +542,6 @@ - echo "" >> $DST - echo "all: src/version.cpp " >> $DST - echo " \$(MAKE) -C qtools" >> $DST -- echo " \$(MAKE) -C libpng" >> $DST - echo " \$(MAKE) -C libmd5" >> $DST - echo " \$(MAKE) -C src" >> $DST - if test $f_wizard = YES; then -@@ -562,7 +561,7 @@ - echo " Created $DST from $SRC..." - done - --f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libpng/libpng.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in" -+f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in" - - for i in $f_inprofiles ; do - SRC=$i -diff -ur doxygen-1.5.1/Makefile.in doxygen-fixed/Makefile.in ---- doxygen-1.5.1/Makefile.in 2006-11-01 22:52:31.257825212 +0200 -+++ doxygen-fixed/Makefile.in 2006-11-01 22:53:44.182738940 +0200 -@@ -7,7 +7,6 @@ - cd doc ; $(MAKE) clean - cd qtools ; $(MAKE) clean - cd src ; $(MAKE) clean -- cd libpng ; $(MAKE) clean - cd libmd5 ; $(MAKE) clean - cd addon/doxywizard ; $(MAKE) clean - cd addon/doxmlparser/src ; $(MAKE) clean -@@ -18,7 +17,6 @@ - - distclean: clean - cd src ; $(MAKE) distclean -- cd libpng ; $(MAKE) distclean - cd libmd5 ; $(MAKE) distclean - cd addon/doxywizard ; $(MAKE) distclean - cd addon/doxmlparser/src ; $(MAKE) distclean -@@ -32,11 +30,10 @@ - -rm -f objects/*.o - -rm -f src/Makefile.doxygen src/Makefile.libdoxygen - -rm -f src/Makefile.doxytag src/Makefile.libdoxycfg -- -rm -f libpng/Makefile.libpng - -rm -f libmd5/Makefile.libmd5 - -rm -f Makefile qtools/Makefile src/Makefile examples/Makefile doc/Makefile - -rm -f .makeconfig .tmakeconfig -- -rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libpng/libpng.pro libmd5/libmd5.pro -+ -rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro - -rm -f src/version.cpp - -rm -r addon/doxywizard/Makefile - -rm -f addon/doxywizard/Makefile.doxywizard -@@ -81,7 +78,7 @@ - pdf: docs - cd latex ; $(MAKE) - --DISTFILES = Doxyfile libpng libmd5 addon tmake doc wintools examples bin lib objects \ -+DISTFILES = Doxyfile libmd5 addon tmake doc wintools examples bin lib objects \ - qtools src configure configure.bin Makefile.in Makefile.win_nmake.in \ - Makefile.win_make.in INSTALL make.bat LANGUAGE.HOWTO LICENSE PLATFORMS \ - VERSION packages winbuild -diff -ur doxygen-1.5.1/src/doxygen.pro.in doxygen-fixed/src/doxygen.pro.in ---- doxygen-1.5.1/src/doxygen.pro.in 2006-11-01 22:52:32.611619404 +0200 -+++ doxygen-fixed/src/doxygen.pro.in 2006-11-01 22:54:39.508328172 +0200 -@@ -28,7 +28,7 @@ - win32:TMAKE_CXXFLAGS += -DQT_NODLL - win32-g++:LIBS = -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5 - win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti --INCLUDEPATH += ../qtools ../libpng ../libmd5 . -+INCLUDEPATH += ../qtools ../libmd5 . - #win32-g++:INCLUDEPATH -= ../libpng - DESTDIR = ../bin - TARGET = doxygen -diff -ur doxygen-1.5.1/src/libdoxygen.pro.in doxygen-fixed/src/libdoxygen.pro.in ---- doxygen-1.5.1/src/libdoxygen.pro.in 2006-11-01 22:52:33.704453268 +0200 -+++ doxygen-fixed/src/libdoxygen.pro.in 2006-11-01 22:54:50.479660276 +0200 -@@ -207,7 +207,6 @@ - win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti - linux-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti - INCLUDEPATH += ../qtools --INCLUDEPATH += ../libpng - INCLUDEPATH += ../libmd5 - win32:INCLUDEPATH += . - win32-g++:INCLUDEPATH = ../qtools /usr/include/libpng12 ../libmd5 -diff -ur doxygen-1.5.1/src/pngenc.cpp doxygen-fixed/src/pngenc.cpp ---- doxygen-1.5.1/src/pngenc.cpp 2006-11-01 22:52:34.006407364 +0200 -+++ doxygen-fixed/src/pngenc.cpp 2006-11-01 22:53:13.023475868 +0200 -@@ -25,7 +25,7 @@ - #endif - - #define ALL_STATIC --#include <../libpng/png.h> -+#include - #include - #include - #include diff --git a/app-doc/doxygen/files/doxygen-1.5.6-prefix-misc-alt.patch b/app-doc/doxygen/files/doxygen-1.5.6-prefix-misc-alt.patch deleted file mode 100644 index 04d69e84f808..000000000000 --- a/app-doc/doxygen/files/doxygen-1.5.6-prefix-misc-alt.patch +++ /dev/null @@ -1,78 +0,0 @@ -* make sure we always look for tools in the path, no "do it yourself paths" - ---- configure -+++ configure -@@ -169,21 +169,12 @@ - ;; - Darwin:*) - f_platform=macosx-c++ -- if test "$f_insttool" = NO; then -- f_insttool=/usr/bin/install -- fi - ;; - FreeBSD:*) - f_platform=freebsd-g++ -- if test "$f_insttool" = NO; then -- f_insttool=/usr/bin/install -- fi - ;; - HP-UX:*) - f_platform=hpux-g++ -- if test "$f_insttool" = NO; then -- f_insttool=/usr/bin/install -- fi - ;; - IRIX64:*) - f_platform=irix-64 -@@ -214,9 +205,6 @@ - ;; - SunOS:5*) - f_platform=solaris-g++ -- if test "$f_insttool" = NO; then -- f_insttool=/usr/bin/install -- fi - ;; - ULTRIX:*) - f_platform=ultrix-g++ -@@ -311,8 +299,8 @@ - - echo -n " Checking for GNU make tool... " - if test "$f_make" = NO; then -- make_names="gmake make" -- make_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin" -+ make_names="make" -+ make_dirs="$bin_dirs" - make_prog=NO - for i in $make_names; do - for j in $make_dirs; do -@@ -338,8 +326,8 @@ - - echo -n " Checking for GNU install tool... " - if test "$f_insttool" = NO; then -- install_names="ginstall install" -- install_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin /usr/ucb" -+ install_names="install" -+ install_dirs="$bin_dirs" - install_prog=NO - install_found=NO - for i in $install_names; do -@@ -397,7 +385,7 @@ - echo -n " Checking for perl... " - if test "$f_perl" = NO; then - perl_names="perl perl5" -- perl_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin" -+ perl_dirs="$bin_dirs" - perl_prog=NO - perl_found=NO - for i in $perl_names; do -@@ -550,10 +538,6 @@ - cat >> .tmakeconfig <> .tmakeconfig <> .tmakeconfig < nonSymlinks; - QDict known; - QCString result = path; -+ QCString oldPrefix = "/"; - do - { - #ifdef WIN32 -@@ -8637,7 +8638,7 @@ - QString target = fi.readLink(); - if (QFileInfo(target).isRelative()) - { -- target = QDir::cleanDirPath(prefix+"/"+target.data()); -+ target = QDir::cleanDirPath(oldPrefix+"/"+target.data()); - } - if (sepPos!=-1) - { -@@ -8656,6 +8657,7 @@ - { - nonSymlinks.insert(prefix,(void*)0x8); - } -+ oldPrefix = prefix; - } - } - while (sepPos!=-1); diff --git a/app-doc/doxygen/files/doxygen-1.8.4-infinite_loop.patch b/app-doc/doxygen/files/doxygen-1.8.4-infinite_loop.patch deleted file mode 100644 index 840baa810520..000000000000 --- a/app-doc/doxygen/files/doxygen-1.8.4-infinite_loop.patch +++ /dev/null @@ -1,26 +0,0 @@ -Fix inifite loop - -https://bugs.gentoo.org/show_bug.cgi?id=474716 -https://bugzilla.gnome.org/show_bug.cgi?id=701295 - -Patch written by Dimitri van Heesch - ---- a/src/util.cpp -+++ b/src/util.cpp -@@ -1843,11 +1843,15 @@ int findParameterList(const QString &name) - ++templateDepth; - pos=nextOpenPos-1; - } -- else -+ else if (nextClosePos!=-1) - { - --templateDepth; - pos=nextClosePos-1; - } -+ else // more >'s than <'s, see bug701295 -+ { -+ return -1; -+ } - } - else - { diff --git a/app-doc/doxygen/files/doxygen-1.8.4-libreoffice.patch b/app-doc/doxygen/files/doxygen-1.8.4-libreoffice.patch deleted file mode 100644 index 7aa7baa37596..000000000000 --- a/app-doc/doxygen/files/doxygen-1.8.4-libreoffice.patch +++ /dev/null @@ -1,30 +0,0 @@ -From b3e1f10a2d795d0cf31f6efb3f88a31ad4c68980 Mon Sep 17 00:00:00 2001 -From: Michael Stahl -Date: Wed, 29 May 2013 16:29:04 +0200 -Subject: [PATCH] fix "Constant Groups" regression on file pages - -Due to a copy/paste error in the UNO IDL patch the "Namespaces" -listed on the "File Reference" pages are erroneously duplicated. -(thanks to Stephan Bergmann for finding this problem) - -Signed-off-by: Dimitri van Heesch ---- - src/layout.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/layout.cpp b/src/layout.cpp -index c2b1ac5..010c850 100644 ---- a/src/layout.cpp -+++ b/src/layout.cpp -@@ -582,7 +582,7 @@ class LayoutParser : public QXmlDefaultHandler - SrcLangExt_Fortran,theTranslator->trModules() - ))); - m_sHandler.insert("file/memberdecl/constantgroups", -- new StartElementHandlerSection(this,LayoutDocEntry::FileNamespaces,&LayoutParser::startSectionEntry, -+ new StartElementHandlerSection(this,LayoutDocEntry::FileConstantGroups,&LayoutParser::startSectionEntry, - theTranslator->trConstantGroups())); - m_sHandler.insert("file/memberdecl/defines", - new StartElementHandlerMember(this,&LayoutParser::startMemberDeclEntry, --- -1.8.1.6 - -- cgit v1.2.3-65-gdbad