Fixing merge conflict

2021-05-20 05:12:24 +05:30 · 2021-05-20 05:12:24 +05:30 · 5f8e7a2693
parent 072a42ad14 9653037dc1
commit 5f8e7a2693
2 changed files with 3 additions and 1 deletions
--- a/.builds/ubuntu.yml
+++ b/.builds/ubuntu.yml
@ -12,6 +12,8 @@ packages:
  - libtag1-dev
  - libtagc0
  - libexif-dev
+  - libpango1.0-dev
+  - pkg-config
  - git
  - meson
  - g++
--- a/meson.build
+++ b/meson.build
@ -29,7 +29,7 @@ endforeach

 wx = dependency('wxwidgets', version: '>=3.0.4')
 wxsvg = dependency('libwxsvg')
-taglib = dependency('taglib', version: '>=1.12')
+taglib = dependency('taglib', version: '>=1.11')
 sqlite3 = dependency('sqlite3')
 yaml = dependency('yaml-cpp')