235981 2022-02-01 15:36:30 -0800 Copy PDF.js in WebCore.framework bundle at build-time 2022-07-01 15:07:27 -0700 1 1 1 Unclassified WebKit PDF WebKit Nightly Build Unspecified Unspecified RESOLVED DUPLICATE 241117 InRadar P2 Normal --- 242263 237844 241117 235969 1 ntim emw ap emw thorton webkit-bug-importer youennf oldest_to_newest 1836192 0 ntim 2022-02-01 15:36:30 -0800 We should: - get the downloaded version of PDF.js from https://mozilla.github.io/pdf.js/getting_started/#download (the Prebuilt one) - include it somewhere in Source/WebCore - create a script that copies it into the WebCore bundle - run that script during the build 1836193 1 webkit-bug-importer 2022-02-01 15:36:43 -0800 <rdar://problem/88352142> 1840281 2 451664 ntim 2022-02-11 02:55:23 -0800 Created attachment 451664 Patch 1840294 3 ews-feeder 2022-02-11 04:06:54 -0800 Committed r289616 (247127@main): <https://commits.webkit.org/247127@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 451664. 1840434 4 ntim 2022-02-11 10:25:25 -0800 Reverted this in r289637 since this broke production builds: ``` /bin/sh -c /System/Volumes/Data/otmp/od.xLjbWx/lw.JIlSYt/sandbox-0/OBJROOT/WebCore.build/WebCore.build/Script-49AA6B1727B6755F000B0F64.sh rsync: link_stat "/System/Volumes/Data/otmp/od.xLjbWx/lw.JIlSYt/sandbox-0/WebCore/Source/WebCore/../ThirdParty/pdfjs/." failed: No such file or directory (2) rsync error: some files could not be transferred (code 23) at /System/Volumes/Data/SWE/macOS/BuildRoots/6b362bc7f6/Library/Caches/com.apple.xbs/Sources/rsync/rsync-55/rsync/main.c(996) [sender=2.6.9] /System/Volumes/Data/otmp/od.xLjbWx/lw.JIlSYt/sandbox-0/OBJROOT/WebCore.build/WebCore.build/Script-49AA6B1727B6755F000B0F64.sh: line 9: cd: /System/Volumes/Data/otmp/od.xLjbWx/lw.JIlSYt/sandbox-0/WebCore/Source/WebCore/../ThirdParty/pdfjs: No such file or directory Command PhaseScriptExecution failed with a nonzero exit code ``` 1840451 5 451664 emw 2022-02-11 10:51:44 -0800 Comment on attachment 451664 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=451664&action=review > Source/WebCore/WebCore.xcodeproj/project.pbxproj:38406 > + 49AA6B1727B6755F000B0F64 /* Copy PDF.js Resources */ = { > + isa = PBXShellScriptBuildPhase; > + buildActionMask = 2147483647; > + files = ( > + ); > + inputFileListPaths = ( > + ); > + inputPaths = ( > + ); > + name = "Copy PDF.js Resources"; > + outputFileListPaths = ( > + ); > + outputPaths = ( > + ); > + runOnlyForDeploymentPostprocessing = 0; > + shellPath = /bin/sh; > + shellScript = "SRC_DIR=\"$SRCROOT/../ThirdParty/pdfjs\"\nDST_DIR=\"$BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/pdfjs\"\n\nmkdir -p \"$DST_DIR\"\n\nrsync -aq --exclude \".svn\" --exclude \".DS_Store\" \"$SRC_DIR/\" \"$DST_DIR/\"\n\ncd \"$SRC_DIR\"\n"; > + }; I think it would be preferable to add `pdfjs/` to the xcodeproj as a folder reference, and use a Copy Files phase to copy it over. This gives Xcode's build system more dependency information about what's being copied, is marginally faster, and might help with the production build problems you're seeing. 1841830 6 452064 ntim 2022-02-15 11:24:46 -0800 Created attachment 452064 Patch 1841832 7 452064 ap 2022-02-15 11:27:31 -0800 Comment on attachment 452064 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=452064&action=review > Source/WebCore/Makefile:5 > + mkdir -p $@ Do we need to quote this, or anything else, in case of spaces in the path? 1841928 8 ews-feeder 2022-02-15 13:52:30 -0800 Committed r289850 (247292@main): <https://commits.webkit.org/247292@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 452064. 1850956 9 ntim 2022-03-14 11:33:27 -0700 We're reverting this in bug 237844, since this causes a significant size increase in the bundle. This patch can be re-landed once work on PDF.js resumes along with bundle size optimization. 1850957 10 ntim 2022-03-14 11:35:42 -0700 (This needs a rebase fwiw) 1850959 11 ntim 2022-03-14 11:36:43 -0700 To replicate the changes in Source/WebCore/WebCore.xcodeproj/project.pbxproj, add a folder reference to Source/ThirdParty/pdfjs in the WebCore/Resources folder in the file tree. 1852422 12 ntim 2022-03-17 12:51:53 -0700 Worth noting that Igalia added a build option in bug 238023, probably worth using that for file size concerns. 1880174 13 ntim 2022-07-01 15:07:27 -0700 *** This bug has been marked as a duplicate of bug 241117 *** 451664 2022-02-11 02:55:23 -0800 2022-02-15 11:24:42 -0800 Patch bug-235981-20220211115522.patch text/plain 3026 ntim U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NjEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTRiMmJhZDVkMTM0ZDY1 Mjk2ZjkxMjUxNWY2ZTQ1OTkzZmFjZTcxNS4uOTgwZmJjYzkwZmNlZmJjMGMwNDZiMjRiOTE2YmQw MmU1ZDlkZjVjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIyLTAyLTExICBUaW0g Tmd1eWVuICA8bnRpbUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGJ1aWxkIHBoYXNlIHRvIGNv cHkgUERGLmpzIHJlc291cmNlcyB0byBXZWJDb3JlLmZyYW1ld29yayByZXNvdXJjZXMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTk4MQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgYWRkcyBhIG5l dyAiUnVuIFNjcmlwdCIgcGhhc2UgdGhhdCBzaW1wbHkgY29waWVzIFNvdXJjZS9UaGlyZFBhcnR5 L3BkZmpzIHRvCisgICAgICAgIFdlYkNvcmUuZnJhbWV3b3JrL1Jlc291cmNlcy9wZGZqcywgaXQg ZXhjbHVkZXMgLnN2biBhbmQgLkRTX1N0b3JlIGZpbGVzIHRvby4KKworICAgICAgICAqIFdlYkNv cmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKwogMjAyMi0wMi0xMSAgTXlsZXMgQy4gTWF4 ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAgIFRhYiBjaGFyYWN0ZXJzIGFu ZCBjaCB1bml0cyBkbyBub3Qgb2JleSBzeW50aGV0aWMgYm9sZCB3aWR0aCBhZGp1c3RtZW50cyBj b3JyZWN0bHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3By b2plY3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3Qu cGJ4cHJvagppbmRleCBlNjM3ZjNmZDYxMWVkMGExZjdiYTVjZWJiMDE2NWQ1NjQzYTNlZGE1Li4y ZDQ3OTZmMTM0Yzg4OWY5ZTU0N2NhYzcwODUxZjJiNWM2ODJlMWU0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIvU291cmNl L1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0zODIyMyw2ICsz ODIyMyw3IEBACiAJCQkJMzdBMUVBQTMxNDI2OTlCQzAwODdGNDI1IC8qIENoZWNrIEZvciBJbmFw cHJvcHJpYXRlIE9iamVjdGl2ZS1DIENsYXNzIE5hbWVzICovLAogCQkJCTVERjUwODg3MTE2RjMw NzcwMDUyMDJBQiAvKiBDaGVjayBGb3IgSW5hcHByb3ByaWF0ZSBGaWxlcyBJbiBGcmFtZXdvcmsg Ki8sCiAJCQkJNzFENkFBMzgxREE0RTY5NDAwQjIzOTY5IC8qIENvcHkgbW9kZXJuIG1lZGlhIGNv bnRyb2xzIGNvZGUgYW5kIGFzc2V0cyAqLywKKwkJCQk0OUFBNkIxNzI3QjY3NTVGMDAwQjBGNjQg LyogQ29weSBQREYuanMgUmVzb3VyY2VzICovLAogCQkJCTUzNzlDN0FBMjFFNTI4NzEwMEU0QThG NiAvKiBDaGVjayAueGNmaWxlbGlzdHMgKi8sCiAJCQkJNjU3N0ZGQzcyNzZBQzlBRDAwMTFBRUM4 IC8qIENyZWF0ZSBTeW1saW5rIHRvIEFsdCBSb290IFBhdGggKi8sCiAJCQkpOwpAQCAtMzgzODUs NiArMzgzODYsMjQgQEAKIAkJCXNoZWxsUGF0aCA9IC9iaW4vc2g7CiAJCQlzaGVsbFNjcmlwdCA9 ICJpZiBbIFwiJHtBQ1RJT059XCIgPSBcImluc3RhbGxoZHJzXCIgLW8gXCIke0FDVElPTn1cIiA9 IFwiaW5zdGFsbGFwaVwiIF07IHRoZW5cbiAgICBleGl0IDA7XG5maVxuXG5EU1RfRElSPVwiJEJV SUxUX1BST0RVQ1RTX0RJUi8kVU5MT0NBTElaRURfUkVTT1VSQ0VTX0ZPTERFUl9QQVRIL2VuLmxw cm9qXCJcbm1rZGlyIC1wIFwiJERTVF9ESVJcIlxuXG5pZiBbIC1lICRCVUlMVF9QUk9EVUNUU19E SVIvRGVyaXZlZFNvdXJjZXMvV2ViQ29yZS9Mb2NhbGl6YWJsZUFkZGl0aW9ucy5zdHJpbmdzLm91 dCAgXSA7IHRoZW5cbiAgICBjYXQgJFNSQ1JPT1QvZW4ubHByb2ovTG9jYWxpemFibGUuc3RyaW5n cyAkQlVJTFRfUFJPRFVDVFNfRElSL0Rlcml2ZWRTb3VyY2VzL1dlYkNvcmUvTG9jYWxpemFibGVB ZGRpdGlvbnMuc3RyaW5ncy5vdXQgPiAkRFNUX0RJUi9Mb2NhbGl6YWJsZS5zdHJpbmdzXG5lbHNl XG4gICAgY3AgJFNSQ1JPT1QvZW4ubHByb2ovTG9jYWxpemFibGUuc3RyaW5ncyAkRFNUX0RJUi9M b2NhbGl6YWJsZS5zdHJpbmdzXG5maVxuIjsKIAkJfTsKKwkJNDlBQTZCMTcyN0I2NzU1RjAwMEIw RjY0IC8qIENvcHkgUERGLmpzIFJlc291cmNlcyAqLyA9IHsKKwkJCWlzYSA9IFBCWFNoZWxsU2Ny aXB0QnVpbGRQaGFzZTsKKwkJCWJ1aWxkQWN0aW9uTWFzayA9IDIxNDc0ODM2NDc7CisJCQlmaWxl cyA9ICgKKwkJCSk7CisJCQlpbnB1dEZpbGVMaXN0UGF0aHMgPSAoCisJCQkpOworCQkJaW5wdXRQ YXRocyA9ICgKKwkJCSk7CisJCQluYW1lID0gIkNvcHkgUERGLmpzIFJlc291cmNlcyI7CisJCQlv dXRwdXRGaWxlTGlzdFBhdGhzID0gKAorCQkJKTsKKwkJCW91dHB1dFBhdGhzID0gKAorCQkJKTsK KwkJCXJ1bk9ubHlGb3JEZXBsb3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOworCQkJc2hlbGxQYXRo ID0gL2Jpbi9zaDsKKwkJCXNoZWxsU2NyaXB0ID0gIlNSQ19ESVI9XCIkU1JDUk9PVC8uLi9UaGly ZFBhcnR5L3BkZmpzXCJcbkRTVF9ESVI9XCIkQlVJTFRfUFJPRFVDVFNfRElSLyRVTkxPQ0FMSVpF RF9SRVNPVVJDRVNfRk9MREVSX1BBVEgvcGRmanNcIlxuXG5ta2RpciAtcCBcIiREU1RfRElSXCJc blxucnN5bmMgLWFxIC0tZXhjbHVkZSBcIi5zdm5cIiAtLWV4Y2x1ZGUgXCIuRFNfU3RvcmVcIiBc IiRTUkNfRElSL1wiIFwiJERTVF9ESVIvXCJcblxuY2QgXCIkU1JDX0RJUlwiXG4iOworCQl9Owog CQk1MzI1QkRDQzIxREZGMzNFMDBBMERFRTEgLyogU2hlbGxTY3JpcHQgKi8gPSB7CiAJCQlpc2Eg PSBQQlhTaGVsbFNjcmlwdEJ1aWxkUGhhc2U7CiAJCQlidWlsZEFjdGlvbk1hc2sgPSAyMTQ3NDgz NjQ3Owo= 452064 2022-02-15 11:24:46 -0800 2022-02-15 13:52:33 -0800 Patch bug-235981-20220215202445.patch text/plain 4939 ntim U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NzkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2EyNmI3ODA0OTI2MDhh MzNjZGNlNDNjODQ3ZGRkNTcwNzQ2MTliMy4uYzA3OGNmODRkMmYzYjczZmU3YWM1YmI5OGQ4NThk MDE2YjJkYTBjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIyLTAyLTE0ICBUaW0g Tmd1eWVuICA8bnRpbUBhcHBsZS5jb20+CisKKyAgICAgICAgQ29weSBQREYuanMgaW4gV2ViQ29y ZS5mcmFtZXdvcmsgYnVuZGxlIGF0IGJ1aWxkLXRpbWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTk4MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgYWRkcyB0aGUgU291cmNlL1RoaXJkUGFydHkv cGRmanMgZm9sZGVyIGFzIGEgZm9sZGVyIHJlc291cmNlLiBBZGRzIGEgaW5zdGFsbHNyYyBzdGVw IGluIHRoZQorICAgICAgICBXZWJDb3JlIG1ha2VmaWxlIHRvIG1ha2Ugc3VyZSBYQ29kZSBmaW5k cyB0aGUgZm9sZGVyIGluIHByb2R1Y3Rpb24gYnVpbGRzLgorCisgICAgICAgICogTWFrZWZpbGU6 CisgICAgICAgICogV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorCiAyMDIyLTAy LTE0ICBLaW1tbyBLaW5udW5lbiAgPGtraW5udW5lbkBhcHBsZS5jb20+CiAKICAgICAgICAgRXh0 ZW5zaW9uc0dMIGlzIG5vdCB1c2VmdWwgY2xhc3MsIGl0IHNob3VsZCBiZSByZW1vdmVkCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9NYWtlZmlsZSBiL1NvdXJjZS9XZWJDb3JlL01ha2VmaWxl CmluZGV4IGNiNGMxMWE1N2M2NzM5YTE0MjZhNWJiOWQ4MTJiNzMwMDFlNjlkOTEuLjljZmZjNjU3 NDE1YjdkZTIzMTk0NzI2NmI4Y2Q0ZDRmYTQ5YzdjM2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL01ha2VmaWxlCisrKyBiL1NvdXJjZS9XZWJDb3JlL01ha2VmaWxlCkBAIC0xICsxLDggQEAK IGluY2x1ZGUgLi4vTWFrZWZpbGUuc2hhcmVkCisKK1BERkpTX1NSQ1JPT1QgPSAkKFNSQ1JPT1Qp JChQQVRIX0ZST01fUk9PVCkvLi4vVGhpcmRQYXJ0eS9wZGZqcworJChQREZKU19TUkNST09UKToK Kwlta2RpciAtcCAkQAorCWNwIC1SIC4uL1RoaXJkUGFydHkvcGRmanMvICQoUERGSlNfU1JDUk9P VCkKKworaW5zdGFsbHNyYzogJChQREZKU19TUkNST09UKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvU291cmNlL1dlYkNvcmUv V2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IDcyOGMxM2QyNmIyNWNiN2I1 ZThmNGNhMDc4NTRhOGFlZjgxNzM0ZjcuLmYxODQxMDFjNzZjODAxNjJkZGVhMDJiMTNkYzJkODFl YjM3NWY5YWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3By b2plY3QucGJ4cHJvagorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9q ZWN0LnBieHByb2oKQEAgLTE0NTksNiArMTQ1OSw3IEBACiAJCTQ5RTkxMkFFMEVGQUM5MDYwMDlE MENBRiAvKiBUaW1pbmdGdW5jdGlvbi5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRG aWxlOyBmaWxlUmVmID0gNDlFOTEyQTkwRUZBQzkwNjAwOUQwQ0FGIC8qIFRpbWluZ0Z1bmN0aW9u LmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJNDlF Q0VCNkUxNDk5NzkwRDAwQ0REM0E0IC8qIEZpbHRlck9wZXJhdGlvbi5oIGluIEhlYWRlcnMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNDlFQ0VCNjQxNDk5NzkwRDAwQ0REM0E0 IC8qIEZpbHRlck9wZXJhdGlvbi5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZh dGUsICk7IH07IH07CiAJCTQ5RUNFQjcwMTQ5OTc5MEQwMENERDNBNCAvKiBGaWx0ZXJPcGVyYXRp b25zLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA0OUVD RUI2NjE0OTk3OTBEMDBDREQzQTQgLyogRmlsdGVyT3BlcmF0aW9ucy5oICovOyBzZXR0aW5ncyA9 IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CisJCTQ5RUNGNzJGMjdCQUU4NTQwMDg4 MDk5MSAvKiBwZGZqcyBpbiBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gNDlFQ0Y3MkQyN0JBRTg1NDAwODgwOTkxIC8qIHBkZmpzICovOyB9OwogCQk0OUVFRDE0 NTEwNTE5Njk0MDAwOTlGQUIgLyogSlNDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuaCBpbiBIZWFk ZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDQ5RUVEMTNGMTA1MTk2OTQw MDA5OUZBQiAvKiBKU0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5oICovOyB9OwogCQk0OUVFRDE0 NzEwNTE5Njk0MDAwOTlGQUIgLyogSlNXZWJHTFJlbmRlcmluZ0NvbnRleHQuaCBpbiBIZWFkZXJz ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDQ5RUVEMTQxMTA1MTk2OTQwMDA5 OUZBQiAvKiBKU1dlYkdMUmVuZGVyaW5nQ29udGV4dC5oICovOyB9OwogCQk0QTBEQTJGRjEyOUIy NDE5MDBBQjYxRTEgLyogRm9ybUFzc29jaWF0ZWRFbGVtZW50LmggaW4gSGVhZGVycyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA0QTBEQTJGRDEyOUIyNDE5MDBBQjYxRTEgLyog Rm9ybUFzc29jaWF0ZWRFbGVtZW50LmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJp dmF0ZSwgKTsgfTsgfTsKQEAgLTk0NzcsNiArOTQ3OCw3IEBACiAJCTQ5RUNFQjY0MTQ5OTc5MEQw MENERDNBNCAvKiBGaWx0ZXJPcGVyYXRpb24uaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBw YXRoID0gRmlsdGVyT3BlcmF0aW9uLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTQ5 RUNFQjY1MTQ5OTc5MEQwMENERDNBNCAvKiBGaWx0ZXJPcGVyYXRpb25zLmNwcCAqLyA9IHtpc2Eg PSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9 IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IEZpbHRlck9wZXJhdGlvbnMuY3BwOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwogCQk0OUVDRUI2NjE0OTk3OTBEMDBDREQzQTQgLyogRmlsdGVy T3BlcmF0aW9ucy5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBGaWx0ZXJPcGVy YXRpb25zLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTQ5RUNGNzJEMjdCQUU4NTQw MDg4MDk5MSAvKiBwZGZqcyAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25G aWxlVHlwZSA9IGZvbGRlcjsgbmFtZSA9IHBkZmpzOyBwYXRoID0gLi4vLi4vVGhpcmRQYXJ0eS9w ZGZqczsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDlFRUQxM0UxMDUxOTY5NDAwMDk5 RkFCIC8qIEpTQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxl UmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv ZGUuY3BwLmNwcDsgcGF0aCA9IEpTQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmNwcDsgc291cmNl VHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNDlFRUQxM0YxMDUxOTY5NDAwMDk5RkFCIC8qIEpTQ2Fu dmFzUmVuZGVyaW5nQ29udGV4dDJELmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9 IEpTQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CiAJCTQ5RUVEMTQwMTA1MTk2OTQwMDA5OUZBQiAvKiBKU1dlYkdMUmVuZGVyaW5nQ29udGV4dC5j cHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBKU1dlYkdMUmVuZGVyaW5n Q29udGV4dC5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC0xOTE1Miw2ICsxOTE1 NCw3IEBACiAJCTA4OUMxNjY1RkU4NDExNThDMDJBQUMwNyAvKiBSZXNvdXJjZXMgKi8gPSB7CiAJ CQlpc2EgPSBQQlhHcm91cDsKIAkJCWNoaWxkcmVuID0gKAorCQkJCTQ5RUNGNzJEMjdCQUU4NTQw MDg4MDk5MSAvKiBwZGZqcyAqLywKIAkJCQlDRDBEQkIzRTE0MjI3NEU2MDAyODAyNjMgLyogYXVk aW8gKi8sCiAJCQkJNjU5OThBNjUwRTVGNUZEMzAwNEUwOTdBIC8qIGltYWdlcyAqLywKIAkJCQlB MUFBOUFCODFEMjM5MTE1MDBGRUFEQjMgLyogQ29udGVudEZpbHRlckJsb2NrZWRQYWdlLmh0bWwg Ki8sCkBAIC0zODM2OCw2ICszODM3MSw3IEBACiAJCQkJQTExRThDMDkxQjFFMjkwNzAwMDNBN0M3 IC8qIG5vcnRoV2VzdFNvdXRoRWFzdFJlc2l6ZUN1cnNvci5wbmcgaW4gUmVzb3VyY2VzICovLAog CQkJCTkzMTUzQkRDMTQxOTU5QkMwMEZDRjVCRSAvKiB0ZXh0QXJlYVJlc2l6ZUNvcm5lci5wbmcg aW4gUmVzb3VyY2VzICovLAogCQkJCTkzNzA5MThEMTQxNkQ4NkIwMDQ3NzMzMyAvKiB0ZXh0QXJl YVJlc2l6ZUNvcm5lckAyeC5wbmcgaW4gUmVzb3VyY2VzICovLAorCQkJCTQ5RUNGNzJGMjdCQUU4 NTQwMDg4MDk5MSAvKiBwZGZqcyBpbiBSZXNvdXJjZXMgKi8sCiAJCQkpOwogCQkJcnVuT25seUZv ckRlcGxveW1lbnRQb3N0cHJvY2Vzc2luZyA9IDA7CiAJCX07Cg==