Merge pull request #45500 from basilrabi/rpm

update RPM patch
qgis · Oct 13, 2021 · 1295cb1 · 1295cb1
2 parents 54f77ce + 7e2f7bb
commit 1295cb1
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/rpm/sources/qgis-lib64.patch b/rpm/sources/qgis-lib64.patch
@@ -1,12 +1,12 @@
 diff -up cmake/PyQtMacros.cmake cmake/PyQtMacros.cmake.lib64
---- cmake/PyQtMacros.cmake	2019-08-06 15:58:04.255845979 +0200
-+++ cmake/PyQtMacros.cmake.lib64	2019-08-06 15:58:52.428790521 +0200
-@@ -36,7 +36,7 @@ MACRO(PYQT_WRAP_UI outfiles )
-   ELSE(CMAKE_HOST_WIN32)
+--- cmake/PyQtMacros.cmake	2021-10-12 23:47:30.068897214 +0800
++++ cmake/PyQtMacros.cmake.lib64	2021-10-13 00:08:48.468832699 +0800
+@@ -34,7 +34,7 @@ MACRO(PYQT_WRAP_UI outfiles )
+   ELSE()
      # TODO osx
      SET(PYUIC_WRAPPER "${CMAKE_SOURCE_DIR}/scripts/pyuic_wrapper.sh")
 -    SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib")
 +    SET(PYUIC_WRAPPER_PATH "${QGIS_OUTPUT_DIRECTORY}/lib${LIB_SUFFIX}")
-   ENDIF(CMAKE_HOST_WIN32)
+   ENDIF()
 
    FOREACH(it ${ARGN})