From 25e096ba133da5343bc6c6c34484f00cf167d489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szabolcs=20Horva=CC=81t?= Date: Sat, 4 Jun 2022 11:56:15 +0200 Subject: [PATCH 1/3] [igraph] update to 0.9.9 --- ports/igraph/portfile.cmake | 6 +++--- ports/igraph/vcpkg.json | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ports/igraph/portfile.cmake b/ports/igraph/portfile.cmake index 5e622e0d6b513d..0d349c2b4afb5c 100644 --- a/ports/igraph/portfile.cmake +++ b/ports/igraph/portfile.cmake @@ -4,9 +4,9 @@ # - The release tarball contains pre-generated parser sources, which eliminates the dependency on bison/flex. vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/igraph/igraph/releases/download/0.9.8/igraph-0.9.8.tar.gz" - FILENAME "igraph-0.9.8.tar.gz" - SHA512 4f0af3e2b4e2ed782064afc8a7aa0f104c683c35de3f71240d41a1b5097dd41101a483d4e5f9ce4dca1a5ca0bb616e1c125d58ccf50066b1405e8188fe4d796f + URLS "https://github.com/igraph/igraph/releases/download/0.9.9/igraph-0.9.9.tar.gz" + FILENAME "igraph-0.9.9.tar.gz" + SHA512 bbfe8b76e7806ba4c70cbf0dc5ce6724f1805383c1fb6ac05c5cd1bfc829682ff2184e4f836886a562851d1af1384fd7cccb5027c4aa0deadd0e35d50aabb451 ) vcpkg_extract_source_archive_ex( diff --git a/ports/igraph/vcpkg.json b/ports/igraph/vcpkg.json index 22d4f589d8e774..42ea1bceb7ce84 100644 --- a/ports/igraph/vcpkg.json +++ b/ports/igraph/vcpkg.json @@ -1,7 +1,6 @@ { "name": "igraph", - "version": "0.9.8", - "port-version": 2, + "version": "0.9.9", "description": "igraph is a C library for network analysis and graph theory, with an emphasis on efficiency portability and ease of use.", "homepage": "https://igraph.org/", "license": "GPL-2.0-or-later", From d7c434700bd84ad50e800abfaf50216f61bdf74c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szabolcs=20Horva=CC=81t?= Date: Sat, 4 Jun 2022 11:57:42 +0200 Subject: [PATCH 2/3] [igraph] patch vendored GLPK to fix UWP support --- ports/igraph/glpk-uwp.patch | 13 +++++++++++++ ports/igraph/portfile.cmake | 2 ++ ports/igraph/vcpkg.json | 1 - 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 ports/igraph/glpk-uwp.patch diff --git a/ports/igraph/glpk-uwp.patch b/ports/igraph/glpk-uwp.patch new file mode 100644 index 00000000000000..7bee3aed0222d0 --- /dev/null +++ b/ports/igraph/glpk-uwp.patch @@ -0,0 +1,13 @@ +diff --git a/vendor/glpk/env/dlsup.c b/vendor/glpk/env/dlsup.c +index 741354475..968a794b7 100644 +--- a/vendor/glpk/env/dlsup.c ++++ b/vendor/glpk/env/dlsup.c +@@ -25,6 +25,8 @@ + + #include "env.h" + ++#undef __WOE__ ++ + /* GNU version ********************************************************/ + + #if defined(HAVE_LTDL) diff --git a/ports/igraph/portfile.cmake b/ports/igraph/portfile.cmake index 0d349c2b4afb5c..6fc9619073ac41 100644 --- a/ports/igraph/portfile.cmake +++ b/ports/igraph/portfile.cmake @@ -12,6 +12,8 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} + PATCHES + "glpk-uwp.patch" # patch GLPK for UWP compatibility ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/igraph/vcpkg.json b/ports/igraph/vcpkg.json index 42ea1bceb7ce84..f7c08f3693a807 100644 --- a/ports/igraph/vcpkg.json +++ b/ports/igraph/vcpkg.json @@ -4,7 +4,6 @@ "description": "igraph is a C library for network analysis and graph theory, with an emphasis on efficiency portability and ease of use.", "homepage": "https://igraph.org/", "license": "GPL-2.0-or-later", - "supports": "!uwp", "dependencies": [ "blas", "lapack", From 8c80959d6204ff0ea081d61b8ec42a626eda9e7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szabolcs=20Horva=CC=81t?= Date: Sun, 5 Jun 2022 23:06:03 +0200 Subject: [PATCH 3/3] [igraph] x-add-version --- versions/baseline.json | 4 ++-- versions/i-/igraph.json | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index a938c9640fcaa9..02d40d07ab84df 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2917,8 +2917,8 @@ "port-version": 4 }, "igraph": { - "baseline": "0.9.8", - "port-version": 2 + "baseline": "0.9.9", + "port-version": 0 }, "iir1": { "baseline": "1.9.1", diff --git a/versions/i-/igraph.json b/versions/i-/igraph.json index 3534d70151bfce..e5ffcb6a6a37b7 100644 --- a/versions/i-/igraph.json +++ b/versions/i-/igraph.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c374fc0b09a493a6afbd4c009dd43763b2a9132f", + "version": "0.9.9", + "port-version": 0 + }, { "git-tree": "562fb321b0c46134d9b876fe95a3796fd4404b24", "version": "0.9.8",