From fdb49727a753150890d8d16d26d45fb86fda68bf Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 18 Mar 2026 15:35:05 -0700 Subject: links,links-x11: Upgrade to 3.20 Fix build with glibc 2.43+ Signed-off-by: Khem Raj --- .../0001-Adjust-for-c23-prototype-for-strchr.patch | 32 ++++++++++++++++++++++ meta-oe/recipes-support/links/links-x11_2.26.bb | 28 ------------------- meta-oe/recipes-support/links/links-x11_2.30.bb | 28 +++++++++++++++++++ meta-oe/recipes-support/links/links.inc | 1 + meta-oe/recipes-support/links/links_2.29.bb | 11 -------- meta-oe/recipes-support/links/links_2.30.bb | 11 ++++++++ 6 files changed, 72 insertions(+), 39 deletions(-) create mode 100644 meta-oe/recipes-support/links/files/0001-Adjust-for-c23-prototype-for-strchr.patch delete mode 100644 meta-oe/recipes-support/links/links-x11_2.26.bb create mode 100644 meta-oe/recipes-support/links/links-x11_2.30.bb delete mode 100644 meta-oe/recipes-support/links/links_2.29.bb create mode 100644 meta-oe/recipes-support/links/links_2.30.bb diff --git a/meta-oe/recipes-support/links/files/0001-Adjust-for-c23-prototype-for-strchr.patch b/meta-oe/recipes-support/links/files/0001-Adjust-for-c23-prototype-for-strchr.patch new file mode 100644 index 0000000000..856bdccdbe --- /dev/null +++ b/meta-oe/recipes-support/links/files/0001-Adjust-for-c23-prototype-for-strchr.patch @@ -0,0 +1,32 @@ +From 75003957e8f526738b479dff7d5d9a5419111f33 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 18 Mar 2026 15:30:37 -0700 +Subject: [PATCH] Adjust for c23 prototype for strchr + +in glibc 2.43+ functions like strchr, memchr, strstr +and friends are now const-preserving macros + +That means if you pass a const char *, strchr now returns const char *, +which breaks older code patterns that assumed char * or wrapped the +result in compatibility helpers + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + ftp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ftp.c b/ftp.c +index 7a8d05d..41c0a25 100644 +--- a/ftp.c ++++ b/ftp.c +@@ -768,7 +768,7 @@ do { \ + } while (0) + A(ftp_head); + ud = stracpy(get_url_data(c->url)); +- if (strchr(cast_const_char ud, POST_CHAR)) *strchr(cast_const_char ud, POST_CHAR) = 0; ++ if (strchr(ud, POST_CHAR)) *strchr(ud, POST_CHAR) = 0; + s0 = init_str(); + s0l = 0; + add_conv_str(&s0, &s0l, ud, (int)strlen(cast_const_char ud), -1); diff --git a/meta-oe/recipes-support/links/links-x11_2.26.bb b/meta-oe/recipes-support/links/links-x11_2.26.bb deleted file mode 100644 index cbee1f10f1..0000000000 --- a/meta-oe/recipes-support/links/links-x11_2.26.bb +++ /dev/null @@ -1,28 +0,0 @@ -require links.inc - -DEPENDS += "virtual/libx11" -RCONFLICTS:${PN} = "links" - -inherit features_check -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI += " file://links2.desktop \ - file://links2.png" - -SRC_URI[sha256sum] = "f05b3577f25dbe63e491c424f0ecb31f7bfadce9b2bc2f111dfed049c004c9cb" - -S = "${UNPACKDIR}/links-${PV}" - -EXTRA_OECONF = "--enable-graphics \ - --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \ - --without-libtiff --without-svgalib --without-fb \ - --without-directfb --without-pmshell --without-atheos \ - --with-x --without-gpm" - -do_install:append() { - install -d ${D}/${datadir}/applications - install -m 0644 ${UNPACKDIR}/links2.desktop ${D}/${datadir}/applications - install -d ${D}/${datadir}/pixmaps - install -m 0644 ${UNPACKDIR}/links2.png ${D}/${datadir}/pixmaps -} diff --git a/meta-oe/recipes-support/links/links-x11_2.30.bb b/meta-oe/recipes-support/links/links-x11_2.30.bb new file mode 100644 index 0000000000..29ea339d02 --- /dev/null +++ b/meta-oe/recipes-support/links/links-x11_2.30.bb @@ -0,0 +1,28 @@ +require links.inc + +DEPENDS += "virtual/libx11" +RCONFLICTS:${PN} = "links" + +inherit features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI += " file://links2.desktop \ + file://links2.png" + +SRC_URI[sha256sum] = "c4631c6b5a11527cdc3cb7872fc23b7f2b25c2b021d596be410dadb40315f166" + +S = "${UNPACKDIR}/links-${PV}" + +EXTRA_OECONF = "--enable-graphics \ + --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \ + --without-libtiff --without-svgalib --without-fb \ + --without-directfb --without-pmshell --without-atheos \ + --with-x --without-gpm" + +do_install:append() { + install -d ${D}/${datadir}/applications + install -m 0644 ${UNPACKDIR}/links2.desktop ${D}/${datadir}/applications + install -d ${D}/${datadir}/pixmaps + install -m 0644 ${UNPACKDIR}/links2.png ${D}/${datadir}/pixmaps +} diff --git a/meta-oe/recipes-support/links/links.inc b/meta-oe/recipes-support/links/links.inc index a255f0ba6b..5946d8be91 100644 --- a/meta-oe/recipes-support/links/links.inc +++ b/meta-oe/recipes-support/links/links.inc @@ -8,6 +8,7 @@ DEPENDS = "jpeg libpng flex openssl zlib" SRC_URI = "http://links.twibright.com/download/links-${PV}.tar.bz2 \ file://ac-prog-cxx.patch \ + file://0001-Adjust-for-c23-prototype-for-strchr.patch \ " PACKAGECONFIG ??= "" diff --git a/meta-oe/recipes-support/links/links_2.29.bb b/meta-oe/recipes-support/links/links_2.29.bb deleted file mode 100644 index e3a15d1819..0000000000 --- a/meta-oe/recipes-support/links/links_2.29.bb +++ /dev/null @@ -1,11 +0,0 @@ -require links.inc - -DEPENDS += "gpm" -RCONFLICTS:${PN} = "links-x11" - -EXTRA_OECONF = "--enable-graphics \ - --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \ - --without-libtiff --without-svgalib --with-fb \ - --without-directfb --without-pmshell --without-atheos \ - --without-x" -SRC_URI[sha256sum] = "22aa96c0b38e1a6f8f7ed9d7a4167a47fc37246097759ef6059ecf8f9ead7998" diff --git a/meta-oe/recipes-support/links/links_2.30.bb b/meta-oe/recipes-support/links/links_2.30.bb new file mode 100644 index 0000000000..2a344d11e5 --- /dev/null +++ b/meta-oe/recipes-support/links/links_2.30.bb @@ -0,0 +1,11 @@ +require links.inc + +DEPENDS += "gpm" +RCONFLICTS:${PN} = "links-x11" + +EXTRA_OECONF = "--enable-graphics \ + --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \ + --without-libtiff --without-svgalib --with-fb \ + --without-directfb --without-pmshell --without-atheos \ + --without-x" +SRC_URI[sha256sum] = "c4631c6b5a11527cdc3cb7872fc23b7f2b25c2b021d596be410dadb40315f166" -- cgit v1.2.3-54-g00ecf