From bd7a40dafbc5dd452bd9e341b52665d5f2d34318 Mon Sep 17 00:00:00 2001 From: kn Date: Mon, 28 Feb 2022 22:48:48 +0000 Subject: [PATCH] Remove obsolete patch disabling libdispatch lib_crl now detects dispatch and automatically fails back to Qt. tdesktop still configures if dispatch cannot be found, despite the warning/error. --- net/tdesktop/Makefile | 5 +---- .../patch-cmake_external_dispatch_CMakeLists_txt | 15 --------------- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 net/tdesktop/patches/patch-cmake_external_dispatch_CMakeLists_txt diff --git a/net/tdesktop/Makefile b/net/tdesktop/Makefile index 138f2e56f98..642bd5b184d 100644 --- a/net/tdesktop/Makefile +++ b/net/tdesktop/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2022/02/13 21:21:02 kn Exp $ +# $OpenBSD: Makefile,v 1.14 2022/02/28 22:48:48 kn Exp $ # the MTProto implementation does not support big-endian # https://github.com/telegramdesktop/tdesktop/issues/3167#issuecomment-658308298 @@ -77,9 +77,6 @@ CONFIGURE_ARGS += -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=ON \ # match standard version with abseil CONFIGURE_ARGS += -DCMAKE_CXX_STANDARD=17 -# disable use of unported dispatch library -CXXFLAGS += -DCRL_FORCE_QT - NO_TEST = Yes # archivers/minizip is minizip-ng, telegram requires incompatible original zlib diff --git a/net/tdesktop/patches/patch-cmake_external_dispatch_CMakeLists_txt b/net/tdesktop/patches/patch-cmake_external_dispatch_CMakeLists_txt deleted file mode 100644 index 7ab051ab5df..00000000000 --- a/net/tdesktop/patches/patch-cmake_external_dispatch_CMakeLists_txt +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-cmake_external_dispatch_CMakeLists_txt,v 1.1.1.1 2022/01/26 19:38:06 kn Exp $ - -Disable any use of libdispatch - -Index: cmake/external/dispatch/CMakeLists.txt ---- cmake/external/dispatch/CMakeLists.txt.orig -+++ cmake/external/dispatch/CMakeLists.txt -@@ -3,6 +3,7 @@ - # - # For license and copyright information please follow this link: - # https://github.com/desktop-app/legal/blob/master/LEGAL -+return() - - set(dispatch_loc ${third_party_loc}/dispatch) - set(dispatch_prefix ${CMAKE_CURRENT_BINARY_DIR}/dispatch-prefix)