Skip to content

[GR] update Qt6Base_jll #11052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

[GR] update Qt6Base_jll #11052

Changes from 5 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4af1189
update Qt6Base_jll for GR
t-bltg Apr 21, 2025
4c5b324
update bnds
t-bltg Apr 21, 2025
b1e7af6
update macos SDK
t-bltg Apr 21, 2025
6df907f
try linker flags
t-bltg Apr 21, 2025
063a386
update
t-bltg Apr 21, 2025
dee9536
debug
t-bltg Apr 21, 2025
66db385
testing
t-bltg Apr 21, 2025
bd411a6
file
t-bltg Apr 21, 2025
1dcc03f
use gcc-13 on windows because of ICE
t-bltg Apr 21, 2025
23a45db
spacing
t-bltg Apr 21, 2025
26ae96b
add `include`
t-bltg Apr 21, 2025
c55f642
restore quotes
t-bltg Apr 21, 2025
e6c61e6
restore orginal MacOSX-SDKs repo
t-bltg Apr 21, 2025
9b32280
revert change
t-bltg Apr 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions G/GR/build_tarballs.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ sources = [
GitSource("https://github.com/sciapp/gr.git", "9a62289c2e4e36c28e045c3a34f02d0d01c4231c"),
FileSource("https://github.com/sciapp/gr/releases/download/v$version/gr-$version.js",
"7f94982b410c686d67be956f1e0317b6e2644702b3f3d69328ee8217e7be5217", "gr.js"),
ArchiveSource("https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.14.sdk.tar.xz",
"0f03869f72df8705b832910517b47dd5b79eb4e160512602f593ed243b28715f")
ArchiveSource("https://github.com/roblabla/MacOSX-SDKs/releases/download/macosx14.0/MacOSX14.0.sdk.tar.xz",
"4a31565fd2644d1aec23da3829977f83632a20985561a2038e198681e7e7bf49")
]

# Bash recipe for building across all platforms
Expand All @@ -23,16 +23,16 @@ update_configure_scripts
make -C 3rdparty/qhull -j${nproc}

if [[ $target == *"mingw"* ]]; then
winflags=-DCMAKE_C_FLAGS="-D_WIN32_WINNT=0x0f00"
winflags="-DCMAKE_C_FLAGS='-D_WIN32_WINNT=0x0f00' -DCMAKE_EXE_LINKER_FLAGS='-Wl,--verbose' -DCMAKE_MODULE_LINKER_FLAGS='-Wl,--verbose' -DCMAKE_SHARED_LINKER_FLAGS='-Wl,--verbose'"
tifflags=-DTIFF_LIBRARY=${libdir}/libtiff-6.dll
else
tifflags=-DTIFF_LIBRARY=${libdir}/libtiff.${dlext}
fi

if [[ "${target}" == x86_64-apple-darwin* ]]; then
apple_sdk_root=$WORKSPACE/srcdir/MacOSX10.14.sdk
apple_sdk_root=$WORKSPACE/srcdir/MacOSX14.0.sdk
sed -i "s!/opt/x86_64-apple-darwin14/x86_64-apple-darwin14/sys-root!$apple_sdk_root!" $CMAKE_TARGET_TOOLCHAIN
export MACOSX_DEPLOYMENT_TARGET=10.14
export MACOSX_DEPLOYMENT_TARGET=12
fi

if [[ "${target}" == *apple* ]]; then
Expand All @@ -47,7 +47,7 @@ mkdir build
cd build
cmake $winflags -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_FIND_ROOT_PATH=$prefix -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN} -DGR_USE_BUNDLED_LIBRARIES=ON $tifflags -DCMAKE_BUILD_TYPE=Release ..

VERBOSE=ON cmake --build . --config Release --target install -- -j${nproc}
cmake --build . --verbose --config Release --target install -- -j${nproc}
cp ../../gr.js ${libdir}/

install_license $WORKSPACE/srcdir/gr/LICENSE.md
Expand Down Expand Up @@ -78,28 +78,28 @@ platforms = expand_cxxstring_abis(platforms)

# The products that we will ensure are always built
products = [
LibraryProduct("libGR", :libGR, dont_dlopen=true),
LibraryProduct("libGR3", :libGR3, dont_dlopen=true),
LibraryProduct("libGRM", :libGRM, dont_dlopen=true),
LibraryProduct("libGKS", :libGKS, dont_dlopen=true),
LibraryProduct("libGR", :libGR; dont_dlopen=true),
LibraryProduct("libGR3", :libGR3; dont_dlopen=true),
LibraryProduct("libGRM", :libGRM; dont_dlopen=true),
LibraryProduct("libGKS", :libGKS; dont_dlopen=true),
ExecutableProduct("gksqt", :gksqt),
ExecutableProduct("grplot", :grplot),
]

# Dependencies that must be installed before this package can be built
dependencies = [
Dependency("Bzip2_jll"; compat="1.0.8"),
Dependency("Cairo_jll"; compat="1.16.1"),
Dependency("Bzip2_jll"),
Dependency("Cairo_jll"),
Dependency("FFMPEG_jll"),
Dependency("Fontconfig_jll"),
Dependency("FreeType2_jll"; compat="2.10.4"),
Dependency("FreeType2_jll"; compat="2.13.4"),
Dependency("GLFW_jll"),
Dependency("JpegTurbo_jll"),
Dependency("libpng_jll"),
Dependency("Libtiff_jll"; compat="4.7.1"),
Dependency("Libtiff_jll"),
Dependency("Pixman_jll"),
HostBuildDependency("Qt6Base_jll"),
Dependency("Qt6Base_jll"; compat="~6.7.1"), # Never allow upgrading more than the minor version without recompilation
Dependency("Qt6Base_jll"; compat="~6.8.2"), # Never allow upgrading more than the minor version without recompilation
BuildDependency("Xorg_libX11_jll"),
BuildDependency("Xorg_xproto_jll"),
Dependency("Zlib_jll"),
Expand Down