Befator-Inc-Firmen-Netzwerk/MINGW-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

geos: update to 3.6.2. (#3821)

Browse Source
This commit is contained in:
Andrew Sun
2018-05-24 01:03:53 -04:00
committed by Алексей
parent 6f163401aa
commit ff662ee2f3
2 changed files with 75 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mingw-w64-geos/PKGBUILD
View File

@@ -4,7 +4,7 @@
_realname=geos
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=3.6.1
pkgver=3.6.2
pkgrel=1
pkgdesc="C++ port of the Java Topology Suite (mingw-w64)"
arch=('any')
@@ -14,8 +14,8 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-cmake")
options=('strip' '!emptydirs')
source=("http://download.osgeo.org/geos/geos-${pkgver}.tar.bz2"
"geos-3.5.0.patch")
sha256sums=('4a2e4e3a7a09a7cfda3211d0f4a235d9fd3176ddf64bd8db14b4ead266189fc5'
'f6815e3d12bc9daa0d57f52619bfe5efca130bac8ec27145d42fd7498769d981')
sha256sums=('045a13df84d605a866602f6020fc6cbf8bf4c42fb50de237a08926e1d7d7652a'
'778ea9e73e343396c761e66a67c87b2054a33be629fa94a6243f7bdd7ab68346')
prepare() {
cd "${srcdir}/${_realname}-${pkgver}"

211
mingw-w64-geos/geos-3.5.0.patch
View File

@@ -1,141 +1,74 @@
diff -c -r geos-3.5.0.orig/CMakeLists.txt geos-3.5.0/CMakeLists.txt
*** geos-3.5.0.orig/CMakeLists.txt 2015-08-14 15:28:27.000000000 -0300
--- geos-3.5.0/CMakeLists.txt 2016-03-11 19:59:37.102667200 -0300
***************
*** 111,117 ****
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long")
# Turn on Position Independent Code generation for GEOS C shared library
! set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
# Enable glibc ISO C99 features (macros isfinite, isnan)
set(CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -D_ISOC99_SOURCE=1")
--- 111,117 ----
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long")
# Turn on Position Independent Code generation for GEOS C shared library
! #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
# Enable glibc ISO C99 features (macros isfinite, isnan)
set(CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -D_ISOC99_SOURCE=1")
***************
*** 183,189 ****
include(CheckPrototypeExists)
include(CheckSymbolExists)
! check_prototype_exists(isnan cmath HAVE_STD_ISNAN)
if(NOT HAVE_STD_ISNAN)
if(MSVC)
check_prototype_exists(_isnan float.h HAVE_ISNAN)
--- 183,192 ----
include(CheckPrototypeExists)
include(CheckSymbolExists)
! check_cxx_source_compiles(
! "#include <cmath>
! int main() { double x=0.1; return std::isnan(x)?1:0; }"
! HAVE_STD_ISNAN)
if(NOT HAVE_STD_ISNAN)
if(MSVC)
check_prototype_exists(_isnan float.h HAVE_ISNAN)
***************
*** 197,203 ****
endif()
endif()
! check_prototype_exists(isfinite cmath HAVE_STD_ISFINITE)
if(NOT HAVE_STD_ISFINITE)
if(MSVC)
--- 200,209 ----
endif()
endif()
! check_cxx_source_compiles(
! "#include <cmath>
! int main() { double x=0.1; return std::isfinite(x)?1:0; }"
! HAVE_STD_ISFINITE)
if(NOT HAVE_STD_ISFINITE)
if(MSVC)
***************
*** 323,329 ****
#################################################################################
# Configure subdirectories
#################################################################################
! include(GenerateSourceGroups)
add_subdirectory(include)
add_subdirectory(src)
--- 329,335 ----
#################################################################################
# Configure subdirectories
#################################################################################
! #include(GenerateSourceGroups)
add_subdirectory(include)
add_subdirectory(src)
diff -c -r geos-3.5.0.orig/include/CMakeLists.txt geos-3.5.0/include/CMakeLists.txt
*** geos-3.5.0.orig/include/CMakeLists.txt 2015-08-14 15:23:17.000000000 -0300
--- geos-3.5.0/include/CMakeLists.txt 2016-03-11 19:54:18.808916700 -0300
***************
*** 54,57 ****
#################################################################################
# Group source files for IDE source explorers (e.g. Visual Studio)
#################################################################################
! GenerateSourceGroups(include)
--- 54,57 ----
#################################################################################
# Group source files for IDE source explorers (e.g. Visual Studio)
#################################################################################
! #GenerateSourceGroups(include)
diff -c -r geos-3.5.0.orig/src/CMakeLists.txt geos-3.5.0/src/CMakeLists.txt
*** geos-3.5.0.orig/src/CMakeLists.txt 2015-08-14 15:23:15.000000000 -0300
--- geos-3.5.0/src/CMakeLists.txt 2016-03-11 19:54:18.808916700 -0300
***************
*** 99,102 ****
#################################################################################
# Group source files for IDE source explorers (e.g. Visual Studio)
#################################################################################
! GenerateSourceGroups(src)
--- 99,102 ----
#################################################################################
# Group source files for IDE source explorers (e.g. Visual Studio)
#################################################################################
! #GenerateSourceGroups(src)
diff -c -r geos-3.5.0.orig/tests/unit/CMakeLists.txt geos-3.5.0/tests/unit/CMakeLists.txt
*** geos-3.5.0.orig/tests/unit/CMakeLists.txt 2015-08-14 15:23:16.000000000 -0300
--- geos-3.5.0/tests/unit/CMakeLists.txt 2016-03-11 19:54:18.824542900 -0300
***************
*** 38,41 ****
#################################################################################
# Group source files for IDE source explorers (e.g. Visual Studio)
#################################################################################
! GenerateSourceGroups(tests/unit)
diff -Naur geos-3.6.2.orig/CMakeLists.txt geos-3.6.2/CMakeLists.txt
--- geos-3.6.2.orig/CMakeLists.txt 2018-05-23 19:46:15.542316000 -0400
+++ geos-3.6.2/CMakeLists.txt 2018-05-23 20:36:33.943193000 -0400
@@ -116,7 +116,7 @@
"Forcing IEEE 754 using flag -ffloat-store - ${GEOS_ENABLE_FLOATSTORE}")
# Warnings specification
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long")
+ #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long")
# Turn on Position Independent Code generation for GEOS C shared library
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
@@ -191,7 +191,10 @@
include(CheckPrototypeExists)
include(CheckSymbolExists)
-check_prototype_exists(isnan cmath HAVE_STD_ISNAN)
+check_cxx_source_compiles(
+ "#include <cmath>
+ int main() { double x=0.1; return std::isnan(x)?1:0; }"
+ HAVE_STD_ISNAN)
if(NOT HAVE_STD_ISNAN)
if(MSVC)
check_prototype_exists(_isnan float.h HAVE_ISNAN)
@@ -205,7 +208,10 @@
endif()
endif()
-check_prototype_exists(isfinite cmath HAVE_STD_ISFINITE)
+check_cxx_source_compiles(
+ "#include <cmath>
+ int main() { double x=0.1; return std::isfinite(x)?1:0; }"
+ HAVE_STD_ISFINITE)
if(NOT HAVE_STD_ISFINITE)
if(MSVC)
@@ -347,7 +353,7 @@
#################################################################################
# Configure subdirectories
#################################################################################
-include(GenerateSourceGroups)
+#include(GenerateSourceGroups)
add_subdirectory(include)
add_subdirectory(src)
diff -Naur geos-3.6.2.orig/include/CMakeLists.txt geos-3.6.2/include/CMakeLists.txt
--- geos-3.6.2.orig/include/CMakeLists.txt 2018-05-23 19:46:15.521315800 -0400
+++ geos-3.6.2/include/CMakeLists.txt 2018-05-23 20:37:32.614369700 -0400
@@ -54,4 +54,4 @@
#################################################################################
# Group source files for IDE source explorers (e.g. Visual Studio)
#################################################################################
-GenerateSourceGroups(include)
+#GenerateSourceGroups(include)
diff -Naur geos-3.6.2.orig/src/CMakeLists.txt geos-3.6.2/src/CMakeLists.txt
--- geos-3.6.2.orig/src/CMakeLists.txt 2018-05-23 19:46:15.848312300 -0400
+++ geos-3.6.2/src/CMakeLists.txt 2018-05-23 20:37:52.022699800 -0400
@@ -105,4 +105,4 @@
#################################################################################
# Group source files for IDE source explorers (e.g. Visual Studio)
#################################################################################
-GenerateSourceGroups(src)
+#GenerateSourceGroups(src)
diff -Naur geos-3.6.2.orig/tests/unit/CMakeLists.txt geos-3.6.2/tests/unit/CMakeLists.txt
--- geos-3.6.2.orig/tests/unit/CMakeLists.txt 2018-05-23 19:46:14.736324600 -0400
+++ geos-3.6.2/tests/unit/CMakeLists.txt 2018-05-23 20:38:21.110716300 -0400
@@ -38,4 +38,4 @@
#################################################################################
# Group source files for IDE source explorers (e.g. Visual Studio)
#################################################################################
-GenerateSourceGroups(tests/unit)
\ No newline at end of file
--- 38,41 ----
#################################################################################
# Group source files for IDE source explorers (e.g. Visual Studio)
#################################################################################
! #GenerateSourceGroups(tests/unit)
+#GenerateSourceGroups(tests/unit)
\ No newline at end of file
diff -c -r geos-3.5.0.orig/tools/CMakeLists.txt geos-3.5.0/tools/CMakeLists.txt
*** geos-3.5.0.orig/tools/CMakeLists.txt 2015-08-14 15:23:15.000000000 -0300
--- geos-3.5.0/tools/CMakeLists.txt 2016-03-11 20:01:26.711461000 -0300
***************
*** 11,17 ****
#
#################################################################################
! if(UNIX)
if(APPLE AND GEOS_ENABLE_MACOSX_FRAMEWORK AND GEOS_ENABLE_MACOSX_FRAMEWORK_UNIXCOMPAT)
set(installdest GEOS.framework/Versions/${VERSION_MAJOR}/unix/bin)
--- 11,17 ----
#
#################################################################################
! if(UNIX OR MINGW)
if(APPLE AND GEOS_ENABLE_MACOSX_FRAMEWORK AND GEOS_ENABLE_MACOSX_FRAMEWORK_UNIXCOMPAT)
set(installdest GEOS.framework/Versions/${VERSION_MAJOR}/unix/bin)