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

Update to harfbuzz 2.4.0. #141

Closed

Conversation

waywardmonkeys
Copy link
Collaborator

@waywardmonkeys waywardmonkeys commented Mar 30, 2019

This change is Reviewable

@jdm
Copy link
Member

jdm commented Mar 30, 2019

Appveyor is displeased, unfortunately.

@spl
Copy link
Contributor

spl commented Apr 4, 2019

There's a large diff between the 2.4.0 tag and the 2.4.0 tarball. Just the src/ diff is 98KB. Plus, the 2.4.0 tag passed AppVeyor. Can you try again using the repository instead of the tarball?

Also, just for my own personal education, what is the procedure used to make this update? Is it documented anywhere?

@spl
Copy link
Contributor

spl commented Apr 4, 2019

Okay, just discovered harfbuzz/harfbuzz#1641 and harfbuzz/harfbuzz#1643. But there's some implication there that the problematic tarball has been replaced, yet the diff still doesn't make sense.

In particular, there's this diff snippet:

diff -uar harfbuzz-original/src/hb-iter.hh harfbuzz-2.4.0/src/hb-iter.hh
--- harfbuzz-original/src/hb-iter.hh    2019-04-04 14:17:56.000000000 +0200
+++ harfbuzz-2.4.0/src/hb-iter.hh       2019-03-30 01:16:02.000000000 +0200
[...]
+template<typename T>
+struct _hb_is_iterable<T, hb_bool_tt<true || sizeof (hb_declval (T).iter ())> >
+{ enum { value = true }; };
[...]

and that addition exactly matches the first error currently shown in the AppVeyor build log:

[harfbuzz-sys 0.3.1] c:\projects\rust-harfbuzz\harfbuzz-sys\harfbuzz\src\hb-iter.hh(205):
error C2228: left of '.iter' must have class/struct/union
[C:\projects\rust-harfbuzz\target\debug\build\harfbuzz-sys-4e2b61eac7e21260\out\build\harfbuzz.vcxproj]

@waywardmonkeys
Copy link
Collaborator Author

Thanks for looking into this. I've been caught up in other things for the last couple of days.

My process is to grab a new tarball (which includes things that the repo doesn't, like generated configure scripts), and then:

cd harfbuzz-sys
git rm -rf harfbuzz
tar -xvf ~/Downloads/harfbuzz-whatever.tar.bz2
mv harfbuzz-whatever harfbuzz
git add harfbuzz

Then I'll re-generate the bindings using this:

bindgen \
    --no-prepend-enum-name \
    --disable-name-namespacing \
    --distrust-clang-mangling \
    --whitelist-type=hb.* \
    --whitelist-function=hb.* \
    --whitelist-var=HB.* \
    --blacklist-type=HB_VERSION.* \
    -o harfbuzz-sys/src/lib.rs \
    harfbuzz-sys/harfbuzz/src/hb-aat.h \
    -- -DHB_DISABLE_DEPRECATED \
       -Iharfbuzz-sys/harfbuzz/src \
       -I.

And then I'll inspect the differences and add the relevant ones. (I skip all documentation changes for now.)

This could all be improved ... but it isn't something that happens all that often.

@spl
Copy link
Contributor

spl commented Apr 6, 2019

A new 2.4.0 tarball has been uploaded. The diff with the repository looks much better.

halstead pushed a commit to openembedded/openembedded-core that referenced this pull request Apr 15, 2019
RP: Upstream replaced the original release tarball:
servo/rust-harfbuzz#141

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
kraj pushed a commit to YoeDistro/poky-old that referenced this pull request Apr 15, 2019
RP: Upstream replaced the original release tarball:
servo/rust-harfbuzz#141

(From OE-Core rev: 1e1f373dc870d4d3a6a88660b21072e6dd1b43f0)

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
halstead pushed a commit to openembedded/openembedded-core that referenced this pull request Apr 15, 2019
RP: Upstream replaced the original release tarball:
servo/rust-harfbuzz#141

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
gbionescu pushed a commit to gbionescu/poky that referenced this pull request Apr 15, 2019
RP: Upstream replaced the original release tarball:
servo/rust-harfbuzz#141

(From OE-Core rev: 96b29910f8515dc79ca4ecc0a1dfbbe3efb83f19)

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
gbionescu pushed a commit to gbionescu/poky that referenced this pull request Apr 15, 2019
RP: Upstream replaced the original release tarball:
servo/rust-harfbuzz#141

(From OE-Core rev: 96b29910f8515dc79ca4ecc0a1dfbbe3efb83f19)

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
gbionescu pushed a commit to gbionescu/poky that referenced this pull request Apr 16, 2019
RP: Upstream replaced the original release tarball:
servo/rust-harfbuzz#141

(From OE-Core rev: 96b29910f8515dc79ca4ecc0a1dfbbe3efb83f19)

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
gbionescu pushed a commit to gbionescu/poky that referenced this pull request Apr 16, 2019
RP: Upstream replaced the original release tarball:
servo/rust-harfbuzz#141

(From OE-Core rev: 96b29910f8515dc79ca4ecc0a1dfbbe3efb83f19)

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
jpuhlman pushed a commit to MontaVista-OpenSourceTechnology/poky that referenced this pull request Apr 17, 2019
Source: poky
MR: 00000
Type: Integration
Disposition: Merged from poky
ChangeID: 7b55ec6
Description:

RP: Upstream replaced the original release tarball:
servo/rust-harfbuzz#141

(From OE-Core rev: 96b29910f8515dc79ca4ecc0a1dfbbe3efb83f19)

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
@waywardmonkeys
Copy link
Collaborator Author

Closing in favor of updating to 2.5.0.

@waywardmonkeys waywardmonkeys deleted the update-to-harfbuzz-2.4.0 branch May 26, 2019 10:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants