Skip to content

Commit 396be77

Browse files
author
turtlebrowser-bot
committed
schedule : Commit by patricia-gallardo with SHA d2c09307bfeff97f870e74d8826e00b82c675dc5 on refs/heads/master
1 parent 3fe01cc commit 396be77

File tree

42 files changed

+75
-77
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+75
-77
lines changed

.conan/data/icu/64.2/_/_/export/conanfile.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class ICUBase(ConanFile):
1515
url = "https://github.com/conan-io/conan-center-index"
1616
topics = ("conan", "icu", "icu4c", "i see you", "unicode")
1717
settings = "os", "arch", "compiler", "build_type"
18-
exports = ["patches/*.patch"]
18+
exports_sources = "patches/*.patch"
1919
options = {"shared": [True, False],
2020
"fPIC": [True, False],
2121
"data_packaging": ["files", "archive", "library", "static"],
@@ -234,16 +234,23 @@ def _data_filename(self):
234234
def package_info(self):
235235
self.cpp_info.names["cmake_find_package"] = "ICU"
236236
self.cpp_info.names["cmake_find_package_multi"] = "ICU"
237+
237238
# icudata
238239
self.cpp_info.components["icu-data"].names["cmake_find_package"] = "data"
239240
self.cpp_info.components["icu-data"].names["cmake_find_package_multi"] = "data"
240241
self.cpp_info.components["icu-data"].libs = [self._lib_name("icudt" if self.settings.os == "Windows" else "icudata")]
241242
if not self.options.shared:
242243
self.cpp_info.components["icu-data"].defines.append("U_STATIC_IMPLEMENTATION")
244+
245+
# icu uses c++, so add the c++ runtime
246+
if tools.stdcpp_library(self):
247+
self.cpp_info.components["icu-data"].system_libs.append(tools.stdcpp_library(self))
248+
243249
# Alias of data CMake component
244250
self.cpp_info.components["icu-data-alias"].names["cmake_find_package"] = "dt"
245251
self.cpp_info.components["icu-data-alias"].names["cmake_find_package_multi"] = "dt"
246252
self.cpp_info.components["icu-data-alias"].requires = ["icu-data"]
253+
247254
# icuuc
248255
self.cpp_info.components["icu-uc"].names["cmake_find_package"] = "uc"
249256
self.cpp_info.components["icu-uc"].names["cmake_find_package_multi"] = "uc"
@@ -256,6 +263,7 @@ def package_info(self):
256263
self.cpp_info.components["icu-uc"].system_libs.append("dl")
257264
elif self.settings.os == "Windows":
258265
self.cpp_info.components["icu-uc"].system_libs = ["advapi32"]
266+
259267
# icui18n
260268
self.cpp_info.components["icu-i18n"].names["cmake_find_package"] = "i18n"
261269
self.cpp_info.components["icu-i18n"].names["cmake_find_package_multi"] = "i18n"
@@ -264,23 +272,27 @@ def package_info(self):
264272
self.cpp_info.components["icu-i18n"].requires = ["icu-uc"]
265273
if self.settings.os == "Linux":
266274
self.cpp_info.components["icu-i18n"].system_libs = ["m"]
275+
267276
# Alias of i18n CMake component
268277
self.cpp_info.components["icu-i18n-alias"].names["cmake_find_package"] = "in"
269278
self.cpp_info.components["icu-i18n-alias"].names["cmake_find_package_multi"] = "in"
270279
self.cpp_info.components["icu-i18n-alias"].requires = ["icu-i18n"]
280+
271281
# icuio
272282
self.cpp_info.components["icu-io"].names["cmake_find_package"] = "io"
273283
self.cpp_info.components["icu-io"].names["cmake_find_package_multi"] = "io"
274284
self.cpp_info.components["icu-io"].names["pkg_config"] = "icu-io"
275285
self.cpp_info.components["icu-io"].libs = [self._lib_name("icuio")]
276286
self.cpp_info.components["icu-io"].requires = ["icu-i18n", "icu-uc"]
287+
277288
# icutu
278289
self.cpp_info.components["icu-tu"].names["cmake_find_package"] = "tu"
279290
self.cpp_info.components["icu-tu"].names["cmake_find_package_multi"] = "tu"
280291
self.cpp_info.components["icu-tu"].libs = [self._lib_name("icutu")]
281292
self.cpp_info.components["icu-tu"].requires = ["icu-i18n", "icu-uc"]
282293
if self.settings.os == "Linux":
283294
self.cpp_info.components["icu-tu"].system_libs = ["pthread"]
295+
284296
# icutest
285297
self.cpp_info.components["icu-test"].names["cmake_find_package"] = "test"
286298
self.cpp_info.components["icu-test"].names["cmake_find_package_multi"] = "test"
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
1599322262
1+
1599736128
22
conandata.yml: bf49b1c700469343a22dd157b3d4abdb
3-
conanfile.py: 7494fa76b3135b8173cae3a86bdd0de1
4-
patches/6aba9344a18f4f32e8070ee53b79495630901c26.patch: 242f16e52b8d59b6f31031f21b0d409d
3+
conanfile.py: f6a9c040844c4a2e6670af11ff0e85f4
4+
export_source/patches/0001-67.1-fix-mingw.patch: 2163da0ac6a6732c4e2dabe1042ff102
5+
export_source/patches/6aba9344a18f4f32e8070ee53b79495630901c26.patch: 242f16e52b8d59b6f31031f21b0d409d

.conan/data/icu/64.2/_/_/export/patches/6aba9344a18f4f32e8070ee53b79495630901c26.patch

Lines changed: 0 additions & 22 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"packages": {"7491e184ad3cec95c035a0f1270e544956f4c213": {"remote": "conan-center", "recipe_revision": "0", "revision": "0", "properties": {}, "checksums": {"conan_package.tgz": {"sha1": "9b06e0a4bce69b2ce11e2df2e3779a73bfbea6fb", "md5": "4a68d7f7c01c4d411fa7ed8c3b9eb2e9"}, "conanmanifest.txt": {"sha1": "813f8cc4bb8ab9ce9e806d4e5a34ef67b6175a67", "md5": "674783e0aca6b3137abe6f80e2d442cd"}, "conaninfo.txt": {"sha1": "d62b8d3661edc75bf1ab74f0689610b2bd4a0c8e", "md5": "77af94122d3f1a88c55579c81393bdf4"}}}}, "recipe": {"remote": "conan-center", "properties": {}, "revision": "0", "checksums": {"conan_export.tgz": {"sha1": "4888f7101b442d81d29a10b6f70ede81ce372e05", "md5": "d2eff751ff5442984444f073fbbc88b6"}, "conanfile.py": {"sha1": "b9575bfad41b79d90ceb0b6c85b65e879549aee4", "md5": "7494fa76b3135b8173cae3a86bdd0de1"}, "conanmanifest.txt": {"sha1": "54990f42a2cf93a37312e2c017735c714a7c2653", "md5": "5c471dcc52b70fdf4de0c2c2de630e29"}}}}
1+
{"packages": {"7491e184ad3cec95c035a0f1270e544956f4c213": {"properties": {}, "recipe_revision": "0", "revision": "0", "remote": "conan-center", "checksums": {"conaninfo.txt": {"sha1": "65ec0d18a8f7dfd250ec4c6359ffc3dd4ea0569b", "md5": "3f1ac796095944e816e61e803ae8064f"}, "conan_package.tgz": {"sha1": "7cbd5d9d7b29aba69d1c78031595bcfeade612c9", "md5": "5e2698b2f3132c31aed6e112d147efef"}, "conanmanifest.txt": {"sha1": "84628b4bf5d9afd8f68d645946c91663c09c5dfb", "md5": "9f49ae68a32a793c0d7499d7d12ba96d"}}}}, "recipe": {"properties": {}, "revision": "0", "remote": "conan-center", "checksums": {"conan_export.tgz": {"sha1": "f214eef9d923f75dce7e3543be314553eb96e0a6", "md5": "1fae9135501a5cc3c381f2dcb65daf4e"}, "conanfile.py": {"sha1": "2ca42b6af991ddb0d00a1147b1452e43b175bb27", "md5": "f6a9c040844c4a2e6670af11ff0e85f4"}, "conanmanifest.txt": {"sha1": "a81dfa8539b917a95027a0e4aa55313056465f74", "md5": "d0c53a68064c9e9452e69b10afb9d8ff"}}}}

