Skip to content

Commit d7cb62b

Browse files
author
turtlebrowser-bot
committed
schedule : Commit by patricia-gallardo with SHA 901e39aef3e9f633ad33a7c3380569143f3faa5a on refs/heads/master
1 parent 244d14b commit d7cb62b

File tree

13 files changed

+21
-21
lines changed

13 files changed

+21
-21
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
1601558853
1+
1603200967
22
conandata.yml: 865dc45c04b8bdcac0693255a3c04402
33
conanfile.py: 0fb724bb64544034ed3f675504a16716
4-
export_source/CMakeLists.txt: dc5eb51299a1f3d75583702179784fe5
4+
export_source/CMakeLists.txt: ac606e6da954a6f18d4b49db940ee1a1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"recipe": {"properties": {}, "checksums": {"conan_export.tgz": {"sha1": "9a8aaaf6e771d47d8d0048630d6d98b556c22249", "md5": "b483880b7965b218ec785660a718d925"}, "conanmanifest.txt": {"sha1": "c9f2710763c854aca4e6643284b132eb965499fd", "md5": "eb35eac9906b7c6794e95753cde3d266"}, "conanfile.py": {"sha1": "c6fdd9e63a5fe377771c83ac5b09b987f16fbebd", "md5": "0fb724bb64544034ed3f675504a16716"}}, "remote": "conan-center", "revision": "0"}, "packages": {"2529444d14934fc77cb61780d98aad96c0578c5c": {"properties": {}, "recipe_revision": "0", "checksums": {"conanmanifest.txt": {"md5": "c7a9221b8aad4186d9b64c83171f707d", "sha1": "1201602c22cd23f69c9c949b378d77380e09fa87"}, "conan_package.tgz": {"md5": "026ec571e4041c9abdae19df07225049", "sha1": "1d8b1e3185b1a4355ddebc93b69b58bff5e24765"}, "conaninfo.txt": {"md5": "5b29e13c096da55ec5de4dc4f196e4e3", "sha1": "80731c7c7b82511e47bd4e6e8eeaea3f28c6cf36"}}, "remote": "conan-center", "revision": "0"}, "bf05ac88aac1986abd35f257eeb0064299824400": {"properties": {}, "recipe_revision": "0", "checksums": {"conanmanifest.txt": {"md5": "91279816e733ae93c5000ed2a2dc9d85", "sha1": "0114d7178b5f3e127fb5782edf821ea2407a7ca7"}, "conan_package.tgz": {"md5": "026ec571e4041c9abdae19df07225049", "sha1": "1d8b1e3185b1a4355ddebc93b69b58bff5e24765"}, "conaninfo.txt": {"md5": "390a740f5ef783911669b4c2bc3c18e8", "sha1": "4915d6a2e1d839cba42c166f775c0d7c287143c6"}}, "remote": "conan-center", "revision": "0"}}}
1+
{"packages": {"2529444d14934fc77cb61780d98aad96c0578c5c": {"revision": "0", "remote": "conan-center", "properties": {}, "checksums": {"conaninfo.txt": {"md5": "5b29e13c096da55ec5de4dc4f196e4e3", "sha1": "80731c7c7b82511e47bd4e6e8eeaea3f28c6cf36"}, "conan_package.tgz": {"md5": "026ec571e4041c9abdae19df07225049", "sha1": "1d8b1e3185b1a4355ddebc93b69b58bff5e24765"}, "conanmanifest.txt": {"md5": "c7a9221b8aad4186d9b64c83171f707d", "sha1": "1201602c22cd23f69c9c949b378d77380e09fa87"}}, "recipe_revision": "0"}, "bf05ac88aac1986abd35f257eeb0064299824400": {"revision": "0", "remote": "conan-center", "properties": {}, "checksums": {"conaninfo.txt": {"md5": "7f118045071e0008ed562ff92d807330", "sha1": "3b90cc97703bbf1d9ea142f8eb49bc8e3ed275d3"}, "conan_package.tgz": {"md5": "026ec571e4041c9abdae19df07225049", "sha1": "1d8b1e3185b1a4355ddebc93b69b58bff5e24765"}, "conanmanifest.txt": {"md5": "602f9cffba32af383a14803f2c6860b3", "sha1": "a157dcf0ab279800c86b112d015329bf04d96f58"}}, "recipe_revision": "0"}}, "recipe": {"revision": "0", "remote": "conan-center", "checksums": {"conan_export.tgz": {"md5": "b483880b7965b218ec785660a718d925", "sha1": "9a8aaaf6e771d47d8d0048630d6d98b556c22249"}, "conanmanifest.txt": {"md5": "dc85a960a7e28b971feead9d4d0be2ed", "sha1": "c1421832b7235e5dbcae0c71707b5730d7c833fa"}, "conanfile.py": {"md5": "0fb724bb64544034ed3f675504a16716", "sha1": "c6fdd9e63a5fe377771c83ac5b09b987f16fbebd"}}, "properties": {}}}

