Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "[fix] MuPDF Android font dir patch update (#971)" #1013

Merged
merged 2 commits into from
Nov 21, 2019

Conversation

Frenzie
Copy link
Member

@Frenzie Frenzie commented Nov 21, 2019

This reverts commit b7dd4c1.

Closes koreader/koreader#5617.


This change is Reviewable

@Frenzie
Copy link
Member Author

Frenzie commented Nov 21, 2019

@NiLuJe I'm a bit confused here. There's something happening only on Cervantes… unrelated to this PR of course so I'll go ahead and merge it now, but pretty weird.

make[3]: Leaving directory '/home/ko/base/thirdparty/fbink/build/arm-cervantes-linux-gnueabi/fbink-prefix/src/fbink'

make stripbin

make[3]: Entering directory '/home/ko/base/thirdparty/fbink/build/arm-cervantes-linux-gnueabi/fbink-prefix/src/fbink'

fatal: No names found, cannot describe anything.

arm-cervantes-linux-gnueabi-strip --strip-unneeded Release/fbink

make[3]: Leaving directory '/home/ko/base/thirdparty/fbink/build/arm-cervantes-linux-gnueabi/fbink-prefix/src/fbink'

make[2]: Leaving directory '/home/ko/base/thirdparty/fbink/build/arm-cervantes-linux-gnueabi/fbink-prefix/src/fbink'

/home/ko/base/thirdparty/fbink/build/arm-cervantes-linux-gnueabi/fbink-prefix/src/fbink/tools/do_debian_package.sh Release armel

Building FBInk--armel.deb

dpkg-deb: error: parsing file 'Release/pkg/DEBIAN/control' near line 2 package 'fbink':

 error in 'Version' field string '': version string is empty

Makefile:535: recipe for target 'cervantes' failed

make[1]: *** [cervantes] Error 2

make[1]: Leaving directory '/home/ko/base/thirdparty/fbink/build/arm-cervantes-linux-gnueabi/fbink-prefix/src/fbink'

ninja: build stopped: subcommand failed.

Makefile.third:484: recipe for target 'build/arm-cervantes-linux-gnueabi/fbink' failed

make: *** [build/arm-cervantes-linux-gnueabi/fbink] Error 1

@Frenzie Frenzie merged commit 024e1a4 into koreader:master Nov 21, 2019
@Frenzie Frenzie deleted the mupdf branch November 21, 2019 13:26
Frenzie added a commit to Frenzie/koreader that referenced this pull request Nov 21, 2019
* [chore] thirdparty patch file dependencies koreader/koreader-base#1012
* Revert "[fix] MuPDF Android font dir patch update koreader/koreader-base#1013

Fixes koreader#5617.
Frenzie added a commit to koreader/koreader that referenced this pull request Nov 21, 2019
* [chore] thirdparty patch file dependencies koreader/koreader-base#1012
* Revert "[fix] MuPDF Android font dir patch update koreader/koreader-base#1013

Fixes #5617.
@NiLuJe
Copy link
Member

NiLuJe commented Nov 21, 2019 via email

@NiLuJe
Copy link
Member

NiLuJe commented Nov 21, 2019

Oh, unless... Because it's no longer pinned on a tag, but on a random commit.

I'll look into it (and tag a release soon anyway ;)).

@NiLuJe
Copy link
Member

NiLuJe commented Nov 21, 2019

Ah, no, it's simply that git describe requires an unshallow clone to behave properly, I think?

@NiLuJe
Copy link
Member

NiLuJe commented Nov 21, 2019

It's also highly unclear to me how its error message (fatal: No names found, cannot describe anything.) managed to make it to your log despite a 2>/dev/null... ^^

@Frenzie
Copy link
Member Author

Frenzie commented Nov 21, 2019

git describe has to be able to reach a tag, but the script I wrote only goes deeper than 50 if it fails to checkout the tag or commit. If you've got more than 50 commits since the last tag maybe it's about time? :-P

4b8bc32

@Frenzie
Copy link
Member Author

Frenzie commented Nov 21, 2019

Anyway, if it were purely about git describe then surely it should happen just as much on Kobo?

@NiLuJe
Copy link
Member

NiLuJe commented Nov 21, 2019

Yeah, switching to a tag forces an unshallow clone since master is currently 55 commits away from the last tag ;).

That particular visible git describe call is Cervantes-specific, but there's another one buried in the Makefile, which is currently probably doing something very stupid, like using the error message as a version string :D.

NiLuJe added a commit to NiLuJe/FBInk that referenced this pull request Nov 21, 2019
(because of a shallow clone, for instance).
c.f., koreader/koreader-base#1013
@NiLuJe
Copy link
Member

NiLuJe commented Nov 21, 2019

There, fixed it ;).

Plus, I'll tag & bump a release soon anyway ;).

mwoz123 pushed a commit to mwoz123/koreader that referenced this pull request Mar 29, 2020
* [chore] thirdparty patch file dependencies koreader/koreader-base#1012
* Revert "[fix] MuPDF Android font dir patch update koreader/koreader-base#1013

Fixes koreader#5617.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CJK characters not displaying in dictionary and footnotes
2 participants