Skip to content

Commit 984286c

Browse files
Update all non major dependencies
1 parent 2b4d1ec commit 984286c

File tree

23 files changed

+130
-90
lines changed

23 files changed

+130
-90
lines changed

recipes/cairo/1.18.0/conanfile.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,21 +94,21 @@ def layout(self):
9494
basic_layout(self, src_folder="src")
9595

9696
def requirements(self):
97-
self.requires("pixman/0.43.4")
97+
self.requires("pixman/0.46.2")
9898
if self.options.with_zlib and self.options.with_png:
99-
self.requires("expat/[>=2.6.2 <3]")
99+
self.requires("expat/[>=2.7.3 <3]")
100100
if self.options.with_lzo:
101101
self.requires("lzo/2.10")
102102
if self.options.with_zlib:
103-
self.requires("zlib/[>=1.2.11 <2]")
103+
self.requires("zlib/[>=1.3.1 <2]")
104104
if self.options.with_freetype:
105-
self.requires("freetype/2.13.2", transitive_headers=True, transitive_libs=True)
105+
self.requires("freetype/2.14.1", transitive_headers=True, transitive_libs=True)
106106
if self.options.with_fontconfig:
107-
self.requires("fontconfig/2.15.0-odr", transitive_headers=True, transitive_libs=True)
107+
self.requires("fontconfig/2.15.0", transitive_headers=True, transitive_libs=True)
108108
if self.options.with_png:
109-
self.requires("libpng/[>=1.6 <2]")
109+
self.requires("libpng/[>=1.6.50 <2]")
110110
if self.options.with_glib:
111-
self.requires("glib/2.81.0-odr")
111+
self.requires("glib/2.85.3")
112112
if self.settings.os in ["Linux", "FreeBSD"]:
113113
if self.options.with_xlib or self.options.with_xlib_xrender or self.options.with_xcb:
114114
self.requires("xorg/system", transitive_headers=True, transitive_libs=True)
@@ -136,9 +136,9 @@ def validate(self):
136136
)
137137

138138
def build_requirements(self):
139-
self.tool_requires("meson/1.4.0")
139+
self.tool_requires("meson/1.9.1")
140140
if not self.conf.get("tools.gnu:pkg_config", check_type=str):
141-
self.tool_requires("pkgconf/2.1.0")
141+
self.tool_requires("pkgconf/2.5.1")
142142

143143
def source(self):
144144
get(self, **self.conan_data["sources"][self.version], strip_root=True)

recipes/fontconfig/2.15.0/conan.lock

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@
44
"zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1733936244.862",
55
"util-linux-libuuid/2.39.2#637bd312b6310c18190469fae4e1d480%1729761467.688",
66
"libpng/1.6.50#c96b3b9fa67d44545d6583bb0c348904%1751616189.701",
7+
"freetype/2.14.1#40f1e4af5db7d8155f9ecabd09973280%1762374429.281",
78
"freetype/2.13.2#18656f7a6d52256a930f1cbd79f1509d%1756828316.696",
89
"expat/2.7.3#f529802a90f0758a01f498a18f8c657b%1759399780.465",
910
"bzip2/1.0.8#00b4a4658791c1f06914e087f0e792f5%1744702067.178",
1011
"brotli/1.1.0#406ce8f1c997f4ef7852fa01ff85ef9f%1743158659.041"
1112
],
1213
"build_requires": [
14+
"pkgconf/2.5.1#93c2051284cba1279494a43a4fcfeae2%1757684701.089",
1315
"pkgconf/2.2.0#4ac315b50ef734072b00ff3aacbf52bf%1755505628.021",
1416
"pkgconf/2.1.0#21f96520faf7660b99f872e956d2ac13%1755505630.82",
1517
"ninja/1.13.1#294f8721dbcde145674f7ba44994700e%1753400352.374",
@@ -20,4 +22,4 @@
2022
],
2123
"python_requires": [],
2224
"config_requires": []
23-
}
25+
}

recipes/fontconfig/2.15.0/conanfile.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,16 @@ def layout(self):
4242
basic_layout(self, src_folder="src")
4343

4444
def requirements(self):
45-
self.requires("freetype/2.13.2")
46-
self.requires("expat/[>=2.6.2 <3]")
45+
self.requires("freetype/2.14.1")
46+
self.requires("expat/[>=2.7.3 <3]")
4747
if self.settings.os == "Linux":
4848
self.requires("util-linux-libuuid/2.39.2")
4949

