diff options
| author | Marius Bakke <marius@gnu.org> | 2020-11-28 22:39:12 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-11-28 22:39:12 +0100 |
| commit | 4dadb4977908028bb0651d43ed4813cc988db92d (patch) | |
| tree | 4647ae542d36e146fa91f728084b603dbfda6fa3 /gnu/packages/patches/dconf-meson-0.52.patch | |
| parent | fe5c9051cc25bd81aa6c88f5de06f10ff9532441 (diff) | |
| parent | e827f40479dc6b652fbb92fe8a64b50cec83731b (diff) | |
Merge branch 'staging'
Diffstat (limited to 'gnu/packages/patches/dconf-meson-0.52.patch')
| -rw-r--r-- | gnu/packages/patches/dconf-meson-0.52.patch | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/gnu/packages/patches/dconf-meson-0.52.patch b/gnu/packages/patches/dconf-meson-0.52.patch deleted file mode 100644 index c636edc108..0000000000 --- a/gnu/packages/patches/dconf-meson-0.52.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fix build failure with Meson 0.52. - -Taken from upstream: -https://gitlab.gnome.org/GNOME/dconf/commit/7ad890fb7a2ec90a777a756a1fa20a615ec7245e -https://gitlab.gnome.org/GNOME/dconf/merge_requests/54 - -diff --git a/client/meson.build b/client/meson.build -index f3b7122cb05bfa7bb481c487e3cd052aa1ad58e5..de6387e2cac2aba12b83f2614c277bada434fd16 100644 ---- a/client/meson.build -+++ b/client/meson.build -@@ -28,7 +28,7 @@ libdconf_client = static_library( - - libdconf_client_dep = declare_dependency( - dependencies: gio_dep, -- link_whole: libdconf_client, -+ link_with: libdconf_client, - ) - - libdconf = shared_library( |