.conan/data/icu/64.2/_/_/package/7491e184ad3cec95c035a0f1270e544956f4c213/bin/icu-config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@ loaddefs()
5353
# etc. If ICU is not installed in this directory, you must change the
5454
# following line. There should exist ${prefix}/include/unicode/utypes.h
5555
# for example.
56-
default_prefix="/home/conan/w/cci_PR-2833/1/df0f5381-f1aa-45bd-8651-9c9bcda669dd/.conan/data/icu/64.2/_/_/package/7491e184ad3cec95c035a0f1270e544956f4c213"
56+
default_prefix="/home/conan/w/cci_PR-2868/3/8d6d6f42-cc02-4633-8a44-a384b47b0492/.conan/data/icu/64.2/_/_/package/7491e184ad3cec95c035a0f1270e544956f4c213"
5757
if [ "x${prefix}" = "x" ]; then prefix="$default_prefix"; fi
5858
exec_prefix="${prefix}"
5959
libdir="${exec_prefix}/lib"
6060
libexecdir="${exec_prefix}/libexec"
6161
bindir="${exec_prefix}/bin"
62-
datarootdir="/home/conan/w/cci_PR-2833/1/df0f5381-f1aa-45bd-8651-9c9bcda669dd/.conan/data/icu/64.2/_/_/package/7491e184ad3cec95c035a0f1270e544956f4c213/lib"
62+
datarootdir="/home/conan/w/cci_PR-2868/3/8d6d6f42-cc02-4633-8a44-a384b47b0492/.conan/data/icu/64.2/_/_/package/7491e184ad3cec95c035a0f1270e544956f4c213/lib"
6363
datadir="${datarootdir}"
64-
sbindir="/home/conan/w/cci_PR-2833/1/df0f5381-f1aa-45bd-8651-9c9bcda669dd/.conan/data/icu/64.2/_/_/package/7491e184ad3cec95c035a0f1270e544956f4c213/bin"
64+
sbindir="/home/conan/w/cci_PR-2868/3/8d6d6f42-cc02-4633-8a44-a384b47b0492/.conan/data/icu/64.2/_/_/package/7491e184ad3cec95c035a0f1270e544956f4c213/bin"
6565

