Skip to content

Commit

Permalink
[protobuf] Update patches
Browse files Browse the repository at this point in the history
patches/upstream-pr-7761-cmake-regex-fix.patch
and
patches/upstream-pr-7288-android-log.patch
no longer needed, they have been merged before 3.15.5

patches/upstream-pr-8301-bundle-destination.patch
is in master but not in 3.15.5
  • Loading branch information
anton-danielsson committed Mar 12, 2021
1 parent d81b812 commit facc289
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions recipes/protobuf/all/conandata.yml
Expand Up @@ -31,3 +31,6 @@ patches:
base_path: "source_subfolder"
- patch_file: "patches/upstream-pr-8301-bundle-destination.patch"
base_path: "source_subfolder"
3.15.5:
- patch_file: "patches/upstream-pr-8301-bundle-destination.patch"
base_path: "source_subfolder"

0 comments on commit facc289

Please sign in to comment.