| 1 |
commit: ff82bc730056751a6400394102d03636076120b2 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 24 14:19:04 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 24 14:19:04 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff82bc73 |
| 7 |
|
| 8 |
www-misc/htdig: Added Debian patch to fix build issue. |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/638720 |
| 11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 12 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 13 |
|
| 14 |
.../htdig-3.2.0_beta6-drop-bogus-assignment.patch | 16 ++++++++++++++++ |
| 15 |
www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild | 19 +++++++++++-------- |
| 16 |
2 files changed, 27 insertions(+), 8 deletions(-) |
| 17 |
|
| 18 |
diff --git a/www-misc/htdig/files/htdig-3.2.0_beta6-drop-bogus-assignment.patch b/www-misc/htdig/files/htdig-3.2.0_beta6-drop-bogus-assignment.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..2328280e317 |
| 21 |
--- /dev/null |
| 22 |
+++ b/www-misc/htdig/files/htdig-3.2.0_beta6-drop-bogus-assignment.patch |
| 23 |
@@ -0,0 +1,16 @@ |
| 24 |
+--- htdig-3.2.0b6.orig/htdig/Parsable.cc |
| 25 |
++++ htdig-3.2.0b6/htdig/Parsable.cc |
| 26 |
+@@ -74,7 +74,6 @@ Parsable::addString(Retriever& retriever |
| 27 |
+ retriever.got_word(w, wordindex++, slot); // slot for img_alt |
| 28 |
+ w = HtWordToken(0); |
| 29 |
+ } |
| 30 |
+- w = '\0'; |
| 31 |
+ } |
| 32 |
+ |
| 33 |
+ //***************************************************************************** |
| 34 |
+@@ -92,5 +91,4 @@ Parsable::addKeywordString(Retriever& re |
| 35 |
+ retriever.got_word(w, wordindex++, 9); |
| 36 |
+ w = HtWordToken(0); |
| 37 |
+ } |
| 38 |
+- w = '\0'; |
| 39 |
+ } |
| 40 |
|
| 41 |
diff --git a/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild b/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild |
| 42 |
index 7596cb36167..eec36227e38 100644 |
| 43 |
--- a/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild |
| 44 |
+++ b/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild |
| 45 |
@@ -1,4 +1,4 @@ |
| 46 |
-# Copyright 1999-2018 Gentoo Foundation |
| 47 |
+# Copyright 1999-2018 Gentoo Authors |
| 48 |
# Distributed under the terms of the GNU General Public License v2 |
| 49 |
|
| 50 |
EAPI=6 |
| 51 |
@@ -31,6 +31,7 @@ PATCHES=( |
| 52 |
"${FILESDIR}"/${P}-quoting.patch |
| 53 |
"${FILESDIR}"/${P}-gcc6.patch |
| 54 |
"${FILESDIR}"/${P}-musl.patch |
| 55 |
+ "${FILESDIR}"/${P}-drop-bogus-assignment.patch #638720 |
| 56 |
) |
| 57 |
|
| 58 |
HTML_DOCS=( htdoc ) |
| 59 |
@@ -42,14 +43,16 @@ src_prepare() { |
| 60 |
} |
| 61 |
|
| 62 |
src_configure() { |
| 63 |
- econf \ |
| 64 |
- --with-config-dir="${EPREFIX}"/etc/${PN} \ |
| 65 |
- --with-default-config-file="${EPREFIX}"/etc/${PN}/${PN}.conf \ |
| 66 |
- --with-database-dir="${EPREFIX}"/var/lib/${PN}/db \ |
| 67 |
- --with-cgi-bin-dir="${EPREFIX}"/var/www/localhost/cgi-bin \ |
| 68 |
- --with-search-dir="${EPREFIX}"/var/www/localhost/htdocs/${PN} \ |
| 69 |
- --with-image-dir="${EPREFIX}"/var/www/localhost/htdocs/${PN} \ |
| 70 |
+ local myeconfargs=( |
| 71 |
+ --with-config-dir="${EPREFIX}"/etc/${PN} |
| 72 |
+ --with-default-config-file="${EPREFIX}"/etc/${PN}/${PN}.conf |
| 73 |
+ --with-database-dir="${EPREFIX}"/var/lib/${PN}/db |
| 74 |
+ --with-cgi-bin-dir="${EPREFIX}"/var/www/localhost/cgi-bin |
| 75 |
+ --with-search-dir="${EPREFIX}"/var/www/localhost/htdocs/${PN} |
| 76 |
+ --with-image-dir="${EPREFIX}"/var/www/localhost/htdocs/${PN} |
| 77 |
$(use_with ssl) |
| 78 |
+ ) |
| 79 |
+ econf "${myeconfargs[@]}" |
| 80 |
} |
| 81 |
|
| 82 |
src_install () { |
Archives