From 73a23cabed99c0c8c74c3ad33d46cdeece7c2d23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 7 Mar 2021 12:35:37 +0100 Subject: [PATCH] kdelibs4support: get rid of some patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 0003-Hack-away-SSL-configure-check.patch is no more required * 0001-make-broken-glib-a-configure-option-we-cannot-run-co.patch is replaced by configure option -DHAVE_GOOD_GETADDRINFO=ON Signed-off-by: Andreas Müller --- ...-a-configure-option-we-cannot-run-co.patch | 54 ------------------- ...01-only-build-kf5-config-for-native.patch} | 0 .../0003-Hack-away-SSL-configure-check.patch | 33 ------------ .../kdelibs4support/kdelibs4support-native.bb | 4 +- .../kdelibs4support/kdelibs4support.bb | 6 --- .../kdelibs4support/kdelibs4support.inc | 7 ++- 6 files changed, 4 insertions(+), 100 deletions(-) delete mode 100644 recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0001-make-broken-glib-a-configure-option-we-cannot-run-co.patch rename recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/{0002-only-build-kf5-config-for-native.patch => 0001-only-build-kf5-config-for-native.patch} (100%) delete mode 100644 recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0003-Hack-away-SSL-configure-check.patch diff --git a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0001-make-broken-glib-a-configure-option-we-cannot-run-co.patch b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0001-make-broken-glib-a-configure-option-we-cannot-run-co.patch deleted file mode 100644 index 6f7a5fc4..00000000 --- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0001-make-broken-glib-a-configure-option-we-cannot-run-co.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 9fcb39c7a5e60b8f07b38320fa32376547eb21bd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Mon, 8 Dec 2014 09:13:19 +0100 -Subject: [PATCH 1/3] make broken glib a configure option - we cannot run - compiled code -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [cross] - -Signed-off-by: Andreas Müller - ---- - src/ConfigureChecks.cmake | 23 ++--------------------- - 1 file changed, 2 insertions(+), 21 deletions(-) - -diff --git a/src/ConfigureChecks.cmake b/src/ConfigureChecks.cmake -index 9edbff7..d44aca6 100644 ---- a/src/ConfigureChecks.cmake -+++ b/src/ConfigureChecks.cmake -@@ -85,27 +85,8 @@ check_struct_has_member("struct sockaddr" sa_len "sys/types.h;sys/socket.h" HAVE - check_struct_has_member(dirent d_type dirent.h HAVE_DIRENT_D_TYPE LANGUAGE CXX) - check_prototype_exists(res_init "sys/types.h;netinet/in.h;arpa/nameser.h;resolv.h" HAVE_RES_INIT_PROTO) - --check_cxx_source_runs(" -- #include -- #include -- #include -- #include -- int main() -- { -- struct addrinfo hint, *res; -- int err; -- memset(&hint, 0, sizeof(hint)); -- hint.ai_family = AF_INET; -- hint.ai_protocol = 0; -- hint.ai_socktype = SOCK_STREAM; -- hint.ai_flags = AI_PASSIVE; -- err = getaddrinfo(0, \"18300\", &hint, &res); -- if (err != 0 || res == 0 || res->ai_family != AF_INET) -- return 1; -- return 0; -- }" -- HAVE_GOOD_GETADDRINFO --) -+# we cannot test if code is running so make it an option -+option(HAVE_GOOD_GETADDRINFO "glib getaddr is working properly - set off for workaround" On) - - if( NOT HAVE_GOOD_GETADDRINFO ) - set( HAVE_BROKEN_GETADDRINFO 1 ) --- -1.8.3.1 - diff --git a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0002-only-build-kf5-config-for-native.patch b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0001-only-build-kf5-config-for-native.patch similarity index 100% rename from recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0002-only-build-kf5-config-for-native.patch rename to recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0001-only-build-kf5-config-for-native.patch diff --git a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0003-Hack-away-SSL-configure-check.patch b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0003-Hack-away-SSL-configure-check.patch deleted file mode 100644 index a88ffeb1..00000000 --- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0003-Hack-away-SSL-configure-check.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f70a18e936616d448a56015009b8a4f0004bd9b8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Mon, 29 Oct 2018 15:12:25 +0100 -Subject: [PATCH] Hack away SSL configure check -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -it fails for -isystem /usr/include failure on gcc8 - -Upstream-Status: Inappropriate [cross-specific] - -Signed-off-by: Andreas Müller ---- - src/ConfigureChecks.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ConfigureChecks.cmake b/src/ConfigureChecks.cmake -index d44aca6..689ac0e 100644 ---- a/src/ConfigureChecks.cmake -+++ b/src/ConfigureChecks.cmake -@@ -13,7 +13,7 @@ set( KDELIBSUFF ${LIB_SUFFIX} ) - - set(CMAKE_REQUIRED_LIBRARIES Qt5::Network) - check_cxx_source_compiles( --"#include -+"class QSslSocket; - int main() - { - QSslSocket *socket; --- -2.14.5 - diff --git a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support-native.bb b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support-native.bb index f9ceac2c..e2866c99 100644 --- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support-native.bb +++ b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support-native.bb @@ -12,6 +12,4 @@ DEPENDS += " \ gettext-native \ " -SRC_URI += " \ - file://0002-only-build-kf5-config-for-native.patch \ -" +SRC_URI += "file://0001-only-build-kf5-config-for-native.patch" diff --git a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb index 7f56c5a0..e51870f1 100644 --- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb +++ b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb @@ -36,12 +36,6 @@ DEPENDS += " \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras", "", d)} \ " -SRC_URI += " \ - file://0003-Hack-away-SSL-configure-check.patch \ -" -# uncomment for broken gelib getaddr / AI_PASSIVE -#EXTRA_OECMAKE += "-DHAVE_GOOD_GETADDRINFO=OFF" - do_compile_prepend() { # Error: Could not locate service type file kservicetypes5/ "kdedmodule.desktop" , tried ... export XDG_DATA_HOME=${STAGING_DATADIR} diff --git a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.inc b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.inc index d7f23c79..58130262 100644 --- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.inc +++ b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.inc @@ -10,8 +10,7 @@ inherit kde-kf5-porting-aids perlnative PV = "${KF5_VERSION}" SRC_URI[sha256sum] = "a542e75e0b20325e5a88d33229441416da4c8d467742a229b2aa87e368053411" -EXTRA_OECMAKE += "-DBUILD_TESTING=OFF" - -SRC_URI += " \ - file://0001-make-broken-glib-a-configure-option-we-cannot-run-co.patch \ +EXTRA_OECMAKE += " \ + -DBUILD_TESTING=OFF \ + -DHAVE_GOOD_GETADDRINFO=ON \ "