Skip to content

Commit 90ebf98

Browse files
author
turtlebrowser-bot
committed
schedule : Commit by patricia-gallardo with SHA ea2b9f83b7118be136b72da7689f2e8742d778f5 on refs/heads/master
1 parent e6a5c90 commit 90ebf98

Some content is hidden

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

48 files changed

+72
-65
lines changed

.conan/data/double-conversion/3.1.5/_/_/export/conanfile.py

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,24 @@ class DoubleConversionConan(ConanFile):
1616
settings = "os", "arch", "compiler", "build_type"
1717
options = {"shared": [True, False], "fPIC": [True, False]}
1818
default_options = {"shared": False, "fPIC": True}
19-
_source_subfolder = "source_subfolder"
20-
_build_subfolder = "build_subfolder"
19+
20+
_cmake = None
21+
22+
@property
23+
def _source_subfolder(self):
24+
return "source_subfolder"
25+
26+
@property
27+
def _build_subfolder(self):
28+
return "build_subfolder"
2129

2230
def config_options(self):
2331
if self.settings.os == "Windows":
2432
del self.options.fPIC
2533

2634
def configure(self):
35+
if self.options.shared:
36+
del self.options.fPIC
2737
if self.settings.os == "Windows" and \
2838
self.settings.compiler == "Visual Studio" and \
2939
Version(self.settings.compiler.version.value) < "14":
@@ -35,9 +45,11 @@ def source(self):
3545
os.rename(extracted_dir, self._source_subfolder)
3646

3747
def _configure_cmake(self):
38-
cmake = CMake(self)
39-
cmake.configure(build_folder=self._build_subfolder)
40-
return cmake
48+
if self._cmake:
49+
return self._cmake
50+
self._cmake = CMake(self)
51+
self._cmake.configure(build_folder=self._build_subfolder)
52+
return self._cmake
4153

4254
def build(self):
4355
cmake = self._configure_cmake()
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
1599079158
1+
1601632750
22
conandata.yml: 16a5cb50ffc1b1541d1c219e78c175bc
3-
conanfile.py: 1560978784f7e5fc809150c7e9e8b07f
4-
export_source/CMakeLists.txt: 2239266b74feff6e8345249efef2e9af
3+
conanfile.py: bf71f67986b1cd68a21d8ad7710fd79e
4+
export_source/CMakeLists.txt: b446f501d4cf05bf757d6c1fa747b082
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"recipe": {"remote": "conan-center", "checksums": {"conanmanifest.txt": {"md5": "6ffc09ccbfb6a260456b1df022eee15b", "sha1": "d73bd6d8fde11d34cfa2ff1db0d12500973015b9"}, "conanfile.py": {"md5": "1560978784f7e5fc809150c7e9e8b07f", "sha1": "c85d5f800732d5994ce4cd1c9086e24fff01d5b1"}, "conan_export.tgz": {"md5": "b359fdc33eefa44ac476359eeecc1afc", "sha1": "e703819796222f61f888845b7c0db03a62f51787"}}, "revision": "0", "properties": {}}, "packages": {"4d887c1c2779c63d2cdd81580698d2e22cb35b29": {"properties": {}, "recipe_revision": "0", "checksums": {"conaninfo.txt": {"md5": "7d4ac087a042f702e8989c0cc0aaace1", "sha1": "a3543f2c8d79826e7eb07253a144fdd1a62e1f45"}, "conanmanifest.txt": {"md5": "2b36764f9e946011a79ec382b7d415ad", "sha1": "7d10752b257366a07a0b319f0b068ef894ecd18d"}, "conan_package.tgz": {"md5": "109fcd7c7fa971a0bbdfc8744122aacd", "sha1": "f9f434c2dbd23549a982d31389a36dab2cc01052"}}, "revision": "0", "remote": "conan-center"}}}
1+
{"packages": {"4d887c1c2779c63d2cdd81580698d2e22cb35b29": {"checksums": {"conaninfo.txt": {"sha1": "3c76340fc0b6adea8ba11ccca45c491005413262", "md5": "2c35f0459a43edcfcfad6e965ac9d4a2"}, "conanmanifest.txt": {"sha1": "5a66e730ccc9e0f906f26997698d6ef996648d24", "md5": "cfabb67bff8b4079940649502611bf86"}, "conan_package.tgz": {"sha1": "f9f434c2dbd23549a982d31389a36dab2cc01052", "md5": "109fcd7c7fa971a0bbdfc8744122aacd"}}, "remote": "conan-center", "properties": {}, "recipe_revision": "0", "revision": "0"}}, "recipe": {"checksums": {"conanfile.py": {"sha1": "4038aeaa7a768d1236c996bb4d4ff4a88271b629", "md5": "bf71f67986b1cd68a21d8ad7710fd79e"}, "conanmanifest.txt": {"sha1": "0ea8a9dd54030dbfeb6fe114276afe67f782ac73", "md5": "12d345bcd8bdd66a7d67b74077ba38f9"}, "conan_export.tgz": {"sha1": "e703819796222f61f888845b7c0db03a62f51787", "md5": "b359fdc33eefa44ac476359eeecc1afc"}}, "remote": "conan-center", "properties": {}, "revision": "0"}}