.conan/data/freetype/2.10.2/_/_/package/bf05ac88aac1986abd35f257eeb0064299824400/conaninfo.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
zlib:shared=False
5353

5454
[recipe_hash]
55-
4bfb59e0a9a4ad8b5b8df9f3a8d8639b
55+
a5524f06f1742e2696f8b46505854f82
5656

5757
[env]
5858

.conan/data/freetype/2.10.2/_/_/package/bf05ac88aac1986abd35f257eeb0064299824400/conanmanifest.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
1601558873
1+
1603201475
22
bin/freetype-config: 7181ddc0ed7b21d7e11d6078b024264e
3-
conaninfo.txt: 390a740f5ef783911669b4c2bc3c18e8
3+
conaninfo.txt: 7f118045071e0008ed562ff92d807330
44
include/freetype2/freetype/config/ftconfig.h: 39ff56ce9873713942bce9ac19413035
55
include/freetype2/freetype/config/ftheader.h: afae2de70247a427f71987fb71adbe26
66
include/freetype2/freetype/config/ftmodule.h: b20abed08fe5fd231f34aab0dd017e5d

.conan/data/openssl/1.1.1g/_/_/export/conanfile.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ def build_requirements(self):
119119
if not self.options.no_asm and not tools.which("nasm"):
120120
self.build_requires("nasm/2.14")
121121
if self._win_bash:
122-
if "CONAN_BASH_PATH" not in os.environ and tools.os_info.detect_windows_subsystem() != 'msys2':
123-
self.build_requires("msys2/20190524")
122+
if "CONAN_BASH_PATH" not in os.environ:
123+
self.build_requires("msys2/20200517")
124124

125125
@property
126126
def _is_msvc(self):
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
1601289186
1+
1603305853
22
conandata.yml: 2ddc6c3c40440ea758ee692e304db93e
3-
conanfile.py: ecc0da48ea94d1fddb68ef06c7ddd5cb
3+
conanfile.py: 9a4a414efbf09dd970aab3763dd79aae
44
export_source/patches/1.1.1-tvos.patch: f1ec0a20dd1941cbfb2c59055af5266f
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"recipe": {"properties": {}, "checksums": {"conan_export.tgz": {"sha1": "0f859f6fb81a0acdefa7b91abda3affa6ceb70eb", "md5": "48e030d41a819cbf8e4542fc75ac0dc4"}, "conanmanifest.txt": {"sha1": "9f21c01a616b974efcd43839e502bf2ed7f79532", "md5": "a031ceba992881c35e385f759722066b"}, "conanfile.py": {"sha1": "5f9e240fc23cb9ef4aa4078957f2efebafc244ab", "md5": "ecc0da48ea94d1fddb68ef06c7ddd5cb"}}, "remote": "conan-center", "revision": "0"}, "packages": {"76f87539fc90ff313e0b3182641a9bb558a717d2": {"properties": {}, "recipe_revision": "0", "checksums": {"conanmanifest.txt": {"md5": "50098146f19a4e9fe7b030d260476d89", "sha1": "9629f7ef897c416e63ad9b670b33628d9868703f"}, "conan_package.tgz": {"md5": "fa41690dec610e51f128dd3ebaa34f41", "sha1": "994ba68bd4cb2ad39878a1cd3da2517d9721de32"}, "conaninfo.txt": {"md5": "28acd889e1f2eb9c2b75db035bb9897b", "sha1": "9ea3b2ccd05bf775deb645d757d95b858859cede"}}, "remote": "conan-center", "revision": "0"}}}
1+
{"packages": {"76f87539fc90ff313e0b3182641a9bb558a717d2": {"revision": "0", "remote": "conan-center", "properties": {}, "checksums": {"conaninfo.txt": {"md5": "a1b70a149396df5593a663eb8cdada24", "sha1": "78e6073301221464d9a3bbc28ef3c09d815478d8"}, "conan_package.tgz": {"md5": "a10fb7d5da4d9e06ec208499e2686ade", "sha1": "182077aee7fbc4e4f4cb44d3cc5aaa561472368d"}, "conanmanifest.txt": {"md5": "e3d1d4403441cf72d2187f60c26967f7", "sha1": "89b3202f316f3b472d04724790f5e53e3da9a3a0"}}, "recipe_revision": "0"}}, "recipe": {"revision": "0", "remote": "conan-center", "checksums": {"conan_export.tgz": {"md5": "48e030d41a819cbf8e4542fc75ac0dc4", "sha1": "0f859f6fb81a0acdefa7b91abda3affa6ceb70eb"}, "conanmanifest.txt": {"md5": "1651c26708bb10b859c395aeb6cc988f", "sha1": "dcd31d790105e99766f9980d1a29ccdd6f0c97a9"}, "conanfile.py": {"md5": "9a4a414efbf09dd970aab3763dd79aae", "sha1": "50fe162aa3fa8699e8f119e9ab74e0c227b1d26d"}}, "properties": {}}}

