diff --git a/debian/patches/0391-relax-google-protobuf.patch b/debian/patches/0391-relax-google-protobuf.patch new file mode 100644 index 0000000000..3d23b948b1 --- /dev/null +++ b/debian/patches/0391-relax-google-protobuf.patch @@ -0,0 +1,11 @@ +--- a/Gemfile ++++ b/Gemfile +@@ -397,7 +397,7 @@ + # Gitaly GRPC client + gem 'gitaly-proto', '~> 0.84', require: 'gitaly' + # Locked until https://github.com/google/protobuf/issues/4210 is closed +-gem 'google-protobuf', '= 3.5.1' ++gem 'google-protobuf', '~> 3.2' + + gem 'toml-rb', '>= 0.3.15', require: false + diff --git a/debian/patches/series b/debian/patches/series index f3d206a96e..f7bf393aaf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -18,6 +18,7 @@ pid-log-paths.patch 0370-relax-prof.patch 0380-relax-google-api-client.patch 0390-relax-gitaly-proto.patch +0391-relax-google-protobuf.patch 0410-set-webpack-root.patch 0420-use-system-libs.patch 890757.patch