| Message ID | 20250318043846.2422141-5-raj.khem@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [01/24] webkitgtk: 2.46.6 -> 2.48.0 | expand |
On Tue, 18 Mar 2025 at 05:39, Khem Raj via lists.openembedded.org <raj.khem=gmail.com@lists.openembedded.org> wrote: > Brings needed fixes to build with GCC15 > # commit id corresponds to the revision in package version > -SRCREV = "1c55d64d9d3e00399a21f04e9cac1e472ab5f70a" > +# v6_5_20250315 > +SRCREV = "5fa5aea6d020750dbe601c1136c7cc35a8a53dd8" > +PV .= "+20250315" I know we had them in the past, but ncurses' YYYYMMDD are all random development snapshots, and I wouldn't want to update to them. Is it possible to cherry-pick needed fixes? Alex
On Tue, Mar 18, 2025 at 2:38 AM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > > On Tue, 18 Mar 2025 at 05:39, Khem Raj via lists.openembedded.org > <raj.khem=gmail.com@lists.openembedded.org> wrote: > > Brings needed fixes to build with GCC15 > > # commit id corresponds to the revision in package version > > -SRCREV = "1c55d64d9d3e00399a21f04e9cac1e472ab5f70a" > > +# v6_5_20250315 > > +SRCREV = "5fa5aea6d020750dbe601c1136c7cc35a8a53dd8" > > +PV .= "+20250315" > > I know we had them in the past, but ncurses' YYYYMMDD are all random > development snapshots, and I wouldn't want to update to them. Is it > possible to cherry-pick needed fixes? Fedora is using these releases as well, so I am hoping that it is sane. > > Alex
On Tue, 18 Mar 2025 at 17:08, Khem Raj <raj.khem@gmail.com> wrote: > > I know we had them in the past, but ncurses' YYYYMMDD are all random > > development snapshots, and I wouldn't want to update to them. Is it > > possible to cherry-pick needed fixes? > > Fedora is using these releases as well, so I am hoping that it is sane. Fedora is wrong too. They're *not* releases. I have to put my foot down here Khem: https://github.com/ThomasDickey/ncurses-snapshots/blob/master/NEWS Alex
On Tue, 18 Mar 2025 at 17:20, Alexander Kanavin via lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org> wrote: > > On Tue, 18 Mar 2025 at 17:08, Khem Raj <raj.khem@gmail.com> wrote: > > > I know we had them in the past, but ncurses' YYYYMMDD are all random > > > development snapshots, and I wouldn't want to update to them. Is it > > > possible to cherry-pick needed fixes? > > > > Fedora is using these releases as well, so I am hoping that it is sane. > > Fedora is wrong too. They're *not* releases. I have to put my foot > down here Khem: > > https://github.com/ThomasDickey/ncurses-snapshots/blob/master/NEWS That said, upstream doesn't seem to be doing proper commits: they just roll up any changes into those weekly snapshots: https://github.com/ThomasDickey/ncurses-snapshots/commits/master/ I'd still hope you can find the snapshot commit where the gcc15 fixes are, and extract just the needed pieces from it. Alex
diff --git a/meta/recipes-core/ncurses/files/0001-tic-hang.patch b/meta/recipes-core/ncurses/files/0001-tic-hang.patch index 8cb92a39398..d2df9680ffc 100644 --- a/meta/recipes-core/ncurses/files/0001-tic-hang.patch +++ b/meta/recipes-core/ncurses/files/0001-tic-hang.patch @@ -16,11 +16,9 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> misc/terminfo.src | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) -diff --git a/misc/terminfo.src b/misc/terminfo.src -index 5d575b8e..f9cc6880 100644 --- a/misc/terminfo.src +++ b/misc/terminfo.src -@@ -6518,12 +6518,11 @@ konsole-xf3x|KDE console window with keyboard for XFree86 3.x xterm, +@@ -6577,12 +6577,11 @@ konsole-xf3x|KDE console window with key # The value for kbs (see konsole-vt100) reflects local customization rather # than the settings used for XFree86 xterm. konsole-xf4x|KDE console window with keyboard for XFree86 4.x xterm, diff --git a/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch b/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch index 11ca66c8e8f..1353405ee25 100644 --- a/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch +++ b/meta/recipes-core/ncurses/files/0002-configure-reproducible.patch @@ -17,11 +17,9 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure b/configure -index 488d93fc..005d44e2 100755 --- a/configure +++ b/configure -@@ -5129,7 +5129,7 @@ else +@@ -5448,7 +5448,7 @@ else ;; (*) cf_cv_ar_flags=unknown diff --git a/meta/recipes-core/ncurses/files/0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch b/meta/recipes-core/ncurses/files/0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch index d89399bbe51..c2e3984db92 100644 --- a/meta/recipes-core/ncurses/files/0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch +++ b/meta/recipes-core/ncurses/files/0003-gen-pkgconfig.in-Do-not-include-LDFLAGS-in-generated.patch @@ -14,11 +14,9 @@ Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> misc/gen-pkgconfig.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in -index 89a5cd4a..07d94d17 100644 --- a/misc/gen-pkgconfig.in +++ b/misc/gen-pkgconfig.in -@@ -83,7 +83,7 @@ if [ "$includedir" != "/usr/include" ]; then +@@ -83,7 +83,7 @@ if [ "$includedir" != "/usr/include" ]; fi lib_flags= diff --git a/meta/recipes-core/ncurses/files/exit_prototype.patch b/meta/recipes-core/ncurses/files/exit_prototype.patch index 299852d2c07..09a9d5dce1b 100644 --- a/meta/recipes-core/ncurses/files/exit_prototype.patch +++ b/meta/recipes-core/ncurses/files/exit_prototype.patch @@ -9,19 +9,26 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> configure | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/configure b/configure -index 005d44e2..72fa6c23 100755 --- a/configure +++ b/configure -@@ -3462,6 +3462,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext" +@@ -3763,6 +3763,7 @@ rm -f "conftest.$ac_objext" "conftest.$a cat >"conftest.$ac_ext" <<_ACEOF - #line 3463 "configure" + #line 3764 "configure" #include "confdefs.h" +#include <stdlib.h> $ac_declaration int main (void) -@@ -13533,6 +13534,7 @@ cat >"conftest.$ac_ext" <<_ACEOF +@@ -3821,7 +3822,7 @@ echo $ECHO_N "checking if $CXX works... + + save_CPPFLAGS="$CPPFLAGS" + eval cf_includedir=${includedir} +- CPPFLAGS="$CPPFLAGS -I${cf_includedir}" ++ CPPFLAGS="$CPPFLAGS " + + cat >"conftest.$ac_ext" <<_ACEOF + #line 3827 "configure" +@@ -13891,6 +13892,7 @@ cat >"conftest.$ac_ext" <<_ACEOF #include <stdlib.h> #include <stdarg.h> #include <stdio.h> diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index 3f93550cf99..513cb4c1c9c 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/meta/recipes-core/ncurses/ncurses.inc @@ -2,7 +2,7 @@ SUMMARY = "The New Curses library" DESCRIPTION = "SVr4 and XSI-Curses compatible curses library and terminfo tools including tic, infocmp, captoinfo. Supports color, multiple highlights, forms-drawing characters, and automatic recognition of keypad and function-key sequences. Extensions include resizable windows and mouse support on both xterm and Linux console using the gpm library." HOMEPAGE = "http://www.gnu.org/software/ncurses/ncurses.html" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=6f291ee54551d9d8d992ecd623fe4bc7;endline=27" +LIC_FILES_CHKSUM = "file://COPYING;md5=c534844fa5a74d14ae8fa3d9b3b42138;endline=27" SECTION = "libs" DEPENDS = "ncurses-native" DEPENDS:class-native = "" diff --git a/meta/recipes-core/ncurses/ncurses_6.5.bb b/meta/recipes-core/ncurses/ncurses_6.5.bb index 2e3ee337ea4..980671218ca 100644 --- a/meta/recipes-core/ncurses/ncurses_6.5.bb +++ b/meta/recipes-core/ncurses/ncurses_6.5.bb @@ -6,10 +6,12 @@ SRC_URI += "file://0001-tic-hang.patch \ file://exit_prototype.patch \ " # commit id corresponds to the revision in package version -SRCREV = "1c55d64d9d3e00399a21f04e9cac1e472ab5f70a" +# v6_5_20250315 +SRCREV = "5fa5aea6d020750dbe601c1136c7cc35a8a53dd8" +PV .= "+20250315" S = "${WORKDIR}/git" EXTRA_OECONF += "--with-abi-version=5" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+_\d+)$" -# This is needed when using patchlevel versions like 6.1+20181013 -#CVE_VERSION = "${@d.getVar("PV").split('+')[0]}.${@d.getVar("PV").split('+')[1]}" +# This is needed when using patchlevel versions like 6.5+20250315 +CVE_VERSION = "${@d.getVar("PV").split('+')[0]}.${@d.getVar("PV").split('+')[1]}"
Brings needed fixes to build with GCC15 License-Update: Copyright Years changed Signed-off-by: Khem Raj <raj.khem@gmail.com> --- .../ncurses/files/0001-tic-hang.patch | 4 +--- .../files/0002-configure-reproducible.patch | 4 +--- ...in-Do-not-include-LDFLAGS-in-generated.patch | 4 +--- .../ncurses/files/exit_prototype.patch | 17 ++++++++++++----- meta/recipes-core/ncurses/ncurses.inc | 2 +- meta/recipes-core/ncurses/ncurses_6.5.bb | 8 +++++--- 6 files changed, 21 insertions(+), 18 deletions(-)