diff --git a/mingw-w64-yaml-cpp/010-no-fPIC.patch b/mingw-w64-yaml-cpp/010-no-fPIC.patch deleted file mode 100644 index 0e4228f9b6..0000000000 --- a/mingw-w64-yaml-cpp/010-no-fPIC.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -156,7 +156,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR - set(GCC_EXTRA_OPTIONS "") - # - if(YAML_BUILD_SHARED_LIBS) -- set(GCC_EXTRA_OPTIONS "${GCC_EXTRA_OPTIONS} -fPIC") - endif() - # - set(FLAG_TESTED "-Wextra -Wshadow -Weffc++ -pedantic -pedantic-errors") diff --git a/mingw-w64-yaml-cpp/PKGBUILD b/mingw-w64-yaml-cpp/PKGBUILD index 8cb2222542..6cb78b144d 100644 --- a/mingw-w64-yaml-cpp/PKGBUILD +++ b/mingw-w64-yaml-cpp/PKGBUILD @@ -3,8 +3,8 @@ _realname=yaml-cpp pkgbase="mingw-w64-${_realname}" pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=0.6.3 -pkgrel=5 +pkgver=0.7.0 +pkgrel=1 pkgdesc="A YAML parser and emitter in C++ matching the YAML 1.2 spec (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') @@ -18,16 +18,13 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-pkg-config") options=('staticlibs' 'strip') source=(${_realname}-${pkgver}.tar.gz::https://github.com/jbeder/yaml-cpp/archive/${_realname}-${pkgver}.tar.gz - mingw-install-pkgconfig.patch - 010-no-fPIC.patch) -sha256sums=('77ea1b90b3718aa0c324207cb29418f5bced2354c2e483a9523d98c3460af1ed' - '872d28cfb8cfc0280de846e80359c1ae3987afc8095b653df1a4e18daa7dcf72' - '597da9ea350a4c13e07ce3f0fd5f66b40209610644762ee55b1435103375ae24') + https://patch-diff.githubusercontent.com/raw/jbeder/yaml-cpp/pull/1037.patch) +sha256sums=('43e6a9fcb146ad871515f0d0873947e5d497a1c9c60c58cb102a97b47208b7c3' + 'ddc6769f46355d00515954bb2ece02c590c8f9c618ed418ca865d7c1eb9b76b1') prepare() { cd ${srcdir}/${_realname}-${_realname}-${pkgver} - patch -p1 -i ${srcdir}/mingw-install-pkgconfig.patch - patch -p1 -i ${srcdir}/010-no-fPIC.patch + patch -p1 -i ${srcdir}/1037.patch } build() { @@ -43,7 +40,7 @@ build() { -DYAML_BUILD_SHARED_LIBS=ON \ -DYAML_CPP_BUILD_TESTS=OFF \ ../${_realname}-${_realname}-${pkgver} - cmake --build . + ${MINGW_PREFIX}/bin/cmake --build . msg2 "Build static library" [[ -d "build-${MSYSTEM}-static" ]] && rm -rf "build-${MSYSTEM}-static" @@ -56,15 +53,15 @@ build() { -DYAML_BUILD_SHARED_LIBS=OFF \ -DYAML_CPP_BUILD_TESTS=OFF \ ../${_realname}-${_realname}-${pkgver} - cmake --build . + ${MINGW_PREFIX}/bin/cmake --build . } package() { cd "${srcdir}/build-${MSYSTEM}-static" - DESTDIR=${pkgdir} cmake --install . + DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake --install . cd "${srcdir}/build-${MSYSTEM}-shared" - DESTDIR=${pkgdir} cmake --install . + DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake --install . install -Dm644 ${srcdir}/${_realname}-${_realname}-${pkgver}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE } diff --git a/mingw-w64-yaml-cpp/mingw-install-pkgconfig.patch b/mingw-w64-yaml-cpp/mingw-install-pkgconfig.patch deleted file mode 100644 index d123a2f204..0000000000 --- a/mingw-w64-yaml-cpp/mingw-install-pkgconfig.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- yaml-cpp-yaml-cpp-0.6.2/CMakeLists.txt.orig 2018-03-06 01:56:23.000000000 -0300 -+++ yaml-cpp-yaml-cpp-0.6.2/CMakeLists.txt 2018-04-23 16:48:09.855961800 -0300 -@@ -320,7 +320,7 @@ - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/yaml-cpp-config.cmake.in - "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" @ONLY) - --if(WIN32 AND NOT CYGWIN) -+if(WIN32 AND NOT CYGWIN AND NOT MINGW) - set(INSTALL_CMAKE_DIR CMake) - else() - set(INSTALL_CMAKE_DIR ${LIB_INSTALL_DIR}/cmake/yaml-cpp) -@@ -340,7 +340,7 @@ - DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev) - install(EXPORT yaml-cpp-targets DESTINATION ${INSTALL_CMAKE_DIR}) - -- if(UNIX) -+ if(UNIX OR MINGW) - set(PC_FILE ${CMAKE_BINARY_DIR}/yaml-cpp.pc) - configure_file("yaml-cpp.pc.cmake" ${PC_FILE} @ONLY) - install(FILES ${PC_FILE} DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)