108373 2013-01-30 13:19:23 -0800 [harfbuzz] WebKit fails to build with MinGW compiler because of invalid cast in HarfBuzzShaper.cpp 2013-06-03 15:47:42 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 tuxator webkit-unassigned commit-queue darin dglazkov d-r kalevlember mrobinson peter+ews webkit.review.bot oldest_to_newest 820467 0 tuxator 2013-01-30 13:19:23 -0800 Build dies with the following error GEN generate-testwebkitapi-forwarding-headers GEN DerivedSources/JavaScriptCore/LLIntAssembly.h offlineasm: Parsing ./Source/JavaScriptCore/llint/LowLevelInterpreter.asm and Programs/LLIntOffsetsExtractor.exe and creating assembly file DerivedSources/JavaScriptCore/LLIntAssembly.h. offlineasm: No magic values found. Skipping assembly file generation. make all-am make[1]: Wejście do katalogu `/home/pawel/src/webkit' /usr/bin/mkdir -p ./.deps/DerivedSources CXX Source/WebCore/platform/graphics/harfbuzz/ng/libWebCore_la-HarfBuzzShaper.lo Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzShaper.cpp: In member function 'bool WebCore::HarfBuzzShaper::shapeHarfBuzzRuns(bool)': Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzShaper.cpp:340:138: error: invalid conversion from 'const UChar* {aka const wchar_t*}' to 'const uint16_t* {aka const short unsigned int*}' [-fpermissive] In file included from /usr/i686-w64-mingw32/sys-root/mingw/include/harfbuzz/hb.h:32:0, from Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzShaper.h:38, from Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzShaper.cpp:32: /usr/i686-w64-mingw32/sys-root/mingw/include/harfbuzz/hb-buffer.h:230:1: error: initializing argument 2 of 'void hb_buffer_add_utf16(hb_buffer_t*, const uint16_t*, int, unsigned int, int)' [-fpermissive] Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzShaper.cpp:342:167: error: invalid conversion from 'WTF::OwnArrayPtr<wchar_t>::PtrType {aka wchar_t*}' to 'const uint16_t* {aka const short unsigned int*}' [-fpermissive] In file included from /usr/i686-w64-mingw32/sys-root/mingw/include/harfbuzz/hb.h:32:0, from Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzShaper.h:38, from Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzShaper.cpp:32: /usr/i686-w64-mingw32/sys-root/mingw/include/harfbuzz/hb-buffer.h:230:1: error: initializing argument 2 of 'void hb_buffer_add_utf16(hb_buffer_t*, const uint16_t*, int, unsigned int, int)' [-fpermissive] make[1]: *** [Source/WebCore/platform/graphics/harfbuzz/ng/libWebCore_la-HarfBuzzShaper.lo] Błąd 1 make[1]: Opuszczenie katalogu `/home/pawel/src/webkit' make: *** [all] Błąd 2 820501 1 185553 tuxator 2013-01-30 13:44:29 -0800 Created attachment 185553 proposed fix 821345 2 185739 tuxator 2013-01-31 03:51:14 -0800 Created attachment 185739 Update for directory rename 821348 3 185739 eflews.bot 2013-01-31 03:58:36 -0800 Comment on attachment 185739 Update for directory rename Attachment 185739 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/16266173 821363 4 185739 webkit.review.bot 2013-01-31 04:11:51 -0800 Comment on attachment 185739 Update for directory rename Attachment 185739 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/16271193 821371 5 185739 peter+ews 2013-01-31 04:22:10 -0800 Comment on attachment 185739 Update for directory rename Attachment 185739 did not pass cr-android-ews (chromium-android): Output: http://queues.webkit.org/results/16252352 821372 6 185745 tuxator 2013-01-31 04:23:45 -0800 Created attachment 185745 don't ommit const 824611 7 185745 mrobinson 2013-02-04 11:37:47 -0800 Comment on attachment 185745 don't ommit const This kind of cast always makes me nervous. 825274 8 d-r 2013-02-05 01:46:44 -0800 (In reply to comment #0) > Build dies with the following error > > GEN generate-testwebkitapi-forwarding-headers > GEN DerivedSources/JavaScriptCore/LLIntAssembly.h > offlineasm: Parsing ./Source/JavaScriptCore/llint/LowLevelInterpreter.asm and Programs/LLIntOffsetsExtractor.exe and creating assembly file DerivedSources/JavaScriptCore/LLIntAssembly.h. > offlineasm: No magic values found. Skipping assembly file generation. > make all-am > make[1]: Wejście do katalogu `/home/pawel/src/webkit' > /usr/bin/mkdir -p ./.deps/DerivedSources > CXX Source/WebCore/platform/graphics/harfbuzz/ng/libWebCore_la-HarfBuzzShaper.lo > Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzShaper.cpp: In member function 'bool WebCore::HarfBuzzShaper::shapeHarfBuzzRuns(bool)': > Source/WebCore/platform/graphics/harfbuzz/ng/HarfBuzzShaper.cpp:340:138: error: invalid conversion from 'const UChar* {aka const wchar_t*}' to 'const uint16_t* {aka const short unsigned int*}' [-fpermissive] m_normalizedBuffer is declared as follow: OwnArrayPtr<UChar> m_normalizedBuffer; Are you sure you have a correctly sized UChar typedef/declaration on your platform? What configuration are you building? Does it match one of the bots? 825525 9 tuxator 2013-02-05 09:07:57 -0800 (In reply to comment #8) > > m_normalizedBuffer is declared as follow: > OwnArrayPtr<UChar> m_normalizedBuffer; > Are you sure you have a correctly sized UChar typedef/declaration on your platform? What configuration are you building? Does it match one of the bots? I try to cross compile WebkitGTK for Windows using MinGW stack, there is no such build bot like that as far as i know. 825543 10 d-r 2013-02-05 09:23:46 -0800 (In reply to comment #9) > (In reply to comment #8) > > > > > m_normalizedBuffer is declared as follow: > > OwnArrayPtr<UChar> m_normalizedBuffer; > > Are you sure you have a correctly sized UChar typedef/declaration on your platform? What configuration are you building? Does it match one of the bots? > > I try to cross compile WebkitGTK for Windows using MinGW stack, there is no such build bot like > that as far as i know. I would try to follow up why UChar/wchar_t is not matching uint16_t in this configuration, maybe there is something wrong with your build configuration of ICU. 848920 11 185745 darin 2013-03-06 09:13:40 -0800 Comment on attachment 185745 don't ommit const Change looks fine. Patch needs a change log. 896608 12 kalevlember 2013-06-03 14:12:54 -0700 UChar is always defined as a 16 bit type. Depending on the build configuration, the exact type can vary, but it's always a 16 bit type. In the GTK+/MinGW configuration, the preprocessor magic chooses it to be wchar_t, but only after making sure wchar_t is a 16 bit type. Unfortunately, even though the source and target types are both 16 bit, gcc considers them to be different, so it needs an explicit reinterpret_cast. From Source/JavaScriptCore/icu/unicode/umachine.h: #if U_SIZEOF_WCHAR_T==2 typedef wchar_t UChar; #elif U_GNUC_UTF16_STRING #if defined _GCC_ typedef __CHAR16_TYPE__ char16_t; #endif typedef char16_t UChar; #else typedef uint16_t UChar; #endif 896623 13 203629 tuxator 2013-06-03 14:45:29 -0700 Created attachment 203629 Patch updated with the changelog 896630 14 203629 mrobinson 2013-06-03 14:52:32 -0700 Comment on attachment 203629 Patch updated with the changelog View in context: https://bugs.webkit.org/attachment.cgi?id=203629&action=review > Source/WebCore/ChangeLog:10 > + No new tests (OOPS!). You need to remove this line for the patch to pass the tools. 896640 15 203631 tuxator 2013-06-03 15:19:02 -0700 Created attachment 203631 updated 896651 16 203631 commit-queue 2013-06-03 15:47:38 -0700 Comment on attachment 203631 updated Clearing flags on attachment: 203631 Committed r151141: <http://trac.webkit.org/changeset/151141> 896652 17 commit-queue 2013-06-03 15:47:42 -0700 All reviewed patches have been landed. Closing bug. 185553 2013-01-30 13:44:29 -0800 2013-01-31 03:51:14 -0800 proposed fix harfbuzz.diff text/plain 1544 tuxator ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L25n L0hhcmZCdXp6U2hhcGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2hh cmZidXp6L25nL0hhcmZCdXp6U2hhcGVyLmNwcAppbmRleCA5ZDIzODVmLi45Y2Q2ZjNkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9uZy9IYXJm QnV6elNoYXBlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaGFy ZmJ1enovbmcvSGFyZkJ1enpTaGFwZXIuY3BwCkBAIC0zMzcsOSArMzM3LDkgQEAgYm9vbCBIYXJm QnV6elNoYXBlcjo6c2hhcGVIYXJmQnV6elJ1bnMoYm9vbCBzaG91bGRTZXREaXJlY3Rpb24pCiAg ICAgICAgICAgICBTdHJpbmcgdXBwZXJUZXh0ID0gU3RyaW5nKG1fbm9ybWFsaXplZEJ1ZmZlci5n ZXQoKSArIGN1cnJlbnRSdW4tPnN0YXJ0SW5kZXgoKSwgY3VycmVudFJ1bi0+bnVtQ2hhcmFjdGVy cygpKTsKICAgICAgICAgICAgIHVwcGVyVGV4dC5tYWtlVXBwZXIoKTsKICAgICAgICAgICAgIGN1 cnJlbnRGb250RGF0YSA9IG1fZm9udC0+Z2x5cGhEYXRhRm9yQ2hhcmFjdGVyKHVwcGVyVGV4dFsw XSwgZmFsc2UsIFNtYWxsQ2Fwc1ZhcmlhbnQpLmZvbnREYXRhOwotICAgICAgICAgICAgaGJfYnVm ZmVyX2FkZF91dGYxNihoYXJmYnV6ekJ1ZmZlci5nZXQoKSwgdXBwZXJUZXh0LmNoYXJhY3RlcnMo KSwgY3VycmVudFJ1bi0+bnVtQ2hhcmFjdGVycygpLCAwLCBjdXJyZW50UnVuLT5udW1DaGFyYWN0 ZXJzKCkpOworICAgICAgICAgICAgaGJfYnVmZmVyX2FkZF91dGYxNihoYXJmYnV6ekJ1ZmZlci5n ZXQoKSwgcmVpbnRlcnByZXRfY2FzdDxjb25zdCB1aW50MTZfdCo+KHVwcGVyVGV4dC5jaGFyYWN0 ZXJzKCkpLCBjdXJyZW50UnVuLT5udW1DaGFyYWN0ZXJzKCksIDAsIGN1cnJlbnRSdW4tPm51bUNo YXJhY3RlcnMoKSk7CiAgICAgICAgIH0gZWxzZQotICAgICAgICAgICAgaGJfYnVmZmVyX2FkZF91 dGYxNihoYXJmYnV6ekJ1ZmZlci5nZXQoKSwgbV9ub3JtYWxpemVkQnVmZmVyLmdldCgpICsgY3Vy cmVudFJ1bi0+c3RhcnRJbmRleCgpLCBjdXJyZW50UnVuLT5udW1DaGFyYWN0ZXJzKCksIDAsIGN1 cnJlbnRSdW4tPm51bUNoYXJhY3RlcnMoKSk7CisgICAgICAgICAgICBoYl9idWZmZXJfYWRkX3V0 ZjE2KGhhcmZidXp6QnVmZmVyLmdldCgpLCByZWludGVycHJldF9jYXN0PGNvbnN0IHVpbnQxNl90 Kj4obV9ub3JtYWxpemVkQnVmZmVyLmdldCgpKSArIGN1cnJlbnRSdW4tPnN0YXJ0SW5kZXgoKSwg Y3VycmVudFJ1bi0+bnVtQ2hhcmFjdGVycygpLCAwLCBjdXJyZW50UnVuLT5udW1DaGFyYWN0ZXJz KCkpOwogCiAgICAgICAgIEZvbnRQbGF0Zm9ybURhdGEqIHBsYXRmb3JtRGF0YSA9IGNvbnN0X2Nh c3Q8Rm9udFBsYXRmb3JtRGF0YSo+KCZjdXJyZW50Rm9udERhdGEtPnBsYXRmb3JtRGF0YSgpKTsK ICAgICAgICAgSGFyZkJ1enpOR0ZhY2UqIGZhY2UgPSBwbGF0Zm9ybURhdGEtPmhhcmZidXp6RmFj ZSgpOwo= 185739 2013-01-31 03:51:14 -0800 2013-01-31 04:23:45 -0800 Update for directory rename harfbuzz.diff text/plain 1518 tuxator ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L0hh cmZCdXp6U2hhcGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2hhcmZi dXp6L0hhcmZCdXp6U2hhcGVyLmNwcAppbmRleCAwNmQxM2YxLi4yYTQxY2JlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9IYXJmQnV6elNoYXBl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaGFyZmJ1enovSGFy ZkJ1enpTaGFwZXIuY3BwCkBAIC0zMzcsOSArMzM3LDkgQEAgYm9vbCBIYXJmQnV6elNoYXBlcjo6 c2hhcGVIYXJmQnV6elJ1bnMoYm9vbCBzaG91bGRTZXREaXJlY3Rpb24pCiAgICAgICAgICAgICBT dHJpbmcgdXBwZXJUZXh0ID0gU3RyaW5nKG1fbm9ybWFsaXplZEJ1ZmZlci5nZXQoKSArIGN1cnJl bnRSdW4tPnN0YXJ0SW5kZXgoKSwgY3VycmVudFJ1bi0+bnVtQ2hhcmFjdGVycygpKTsKICAgICAg ICAgICAgIHVwcGVyVGV4dC5tYWtlVXBwZXIoKTsKICAgICAgICAgICAgIGN1cnJlbnRGb250RGF0 YSA9IG1fZm9udC0+Z2x5cGhEYXRhRm9yQ2hhcmFjdGVyKHVwcGVyVGV4dFswXSwgZmFsc2UsIFNt YWxsQ2Fwc1ZhcmlhbnQpLmZvbnREYXRhOwotICAgICAgICAgICAgaGJfYnVmZmVyX2FkZF91dGYx NihoYXJmQnV6ekJ1ZmZlci5nZXQoKSwgdXBwZXJUZXh0LmNoYXJhY3RlcnMoKSwgY3VycmVudFJ1 bi0+bnVtQ2hhcmFjdGVycygpLCAwLCBjdXJyZW50UnVuLT5udW1DaGFyYWN0ZXJzKCkpOworICAg ICAgICAgICAgaGJfYnVmZmVyX2FkZF91dGYxNihoYXJmQnV6ekJ1ZmZlci5nZXQoKSwgcmVpbnRl cnByZXRfY2FzdDx1aW50MTZfdCo+KHVwcGVyVGV4dC5jaGFyYWN0ZXJzKCkpLCBjdXJyZW50UnVu LT5udW1DaGFyYWN0ZXJzKCksIDAsIGN1cnJlbnRSdW4tPm51bUNoYXJhY3RlcnMoKSk7CiAgICAg ICAgIH0gZWxzZQotICAgICAgICAgICAgaGJfYnVmZmVyX2FkZF91dGYxNihoYXJmQnV6ekJ1ZmZl ci5nZXQoKSwgbV9ub3JtYWxpemVkQnVmZmVyLmdldCgpICsgY3VycmVudFJ1bi0+c3RhcnRJbmRl eCgpLCBjdXJyZW50UnVuLT5udW1DaGFyYWN0ZXJzKCksIDAsIGN1cnJlbnRSdW4tPm51bUNoYXJh Y3RlcnMoKSk7CisgICAgICAgICAgICBoYl9idWZmZXJfYWRkX3V0ZjE2KGhhcmZCdXp6QnVmZmVy LmdldCgpLCByZWludGVycHJldF9jYXN0PHVpbnQxNl90Kj4obV9ub3JtYWxpemVkQnVmZmVyLmdl dCgpICsgY3VycmVudFJ1bi0+c3RhcnRJbmRleCgpKSwgY3VycmVudFJ1bi0+bnVtQ2hhcmFjdGVy cygpLCAwLCBjdXJyZW50UnVuLT5udW1DaGFyYWN0ZXJzKCkpOwogCiAgICAgICAgIEZvbnRQbGF0 Zm9ybURhdGEqIHBsYXRmb3JtRGF0YSA9IGNvbnN0X2Nhc3Q8Rm9udFBsYXRmb3JtRGF0YSo+KCZj dXJyZW50Rm9udERhdGEtPnBsYXRmb3JtRGF0YSgpKTsKICAgICAgICAgSGFyZkJ1enpGYWNlKiBm YWNlID0gcGxhdGZvcm1EYXRhLT5oYXJmQnV6ekZhY2UoKTsK 185745 2013-01-31 04:23:45 -0800 2013-06-03 14:45:29 -0700 don't ommit const harfbuzz.diff text/plain 1530 tuxator ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L0hh cmZCdXp6U2hhcGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2hhcmZi dXp6L0hhcmZCdXp6U2hhcGVyLmNwcAppbmRleCAwNmQxM2YxLi4wMjRhYjBlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9IYXJmQnV6elNoYXBl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaGFyZmJ1enovSGFy ZkJ1enpTaGFwZXIuY3BwCkBAIC0zMzcsOSArMzM3LDkgQEAgYm9vbCBIYXJmQnV6elNoYXBlcjo6 c2hhcGVIYXJmQnV6elJ1bnMoYm9vbCBzaG91bGRTZXREaXJlY3Rpb24pCiAgICAgICAgICAgICBT dHJpbmcgdXBwZXJUZXh0ID0gU3RyaW5nKG1fbm9ybWFsaXplZEJ1ZmZlci5nZXQoKSArIGN1cnJl bnRSdW4tPnN0YXJ0SW5kZXgoKSwgY3VycmVudFJ1bi0+bnVtQ2hhcmFjdGVycygpKTsKICAgICAg ICAgICAgIHVwcGVyVGV4dC5tYWtlVXBwZXIoKTsKICAgICAgICAgICAgIGN1cnJlbnRGb250RGF0 YSA9IG1fZm9udC0+Z2x5cGhEYXRhRm9yQ2hhcmFjdGVyKHVwcGVyVGV4dFswXSwgZmFsc2UsIFNt YWxsQ2Fwc1ZhcmlhbnQpLmZvbnREYXRhOwotICAgICAgICAgICAgaGJfYnVmZmVyX2FkZF91dGYx NihoYXJmQnV6ekJ1ZmZlci5nZXQoKSwgdXBwZXJUZXh0LmNoYXJhY3RlcnMoKSwgY3VycmVudFJ1 bi0+bnVtQ2hhcmFjdGVycygpLCAwLCBjdXJyZW50UnVuLT5udW1DaGFyYWN0ZXJzKCkpOworICAg ICAgICAgICAgaGJfYnVmZmVyX2FkZF91dGYxNihoYXJmQnV6ekJ1ZmZlci5nZXQoKSwgcmVpbnRl cnByZXRfY2FzdDxjb25zdCB1aW50MTZfdCo+KHVwcGVyVGV4dC5jaGFyYWN0ZXJzKCkpLCBjdXJy ZW50UnVuLT5udW1DaGFyYWN0ZXJzKCksIDAsIGN1cnJlbnRSdW4tPm51bUNoYXJhY3RlcnMoKSk7 CiAgICAgICAgIH0gZWxzZQotICAgICAgICAgICAgaGJfYnVmZmVyX2FkZF91dGYxNihoYXJmQnV6 ekJ1ZmZlci5nZXQoKSwgbV9ub3JtYWxpemVkQnVmZmVyLmdldCgpICsgY3VycmVudFJ1bi0+c3Rh cnRJbmRleCgpLCBjdXJyZW50UnVuLT5udW1DaGFyYWN0ZXJzKCksIDAsIGN1cnJlbnRSdW4tPm51 bUNoYXJhY3RlcnMoKSk7CisgICAgICAgICAgICBoYl9idWZmZXJfYWRkX3V0ZjE2KGhhcmZCdXp6 QnVmZmVyLmdldCgpLCByZWludGVycHJldF9jYXN0PGNvbnN0IHVpbnQxNl90Kj4obV9ub3JtYWxp emVkQnVmZmVyLmdldCgpICsgY3VycmVudFJ1bi0+c3RhcnRJbmRleCgpKSwgY3VycmVudFJ1bi0+ bnVtQ2hhcmFjdGVycygpLCAwLCBjdXJyZW50UnVuLT5udW1DaGFyYWN0ZXJzKCkpOwogCiAgICAg ICAgIEZvbnRQbGF0Zm9ybURhdGEqIHBsYXRmb3JtRGF0YSA9IGNvbnN0X2Nhc3Q8Rm9udFBsYXRm b3JtRGF0YSo+KCZjdXJyZW50Rm9udERhdGEtPnBsYXRmb3JtRGF0YSgpKTsKICAgICAgICAgSGFy ZkJ1enpGYWNlKiBmYWNlID0gcGxhdGZvcm1EYXRhLT5oYXJmQnV6ekZhY2UoKTsK 203629 2013-06-03 14:45:29 -0700 2013-06-03 15:19:02 -0700 Patch updated with the changelog harfbuzz.diff text/plain 2292 tuxator ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0ZGM5ODJlLi4yNDM1MDU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTMtMDYtMDMgIFBhd2XFgiBGb3J5c2l1ayAgPHR1eGF0b3JAbzIucGw+CisKKyAgICAg ICAgW2hhcmZidXp6XSBXZWJLaXQgZmFpbHMgdG8gYnVpbGQgd2l0aCBNaW5HVyBjb21waWxlciBi ZWNhdXNlIG9mIGludmFsaWQgY2FzdCBpbiBIYXJmQnV6elNoYXBlci5jcHAKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwODM3MworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBidWlsZGluZyBvbiBwbGF0 Zm9ybXMgd2hlcmUgVUNoYXIgaXMgZGVmaW5lZCBhcyB3Y2hhcl90LgorCisgICAgICAgIE5vIG5l dyB0ZXN0cyAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvaGFyZmJ1enov SGFyZkJ1enpTaGFwZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SGFyZkJ1enpTaGFwZXI6OnNo YXBlSGFyZkJ1enpSdW5zKToKKwogMjAxMy0wNi0wMyAgQ2hyaXMgRmxlaXphY2ggIDxjZmxlaXph Y2hAYXBwbGUuY29tPgogCiAgICAgICAgIEFYOiBNYXRoTUwgbXVsdGlzY3JpcHRzIG5vdCBleHBv c2VkIGluIEFjY2Vzc2liaWxpdHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2hhcmZidXp6L0hhcmZCdXp6U2hhcGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L0hhcmZCdXp6U2hhcGVyLmNwcAppbmRleCA4ZWQyYjRh Li5jNjg5OGE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9o YXJmYnV6ei9IYXJmQnV6elNoYXBlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvaGFyZmJ1enovSGFyZkJ1enpTaGFwZXIuY3BwCkBAIC00ODAsOSArNDgwLDkgQEAg Ym9vbCBIYXJmQnV6elNoYXBlcjo6c2hhcGVIYXJmQnV6elJ1bnMoYm9vbCBzaG91bGRTZXREaXJl Y3Rpb24pCiAgICAgICAgICAgICBTdHJpbmcgdXBwZXJUZXh0ID0gU3RyaW5nKG1fbm9ybWFsaXpl ZEJ1ZmZlci5nZXQoKSArIGN1cnJlbnRSdW4tPnN0YXJ0SW5kZXgoKSwgY3VycmVudFJ1bi0+bnVt Q2hhcmFjdGVycygpKTsKICAgICAgICAgICAgIHVwcGVyVGV4dC5tYWtlVXBwZXIoKTsKICAgICAg ICAgICAgIGN1cnJlbnRGb250RGF0YSA9IG1fZm9udC0+Z2x5cGhEYXRhRm9yQ2hhcmFjdGVyKHVw cGVyVGV4dFswXSwgZmFsc2UsIFNtYWxsQ2Fwc1ZhcmlhbnQpLmZvbnREYXRhOwotICAgICAgICAg ICAgaGJfYnVmZmVyX2FkZF91dGYxNihoYXJmQnV6ekJ1ZmZlci5nZXQoKSwgdXBwZXJUZXh0LmNo YXJhY3RlcnMoKSwgY3VycmVudFJ1bi0+bnVtQ2hhcmFjdGVycygpLCAwLCBjdXJyZW50UnVuLT5u dW1DaGFyYWN0ZXJzKCkpOworICAgICAgICAgICAgaGJfYnVmZmVyX2FkZF91dGYxNihoYXJmQnV6 ekJ1ZmZlci5nZXQoKSwgcmVpbnRlcnByZXRfY2FzdDxjb25zdCB1aW50MTZfdCo+KHVwcGVyVGV4 dC5jaGFyYWN0ZXJzKCkpLCBjdXJyZW50UnVuLT5udW1DaGFyYWN0ZXJzKCksIDAsIGN1cnJlbnRS dW4tPm51bUNoYXJhY3RlcnMoKSk7CiAgICAgICAgIH0gZWxzZQotICAgICAgICAgICAgaGJfYnVm ZmVyX2FkZF91dGYxNihoYXJmQnV6ekJ1ZmZlci5nZXQoKSwgbV9ub3JtYWxpemVkQnVmZmVyLmdl dCgpICsgY3VycmVudFJ1bi0+c3RhcnRJbmRleCgpLCBjdXJyZW50UnVuLT5udW1DaGFyYWN0ZXJz KCksIDAsIGN1cnJlbnRSdW4tPm51bUNoYXJhY3RlcnMoKSk7CisgICAgICAgICAgICBoYl9idWZm ZXJfYWRkX3V0ZjE2KGhhcmZCdXp6QnVmZmVyLmdldCgpLCByZWludGVycHJldF9jYXN0PGNvbnN0 IHVpbnQxNl90Kj4obV9ub3JtYWxpemVkQnVmZmVyLmdldCgpICsgY3VycmVudFJ1bi0+c3RhcnRJ bmRleCgpKSwgY3VycmVudFJ1bi0+bnVtQ2hhcmFjdGVycygpLCAwLCBjdXJyZW50UnVuLT5udW1D aGFyYWN0ZXJzKCkpOwogCiAgICAgICAgIEZvbnRQbGF0Zm9ybURhdGEqIHBsYXRmb3JtRGF0YSA9 IGNvbnN0X2Nhc3Q8Rm9udFBsYXRmb3JtRGF0YSo+KCZjdXJyZW50Rm9udERhdGEtPnBsYXRmb3Jt RGF0YSgpKTsKICAgICAgICAgSGFyZkJ1enpGYWNlKiBmYWNlID0gcGxhdGZvcm1EYXRhLT5oYXJm QnV6ekZhY2UoKTsK 203631 2013-06-03 15:19:02 -0700 2013-06-03 15:47:38 -0700 updated harfbuzz.diff text/plain 2261 tuxator ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA0ZGM5ODJlLi4yNDM1MDU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTMtMDYtMDMgIFBhd2XFgiBGb3J5c2l1ayAgPHR1eGF0b3JAbzIucGw+CisKKyAgICAg ICAgW2hhcmZidXp6XSBXZWJLaXQgZmFpbHMgdG8gYnVpbGQgd2l0aCBNaW5HVyBjb21waWxlciBi ZWNhdXNlIG9mIGludmFsaWQgY2FzdCBpbiBIYXJmQnV6elNoYXBlci5jcHAKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwODM3MworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBidWlsZGluZyBvbiBwbGF0 Zm9ybXMgd2hlcmUgVUNoYXIgaXMgZGVmaW5lZCBhcyB3Y2hhcl90LgorCisKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9IYXJmQnV6elNoYXBlci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpIYXJmQnV6elNoYXBlcjo6c2hhcGVIYXJmQnV6elJ1bnMpOgorCiAyMDEzLTA2LTAz ICBDaHJpcyBGbGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CiAKICAgICAgICAgQVg6IE1h dGhNTCBtdWx0aXNjcmlwdHMgbm90IGV4cG9zZWQgaW4gQWNjZXNzaWJpbGl0eQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaGFyZmJ1enovSGFyZkJ1enpTaGFw ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvaGFyZmJ1enovSGFyZkJ1 enpTaGFwZXIuY3BwCmluZGV4IDhlZDJiNGEuLmM2ODk4YTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2hhcmZidXp6L0hhcmZCdXp6U2hhcGVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9oYXJmYnV6ei9IYXJmQnV6elNoYXBl ci5jcHAKQEAgLTQ4MCw5ICs0ODAsOSBAQCBib29sIEhhcmZCdXp6U2hhcGVyOjpzaGFwZUhhcmZC dXp6UnVucyhib29sIHNob3VsZFNldERpcmVjdGlvbikKICAgICAgICAgICAgIFN0cmluZyB1cHBl clRleHQgPSBTdHJpbmcobV9ub3JtYWxpemVkQnVmZmVyLmdldCgpICsgY3VycmVudFJ1bi0+c3Rh cnRJbmRleCgpLCBjdXJyZW50UnVuLT5udW1DaGFyYWN0ZXJzKCkpOwogICAgICAgICAgICAgdXBw ZXJUZXh0Lm1ha2VVcHBlcigpOwogICAgICAgICAgICAgY3VycmVudEZvbnREYXRhID0gbV9mb250 LT5nbHlwaERhdGFGb3JDaGFyYWN0ZXIodXBwZXJUZXh0WzBdLCBmYWxzZSwgU21hbGxDYXBzVmFy aWFudCkuZm9udERhdGE7Ci0gICAgICAgICAgICBoYl9idWZmZXJfYWRkX3V0ZjE2KGhhcmZCdXp6 QnVmZmVyLmdldCgpLCB1cHBlclRleHQuY2hhcmFjdGVycygpLCBjdXJyZW50UnVuLT5udW1DaGFy YWN0ZXJzKCksIDAsIGN1cnJlbnRSdW4tPm51bUNoYXJhY3RlcnMoKSk7CisgICAgICAgICAgICBo Yl9idWZmZXJfYWRkX3V0ZjE2KGhhcmZCdXp6QnVmZmVyLmdldCgpLCByZWludGVycHJldF9jYXN0 PGNvbnN0IHVpbnQxNl90Kj4odXBwZXJUZXh0LmNoYXJhY3RlcnMoKSksIGN1cnJlbnRSdW4tPm51 bUNoYXJhY3RlcnMoKSwgMCwgY3VycmVudFJ1bi0+bnVtQ2hhcmFjdGVycygpKTsKICAgICAgICAg fSBlbHNlCi0gICAgICAgICAgICBoYl9idWZmZXJfYWRkX3V0ZjE2KGhhcmZCdXp6QnVmZmVyLmdl dCgpLCBtX25vcm1hbGl6ZWRCdWZmZXIuZ2V0KCkgKyBjdXJyZW50UnVuLT5zdGFydEluZGV4KCks IGN1cnJlbnRSdW4tPm51bUNoYXJhY3RlcnMoKSwgMCwgY3VycmVudFJ1bi0+bnVtQ2hhcmFjdGVy cygpKTsKKyAgICAgICAgICAgIGhiX2J1ZmZlcl9hZGRfdXRmMTYoaGFyZkJ1enpCdWZmZXIuZ2V0 KCksIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgdWludDE2X3QqPihtX25vcm1hbGl6ZWRCdWZmZXIu Z2V0KCkgKyBjdXJyZW50UnVuLT5zdGFydEluZGV4KCkpLCBjdXJyZW50UnVuLT5udW1DaGFyYWN0 ZXJzKCksIDAsIGN1cnJlbnRSdW4tPm51bUNoYXJhY3RlcnMoKSk7CiAKICAgICAgICAgRm9udFBs YXRmb3JtRGF0YSogcGxhdGZvcm1EYXRhID0gY29uc3RfY2FzdDxGb250UGxhdGZvcm1EYXRhKj4o JmN1cnJlbnRGb250RGF0YS0+cGxhdGZvcm1EYXRhKCkpOwogICAgICAgICBIYXJmQnV6ekZhY2Uq IGZhY2UgPSBwbGF0Zm9ybURhdGEtPmhhcmZCdXp6RmFjZSgpOwo=