Commit 1f0b7aa5 authored by Matthew Waters's avatar Matthew Waters 🐨

recipes/gdk-pixbuf: fix enum dep in build files

parent c9497370
......@@ -21,7 +21,8 @@ class Recipe(recipe.Recipe):
patches = ['gdk-pixbuf/0001-meson-add-option-for-disabling-GIO-sniffing.patch',
'gdk-pixbuf/0001-meson-Don-t-generate-the-loader-cache-when-cross-com.patch',
'gdk-pixbuf/0001-meson-don-t-build-tests-or-the-thumbnailer-if-cross-.patch']
'gdk-pixbuf/0001-meson-don-t-build-tests-or-the-thumbnailer-if-cross-.patch',
'gdk-pixbuf/0001-build-add-enum-generation-header-to-sources-of-built.patch']
files_libs = ['libgdk_pixbuf-2.0']
files_bins = ['gdk-pixbuf-query-loaders', 'gdk-pixbuf-csource']
......
From c8a2098f756de94301fde16b9eec3dce566dc3ff Mon Sep 17 00:00:00 2001
From: Matthew Waters <matthew@centricular.com>
Date: Wed, 17 Oct 2018 10:13:59 +1100
Subject: [PATCH] build: add enum generation header to sources of built
libraries
This ensures that the enums are generated before compiling the headers.
Fixes variations on this error for different loaders
pixbuf@@staticpixbufloader-qtif@sta/io-qtif.c.o' -c ../gdk-pixbuf/io-qtif.c
In file included from ../gdk-pixbuf/io-qtif.c:34:0:
../gdk-pixbuf/gdk-pixbuf.h:40:46: fatal error: gdk-pixbuf/gdk-pixbuf-enum-types.h: No such file or directory
---
gdk-pixbuf/meson.build | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
index 41323b2d4..430823028 100644
--- a/gdk-pixbuf/meson.build
+++ b/gdk-pixbuf/meson.build
@@ -125,6 +125,7 @@ foreach l: loaders
mod = static_library('staticpixbufloader-@0@'.format(name),
sources,
+ gdkpixbuf_enum_h,
dependencies: loaders_deps + gdk_pixbuf_deps,
include_directories: [ root_inc, gdk_pixbuf_inc ],
c_args: common_cflags + gdk_pixbuf_cflags + cflags + cflag_for_included_loader)
@@ -149,6 +150,7 @@ if native_windows_loaders
mod = static_library('staticpixbufloader-gdiplus',
win_loader_sources,
+ gdkpixbuf_enum_h,
dependencies: loaders_deps + gdk_pixbuf_deps,
include_directories: [ root_inc, gdk_pixbuf_inc ],
c_args: common_cflags + gdk_pixbuf_cflags + cflag_for_included_loader)
@@ -253,6 +255,7 @@ foreach l: loaders
if cond and not (builtin_loaders.contains(name) or builtin_all_loaders)
mod = shared_module('pixbufloader-@0@'.format(name),
sources,
+ gdkpixbuf_enum_h,
dependencies: loaders_deps + gdk_pixbuf_deps + [ gdkpixbuf_dep ],
include_directories: [ root_inc, gdk_pixbuf_inc ],
c_args: common_cflags + gdk_pixbuf_cflags + cflags,
@@ -274,6 +277,7 @@ if native_windows_loaders
mod = shared_module('pixbufloader-gdip-@0@'.format(loader),
loader_sources,
+ gdkpixbuf_enum_h,
dependencies: loaders_deps + gdk_pixbuf_deps + [ gdkpixbuf_dep ],
include_directories: [ root_inc, gdk_pixbuf_inc ],
c_args: common_cflags + gdk_pixbuf_cflags + cflags,
@@ -296,6 +300,7 @@ foreach bin: gdkpixbuf_bin
bin_source = bin.get(1, bin_name + '.c')
bin = executable(bin_name, bin_source,
+ gdkpixbuf_enum_h,
dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ],
include_directories: [ root_inc, gdk_pixbuf_inc ],
c_args: common_cflags + gdk_pixbuf_cflags,
--
2.19.0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment