File fix-build.patch of Package qgroundcontrol

Overview Repositories Revisions Requests Users Attributes Meta

File fix-build.patch of Package qgroundcontrol

diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri
index e2a23078..0595b75c 100644
--- a/QGCExternalLibs.pri
+++ b/QGCExternalLibs.pri
@@ -297,7 +297,7 @@ contains (DEFINES, DISABLE_AIRMAP) {
     } else:LinuxBuild {
         #-- Download and install platform-sdk libs and headers iff they're not already in the build directory
         AIRMAP_PLATFORM_SDK_URL = "https://github.com/airmap/platform-sdk/releases/download/2.0/airmap-platform-sdk-2.0.0-Linux.deb"
-        AIRMAP_PLATFORM_SDK_FILEPATH = "$${OUT_PWD}/airmap-platform-sdk.deb"
+        AIRMAP_PLATFORM_SDK_FILEPATH = "/home/abuild/rpmbuild/SOURCES/airmap-platform-sdk-2.0.0-Linux.deb"
         AIRMAP_PLATFORM_SDK_INSTALL_DIR = "tmp"
 
         airmap_platform_sdk_install.target = $${AIRMAP_PLATFORM_SDK_PATH}/include/airmap
@@ -306,7 +306,6 @@ contains (DEFINES, DISABLE_AIRMAP) {
             mkdir -p "$${AIRMAP_PLATFORM_SDK_PATH}/linux/$${AIRMAP_QT_PATH}" && \
             mkdir -p "$${AIRMAP_PLATFORM_SDK_PATH}/include/airmap" && \
             mkdir -p "$${AIRMAP_PLATFORM_SDK_PATH}/$${AIRMAP_PLATFORM_SDK_INSTALL_DIR}" && \
-            curl --location --output "$${AIRMAP_PLATFORM_SDK_FILEPATH}" "$${AIRMAP_PLATFORM_SDK_URL}" && \
             ar p "$${AIRMAP_PLATFORM_SDK_FILEPATH}" data.tar.gz | tar xvz -C "$${AIRMAP_PLATFORM_SDK_PATH}/$${AIRMAP_PLATFORM_SDK_INSTALL_DIR}/" --strip-components=1 && \
             mv -u "$${AIRMAP_PLATFORM_SDK_PATH}/$${AIRMAP_PLATFORM_SDK_INSTALL_DIR}/usr/lib/x86_64-linux-gnu/*" "$${AIRMAP_PLATFORM_SDK_PATH}/linux/$${AIRMAP_QT_PATH}/" && \
             mv -u "$${AIRMAP_PLATFORM_SDK_PATH}/$${AIRMAP_PLATFORM_SDK_INSTALL_DIR}/usr/include/airmap/*" "$${AIRMAP_PLATFORM_SDK_PATH}/include/airmap/" && \
diff --git a/QGCPostLinkCommon.pri b/QGCPostLinkCommon.pri
index 4816d61a..5338a3d7 100644
--- a/QGCPostLinkCommon.pri
+++ b/QGCPostLinkCommon.pri
@@ -73,7 +73,6 @@ WindowsBuild {
 
 LinuxBuild {
     QMAKE_POST_LINK += && mkdir -p $$DESTDIR/Qt/libs && mkdir -p $$DESTDIR/Qt/plugins
-    QMAKE_RPATHDIR += $ORIGIN/Qt/libs
 
     # QT_INSTALL_LIBS
     QT_LIB_LIST += \
@@ -172,7 +171,7 @@ LinuxBuild {
         include($$PWD/custom/custom_deploy.pri)
     }
 
-    QMAKE_POST_LINK += && SEARCHDIR="$$DESTDIR/Qt" RPATHDIR="$$DESTDIR/Qt/libs" "$$PWD/deploy/linux-fixup-rpaths.bash"
+    QMAKE_POST_LINK += && SEARCHDIR="$$DESTDIR/Qt" "$$PWD/deploy/linux-fixup-rpaths.bash"
 
     # https://doc.qt.io/qt-5/qt-conf.html
     QMAKE_POST_LINK += && $$QMAKE_COPY "$$SOURCE_DIR/deploy/qt.conf" "$$DESTDIR"

Places

File fix-build.patch of Package qgroundcontrol

Places