diff mbox series

[09/49] libxcb: update 1.14 -> 1.15

Message ID 20220518105843.3299331-9-alex@linutronix.de
State Accepted, archived
Commit 300afee4835c451db139aff6d5a2a465ca6b14f5
Headers show
Series [01/49] sato: work around missing icons in adwaita 42.0 | expand

Commit Message

Alexander Kanavin May 18, 2022, 10:58 a.m. UTC 
Drop disable-check.patch, with recipe-specific sysroots
it is no longer necessary.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../xorg-lib/libxcb/disable-check.patch       | 25 -------------------
 .../{libxcb_1.14.bb => libxcb_1.15.bb}        |  6 ++---
 2 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch
 rename meta/recipes-graphics/xorg-lib/{libxcb_1.14.bb => libxcb_1.15.bb} (83%)
diff mbox series

Patch

diff --git a/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch b/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch
deleted file mode 100644
index c0efbdc213..0000000000
--- a/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch
+++ /dev/null
@@ -1,25 +0,0 @@ 
-The "check" package is checked for without an explicit enable/disable option,
-which can lead to non-deterministic build issues with both check and libxslt.
-
-As the unit test suite is minimal at present, simply disable the test suite.  In
-the future if the test suite is expanded this can be made conditional on the
-ptest DISTRO_FEATURE.
-
-Upstream-Status: Inappropriate
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-
-Index: libxcb-1.12/configure.ac
-===================================================================
---- libxcb-1.12.orig/configure.ac
-+++ libxcb-1.12/configure.ac
-@@ -36,7 +36,8 @@ if test x"$HAVE_DOT" = xno; then
-     AC_MSG_WARN([dot not found - doxygen targets will be skipped])
- fi
- 
--PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no])
-+dnl PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no])
-+HAVE_CHECK=no
- AM_CONDITIONAL(HAVE_CHECK, test x$HAVE_CHECK = xyes)
- 
- XSLTPROC=no
diff --git a/meta/recipes-graphics/xorg-lib/libxcb_1.14.bb b/meta/recipes-graphics/xorg-lib/libxcb_1.15.bb
similarity index 83%
rename from meta/recipes-graphics/xorg-lib/libxcb_1.14.bb
rename to meta/recipes-graphics/xorg-lib/libxcb_1.15.bb
index 5341bbd4bc..839577326e 100644
--- a/meta/recipes-graphics/xorg-lib/libxcb_1.14.bb
+++ b/meta/recipes-graphics/xorg-lib/libxcb_1.15.bb
@@ -9,11 +9,9 @@  SECTION = "x11/libs"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7"
 
-SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.xz \
-           file://disable-check.patch \
-          "
+SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.xz"
 
-SRC_URI[sha256sum] = "a55ed6db98d43469801262d81dc2572ed124edc3db31059d4e9916eb9f844c34"
+SRC_URI[sha256sum] = "cc38744f817cf6814c847e2df37fcb8997357d72fa4bcbc228ae0fe47219a059"
 
 BBCLASSEXTEND = "native nativesdk"