Skip to content

Commit 6b4ce24

Browse files
committed
rebuilds for protobuf-35
1 parent cf606ad commit 6b4ce24

12 files changed

Lines changed: 25 additions & 17 deletions

File tree

mingw-w64-android-tools/PKGBUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}
55
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
66
pkgver=35.0.2
77
_tag=${pkgver}
8-
pkgrel=9
8+
pkgrel=10
99
pkgdesc='Android platform tools (mingw-w64)'
1010
arch=('any')
1111
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')

mingw-w64-arrow/PKGBUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ _realname=arrow
44
pkgbase=mingw-w64-${_realname}
55
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
66
pkgver=24.0.0
7-
pkgrel=6
7+
pkgrel=7
88
pkgdesc="Apache Arrow is a cross-language development platform for in-memory data (mingw-w64)"
99
arch=(any)
1010
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')

mingw-w64-grpc/PKGBUILD

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
88
"${MINGW_PACKAGE_PREFIX}-python-grpcio"
99
"${MINGW_PACKAGE_PREFIX}-python-grpcio-tools")
1010
pkgver=1.81.0
11-
pkgrel=1
11+
pkgrel=2
12+
_proto_ver=35.0
1213
pkgdesc="Google's high performance, open source, general RPC framework (mingw-w64)"
1314
arch=('any')
1415
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -36,12 +37,14 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
3637
"${MINGW_PACKAGE_PREFIX}-python-installer"
3738
"${MINGW_PACKAGE_PREFIX}-python-setuptools")
3839
source=("${msys2_repository_url}/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
40+
https://github.com/protocolbuffers/protobuf/releases/download/v${_proto_ver}/protobuf-${_proto_ver}.tar.gz
3941
"001-fix-thread_local.patch"
4042
"002-fix-building-python-module.patch"
4143
"003-fix-build-shared-libs-on-mingw.patch"
4244
"004-use-system-abseil-cpp.patch"
4345
"005-fix-build-on-clangarm64.patch::https://github.com/protocolbuffers/protobuf/commit/0e84323c.patch")
4446
sha256sums=('41b695614b26652ff9e97ce50cfd4a6c7a3d45a9fe598d1454407746499bbf2c'
47+
'8f907baca4b34a3b4854103ba5811e418fb6e2ff11fe0d8df9e8280b11d79926'
4548
'6695fd531478be73e9555c28d4a1242eb47b9e8c24ccf8df1b8243d81e11c8b1'
4649
'c08e9a6a4dd569155452660825c8b42a06bbc6eb1e924af98796b138e6698e93'
4750
'd1b8334fbd97c833f37f03f222bd443a77772409586c1324cb5bb1b5d85037b3'
@@ -134,6 +137,7 @@ build() {
134137
GRPC_BUILD_WITH_BORING_SSL_ASM=0 \
135138
GRPC_PYTHON_CFLAGS="-DGPR_MSVC_EMPTY_BASE_CLASS_WORKAROUND='' -DSTRSAFE_NO_DEPRECATE" \
136139
LDFLAGS="${LDFLAGS} -L../build-${MSYSTEM}" \
140+
CXXFLAGS+=" -Wno-deprecated-declarations" \
137141
${MINGW_PREFIX}/bin/python -m build --wheel --skip-dependency-check --no-isolation
138142

139143
cd tools/distrib/python/grpcio_tools
@@ -149,7 +153,7 @@ build() {
149153
protoc_lib_deps.py
150154
cp -r "${srcdir}"/${_realname}-${pkgver} grpc_root || true
151155

152-
GRPC_PYTHON_CFLAGS="${CFLAGS} -fno-wrapv -frtti -std=c++17 -DPROTOBUF_USE_DLLS" \
156+
GRPC_PYTHON_CFLAGS="${CFLAGS} -fno-wrapv -frtti -std=c++17 -DPROTOBUF_USE_DLLS -Wno-deprecated-declarations -I$(cygpath -m ${srcdir}/protobuf-${_proto_ver}/src)" \
153157
GRPC_PYTHON_LDFLAGS="${LDFLAGS} $(pkgconf --libs protobuf) -lprotoc" \
154158
${MINGW_PREFIX}/bin/python -m build --wheel --skip-dependency-check --no-isolation
155159
}

mingw-w64-kicad/PKGBUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
1212
"${MINGW_PACKAGE_PREFIX}-${_realname}-demos"
1313
"${MINGW_PACKAGE_PREFIX}-${_realname}-meta")
1414
pkgver=10.0.3
15-
pkgrel=2
15+
pkgrel=3
1616
pkgdesc="Software for the creation of electronic schematic diagrams and printed circuit board artwork (mingw-w64)"
1717
arch=(any)
1818
mingw_arch=('ucrt64' 'clang64' 'clangarm64')

mingw-w64-libosmpbf/PKGBUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ _realname=libosmpbf
44
pkgbase=mingw-w64-${_realname}
55
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
66
pkgver=1.5.1
7-
pkgrel=5
7+
pkgrel=6
88
pkgdesc="A library to support OpenStreetMap's protocolbuffer binary .pbf format (mingw-w64)"
99
arch=('any')
1010
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')

mingw-w64-onnx/PKGBUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}
55
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
66
"${MINGW_PACKAGE_PREFIX}-python-${_realname}")
77
pkgver=1.21.0
8-
pkgrel=3
8+
pkgrel=4
99
pkgdesc="Open standard for machine learning interoperability. (mingw-w64)"
1010
arch=('any')
1111
mingw_arch=('ucrt64' 'clang64' 'clangarm64')

