Skip to content

Commit

Permalink
Merge pull request #211 from xylar/4.25.1
Browse files Browse the repository at this point in the history
protobuf 4.25.1
  • Loading branch information
xhochy authored Jan 22, 2024
2 parents 73c966d + a864da9 commit 128b13c
Show file tree
Hide file tree
Showing 10 changed files with 73 additions and 14 deletions.
3 changes: 3 additions & 0 deletions .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .azure-pipelines/azure-pipelines-win.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 23 additions & 2 deletions .gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .scripts/run_docker_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 10 additions & 3 deletions .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 12 additions & 2 deletions .scripts/run_win_build.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# keep this without major version to let the bot pick it up
{% set version = "24.3" %}
{% set version = "25.1" %}
# protobuf doesn't add the major version in the tag, it's defined per language in
# https://github.com/protocolbuffers/protobuf/blob/main/version.json
{% set major = "4" %}
Expand All @@ -12,7 +12,7 @@ package:

source:
url: https://github.com/protocolbuffers/protobuf/archive/refs/tags/v{{ version }}.tar.gz
sha256: 07d69502e58248927b58c7d7e7424135272ba5b2852a753ab6b67e62d2d29355
sha256: 9bd87b8280ef720d3240514f884e56a712f2218f0d693b48050c836028940a42
patches:
- patches/0001-do-not-link-msvc-runtime-statically.patch
- patches/0002-fix-paths-for-include-lib-directories.patch
Expand All @@ -21,7 +21,7 @@ source:
- patches/0005-set-PROTOBUF_USE_DLLS-on-windows.patch

build:
number: 1
number: 0
script:
- cd python
- export PROTOC=$PREFIX/bin/protoc # [unix and (build_platform == target_platform)]
Expand Down

0 comments on commit 128b13c

Please sign in to comment.