mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-15 16:07:26 +00:00
icewm: upgrade 3.8.2 -> 4.0.0
Refresh the cross-compile configure.ac patch for 4.0.0. Its configure.ac now requires the xcursor pkg-config module in the core PKG_CHECK_MODULES, which the recipe never depended on, so do_configure fails: checking for fontconfig xrender xcomposite xcursor xdamage xfixes xext x11... no configure: error: Package requirements (...) were not met: Package 'xcursor' not found Add libxcursor to DEPENDS. Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
+4
-4
@@ -1,4 +1,4 @@
|
|||||||
From bcf7da314d4cd1db1708d48c908ab7da797a733b Mon Sep 17 00:00:00 2001
|
From d505f384aea5e565c4207e026b8c0dac485a741a Mon Sep 17 00:00:00 2001
|
||||||
From: Naveen Saini <naveen.kumar.saini@intel.com>
|
From: Naveen Saini <naveen.kumar.saini@intel.com>
|
||||||
Date: Fri, 2 Aug 2019 10:41:26 +0800
|
Date: Fri, 2 Aug 2019 10:41:26 +0800
|
||||||
Subject: [PATCH] configure.ac: skip running test program when cross-compiling
|
Subject: [PATCH] configure.ac: skip running test program when cross-compiling
|
||||||
@@ -11,7 +11,7 @@ Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
|
|||||||
1 file changed, 2 insertions(+), 17 deletions(-)
|
1 file changed, 2 insertions(+), 17 deletions(-)
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
diff --git a/configure.ac b/configure.ac
|
||||||
index 7d16afb..65cd194 100644
|
index 8d3dfea..b21361e 100644
|
||||||
--- a/configure.ac
|
--- a/configure.ac
|
||||||
+++ b/configure.ac
|
+++ b/configure.ac
|
||||||
@@ -152,7 +152,7 @@ AC_CHECK_FUNCS([backtrace_symbols_fd memrchr sysctl sysctlbyname \
|
@@ -152,7 +152,7 @@ AC_CHECK_FUNCS([backtrace_symbols_fd memrchr sysctl sysctlbyname \
|
||||||
@@ -51,6 +51,6 @@ index 7d16afb..65cd194 100644
|
|||||||
- ])
|
- ])
|
||||||
- ])
|
- ])
|
||||||
-
|
-
|
||||||
PKG_CHECK_MODULES([CORE],[fontconfig xrender xcomposite xdamage xfixes xext x11])
|
PKG_CHECK_MODULES([CORE],[fontconfig xrender xcomposite
|
||||||
|
xcursor xdamage xfixes xext x11])
|
||||||
AC_SUBST([CORE_CFLAGS])
|
AC_SUBST([CORE_CFLAGS])
|
||||||
AC_SUBST([CORE_LIBS])
|
|
||||||
|
|||||||
+2
-2
@@ -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 \
|
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 \
|
file://0001-configure.ac-skip-running-test-program-when-cross-co.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[sha256sum] = "c64b1b7c8ee262a3c4796be57349a3198998564d70ed26f11e724e1b73d48394"
|
SRC_URI[sha256sum] = "b8b22a2f0460c51f92ba785102bd122707966a618bb872c95fa6e6801d620cd1"
|
||||||
|
|
||||||
UPSTREAM_CHECK_URI = "https://github.com/ice-wm/${BPN}/releases"
|
UPSTREAM_CHECK_URI = "https://github.com/ice-wm/${BPN}/releases"
|
||||||
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
|
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
|
||||||
@@ -21,7 +21,7 @@ EXTRA_OECONF += "--with-libdir=${datadir}/icewm \
|
|||||||
--enable-shape"
|
--enable-shape"
|
||||||
|
|
||||||
DEPENDS = "asciidoc-native fontconfig fribidi gdk-pixbuf imlib2 libxft libxpm libxrandr \
|
DEPENDS = "asciidoc-native fontconfig fribidi gdk-pixbuf imlib2 libxft libxpm libxrandr \
|
||||||
libxinerama libice libsm libx11 libxext libxrender libxcomposite libxdamage \
|
libxinerama libice libsm libx11 libxext libxrender libxcomposite libxcursor libxdamage \
|
||||||
libxfixes"
|
libxfixes"
|
||||||
DEPENDS:append = " qemu-native"
|
DEPENDS:append = " qemu-native"
|
||||||
RDEPENDS:${PN} = "perl fribidi imlib2 imlib2-loaders"
|
RDEPENDS:${PN} = "perl fribidi imlib2 imlib2-loaders"
|
||||||
Reference in New Issue
Block a user