5050
def build_requirements(self):
5151
self.tool_requires("gperf/3.1")
52-
self.tool_requires("meson/1.4.0")
52+
self.tool_requires("meson/1.9.1")
5353
if not self.conf.get("tools.gnu:pkg_config", default=False, check_type=str):
54-
self.tool_requires("pkgconf/2.1.0")
54+
self.tool_requires("pkgconf/2.5.1")
5555

5656
def source(self):
5757
get(self, **self.conan_data["sources"][self.version], strip_root=True)

recipes/fontforge/20240423/conan.lock

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,28 @@
11
{
22
"version": "0.5",
33
"requires": [
4+
"zstd/1.5.7#b68ca8e3de04ba5957761751d1d661f4%1760955092.069",
45
"zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1733936244.862",
6+
"xz_utils/5.8.1#536e4c68ef30b7308b28a1c50e663c31%1762252965.869",
57
"pcre2/10.42#9a35f5089feb875ec61a38eca364ce77%1743524593.693",
68
"openlibm/0.8.3#61d8454cf655e95e0d3d3359bde58ac7%1761496872.7485492",
9+
"libxml2/2.15.0#8d852c332225c0aa07a723fba8bcd0f5%1759824466.773",
710
"libxml2/2.12.7#1c4d20b7ab8b618ce699733723ba4df6%1721306327.767",
811
"libselinux/3.6#5a78ff6ae5034eeaac8da723361a8ce4%1717655459.344",
912
"libpng/1.6.50#c96b3b9fa67d44545d6583bb0c348904%1751616189.701",
13+
"libmount/2.39.2#64850679fa9d5ead878e5076b0cab2a8%1705591482.625",
1014
"libjpeg/9f#8edfe2699565c80c825d0256002504ff%1723665907.087",
1115
"libiconv/1.17#1e65319e945f2d31941a9d28cc13c058%1751451666.321",
1216
"libgettext/0.22#766c603ca03bfbcad907369de5368c29%1755528994.227",
1317
"libffi/3.4.8#a045c00fb26779635e3bed40e80c5254%1753360042.396",
1418
"libelf/0.8.13#ba59bbc89757ed62cfd7690a73bf81be%1741781951.327",
19+
"glib/2.85.3#2fef4f1c3f92c9eaf077ccd54b9404a3%1755678176.882",
1520
"glib/2.81.0-odr#ddf445d5af468f972978af93c44d26e1%1761496871.9808278",
1621
"giflib/5.2.2#3923fc0f7ffec2f0bdbdee9b548f9248%1731663927.701",
1722
"getopt-for-visual-studio/20200201#32ee360e2552fe65ad8bec52edcd64fd%1678877536.186",
23+
"freetype/2.14.1#40f1e4af5db7d8155f9ecabd09973280%1762374429.281",
1824
"freetype/2.13.2#18656f7a6d52256a930f1cbd79f1509d%1756828316.696",
25+
"elfutils/0.190#8e8c47bd9b2578e29a0341b09b977be8%1739188192.515",
1926
"bzip2/1.0.8#00b4a4658791c1f06914e087f0e792f5%1744702067.178",
2027
"brotli/1.1.0#406ce8f1c997f4ef7852fa01ff85ef9f%1743158659.041"
2128
],
@@ -31,9 +38,11 @@
3138
"gnu-config/cci.20210814#69fde734e1a46fd1655b4af46ab40945%1746203214.947",
3239
"gettext/0.22.5#4705a1582f4a611eadb15d0417427993%1755528989.046",
3340
"flex/2.6.4#e5cd857e69595b17f7599ba56be7dad2%1761206488.085",
41+
"cmake/4.1.2#6f844b9ec4e0e29d4f1232f9c5039901%1761647877.842",
42+
"bison/3.8.2#c3490cbe0078b6fd3eb4cf5ed64144dc%1755688988.644",
3443
"automake/1.16.5#b91b7c384c3deaa9d535be02da14d04f%1755524470.56",
3544
"autoconf/2.71#51077f068e61700d65bb05541ea1e4b0%1731054366.86"
3645
],
3746
"python_requires": [],
3847
"config_requires": []
39-
}
48+
}

recipes/fontforge/20240423/conanfile.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,23 @@ class FontForgeConan(ConanFile):
3838
}
3939

4040
def requirements(self):
41-
self.requires("freetype/2.13.2")
41+
self.requires("freetype/2.14.1")
4242

43-
self.requires("libxml2/2.12.7")
43+
self.requires("libxml2/2.15.0")
4444
self.requires("giflib/5.2.2")
4545
self.requires("libjpeg/9f")
46-
self.requires("libpng/[>=1.6 <2]")
46+
self.requires("libpng/[>=1.6.50 <2]")
4747
self.requires("libgettext/0.22", transitive_headers=True, transitive_libs=True)
4848

