Compiling icu x86_64-pc-linux-gnu-gcc -march=native -mtune=native -O2 -pipe -fPIC -march=native -mtune=native -O2 -pipe -fvisibility=hidden -pthread -I/usr/include/python3.8 -O3 -DCALIBRE_MODINIT_FUNC= __attribute__ ((visibility ("default"))) PyObject* -c /var/tmp/portage/app-text/calibre-4.23.0/work/calibre-4.23.0/src/calibre/utils/icu.c -o /var/tmp/portage/app-text/calibre-4.23.0/work/calibre-4.23.0/build/3/objects/icu/icu.o /var/tmp/portage/app-text/calibre-4.23.0/work/calibre-4.23.0/src/calibre/utils/icu.c: In function ‘icu_Collator_contains’: /var/tmp/portage/app-text/calibre-4.23.0/work/calibre-4.23.0/src/calibre/utils/icu.c:246:29: error: ‘TRUE’ undeclared (first use in this function) 246 | if (asz == 0) { found = TRUE; goto end; } | ^~~~ /var/tmp/portage/app-text/calibre-4.23.0/work/calibre-4.23.0/src/calibre/utils/icu.c:246:29: note: each undeclared identifier is reported only once for each function it appears in
Same with app-text/calibre-5.4.2
Created attachment 669773 [details, diff] calibre-icu68.patch Possible fix
ping
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d13714f2a66bb0eb4ea88b33dc2404f6d4120df commit 1d13714f2a66bb0eb4ea88b33dc2404f6d4120df Author: Andreas K. Hüttel <dilfridge@gentoo.org> AuthorDate: 2020-11-28 22:50:26 +0000 Commit: Andreas K. Hüttel <dilfridge@gentoo.org> CommitDate: 2020-11-28 22:50:45 +0000 app-text/calibre: Fix build with icu-68 Closes: https://bugs.gentoo.org/752015 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org> app-text/calibre/calibre-4.22.0.ebuild | 3 +- app-text/calibre/calibre-4.23.0.ebuild | 3 +- app-text/calibre/calibre-5.4.2.ebuild | 1 + app-text/calibre/files/calibre-4.22.0-icu68.patch | 37 +++++++++++++++++++++++ 4 files changed, 42 insertions(+), 2 deletions(-)
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc8f9b505478b47275ad3318d9179390b04dd55d commit fc8f9b505478b47275ad3318d9179390b04dd55d Author: Andreas K. Hüttel <dilfridge@gentoo.org> AuthorDate: 2020-11-29 13:06:39 +0000 Commit: Andreas K. Hüttel <dilfridge@gentoo.org> CommitDate: 2020-11-29 13:07:16 +0000 app-text/calibre: Fix build with icu-68, now really Bug: https://bugs.gentoo.org/752015 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org> app-text/calibre/calibre-4.22.0.ebuild | 5 +++-- app-text/calibre/calibre-4.23.0.ebuild | 5 +++-- app-text/calibre/calibre-5.4.2.ebuild | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-)
*** Bug 775218 has been marked as a duplicate of this bug. ***
(In reply to Tadej Obrstar from bug 775218 comment #0) > emerge fails with: > * Applying calibre-4.22.0-icu68.patch ... > patching file src/calibre/utils/icu.c > Hunk #1 FAILED at 238. > 1 out of 1 hunk FAILED -- saving rejects to file src/calibre/utils/icu.c.rej > patching file src/calibre/utils/matcher.c > Hunk #1 FAILED at 15. > 1 out of 1 hunk FAILED -- saving rejects to file > src/calibre/utils/matcher.c.rej > [ !! ] > > Reproducible: Always The patch from comment #2 doesn't apply to calibre-5.13.0. Maybe that means it supports icu68?
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa0d07b6df4d1f31748feab3ced9f8f4dfcd0cf9 commit fa0d07b6df4d1f31748feab3ced9f8f4dfcd0cf9 Author: Zac Medico <zmedico@gentoo.org> AuthorDate: 2021-03-10 17:53:31 +0000 Commit: Zac Medico <zmedico@gentoo.org> CommitDate: 2021-03-10 17:55:42 +0000 app-text/calibre: drop icu68 patch from calibre-5.13.0 Closes: https://bugs.gentoo.org/752015 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Zac Medico <zmedico@gentoo.org> app-text/calibre/calibre-5.13.0.ebuild | 2 -- 1 file changed, 2 deletions(-)
