mirror of
https://github.com/qgis/QGIS.git
synced 2025-02-22 00:06:12 -05:00
[RPM] Remove lib64 patch for master
This commit is contained in:
parent
0e05ca1066
commit
0e58b3797b
@ -46,11 +46,6 @@ Source5: %{name}-server-README.fedora
|
||||
# Based on debian/qgis.xml but excluding already defined or proprietary types
|
||||
Source6: %{name}-mime.xml
|
||||
|
||||
# Fix builds on 64-bit machines
|
||||
# https://github.com/qgis/QGIS/issues/23525
|
||||
# https://github.com/qgis/QGIS/commit/718581ffb12b723f9a3c0ae01b7ec2d8aed9d4bb.patch
|
||||
Patch0: %{name}-lib64.patch
|
||||
|
||||
# Compiling stuff
|
||||
BuildRequires: bison
|
||||
BuildRequires: clang
|
||||
@ -208,7 +203,6 @@ Please refer to %{name}-server-README.fedora for details!
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p0 -b .lib64
|
||||
|
||||
# Remove executable permissions from source code files
|
||||
find . \( -name "*.cpp" -o -name "*.h" \) -type f -perm /111 -execdir chmod -x {} \+
|
||||
|
@ -1,12 +0,0 @@
|
||||
diff -up cmake/PyQtMacros.cmake cmake/PyQtMacros.cmake.lib64
|
||||
--- 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()
|
||||
|
||||
FOREACH(it ${ARGN})
|
Loading…
x
Reference in New Issue
Block a user