6666
# about the ICU version
6767
VERSION="64.2"

.conan/data/icu/64.2/_/_/package/7491e184ad3cec95c035a0f1270e544956f4c213/conaninfo.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
with_unit_tests=False
3636

3737
[recipe_hash]
38-
dd73ae0e9c962f24a67db1f5a6df9924
38+
34110f6b8c8fe71ae764c99b1b31eddb
3939

4040
[env]
4141

.conan/data/icu/64.2/_/_/package/7491e184ad3cec95c035a0f1270e544956f4c213/conanmanifest.txt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
1599322405
2-
bin/derb: d1b6e4e28e92878f94a3c37f088b34b6
1+
1599736255
2+
bin/derb: 54256a58393150946680137829cf67e9
33
bin/escapesrc: cbd8807b896fab9db9399962200fd5d5
4-
bin/genbrk: a59058765430bec4a36f2b29ff184488
4+
bin/genbrk: a51aa6f69562e7ec12bf481e1d0d9710
55
bin/genccode: ce7f44809979ebad70b0469fb0c1bde3
6-
bin/gencfu: b0a4928b2a75c0f44876d13b60fa5b13
7-
bin/gencmn: 1bfec84bfce414baa25a843eda2f25f4
8-
bin/gencnval: ab97e648e75e549c939c9788e6e302b2
9-
bin/gendict: 3a6ac53ff274a2b424015abcc77d4366
6+
bin/gencfu: eca4b78fcb331b9bf07e07458d54655e
7+
bin/gencmn: 3b4f74c808649f92f5341fddf0917732
8+
bin/gencnval: cc7b29d04356cea39d3ccdbb13965466
9+
bin/gendict: ee03b5cdd9cb90f5eec097bd22455833
1010
bin/gennorm2: 2664dcceecea9b92127b5af7963e7522
11-
bin/genrb: 3b84943c91f5170f3cf0a0a57ba2b699
12-
bin/gensprep: f260313e72816c7149be11c9b1d37638
13-
bin/icu-config: 4bb1b2888d7827c6a37e7ede8d2c058d
14-
bin/icuinfo: 4891a7008808665662e39d8e91ec6870
11+
bin/genrb: efa92a44d204892a40745ce813b7d357
12+
bin/gensprep: c318401d1eaadd9419a80587c8be16f8
13+
bin/icu-config: a6895661275c18c58ba4d2b2f86d1890
14+
bin/icuinfo: bf217d3a561e354e9b2ddac82cb090a3
1515
bin/icupkg: 7d4308635760e9440c8cc76a64d96073
16-
bin/makeconv: 51f449e191cb303d8cffa530bb7404c0
17-
bin/pkgdata: 98a561ac4c2952bf878b6eea2612ef3a
18-
conaninfo.txt: 77af94122d3f1a88c55579c81393bdf4
16+
bin/makeconv: 8fd30b789202aaa397c4df49d7c9afab
17+
bin/pkgdata: 6f20a5115c8f67c2a3a9e4210d80c786
18+
conaninfo.txt: 3f1ac796095944e816e61e803ae8064f
1919
include/unicode/alphaindex.h: edc0ff1708822c14fbac4f58a89859c9
2020
include/unicode/appendable.h: 713ee4a1c3e3ca090b202ceb81d6ad9f
2121
include/unicode/basictz.h: 456683947de10ae84e2c069c9fc55e9f
@@ -207,6 +207,6 @@ lib/libicui18n.a: 9e0cf982aeac13122d3961e599663d3c
207207
lib/libicuio.a: 71775de4b585c52b33ebf11abeb974b6
208208
lib/libicutest.a: a04c5b056689433b6889a2950da5fc5a
209209
lib/libicutu.a: b60bda9d09f7a699de522c399ebac02b
210-
lib/libicuuc.a: d3619f49b3b66df3b46a290e22b319ca
210+
lib/libicuuc.a: 7512063b224e4ae79fad69ef75cf2b20
211211
licenses/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d
212212
res/icudt64l.dat: e5e1f40a3f06f5da9e4a9bce8f041763

