mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-28 00:29:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[atk,gdk-pixbuf,glib] Use vcpkg_from_gitlab. (#24541)

Browse Source 
* [atk,gdk-pixbuf,glib] Use vcpkg_from_gitlab.

* Add quotes and licenses.
This commit is contained in:
Billy O'Neal 2022-05-06 11:20:25 -07:00 committed by GitHub
parent 47cbed8851
commit 309f985971
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 61 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ports/atk/portfile.cmake
View File

@ -2,24 +2,21 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
set(ATK_VERSION 2.38.0) set(ATK_VERSION 2.38.0)
vcpkg_download_distfile(ARCHIVE vcpkg_from_gitlab(
URLS "https://gitlab.gnome.org/GNOME/atk/-/archive/${ATK_VERSION}/atk-${ATK_VERSION}.tar.gz" GITLAB_URL https://gitlab.gnome.org/
FILENAME "atk-${ATK_VERSION}.tar.gz" OUT_SOURCE_PATH SOURCE_PATH
REPO GNOME/atk
REF "${ATK_VERSION}"
HEAD_REF master
SHA512 f31951ecbdace6a18fb9f772616137cb8732163b37448fef4daf1af60ba8479c94d498dcdaf4880468c80012c77a446da585926a99704a9a940b80e546080cf3 SHA512 f31951ecbdace6a18fb9f772616137cb8732163b37448fef4daf1af60ba8479c94d498dcdaf4880468c80012c77a446da585926a99704a9a940b80e546080cf3
) )
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
PATCHES
)
vcpkg_configure_meson( vcpkg_configure_meson(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH "${SOURCE_PATH}"
OPTIONS -Dintrospection=false OPTIONS -Dintrospection=false
ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' ADDITIONAL_NATIVE_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal'
glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums'
ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' ADDITIONAL_CROSS_BINARIES glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal'
glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums' glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums'
) )
vcpkg_install_meson() vcpkg_install_meson()
@ -28,4 +25,4 @@ vcpkg_copy_pdbs()
vcpkg_fixup_pkgconfig() vcpkg_fixup_pkgconfig()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

2
ports/atk/vcpkg.json
View File