4949
if self.options.with_tiff:
50-
self.requires("libtiff/4.6.0")
50+
self.requires("libtiff/4.7.1")
5151

5252
# jbig and libdeflate are required by libtiff
5353
# Conan auto finds them, but linker doesn't, unless they're added here manually
5454
# self.requires("jbig/20160605")
5555
# self.requires("libdeflate/1.20")
5656

57-
self.requires("glib/2.81.0-odr")
57+
self.requires("glib/2.85.3")
5858

5959
if self.settings.os == "Android" and int(self.settings.os.get_safe("api_level")) < 23:
6060
self.requires("openlibm/0.8.3")

recipes/glib/2.81.0/conanfile.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,26 +70,26 @@ def layout(self):
7070
basic_layout(self, src_folder="src")
7171

7272
def requirements(self):
73-
self.requires("zlib/[>=1.2.11 <2]")
73+
self.requires("zlib/[>=1.3.1 <2]")
7474
self.requires("libffi/3.4.8")
75-
self.requires("pcre2/10.42")
75+
self.requires("pcre2/10.44")
7676
if self.options.get_safe("with_elf"):
7777
self.requires("libelf/0.8.13")
7878
if self.options.get_safe("with_mount"):
79-
self.requires("libmount/2.39")
79+
self.requires("libmount/2.40.2")
8080
if self.options.get_safe("with_selinux"):
8181
self.requires("libselinux/3.6")
8282
if self.settings.os != "Linux":
8383
# for Linux, gettext is provided by libc
8484
self.requires("libgettext/0.22", transitive_headers=True, transitive_libs=True)
8585

8686
if is_apple_os(self):
87-
self.requires("libiconv/1.17")
87+
self.requires("libiconv/1.18")
8888

8989
def build_requirements(self):
90-
self.tool_requires("meson/[>=1.2.3 <2]")
90+
self.tool_requires("meson/[>=1.9.1 <2]")
9191
if not self.conf.get("tools.gnu:pkg_config", check_type=str):
92-
self.tool_requires("pkgconf/2.0.3")
92+
self.tool_requires("pkgconf/2.5.1")
9393

9494
def source(self):
9595
get(self, **self.conan_data["sources"][self.version], strip_root=True)

recipes/libgsf/1.14.52/conan.lock

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,25 @@
11
{
22
"version": "0.5",
33
"requires": [
4+
"zstd/1.5.7#b68ca8e3de04ba5957761751d1d661f4%1760955092.069",
45
"zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1733936244.862",
6+
"xz_utils/5.8.1#536e4c68ef30b7308b28a1c50e663c31%1762252965.869",
57
"pcre2/10.42#9a35f5089feb875ec61a38eca364ce77%1743524593.693",
8+
"libxml2/2.15.0#8d852c332225c0aa07a723fba8bcd0f5%1759824466.773",
69
"libxml2/2.12.7#1c4d20b7ab8b618ce699733723ba4df6%1721306327.767",
710
"libselinux/3.6#5a78ff6ae5034eeaac8da723361a8ce4%1717655459.344",
11+
"libmount/2.39.2#64850679fa9d5ead878e5076b0cab2a8%1705591482.625",
812
"libiconv/1.17#1e65319e945f2d31941a9d28cc13c058%1751451666.321",
913
"libgettext/0.22#766c603ca03bfbcad907369de5368c29%1755528994.227",
1014
"libffi/3.4.8#a045c00fb26779635e3bed40e80c5254%1753360042.396",
1115
"libelf/0.8.13#ba59bbc89757ed62cfd7690a73bf81be%1741781951.327",
16+
"glib/2.85.3#2fef4f1c3f92c9eaf077ccd54b9404a3%1755678176.882",
1217
"glib/2.81.0-odr#ddf445d5af468f972978af93c44d26e1%1761496871.9808278",
18+
"elfutils/0.190#8e8c47bd9b2578e29a0341b09b977be8%1739188192.515",
1319
"bzip2/1.0.8#00b4a4658791c1f06914e087f0e792f5%1744702067.178"
1420
],
1521
"build_requires": [
22+
"pkgconf/2.5.1#93c2051284cba1279494a43a4fcfeae2%1757684701.089",
1623
"pkgconf/2.2.0#4ac315b50ef734072b00ff3aacbf52bf%1755505628.021",
1724
"pkgconf/2.1.0#21f96520faf7660b99f872e956d2ac13%1755505630.82",
1825
"pkgconf/2.0.3#c7ba7fd1d7d22534ee070ae60ed79604%1755505633.107",
@@ -26,9 +33,11 @@
2633
"gnu-config/cci.20210814#69fde734e1a46fd1655b4af46ab40945%1746203214.947",
2734
"gettext/0.22.5#4705a1582f4a611eadb15d0417427993%1755528989.046",
2835
"flex/2.6.4#e5cd857e69595b17f7599ba56be7dad2%1761206488.085",
36+
"cmake/4.1.2#6f844b9ec4e0e29d4f1232f9c5039901%1761647877.842",
37+
"bison/3.8.2#c3490cbe0078b6fd3eb4cf5ed64144dc%1755688988.644",
2938
"automake/1.16.5#b91b7c384c3deaa9d535be02da14d04f%1755524470.56",
3039
"autoconf/2.71#51077f068e61700d65bb05541ea1e4b0%1731054366.86"
3140
],
3241
"python_requires": [],
3342
"config_requires": []
34-
}
43+
}