mingw-w64-opencv/PKGBUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pkgbase=mingw-w64-${_realname}
77
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
88
"${MINGW_PACKAGE_PREFIX}-python-${_realname}")
99
pkgver=4.13.0
10-
pkgrel=5
10+
pkgrel=6
1111
pkgdesc="Open Source Computer Vision Library (mingw-w64)"
1212
arch=('any')
1313
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')

mingw-w64-osgearth/PKGBUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ _realname=osgearth
55
pkgbase=mingw-w64-${_realname}
66
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
77
pkgver=3.7.2
8-
pkgrel=9
8+
pkgrel=10
99
_rj_ver=1.1.0
1010
_lerc_commit=19542a00b9a8b5c1089f74239e5859e02e403212
1111
arch=('any')

mingw-w64-paraview/PKGBUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ _realname=paraview
44
pkgbase=mingw-w64-${_realname}
55
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
66
pkgver=6.0.1
7-
pkgrel=10
7+
pkgrel=11
88
pkgdesc="Parallel Data Analysis and Visualization Application based on VTK. (mingw-w64)"
99
arch=('any')
10-
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
10+
mingw_arch=('ucrt64' 'clang64' 'clangarm64')
1111
url='https://www.paraview.org/'
1212
msys2_repository_url="https://gitlab.kitware.com/paraview/paraview"
1313
msys2_references=(

mingw-w64-protobuf-c/PKGBUILD

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ _realname=protobuf-c
44
pkgbase=mingw-w64-${_realname}
55
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
66
pkgver=1.5.2
7-
pkgrel=9
7+
pkgrel=10
88
pkgdesc="Protocol Buffers implementation in C (mingw-w64)"
99
arch=('any')
1010
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -19,11 +19,14 @@ depends=("${MINGW_PACKAGE_PREFIX}-abseil-cpp"
1919
"${MINGW_PACKAGE_PREFIX}-protobuf")
2020
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
2121
"${MINGW_PACKAGE_PREFIX}-autotools")
22-
source=("$url/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.gz")
23-
sha256sums=('e2c86271873a79c92b58fef7ebf8de1aa0df4738347a8bd5d4e65a80a16d0d24')
22+
source=("$url/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.gz"
23+
https://github.com/protobuf-c/protobuf-c/pull/797.patch)
24+
sha256sums=('e2c86271873a79c92b58fef7ebf8de1aa0df4738347a8bd5d4e65a80a16d0d24'
25+
'bf70df90f83d18fa2d4f2415378aa64e27ddaa8d1334deab2fde0407035dae90')
2426

2527
prepare() {
2628
cd "${srcdir}/${_realname}-${pkgver}"
29+
patch -p1 -i "${srcdir}"/797.patch
2730
autoreconf -fiv
2831
}
2932

@@ -44,5 +47,6 @@ check() {
4447
package() {
4548
cd "${srcdir}/build-${MSYSTEM}"
4649
make DESTDIR="${pkgdir}" install
47-
install -Dm644 "${srcdir}"/${_realname}-${pkgver}/LICENSE "${pkgdir}${MINGW_PREFIX}"/share/licenses/${_realname}/LICENSE
50+
install -Dm644 "${srcdir}"/${_realname}-${pkgver}/LICENSE \
51+
"${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE
4852
}

0 commit comments

Comments
 (0)