@ -1,8 +1,10 @@
{ {
"name": "atk", "name": "atk",
"version": "2.38.0", "version": "2.38.0",
"port-version": 1,
"description": "GNOME Accessibility Toolkit", "description": "GNOME Accessibility Toolkit",
"homepage": "https://developer.gnome.org/atk/", "homepage": "https://developer.gnome.org/atk/",
"license": "GPL-2.0-only",
"supports": "!arm", "supports": "!arm",
"dependencies": [ "dependencies": [
"gettext", "gettext",

23
ports/gdk-pixbuf/portfile.cmake
View File

@ -1,23 +1,22 @@
set(GDK_PIXBUF_VERSION 2.42) set(GDK_PIXBUF_VERSION 2.42)
set(GDK_PIXBUF_PATCH 8) set(GDK_PIXBUF_PATCH 8)
vcpkg_download_distfile(ARCHIVE vcpkg_from_gitlab(
URLS "https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/archive/${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}/gdk-pixbuf-${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}.tar.gz" GITLAB_URL https://gitlab.gnome.org/
FILENAME "gdk-pixbuf-${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}.tar.gz"
SHA512 ea3b7d47f2ef3dbb88f640629e03eb4fab4a371da2545c199274d75b993b176af0c69ea72b46d5fadf58f82dff9a809fe1e0a4802ad1f1f13eaa9d757ebfeb4c
)
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE} REPO GNOME/gdk-pixbuf
REF "${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}"
SHA512 ea3b7d47f2ef3dbb88f640629e03eb4fab4a371da2545c199274d75b993b176af0c69ea72b46d5fadf58f82dff9a809fe1e0a4802ad1f1f13eaa9d757ebfeb4c
HEAD_REF master
PATCHES PATCHES
fix_build_error_windows.patch fix_build_error_windows.patch
) )
if(VCPKG_TARGET_IS_WINDOWS) if(VCPKG_TARGET_IS_WINDOWS)
#list(APPEND OPTIONS -Dnative_windows_loaders=true) # Use Windows system components to handle BMP, EMF, GIF, ICO, JPEG, TIFF and WMF images, overriding jpeg and tiff. To build this into gdk-pixbuf, pass in windows" with the other loaders to build in or use "all" with the builtin_loaders option #list(APPEND OPTIONS -Dnative_windows_loaders=true) # Use Windows system components to handle BMP, EMF, GIF, ICO, JPEG, TIFF and WMF images, overriding jpeg and tiff. To build this into gdk-pixbuf, pass in windows" with the other loaders to build in or use "all" with the builtin_loaders option
endif() endif()
vcpkg_configure_meson( vcpkg_configure_meson(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH "${SOURCE_PATH}"
OPTIONS OPTIONS
-Dman=false # Whether to generate man pages (requires xlstproc) -Dman=false # Whether to generate man pages (requires xlstproc)
-Dgtk_doc=false # Whether to generate the API reference (requires GTK-Doc) -Dgtk_doc=false # Whether to generate the API reference (requires GTK-Doc)
@ -29,7 +28,7 @@ vcpkg_configure_meson(
-Drelocatable=true # Whether to enable application bundle relocation support -Drelocatable=true # Whether to enable application bundle relocation support
-Dinstalled_tests=false -Dinstalled_tests=false
-Dgio_sniffing=false # Perform file type detection using GIO (Unused on MacOS and Windows) -Dgio_sniffing=false # Perform file type detection using GIO (Unused on MacOS and Windows)
-Dbuiltin_loaders=all # since it is unclear where loadable plugins should be located; -Dbuiltin_loaders=all # since it is unclear where loadable plugins should be located;
# Comma-separated list of loaders to build into gdk-pixbuf, or "none", or "all" to build all buildable loaders into gdk-pixbuf # Comma-separated list of loaders to build into gdk-pixbuf, or "none", or "all" to build all buildable loaders into gdk-pixbuf
ADDITIONAL_NATIVE_BINARIES glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources' ADDITIONAL_NATIVE_BINARIES glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources'
glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal' glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal'
@ -40,7 +39,7 @@ vcpkg_configure_meson(
) )
vcpkg_install_meson(ADD_BIN_TO_PATH) vcpkg_install_meson(ADD_BIN_TO_PATH)
# Fix paths in pc file. # Fix paths in pc file.
set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gdk-pixbuf-2.0.pc") set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gdk-pixbuf-2.0.pc")
if(EXISTS "${_file}") if(EXISTS "${_file}")
file(READ "${_file}" _contents) file(READ "${_file}" _contents)
@ -67,6 +66,6 @@ endif()
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN) vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN)
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

5
ports/gdk-pixbuf/vcpkg.json
View File

@ -1,9 +1,10 @@
{ {
"name": "gdk-pixbuf", "name": "gdk-pixbuf",
"version": "2.42.8", "version": "2.42.8",
"port-version": 1, "port-version": 2,
"description": "Image loading library.", "description": "Image loading library.",
"homepage": "https://developer.gnome.org/gdk-pixbuf/", "homepage": "https://gitlab.gnome.org/GNOME/gdk-pixbuf",
"license": "LGPL-2.1-only",
"dependencies": [ "dependencies": [
"gettext", "gettext",
"glib", "glib",

36
ports/glib/portfile.cmake
View File

@ -6,21 +6,17 @@ endif()
set(GLIB_MAJOR_MINOR 2.70) set(GLIB_MAJOR_MINOR 2.70)
set(GLIB_PATCH 5) set(GLIB_PATCH 5)
vcpkg_download_distfile(ARCHIVE vcpkg_from_gitlab(
URLS "https://gitlab.gnome.org/GNOME/glib/-/archive/${GLIB_MAJOR_MINOR}.${GLIB_PATCH}/glib-${GLIB_MAJOR_MINOR}.${GLIB_PATCH}.tar.gz" GITLAB_URL https://gitlab.gnome.org/
FILENAME "glib-${GLIB_MAJOR_MINOR}.${GLIB_PATCH}.tar.gz"
SHA512 69c032358e0a0d88414a97e0bc898b5ce2797839a432b95790d03f108e55a79eee2d51bab5e281cc9469e2a57accc0d2c9bbaa80f9369050534387d1a215dd98)
vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE} REPO GNOME/glib
REF ${GLIB_VERSION} REF "${GLIB_MAJOR_MINOR}.${GLIB_PATCH}"
SHA512 69c032358e0a0d88414a97e0bc898b5ce2797839a432b95790d03f108e55a79eee2d51bab5e281cc9469e2a57accc0d2c9bbaa80f9369050534387d1a215dd98
PATCHES PATCHES
use-libiconv-on-windows.patch use-libiconv-on-windows.patch
libintl.patch libintl.patch
) )
if (selinux IN_LIST FEATURES) if (selinux IN_LIST FEATURES)
if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT EXISTS "/usr/include/selinux") if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT EXISTS "/usr/include/selinux")
message("Selinux was not found in its typical system location. Your build may fail. You can install Selinux with \"apt-get install selinux\".") message("Selinux was not found in its typical system location. Your build may fail. You can install Selinux with \"apt-get install selinux\".")
@ -41,7 +37,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
endif() endif()
vcpkg_configure_meson( vcpkg_configure_meson(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH "${SOURCE_PATH}"
OPTIONS OPTIONS
-Dinstalled_tests=false -Dinstalled_tests=false
${OPTIONS} ${OPTIONS}
@ -54,15 +50,15 @@ vcpkg_install_meson(ADD_BIN_TO_PATH)
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
set(GLIB_TOOLS gdbus set(GLIB_TOOLS gdbus
gio gio
gio-querymodules gio-querymodules
glib-compile-resources glib-compile-resources
glib-compile-schemas glib-compile-schemas
gobject-query gobject-query
gresource gresource
gsettings gsettings
) )
if(NOT VCPKG_TARGET_IS_WINDOWS) if(NOT VCPKG_TARGET_IS_WINDOWS)
if(NOT VCPKG_TARGET_IS_OSX) if(NOT VCPKG_TARGET_IS_OSX)
@ -111,7 +107,7 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/glib-2.0.pc")
endif() endif()
vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES ${SYSTEM_LIBRARIES}) vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES ${SYSTEM_LIBRARIES})
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
# Fix python scripts # Fix python scripts
set(_file "${CURRENT_PACKAGES_DIR}/tools/${PORT}/gdbus-codegen") set(_file "${CURRENT_PACKAGES_DIR}/tools/${PORT}/gdbus-codegen")

3
ports/glib/vcpkg.json
View File

@ -1,9 +1,10 @@
{ {
"name": "glib", "name": "glib",
"version": "2.70.5", "version": "2.70.5",
"port-version": 1, "port-version": 2,
"description": "Portable, general-purpose utility library.", "description": "Portable, general-purpose utility library.",
"homepage": "https://developer.gnome.org/glib/", "homepage": "https://developer.gnome.org/glib/",
"license": "LGPL-2.1-only",
"supports": "!uwp & !(windows & static)", "supports": "!uwp & !(windows & static)",
"dependencies": [ "dependencies": [
"dirent", "dirent",

5
versions/a-/atk.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "4034b57da4c9eeb30d6904339be721b7e45f8a89",
"version": "2.38.0",
"port-version": 1
},
{ {
"git-tree": "9e43338e95e4bfeb688d23ade7792fb45b185356", "git-tree": "9e43338e95e4bfeb688d23ade7792fb45b185356",
"version": "2.38.0", "version": "2.38.0",

6
versions/baseline.json
View File

@ -206,7 +206,7 @@
}, },
"atk": { "atk": {
"baseline": "2.38.0", "baseline": "2.38.0",
"port-version": 0 "port-version": 1
}, },
"atkmm": { "atkmm": {
"baseline": "2.36.1", "baseline": "2.36.1",
@ -2442,7 +2442,7 @@
}, },
"gdk-pixbuf": { "gdk-pixbuf": {
"baseline": "2.42.8", "baseline": "2.42.8",
"port-version": 1 "port-version": 2
}, },
"gemmlowp": { "gemmlowp": {
"baseline": "2021-09-28", "baseline": "2021-09-28",
@ -2538,7 +2538,7 @@
}, },
"glib": { "glib": {
"baseline": "2.70.5", "baseline": "2.70.5",
"port-version": 1 "port-version": 2
}, },
"glibmm": { "glibmm": {
"baseline": "2.70.0", "baseline": "2.70.0",

5
versions/g-/gdk-pixbuf.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "2e82cf35eb436a674fdbdfa12cce69e629c83bf4",
"version": "2.42.8",
"port-version": 2
},
{ {
"git-tree": "d1c32f1df7acf96c17689e559b2e1edeb947de38", "git-tree": "d1c32f1df7acf96c17689e559b2e1edeb947de38",
"version": "2.42.8", "version": "2.42.8",

5
versions/g-/glib.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "3fc7533aba85394460293d7ba61abc3170323f1d",
"version": "2.70.5",
"port-version": 2
},
{ {
"git-tree": "23fe84cc74f69a066a1e2a2629a527b9c8d058ad", "git-tree": "23fe84cc74f69a066a1e2a2629a527b9c8d058ad",
"version": "2.70.5", "version": "2.70.5",