diff --git a/recipes-lxqt/obconf-qt/files/Fix-invalid-conversion-from-xmlError.patch b/recipes-lxqt/obconf-qt/files/Fix-invalid-conversion-from-xmlError.patch deleted file mode 100644 index ede8a55e..00000000 --- a/recipes-lxqt/obconf-qt/files/Fix-invalid-conversion-from-xmlError.patch +++ /dev/null @@ -1,34 +0,0 @@ -Fix invalid conversion from xmlError - -src/obconf-qt.cpp: In function 'int main(int, char**)': -src/obconf-qt.cpp:233:36: error: invalid conversion from 'const xmlError*' {aka 'const _xmlError*'} to 'xmlErrorPtr' {aka '_xmlError*'} [-fpermissive] - -Upstream-Status: Backport[https://github.com/lxqt/obconf-qt/commit/9fc5e566ea6559c27238c9dd5ae914b767f6c251] - -Signed-off-by: Rob Woolley - -From 9fc5e566ea6559c27238c9dd5ae914b767f6c251 Mon Sep 17 00:00:00 2001 -From: Tsu Jan -Date: Sun, 14 Jan 2024 14:28:24 +0330 -Subject: [PATCH] Fixed compilation - -Fixes https://github.com/lxqt/obconf-qt/issues/224 ---- - CHANGELOG | 4 ++++ - CMakeLists.txt | 2 +- - src/obconf-qt.cpp | 2 +- - 3 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/obconf-qt.cpp b/src/obconf-qt.cpp -index e07c236..0d5b442 100644 ---- a/src/obconf-qt.cpp -+++ b/src/obconf-qt.cpp -@@ -230,7 +230,7 @@ int main(int argc, char** argv) { - - /* look for parsing errors */ - { -- xmlErrorPtr e = xmlGetLastError(); -+ const xmlError *e = xmlGetLastError(); - - if(e) { - QString message = QObject::tr("Error while parsing the Openbox configuration file. Your configuration file is not valid XML.\n\nMessage: %1") diff --git a/recipes-lxqt/obconf-qt/obconf-qt.bb b/recipes-lxqt/obconf-qt/obconf-qt.bb index 7cab0b8b..4bf827cc 100644 --- a/recipes-lxqt/obconf-qt/obconf-qt.bb +++ b/recipes-lxqt/obconf-qt/obconf-qt.bb @@ -6,8 +6,7 @@ inherit lxqt qt5-translation pkgconfig DEPENDS += "qtx11extras openbox" -SRC_URI += "file://0001-finding-sed-does-not-work-and-is-not-neccessary.patch \ - file://Fix-invalid-conversion-from-xmlError.patch" +SRC_URI += "file://0001-finding-sed-does-not-work-and-is-not-neccessary.patch" SRCREV = "1f42940f7a557bf20e772b7ac6c3e15a04013a95" PV = "0.16.4"