From 0e58b3797b7d85d3a8d70871e9c533f9733c227d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= Date: Sun, 27 Feb 2022 18:13:19 +0100 Subject: [PATCH] [RPM] Remove lib64 patch for master --- rpm/qgis.spec.template | 6 ------ rpm/sources/qgis-lib64.patch | 12 ------------ 2 files changed, 18 deletions(-) delete mode 100644 rpm/sources/qgis-lib64.patch diff --git a/rpm/qgis.spec.template b/rpm/qgis.spec.template index 33d71507269..adc0e359f64 100644 --- a/rpm/qgis.spec.template +++ b/rpm/qgis.spec.template @@ -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 {} \+ diff --git a/rpm/sources/qgis-lib64.patch b/rpm/sources/qgis-lib64.patch deleted file mode 100644 index c41b148c130..00000000000 --- a/rpm/sources/qgis-lib64.patch +++ /dev/null @@ -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})