Skip to content

Commit c4048de

Browse files
PatTheMavRytoEX
authored andcommitted
deps.qt: Backport upstream patch removing AGL linkage from macOS
1 parent b686646 commit c4048de

File tree

2 files changed

+62
-0
lines changed

2 files changed

+62
-0
lines changed
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
From cdb33c3d5621ce035ad6950c8e2268fe94b73de5 Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <[email protected]>
3+
Date: Tue, 10 Jun 2025 06:46:30 -0700
4+
Subject: [PATCH] macOS: Remove linkage to AGL framework
5+
6+
It's no longer available on macOS 26, and we don't use it anymore
7+
anyways.
8+
9+
Pick-to: 6.10 6.9 6.8 6.5
10+
Change-Id: Ia1d0e37dda177f333646e598e517f4af20215dad
11+
Reviewed-by: Alexandru Croitor <[email protected]>
12+
---
13+
cmake/FindWrapOpenGL.cmake | 9 ---------
14+
mkspecs/common/mac.conf | 5 ++---
15+
2 files changed, 2 insertions(+), 12 deletions(-)
16+
17+
diff --git a/qtbase/cmake/FindWrapOpenGL.cmake b/qtbase/cmake/FindWrapOpenGL.cmake
18+
index 7295a159caf6..fe73ab782118 100644
19+
--- a/qtbase/cmake/FindWrapOpenGL.cmake
20+
+++ b/qtbase/cmake/FindWrapOpenGL.cmake
21+
@@ -37,16 +37,7 @@ if (OpenGL_FOUND)
22+
set(__opengl_fw_path "-framework OpenGL")
23+
endif()
24+
25+
- find_library(WrapOpenGL_AGL NAMES AGL)
26+
- if(WrapOpenGL_AGL)
27+
- set(__opengl_agl_fw_path "${WrapOpenGL_AGL}")
28+
- endif()
29+
- if(NOT __opengl_agl_fw_path)
30+
- set(__opengl_agl_fw_path "-framework AGL")
31+
- endif()
32+
-
33+
target_link_libraries(WrapOpenGL::WrapOpenGL INTERFACE ${__opengl_fw_path})
34+
- target_link_libraries(WrapOpenGL::WrapOpenGL INTERFACE ${__opengl_agl_fw_path})
35+
else()
36+
target_link_libraries(WrapOpenGL::WrapOpenGL INTERFACE OpenGL::GL)
37+
endif()
38+
diff --git a/qtbase/mkspecs/common/mac.conf b/qtbase/mkspecs/common/mac.conf
39+
index 61bea952b220..9ba38d9949d6 100644
40+
--- a/qtbase/mkspecs/common/mac.conf
41+
+++ b/qtbase/mkspecs/common/mac.conf
42+
@@ -18,8 +18,7 @@ QMAKE_LIBDIR =
43+
44+
# sdk.prf will prefix the proper SDK sysroot
45+
QMAKE_INCDIR_OPENGL = \
46+
- /System/Library/Frameworks/OpenGL.framework/Headers \
47+
- /System/Library/Frameworks/AGL.framework/Headers/
48+
+ /System/Library/Frameworks/OpenGL.framework/Headers
49+
50+
QMAKE_FIX_RPATH = install_name_tool -id
51+
52+
@@ -30,7 +29,7 @@ QMAKE_LFLAGS_REL_RPATH =
53+
QMAKE_REL_RPATH_BASE = @loader_path
54+
55+
QMAKE_LIBS_DYNLOAD =
56+
-QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL
57+
+QMAKE_LIBS_OPENGL = -framework OpenGL
58+
QMAKE_LIBS_THREAD =
59+
60+
QMAKE_INCDIR_WAYLAND =

deps.qt/qt6.zsh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ local hash="${0:a:h}/checksums"
88
local -a patches=(
99
"macos ${0:a:h}/patches/Qt6/mac/0001-QTBUG-121351.patch \
1010
df46dc93e874c36b2ad0da746c43585528308a7fcde60930c1ffb5e841472e7b"
11+
"macos ${0:a:h}/patches/Qt6/mac/0002-QTBUG-137687.patch \
12+
2ddccdaf111332618e8d95ebf483f1f393d499acd5212b74fa497a1c2134b796"
1113
)
1214

1315
local -a qt_components=(

0 commit comments

Comments
 (0)