diff mbox series

[meta-oe,12/60] icewm: upgrade 3.4.5 -> 3.6.0

Message ID 1722933994-32549-12-git-send-email-wangmy@fujitsu.com
State Accepted
Headers show
Series [meta-webserver,01/60] apache2: upgrade 2.4.61 -> 2.4.62 | expand

Commit Message

Mingyu Wang (Fujitsu) Aug. 6, 2024, 8:45 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...c-skip-running-test-program-when-cross-co.patch | 14 ++++++++------
 .../icewm/{icewm_3.4.5.bb => icewm_3.6.0.bb}       |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)
 rename meta-oe/recipes-extended/icewm/{icewm_3.4.5.bb => icewm_3.6.0.bb} (94%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-extended/icewm/icewm/0001-configure.ac-skip-running-test-program-when-cross-co.patch b/meta-oe/recipes-extended/icewm/icewm/0001-configure.ac-skip-running-test-program-when-cross-co.patch
index c5e210afc..994f252a1 100644
--- a/meta-oe/recipes-extended/icewm/icewm/0001-configure.ac-skip-running-test-program-when-cross-co.patch
+++ b/meta-oe/recipes-extended/icewm/icewm/0001-configure.ac-skip-running-test-program-when-cross-co.patch
@@ -1,4 +1,4 @@ 
-From c2a67c1f62175ab061bc03d10dd766f968c6a097 Mon Sep 17 00:00:00 2001
+From 06207b1340963e77f2e5d08ebf9727180ad86a36 Mon Sep 17 00:00:00 2001
 From: Naveen Saini <naveen.kumar.saini@intel.com>
 Date: Fri, 2 Aug 2019 10:41:26 +0800
 Subject: [PATCH] configure.ac: skip running test program when cross-compiling
@@ -7,12 +7,14 @@  Upstream-Status: Inappropriate [OE-Specific]
 
 Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
 ---
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ configure.ac | 19 ++-----------------
+ 1 file changed, 2 insertions(+), 17 deletions(-)
 
+diff --git a/configure.ac b/configure.ac
+index c4a9b02..3f5a792 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -160,7 +160,7 @@ AC_CHECK_FUNCS([backtrace_symbols_fd mem
+@@ -151,7 +151,7 @@ AC_CHECK_FUNCS([backtrace_symbols_fd memrchr sysctl sysctlbyname])
  AC_FUNC_SELECT_ARGTYPES
  
  AC_MSG_CHECKING([for strlcpy])
@@ -21,7 +23,7 @@  Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
                 char a[2];
                 if (strlcpy(a, "yes", 2) != 3)
                     return 1;]])],
-@@ -176,7 +176,7 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[#includ
+@@ -167,7 +167,7 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]],[[
                ])
  
  AC_MSG_CHECKING([for strlcat])
@@ -30,7 +32,7 @@  Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
                 char a[4] = "no";
                 if (strlcat(a, "yes", 4) != 5)
                     return 1;]])],
-@@ -191,21 +191,6 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[#includ
+@@ -182,21 +182,6 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]],[[
                             [Define to 1 if you have the strlcat function.])
                ])
  
diff --git a/meta-oe/recipes-extended/icewm/icewm_3.4.5.bb b/meta-oe/recipes-extended/icewm/icewm_3.6.0.bb
similarity index 94%
rename from meta-oe/recipes-extended/icewm/icewm_3.4.5.bb
rename to meta-oe/recipes-extended/icewm/icewm_3.6.0.bb
index 8948da77b..c6202905d 100644
--- a/meta-oe/recipes-extended/icewm/icewm_3.4.5.bb
+++ b/meta-oe/recipes-extended/icewm/icewm_3.6.0.bb
@@ -5,7 +5,7 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=4a26952467ef79a7efca4a9cf52d417b"
 SRC_URI = "https://github.com/ice-wm/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.lz \
            file://0001-configure.ac-skip-running-test-program-when-cross-co.patch \
            "
-SRC_URI[sha256sum] = "8d1afe9a2d5e28e88261b68906337449307e53f06c08218e1a6409083998a5f1"
+SRC_URI[sha256sum] = "979fafd3a3371f73cbafe592e2be052475637ac4bb4385bb132331fd6924bc76"
 
 UPSTREAM_CHECK_URI = "https://github.com/ice-wm/${BPN}/releases"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"