Skip to content

Commit dafd9fc

Browse files
author
turtlebrowser-bot
committed
schedule : Commit by patricia-gallardo with SHA 2a1b8d3d113866ba68e42a8702dc00206bddba2a on refs/heads/master
1 parent 9508a5c commit dafd9fc

File tree

16 files changed

+35
-30
lines changed

16 files changed

+35
-30
lines changed

.conan/data/freetype/2.10.4/_/_/export/conanfile.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class FreetypeConan(ConanFile):
1414
url = "https://github.com/conan-io/conan-center-index"
1515
homepage = "https://www.freetype.org"
1616
license = "FTL"
17-
topics = ("conan", "freetype", "fonts")
17+
topics = ("freetype", "fonts")
1818

1919
settings = "os", "arch", "compiler", "build_type"
2020
options = {
@@ -31,7 +31,7 @@ class FreetypeConan(ConanFile):
3131
"with_png": True,
3232
"with_zlib": True,
3333
"with_bzip2": True,
34-
"with_brotli": True
34+
"with_brotli": True,
3535
}
3636

3737
exports_sources = "CMakeLists.txt"
@@ -80,8 +80,9 @@ def _patch_sources(self):
8080
# Do not accidentally enable dependencies we have disabled
8181
cmakelists = os.path.join(self._source_subfolder, "CMakeLists.txt")
8282
find_harfbuzz = "find_package(HarfBuzz {})".format("1.3.0" if tools.Version(self.version) < "2.10.2" else "${HARFBUZZ_MIN_VERSION}")
83+
if_harfbuzz_found = "if ({})".format("HARFBUZZ_FOUND" if tools.Version(self.version) < "2.11.0" else "HarfBuzz_FOUND")
8384
tools.replace_in_file(cmakelists, find_harfbuzz, "")
84-
tools.replace_in_file(cmakelists, "if (HARFBUZZ_FOUND)", "if(0)")
85+
tools.replace_in_file(cmakelists, if_harfbuzz_found, "if(0)")
8586
if not self.options.with_png:
8687
tools.replace_in_file(cmakelists, "find_package(PNG)", "")
8788
tools.replace_in_file(cmakelists, "if (PNG_FOUND)", "if(0)")
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
1624607740
1+
1632052422
22
conandata.yml: 81a1c76362fe5e71bcc978c0e49ba7a9
3-
conanfile.py: 415be9c3b70defdb33d28ad514b6bcd8
3+
conanfile.py: 7ac40840159da4160bb2bf7eb22d6ba1
44
export_source/CMakeLists.txt: ac606e6da954a6f18d4b49db940ee1a1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"recipe": {"revision": "0", "remote": "conancenter", "properties": {}, "checksums": {"conanmanifest.txt": {"md5": "cd69020ca66faac54136a12b68df3c6e", "sha1": "f01a4ca25ac879a6a2fbf34a671661af6c58698a"}, "conanfile.py": {"md5": "415be9c3b70defdb33d28ad514b6bcd8", "sha1": "bd41a6e506a767f319c630892a3aaaa764515f18"}, "conan_export.tgz": {"md5": "eea3d1a2f04ae2da2996d9e0a48d22ad", "sha1": "9f35a22d7cb89a793576e600631de9c510f7aef7"}}}, "packages": {"f4924bd3b94e155cbf790d74ba3a3c29ccc81e89": {"revision": "0", "recipe_revision": "0", "remote": "conancenter", "properties": {}, "checksums": {"conanmanifest.txt": {"md5": "863fd0af78e13e5f920b5b07160ad39f", "sha1": "9fcb258ce5436a286bf2d7115c5a63dce716c850"}, "conaninfo.txt": {"md5": "4dced51dc325a1920c4e11cef54b91f3", "sha1": "0a48f7851b0f6fc351ae24d0319ccff779f8636b"}, "conan_package.tgz": {"md5": "cb1a7f4bf5702e81b82cfe4694dd57cf", "sha1": "121995ca1cb1a34deaf06772d6ea79d81a8b7d9b"}}}}}
1+
{"recipe": {"revision": "0", "remote": "conancenter", "properties": {}, "checksums": {"conanmanifest.txt": {"md5": "2fce0cc03a7a8520a000d249bccda902", "sha1": "61483c39864e093eb4e034afb4537541c93f5ca3"}, "conanfile.py": {"md5": "7ac40840159da4160bb2bf7eb22d6ba1", "sha1": "14ec24563aef573c86662642398390e2d1cc7265"}, "conan_export.tgz": {"md5": "eea3d1a2f04ae2da2996d9e0a48d22ad", "sha1": "9f35a22d7cb89a793576e600631de9c510f7aef7"}}}, "packages": {"f4924bd3b94e155cbf790d74ba3a3c29ccc81e89": {"revision": "0", "recipe_revision": "0", "remote": "conancenter", "properties": {}, "checksums": {"conanmanifest.txt": {"md5": "59508f74037e5985f24af2a6570994f4", "sha1": "1d474551dd33ddae1f6276f1f34e52a3222cfebb"}, "conaninfo.txt": {"md5": "85e0ea576e675889c5446bfffa5664d3", "sha1": "1e41472355dda39464322c09d3de987fb92fd5ae"}, "conan_package.tgz": {"md5": "07f8e0024d539a2786d8674915b64e4d", "sha1": "fc91b338f1f1cbe0e5d1449a49ef2e5eb38df201"}}}}}