.conan/data/double-conversion/3.1.5/_/_/package/4d887c1c2779c63d2cdd81580698d2e22cb35b29/conaninfo.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
shared=False
3030

3131
[recipe_hash]
32-
8cd9755bafe1114b3c5c9d1c068c6d69
32+
bf7fceaa33f97d13a341039f49a5ec8f
3333

3434
[env]
3535

.conan/data/double-conversion/3.1.5/_/_/package/4d887c1c2779c63d2cdd81580698d2e22cb35b29/conanmanifest.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
1600363952
2-
conaninfo.txt: 7d4ac087a042f702e8989c0cc0aaace1
1+
1601918781
2+
conaninfo.txt: 2c35f0459a43edcfcfad6e965ac9d4a2
33
include/double-conversion/bignum.h: 260470f75e208873ec60252f8b406e52
44
include/double-conversion/cached-powers.h: 9f8eee22a23aeb313aafb0fc84e43472
55
include/double-conversion/diy-fp.h: ac1b1c9daed7bc756232789d940831c3

.conan/data/fontconfig/2.13.91/_/_/export/conanfile.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ def package(self):
7373
if os.path.islink(f):
7474
os.unlink(f)
7575

76+
7677
def package_info(self):
7778
self.cpp_info.libs = ["fontconfig"]
7879
if self.settings.os == "Linux":
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
1595858754
1+
1601915414
22
conandata.yml: d4bca0e5775bb366a815321fd151b8de
3-
conanfile.py: b2427049785b5c2c8947a443984ce803
3+
conanfile.py: f09dd3950610e26f291e3e580fe61397
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"recipe": {"properties": {}, "checksums": {"conan_export.tgz": {"md5": "85f5a51287da4982b2d8f304c44d62d7", "sha1": "9eb97082455b5b5934213b8729d9a1cbcaac9e81"}, "conanmanifest.txt": {"md5": "47fcf73ead1bcba12d3f928f245cba42", "sha1": "460f90be8443bb38c9d729bd208a790380115283"}, "conanfile.py": {"md5": "b2427049785b5c2c8947a443984ce803", "sha1": "d957999b3124661bbdddf4ff353e3308c1cd4573"}}, "remote": "conan-center", "revision": "0"}, "packages": {"fdb1122458d3e0706667fbb2af09026ac0bc1787": {"properties": {}, "recipe_revision": "0", "checksums": {}, "remote": null, "revision": "ff5bedd23f2ad9e7776b80ce7b9aa532"}, "014268efa8761faffd3d3bf6d137e2af8822fbe0": {"properties": {}, "recipe_revision": "0", "checksums": {"conanmanifest.txt": {"md5": "58987ba1381c31124f81dc301a9183d3", "sha1": "f49af99a858e1c048847d399259588d423c61f48"}, "conan_package.tgz": {"md5": "a8cdb1af2e9befe12f9df7b7eb6037b6", "sha1": "a73eeb5dcc16a283517b60e3016642e8fdbb5e9e"}, "conaninfo.txt": {"md5": "2576c558a15d21bb5f3b8e42b7067cb4", "sha1": "2ee466dd9737a5d9f12106069899933ab7a606d3"}}, "remote": "conan-center", "revision": "0"}}}
1+
{"packages": {"014268efa8761faffd3d3bf6d137e2af8822fbe0": {"checksums": {"conaninfo.txt": {"sha1": "2ee466dd9737a5d9f12106069899933ab7a606d3", "md5": "2576c558a15d21bb5f3b8e42b7067cb4"}, "conanmanifest.txt": {"sha1": "f49af99a858e1c048847d399259588d423c61f48", "md5": "58987ba1381c31124f81dc301a9183d3"}, "conan_package.tgz": {"sha1": "a73eeb5dcc16a283517b60e3016642e8fdbb5e9e", "md5": "a8cdb1af2e9befe12f9df7b7eb6037b6"}}, "remote": "conan-center", "properties": {}, "recipe_revision": "0", "revision": "0"}, "fdb1122458d3e0706667fbb2af09026ac0bc1787": {"checksums": {"conaninfo.txt": {"sha1": "3883954dfa5ff4ce0418851205fb9bdd59b53456", "md5": "2fb0477a061af49faace79003c7d1368"}, "conanmanifest.txt": {"sha1": "8b9f3ca81140d43ee97d6da23a5f402e4f146c00", "md5": "8af81120462e044e01b7e41cbc1874c1"}, "conan_package.tgz": {"sha1": "57a89b7e5bc6ebf757dc6be52d554ef9dac60862", "md5": "1bb17bd66c774ef73a691b732115d1f7"}}, "remote": "conan-center", "properties": {}, "recipe_revision": "0", "revision": "0"}}, "recipe": {"checksums": {"conanfile.py": {"sha1": "5369c6cd1b2f336bbab85cc67e8c55175b3d4c33", "md5": "f09dd3950610e26f291e3e580fe61397"}, "conanmanifest.txt": {"sha1": "e12aced565837436848c8be860dd8fbecbea44c4", "md5": "0f78740e39fcaa97e0f3419ab133a860"}, "conan_export.tgz": {"sha1": "9eb97082455b5b5934213b8729d9a1cbcaac9e81", "md5": "85f5a51287da4982b2d8f304c44d62d7"}}, "remote": "conan-center", "properties": {}, "revision": "0"}}

