This patch fixes the build of Libreoffice 6.0.5 with icu 61.1. It was downloaded from https://bugs.gentoo.org/651702. --- a/forms/source/xforms/datatypes.hxx +++ a/forms/source/xforms/datatypes.hxx @@ -36,6 +36,8 @@ #include +using icu::RegexMatcher; + namespace xforms { --- a/i18npool/inc/collator_unicode.hxx +++ a/i18npool/inc/collator_unicode.hxx @@ -26,6 +26,8 @@ #include +using icu::RuleBasedCollator; + // ---------------------------------------------------- // class Collator_Unicode // ---------------------------------------------------- --- a/i18npool/source/breakiterator/breakiterator_unicode.cxx +++ a/i18npool/source/breakiterator/breakiterator_unicode.cxx @@ -30,6 +30,9 @@ #include #include +using icu::BreakIterator; +using icu::RuleBasedBreakIterator; + U_CDECL_BEGIN extern const char OpenOffice_dat[]; U_CDECL_END --- a/i18npool/source/collator/collator_unicode.cxx +++ a/i18npool/source/collator/collator_unicode.cxx @@ -29,6 +29,8 @@ #include #include +using icu::Collator; + using namespace ::com::sun::star; using namespace ::com::sun::star::i18n; using namespace ::com::sun::star::lang; --- a/i18npool/source/collator/gencoll_rule.cxx +++ a/i18npool/source/collator/gencoll_rule.cxx @@ -31,6 +31,8 @@ #include +using icu::RuleBasedCollator; + /* Main Procedure */ void data_write(char* file, char* name, sal_uInt8 *data, sal_Int32 len) --- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx +++ a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx @@ -29,6 +29,8 @@ #include #include +using icu::NumberFormat; + using namespace ::com::sun::star::i18n; using namespace ::com::sun::star::uno; using namespace ::com::sun::star; --- a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx +++ a/i18npool/source/transliteration/ignoreDiacritics_CTL.cxx @@ -12,6 +12,8 @@ #include #include +using icu::UnicodeString; + namespace i18npool { ignoreDiacritics_CTL::ignoreDiacritics_CTL() --- a/i18nutil/source/utility/unicode.cxx +++ a/i18nutil/source/utility/unicode.cxx @@ -34,6 +34,9 @@ // which (obviously) breaks UnicodeType::CURRENCY_SYMBOL #undef CURRENCY_SYMBOL +using icu::NumberFormat; +using icu::UnicodeString; + using namespace ::com::sun::star::i18n; template --- a/lotuswordpro/source/filter/localtime.cxx +++ a/lotuswordpro/source/filter/localtime.cxx @@ -57,6 +57,8 @@ #include #include +using icu::TimeZone; + const long DAY_SEC =24 * 60 * 60; const long YEAR_SEC = 365 * DAY_SEC; const long FOURYEAR_SEC = 4 * YEAR_SEC + DAY_SEC; --- a/opencl/source/openclconfig.cxx +++ a/opencl/source/openclconfig.cxx @@ -17,6 +17,8 @@ #include #include +using icu::RegexMatcher; + OpenCLConfig::OpenCLConfig() : mbUseOpenCL(true) { --- a/vcl/inc/scrptrun.h +++ a/vcl/inc/scrptrun.h @@ -45,6 +45,8 @@ #include #include +using icu::UObject; + namespace vcl { struct ParenStackEntry 022'>Remove now unnecessary uses of (guix grafts)....These modules would use (guix grafts) just to access '%graft?' and related bindings, which are now in (guix store). * gnu/ci.scm, guix/gexp.scm, guix/lint.scm, guix/scripts.scm, guix/scripts/archive.scm, guix/scripts/build.scm, guix/scripts/challenge.scm, guix/scripts/deploy.scm, guix/scripts/environment.scm, guix/scripts/home.scm, guix/scripts/pack.scm, guix/scripts/package.scm, guix/scripts/pull.scm, guix/scripts/size.scm, guix/scripts/system.scm, guix/scripts/weather.scm, tests/builders.scm, tests/channels.scm, tests/cpan.scm, tests/derivations.scm, tests/gexp.scm, tests/graph.scm, tests/guix-daemon.sh, tests/monads.scm, tests/pack.scm, tests/packages.scm, tests/profiles.scm, tests/system.scm: Remove #:use-module (guix grafts). Ludovic Courtès 2022-02-14git-authenticate: Ensure the target is a descendant of the introductory commit....Fixes a bug whereby authentication of a commit *not* descending from the introductory commit could succeed, provided the commit verifies the authorization invariant. In the example below, A is a common ancestor of the introductory commit I and of commit X. Authentication of X would succeed, even though it is not a descendant of I, as long as X is authorized according to the '.guix-authorizations' in A: X I \ / A This is because, 'authenticate-repository' would not check whether X descends from I, and the call (commit-difference X I) would return X. In practice that only affects forks because it means that ancestors of the introductory commit already contain a '.guix-authorizations' file. * guix/git-authenticate.scm (authenticate-repository): Add call to 'commit-descendant?'. * tests/channels.scm ("authenticate-channel, not a descendant of introductory commit"): New test. * tests/git-authenticate.scm ("authenticate-repository, target not a descendant of intro"): New test. * tests/guix-git-authenticate.sh: Expect earlier test to fail since 9549f0283a78fe36f2d4ff2a04ef8ad6b0c02604 is not a descendant of $intro_commit. Add new test targeting an ancestor of the introductory commit, and another test targeting the v1.2.0 commit. * doc/guix.texi (Specifying Channel Authorizations): Add a sentence. Ludovic Courtès 2021-12-22tests: Move keys into ./tests/keys/ and add a third ed25519 key....The third key will be used in an upcoming commit. Rename public keys to .pub. * guix/tests/gnupg.scm (%ed25519-3-public-key-file): New variable. (%ed25519-3-secret-key-file): New variable. (%ed25519-2-public-key-file): Renamed from %ed25519bis-public-key-file. (%ed25519-2-secret-key-file): Renamed from %ed25519bis-secret-key-file. * tests/keys/ed25519-3.key: New file. * tests/keys/ed25519-3.sec: New file. Signed-off-by: Mathieu Othacehe <othacehe@gnu.org> Attila Lendvai 2021-09-18channels: 'channel-news-entry-commit' correctly resolves annotated tags....Previously, 'channel-news-entry-commit' would return the tag ID rather than the commit ID when the news entry was referred to via an annotated tag. Reported by Xinglu Chen <public@yoctocell.xyz>. * guix/channels.scm (resolve-channel-news-entry-tag): Check whether the reference points to annotated tag; resolve it if it does. * tests/channels.scm ("channel-news, annotated tag"): New test. Ludovic Courtès