.conan/data/freetype/2.10.4/_/_/package/f4924bd3b94e155cbf790d74ba3a3c29ccc81e89/conaninfo.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
[full_requires]
3030
brotli/1.0.9:647afeb69d3b0a2d3d316e80b24d38c714cc6900
3131
bzip2/1.0.8:75fe66fbfe61230e9fcbb361f13b6b3baa483e0a
32-
libpng/1.6.37:88955cec2844f731470e07bd44ce5a3a24ec88b7
32+
libpng/1.6.37:ac5d0a30f12dfc11387a002e4010b156f3b7eda5
3333
zlib/1.2.11:647afeb69d3b0a2d3d316e80b24d38c714cc6900
3434

3535
[full_options]
@@ -44,15 +44,16 @@
4444
bzip2:build_executable=True
4545
bzip2:fPIC=True
4646
bzip2:shared=False
47-
libpng:api_prefix=None
47+
libpng:api_prefix=
4848
libpng:fPIC=True
4949
libpng:shared=False
50+
libpng:sse=True
5051
zlib:fPIC=True
5152
zlib:minizip=deprecated
5253
zlib:shared=False
5354

5455
[recipe_hash]
55-
4b72f982daf39c04feee2fb520b6f4ff
56+
5f39ce560c4e2226babf571e8f4f6f32
5657

5758
[env]
5859

.conan/data/freetype/2.10.4/_/_/package/f4924bd3b94e155cbf790d74ba3a3c29ccc81e89/conanmanifest.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
1624607902
1+
1632053299
22
bin/freetype-config: 5db4041ebd28c0840a4139385ba897de
3-
conaninfo.txt: 4dced51dc325a1920c4e11cef54b91f3
3+
conaninfo.txt: 85e0ea576e675889c5446bfffa5664d3
44
include/freetype2/freetype/config/ftconfig.h: 28acbc49e36c82ae9ea2b76e453a5e4b
55
include/freetype2/freetype/config/ftheader.h: 8e72e64894219c4ec3fca41f9b9bed55
66
include/freetype2/freetype/config/ftmodule.h: e8dfd5b101eeec8ee3902fdf750f3999
@@ -56,7 +56,7 @@ include/freetype2/freetype/tttags.h: e6575cc01c0d7fb4fd7104bd58976d87
5656
include/freetype2/ft2build.h: bd3f0a22427fb3084a1c1433e59ac33e
5757
lib/cmake/conan-official-freetype-targets.cmake: 427f38bae7f4bbcb0ad89f18dcc62edd
5858
lib/cmake/conan-official-freetype-variables.cmake: c62479687b38c38c2665e2475e299546
59-
lib/libfreetype.a: b5c7ca9f42678be2ce86c2b183133770
59+
lib/libfreetype.a: 1cf911a7720365d2104bed1c522a8f95
6060
licenses/FTL.TXT: 9f37b4e6afa3fef9dba8932b16bd3f97
6161
licenses/GPLv2.TXT: 8ef380476f642c20ebf40fecb0add2ec
6262
licenses/LICENSE.TXT: 4af6221506f202774ef74f64932878a1

