[meta-oe,v2] xterm: upgrade 366 -> 367

Submitted by zangrc on April 1, 2021, 5:55 p.m. | Patch ID: 179534

Details

Message ID 1617299739-4528-1-git-send-email-zangrc.fnst@fujitsu.com
State New
Headers show

Commit Message

zangrc April 1, 2021, 5:55 p.m.
-License-Update: Copyright year updated to 2021.

Signed-off-by: Zang Ruochen <zangrc.fnst@fujitsu.com>
---
 .../recipes-graphics/xorg-app/{xterm_366.bb => xterm_367.bb}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-graphics/xorg-app/{xterm_366.bb => xterm_367.bb} (89%)

Patch hide | download patch | download mbox

diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_366.bb b/meta-oe/recipes-graphics/xorg-app/xterm_367.bb
similarity index 89%
rename from meta-oe/recipes-graphics/xorg-app/xterm_366.bb
rename to meta-oe/recipes-graphics/xorg-app/xterm_367.bb
index 969159bc5..e0d3dcec1 100644
--- a/meta-oe/recipes-graphics/xorg-app/xterm_366.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xterm_367.bb
@@ -2,13 +2,13 @@  require recipes-graphics/xorg-app/xorg-app-common.inc
 SUMMARY = "xterm is the standard terminal emulator for the X Window System"
 DEPENDS = "libxaw xorgproto libxext libxau libxinerama libxpm ncurses desktop-file-utils-native"
 
-LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=996b1ce0584c0747b17b57654cc81e8e"
+LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=987de9787175385203a1ea2482246a17"
 
 SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \
            file://0001-Add-configure-time-check-for-setsid.patch \
           "
 
-SRC_URI[sha256sum] = "858b2885963fe97e712739066aadc1baeba2b33a0016303a7fec7d38bc73bf6e"
+SRC_URI[sha256sum] = "27f1a8b1c756e269fd5684e60802b545f0be9b36b8b5d6bdbc840c6b000dc51f"
 
 PACKAGECONFIG ?= ""
 PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native"

Comments

Khem Raj April 2, 2021, 9:02 a.m.
patch needs to be refreshed

i see

ERROR: xterm-367-r0 do_patch: Fuzz detected:

Applying patch 0001-Add-configure-time-check-for-setsid.patch
patching file configure
Hunk #1 succeeded at 5605 (offset 194 lines).
patching file configure.in
patching file main.c
Hunk #1 succeeded at 2903 (offset 35 lines).
Hunk #2 succeeded at 4074 (offset 34 lines).
patching file xtermcfg.hin
Hunk #1 succeeded at 95 with fuzz 1 (offset -1 lines).


The context lines in the patches can be updated with devtool:

    devtool modify xterm
    devtool finish --force-patch-refresh xterm <layer_path>

Don't forget to review changes done by devtool!

ERROR: xterm-367-r0 do_patch: QA Issue: Patch log indicates that
patches do not apply cleanly. [patch-fuzz]

On Wed, Mar 31, 2021 at 10:55 PM zangrc <zangrc.fnst@fujitsu.com> wrote:
>
> -License-Update: Copyright year updated to 2021.
>
> Signed-off-by: Zang Ruochen <zangrc.fnst@fujitsu.com>
> ---
>  .../recipes-graphics/xorg-app/{xterm_366.bb => xterm_367.bb}  | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>  rename meta-oe/recipes-graphics/xorg-app/{xterm_366.bb => xterm_367.bb} (89%)
>
> diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_366.bb b/meta-oe/recipes-graphics/xorg-app/xterm_367.bb
> similarity index 89%
> rename from meta-oe/recipes-graphics/xorg-app/xterm_366.bb
> rename to meta-oe/recipes-graphics/xorg-app/xterm_367.bb
> index 969159bc5..e0d3dcec1 100644
> --- a/meta-oe/recipes-graphics/xorg-app/xterm_366.bb
> +++ b/meta-oe/recipes-graphics/xorg-app/xterm_367.bb
> @@ -2,13 +2,13 @@ require recipes-graphics/xorg-app/xorg-app-common.inc
>  SUMMARY = "xterm is the standard terminal emulator for the X Window System"
>  DEPENDS = "libxaw xorgproto libxext libxau libxinerama libxpm ncurses desktop-file-utils-native"
>
> -LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=996b1ce0584c0747b17b57654cc81e8e"
> +LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=987de9787175385203a1ea2482246a17"
>
>  SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \
>             file://0001-Add-configure-time-check-for-setsid.patch \
>            "
>
> -SRC_URI[sha256sum] = "858b2885963fe97e712739066aadc1baeba2b33a0016303a7fec7d38bc73bf6e"
> +SRC_URI[sha256sum] = "27f1a8b1c756e269fd5684e60802b545f0be9b36b8b5d6bdbc840c6b000dc51f"
>
>  PACKAGECONFIG ?= ""
>  PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native"
> --
> 2.25.1
>
>
> 
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#90520): https://lists.openembedded.org/g/openembedded-devel/message/90520
Mute This Topic: https://lists.openembedded.org/mt/81769532/3617530
Group Owner: openembedded-devel+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-