.conan/data/fontconfig/2.13.91/_/_/package/fdb1122458d3e0706667fbb2af09026ac0bc1787/bin/etc/fonts/fonts.conf

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

8989
<!-- Font cache directory list -->
9090

91-
<cachedir>/home/runner/work/turtlebrowser/turtlebrowser/release/.conan/data/fontconfig/2.13.91/_/_/package/fdb1122458d3e0706667fbb2af09026ac0bc1787/bin/var/cache/fontconfig</cachedir>
91+
<cachedir>/home/conan/w/cci_PR-3103/.conan/data/fontconfig/2.13.91/_/_/package/fdb1122458d3e0706667fbb2af09026ac0bc1787/bin/var/cache/fontconfig</cachedir>
9292
<cachedir prefix="xdg">fontconfig</cachedir>
9393
<!-- the following element will be removed in the future -->
9494
<cachedir>~/.fontconfig</cachedir>

.conan/data/fontconfig/2.13.91/_/_/package/fdb1122458d3e0706667fbb2af09026ac0bc1787/conaninfo.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
zlib:shared=False
5757

5858
[recipe_hash]
59-
f352b873e84bdb407e9d26f10c4d5ace
59+
06f0e12ebdcd5ca567f49cba6613cd3e
6060

6161
[env]
6262

.conan/data/fontconfig/2.13.91/_/_/package/fdb1122458d3e0706667fbb2af09026ac0bc1787/conanmanifest.txt

