[patch] rstudio-2022.07.2.576-qtsingleapplication.patch

rstudio-2022.07.2.576-qtsingleapplication.patch (text/plain), 2.25 KB, created by Mark Wright on 2022-10-27 10:01:33 UTC

--- rstudio-2022.07.2-576-orig/src/cpp/desktop/CMakeLists.txt	2022-08-31 23:09:53.000000000 +1000
+++ rstudio-2022.07.2-576/src/cpp/desktop/CMakeLists.txt	2022-10-10 09:30:54.801075471 +1100
@@ -144,6 +144,13 @@
    get_filename_component(QT_LIBRARY_PATH "${QT_BIN_DIR}/../lib"     ABSOLUTE CACHE)
    get_filename_component(QT_INSTALL_PATH "${QT_BIN_DIR}/.."         ABSOLUTE CACHE)
 
+   find_path(QTSINGLEAPPLIB_INCLUDE_DIR NAMES QtSingleApplication
+     PATH_SUFFIXES QtSolutions
+     PATHS
+     /usr/include/qt5)
+   find_library(QTSINGLEAPPLIB Qt5Solutions_SingleApplication-2.6
+     libQt5Solutions_SingleApplication-2.6)
+
    # disable clang warnings for qt sources
    if(APPLE)
       add_definitions(-Wno-unused-private-field
@@ -162,7 +169,6 @@
 
    set(MOC_DESKTOP_HEADER_FILES ${DESKTOP_HEADER_FILES})
    list(REMOVE_ITEM MOC_DESKTOP_HEADER_FILES
-      ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtsingleapplication/qtlockedfile.h
       ${CMAKE_CURRENT_SOURCE_DIR}/DesktopDetectRHome.hpp
       ${CMAKE_CURRENT_SOURCE_DIR}/DesktopOptions.hpp
       ${CMAKE_CURRENT_SOURCE_DIR}/DesktopRVersion.hpp
@@ -232,8 +238,6 @@
       DesktopSynctex.cpp
       DesktopJobLauncherOverlay.cpp
       RemoteDesktopSessionLauncherOverlay.cpp
-      3rdparty/qtsingleapplication/qtsingleapplication.cpp
-      3rdparty/qtsingleapplication/qtlocalpeer.cpp
    )
 
    if(WIN32)
@@ -290,6 +294,7 @@
       ${OPENSSL_INCLUDE_DIR}
       ${CMAKE_CURRENT_SOURCE_DIR}
       ${CMAKE_CURRENT_BINARY_DIR}
+      ${QTSINGLEAPPLIB_INCLUDE_DIR}
       ${EXT_SOURCE_DIR}
       ${SESSION_SOURCE_DIR}/include
       ${TESTS_INCLUDE_DIR}
@@ -404,6 +409,7 @@
       # set link dependencies
       target_link_libraries(rstudio
          ${RSTUDIO_QTMODULES}
+         ${QTSINGLEAPPLIB}
          ${QT_LIBRARIES}
          ${Boost_LIBRARIES}
          rstudio-core
--- rstudio-2022.07.2-576-orig/src/cpp/desktop/DesktopPosixApplication.hpp	2022-08-31 23:09:53.000000000 +1000
+++ rstudio-2022.07.2-576/src/cpp/desktop/DesktopPosixApplication.hpp	2022-10-10 09:30:54.801075471 +1100
@@ -16,7 +16,7 @@
 #ifndef DESKTOP_POSIX_APPLICATION_HPP
 #define DESKTOP_POSIX_APPLICATION_HPP
 
-#include "3rdparty/qtsingleapplication/QtSingleApplication"
+#include <QtSingleApplication>
 
 #include "DesktopApplicationLaunch.hpp"