diff --git a/mingw-w64-protobuf/0003-demote-error-about-buildtime-runtime-version-difference-to-warning.patch b/mingw-w64-protobuf/0003-demote-error-about-buildtime-runtime-version-difference-to-warning.patch new file mode 100644 index 0000000000..90f5e6582e --- /dev/null +++ b/mingw-w64-protobuf/0003-demote-error-about-buildtime-runtime-version-difference-to-warning.patch @@ -0,0 +1,11 @@ +--- a/src/google/protobuf/stubs/common.cc ++++ b/src/google/protobuf/stubs/common.cc +@@ -44,7 +44,7 @@ + // If the user's program is linked against a different version of Protobuf, + // GOOGLE_PROTOBUF_VERSION will have a different value. + if (GOOGLE_PROTOBUF_VERSION != protobufVersionCompiledWith) { +- ABSL_LOG(FATAL) ++ ABSL_LOG(WARNING) + << "This program was compiled with Protobuf C++ version " + << VersionString(protobufVersionCompiledWith) + << ", but the linked version is " diff --git a/mingw-w64-protobuf/PKGBUILD b/mingw-w64-protobuf/PKGBUILD index 14c1115972..be07c74fd5 100644 --- a/mingw-w64-protobuf/PKGBUILD +++ b/mingw-w64-protobuf/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" # Note: make sure to update python-protobuf to match this version pkgver=28.3 -pkgrel=1 +pkgrel=2 pkgdesc="Protocol Buffers - Google's data interchange format (mingw-w64)" arch=('any') mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') @@ -26,10 +26,12 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-ninja") source=(https://github.com/protocolbuffers/${_realname}/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.gz 0001-fix-building-shared-libs-with-clang.patch - 0002-windres-invocation.patch) + 0002-windres-invocation.patch + 0003-demote-error-about-buildtime-runtime-version-difference-to-warning.patch) sha256sums=('7c3ebd7aaedd86fa5dc479a0fda803f602caaf78d8aff7ce83b89e1b8ae7442a' '04096f913c1fd5b8c6703e3f696ae7d068c1576ef14fadad2e372da4af188dd0' - '174f714b842d5153c79c5fda1ae775ee002aea11d53cb5d5f51cb5c4b9e63d29') + '174f714b842d5153c79c5fda1ae775ee002aea11d53cb5d5f51cb5c4b9e63d29' + '2b680e1c642ccd5bb70b3dcf7217c27360bc0b74f63d8afb66dd668173d9b2dd') apply_patch_with_msg() { for _patch in "$@" @@ -43,7 +45,8 @@ prepare() { cd "${srcdir}/${_realname}-${pkgver}" apply_patch_with_msg \ 0001-fix-building-shared-libs-with-clang.patch \ - 0002-windres-invocation.patch + 0002-windres-invocation.patch \ + 0003-demote-error-about-buildtime-runtime-version-difference-to-warning.patch } build() {