recipes/libgsf/1.14.52/conanfile.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ def configure(self):
4545
# basic_layout(self, src_folder="src")
4646

4747
def requirements(self):
48-
self.requires("glib/2.81.0-odr", transitive_headers=True)
48+
self.requires("glib/2.85.3", transitive_headers=True)
4949
self.requires("zlib/1.3.1")
50-
self.requires("libxml2/2.12.7", transitive_headers=True)
50+
self.requires("libxml2/2.15.0", transitive_headers=True)
5151

5252
# if another tool than the compiler or autotools is required to build the project (pkgconf, bison, flex etc)
5353
def build_requirements(self):
@@ -61,7 +61,7 @@ def build_requirements(self):
6161
self.tool_requires("libtool/2.4.7")
6262
# only if upstream configure.ac relies on PKG_CHECK_MODULES macro
6363
if not self.conf.get("tools.gnu:pkg_config", check_type=str):
64-
self.tool_requires("pkgconf/2.2.0")
64+
self.tool_requires("pkgconf/2.5.1")
6565
# required to suppport windows as a build machine
6666
if self._settings_build.os == "Windows":
6767
self.win_bash = True

recipes/odrcore/2.1/conan.lock

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@
22
"version": "0.5",
33
"requires": [
44
"vincentlaucsb-csv-parser/2.3.0#ac67e368e82c9e3da4a663c35e3a1b2f%1718528275.177",
5+
"utfcpp/4.0.8#2b56ab30c4747169f419f9a82a47d45c%1758199947.264",
56
"utfcpp/4.0.4#cd6efc5d62de4e9ee0b5f3abd0df37a9%1722968964.685",
67
"uchardet/0.0.8#6ab25e452021fcdb560f4e37f4a27bc1%1759735438.978",
8+
"pugixml/1.15#979e88f4fafbfe3585d2c0510a071cc7%1739435725.483",
79
"pugixml/1.14#c6afdcf73d71858303d8260b0d76ff91%1696206310.014",
10+
"nlohmann_json/3.12.0#2d634ab0ec8d9f56353e5ccef6d6612c%1744735883.94",
811
"nlohmann_json/3.11.3#45828be26eb619a2e04ca517bb7b828d%1701220705.259",
912
"miniz/3.0.2#bfbce07c6654293cce27ee24129d2df7%1743673472.805",
13+
"gtest/1.17.0#5224b3b3ff3b4ce1133cbdd27d53ee7d%1755784855.585",
1014
"gtest/1.14.0#f8f0757a574a8dd747d16af62d6eb1b7%1743410807.169",
1115
"cryptopp/8.9.0#7a51e0038756b21bc3a6b82d681d5906%1758206597.119"
1216
],
@@ -15,4 +19,4 @@
1519
],
1620
"python_requires": [],
1721
"config_requires": []
18-
}
22+
}

recipes/odrcore/2.1/conanfile.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,16 @@ def configure(self):
4343
self.options.rm_safe("fPIC")
4444

4545
def requirements(self):
46-
self.requires("pugixml/1.14")
46+
self.requires("pugixml/1.15")
4747
self.requires("cryptopp/8.9.0")
4848
self.requires("miniz/3.0.2")
49-
self.requires("nlohmann_json/3.11.3")
49+
self.requires("nlohmann_json/3.12.0")
5050
self.requires("vincentlaucsb-csv-parser/2.3.0")
5151
self.requires("uchardet/0.0.8")
52-
self.requires("utfcpp/4.0.4")
52+
self.requires("utfcpp/4.0.8")
5353

5454
def build_requirements(self):
55-
self.test_requires("gtest/1.14.0")
55+
self.test_requires("gtest/1.17.0")
5656

5757
def validate_build(self):
5858
if self.settings.get_safe("compiler.cppstd"):

0 commit comments

Comments
 (0)