Remove patch that has been integrated upstream.

In some build environments, the patch command would revert the diff...

Patching file src/core/CMakeLists.txt using Plan A...
Reversed (or previously applied) patch detected!  Assume -R? [y]
Hunk #1 succeeded at 1317 with fuzz 2 (offset 424 lines).

... and thus reintroduce the problem the diff was intended to fix.
This commit is contained in:
naddy 2020-02-28 14:46:08 +00:00
parent 27203f01c0
commit f5e89c88d2
2 changed files with 2 additions and 20 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.122 2020/02/25 12:16:52 landry Exp $
# $OpenBSD: Makefile,v 1.123 2020/02/28 14:46:08 naddy Exp $
BROKEN-powerpc = does not build: "operand out of range"
@ -7,6 +7,7 @@ COMMENT = desktop geographical information system
DPB_PROPERTIES = parallel
DISTNAME = qgis-3.12.0
REVISION = 0
EXTRACT_SUFX = .tar.bz2
CATEGORIES = geo x11
DEBUG_PACKAGES =${BUILD_PACKAGES}

View File

@ -1,19 +0,0 @@
$OpenBSD: patch-src_core_CMakeLists_txt,v 1.26 2020/01/21 12:50:46 landry Exp $
takes many hours with the default (225)
https://bugreports.qt.io/browse/QTBUG-57672
https://bugs.llvm.org/show_bug.cgi?id=42515
https://github.com/qgis/QGIS/commit/59a766e22a12cc274cf1b852d466f34848297658
Index: src/core/CMakeLists.txt
--- src/core/CMakeLists.txt.orig
+++ src/core/CMakeLists.txt
@@ -893,6 +893,7 @@ ELSE(MSVC)
SET_SOURCE_FILES_PROPERTIES(${QGIS_CORE_MOC_SRCS} PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations" )
IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND (CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo))
SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/qgsexpression_texts.cpp PROPERTIES COMPILE_FLAGS "-O1")
+ SET_SOURCE_FILES_PROPERTIES(qgscoordinatereferencesystem.cpp PROPERTIES COMPILE_FLAGS "-mllvm -inline-threshold=128")
ENDIF ()
ENDIF(MSVC)