[Qt6] Re-enable XCB plugin (#7374)

JuliaPackaging · Sep 20, 2023 · b2d7566 · b2d7566
1 parent 6e9476a
commit b2d7566
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/Q/Qt6Base/build_tarballs.jl b/Q/Qt6Base/build_tarballs.jl
@@ -50,7 +50,7 @@ case "$bb_full_target" in
 
     x86_64-linux-musl-libgfortran5-cxx11)
         sed -i 's/exit 1/#exit 1/' $HOSTCXX
-        ../qtbase-everywhere-src-*/configure -prefix $prefix $commonoptions -fontconfig -- -DCMAKE_PREFIX_PATH=${prefix} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_HOST_TOOLCHAIN}
+        ../qtbase-everywhere-src-*/configure -prefix $prefix $commonoptions -fontconfig -- -DCMAKE_PREFIX_PATH=${prefix} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_HOST_TOOLCHAIN} -DQT_FEATURE_xcb=ON
         sed -i 's/#exit 1/exit 1/' $HOSTCXX
     ;;
 
@@ -95,15 +95,15 @@ case "$bb_full_target" in
         sed -i 's/-Wl,--no-undefined//' $qtsrcdir/mkspecs/freebsd-clang/qmake.conf
         sed -i 's/-Wl,--no-undefined//' $qtsrcdir/cmake/QtFlagHandlingHelpers.cmake
         sed -i 's/exit 1/#exit 1/' /opt/bin/$bb_full_target/$target-clang++
-        ../qtbase-everywhere-src-*/configure -prefix $prefix $commonoptions -fontconfig -- $commoncmakeoptions -DQT_PLATFORM_DEFINITION_DIR=$host_prefix/mkspecs/freebsd-clang
+        ../qtbase-everywhere-src-*/configure -prefix $prefix $commonoptions -fontconfig -- $commoncmakeoptions -DQT_PLATFORM_DEFINITION_DIR=$host_prefix/mkspecs/freebsd-clang -DQT_FEATURE_xcb=ON
         sed -i 's/#exit 1/exit 1/' /opt/bin/$bb_full_target/$target-clang++
     ;;
 
     *)
         echo "#define ELFOSABI_GNU 3" >> /opt/$target/$target/sys-root/usr/include/elf.h
         echo "#define EM_AARCH64 183" >> /opt/$target/$target/sys-root/usr/include/elf.h
         echo "#define EM_BLACKFIN 106" >> /opt/$target/$target/sys-root/usr/include/elf.h
-        ../qtbase-everywhere-src-*/configure -prefix $prefix $commonoptions -fontconfig -- $commoncmakeoptions
+        ../qtbase-everywhere-src-*/configure -verbose -prefix $prefix $commonoptions -fontconfig -- $commoncmakeoptions -DQT_FEATURE_xcb=ON
     ;;
 esac
 
@@ -160,30 +160,33 @@ llvm_version = v"13.0.1"
 
 # Dependencies that must be installed before this package can be built
 dependencies = [
-    BuildDependency("Xorg_libX11_jll"),
+    Dependency("libinput_jll"),
     Dependency("Xorg_libXext_jll"),
-    BuildDependency("Xorg_xproto_jll"),
-    BuildDependency("Xorg_glproto_jll"),
     Dependency("Xorg_libxcb_jll"),
     Dependency("Xorg_xcb_util_wm_jll"),
+    Dependency("Xorg_xcb_util_cursor_jll"),
     Dependency("Xorg_xcb_util_image_jll"),
     Dependency("Xorg_xcb_util_keysyms_jll"),
     Dependency("Xorg_xcb_util_renderutil_jll"),
-    BuildDependency("Xorg_kbproto_jll"),
-    BuildDependency("Xorg_renderproto_jll"),
     Dependency("Xorg_libXrender_jll"),
+    Dependency("Xorg_libSM_jll"),
     Dependency("xkbcommon_jll"),
     Dependency("Libglvnd_jll"),
     Dependency("Fontconfig_jll"),
     Dependency("Glib_jll", v"2.59.0"; compat="2.59.0"),
     Dependency("Zlib_jll"),
     Dependency("CompilerSupportLibraries_jll"),
     Dependency("OpenSSL_jll"; compat="1.1.10"),
+    Dependency("Vulkan_Loader_jll"),
     BuildDependency(PackageSpec(name="LLVM_full_jll", version=llvm_version)),
     BuildDependency(PackageSpec(name="LLVMCompilerRT_jll", uuid="4e17d02c-6bf5-513e-be62-445f41c75a11", version=llvm_version);
                     platforms=filter(p -> Sys.isapple(p) && arch(p) == "x86_64", platforms_macos)),
+    BuildDependency("Xorg_libX11_jll"),
+    BuildDependency("Xorg_kbproto_jll"),
+    BuildDependency("Xorg_renderproto_jll"),
+    BuildDependency("Xorg_xproto_jll"),
+    BuildDependency("Xorg_glproto_jll"),
     BuildDependency("Vulkan_Headers_jll"),
-    Dependency("Vulkan_Loader_jll"),
 ]
 
 if !host_build