Skip to content

Commit dcb7518

Browse files
committed
Merge #20496: build: Drop unneeded macOS framework dependencies
ec4a46d build: Drop unneeded IOKit framework dependency (Hennadii Stepanov) 65afe4c build: Drop unneeded ApplicationServices framework dependency (Hennadii Stepanov) Pull request description: Bitcoin Core codebase does not contain direct dependencies on the `ApplicationServices` and `IOKit` frameworks. ACKs for top commit: jonasschnelli: utACK ec4a46d practicalswift: cr ACK ec4a46d: patch looks correct! promag: Tested ACK ec4a46d (not depends build). Tree-SHA512: 47b5ad87d761992850133a921f07d485565c70ba2909a3289050f406e6dbd39ad49e1aeeb6cad79c6914385a72ddffd273dfadd69259a35545a13cd17d0e5043
2 parents 335d27d + ec4a46d commit dcb7518

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

build-aux/m4/bitcoin_qt.m4

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
128128
_BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)],[-lqxcb -lxcb-static])
129129
AC_DEFINE(QT_QPA_PLATFORM_XCB, 1, [Define this symbol if the qt platform is xcb])
130130
elif test "x$TARGET_OS" = xdarwin; then
131-
AX_CHECK_LINK_FLAG([[-framework IOKit]],[QT_LIBS="$QT_LIBS -framework IOKit"],[AC_MSG_ERROR(could not iokit framework)])
132131
_BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)],[-lqcocoa])
133132
AC_DEFINE(QT_QPA_PLATFORM_COCOA, 1, [Define this symbol if the qt platform is cocoa])
134133
elif test "x$TARGET_OS" = xandroid; then
@@ -202,7 +201,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
202201
*darwin*)
203202
BITCOIN_QT_CHECK([
204203
MOC_DEFS="${MOC_DEFS} -DQ_OS_MAC"
205-
base_frameworks="-framework Foundation -framework ApplicationServices -framework AppKit"
204+
base_frameworks="-framework Foundation -framework AppKit"
206205
AX_CHECK_LINK_FLAG([[$base_frameworks]],[QT_LIBS="$QT_LIBS $base_frameworks"],[AC_MSG_ERROR(could not find base frameworks)])
207206
])
208207
;;

src/qt/notificator.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,7 @@
1717
#include <stdint.h>
1818
#include <QtDBus>
1919
#endif
20-
// Include ApplicationServices.h after QtDbus to avoid redefinition of check().
21-
// This affects at least OSX 10.6. See /usr/include/AssertMacros.h for details.
22-
// Note: This could also be worked around using:
23-
// #define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
2420
#ifdef Q_OS_MAC
25-
#include <ApplicationServices/ApplicationServices.h>
2621
#include <qt/macnotificationhandler.h>
2722
#endif
2823

0 commit comments

Comments
 (0)