From 5640ef244ff2f1d9b1908c1f2a4e1db790741cb1 Mon Sep 17 00:00:00 2001 From: Diego Sogari Date: Sun, 3 Jul 2016 02:44:17 -0300 Subject: [PATCH] squash commit: - do not build tests - remove check function - remove check dependencies - remove curl dependency (only needed to build the examples) - change license string (CI was saying unrecognized) - add compile definition for the 64-bit case to account for a link error in appveyor - modify the cmake script for python bindings, because an incorrect installation path was being used during the package procedure --- mingw-w64-libkml/PKGBUILD | 12 +--- mingw-w64-libkml/libkml-1.3.0.patch | 96 ++++++++++++++++------------- 2 files changed, 56 insertions(+), 52 deletions(-) diff --git a/mingw-w64-libkml/PKGBUILD b/mingw-w64-libkml/PKGBUILD index 93e252907c..f718d48116 100644 --- a/mingw-w64-libkml/PKGBUILD +++ b/mingw-w64-libkml/PKGBUILD @@ -8,23 +8,21 @@ pkgrel=3 pkgdesc="Reference implementation of OGC KML 2.2 (mingw-w64)" arch=('any') url="https://github.com/google/libkml/" -license=('New BSD License') +license=('BSD') makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" - "${MINGW_PACKAGE_PREFIX}-curl" "${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-python2" "${MINGW_PACKAGE_PREFIX}-swig") depends=("${MINGW_PACKAGE_PREFIX}-boost" "${MINGW_PACKAGE_PREFIX}-uriparser" "${MINGW_PACKAGE_PREFIX}-zlib") -checkdepends=("${MINGW_PACKAGE_PREFIX}-gtest") optdepends=("${MINGW_PACKAGE_PREFIX}-python2" "${MINGW_PACKAGE_PREFIX}-swig") source=("${_realname}-${pkgver}.tar.gz::https://codeload.github.com/libkml/libkml/tar.gz/${pkgver}" "${_realname}-${pkgver}.patch" "strptime.c") sha256sums=('8892439e5570091965aaffe30b08631fdf7ca7f81f6495b4648f0950d7ea7963' - '23130cf89a46f556eecbf9c2a07088a0d946158b80a7cac7305c7af8b1907bb6' + 'a7b3c492c471bff3ccc745b56389c6714f6bbef09cf3fa011faef353d90f63b0' '49433be91643aaccef032ded7d413782a6ed62f545883165814e13c0e1f4182c') prepare() { @@ -42,7 +40,6 @@ build() { ${MINGW_PREFIX}/bin/cmake.exe \ -G"MSYS Makefiles" \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ - -DBUILD_TESTING=ON \ -DWITH_SWIG=ON \ -DWITH_PYTHON=ON \ "../${_realname}-${pkgver}" @@ -50,11 +47,6 @@ build() { make } -check() { - cd "${srcdir}/build-${MINGW_CHOST}" - make test -} - package() { cd "${srcdir}/build-${MINGW_CHOST}" make DESTDIR="${pkgdir}" install diff --git a/mingw-w64-libkml/libkml-1.3.0.patch b/mingw-w64-libkml/libkml-1.3.0.patch index 6bb2867795..16e77839b4 100644 --- a/mingw-w64-libkml/libkml-1.3.0.patch +++ b/mingw-w64-libkml/libkml-1.3.0.patch @@ -1,6 +1,6 @@ diff -c -r libkml-1.3.0.orig/CMakeLists.txt libkml-1.3.0/CMakeLists.txt *** libkml-1.3.0.orig/CMakeLists.txt 2015-12-21 15:23:05.000000000 -0200 ---- libkml-1.3.0/CMakeLists.txt 2016-07-02 20:21:57.546646500 -0300 +--- libkml-1.3.0/CMakeLists.txt 2016-07-03 04:46:23.910658900 -0300 *************** *** 69,75 **** set(PKGCONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/pkgconfig") @@ -20,7 +20,7 @@ diff -c -r libkml-1.3.0.orig/CMakeLists.txt libkml-1.3.0/CMakeLists.txt set(DEF_INSTALL_CMAKE_DIR lib/cmake/libkml) diff -c -r libkml-1.3.0.orig/examples/hellonet/CMakeLists.txt libkml-1.3.0/examples/hellonet/CMakeLists.txt *** libkml-1.3.0.orig/examples/hellonet/CMakeLists.txt 2015-12-21 15:23:05.000000000 -0200 ---- libkml-1.3.0/examples/hellonet/CMakeLists.txt 2016-07-02 20:21:57.546646500 -0300 +--- libkml-1.3.0/examples/hellonet/CMakeLists.txt 2016-07-03 04:46:23.926289400 -0300 *************** *** 1,78 **** ! @@ -181,7 +181,7 @@ diff -c -r libkml-1.3.0.orig/examples/hellonet/CMakeLists.txt libkml-1.3.0/examp file(GLOB eg_files "${CMAKE_CURRENT_SOURCE_DIR}/*.cc") diff -c -r libkml-1.3.0.orig/examples/hellonet/csvurl2gmap.cc libkml-1.3.0/examples/hellonet/csvurl2gmap.cc *** libkml-1.3.0.orig/examples/hellonet/csvurl2gmap.cc 2015-12-21 15:23:05.000000000 -0200 ---- libkml-1.3.0/examples/hellonet/csvurl2gmap.cc 2016-07-02 20:21:57.562274000 -0300 +--- libkml-1.3.0/examples/hellonet/csvurl2gmap.cc 2016-07-03 04:46:23.941911400 -0300 *************** *** 23,35 **** // OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF @@ -210,7 +210,7 @@ diff -c -r libkml-1.3.0.orig/examples/hellonet/csvurl2gmap.cc libkml-1.3.0/examp diff -c -r libkml-1.3.0.orig/examples/hellonet/prompt.h libkml-1.3.0/examples/hellonet/prompt.h *** libkml-1.3.0.orig/examples/hellonet/prompt.h 2015-12-21 15:23:05.000000000 -0200 ---- libkml-1.3.0/examples/hellonet/prompt.h 2016-07-02 20:21:57.562274000 -0300 +--- libkml-1.3.0/examples/hellonet/prompt.h 2016-07-03 04:46:23.941911400 -0300 *************** *** 28,37 **** --- 28,65 ---- @@ -288,7 +288,7 @@ diff -c -r libkml-1.3.0.orig/examples/hellonet/prompt.h libkml-1.3.0/examples/he } diff -c -r libkml-1.3.0.orig/examples/hellonet/uploadgmap.cc libkml-1.3.0/examples/hellonet/uploadgmap.cc *** libkml-1.3.0.orig/examples/hellonet/uploadgmap.cc 2015-12-21 15:23:05.000000000 -0200 ---- libkml-1.3.0/examples/hellonet/uploadgmap.cc 2016-07-02 20:21:57.562274000 -0300 +--- libkml-1.3.0/examples/hellonet/uploadgmap.cc 2016-07-03 04:46:23.941911400 -0300 *************** *** 27,38 **** // Maps Data API. The URI of feed to the new map is printed on output. @@ -316,7 +316,7 @@ diff -c -r libkml-1.3.0.orig/examples/hellonet/uploadgmap.cc libkml-1.3.0/exampl diff -c -r libkml-1.3.0.orig/examples/hellonet/uploadgmapkml.cc libkml-1.3.0/examples/hellonet/uploadgmapkml.cc *** libkml-1.3.0.orig/examples/hellonet/uploadgmapkml.cc 2015-12-21 15:23:05.000000000 -0200 ---- libkml-1.3.0/examples/hellonet/uploadgmapkml.cc 2016-07-02 20:21:57.577897800 -0300 +--- libkml-1.3.0/examples/hellonet/uploadgmapkml.cc 2016-07-03 04:46:23.957537100 -0300 *************** *** 23,34 **** // OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF @@ -344,7 +344,7 @@ diff -c -r libkml-1.3.0.orig/examples/hellonet/uploadgmapkml.cc libkml-1.3.0/exa diff -c -r libkml-1.3.0.orig/examples/hellonet/uploadgsheet.cc libkml-1.3.0/examples/hellonet/uploadgsheet.cc *** libkml-1.3.0.orig/examples/hellonet/uploadgsheet.cc 2015-12-21 15:23:05.000000000 -0200 ---- libkml-1.3.0/examples/hellonet/uploadgsheet.cc 2016-07-02 20:21:57.577897800 -0300 +--- libkml-1.3.0/examples/hellonet/uploadgsheet.cc 2016-07-03 04:46:23.973248100 -0300 *************** *** 23,34 **** // OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF @@ -372,7 +372,7 @@ diff -c -r libkml-1.3.0.orig/examples/hellonet/uploadgsheet.cc libkml-1.3.0/exam diff -c -r libkml-1.3.0.orig/examples/helloworld/CMakeLists.txt libkml-1.3.0/examples/helloworld/CMakeLists.txt *** libkml-1.3.0.orig/examples/helloworld/CMakeLists.txt 2015-12-21 15:23:05.000000000 -0200 ---- libkml-1.3.0/examples/helloworld/CMakeLists.txt 2016-07-02 20:21:57.577897800 -0300 +--- libkml-1.3.0/examples/helloworld/CMakeLists.txt 2016-07-03 04:46:23.973248100 -0300 *************** *** 1,6 **** ! add_library(helloutil print.cc) @@ -446,7 +446,7 @@ diff -c -r libkml-1.3.0.orig/examples/helloworld/CMakeLists.txt libkml-1.3.0/exa NAME helloworld diff -c -r libkml-1.3.0.orig/src/kml/base/CMakeLists.txt libkml-1.3.0/src/kml/base/CMakeLists.txt *** libkml-1.3.0.orig/src/kml/base/CMakeLists.txt 2015-12-21 15:23:05.000000000 -0200 ---- libkml-1.3.0/src/kml/base/CMakeLists.txt 2016-07-02 20:21:57.577897800 -0300 +--- libkml-1.3.0/src/kml/base/CMakeLists.txt 2016-07-03 04:46:23.973248100 -0300 *************** *** 7,16 **** @@ -477,7 +477,7 @@ diff -c -r libkml-1.3.0.orig/src/kml/base/CMakeLists.txt libkml-1.3.0/src/kml/ba #supress long-long warning for linux diff -c -r libkml-1.3.0.orig/src/kml/base/contrib/minizip/unzip.c libkml-1.3.0/src/kml/base/contrib/minizip/unzip.c *** libkml-1.3.0.orig/src/kml/base/contrib/minizip/unzip.c 2015-12-21 15:23:05.000000000 -0200 ---- libkml-1.3.0/src/kml/base/contrib/minizip/unzip.c 2016-07-02 20:21:57.593524400 -0300 +--- libkml-1.3.0/src/kml/base/contrib/minizip/unzip.c 2016-07-03 04:46:23.988790900 -0300 *************** *** 35,40 **** --- 35,43 ---- @@ -490,9 +490,10 @@ diff -c -r libkml-1.3.0.orig/src/kml/base/contrib/minizip/unzip.c libkml-1.3.0/s #include #include +Only in libkml-1.3.0/src/kml/base/contrib: strptime.c diff -c -r libkml-1.3.0.orig/src/kml/base/date_time.cc libkml-1.3.0/src/kml/base/date_time.cc *** libkml-1.3.0.orig/src/kml/base/date_time.cc 2015-12-21 15:23:05.000000000 -0200 ---- libkml-1.3.0/src/kml/base/date_time.cc 2016-07-02 20:21:57.593524400 -0300 +--- libkml-1.3.0/src/kml/base/date_time.cc 2016-07-03 04:46:23.988790900 -0300 *************** *** 29,40 **** #include "boost/scoped_ptr.hpp" @@ -518,7 +519,7 @@ diff -c -r libkml-1.3.0.orig/src/kml/base/date_time.cc libkml-1.3.0/src/kml/base namespace kmlbase { diff -c -r libkml-1.3.0.orig/src/kml/base/date_time.h libkml-1.3.0/src/kml/base/date_time.h *** libkml-1.3.0.orig/src/kml/base/date_time.h 2015-12-21 15:23:05.000000000 -0200 ---- libkml-1.3.0/src/kml/base/date_time.h 2016-07-02 20:21:57.593524400 -0300 +--- libkml-1.3.0/src/kml/base/date_time.h 2016-07-03 04:46:24.004414700 -0300 *************** *** 31,42 **** #include @@ -536,7 +537,7 @@ diff -c -r libkml-1.3.0.orig/src/kml/base/date_time.h libkml-1.3.0/src/kml/base/ --- 31,36 ---- diff -c -r libkml-1.3.0.orig/src/kml/base/file_win32.cc libkml-1.3.0/src/kml/base/file_win32.cc *** libkml-1.3.0.orig/src/kml/base/file_win32.cc 2015-12-21 15:23:05.000000000 -0200 ---- libkml-1.3.0/src/kml/base/file_win32.cc 2016-07-02 20:21:57.609150700 -0300 +--- libkml-1.3.0/src/kml/base/file_win32.cc 2016-07-03 04:46:24.004414700 -0300 *************** *** 34,44 **** --- 34,47 ---- @@ -607,7 +608,7 @@ diff -c -r libkml-1.3.0.orig/src/kml/base/file_win32.cc libkml-1.3.0/src/kml/bas diff -c -r libkml-1.3.0.orig/src/kml/base/uri_parser.cc libkml-1.3.0/src/kml/base/uri_parser.cc *** libkml-1.3.0.orig/src/kml/base/uri_parser.cc 2015-12-21 15:23:05.000000000 -0200 ---- libkml-1.3.0/src/kml/base/uri_parser.cc 2016-07-02 20:21:57.609150700 -0300 +--- libkml-1.3.0/src/kml/base/uri_parser.cc 2016-07-03 04:46:24.004414700 -0300 *************** *** 187,197 **** @@ -634,7 +635,7 @@ diff -c -r libkml-1.3.0.orig/src/kml/base/uri_parser.cc libkml-1.3.0/src/kml/bas bool UriParser::UnixFilenameToUri(const string& filename, diff -c -r libkml-1.3.0.orig/src/kml/dom/CMakeLists.txt libkml-1.3.0/src/kml/dom/CMakeLists.txt *** libkml-1.3.0.orig/src/kml/dom/CMakeLists.txt 2015-12-21 15:23:05.000000000 -0200 ---- libkml-1.3.0/src/kml/dom/CMakeLists.txt 2016-07-02 20:21:57.609150700 -0300 +--- libkml-1.3.0/src/kml/dom/CMakeLists.txt 2016-07-03 04:46:24.004414700 -0300 *************** *** 50,55 **** --- 50,60 ---- @@ -651,9 +652,9 @@ diff -c -r libkml-1.3.0.orig/src/kml/dom/CMakeLists.txt libkml-1.3.0/src/kml/dom SRCS ${SRCS} diff -c -r libkml-1.3.0.orig/src/swig/CMakeLists.txt libkml-1.3.0/src/swig/CMakeLists.txt *** libkml-1.3.0.orig/src/swig/CMakeLists.txt 2015-12-21 15:23:05.000000000 -0200 ---- libkml-1.3.0/src/swig/CMakeLists.txt 2016-07-03 01:04:41.069907800 -0300 +--- libkml-1.3.0/src/swig/CMakeLists.txt 2016-07-03 04:53:03.361396300 -0300 *************** -*** 1,10 **** +*** 1,42 **** if(WITH_PYTHON) ! find_package(PythonLibs REQUIRED) if(NOT PYTHONLIBS_FOUND) @@ -664,21 +665,12 @@ diff -c -r libkml-1.3.0.orig/src/swig/CMakeLists.txt libkml-1.3.0/src/swig/CMake include_directories(${PYTHON_INCLUDE_PATH}) ---- 1,10 ---- - if(WITH_PYTHON) -! find_package(PythonLibs 2.7 REQUIRED) - if(NOT PYTHONLIBS_FOUND) - message(FATAL_ERROR "Python Libraries not found.") - endif() - -! find_package(PythonInterp 2.7 REQUIRED) - - include_directories(${PYTHON_INCLUDE_PATH}) - -*************** -*** 15,42 **** +! if(NOT DEFINED PYTHON_INSTALL_DIR) + execute_process(COMMAND + ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(True)" + OUTPUT_VARIABLE PYTHON_INSTALL_DIR OUTPUT_STRIP_TRAILING_WHITESPACE ) - endif(NOT DEFINED PYTHON_INSTALL_DIR) +! endif(NOT DEFINED PYTHON_INSTALL_DIR) file(GLOB IFILES "kml*.i") foreach(INTERFACE_FILE ${IFILES}) @@ -705,12 +697,32 @@ diff -c -r libkml-1.3.0.orig/src/swig/CMakeLists.txt libkml-1.3.0/src/swig/CMake DESTINATION ${PYTHON_INSTALL_DIR}) endforeach() ---- 15,46 ---- - OUTPUT_STRIP_TRAILING_WHITESPACE ) - endif(NOT DEFINED PYTHON_INSTALL_DIR) +--- 1,52 ---- + if(WITH_PYTHON) +! find_package(PythonLibs 2.7 REQUIRED) + if(NOT PYTHONLIBS_FOUND) + message(FATAL_ERROR "Python Libraries not found.") + endif() + +! find_package(PythonInterp 2.7 REQUIRED) + + include_directories(${PYTHON_INCLUDE_PATH}) + +! if(MINGW) +! set(PYTHON_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib/python2.7/site-packages") +! elseif(NOT DEFINED PYTHON_INSTALL_DIR) + execute_process(COMMAND + ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(True)" + OUTPUT_VARIABLE PYTHON_INSTALL_DIR + OUTPUT_STRIP_TRAILING_WHITESPACE ) +! endif() +! +! if(WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 8) +! add_definitions("-DMS_WIN64") +! endif() +! +! set(CMAKE_SWIG_OUTDIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) -+ set(CMAKE_SWIG_OUTDIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) -+ file(GLOB IFILES "kml*.i") foreach(INTERFACE_FILE ${IFILES}) get_filename_component(MODULE_NAME ${INTERFACE_FILE} NAME_WE) @@ -740,7 +752,7 @@ diff -c -r libkml-1.3.0.orig/src/swig/CMakeLists.txt libkml-1.3.0/src/swig/CMake endforeach() diff -c -r libkml-1.3.0.orig/tests/kml/base/CMakeLists.txt libkml-1.3.0/tests/kml/base/CMakeLists.txt *** libkml-1.3.0.orig/tests/kml/base/CMakeLists.txt 2015-12-21 15:23:05.000000000 -0200 ---- libkml-1.3.0/tests/kml/base/CMakeLists.txt 2016-07-02 20:21:57.609150700 -0300 +--- libkml-1.3.0/tests/kml/base/CMakeLists.txt 2016-07-03 04:46:24.020041600 -0300 *************** *** 18,23 **** --- 18,28 ---- @@ -757,7 +769,7 @@ diff -c -r libkml-1.3.0.orig/tests/kml/base/CMakeLists.txt libkml-1.3.0/tests/km GROUP base diff -c -r libkml-1.3.0.orig/tests/kml/convenience/CMakeLists.txt libkml-1.3.0/tests/kml/convenience/CMakeLists.txt *** libkml-1.3.0.orig/tests/kml/convenience/CMakeLists.txt 2015-12-21 15:23:05.000000000 -0200 ---- libkml-1.3.0/tests/kml/convenience/CMakeLists.txt 2016-07-02 20:21:57.624776000 -0300 +--- libkml-1.3.0/tests/kml/convenience/CMakeLists.txt 2016-07-03 04:46:24.020041600 -0300 *************** *** 13,19 **** @@ -777,7 +789,7 @@ diff -c -r libkml-1.3.0.orig/tests/kml/convenience/CMakeLists.txt libkml-1.3.0/t endforeach() diff -c -r libkml-1.3.0.orig/tests/kml/convenience/google_maps_data_test.cc libkml-1.3.0/tests/kml/convenience/google_maps_data_test.cc *** libkml-1.3.0.orig/tests/kml/convenience/google_maps_data_test.cc 2015-12-21 15:23:05.000000000 -0200 ---- libkml-1.3.0/tests/kml/convenience/google_maps_data_test.cc 2016-07-02 20:21:57.624776000 -0300 +--- libkml-1.3.0/tests/kml/convenience/google_maps_data_test.cc 2016-07-03 04:46:24.020041600 -0300 *************** *** 36,41 **** --- 36,48 ---- @@ -796,7 +808,7 @@ diff -c -r libkml-1.3.0.orig/tests/kml/convenience/google_maps_data_test.cc libk #include "kml/base/google_internal_test.h" diff -c -r libkml-1.3.0.orig/tests/kml/engine/feature_view_test.cc libkml-1.3.0/tests/kml/engine/feature_view_test.cc *** libkml-1.3.0.orig/tests/kml/engine/feature_view_test.cc 2015-12-21 15:23:05.000000000 -0200 ---- libkml-1.3.0/tests/kml/engine/feature_view_test.cc 2016-07-02 20:21:57.624776000 -0300 +--- libkml-1.3.0/tests/kml/engine/feature_view_test.cc 2016-07-03 04:46:24.035667300 -0300 *************** *** 144,150 **** --- 144,154 ---- @@ -813,7 +825,7 @@ diff -c -r libkml-1.3.0.orig/tests/kml/engine/feature_view_test.cc libkml-1.3.0/ ASSERT_FALSE(lookat->has_heading()); diff -c -r libkml-1.3.0.orig/tests/kml/engine/kmz_file_test.cc libkml-1.3.0/tests/kml/engine/kmz_file_test.cc *** libkml-1.3.0.orig/tests/kml/engine/kmz_file_test.cc 2015-12-21 15:23:05.000000000 -0200 ---- libkml-1.3.0/tests/kml/engine/kmz_file_test.cc 2016-07-02 20:21:57.624776000 -0300 +--- libkml-1.3.0/tests/kml/engine/kmz_file_test.cc 2016-07-03 04:46:24.035667300 -0300 *************** *** 347,353 **** --- 347,357 ---- @@ -892,7 +904,7 @@ diff -c -r libkml-1.3.0.orig/tests/kml/engine/kmz_file_test.cc libkml-1.3.0/test TEST_F(KmzTest, TestSaveToString) { diff -c -r libkml-1.3.0.orig/tests/swig/CMakeLists.txt libkml-1.3.0/tests/swig/CMakeLists.txt *** libkml-1.3.0.orig/tests/swig/CMakeLists.txt 2015-12-21 15:23:05.000000000 -0200 ---- libkml-1.3.0/tests/swig/CMakeLists.txt 2016-07-03 01:03:13.262747300 -0300 +--- libkml-1.3.0/tests/swig/CMakeLists.txt 2016-07-03 04:46:24.035667300 -0300 *************** *** 1,12 **** if(WITH_PYTHON)