<pre style='margin:0'>
Dan Villiom Podlaski Christiansen (danchr) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/99fac45de4accb062bc5578024b3712a8cc733f5">https://github.com/macports/macports-ports/commit/99fac45de4accb062bc5578024b3712a8cc733f5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 99fac45de4accb062bc5578024b3712a8cc733f5
</span>Author: Dan Villiom Podlaski Christiansen <danchr@macports.org>
AuthorDate: Fri Jul 9 12:24:00 2021 +0200
<span style='display:block; white-space:pre;color:#404040;'> watchman: update to 2021.09.20.00
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> And use CMake for building.
</span>---
sysutils/watchman/Portfile | 142 ++++++++++++++++++---
sysutils/watchman/files/cmake-python-destdir.diff | 11 ++
.../watchman/files/cmake-rust-build-target.diff | 20 +++
.../watchman/files/patch-container-of-uses.diff | 107 ----------------
4 files changed, 156 insertions(+), 124 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/watchman/Portfile b/sysutils/watchman/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cec6331fc62..00b94c52616 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/watchman/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/watchman/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,37 +2,145 @@
</span>
PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup boost 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cargo_fetch 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup facebook watchman 4.9.0 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup facebook watchman 2021.09.20.00 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
categories sysutils
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {danchr @danchr} openmaintainer
</span> license Apache-2
description watches files and takes action when they change
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-autoreconf.env "AUTOMAKE=automake --foreign"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bin:node:nodejs14 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:yarn \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gtest \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:pcre \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:folly \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libevent \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python39
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:pcre
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBoost_INCLUDE_DIR=[boost::include_dir] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DUSE_SYSTEM_PYTHON=ON
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-container-of-uses.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NODE_BIN=${prefix}/bin/node \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ YARN_PATH=${prefix}/bin/yarn \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DESTDIR=${destroot}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles cmake-rust-build-target.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake-python-destdir.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-silent-rules \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pcre \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s,/usr/bin,${prefix}," CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2017
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums ${distname}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 4e74142f248561cbec56e5d0a2a3fbbac06fcacf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1efc783e4544289aaad90820e7526eb721dcf15780941f7ef02fcaa428e79903 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3753547
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cargo.crates \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ahash 0.3.8 e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ansi_term 0.11.0 ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ anyhow 1.0.44 61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ atty 0.2.14 d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ autocfg 1.0.1 cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bitflags 1.3.2 bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ byteorder 1.4.3 14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bytes 1.1.0 c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cfg-if 1.0.0 baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clap 2.33.3 37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const-random 0.1.13 f590d95d011aa80b063ffe3253422ed5aa462af4e9867d43ce8337562bac77c4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const-random-macro 0.1.13 615f6e27d000a2bffbc7f2f6a8669179378fa27ee4d0a509e985dfc0a7defb40 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ crossbeam 0.8.1 4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ crossbeam-channel 0.5.1 06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ crossbeam-deque 0.8.1 6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ crossbeam-epoch 0.9.5 4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ crossbeam-queue 0.3.2 9b10ddc024425c88c2ad148c1b0fd53f4c6d38db9697c9f1588381212fa657c9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ crossbeam-utils 0.8.5 d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ crunchy 0.2.2 7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ either 1.6.1 e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ futures 0.1.31 3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ futures 0.3.17 a12aa0eb539080d55c3f2d45a67c3b58b6b0773c1a3ca2dfec66d58c97fd66ca \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ futures-channel 0.3.17 5da6ba8c3bb3c165d3c7319fc1cc8304facf1fb8db99c5de877183c08a273888 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ futures-core 0.3.17 88d1c26957f23603395cd326b0ffe64124b818f4449552f960d815cfba83a53d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ futures-executor 0.3.17 45025be030969d763025784f7f355043dc6bc74093e4ecc5000ca4dc50d8745c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ futures-io 0.3.17 522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ futures-macro 0.3.17 18e4a4b95cea4b4ccbcf1c5675ca7c4ee4e9e75eb79944d07defde18068f79bb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ futures-sink 0.3.17 36ea153c13024fe480590b3e3d4cad89a0cfacecc24577b68f86c6ced9c2bc11 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ futures-task 0.3.17 1d3d00f4eddb73e498a54394f228cd55853bdf059259e8e7bc6e69d408892e99 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ futures-util 0.3.17 36568465210a3a6ee45e1f165136d68671471a501e632e9a98d96872222b5481 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ getrandom 0.2.3 7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ heck 0.3.3 6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hermit-abi 0.1.19 62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ instant 0.1.10 bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ jwalk 0.6.0 172752e853a067cbce46427de8470ddf308af7fd8ceaf9b682ef31a5021b6bb9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lazy_static 1.4.0 e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libc 0.2.102 a2a5ac8f984bfcf3a823267e5fde638acc3325f6496633a5da6bb6eb2171e103 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lock_api 0.4.5 712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ log 0.4.14 51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ maplit 1.0.2 3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memchr 2.4.1 308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memoffset 0.6.4 59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mio 0.7.13 8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ miow 0.3.7 b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ntapi 0.3.6 3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ num_cpus 1.13.0 05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ once_cell 1.8.0 692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ parking_lot 0.11.2 7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ parking_lot_core 0.8.5 d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pin-project-lite 0.2.7 8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pin-utils 0.1.0 8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proc-macro-error 1.0.4 da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proc-macro-error-attr 1.0.4 a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proc-macro-hack 0.5.19 dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proc-macro-nested 0.1.7 bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proc-macro2 1.0.29 b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ quote 1.0.9 c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rayon 1.5.1 c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rayon-core 1.9.1 d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ redox_syscall 0.2.10 8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scopeguard 1.1.0 d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ serde 1.0.130 f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ serde_derive 1.0.130 d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ signal-hook-registry 1.4.0 e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ slab 0.4.4 c307a32c1c5c437f38c7fd45d753050587732ba8628319fbdf12a7e289ccc590 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ smallvec 1.6.1 fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strsim 0.8.0 8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ structopt 0.3.23 bf9d950ef167e25e0bdb073cf1d68e9ad2795ac826f2f3f59647817cf23c0bfa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ structopt-derive 0.4.16 134d838a2c9943ac3125cf6df165eda53493451b719f3255b2a26b85f772d0ba \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ syn 1.0.76 c6f107db402c2c2055242dbf4d2af0e69197202e9faacbef9571bbe47f5a1b84 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ textwrap 0.11.0 d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ thiserror 1.0.29 602eca064b2d83369e2b2f34b09c70b605402801927c65c11071ac911d299b88 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ thiserror-impl 1.0.29 bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tiny-keccak 2.0.2 2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tokio 1.12.0 c2c2416fdedca8443ae44b4527de1ea633af61d8f7169ffa6e72c5b53d24efcc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tokio-macros 1.3.0 54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tokio-util 0.6.8 08d3725d3efa29485e87311c5b699de63cde14b00ed4d256b8318aa30ca452cd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unicode-segmentation 1.8.0 8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unicode-width 0.1.9 3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unicode-xid 0.2.2 8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vec_map 0.8.2 f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version_check 0.9.3 5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wasi 0.10.2+wasi-snapshot-preview1 fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ winapi 0.3.9 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ winapi-i686-pc-windows-gnu 0.4.0 ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ winapi-x86_64-pc-windows-gnu 0.4.0 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.generator Ninja
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3a50239fd977952bf8c8e3d5886d38377c85a53f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d529c2e9dfe1db32826717aed80553a99ba31aeb82cee88f93e31a984b372489 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3508060
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> test.run yes
test.target check
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/watchman/files/cmake-python-destdir.diff b/sysutils/watchman/files/cmake-python-destdir.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a70823f73db
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/watchman/files/cmake-python-destdir.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ #<buffer CMakeLists.txt>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -411,7 +411,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_COMMAND} -E env
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${Python3_EXECUTABLE} ${SETUP_PY} install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- --root $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ --root $ENV{DESTDIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RESULT_VARIABLE STATUS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (NOT STATUS STREQUAL 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(FATAL_ERROR \"pywatchman install failed\")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/watchman/files/cmake-rust-build-target.diff b/sysutils/watchman/files/cmake-rust-build-target.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e8a7e6090cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/watchman/files/cmake-rust-build-target.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- build/fbcode_builder/CMake/RustStaticLibrary.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ #<buffer RustStaticLibrary.cmake>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -97,7 +97,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(cargo_target "${TARGET}.cargo")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(target_dir $<IF:$<CONFIG:Debug>,debug,release>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(target_dir $ENV{CARGO_BUILD_TARGET}/$<IF:$<CONFIG:Debug>,debug,release>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(staticlib_name "${CMAKE_STATIC_LIBRARY_PREFIX}${crate_name}${CMAKE_STATIC_LIBRARY_SUFFIX}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(rust_staticlib "${CMAKE_CURRENT_BINARY_DIR}/${target_dir}/${staticlib_name}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -158,7 +158,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(crate_name "${TARGET}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(cargo_target "${TARGET}.cargo")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(target_dir $<IF:$<CONFIG:Debug>,debug,release>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(target_dir $ENV{CARGO_BUILD_TARGET}/$<IF:$<CONFIG:Debug>,debug,release>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(DEFINED ARG_BINARY_NAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(executable_name "${ARG_BINARY_NAME}${CMAKE_EXECUTABLE_SUFFIX}")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/watchman/files/patch-container-of-uses.diff b/sysutils/watchman/files/patch-container-of-uses.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1b88e7ba199..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/watchman/files/patch-container-of-uses.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,107 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 28a70a81e70ea5919938958ce48112eafe24154c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Wez Furlong <wez@fb.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 2 May 2018 14:39:12 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] fixup compilation error on macos
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Summary:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This only seems to be breaking our autoconf based builds
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-on the mac hosts. The cmake based builds on macs are succeeding.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Weird!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-I've removed the use of container_of; all instances can be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-replaced with a simple cast as the members were all at
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-the front of their respective structs.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Longer term, I'd like to migrate this to folly::dynamic and the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bser implementation there.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-```
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bser.cpp:345:17: error: offset of on non-standard-layout type 'json_object_t' [-Werror,-Winvalid-offsetof]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- auto object = json_to_object(obj);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-```
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Reviewed By: chadaustin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Differential Revision: D7849156
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fbshipit-source-id: 9d8115a1fc73ee6360d3857644bc736e89205b67
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bser.cpp | 3 +--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- thirdparty/jansson/jansson_private.h | 27 +++++++++++++++++++--------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- thirdparty/jansson/load.cpp | 4 +++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3 files changed, 23 insertions(+), 11 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/bser.cpp b/bser.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4c858724..8db9baf2 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/bser.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/bser.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -342,8 +342,7 @@ static int bser_object(const bser_ctx_t* ctx, const json_ref& obj, void* data) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- auto object = json_to_object(obj);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for (auto& it : object->map) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (auto& it : obj.object()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- auto &key = it.first;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- auto &val = it.second;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/thirdparty/jansson/jansson_private.h b/thirdparty/jansson/jansson_private.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 318b0698..b70f6e68 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/thirdparty/jansson/jansson_private.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/thirdparty/jansson/jansson_private.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,9 +15,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <unordered_map>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <vector>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define container_of(ptr_, type_, member_) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ((type_ *)((char *)ptr_ - offsetof(type_, member_)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* va_copy is a C99 feature. In C89 implementations, it's sometimes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- available as __va_copy. If not, memcpy() should do the trick. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef va_copy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,11 +65,25 @@ struct json_integer_t {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- json_integer_t(json_int_t value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define json_to_object(json_) container_of((json_t*)json_, json_object_t, json)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define json_to_array(json_) container_of((json_t*)json_, json_array_t, json)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define json_to_string(json_) container_of((json_t*)json_, json_string_t, json)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define json_to_real(json_) container_of((json_t*)json_, json_real_t, json)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define json_to_integer(json_) container_of((json_t*)json_, json_integer_t, json)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+inline json_object_t* json_to_object(const json_t* json) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return reinterpret_cast<json_object_t*>(const_cast<json_t*>(json));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+inline json_array_t* json_to_array(const json_t* json) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return reinterpret_cast<json_array_t*>(const_cast<json_t*>(json));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+inline json_string_t* json_to_string(const json_t* json) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return reinterpret_cast<json_string_t*>(const_cast<json_t*>(json));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+inline json_real_t* json_to_real(const json_t* json) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return reinterpret_cast<json_real_t*>(const_cast<json_t*>(json));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+inline json_integer_t* json_to_integer(const json_t* json) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return reinterpret_cast<json_integer_t*>(const_cast<json_t*>(json));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void jsonp_error_init(json_error_t *error, const char *source);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void jsonp_error_set_source(json_error_t *error, const char *source);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/thirdparty/jansson/load.cpp b/thirdparty/jansson/load.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0c369cdd..391fb058 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/thirdparty/jansson/load.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/thirdparty/jansson/load.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,7 +68,9 @@ typedef struct {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } value;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } lex_t;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define stream_to_lex(stream) container_of(stream, lex_t, stream)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+inline lex_t* stream_to_lex(stream_t* stream) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return reinterpret_cast<lex_t*>(stream);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*** error reporting ***/
</span>\ No newline at end of file
</pre><pre style='margin:0'>
</pre>