.conan/data/opengl/system/_/_/export/conanfile.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ def system_requirements(self):
6363
package_tool.install(update=True, packages=p)
6464

6565
def package_info(self):
66+
# TODO: Workaround for #2311 until a better solution can be found
67+
self.cpp_info.filenames["cmake_find_package"] = "opengl_system"
68+
self.cpp_info.filenames["cmake_find_package_multi"] = "opengl_system"
69+
6670
self.cpp_info.includedirs = []
6771
self.cpp_info.libdirs = []
6872
if self.settings.os == "Macos":
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
1595864689
2-
conanfile.py: b793fe0b4a2294d95b6dd52be48a418f
1+
1600704242
2+
conanfile.py: 6db463471ace87caf8898bfd5cc132ce
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"packages": {"5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9": {"remote": "conan-center", "recipe_revision": "0", "revision": "0", "properties": {}, "checksums": {"conan_package.tgz": {"sha1": "be152c82859285658a06816aaaec529a159c33d3", "md5": "25f53ac9685e07815b990e7c6f21bfd0"}, "conanmanifest.txt": {"sha1": "ff28f86af18572dba578ebeb621e58ef7da4997a", "md5": "ed2ed715a2aeeaa38973ba682642b18a"}, "conaninfo.txt": {"sha1": "2d51f703ddf1dcd789f19f9bba40249fec3efb28", "md5": "0fad183468fd509d03c2c45157fbe11c"}}}}, "recipe": {"remote": "conan-center", "properties": {}, "revision": "0", "checksums": {"conanfile.py": {"sha1": "2b9792e73302eb6b368a52d99f4329cd1e6bc20b", "md5": "b793fe0b4a2294d95b6dd52be48a418f"}, "conanmanifest.txt": {"sha1": "81f5a935a829df4ddcffca4dcbb6714d0c57a33c", "md5": "4b1d50b124958a01ea7ae397be46dbb4"}}}}
1+
{"packages": {"5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9": {"properties": {}, "recipe_revision": "0", "revision": "0", "remote": "conan-center", "checksums": {"conaninfo.txt": {"sha1": "2ca30804a3bff581cc318515a0b5eebbb0f3423c", "md5": "0f8950e67e601b0eb85f205a9f2f8af9"}, "conan_package.tgz": {"sha1": "be152c82859285658a06816aaaec529a159c33d3", "md5": "25f53ac9685e07815b990e7c6f21bfd0"}, "conanmanifest.txt": {"sha1": "cc8220f0ffb42b507132eb560c13cce9efb99e7a", "md5": "87af9a3d8f03424f2273bd3bbbfdb46f"}}}}, "recipe": {"properties": {}, "revision": "0", "remote": "conan-center", "checksums": {"conanfile.py": {"sha1": "9c6d82c02a8bef90203a28f3f6fdd6204163fa88", "md5": "6db463471ace87caf8898bfd5cc132ce"}, "conanmanifest.txt": {"sha1": "bb91e062bc74e15244231c08da0b82a7b0ce80c9", "md5": "b0047728408e1f25da0dfca466a29e1e"}}}}

