From 054241faab2806253647941400bf86b15079a36c Mon Sep 17 00:00:00 2001 From: Leander Schulten Date: Sat, 30 Oct 2021 02:08:02 +0200 Subject: [PATCH] [glib] remove absolute paths --- ports/glib/portfile.cmake | 5 +++++ ports/glib/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/g-/glib.json | 5 +++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index 1a0d01a09751c8..b686970253584b 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -124,3 +124,8 @@ string(REPLACE "path = os.path.join(filedir, '..')" "path = os.path.join(filedir string(REPLACE "path = os.path.join('${CURRENT_PACKAGES_DIR}/share', 'glib-2.0')" "path = os.path.join('unuseable/share', 'glib-2.0')" _contents "${_contents}") file(WRITE "${_file}" "${_contents}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/gdb") +if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/glib/glib-gettextize") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/glib/glib-gettextize" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..") +endif() diff --git a/ports/glib/vcpkg.json b/ports/glib/vcpkg.json index 16e6b397867f99..5095a59b823866 100644 --- a/ports/glib/vcpkg.json +++ b/ports/glib/vcpkg.json @@ -1,6 +1,7 @@ { "name": "glib", "version": "2.66.4", + "port-version": 1, "description": "Portable, general-purpose utility library.", "homepage": "https://developer.gnome.org/glib/", "supports": "!uwp & !(windows & static)", diff --git a/versions/baseline.json b/versions/baseline.json index 0e1de0bb9637a8..4455721600cd19 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2458,7 +2458,7 @@ }, "glib": { "baseline": "2.66.4", - "port-version": 0 + "port-version": 1 }, "glibmm": { "baseline": "2.68.1", diff --git a/versions/g-/glib.json b/versions/g-/glib.json index a29fcb758d13e2..5b2f3b0012477c 100644 --- a/versions/g-/glib.json +++ b/versions/g-/glib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6207d9439567fbbc29f4468c831ef7c1fa2e6181", + "version": "2.66.4", + "port-version": 1 + }, { "git-tree": "341ab01f1a30e270603af6d2b934df9c68673a56", "version": "2.66.4",