mirror of https://github.com/microsoft/vcpkg.git
[cairomm] Update to 1.19.1 (#53055)
This commit is contained in:
parent
cc0e558b44
commit
af4d2e5140
|
|
@ -1,30 +1,8 @@
|
|||
diff --git a/meson.build b/meson.build
|
||||
index b8c2191..8f280b4 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -288,7 +288,7 @@ mm_conf_data.set('CAIROMM_MICRO_VERSION', cairomm_micro_version)
|
||||
mm_conf_data.set('VERSION', meson.project_version()) # for MSVC_NMake/cairomm/cairomm.rc
|
||||
|
||||
cairommconfig_h_meson = files('cairommconfig.h.meson')
|
||||
-install_includeconfigdir = install_libdir / cairomm_pcname / 'include'
|
||||
+install_includeconfigdir = install_includedir
|
||||
configure_file(
|
||||
input: cairommconfig_h_meson,
|
||||
output: 'cairommconfig.h',
|
||||
@@ -380,7 +380,7 @@ summary = [
|
||||
'Directories:',
|
||||
' prefix: @0@'.format(install_prefix),
|
||||
' includedir: @0@'.format(install_prefix / install_includedir),
|
||||
- ' includecairommdir: @0@'.format(install_prefix / install_includedir / cairomm_pcname),
|
||||
+ ' includecairommdir: @0@'.format(install_prefix / install_includedir),
|
||||
' libdir: @0@'.format(install_prefix / install_libdir),
|
||||
' includeconfigdir: @0@'.format(install_prefix / install_includeconfigdir),
|
||||
' pkgconfigdir: @0@'.format(install_prefix / install_pkgconfigdir),
|
||||
diff --git a/cairomm/meson.build b/cairomm/meson.build
|
||||
index f940268..23b955e 100644
|
||||
index 8580562..8ec2c51 100644
|
||||
--- a/cairomm/meson.build
|
||||
+++ b/cairomm/meson.build
|
||||
@@ -64,7 +64,7 @@ cairomm_private_h = [
|
||||
@@ -73,7 +73,7 @@ cairomm_private_h = [
|
||||
# docs/reference/meson.build needs this.
|
||||
source_h_files = cairomm_public_h
|
||||
|
||||
|
|
@ -34,12 +12,34 @@ index f940268..23b955e 100644
|
|||
# Make sure we are exporting the symbols from the DLL
|
||||
cairomm_cpp_args = ['-DCAIROMM_BUILD=1']
|
||||
diff --git a/data/cairomm.pc.in b/data/cairomm.pc.in
|
||||
index b6d19a2..59a03f0 100644
|
||||
index 1ee5b42..c7e33b5 100644
|
||||
--- a/data/cairomm.pc.in
|
||||
+++ b/data/cairomm.pc.in
|
||||
@@ -16,4 +16,4 @@ Version: @PACKAGE_VERSION@
|
||||
URL: http://www.cairographics.org/cairomm/
|
||||
URL: https://www.cairographics.org/cairomm/
|
||||
Requires: @CAIROMM_MODULES@
|
||||
Libs: -L${libdir} -lcairomm@MSVC_TOOLSET_VER@-@CAIROMM_API_VERSION@ @CAIROMM_EXTRA_LIBS@
|
||||
-Cflags: -I${includedir}/@CAIROMM_MODULE_NAME@ -I${libdir}/@CAIROMM_MODULE_NAME@/include
|
||||
+Cflags: -I${includedir}
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 9f10967..6949360 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -299,7 +299,7 @@ mm_conf_data.set('CAIROMM_MICRO_VERSION', cairomm_micro_version)
|
||||
mm_conf_data.set('VERSION', meson.project_version()) # for MSVC_NMake/cairomm/cairomm.rc
|
||||
|
||||
cairommconfig_h_meson = files('cairommconfig.h.meson')
|
||||
-install_includeconfigdir = install_libdir / cairomm_pcname / 'include'
|
||||
+install_includeconfigdir = install_includedir
|
||||
configure_file(
|
||||
input: cairommconfig_h_meson,
|
||||
output: 'cairommconfig.h',
|
||||
@@ -387,7 +387,7 @@ summary = [
|
||||
'Directories:',
|
||||
' prefix: @0@'.format(install_prefix),
|
||||
' includedir: @0@'.format(install_prefix / install_includedir),
|
||||
- ' includecairommdir: @0@'.format(install_prefix / install_includedir / cairomm_pcname),
|
||||
+ ' includecairommdir: @0@'.format(install_prefix / install_includedir),
|
||||
' libdir: @0@'.format(install_prefix / install_libdir),
|
||||
' includeconfigdir: @0@'.format(install_prefix / install_includeconfigdir),
|
||||
' pkgconfigdir: @0@'.format(install_prefix / install_pkgconfigdir),
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
|
|||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "https://www.cairographics.org/releases/cairomm-${VERSION}.tar.xz"
|
||||
FILENAME "cairomm-${VERSION}.tar.xz"
|
||||
SHA512 d358a765136e244773b4a0fdcb2d9c81dd0b76f7a27c7108f94df9765f2d790f5f50b5645c09c292efce3e012528f85114d51916450c5fe6fa87d09f5a405d4c
|
||||
SHA512 a5eaca0afd7462351a712e4a6f69cd5be88fcfcdc984978f10c77a1b406062aa8cadb6e243aa2fe179a7552e2b3f042e9511bee52cf35d35a3ba64e69b4f8948
|
||||
)
|
||||
|
||||
vcpkg_extract_source_archive(
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "cairomm",
|
||||
"version": "1.18.0",
|
||||
"version": "1.19.1",
|
||||
"description": "A C++ wrapper for the cairo graphics library",
|
||||
"homepage": "https://www.cairographics.org",
|
||||
"license": "LGPL-2.0-only",
|
||||
|
|
|
|||
|
|
@ -1593,7 +1593,7 @@
|
|||
"port-version": 1
|
||||
},
|
||||
"cairomm": {
|
||||
"baseline": "1.18.0",
|
||||
"baseline": "1.19.1",
|
||||
"port-version": 0
|
||||
},
|
||||
"calceph": {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "3d8255585651184d370d3081038377a2c8e70a24",
|
||||
"version": "1.19.1",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "bd3f26958cdfb6aec8b42ca67dad1d7567461dcf",
|
||||
"version": "1.18.0",
|
||||
|
|
|
|||
Loading…
Reference in New Issue