Updated cmake sources to TDesktop version 3.5.2+93a9f34

Author: EricKotato

external/jemalloc/CMakeLists.txt

@@ -33,11 +33,16 @@ endif()
 include(ExternalProject)
 ExternalProject_Add(jemalloc
     URL ${third_party_loc}/jemalloc
-    CONFIGURE_COMMAND cd "<SOURCE_DIR>" && export EXTRA_CFLAGS=-fstack-protector-all\ -fPIC\ -D_FORTIFY_SOURCE=2 && export EXTRA_CXXFLAGS=-fstack-protector-all\ -fPIC\ -D_FORTIFY_SOURCE=2 && CC=clang CXX=clang++ ./autogen.sh
+    CONFIGURE_COMMAND env
+        CC=clang
+        CXX=clang++
+        "EXTRA_CFLAGS=-fstack-protector-all -D_FORTIFY_SOURCE=2"
+        "EXTRA_CXXFLAGS=-fstack-protector-all -D_FORTIFY_SOURCE=2"
+        ./autogen.sh --disable-shared
     BUILD_IN_SOURCE 1
     STEP_TARGETS build
     EXCLUDE_FROM_ALL TRUE
-    BUILD_BYPRODUCTS <SOURCE_DIR>/lib/libjemalloc.a
+    BUILD_BYPRODUCTS <SOURCE_DIR>/lib/libjemalloc_pic.a
 )
 
 ExternalProject_Get_property(jemalloc SOURCE_DIR)
@@ -50,7 +55,7 @@ INTERFACE
 
 target_link_libraries(external_jemalloc
 INTERFACE
-    -Wl,--push-state,--whole-archive,${SOURCE_DIR}/lib/libjemalloc.a,--pop-state,-ldl
+    -Wl,--push-state,--whole-archive,${SOURCE_DIR}/lib/libjemalloc_pic.a,--pop-state
 )
 
 add_dependencies(external_jemalloc jemalloc-build)

external/kwayland/CMakeLists.txt

@@ -76,23 +76,18 @@ ExternalProject_Add_StepDependencies(plasma-wayland-protocols configure extra-cm
 ExternalProject_Get_property(plasma-wayland-protocols BINARY_DIR)
 set(plasma_wayland_protocols_binary_dir ${BINARY_DIR})
 
-set(kwayland_patch_command)
-if (DESKTOP_APP_QT6)
-    set(kwayland_patch_command PATCH_COMMAND patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/kwayland-qt6.patch)
-endif()
-
 ExternalProject_Add(kwayland
     URL ${third_party_loc}/kwayland
     CMAKE_GENERATOR Ninja
     CMAKE_ARGS
         -DCMAKE_BUILD_TYPE=Release
         -DBUILD_SHARED_LIBS=OFF
         -DBUILD_TESTING=OFF
+        -DBUILD_WITH_QT6=${DESKTOP_APP_QT6}
+        -DEXCLUDE_DEPRECATED_BEFORE_AND_AT=5.91.0
         -DCMAKE_PREFIX_PATH=${wayland_protocols_binary_dir}
         -DECM_DIR=${extra_cmake_modules_binary_dir}/share/ECM/cmake
         -DPlasmaWaylandProtocols_DIR=${plasma_wayland_protocols_binary_dir}/lib/cmake/PlasmaWaylandProtocols
-    ${kwayland_patch_command}
-    BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target KF5WaylandClient
     STEP_TARGETS build
     EXCLUDE_FROM_ALL TRUE
     BUILD_BYPRODUCTS <BINARY_DIR>/lib/libKF5WaylandClient.a

external/kwayland/kwayland-qt6.patch

@@ -64,8 +64,8 @@ endif()
 
 target_link_libraries(common_options
 INTERFACE
-    desktop-app::linux_jemalloc_helper
     $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
+    $<LINK_ONLY:desktop-app::external_jemalloc>
     ${CMAKE_DL_LIBS}
 )