All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 04/13] libdazzle: fix a build issue with meson 0.49.0
Date: Tue, 18 Dec 2018 17:29:56 +0100	[thread overview]
Message-ID: <20181218163005.1330-4-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20181218163005.1330-1-alex.kanavin@gmail.com>

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 ...ine-so-that-gir-compilation-succeeds.patch | 26 +++++++++++++++++++
 .../libdazzle/libdazzle_3.30.2.bb             |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 meta/recipes-gnome/libdazzle/libdazzle/0001-Add-a-define-so-that-gir-compilation-succeeds.patch

diff --git a/meta/recipes-gnome/libdazzle/libdazzle/0001-Add-a-define-so-that-gir-compilation-succeeds.patch b/meta/recipes-gnome/libdazzle/libdazzle/0001-Add-a-define-so-that-gir-compilation-succeeds.patch
new file mode 100644
index 00000000000..c959d43972f
--- /dev/null
+++ b/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/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb b/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb
index 029adddb9ee..5441c10f990 100644
--- a/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb
+++ b/meta/recipes-gnome/libdazzle/libdazzle_3.30.2.bb
@@ -7,6 +7,7 @@ inherit gnomebase upstream-version-is-even vala 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"
 
-- 
2.17.1



  parent reply	other threads:[~2018-12-18 16:30 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-18 16:29 [PATCH 01/13] btrfs-tools: update to 4.19.1 Alexander Kanavin
2018-12-18 16:29 ` [PATCH 02/13] meson: update to 0.49.0 Alexander Kanavin
2018-12-18 16:29 ` [PATCH 03/13] systemd: backport a patch to fix meson 0.49.0 issue Alexander Kanavin
2018-12-18 16:29 ` Alexander Kanavin [this message]
2019-01-03  8:46   ` [PATCH 04/13] libdazzle: fix a build issue with meson 0.49.0 Kang Kai
2019-01-03 11:13     ` Alexander Kanavin
2018-12-18 16:29 ` [PATCH 05/13] dnf: upgrade 4.0.9 -> 4.0.10 Alexander Kanavin
2018-12-18 16:29 ` [PATCH 06/13] createrepo-c: update to 0.12.0 Alexander Kanavin
2018-12-18 16:29 ` [PATCH 07/13] libdnf: upgrade 0.22.3 -> 0.24.1 Alexander Kanavin
2018-12-18 16:30 ` [PATCH 08/13] lighttpd: upgrade 1.4.51 -> 1.4.52 Alexander Kanavin
2018-12-18 16:30 ` [PATCH 09/13] boost: update to 1.69.0 Alexander Kanavin
2018-12-18 16:30 ` [PATCH 10/13] gobject-introspection: upgrade 1.58.1 -> 1.58.2 Alexander Kanavin
2018-12-18 16:30 ` [PATCH 11/13] libcomps: upgrade 0.1.8 -> 0.1.9 Alexander Kanavin
2018-12-18 16:30 ` [PATCH 12/13] webkitgtk: upgrade 2.22.4 -> 2.22.5 Alexander Kanavin
2018-12-18 16:30 ` [PATCH 13/13] librepo: upgrade 1.9.2 -> 1.9.3 Alexander Kanavin
2018-12-18 17:03 ` ✗ patchtest: failure for "btrfs-tools: update to 4.19.1..." and 12 more Patchwork
2018-12-18 17:46   ` Alexander Kanavin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181218163005.1330-4-alex.kanavin@gmail.com \
    --to=alex.kanavin@gmail.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.