.conan/data/libpq/11.5/_/_/export/conanfile.py

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
class LibpqConan(ConanFile):
88
name = "libpq"
99
description = "The library used by all the standard PostgreSQL tools."
10-
topics = ("conan", "libpq", "postgresql", "database", "db")
10+
topics = "libpq", "postgresql", "database", "db"
1111
url = "https://github.com/conan-io/conan-center-index"
1212
homepage = "https://www.postgresql.org/docs/current/static/libpq.html"
1313
license = "PostgreSQL"
@@ -29,12 +29,16 @@ class LibpqConan(ConanFile):
2929
}
3030
_autotools = None
3131

32+
@property
33+
def _settings_build(self):
34+
return getattr(self, "settings_build", self.settings)
35+
3236
def build_requirements(self):
3337
if self.settings.compiler == "Visual Studio":
3438
self.build_requires("strawberryperl/5.30.0.1")
35-
elif tools.os_info.is_windows:
36-
if "CONAN_BASH_PATH" not in os.environ and tools.os_info.detect_windows_subsystem() != 'msys2':
37-
self.build_requires("msys2/20190524")
39+
elif self._settings_build.os == "Windows" and not tools.get_env("CONAN_BASH_PATH"):
40+
self.build_requires("msys2/cci.latest")
41+
3842
@property
3943
def _source_subfolder(self):
4044
return "source_subfolder"
@@ -71,19 +75,18 @@ def requirements(self):
7175
self.requires("openssl/1.1.1h")
7276

7377
def source(self):
74-
tools.get(**self.conan_data["sources"][self.version])
75-
extracted_dir = "postgresql-" + self.version
76-
os.rename(extracted_dir, self._source_subfolder)
78+
tools.get(**self.conan_data["sources"][self.version], strip_root=True,
79+
destination=self._source_subfolder)
7780

7881
def _configure_autotools(self):
7982
if not self._autotools:
8083
self._autotools = AutoToolsBuildEnvironment(self, win_bash=tools.os_info.is_windows)
8184
args = ['--without-readline']
8285
args.append('--without-zlib')
8386
args.append('--with-openssl' if self.options.with_openssl else '--without-openssl')
84-
if tools.cross_building(self.settings) and not self.options.with_openssl:
87+
if tools.cross_building(self) and not self.options.with_openssl:
8588
args.append("--disable-strong-random")
86-
if tools.cross_building(self.settings, skip_x64_x86=True):
89+
if tools.cross_building(self, skip_x64_x86=True):
8790
args.append("USE_DEV_URANDOM=1")
8891
if self.settings.os != "Windows" and self.options.disable_rpath:
8992
args.append('--disable-rpath')
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
1627436070
1+
1631874870
22
conandata.yml: af996500917483bd000d20833c0a380d
3-
conanfile.py: 2647b0b6c319c1fe728b49fc2efdad51
3+
conanfile.py: e581d880f1250b0c63aa124051d4b5b9
44
export_source/patches/13.3/001-Remove-thread-safety-check.patch: 9d546d1683a59e4e2dd70ee591390317
55
export_source/patches/9.6.19/001-Use-return-instead-of-exit-in-configure.patch: 26e7815a9f6c04aa47c8021832afa202
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"recipe": {"revision": "0", "remote": "conancenter", "properties": {}, "checksums": {"conanmanifest.txt": {"md5": "91d4bf6ef9a47b77d429861a75065df6", "sha1": "f2478f924fc44b67e28aab7be0e7365aa61fc006"}, "conanfile.py": {"md5": "2647b0b6c319c1fe728b49fc2efdad51", "sha1": "13e9889929a90b549a78b40ed1ba888221142658"}, "conan_export.tgz": {"md5": "ad440ad4a57cd4c9ec73e160e1b59c14", "sha1": "810bb649332ccf26970c1973b22f4013bb1706da"}}}, "packages": {"647afeb69d3b0a2d3d316e80b24d38c714cc6900": {"revision": "0", "recipe_revision": "0", "remote": "conancenter", "properties": {}, "checksums": {"conanmanifest.txt": {"md5": "7b6df116660b2a09beb94610d6a92327", "sha1": "bcebe36e6140d982c355b6dbb1e122483d42329b"}, "conaninfo.txt": {"md5": "b445f7ec064bad69e341ecff7584dcae", "sha1": "86849206deff5fda0d23a228790d835f54a643f2"}, "conan_package.tgz": {"md5": "8f212b32b606fc60797b64d8e8f37a06", "sha1": "4e785db9c3b99fa5fcc265f19ba3397600ec0f87"}}}}}
1+
{"recipe": {"revision": "0", "remote": "conancenter", "properties": {}, "checksums": {"conanmanifest.txt": {"md5": "1f0f9213ac941a6c3873190580c23672", "sha1": "7454167d81af3a53d6b05fd34a6627cb380b2ec8"}, "conanfile.py": {"md5": "e581d880f1250b0c63aa124051d4b5b9", "sha1": "a2467533e1932f6f5765b1951f0ac859d21fdc67"}, "conan_export.tgz": {"md5": "ad440ad4a57cd4c9ec73e160e1b59c14", "sha1": "810bb649332ccf26970c1973b22f4013bb1706da"}}}, "packages": {"647afeb69d3b0a2d3d316e80b24d38c714cc6900": {"revision": "0", "recipe_revision": "0", "remote": "conancenter", "properties": {}, "checksums": {"conanmanifest.txt": {"md5": "bdebf3e46afcac2894781b2f108b1046", "sha1": "7f0f016759d6658d48f82ac6ec2872c80533887f"}, "conaninfo.txt": {"md5": "bff15c2a26de6e10ca02244423a1e98b", "sha1": "352522a7e9fc5f904b71f0c25b1941a3dbe280da"}, "conan_package.tgz": {"md5": "dfc73a0df99a5e9225bee599e10e3cf3", "sha1": "bd35f55b27ece3847b0143685a86c490d4951a04"}}}}}