.conan/data/opengl/system/_/_/package/5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9/conaninfo.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818

1919
[recipe_hash]
20-
ba4784ae19218f78ce52ce97eab94275
20+
42db39f9018a85c79f70bb3a69917d46
2121

2222
[env]
2323

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
1595864714
2-
conaninfo.txt: 0fad183468fd509d03c2c45157fbe11c
1+
1600704266
2+
conaninfo.txt: 0f8950e67e601b0eb85f205a9f2f8af9
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"packages": {"76f87539fc90ff313e0b3182641a9bb558a717d2": {"remote": "conan-center", "recipe_revision": "0", "revision": "0", "properties": {}, "checksums": {"conan_package.tgz": {"sha1": "dbb0925252b374905adaf9b9781593a53fbae60e", "md5": "4b6f07e1d45549b3a3eda8cbcdf9fc3e"}, "conanmanifest.txt": {"sha1": "33db3e1bde6a9ee4d68549248c9d4a08375535dd", "md5": "fb6015e590bc06eb19adda918960730b"}, "conaninfo.txt": {"sha1": "ab4ef5198dfdd237789ff613395fff258f917452", "md5": "1ad9bedd4dd8a4c8fd86a491d79fbada"}}}}, "recipe": {"remote": "conan-center", "properties": {}, "revision": "0", "checksums": {"conan_export.tgz": {"sha1": "0f859f6fb81a0acdefa7b91abda3affa6ceb70eb", "md5": "48e030d41a819cbf8e4542fc75ac0dc4"}, "conanfile.py": {"sha1": "9bc7d5887133655cddd096d402cb4c09921fffe7", "md5": "2d28aaf2e96d1e36f0243bec2a867c83"}, "conanmanifest.txt": {"sha1": "08ae535b4a51a37b46b2cff481235dbeba76cf01", "md5": "caed9b4755ba2a80e91b6abf3b844e1d"}}}}
1+
{"packages": {"76f87539fc90ff313e0b3182641a9bb558a717d2": {"properties": {}, "recipe_revision": "0", "revision": "0", "remote": "conan-center", "checksums": {"conaninfo.txt": {"sha1": "ab4ef5198dfdd237789ff613395fff258f917452", "md5": "1ad9bedd4dd8a4c8fd86a491d79fbada"}, "conan_package.tgz": {"sha1": "c65677c572e5e8baa9fafc961576303e31865cad", "md5": "2a525fd0b295ded2ed6b29d54f5e7b2b"}, "conanmanifest.txt": {"sha1": "ae974481166e7f5582c8ca41e3bd61e8a3a9b5de", "md5": "4806ac70d8170f09d94ee92485b10e5b"}}}}, "recipe": {"properties": {}, "revision": "0", "remote": "conan-center", "checksums": {"conan_export.tgz": {"sha1": "0f859f6fb81a0acdefa7b91abda3affa6ceb70eb", "md5": "48e030d41a819cbf8e4542fc75ac0dc4"}, "conanfile.py": {"sha1": "9bc7d5887133655cddd096d402cb4c09921fffe7", "md5": "2d28aaf2e96d1e36f0243bec2a867c83"}, "conanmanifest.txt": {"sha1": "08ae535b4a51a37b46b2cff481235dbeba76cf01", "md5": "caed9b4755ba2a80e91b6abf3b844e1d"}}}}