Lines changed: 18 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
1601876310
1+
1601915624
22
bin/etc/fonts/conf.d/README: 42d13304ed2e9e5b60b74d6ed29b3729
3-
bin/etc/fonts/fonts.conf: dfcd89cbce54a80c11b4c6c451ba4ba2
4-
bin/fc-cache: 51727f8fa4a835803bb384120a5d0344
5-
bin/fc-cat: d9763299609cc0cfc60e973578040385
6-
bin/fc-conflist: 1df83298e659746f37c48abf861657e4
7-
bin/fc-list: 7f610b6b6ae734a06efb5ba2c39cc01a
8-
bin/fc-match: 439c00b962e270d837eb82a695b0c805
9-
bin/fc-pattern: 14ff565880f0b6a6b0b28edef993da8e
10-
bin/fc-query: 32b0df85be37e9a6b2cb56c00cdcf1b7
11-
bin/fc-scan: 02634157fbc7e387aded80c6e066ca76
12-
bin/fc-validate: 06710eb8259bb3be439f2de375d0f7f2
3+
bin/etc/fonts/fonts.conf: 62bc1d4ffa2627f31847c1ee8d0424bb
4+
bin/fc-cache: dce86a18e89fa532f17d9c1af2bf7f90
5+
bin/fc-cat: ee2732b5beefb860e5a15dc8063a9680
6+
bin/fc-conflist: 6ca4e17150e081d69850cae18cc0cc41
7+
bin/fc-list: 3d282691701fe976d645144388b933d8
8+
bin/fc-match: 28de87d5cba79d984dab7bb7d35b2137
9+
bin/fc-pattern: b8a40b2d249ca481a94fa8635586f9a4
10+
bin/fc-query: bcc2536f1881bcec52b5d613f14d86c8
11+
bin/fc-scan: b93813ddc1e9a8e51c05048002100e25
12+
bin/fc-validate: a2b7416cb33ad0379a4b116c2b2c6386
1313
bin/share/fontconfig/conf.avail/05-reset-dirs-sample.conf: 380152faa0605907246b184b3f9ac18f
1414
bin/share/fontconfig/conf.avail/10-autohint.conf: b64114e5af24e4cdfc5bd5023f280287
1515
bin/share/fontconfig/conf.avail/10-hinting-full.conf: a5bec12a811215bb09bd0e0a58469918
@@ -50,25 +50,15 @@ bin/share/gettext/its/fontconfig.loc: cb277402e08502ee9bec303b1f07bf73
5050
bin/share/locale/zh_CN/LC_MESSAGES/fontconfig-conf.mo: ecccee37228ae38f91dd691dc83e7d35
5151
bin/share/locale/zh_CN/LC_MESSAGES/fontconfig.mo: c756ed623cb4b5009a77a984d206a1c2
5252
bin/share/xml/fontconfig/fonts.dtd: a114037a0341a7c3066d7bdcccde24ac
53-
bin/var/cache/fontconfig/188ac73a183f12857f63bb60a4a6d603-le64.cache-7: 78026f571cd81d883bf35a1cb1a04b08
54-
bin/var/cache/fontconfig/3047814df9a2f067bd2d96a2b9c36e5a-le64.cache-7: 57c346f0e8d69cbbd51cf3dfa231199f
55-
bin/var/cache/fontconfig/3830d5c3ddfd5cd38a049b759396e72e-le64.cache-7: 0302f047d764189b813f76d2807e0906
56-
bin/var/cache/fontconfig/57e423e26b20ab21d0f2f29c145174c3-le64.cache-7: e4b04ee746644edbf402be42952db0f8
57-
bin/var/cache/fontconfig/7ef2298fde41cc6eeb7af42e48b7d293-le64.cache-7: 259edcc1309d04523dffb3c147c70508
58-
bin/var/cache/fontconfig/945677eb7aeaf62f1d50efc3fb3ec7d8-le64.cache-7: a0b0829b9d81acf01c3b7c49cefdf056
59-
bin/var/cache/fontconfig/95530828ff6c81d309f8258d8d02a23e-le64.cache-7: 768a108fce0f8a3809081e07a39e1d24
53+
bin/var/cache/fontconfig/3830d5c3ddfd5cd38a049b759396e72e-le64.cache-7: 961fd73cfabcc75fb2115a8842003acb
54+
bin/var/cache/fontconfig/7ef2298fde41cc6eeb7af42e48b7d293-le64.cache-7: aae6411aa7e9107e9ed24cb228d7bc06
6055
bin/var/cache/fontconfig/CACHEDIR.TAG: edad2301cde055e29b0d30b8d2f4b724
61-
bin/var/cache/fontconfig/bf3b770c553c462765856025a94f1ce6-le64.cache-7: a177468a653a3bc9a07554e3cb8ebff2
62-
bin/var/cache/fontconfig/d3e5c4ee2ceb1fc347f91d4cefc53bc0-le64.cache-7: c86e0d2712f6c8d3029b668765dcc342
63-
bin/var/cache/fontconfig/d589a48862398ed80a3d6066f4f56f4c-le64.cache-7: bef3509f662646722804b169adf9bf3b
64-
bin/var/cache/fontconfig/d82eb4fd963d448e2fcb7d7b793b5df3-le64.cache-7: 729a2523a5b1a8c16ef62e964eb9206a
65-
bin/var/cache/fontconfig/e52a45a1c8c8fe895fc0fc8c4e6999b8-le64.cache-7: e4dc7789acc37a7b14251e98b8d34ca4
66-
bin/var/cache/fontconfig/f1f2465696798768e9653f19e17ccdc8-le64.cache-7: 376cb07f0489f8ba13894adde8e5f4b3
67-
conaninfo.txt: 90f04334622ecb45a5a5a9da0e0d1685
56+
bin/var/cache/fontconfig/d589a48862398ed80a3d6066f4f56f4c-le64.cache-7: e9327c9c102f39ad4758234ea583c7e8
57+
conaninfo.txt: 2fb0477a061af49faace79003c7d1368
6858
include/fontconfig/fcfreetype.h: f25cec0cf31c557b16c569e1901878bd
6959
include/fontconfig/fcprivate.h: 85e725e25bbda2c2f3ee3fdf90708faf
7060
include/fontconfig/fontconfig.h: 994ab0995d46fd85dab3b64808232f3e
71-
lib/libfontconfig.so: 91927ff5b98c4cdc54cea2d68c3a69ef
72-
lib/libfontconfig.so.1: 91927ff5b98c4cdc54cea2d68c3a69ef
73-
lib/libfontconfig.so.1.12.0: 91927ff5b98c4cdc54cea2d68c3a69ef
61+
lib/libfontconfig.so: 54de35c7343a611855f346dd3f19b6a9
62+
lib/libfontconfig.so.1: 54de35c7343a611855f346dd3f19b6a9
63+
lib/libfontconfig.so.1.12.0: 54de35c7343a611855f346dd3f19b6a9
7464
licenses/COPYING: 7a0449e9bc5370402a94c00204beca3d

