diff --git a/ports/gdbm/fix-readline-linkage.patch b/ports/gdbm/fix-readline-linkage.patch new file mode 100644 index 0000000000..e5886efa59 --- /dev/null +++ b/ports/gdbm/fix-readline-linkage.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index d7458e6..18fae46 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -122,7 +122,7 @@ AC_CHECK_MEMBERS([struct stat.st_blksize, struct stat.st_mtim, struct stat.st_mt + AM_CONDITIONAL([COMPAT_OPT], [test "$want_compat" = yes]) + + # Check for Curses libs. +-for lib in ncurses curses termcap ++for lib in ncursesw ncurses curses termcap + do + AC_CHECK_LIB($lib, tputs, [CURSES_LIBS="-l$lib"; break]) + done diff --git a/ports/gdbm/portfile.cmake b/ports/gdbm/portfile.cmake index d2fea2a2e6..f83838b284 100644 --- a/ports/gdbm/portfile.cmake +++ b/ports/gdbm/portfile.cmake @@ -3,12 +3,14 @@ vcpkg_download_distfile(ARCHIVE "https://ftp.gnu.org/gnu/gdbm/gdbm-${VERSION}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gdbm/gdbm-${VERSION}.tar.gz" FILENAME "gdbm-${VERSION}.tar.gz" - SHA512 401ff8c707079f21da1ac1d6f4714a87f224b6f41943078487dc891be49f51fd1ac7a32fd599aae0fad185f2c6ba7432616d328fd6aaab068eb54db9562ff7fa + SHA512 44aafe254f0950a8f5215d8f1337674f07b19f2a375f6eb19a7e39690028c80c3774b705c2b76b470ae74042b21f2ca77d02f6f57aa2ee50296db801220a3352 ) vcpkg_extract_source_archive( SOURCE_PATH ARCHIVE "${ARCHIVE}" + PATCHES + fix-readline-linkage.patch ) vcpkg_list(SET options) diff --git a/ports/gdbm/vcpkg.json b/ports/gdbm/vcpkg.json index f0f1f459bc..51aa52a1a9 100644 --- a/ports/gdbm/vcpkg.json +++ b/ports/gdbm/vcpkg.json @@ -1,12 +1,15 @@ { "name": "gdbm", - "version": "1.24", - "port-version": 1, + "version": "1.26", "description": "GDBM is a library of database functions that use extensible hashing and works similar to the standard UNIX dbm.", "homepage": "https://www.gnu.org.ua/software/gdbm/gdbm.html", - "license": "GPL-3.0-only", + "license": "GPL-3.0-or-later", "supports": "linux", "dependencies": [ + { + "name": "gettext", + "host": true + }, { "name": "vcpkg-make", "host": true diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index 908687c0cd..03f8df9397 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -347,7 +347,6 @@ gdal[arrow,parquet](!(arm64 | x64))=cascade gdal[aws-ec2-windows](!windows)=cascade gdal[iconv]:arm64-linux=feature-fails gdal[libxml2]:arm64-linux=feature-fails -gdbm[readline]:arm64-linux=feature-fails gdk-pixbuf[introspection]:arm64-windows=skip # needs arm64 host gegl:arm64-osx=fail # meson bug on osx. See https://github.com/microsoft/vcpkg/issues/44411 geogram:arm64-linux=fail # Could NOT find Threads (missing: Threads_FOUND) diff --git a/versions/baseline.json b/versions/baseline.json index ceb0786939..9e92f1f99c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3361,8 +3361,8 @@ "port-version": 2 }, "gdbm": { - "baseline": "1.24", - "port-version": 1 + "baseline": "1.26", + "port-version": 0 }, "gdcm": { "baseline": "3.2.7", diff --git a/versions/g-/gdbm.json b/versions/g-/gdbm.json index f121028a3d..a888574790 100644 --- a/versions/g-/gdbm.json +++ b/versions/g-/gdbm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cbfb96824b599a83049117f7a9e6de4e99d43dfc", + "version": "1.26", + "port-version": 0 + }, { "git-tree": "e0402af6ea114205282de7f19abbb88f45bc5bc0", "version": "1.24",