.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/workspace/onan-center-pull-request_PR-1782/7/pr_1782_7_18_0/.conan/data/openssl/1.1.1g/_/_/package/76f87539fc90ff313e0b3182641a9bb558a717d2/res";
16-
my $prefix = "/home/conan/workspace/onan-center-pull-request_PR-1782/7/pr_1782_7_18_0/.conan/data/openssl/1.1.1g/_/_/package/76f87539fc90ff313e0b3182641a9bb558a717d2";
15+
my $dir = "/home/conan/w/cci_PR-2984/.conan/data/openssl/1.1.1g/_/_/package/76f87539fc90ff313e0b3182641a9bb558a717d2/res";
16+
my $prefix = "/home/conan/w/cci_PR-2984/.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/conanmanifest.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
1594249965
2-
bin/c_rehash: 5cd2c598ffc4846383da795ca7011b59
3-
bin/openssl: c5392a795654250e23752c68187b2523
1+
1600797688
2+
bin/c_rehash: d647680b279e03fc8dd851d9ac044949
3+
bin/openssl: 1b1677b56bbc7e5105818be33e1aac03
44
conaninfo.txt: 1ad9bedd4dd8a4c8fd86a491d79fbada
55
include/openssl/aes.h: 1fe491c6755e6f1014a9b9704ce9bf5b
66
include/openssl/asn1.h: fbdf1a427a6b70efe081f50ba9c2ee57
@@ -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: a2b04162d38fb3008e2995e8f9318c3d
109+
lib/libcrypto.a: a5302aa23b3512fc1102191d0d8c88ac
110110
lib/libssl.a: cd804e560acc9589e7fa690b12244a1d
111111
licenses/LICENSE: d343e62fc9c833710bbbed25f27364c8

.conan/data/xorg/system/_/_/export/conanfile.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from conans import ConanFile, tools
22
from conans.errors import ConanException
33

4+
required_conan_version = ">=1.29"
45

56
class ConanXOrg(ConanFile):
67
name = "xorg"
@@ -33,6 +34,7 @@ def _fill_cppinfo_from_pkgconfig(self, name):
3334
self.cpp_info.components[name].includedirs = include_dirs
3435
self.cpp_info.components[name].cflags = cflags
3536
self.cpp_info.components[name].cxxflags = cflags
37+
self.cpp_info.components[name].version = pkg_config.version[0]
3638

