QGIS 3.0 #16
13
qgis-lib64.patch
Normal file
13
qgis-lib64.patch
Normal file
@ -0,0 +1,13 @@
|
||||
|
||||
diff -up cmake/PyQtMacros.cmake cmake/PyQtMacros.cmake.lib64
|
||||
--- cmake/PyQtMacros.cmake 2017-09-29 17:55:02.000000000 +0200
|
||||
+++ cmake/PyQtMacros.cmake.lib64 2017-09-30 18:32:30.277970717 +0200
|
||||
@@ -36,7 +36,7 @@ MACRO(PYQT_WRAP_UI outfiles )
|
||||
ELSE(WIN32)
|
||||
# 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(WIN32)
|
||||
|
||||
FOREACH(it ${ARGN})
|
@ -19,6 +19,11 @@ Source4: %{name}-server-README.fedora
|
||||
# Based on debian/qgis.xml but excluding already defined or proprietary types
|
||||
Source5: %{name}-mime.xml
|
||||
|
||||
# Fix builds on 64-bit machines
|
||||
# https://hub.qgis.org/issues/15602
|
||||
# https://github.com/qgis/QGIS/commit/718581ffb12b723f9a3c0ae01b7ec2d8aed9d4bb.patch
|
||||
Patch0: %{name}-lib64.patch
|
||||
|
||||
# Some plug-ins need Pyspatialite (bundled)
|
||||
# The license is not totally clear, see:
|
||||
# http://code.google.com/p/pyspatialite/issues/detail?id=3
|
||||
@ -160,6 +165,7 @@ 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 {} \+
|
||||
|
Reference in New Issue
Block a user