Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[cairo] bump dependencies + support conan v2 #13943

Merged
merged 34 commits into from
Jan 24, 2023
Merged

[cairo] bump dependencies + support conan v2 #13943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
36de76c
[cairo] bump glib dependency in meson build
planetmarshall Nov 1, 2022
42ce19c
[cairo] bump deps in autotools build
planetmarshall Nov 1, 2022
f3e7ff7
[cairo] update the autotools toolchain
planetmarshall Nov 3, 2022
a51d7ab
[cairo] fix env vars for msvc autotools
planetmarshall Nov 3, 2022
e7df9ff
[cairo] ignore CAIRO_LIBS
planetmarshall Nov 4, 2022
4f21d80
[cairo] update the autotools build
planetmarshall Nov 6, 2022
a61f198
[cairo] update test packages for the autotools build
planetmarshall Nov 6, 2022
7cbe8a4
[cairo] fix linux autotools build
planetmarshall Nov 6, 2022
fc42ab5
[cairo] update autotools deps
planetmarshall Nov 26, 2022
b8979ec
[cairo] bump deps in meson build
planetmarshall Nov 26, 2022
80cfa1c
[cairo] fix msvc static runtime test
planetmarshall Nov 26, 2022
232170d
[cairo] document patches
planetmarshall Nov 26, 2022
60a6654
Update recipes/cairo/all/conanfile.py
planetmarshall Dec 4, 2022
00278f2
Update recipes/cairo/all/conanfile.py
planetmarshall Dec 4, 2022
f73b4b3
[cairo] revert recipe changes
planetmarshall Dec 5, 2022
5bfe1ab
[cairo] bump deps in meson build
planetmarshall Dec 5, 2022
caeebb9
[cairo] bump deps in autotools build
planetmarshall Dec 5, 2022
6f547d3
[cairo] remove test-v1-package
planetmarshall Dec 17, 2022
f888284
Merge branch 'master' into cairo-bump-deps
danimtb Dec 27, 2022
2e3a64a
Revert "[cairo] remove test-v1-package"
planetmarshall Jan 1, 2023
2b782c0
Revert "[cairo] revert recipe changes"
planetmarshall Jan 1, 2023
992ae15
[cairo] bump dependencies
planetmarshall Jan 1, 2023
2095e92
[cairo] use rm_safe
planetmarshall Jan 1, 2023
f597cd0
[cairo] use rm_safe in meson build
planetmarshall Jan 3, 2023
f47aeab
[cairo] add download mirror
planetmarshall Jan 4, 2023
fa27bc7
Revert update of autotools build to new toolchain
planetmarshall Jan 5, 2023
413e828
[cairo] bump glib dependency
planetmarshall Jan 5, 2023
d8d0aeb
[cairo] disable autotools build for macos
planetmarshall Jan 8, 2023
27950e4
Revert "[cairo] disable autotools build for macos"
planetmarshall Jan 22, 2023
fc26c9d
Revert "Revert update of autotools build to new toolchain"
planetmarshall Jan 22, 2023
b407fe2
[cairo] bump dependencies
planetmarshall Jan 22, 2023
da9842c
[cairo] disable msvc build where LNK1127 error manifests
planetmarshall Jan 22, 2023
bbbd7bf
[cairo] disable msvc build entirely for autotools
planetmarshall Jan 22, 2023
fcd0f02
[cairo] add alternative mirror for 1.17.2
planetmarshall Jan 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 26 additions & 9 deletions recipes/cairo/all/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,43 @@
sources:
"1.17.4":
sha256: "74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705"
url: "https://www.cairographics.org/snapshots/cairo-1.17.4.tar.xz"
url: [
"https://www.cairographics.org/snapshots/cairo-1.17.4.tar.xz",
"https://mirror.koddos.net/blfs/conglomeration/cairo/cairo-1.17.4.tar.xz"
]
"1.17.2":
sha256: "6b70d4655e2a47a22b101c666f4b29ba746eda4aa8a0f7255b32b2e9408801df"
url: "https://www.cairographics.org/snapshots/cairo-1.17.2.tar.xz"
url: [
"https://www.cairographics.org/snapshots/cairo-1.17.2.tar.xz",
"https://www.mirrorservice.org/sites/tinycorelinux.net/11.x/x86_64/tcz/src/cairo/cairo-1.17.2.tar.xz"
]
"1.16.0":
sha256: "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331"
url: "https://www.cairographics.org/releases/cairo-1.16.0.tar.xz"
url: [
"https://www.cairographics.org/releases/cairo-1.16.0.tar.xz",
"https://mirror.koddos.net/blfs/conglomeration/cairo/cairo-1.16.0.tar.xz"
]
patches:
"1.17.4":
- patch_file: "patches/0001-msvc-update-build-scripts-to-compile-with-more-featu.patch"
base_path: "source_subfolder"
patch_type: portability
patch_description: support more features in MSVC build
- patch_file: "patches/binutils-2.34-libbfd-fix.patch"
base_path: "source_subfolder/util/cairo-trace"
patch_description: "fix build with newer versions of bfd"
patch_type: backport
patch_source: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/128
base_path: "util/cairo-trace"
"1.17.2":
- patch_file: "patches/0001-msvc-update-build-scripts-to-compile-with-more-featu.patch"
base_path: "source_subfolder"
- patch_file: "patches/binutils-2.34-libbfd-fix.patch"
base_path: "source_subfolder/util/cairo-trace"
patch_description: "fix build with newer versions of bfd"
patch_type: backport
patch_source: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/128
base_path: "util/cairo-trace"
"1.16.0":
- patch_file: "patches/0001-msvc-update-build-scripts-to-compile-with-more-featu.patch"
base_path: "source_subfolder"
- patch_file: "patches/binutils-2.34-libbfd-fix.patch"
base_path: "source_subfolder/util/cairo-trace"
patch_description: "fix build with newer versions of bfd"
patch_type: backport
patch_source: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/128
base_path: "util/cairo-trace"
Loading