diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
| commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
| tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /poky/meta/recipes-gnome/libdazzle | |
| parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
| download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz | |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-gnome/libdazzle')
| -rw-r--r-- | poky/meta/recipes-gnome/libdazzle/libdazzle/0001-Add-a-define-so-that-gir-compilation-succeeds.patch | 26 | ||||
| -rw-r--r-- | poky/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb | 20 |
2 files changed, 46 insertions, 0 deletions
diff --git a/poky/meta/recipes-gnome/libdazzle/libdazzle/0001-Add-a-define-so-that-gir-compilation-succeeds.patch b/poky/meta/recipes-gnome/libdazzle/libdazzle/0001-Add-a-define-so-that-gir-compilation-succeeds.patch new file mode 100644 index 000000000..c959d4397 --- /dev/null +++ b/poky/meta/recipes-gnome/libdazzle/libdazzle/0001-Add-a-define-so-that-gir-compilation-succeeds.patch @@ -0,0 +1,26 @@ +From 546d53c3515e8a488a204763437d1fa0917097e5 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Tue, 11 Dec 2018 12:39:30 +0100 +Subject: [PATCH] Add a define so that gir compilation succeeds + +For some reason meson 0.49.0 does not anymore pass global arguments to gir compiler. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + src/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/meson.build b/src/meson.build +index 6ff8a6a..f0b2887 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -132,7 +132,7 @@ if get_option('with_introspection') + install_dir_gir: girdir, + install_dir_typelib: typelibdir, + export_packages: libdazzle_package, +- extra_args: [ '--c-include=dazzle.h', '--quiet' ], ++ extra_args: [ '--c-include=dazzle.h', '--quiet', '-DDAZZLE_COMPILATION' ], + ) + + if get_option('with_vapi') diff --git a/poky/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb b/poky/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb new file mode 100644 index 000000000..3779b15af --- /dev/null +++ b/poky/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb @@ -0,0 +1,20 @@ +SUMMARY = "The libdazzle library is a companion library to GObject and Gtk+." +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase upstream-version-is-even vala distro_features_check gobject-introspection + +DEPENDS = "glib-2.0-native glib-2.0 gtk+3" + +SRC_URI += " file://0001-Add-a-define-so-that-gir-compilation-succeeds.patch" +SRC_URI[archive.md5sum] = "24e2e1b914a34f5b8868a9507d1f3c4c" +SRC_URI[archive.sha256sum] = "78770eae9fa15ac5acb9c733d29459330b2540affbf72933119e36dbd90b36d5" + +GI_ENABLE_FLAG = "-Dwith_introspection=true" +GI_DISABLE_FLAG = "-Dwith_introspection=false" + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \ + '${GI_DISABLE_FLAG}', d)} " |