.conan/data/harfbuzz/2.6.8/_/_/export/conanfile.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ def package(self):
111111
cmake.install()
112112
tools.rmdir(os.path.join(self.package_folder, "lib", "cmake"))
113113

114+
114115
def package_info(self):
115116
self.cpp_info.libs = tools.collect_libs(self)
116117
self.cpp_info.includedirs.append(os.path.join("include", "harfbuzz"))
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
1601315185
1+
1601975521
22
conandata.yml: 8883f24676d49b50402be979112ed726
3-
conanfile.py: defad732943eddac73715ed049df902a
3+
conanfile.py: 20e5c9ac3938e71c48586248a143f200
44
export_source/CMakeLists.txt: 616ac58003e839f0e4cd9e1ec77a5445
55
export_source/patches/source_subfolder.patch: 84dca4b861a151f961c9da896c8c7783
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"recipe": {"properties": {}, "checksums": {"conan_export.tgz": {"md5": "c93cc18d579356bc1b56c78221f2f106", "sha1": "7bc704ced05321757bd69635afbd7bb6418f81d7"}, "conanmanifest.txt": {"md5": "0682757e721211b1b4cde3e3f8b6680b", "sha1": "8fb3cb94a019bce7724ce45e0f701b4d80bfc9ca"}, "conanfile.py": {"md5": "defad732943eddac73715ed049df902a", "sha1": "a632cc2b303f5dd0c1b45dfcf975a5f2cf1a8099"}}, "remote": "conan-center", "revision": "0"}, "packages": {"1931f25761239a33679442e5d740cbdeba63f005": {"properties": {}, "recipe_revision": "0", "checksums": {}, "remote": null, "revision": "89ff0fa68d9ab37c6661b0a8f5a07ecd"}, "367d2423d21776708fa0c2df4c62b175e30551e4": {"properties": {}, "recipe_revision": "0", "checksums": {}, "remote": null, "revision": "5783fe2644c0c0490854c49824ce8763"}}}
1+
{"packages": {"1931f25761239a33679442e5d740cbdeba63f005": {"checksums": {}, "remote": null, "properties": {}, "recipe_revision": "0", "revision": "d94d444fdc97915711f7c2088c3fc089"}, "367d2423d21776708fa0c2df4c62b175e30551e4": {"checksums": {}, "remote": null, "properties": {}, "recipe_revision": "0", "revision": "5783fe2644c0c0490854c49824ce8763"}}, "recipe": {"checksums": {"conanfile.py": {"sha1": "63d9409d82d5297e94aa2ed6265a4c93956a77e8", "md5": "20e5c9ac3938e71c48586248a143f200"}, "conanmanifest.txt": {"sha1": "535dd8eccad56e343919e03dedf3448dde22b31d", "md5": "eb1ab9a37299d2556204ba41224a31c0"}, "conan_export.tgz": {"sha1": "7bc704ced05321757bd69635afbd7bb6418f81d7", "md5": "c93cc18d579356bc1b56c78221f2f106"}}, "remote": "conan-center", "properties": {}, "revision": "0"}}