.conan/data/openssl/1.1.1g/_/_/package/76f87539fc90ff313e0b3182641a9bb558a717d2/bin/c_rehash

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
# Perl c_rehash script, scan all files in a directory
1313
# and add symbolic links to their hash values.
1414

15-
my $dir = "/home/conan/w/cci_PR-3001/.conan/data/openssl/1.1.1g/_/_/package/76f87539fc90ff313e0b3182641a9bb558a717d2/res";
16-
my $prefix = "/home/conan/w/cci_PR-3001/.conan/data/openssl/1.1.1g/_/_/package/76f87539fc90ff313e0b3182641a9bb558a717d2";
15+
my $dir = "/home/conan/w/cci_master/.conan/data/openssl/1.1.1g/_/_/package/76f87539fc90ff313e0b3182641a9bb558a717d2/res";
16+
my $prefix = "/home/conan/w/cci_master/.conan/data/openssl/1.1.1g/_/_/package/76f87539fc90ff313e0b3182641a9bb558a717d2";
1717

1818
my $errorcount = 0;
1919
my $openssl = $ENV{OPENSSL} || "openssl";

.conan/data/openssl/1.1.1g/_/_/package/76f87539fc90ff313e0b3182641a9bb558a717d2/conaninfo.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
shared=False
6464

6565
[recipe_hash]
66-
7db1aa62818c6bb1a1e51166f8fb602d
66+
576d2fd6d824c89a42d59adccf698bc4
6767

6868
[env]
6969

.conan/data/openssl/1.1.1g/_/_/package/76f87539fc90ff313e0b3182641a9bb558a717d2/conanmanifest.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
1601289240
2-
bin/c_rehash: 880d220dc56619a0e2e2e54aec57d3d4
3-
bin/openssl: 2f730d1ba2db25967f6bd1ea7ffcbad3
4-
conaninfo.txt: 28acd889e1f2eb9c2b75db035bb9897b
1+
1603305904
2+
bin/c_rehash: 5a5579edf5d8544a766ce659e0b0f4d6
3+
bin/openssl: 63679515bb221e27df42107e4afb00ca
4+
conaninfo.txt: a1b70a149396df5593a663eb8cdada24
55
include/openssl/aes.h: 1fe491c6755e6f1014a9b9704ce9bf5b
66
include/openssl/asn1.h: fbdf1a427a6b70efe081f50ba9c2ee57
77
include/openssl/asn1_mac.h: 926348f025372ccacaf16c663b051aec
@@ -106,6 +106,6 @@ include/openssl/x509_vfy.h: 99fd343f8b3970195c79684291fb6fc9
106106
include/openssl/x509err.h: cf80ca45923582759d23f79d5843971c
107107
include/openssl/x509v3.h: e2ba3dc45f622282a8b5751a4acbbd14
108108
include/openssl/x509v3err.h: fbbe345d57c5d75b39d61a7d843ae526
109-
lib/libcrypto.a: 166126a5e999ce99e05ee7045c3b9f8d
109+
lib/libcrypto.a: 3789d4d2ef5149b83170276f97c1360d
110110
lib/libssl.a: cd804e560acc9589e7fa690b12244a1d
111111
licenses/LICENSE: d343e62fc9c833710bbbed25f27364c8

.conan/remotes.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"remotes": [
33
{
4-
"verify_ssl": true,
54
"name": "conan-center",
5+
"verify_ssl": true,
66
"url": "https://conan.bintray.com"
77
},
88
{
9-
"verify_ssl": true,
109
"name": "bincrafters",
10+
"verify_ssl": true,
1111
"url": "https://api.bintray.com/conan/bincrafters/public-conan"
1212
}
1313
]

0 commit comments

Comments
 (0)