From d60acb96cc308bd08e5b768e7868da4c7cb60a49 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Tue, 6 Aug 2024 16:45:46 +0800 Subject: icewm: upgrade 3.4.5 -> 3.6.0 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...c-skip-running-test-program-when-cross-co.patch | 14 ++++--- meta-oe/recipes-extended/icewm/icewm_3.4.5.bb | 47 ---------------------- meta-oe/recipes-extended/icewm/icewm_3.6.0.bb | 47 ++++++++++++++++++++++ 3 files changed, 55 insertions(+), 53 deletions(-) delete mode 100644 meta-oe/recipes-extended/icewm/icewm_3.4.5.bb create mode 100644 meta-oe/recipes-extended/icewm/icewm_3.6.0.bb 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 c5e210afcd..994f252a15 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 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 --- - 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 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 ]],[[ ]) AC_MSG_CHECKING([for strlcat]) @@ -30,7 +32,7 @@ Signed-off-by: Naveen Saini 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 ]],[[ [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.4.5.bb deleted file mode 100644 index 8948da77bf..0000000000 --- a/meta-oe/recipes-extended/icewm/icewm_3.4.5.bb +++ /dev/null @@ -1,47 +0,0 @@ -DESCRIPTION = "Ice Window Manager (IceWM)" -LICENSE = "GPL-2.0-only" -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" - -UPSTREAM_CHECK_URI = "https://github.com/ice-wm/${BPN}/releases" -UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)" - -inherit autotools pkgconfig gettext perlnative features_check qemu update-alternatives -REQUIRED_DISTRO_FEATURES = "x11" - -EXTRA_OECONF += "--with-libdir=${datadir}/icewm \ - --with-cfgdir=${sysconfdir}/icewm \ - --with-docdir=${docdir}/icewm \ - --enable-fribidi \ - --enable-xinerama \ - --enable-shape" - -DEPENDS = "asciidoc-native fontconfig fribidi gdk-pixbuf imlib2 libxft libxpm libxrandr \ - libxinerama libice libsm libx11 libxext libxrender libxcomposite libxdamage \ - libxfixes" -DEPENDS:append = " qemu-native" -RDEPENDS:${PN} = "perl fribidi imlib2 imlib2-loaders" - -do_compile:prepend:class-target() { - - cd ${B} - oe_runmake -C src genpref - - qemu_binary="${@qemu_wrapper_cmdline(d, '${STAGING_DIR_TARGET}',['${B}/src/.libs','${STAGING_DIR_TARGET}/${libdir}','${STAGING_DIR_TARGET}/${base_libdir}'])}" - cat >qemuwrapper < src/preferences -} - -ALTERNATIVE:${PN} = "x-session-manager" -ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/icewm-session" -ALTERNATIVE_PRIORITY_${PN} = "100" - -FILES:${PN} += "${datadir}/xsessions" diff --git a/meta-oe/recipes-extended/icewm/icewm_3.6.0.bb b/meta-oe/recipes-extended/icewm/icewm_3.6.0.bb new file mode 100644 index 0000000000..c6202905d0 --- /dev/null +++ b/meta-oe/recipes-extended/icewm/icewm_3.6.0.bb @@ -0,0 +1,47 @@ +DESCRIPTION = "Ice Window Manager (IceWM)" +LICENSE = "GPL-2.0-only" +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] = "979fafd3a3371f73cbafe592e2be052475637ac4bb4385bb132331fd6924bc76" + +UPSTREAM_CHECK_URI = "https://github.com/ice-wm/${BPN}/releases" +UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)" + +inherit autotools pkgconfig gettext perlnative features_check qemu update-alternatives +REQUIRED_DISTRO_FEATURES = "x11" + +EXTRA_OECONF += "--with-libdir=${datadir}/icewm \ + --with-cfgdir=${sysconfdir}/icewm \ + --with-docdir=${docdir}/icewm \ + --enable-fribidi \ + --enable-xinerama \ + --enable-shape" + +DEPENDS = "asciidoc-native fontconfig fribidi gdk-pixbuf imlib2 libxft libxpm libxrandr \ + libxinerama libice libsm libx11 libxext libxrender libxcomposite libxdamage \ + libxfixes" +DEPENDS:append = " qemu-native" +RDEPENDS:${PN} = "perl fribidi imlib2 imlib2-loaders" + +do_compile:prepend:class-target() { + + cd ${B} + oe_runmake -C src genpref + + qemu_binary="${@qemu_wrapper_cmdline(d, '${STAGING_DIR_TARGET}',['${B}/src/.libs','${STAGING_DIR_TARGET}/${libdir}','${STAGING_DIR_TARGET}/${base_libdir}'])}" + cat >qemuwrapper < src/preferences +} + +ALTERNATIVE:${PN} = "x-session-manager" +ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/icewm-session" +ALTERNATIVE_PRIORITY_${PN} = "100" + +FILES:${PN} += "${datadir}/xsessions" -- cgit v1.2.3-54-g00ecf