.conan/data/harfbuzz/2.6.8/_/_/package/1931f25761239a33679442e5d740cbdeba63f005/conaninfo.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
zlib:shared=False
5555

5656
[recipe_hash]
57-
cafe84db536b3706473844b596f865ea
57+
269bb21389548547659c3a9bf82a4fa7
5858

5959
[env]
6060

.conan/data/harfbuzz/2.6.8/_/_/package/1931f25761239a33679442e5d740cbdeba63f005/conanmanifest.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
1601876362
2-
conaninfo.txt: 1d508d836f9027b42c49334baac095ea
1+
1602459398
2+
conaninfo.txt: 519c0206633add5f819474ef4b20c980
33
include/harfbuzz/hb-aat-layout.h: 58ef5674d8f3a95e64de98a54d3ed6aa
44
include/harfbuzz/hb-aat.h: 24c72c8291790e6e96b1e5757645f2af
55
include/harfbuzz/hb-blob.h: 3d543765c9e8f9dc2c77948d72a4c838

.conan/data/libiconv/1.16/_/_/export/conanfile.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def _is_msvc(self):
3232
def build_requirements(self):
3333
if tools.os_info.is_windows and "CONAN_BASH_PATH" not in os.environ \
3434
and tools.os_info.detect_windows_subsystem() != "msys2":
35-
self.build_requires("msys2/20190524")
35+
self.build_requires("msys2/20200517")
3636

3737
def config_options(self):
3838
if self.settings.os == "Windows":
@@ -137,12 +137,15 @@ def package(self):
137137
os.unlink(os.path.join(self.package_folder, "lib", "libiconv.la"))
138138
tools.rmdir(os.path.join(self.package_folder, "share"))
139139

140+
if self._is_msvc and self.options.shared:
141+
for import_lib in ["iconv", "charset"]:
142+
os.rename(os.path.join(self.package_folder, "lib", "{}.dll.lib".format(import_lib)),
143+
os.path.join(self.package_folder, "lib", "{}.lib".format(import_lib)))
144+
140145
def package_info(self):
141146
self.cpp_info.names["cmake_find_package"] = "Iconv"
142147
self.cpp_info.names["cmake_find_package_multi"] = "Iconv"
143148
self.cpp_info.libs = ["iconv", "charset"]
144-
if self._is_msvc and self.options.shared:
145-
self.cpp_info.libs = [lib + ".dll.lib" for lib in self.cpp_info.libs]
146149

