mirror of https://github.com/microsoft/vcpkg.git
parent
2e12bbfc16
commit
da0f1cc2bb
|
|
@ -2,30 +2,46 @@ diff --git a/meson.build b/meson.build
|
|||
index 9fe9cd5ac..19a19e5c6 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -792,16 +792,16 @@ subdir('docs/tools')
|
||||
@@ -845,24 +845,24 @@ subdir('po-properties')
|
||||
subdir('docs/tools')
|
||||
subdir('docs/reference')
|
||||
|
||||
# Keep this in sync with post-install.sh expected arguments
|
||||
-if not meson.is_cross_build()
|
||||
- meson.add_install_script('build-aux/meson/post-install.py',
|
||||
- gtk_api_version,
|
||||
- gtk_binary_version,
|
||||
- gtk_libdir,
|
||||
- gtk_datadir,
|
||||
- gtk_bindir)
|
||||
- if meson.version().version_compare('>=0.57.0')
|
||||
- gnome.post_install(
|
||||
- glib_compile_schemas: true,
|
||||
- gio_querymodules: gio_module_dirs,
|
||||
- gtk_update_icon_cache: true,
|
||||
- )
|
||||
- else
|
||||
- meson.add_install_script('build-aux/meson/post-install.py',
|
||||
- gtk_api_version,
|
||||
- gtk_binary_version,
|
||||
- gtk_libdir,
|
||||
- gtk_datadir,
|
||||
- gtk_bindir)
|
||||
- endif
|
||||
-else
|
||||
- message('Not executing post-install steps automatically when cross compiling')
|
||||
-endif
|
||||
+#if not meson.is_cross_build()
|
||||
+# meson.add_install_script('build-aux/meson/post-install.py',
|
||||
+# gtk_api_version,
|
||||
+# gtk_binary_version,
|
||||
+# gtk_libdir,
|
||||
+# gtk_datadir,
|
||||
+# gtk_bindir)
|
||||
+# if meson.version().version_compare('>=0.57.0')
|
||||
+# gnome.post_install(
|
||||
+# glib_compile_schemas: true,
|
||||
+# gio_querymodules: gio_module_dirs,
|
||||
+# gtk_update_icon_cache: true,
|
||||
+# )
|
||||
+# else
|
||||
+# meson.add_install_script('build-aux/meson/post-install.py',
|
||||
+# gtk_api_version,
|
||||
+# gtk_binary_version,
|
||||
+# gtk_libdir,
|
||||
+# gtk_datadir,
|
||||
+# gtk_bindir)
|
||||
+# endif
|
||||
+#else
|
||||
+# message('Not executing post-install steps automatically when cross compiling')
|
||||
+#endif
|
||||
|
||||
if host_machine.system() != 'windows'
|
||||
# Install Valgrind suppression files (except on Windows,
|
||||
if not meson.is_subproject()
|
||||
meson.add_dist_script('build-aux/meson/dist-data.py')
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
diff --git a/gsk/meson.build b/gsk/meson.build
|
||||
index 748f4738a..6d6247343 100644
|
||||
--- a/gsk/meson.build
|
||||
+++ b/gsk/meson.build
|
||||
@@ -165,6 +165,7 @@ gsk_deps = [
|
||||
pango_dep,
|
||||
cairo_dep,
|
||||
cairo_csi_dep,
|
||||
+ lzo_dep,
|
||||
pixbuf_dep,
|
||||
libgdk_dep,
|
||||
]
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 19c3fa942..cd57128b2 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -451,7 +451,9 @@ cairo_csi_dep = dependency('cairo-script-interpreter', required: false)
|
||||
if not cairo_csi_dep.found()
|
||||
cairo_csi_dep = cc.find_library('cairo-script-interpreter', required: get_option('build-tests'))
|
||||
endif
|
||||
-
|
||||
+if cairo_csi_dep.found()
|
||||
+ lzo_dep = dependency('lzo2')
|
||||
+endif
|
||||
cdata.set('HAVE_CAIRO_SCRIPT_INTERPRETER', cairo_csi_dep.found())
|
||||
cdata.set('HAVE_HARFBUZZ', harfbuzz_dep.found())
|
||||
cdata.set('HAVE_PANGOFT', pangoft_dep.found())
|
||||
|
|
@ -1,18 +1,16 @@
|
|||
|
||||
set(GTK_VERSION 4.0.1)
|
||||
set(GTK_VERSION 4.3.0)
|
||||
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "https://download.gnome.org/sources/gtk/4.0/gtk-4.0.1.tar.xz"
|
||||
FILENAME "gtk-${GTK_VERSION}.tar.xz"
|
||||
SHA512 cab50b5bcf1a6bfdd5245c908e813330b9173531c49fdd63f9b5618f5329ddf2560f0a3548f61bba55dea6d816e57681d4e59941cfc50cf430544d3ebcd90aad
|
||||
)
|
||||
|
||||
vcpkg_extract_source_archive_ex(
|
||||
vcpkg_from_gitlab(
|
||||
GITLAB_URL https://gitlab.gnome.org/
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
ARCHIVE ${ARCHIVE}
|
||||
REPO GNOME/gtk
|
||||
REF 40ebed3a03aef096addc0af09fec4ec529d882a0 #v4.3.0
|
||||
SHA512 6f68e1e2f18a4bf0299f0563ccf091cbee3a1dc1db0819565216d50f98f3f3ad4904eef746357d9bc2fdac8a5e29c5cbed5d4df5dd0f89bb941f7438ae3cd096
|
||||
HEAD_REF master # branch name
|
||||
PATCHES build.patch
|
||||
#link_fix_static.patch
|
||||
)
|
||||
)
|
||||
|
||||
vcpkg_find_acquire_program(PKGCONFIG)
|
||||
get_filename_component(PKGCONFIG_DIR "${PKGCONFIG}" DIRECTORY )
|
||||
vcpkg_add_to_path("${PKGCONFIG_DIR}") # Post install script runs pkg-config so it needs to be on PATH
|
||||
|
|
@ -121,7 +119,6 @@ set(TOOL_NAMES gtk4-builder-tool
|
|||
if(VCPKG_TARGET_IS_LINUX)
|
||||
list(APPEND TOOL_NAMES gtk4-launch)
|
||||
endif()
|
||||
|
||||
vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN)
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "gtk",
|
||||
"version": "4.0.1",
|
||||
"version": "4.3.0",
|
||||
"description": "Portable library for creating graphical user interfaces.",
|
||||
"homepage": "https://www.gtk.org/",
|
||||
"dependencies": [
|
||||
|
|
|
|||
|
|
@ -2393,7 +2393,7 @@
|
|||
"port-version": 4
|
||||
},
|
||||
"gtk": {
|
||||
"baseline": "4.0.1",
|
||||
"baseline": "4.3.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"gtkmm": {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "2b9f746a54e5029cc327ecd7ffb1b6d042a478b6",
|
||||
"version": "4.3.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "5df8abca385bd61477f2da4217d0a88c3659db82",
|
||||
"version": "4.0.1",
|
||||
|
|
|
|||
Loading…
Reference in New Issue