libdecor: update to latest commit

https://gitlab.freedesktop.org/libdecor/libdecor/-/commit/bb2ec856aa2ffe30530d6b655d9accec53bbf87d

The check for conflicting symbols has been fixed and thus the nasty hack can be removed

Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

2 files changed, 1 insertions, 35 deletions

diff --git a/meta-oe/recipes-graphics/libdecor/libdecor/0001-libdecor-gtk.c-dont-skip-for-conflicting-symbols.patch b/meta-oe/recipes-graphics/libdecor/libdecor/0001-libdecor-gtk.c-dont-skip-for-conflicting-symbols.patch
deleted file mode 100644
index 9ecbdf3b3..000000000
--- a/meta-oe/recipes-graphics/libdecor/libdecor/0001-libdecor-gtk.c-dont-skip-for-conflicting-symbols.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From fb6eb15b34b5b07a431bb4c3585341411a3e088f Mon Sep 17 00:00:00 2001
-From: Markus Volk <f_l_k@t-online.de>
-Date: Tue, 28 Feb 2023 13:42:18 +0100
-Subject: [PATCH] libdecor-gtk.c: dont skip for conflicting_symbols
-
-This is a hack that should be removed, once the underlying bug in glibc was fixed and
-libdecor was updated to use dlmopen() instead of dlopen()
-
-https://gitlab.freedesktop.org/libdecor/libdecor/-/issues/47
-https://gitlab.freedesktop.org/libdecor/libdecor/-/issues/44
-
----
-Upstream-Status: Pending
-
- src/plugins/gtk/libdecor-gtk.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/plugins/gtk/libdecor-gtk.c b/src/plugins/gtk/libdecor-gtk.c
-index 228161e..fd91afb 100644
---- a/src/plugins/gtk/libdecor-gtk.c
-+++ b/src/plugins/gtk/libdecor-gtk.c
-@@ -2606,7 +2606,7 @@ libdecor_plugin_description = {
-        .priorities = priorities,
-        .constructor = libdecor_plugin_new,
-        .conflicting_symbols = {
--               "png_free",
-+               //"png_free",
-                NULL,
-        },
- };
--- 
-2.34.1
-
diff --git a/meta-oe/recipes-graphics/libdecor/libdecor_0.1.99.bb b/meta-oe/recipes-graphics/libdecor/libdecor_0.1.99.bb
index ed0b05f41..078058e8b 100644
--- a/meta-oe/recipes-graphics/libdecor/libdecor_0.1.99.bb
+++ b/meta-oe/recipes-graphics/libdecor/libdecor_0.1.99.bb
@@ -4,7 +4,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7ae2be7fb1637141840314b51970a9f7"
 
 SRC_URI = " \
     git://gitlab.freedesktop.org/libdecor/libdecor.git;protocol=https;branch=master \
-    file://0001-libdecor-gtk.c-dont-skip-for-conflicting-symbols.patch \
 "
 
 DEPENDS = " \
@@ -16,7 +15,7 @@ DEPENDS = " \
 "
 
 S = "${WORKDIR}/git"
-SRCREV = "a254d0c2ff0cbfcf0bbf14cc67cc403640880c01"
+SRCREV = "0d63d125f899dbb1b932468f2f3b911f9c121e58"
 
 PACKAGECONFIG ?= "dbus ${@bb.utils.filter('DISTRO_FEATURES', 'gtk+3', d)}"