147150
binpath = os.path.join(self.package_folder, "bin")
148151
self.output.info("Appending PATH environment var: {}".format(binpath))
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
1594894901
1+
1601772404
22
conandata.yml: 39702b1d89bb36c3041eb7d5d648c40a
3-
conanfile.py: a0a8debb68a1d7133ebba3e6cd3ef00d
3+
conanfile.py: abe17129bf2765629e5e583cd786409a
44
export_source/patches/0001-libcharset-fix-linkage.patch: 4a4c1063ae9a6870937a0df8625322ab
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": "b77853be3e0156960463bf84130cf284d744708b", "md5": "4aff668e76007db4d7556f6917d66551"}, "conanmanifest.txt": {"sha1": "9f602f05a73958a590328404373395a7dc71bad0", "md5": "b808e1bbea66298c7713ad99d36face5"}, "conaninfo.txt": {"sha1": "b914cea44ba40e7fa64000e62a7c0632fc06f22a", "md5": "9ef74d40a7ad238ead255bd2aab9aa06"}}}}, "recipe": {"remote": "conan-center", "properties": {}, "revision": "0", "checksums": {"conan_export.tgz": {"sha1": "4d5f3b8f525fa175052c11b0f9f40f6f31a4e8fe", "md5": "0fe1bcfd9ab5160a026c1d7d023c39dd"}, "conanfile.py": {"sha1": "7c49aa3b4b74e7701863c5e4be70978722e177e5", "md5": "a0a8debb68a1d7133ebba3e6cd3ef00d"}, "conanmanifest.txt": {"sha1": "3ee3dd53d564ee6a2f3b5600edb1add5f9a60774", "md5": "87811b038c75a79a5efe1cd879b406cf"}}}}
1+
{"packages": {"76f87539fc90ff313e0b3182641a9bb558a717d2": {"checksums": {"conaninfo.txt": {"sha1": "1290560b2f73832c42fdd306ea44e3232740b072", "md5": "76bab07b1806b54654b47a031b8c9d0e"}, "conanmanifest.txt": {"sha1": "0c2370db743806c9f8ae7649119059d02e12cc37", "md5": "94d095773801f82259b18c351ed2a3dd"}, "conan_package.tgz": {"sha1": "c941379ff1d019bdc4787fe9544daf7aa2fe6581", "md5": "580316d4f46271f4e50d6f91a86437d6"}}, "remote": "conan-center", "properties": {}, "recipe_revision": "0", "revision": "0"}}, "recipe": {"checksums": {"conanfile.py": {"sha1": "9698d63e2353220d7b2dae22bf95f5fe5809a6de", "md5": "abe17129bf2765629e5e583cd786409a"}, "conanmanifest.txt": {"sha1": "f6c8d0d7f522303716fd1d4f17a3d470094d8bcd", "md5": "fa15ba9fb12a2e0c6c2ac29885ad1103"}, "conan_export.tgz": {"sha1": "4d5f3b8f525fa175052c11b0f9f40f6f31a4e8fe", "md5": "0fe1bcfd9ab5160a026c1d7d023c39dd"}}, "remote": "conan-center", "properties": {}, "revision": "0"}}

.conan/data/libiconv/1.16/_/_/package/76f87539fc90ff313e0b3182641a9bb558a717d2/conaninfo.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
shared=False
2828

2929
[recipe_hash]
30-
581a80fc52ba4773287e0c826fd3d357
30+
85ac258c97a3774c645f0c32a29e21bd
3131

3232
[env]
3333

.conan/data/libiconv/1.16/_/_/package/76f87539fc90ff313e0b3182641a9bb558a717d2/conanmanifest.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
1594895377
2-
bin/iconv: 95aba53e556635aee0cbb3ec4d8e91e0
3-
conaninfo.txt: 9ef74d40a7ad238ead255bd2aab9aa06
1+
1601912125
2+
bin/iconv: e8eaf22692dca1851c32291026d75c44
3+
conaninfo.txt: 76bab07b1806b54654b47a031b8c9d0e
44
include/iconv.h: 9f911875c0e8b2bbee404630c65d590d
55
include/libcharset.h: 1cd52fc7235fa3238604f89845296d0b
66
include/localcharset.h: 818976f5ab8b223d94d2add2eb8bc807

.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-
"name": "conan-center",
54
"verify_ssl": true,
5+
"name": "conan-center",
66
"url": "https://conan.bintray.com"
77
},
88
{
9-
"name": "bincrafters",
109
"verify_ssl": true,
10+
"name": "bincrafters",
1111
"url": "https://api.bintray.com/conan/bincrafters/public-conan"
1212
}
1313
]

.conan/settings.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ os:
2121
version: ["5.0", "6.0", "7.0", "8.0"]
2222
Linux:
2323
Macos:
24-
version: [None, "10.6", "10.7", "10.8", "10.9", "10.10", "10.11", "10.12", "10.13", "10.14", "10.15"]
24+
version: [None, "10.6", "10.7", "10.8", "10.9", "10.10", "10.11", "10.12", "10.13", "10.14", "10.15", "11.0"]
2525
Android:
2626
api_level: ANY
2727
iOS:

.conan/version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.29.2
1+
1.30.1

0 commit comments

Comments
 (0)