From 1a8f6248e90a18bcc5dcef3044c9715003447396 Mon Sep 17 00:00:00 2001 From: Ilya Arzhannikov Date: Wed, 21 Apr 2021 17:07:23 +0200 Subject: [PATCH 01/11] disable documentation generation --- ports/libidn2/portfile.cmake | 1 + ports/libidn2/vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/libidn2/portfile.cmake b/ports/libidn2/portfile.cmake index 9509d66757f9fe..f4b6c54d75b965 100644 --- a/ports/libidn2/portfile.cmake +++ b/ports/libidn2/portfile.cmake @@ -54,6 +54,7 @@ else() COPY_SOURCE OPTIONS --with-libiconv-prefix=${CURRENT_INSTALLED_DIR} + --disable-gtk-doc-html ) vcpkg_install_make() diff --git a/ports/libidn2/vcpkg.json b/ports/libidn2/vcpkg.json index 5b5a6b63983b8c..744285691ee0ec 100644 --- a/ports/libidn2/vcpkg.json +++ b/ports/libidn2/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libidn2", "version-string": "2.3.0", - "port-version": 2, + "port-version": 3, "description": "GNU Libidn is an implementation of the Stringprep, Punycode and IDNA 2003 specifications. Libidn's purpose is to encode and decode internationalized domain names.", "homepage": "https://www.gnu.org/software/libidn/", "dependencies": [ From 31f42d181639897c37cc8167590ec67672a1ec36 Mon Sep 17 00:00:00 2001 From: Ilya Arzhannikov Date: Wed, 21 Apr 2021 17:07:46 +0200 Subject: [PATCH 02/11] ./vcpkg x-add-version libidn2 --- versions/baseline.json | 2 +- versions/l-/libidn2.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index a6d75aacff675f..30099cbf3003c3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3166,7 +3166,7 @@ }, "libidn2": { "baseline": "2.3.0", - "port-version": 2 + "port-version": 3 }, "libigl": { "baseline": "2.2.0", diff --git a/versions/l-/libidn2.json b/versions/l-/libidn2.json index 688c8a1ace126a..4d081f3fb269e4 100644 --- a/versions/l-/libidn2.json +++ b/versions/l-/libidn2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2bc9552c55fad444ca05c683244b56ce04443140", + "version-string": "2.3.0", + "port-version": 3 + }, { "git-tree": "6f5a62105488c9eb440e97c4d49a1ac6c8fa996c", "version-string": "2.3.0", From bb14bf1872f7371b89cbe4c553001f3194be5e6f Mon Sep 17 00:00:00 2001 From: Ilya Arzhannikov Date: Thu, 22 Apr 2021 11:58:31 +0200 Subject: [PATCH 03/11] requested changes --- ports/libidn2/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libidn2/vcpkg.json b/ports/libidn2/vcpkg.json index 744285691ee0ec..b39058a5d9f03b 100644 --- a/ports/libidn2/vcpkg.json +++ b/ports/libidn2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libidn2", - "version-string": "2.3.0", + "version": "2.3.0", "port-version": 3, "description": "GNU Libidn is an implementation of the Stringprep, Punycode and IDNA 2003 specifications. Libidn's purpose is to encode and decode internationalized domain names.", "homepage": "https://www.gnu.org/software/libidn/", From 5cb8bc201abf3da2772456b1590b64ae7e1d8de7 Mon Sep 17 00:00:00 2001 From: Ilya Arzhannikov Date: Thu, 22 Apr 2021 11:59:00 +0200 Subject: [PATCH 04/11] ./vcpkg x-add-version libidn2 --overwrite-version --- versions/l-/libidn2.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/l-/libidn2.json b/versions/l-/libidn2.json index 4d081f3fb269e4..e5c862f8484950 100644 --- a/versions/l-/libidn2.json +++ b/versions/l-/libidn2.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "2bc9552c55fad444ca05c683244b56ce04443140", - "version-string": "2.3.0", + "git-tree": "7860948bebd0f4ee75147c81eddce083e605d6d9", + "version": "2.3.0", "port-version": 3 }, { From a81eabaea5bc61e76c8ff7a738b01ee96314c257 Mon Sep 17 00:00:00 2001 From: Ilya Arzhannikov Date: Fri, 23 Apr 2021 15:58:36 +0200 Subject: [PATCH 05/11] try like this --- ports/libidn2/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/libidn2/portfile.cmake b/ports/libidn2/portfile.cmake index f4b6c54d75b965..f76326d88b9ce5 100644 --- a/ports/libidn2/portfile.cmake +++ b/ports/libidn2/portfile.cmake @@ -54,7 +54,7 @@ else() COPY_SOURCE OPTIONS --with-libiconv-prefix=${CURRENT_INSTALLED_DIR} - --disable-gtk-doc-html + --disable-gtk-doc ) vcpkg_install_make() From e1207f9b8583a38e9889b93102c16330476cceb4 Mon Sep 17 00:00:00 2001 From: Ilya Arzhannikov Date: Fri, 23 Apr 2021 16:40:03 +0200 Subject: [PATCH 06/11] patch autoreconf to disable gtk doc --- ports/libidn2/disable-gtk-doc.patch | 31 +++++++++++++++++++++++++++++ ports/libidn2/portfile.cmake | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 ports/libidn2/disable-gtk-doc.patch diff --git a/ports/libidn2/disable-gtk-doc.patch b/ports/libidn2/disable-gtk-doc.patch new file mode 100644 index 00000000000000..1bbe90d714fca1 --- /dev/null +++ b/ports/libidn2/disable-gtk-doc.patch @@ -0,0 +1,31 @@ +diff --git a/configure.ac b/configure.ac +index b9c0e73..08807bf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -75,9 +75,12 @@ __asm__ (".symver versioned_symbol, versioned_symbol@IDN2_0.0.0"); + # check for gtk-doc + # + m4_ifdef([GTK_DOC_CHECK], [ +-GTK_DOC_CHECK([1.14],[--flavour no-tmpl]) ++#GTK_DOC_CHECK([1.14],[--flavour no-tmpl]) + ],[ + AM_CONDITIONAL([ENABLE_GTK_DOC], false) ++AM_CONDITIONAL([GTK_DOC_BUILD_HTML], false) ++AM_CONDITIONAL([GTK_DOC_BUILD_PDF], false) ++AM_CONDITIONAL([HAVE_GTK_DOC], false) + ]) + # needed for some older versions of gtk-doc + m4_ifdef([GTK_DOC_USE_LIBTOOL], [], [ +diff --git a/gtk-doc.make b/gtk-doc.make +index 7d9a27f..973707f 100644 +--- a/gtk-doc.make ++++ b/gtk-doc.make +@@ -268,7 +268,7 @@ maintainer-clean-local: + + install-data-local: + @installfiles=`echo $(builddir)/html/*`; \ +- if test "$$installfiles" = '$(builddir)/html/*'; \ ++ if true; \ + then echo 1>&2 'Nothing to install' ; \ + else \ + if test -n "$(DOC_MODULE_VERSION)"; then \ diff --git a/ports/libidn2/portfile.cmake b/ports/libidn2/portfile.cmake index f76326d88b9ce5..435fea800d9d4f 100644 --- a/ports/libidn2/portfile.cmake +++ b/ports/libidn2/portfile.cmake @@ -11,6 +11,8 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${IDN2_VERSION} + PATCHES + disable-gtk-doc.patch ) if (VCPKG_TARGET_IS_WINDOWS) From 5aa1bbb5ffa936efd6676ba9daae1cbe6f5db1c2 Mon Sep 17 00:00:00 2001 From: Ilya Arzhannikov Date: Fri, 23 Apr 2021 16:53:31 +0200 Subject: [PATCH 07/11] remove unneeded option --- ports/libidn2/portfile.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/libidn2/portfile.cmake b/ports/libidn2/portfile.cmake index 435fea800d9d4f..7c78166ebc01fb 100644 --- a/ports/libidn2/portfile.cmake +++ b/ports/libidn2/portfile.cmake @@ -56,7 +56,6 @@ else() COPY_SOURCE OPTIONS --with-libiconv-prefix=${CURRENT_INSTALLED_DIR} - --disable-gtk-doc ) vcpkg_install_make() From 763a8f4d5fc6f39ac17bf6788a9b1a7ae93171ae Mon Sep 17 00:00:00 2001 From: Ilya Arzhannikov Date: Fri, 23 Apr 2021 16:53:53 +0200 Subject: [PATCH 08/11] ./vcpkg x-add-version libidn2 --overwrite-version --- versions/l-/libidn2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libidn2.json b/versions/l-/libidn2.json index e5c862f8484950..2edfbc1eb71fc2 100644 --- a/versions/l-/libidn2.json +++ b/versions/l-/libidn2.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7860948bebd0f4ee75147c81eddce083e605d6d9", + "git-tree": "e4ab7a7b1d0a9c0dec0f367ebe6cbbf7a6978b8c", "version": "2.3.0", "port-version": 3 }, From 87b4863d76d501b53ce88b94d35fe7169e6e86c8 Mon Sep 17 00:00:00 2001 From: Ilya Arzhannikov Date: Fri, 23 Apr 2021 17:25:36 +0200 Subject: [PATCH 09/11] lets try @dg0yt suggestion --- ports/libidn2/portfile.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ports/libidn2/portfile.cmake b/ports/libidn2/portfile.cmake index 7c78166ebc01fb..061509e268f43f 100644 --- a/ports/libidn2/portfile.cmake +++ b/ports/libidn2/portfile.cmake @@ -11,8 +11,8 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${IDN2_VERSION} - PATCHES - disable-gtk-doc.patch + # PATCHES + # disable-gtk-doc.patch ) if (VCPKG_TARGET_IS_WINDOWS) @@ -50,12 +50,14 @@ if (VCPKG_TARGET_IS_WINDOWS) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) else() + set(ENV{GTKDOCIZE} true) vcpkg_configure_make( SOURCE_PATH ${SOURCE_PATH} AUTOCONFIG COPY_SOURCE OPTIONS --with-libiconv-prefix=${CURRENT_INSTALLED_DIR} + --disable-gtk-doc ) vcpkg_install_make() From ff6e9838724b3d12e76732ca334da231cc09164e Mon Sep 17 00:00:00 2001 From: Ilya Arzhannikov Date: Fri, 23 Apr 2021 17:41:04 +0200 Subject: [PATCH 10/11] @dg0yt was rite --- ports/libidn2/disable-gtk-doc.patch | 31 ----------------------------- ports/libidn2/portfile.cmake | 2 -- 2 files changed, 33 deletions(-) delete mode 100644 ports/libidn2/disable-gtk-doc.patch diff --git a/ports/libidn2/disable-gtk-doc.patch b/ports/libidn2/disable-gtk-doc.patch deleted file mode 100644 index 1bbe90d714fca1..00000000000000 --- a/ports/libidn2/disable-gtk-doc.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index b9c0e73..08807bf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -75,9 +75,12 @@ __asm__ (".symver versioned_symbol, versioned_symbol@IDN2_0.0.0"); - # check for gtk-doc - # - m4_ifdef([GTK_DOC_CHECK], [ --GTK_DOC_CHECK([1.14],[--flavour no-tmpl]) -+#GTK_DOC_CHECK([1.14],[--flavour no-tmpl]) - ],[ - AM_CONDITIONAL([ENABLE_GTK_DOC], false) -+AM_CONDITIONAL([GTK_DOC_BUILD_HTML], false) -+AM_CONDITIONAL([GTK_DOC_BUILD_PDF], false) -+AM_CONDITIONAL([HAVE_GTK_DOC], false) - ]) - # needed for some older versions of gtk-doc - m4_ifdef([GTK_DOC_USE_LIBTOOL], [], [ -diff --git a/gtk-doc.make b/gtk-doc.make -index 7d9a27f..973707f 100644 ---- a/gtk-doc.make -+++ b/gtk-doc.make -@@ -268,7 +268,7 @@ maintainer-clean-local: - - install-data-local: - @installfiles=`echo $(builddir)/html/*`; \ -- if test "$$installfiles" = '$(builddir)/html/*'; \ -+ if true; \ - then echo 1>&2 'Nothing to install' ; \ - else \ - if test -n "$(DOC_MODULE_VERSION)"; then \ diff --git a/ports/libidn2/portfile.cmake b/ports/libidn2/portfile.cmake index 061509e268f43f..55946fcc9581c3 100644 --- a/ports/libidn2/portfile.cmake +++ b/ports/libidn2/portfile.cmake @@ -11,8 +11,6 @@ vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH ARCHIVE ${ARCHIVE} REF ${IDN2_VERSION} - # PATCHES - # disable-gtk-doc.patch ) if (VCPKG_TARGET_IS_WINDOWS) From 17671c80dab4f1cd8498536ffd01d743c4ecfa75 Mon Sep 17 00:00:00 2001 From: Ilya Arzhannikov Date: Fri, 23 Apr 2021 17:42:06 +0200 Subject: [PATCH 11/11] ./vcpkg x-add-version libidn2 --overwrite-version --- versions/l-/libidn2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/l-/libidn2.json b/versions/l-/libidn2.json index 2edfbc1eb71fc2..8c85492c96929a 100644 --- a/versions/l-/libidn2.json +++ b/versions/l-/libidn2.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e4ab7a7b1d0a9c0dec0f367ebe6cbbf7a6978b8c", + "git-tree": "cad738e7d2fff6e1ac7c8a2bec14160aa127336f", "version": "2.3.0", "port-version": 3 },