1 |
commit: 43dbe32c9aad84c53a9303bb2148606ce5181a1f |
2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 2 02:05:56 2018 +0000 |
4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 2 02:13:34 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43dbe32c |
7 |
|
8 |
app-doc/doxygen: drop old version 1.8.13 |
9 |
|
10 |
Package-Manager: Portage-2.3.50, Repoman-2.3.11 |
11 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
12 |
|
13 |
app-doc/doxygen/Manifest | 2 - |
14 |
app-doc/doxygen/doxygen-1.8.13-r1.ebuild | 151 --------------------- |
15 |
.../files/doxygen-1.8.13-NULL-dereference.patch | 24 ---- |
16 |
3 files changed, 177 deletions(-) |
17 |
|
18 |
diff --git a/app-doc/doxygen/Manifest b/app-doc/doxygen/Manifest |
19 |
index c91844ad8f9..1131255da45 100644 |
20 |
--- a/app-doc/doxygen/Manifest |
21 |
+++ b/app-doc/doxygen/Manifest |
22 |
@@ -1,3 +1 @@ |
23 |
-DIST doxygen-1.8.13.src.tar.gz 4893912 BLAKE2B 3eb7eb6e7d122f681a9af8caf8a33789d323d52a5c205a3c44a7953eec78f4b227062da3e71c09de443aa6ac5c780937218c3a8c9ddf06d3eb23200a33b7406f SHA512 85da5bd28ad9f33a8e50fa92796817d31e59c024127cb647cb967e4321dd51378feaacdf099d578b7e6020fd646a3c63e99c77420e49e3894fc18ca89ba3e0a2 |
24 |
DIST doxygen-1.8.14.src.tar.gz 4877980 BLAKE2B 9886e5165188548e0c8a3760a53709615385ab175795d07156584f3878996c8c5f18e439b6e45352a32ba5cd40e9b7fdb29cdf86511e1be70b18315069e33377 SHA512 5fac7e457a51b1f8e39fb65de5e0c07633e573f74e876580e7bcad5693540d6970fde1b2cb799a4df6ab9dfca951ece15b76b3010134d7658db3500183bea85c |
25 |
-DIST doxywizard.png 4231 BLAKE2B c71e30fee273c7410bc6b65e171a864066e088d474785f5e24b5500806af1217a6e12e93c5b81a488e2d216bfa59aeed332a092515dbbf8b640d8f7320dda50a SHA512 5e2d26e7427b86866ebe75ec2c66c0f1100d230f3f3e4d66bac424a8dd0d42f0831d936ff03318dfa1bf73cbd9fb53717636d0c91ae3eea0f4e24641479d25d5 |
26 |
|
27 |
diff --git a/app-doc/doxygen/doxygen-1.8.13-r1.ebuild b/app-doc/doxygen/doxygen-1.8.13-r1.ebuild |
28 |
deleted file mode 100644 |
29 |
index 98099291889..00000000000 |
30 |
--- a/app-doc/doxygen/doxygen-1.8.13-r1.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,151 +0,0 @@ |
33 |
-# Copyright 1999-2018 Gentoo Foundation |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=6 |
37 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
38 |
- |
39 |
-inherit cmake-utils eutils flag-o-matic python-any-r1 xdg-utils |
40 |
-if [[ ${PV} = *9999* ]]; then |
41 |
- inherit git-r3 |
42 |
- EGIT_REPO_URI="https://github.com/doxygen/doxygen.git" |
43 |
- SRC_URI="" |
44 |
-else |
45 |
- SRC_URI="https://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz" |
46 |
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" |
47 |
-fi |
48 |
-SRC_URI+=" https://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png" |
49 |
- |
50 |
-DESCRIPTION="Documentation system for most programming languages" |
51 |
-HOMEPAGE="https://www.stack.nl/~dimitri/doxygen/" |
52 |
- |
53 |
-LICENSE="GPL-2" |
54 |
-SLOT="0" |
55 |
-IUSE="clang debug doc dot doxysearch latex qt5 sqlite userland_GNU" |
56 |
- |
57 |
-RDEPEND="app-text/ghostscript-gpl |
58 |
- dev-lang/perl |
59 |
- media-libs/libpng:0= |
60 |
- virtual/libiconv |
61 |
- clang? ( sys-devel/clang:= ) |
62 |
- dot? ( |
63 |
- media-gfx/graphviz |
64 |
- media-libs/freetype |
65 |
- ) |
66 |
- doxysearch? ( =dev-libs/xapian-1.2* ) |
67 |
- latex? ( app-text/texlive[extra] ) |
68 |
- qt5? ( |
69 |
- dev-qt/qtgui:5 |
70 |
- dev-qt/qtwidgets:5 |
71 |
- ) |
72 |
- sqlite? ( dev-db/sqlite:3 ) |
73 |
- " |
74 |
- |
75 |
-REQUIRED_USE="doc? ( latex )" |
76 |
- |
77 |
-DEPEND="sys-devel/flex |
78 |
- sys-devel/bison |
79 |
- doc? ( ${PYTHON_DEPS} ) |
80 |
- ${RDEPEND}" |
81 |
- |
82 |
-# src_test() defaults to make -C testing but there is no such directory (bug #504448) |
83 |
-RESTRICT="test" |
84 |
- |
85 |
-PATCHES=( |
86 |
- "${FILESDIR}/${PN}-1.8.9.1-empty-line-sigsegv.patch" #454348 |
87 |
- "${FILESDIR}/${PN}-1.8.12-link_with_pthread.patch" |
88 |
- "${FILESDIR}/${PN}-1.8.13-NULL-dereference.patch" |
89 |
-) |
90 |
- |
91 |
-DOCS=( LANGUAGE.HOWTO README.md ) |
92 |
- |
93 |
-pkg_setup() { |
94 |
- use doc && python-any-r1_pkg_setup |
95 |
-} |
96 |
- |
97 |
-src_prepare() { |
98 |
- cmake-utils_src_prepare |
99 |
- |
100 |
- # Ensure we link to -liconv |
101 |
- if use elibc_FreeBSD && has_version dev-libs/libiconv || use elibc_uclibc; then |
102 |
- local pro |
103 |
- for pro in */*.pro.in */*/*.pro.in; do |
104 |
- echo "unix:LIBS += -liconv" >> "${pro}" || die |
105 |
- done |
106 |
- fi |
107 |
- |
108 |
- # Call dot with -Teps instead of -Tps for EPS generation - bug #282150 |
109 |
- sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die |
110 |
- |
111 |
- # fix pdf doc |
112 |
- sed -i.orig -e "s:g_kowal:g kowal:" \ |
113 |
- doc/maintainers.txt || die |
114 |
- |
115 |
- if is-flagq "-O3" ; then |
116 |
- ewarn |
117 |
- ewarn "Compiling with -O3 is known to produce incorrectly" |
118 |
- ewarn "optimized code which breaks doxygen." |
119 |
- ewarn |
120 |
- elog |
121 |
- elog "Continuing with -O2 instead ..." |
122 |
- elog |
123 |
- replace-flags "-O3" "-O2" |
124 |
- fi |
125 |
-} |
126 |
- |
127 |
-src_configure() { |
128 |
- local mycmakeargs=( |
129 |
- -DDOC_INSTALL_DIR="share/doc/${P}" |
130 |
- -Duse_libclang=$(usex clang) |
131 |
- -Dbuild_doc=$(usex doc) |
132 |
- -Dbuild_search=$(usex doxysearch) |
133 |
- -Dbuild_wizard=$(usex qt5) |
134 |
- -Duse_sqlite3=$(usex sqlite) |
135 |
- ) |
136 |
- |
137 |
- cmake-utils_src_configure |
138 |
-} |
139 |
- |
140 |
-src_compile() { |
141 |
- cmake-utils_src_compile |
142 |
- |
143 |
- if use doc; then |
144 |
- export VARTEXFONTS="${T}/fonts" # bug #564944 |
145 |
- |
146 |
- if ! use dot; then |
147 |
- sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \ |
148 |
- {Doxyfile,doc/Doxyfile} \ |
149 |
- || die "disabling dot failed" |
150 |
- fi |
151 |
- cmake-utils_src_make -C "${BUILD_DIR}" docs |
152 |
- fi |
153 |
-} |
154 |
- |
155 |
-src_install() { |
156 |
- cmake-utils_src_install |
157 |
- |
158 |
- if use qt5; then |
159 |
- doicon "${DISTDIR}/doxywizard.png" |
160 |
- make_desktop_entry doxywizard "DoxyWizard ${PV}" \ |
161 |
- "/usr/share/pixmaps/doxywizard.png" \ |
162 |
- "Development" |
163 |
- fi |
164 |
-} |
165 |
- |
166 |
-pkg_postinst() { |
167 |
- xdg_desktop_database_update |
168 |
- |
169 |
- elog |
170 |
- elog "For examples and other goodies, see the source tarball. For some" |
171 |
- elog "example output, run doxygen on the doxygen source using the" |
172 |
- elog "Doxyfile provided in the top-level source dir." |
173 |
- elog |
174 |
- elog "Disabling the dot USE flag will remove the GraphViz dependency," |
175 |
- elog "along with Doxygen's ability to generate diagrams in the docs." |
176 |
- elog "See the Doxygen homepage for additional helper tools to parse" |
177 |
- elog "more languages." |
178 |
- elog |
179 |
-} |
180 |
- |
181 |
-pkg_postrm() { |
182 |
- xdg_desktop_database_update |
183 |
-} |
184 |
|
185 |
diff --git a/app-doc/doxygen/files/doxygen-1.8.13-NULL-dereference.patch b/app-doc/doxygen/files/doxygen-1.8.13-NULL-dereference.patch |
186 |
deleted file mode 100644 |
187 |
index 8d72e8ff6e0..00000000000 |
188 |
--- a/app-doc/doxygen/files/doxygen-1.8.13-NULL-dereference.patch |
189 |
+++ /dev/null |
190 |
@@ -1,24 +0,0 @@ |
191 |
-From 0f02761a158a5e9ddbd5801682482af8986dbc35 Mon Sep 17 00:00:00 2001 |
192 |
-From: albert-github <albert.tests@×××××.com> |
193 |
-Date: Wed, 4 Jan 2017 12:24:55 +0100 |
194 |
-Subject: [PATCH] Bug 776791 - [1.8.13 Regression] Segfault building the |
195 |
- breathe docs |
196 |
- |
197 |
-Protected against NULL pointer of variable al |
198 |
---- |
199 |
- src/xmlgen.cpp | 2 +- |
200 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
201 |
- |
202 |
-diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp |
203 |
-index fe95c7a..70e198a 100644 |
204 |
---- a/src/xmlgen.cpp |
205 |
-+++ b/src/xmlgen.cpp |
206 |
-@@ -620,7 +620,7 @@ static void generateXMLForMember(MemberDef *md,FTextStream &ti,FTextStream &t,De |
207 |
- if (md->isInline()) t << "yes"; else t << "no"; |
208 |
- t << "\""; |
209 |
- |
210 |
-- if (al->refQualifier!=RefQualifierNone) |
211 |
-+ if (al!=0 && al->refQualifier!=RefQualifierNone) |
212 |
- { |
213 |
- t << " refqual=\""; |
214 |
- if (al->refQualifier==RefQualifierLValue) t << "lvalue"; else t << "rvalue"; |