.conan/data/libpq/11.5/_/_/package/647afeb69d3b0a2d3d316e80b24d38c714cc6900/conaninfo.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
with_openssl=False
3232

3333
[recipe_hash]
34-
6abb08718f35b6ebe1ccf587760ca301
34+
13ea5cff6ae0e276b4b5b304e6b65e40
3535

3636
[env]
3737

.conan/data/libpq/11.5/_/_/package/647afeb69d3b0a2d3d316e80b24d38c714cc6900/conanmanifest.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
1627436174
2-
bin/pg_config: 171cc8f74afdf060f04ab166fb42cb56
3-
conaninfo.txt: b445f7ec064bad69e341ecff7584dcae
1+
1631875731
2+
bin/pg_config: b7a8b10ab3238936caedfd9b170da075
3+
conaninfo.txt: bff15c2a26de6e10ca02244423a1e98b
44
include/catalog/binary_upgrade.h: a09d9ecdda4330016d12a09c8ae2c5d0
55
include/catalog/catalog.h: 88990d2a6ecedc0115b6104639cb8e64
66
include/catalog/catversion.h: 35708fe33e0f5e533664f3e5c921671f
@@ -157,6 +157,6 @@ include/postgresql/internal/libpq/pqcomm.h: eb6be60350a0589a73a212ec93652217
157157
include/postgresql/internal/port.h: 3130b84adae42a95f71fc047989660a9
158158
include/postgresql/internal/postgres_fe.h: a9cc6a1d638de1aa64d0ea858700b82e
159159
include/postgresql/internal/pqexpbuffer.h: a0f515b03620842a4f3806e577ae8910
160-
lib/libpgcommon.a: c2d9a7ccfe5e940adc2e9af978b6f37c
161-
lib/libpq.a: b3d4a6b786b6708a36e12887620d3b7e
160+
lib/libpgcommon.a: 094aa126b7a1de4eb2d858c6f70befc1
161+
lib/libpq.a: 405ce36382638a85cc75cd6849585aef
162162
licenses/COPYRIGHT: 87da2b84884860b71f5f24ab37e7da78

0 commit comments

Comments
 (0)