3739
def system_requirements(self):
3840
if tools.os_info.is_linux and self.settings.os == "Linux":
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
1596269715
2-
conanfile.py: 1b68a5d789029fe00dc28deb1743d324
1+
1600760157
2+
conanfile.py: bccd5e260c1bc524c56dba876fc3c75d
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"packages": {"5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9": {"remote": "conan-center", "recipe_revision": "0", "revision": "0", "properties": {}, "checksums": {"conan_package.tgz": {"sha1": "be152c82859285658a06816aaaec529a159c33d3", "md5": "25f53ac9685e07815b990e7c6f21bfd0"}, "conanmanifest.txt": {"sha1": "c3e6c29063c00d344c66eaacdac23c2d1d7c414c", "md5": "ca6262d0140b33fb8906084eeff7633c"}, "conaninfo.txt": {"sha1": "182a0720108190c3affc351896bc87d3dddb51fe", "md5": "338de9a0c3ab36579a243bc12f150625"}}}}, "recipe": {"remote": "conan-center", "properties": {}, "revision": "0", "checksums": {"conanfile.py": {"sha1": "024089bcd314a5491ed6929e27da33ee48f48178", "md5": "1b68a5d789029fe00dc28deb1743d324"}, "conanmanifest.txt": {"sha1": "7148ef72b19fbd67e57a29bc09ccfcb9c751dca3", "md5": "fdb368c6470277c72f19fb739ac39db8"}}}}
1+
{"packages": {"5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9": {"properties": {}, "recipe_revision": "0", "revision": "0", "remote": "conan-center", "checksums": {"conaninfo.txt": {"sha1": "c48e3a65aeb24189a8ec8242c1a970c6c8eadc4f", "md5": "56299eead07855d6961a5456ddf47b48"}, "conan_package.tgz": {"sha1": "be152c82859285658a06816aaaec529a159c33d3", "md5": "25f53ac9685e07815b990e7c6f21bfd0"}, "conanmanifest.txt": {"sha1": "f667988686cfdf68bb535675e475b343bdcb0164", "md5": "228a5a01046934cb65703f2cb4ffdb8e"}}}}, "recipe": {"properties": {}, "revision": "0", "remote": "conan-center", "checksums": {"conanfile.py": {"sha1": "91cbcdc73f3774d811aa008364a1e1d6a5e59ce5", "md5": "bccd5e260c1bc524c56dba876fc3c75d"}, "conanmanifest.txt": {"sha1": "8fa17e1096bab8ca3bf2c47a7a02f318e9acd4d8", "md5": "7c3f1d0439685130c538d6858672c9da"}}}}

.conan/data/xorg/system/_/_/package/5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9/conaninfo.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818

1919
[recipe_hash]
20-
cf91a119280726e2bd96f56878e58049
20+
d9f4bfc99f26eb3e7680bf2b17e05a1e
2121

2222
[env]
2323

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
1596269773
2-
conaninfo.txt: 338de9a0c3ab36579a243bc12f150625
1+
1600760244
2+
conaninfo.txt: 56299eead07855d6961a5456ddf47b48

.conan/data/zstd/1.4.4/_/_/export/conanfile.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ def package(self):
6868

6969
def package_info(self):
7070
zstd_cmake = "libzstd_shared" if self.options.shared else "libzstd_static"
71+
self.cpp_info.components["zstdlib"].names["pkg_config"] = "libzstd"
7172
self.cpp_info.components["zstdlib"].names["cmake_find_package"] = zstd_cmake
7273
self.cpp_info.components["zstdlib"].names["cmake_find_package_multi"] = zstd_cmake
7374
self.cpp_info.components["zstdlib"].libs = tools.collect_libs(self)
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
1594990993
1+
1601044788
22
conandata.yml: 0285419aa05b7caa10588cdf53d9d0c4
3-
conanfile.py: 2c71743dbf8b93b2fd5b5d2bb7ad466e
3+
conanfile.py: f74948f38bca27e4111d6a7e40493a39
44
export_source/CMakeLists.txt: 3fa5c2e5403093597f8fbce35c37c662
55
export_source/patches/0001-cmake-install-dll.patch: bd9c2bda443ded0e8042daace2d79ec1

0 commit comments

Comments
 (0)