From 5a0927c55c72e3799e5f2d734da5bdc4c5358b0c Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Sun, 19 Jul 2020 12:17:23 +0200 Subject: [PATCH 1/2] updated webfuse to 0.5.0 --- meson.build | 2 +- subprojects/webfuse.wrap | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index d2459a0..e3796ee 100644 --- a/meson.build +++ b/meson.build @@ -17,7 +17,7 @@ endif jansson_dep = dependency('jansson', version: '>=2.11', fallback: ['jansson', 'jansson_dep']) libfuse_dep = dependency('fuse3', version: '>=3.8.0', fallback: ['fuse3', 'libfuse_dep']) -webfuse_adapter_dep = dependency('webfuse', version: '>=0.4.0', +webfuse_adapter_dep = dependency('webfuse', version: '>=0.5.0', fallback: ['webfuse', 'webfuse_dep'], default_options: ['without_tests=true']) inc_dir = include_directories('src') diff --git a/subprojects/webfuse.wrap b/subprojects/webfuse.wrap index 16b0315..1c26202 100644 --- a/subprojects/webfuse.wrap +++ b/subprojects/webfuse.wrap @@ -1,7 +1,7 @@ [wrap-file] -directory = webfuse-0.4.0 +directory = webfuse-0.5.0 -source_url = https://github.com/falk-werner/webfuse/archive/v0.4.0.tar.gz -source_filename = v0.4.0.tar.gz -source_hash = dda1f07ca90839035f31a71a1ac381a0e94f9fd479d13808f1e61fe6ed096ead +source_url = https://github.com/falk-werner/webfuse/archive/v0.5.0.tar.gz +source_filename = webfuse-0.5.0.tar.gz +source_hash = 3a84aabab55dc4ca270a644b2c35704e31bcfbc3b42d40b673ab4071baf4c1fd From 449e584b302f6bc50311ae8674e850707735061f Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Sun, 19 Jul 2020 12:35:15 +0200 Subject: [PATCH 2/2] workaround: use meson 0.54.3 to avoid build error when coverage is enabled (error in meson 0.55.0) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 79d18ac..f20655d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ env: before_install: - - sudo pip3 install --system meson + - sudo pip3 install --system 'meson==0.54.3' before_script: - meson -Dbuildtype=$BUILD_TYPE -Db_coverage=$COVERAGE build