diff options
| author |   Sam James <sam@gentoo.org> | 2022-02-07 01:51:11 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-02-07 02:07:53 +0000 |
| commit | 4fed9a6d9b0ae81fff6b7a7390fea76e8e59d826 (patch) | |
| tree | de74c7effd11b64d009f69e6e62ad839bc679ab5 /sys-apps/man-db/files | |
| parent | sci-visualization/tensorboard: bump 2.8.0 (diff) | |
| download | gentoo-4fed9a6d9b0ae81fff6b7a7390fea76e8e59d826.tar.gz gentoo-4fed9a6d9b0ae81fff6b7a7390fea76e8e59d826.tar.bz2 gentoo-4fed9a6d9b0ae81fff6b7a7390fea76e8e59d826.zip | |
sys-apps/man-db: add 2.10.0
Now defaults to gdbm, but can use berkdb to switch back to that
instead if desired.
This doesn't change the default for anybody as USE="+gdbm" has
been in profiles for a long time and we dropped USE="+berkdb" in profiles
a while ago. Plus, when in doubt, the ebuild used to go for USE=gdbm when
both were set. So, this is just a cleanup of the existing logic.
Closes: https://bugs.gentoo.org/830565
Closes: https://bugs.gentoo.org/697796
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-apps/man-db/files')
| -rw-r--r-- | sys-apps/man-db/files/man-db-2.10.0-fix-build-clang.patch | 44 | ||||
| -rw-r--r-- | sys-apps/man-db/files/man-db-2.9.3-darwin-libdb-intl.patch | 2 |
2 files changed, 46 insertions, 0 deletions
diff --git a/sys-apps/man-db/files/man-db-2.10.0-fix-build-clang.patch b/sys-apps/man-db/files/man-db-2.10.0-fix-build-clang.patch new file mode 100644 index 000000000000..2896301008ad --- /dev/null +++ b/sys-apps/man-db/files/man-db-2.10.0-fix-build-clang.patch @@ -0,0 +1,44 @@ +https://gitlab.com/cjwatson/man-db/-/commit/f4f94402834f20b9da730aeca5daa465be38efdf +https://gitlab.com/cjwatson/man-db/-/issues/2 + +From f4f94402834f20b9da730aeca5daa465be38efdf Mon Sep 17 00:00:00 2001 +From: Colin Watson <cjwatson@debian.org> +Date: Sun, 6 Feb 2022 12:37:01 +0000 +Subject: [PATCH] Revert "Reduce indentation depth using C99" + +This reverts commit c4d20840f3487588c4a0da4397b1acb6dc83a1e5. Even in +C99, a declaration isn't valid immediately after a label; this didn't +become valid until C2x, although gcc allows it as an extension. + +Fixes https://gitlab.com/cjwatson/man-db/-/issues/2. + +* src/man.c (parse_opt): Restore enclosing block for OPT_WARNINGS. +--- a/src/man.c ++++ b/src/man.c +@@ -383,15 +383,18 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) + + case OPT_WARNINGS: + #ifdef NROFF_WARNINGS +- char *s = xstrdup (arg ? arg : default_roff_warnings); +- const char *warning; ++ { ++ char *s = xstrdup ++ (arg ? arg : default_roff_warnings); ++ const char *warning; + +- for (warning = strtok (s, ","); warning; +- warning = strtok (NULL, ",")) +- gl_list_add_last (roff_warnings, +- xstrdup (warning)); ++ for (warning = strtok (s, ","); warning; ++ warning = strtok (NULL, ",")) ++ gl_list_add_last (roff_warnings, ++ xstrdup (warning)); + +- free (s); ++ free (s); ++ } + #endif /* NROFF_WARNINGS */ + return 0; + +GitLab diff --git a/sys-apps/man-db/files/man-db-2.9.3-darwin-libdb-intl.patch b/sys-apps/man-db/files/man-db-2.9.3-darwin-libdb-intl.patch index a7df3c62fd06..71cbb1c20df6 100644 --- a/sys-apps/man-db/files/man-db-2.9.3-darwin-libdb-intl.patch +++ b/sys-apps/man-db/files/man-db-2.9.3-darwin-libdb-intl.patch @@ -1,3 +1,5 @@ +https://gitlab.com/cjwatson/man-db/-/merge_requests/3 + libdb: link against libintl necessary since gettext is used for translations |