All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alexander Kanavin <alexander.kanavin@linux.intel.com>
To: openembedded-devel@lists.openembedded.org
Subject: [PATCH 05/38] gnumeric: fix gobject introspection support
Date: Wed,  9 Mar 2016 17:05:21 +0200	[thread overview]
Message-ID: <449d0421eaf9b47d1981a34f68dc70e1e9b08170.1457535831.git.alexander.kanavin@linux.intel.com> (raw)
In-Reply-To: <cover.1457535831.git.alexander.kanavin@linux.intel.com>
In-Reply-To: <cover.1457535831.git.alexander.kanavin@linux.intel.com>

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
 ...n-drop-introspection-macros-replace-them-.patch | 84 ++++++++++++++++++++++
 .../recipes-gnome/gnumeric/gnumeric_1.12.0.bb      |  5 +-
 2 files changed, 87 insertions(+), 2 deletions(-)
 create mode 100644 meta-gnome/recipes-gnome/gnumeric/gnumeric/0001-configure.in-drop-introspection-macros-replace-them-.patch

diff --git a/meta-gnome/recipes-gnome/gnumeric/gnumeric/0001-configure.in-drop-introspection-macros-replace-them-.patch b/meta-gnome/recipes-gnome/gnumeric/gnumeric/0001-configure.in-drop-introspection-macros-replace-them-.patch
new file mode 100644
index 0000000..914d2cc
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnumeric/gnumeric/0001-configure.in-drop-introspection-macros-replace-them-.patch
@@ -0,0 +1,84 @@
+From de5f0a535d6ea1932d2c7de53bd33510c8682ee7 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Mon, 22 Feb 2016 16:34:03 +0200
+Subject: [PATCH] configure.in: drop introspection macros, replace them with a
+ standard one
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ configure.in | 57 +--------------------------------------------------------
+ 1 file changed, 1 insertion(+), 56 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 8e1aa37..3086503 100644
+--- a/configure.in
++++ b/configure.in
+@@ -934,63 +934,8 @@ AC_SUBST(MONO_CFLAGS)
+ AC_SUBST(MONO_LIBS)
+ ])
+ 
+-# GObject Introspection
+-GIR_REQ=1.0.0
+-AC_ARG_ENABLE(introspection,
+-          AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
+-                         [Enable introspection for this build]),, 
+-                         [enable_introspection=no])
+-
+-AC_MSG_CHECKING([for gobject-introspection])
+-
+-dnl presence/version checking
+-AS_CASE([$enable_introspection],
+-[no], [
+-    found_introspection="no (disabled, use --enable-introspection to enable)"
+-],
+-[yes],[
+-    PKG_CHECK_EXISTS([gobject-introspection-1.0],,
+-                     AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
+-    PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $GIR_REQ],
+-                     found_introspection=yes,
+-                     AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
+-],
+-[auto],[
+-    PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $GIR_REQ], found_introspection=yes, found_introspection=no)
+-dnl Canonicalize enable_introspection
+-enable_introspection=$found_introspection
+-],
+-[	
+-    AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
+-])
++GOBJECT_INTROSPECTION_CHECK([1.46.0])
+ 
+-AC_MSG_RESULT([$found_introspection])
+-
+-INTROSPECTION_SCANNER=
+-INTROSPECTION_COMPILER=
+-INTROSPECTION_GENERATE=
+-INTROSPECTION_GIRDIR=
+-INTROSPECTION_TYPELIBDIR=
+-if test "x$found_introspection" = "xyes"; then
+-   INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+-   INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+-   INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+-   INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+-   INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+-   INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+-   INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+-   INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
+-fi
+-AC_SUBST(INTROSPECTION_SCANNER)
+-AC_SUBST(INTROSPECTION_COMPILER)
+-AC_SUBST(INTROSPECTION_GENERATE)
+-AC_SUBST(INTROSPECTION_GIRDIR)
+-AC_SUBST(INTROSPECTION_TYPELIBDIR)
+-AC_SUBST(INTROSPECTION_CFLAGS)
+-AC_SUBST(INTROSPECTION_LIBS)
+-AC_SUBST(INTROSPECTION_MAKEFILE)
+-
+-AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
+ dnl we need to change the install directories for distcheck
+ AC_ARG_WITH([gir-dir],
+ 	AS_HELP_STRING(
+-- 
+2.7.0
+
diff --git a/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb b/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb
index 71f99ca..3d3118a 100644
--- a/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb
+++ b/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb
@@ -7,9 +7,10 @@ SUMMARY = "Gnumeric spreadsheet for GNOME"
 
 GNOME_COMPRESS_TYPE = "xz"
 
-inherit gnome
+inherit gnome pythonnative gobject-introspection
 
-SRC_URI += "file://do-not-use-srcdir.patch"
+SRC_URI += "file://do-not-use-srcdir.patch \
+            file://0001-configure.in-drop-introspection-macros-replace-them-.patch"
 
 SRC_URI[archive.md5sum] = "3fd87cca95334b5d8ac922989670fe27"
 SRC_URI[archive.sha256sum] = "037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111"
-- 
2.7.0



  parent reply	other threads:[~2016-03-09 15:09 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-09 15:05 [PATCH 00/38] Initial gobject introspection support for meta-openembedded Alexander Kanavin
2016-03-09 15:05 ` [PATCH 01/38] evolution-data-server: fix gobject introspection Alexander Kanavin
2016-03-09 15:05 ` [PATCH 02/38] evince: update to 3.18.2 Alexander Kanavin
2016-03-09 15:05 ` [PATCH 03/38] gnome-bluetooth: " Alexander Kanavin
2016-03-09 15:05 ` [PATCH 04/38] gnome-desktop: remove pygtk dependency Alexander Kanavin
2016-03-09 15:05 ` Alexander Kanavin [this message]
2016-03-09 15:05 ` [PATCH 06/38] libgsf: fix gobject introspection Alexander Kanavin
2016-03-09 15:05 ` [PATCH 07/38] libwnck: " Alexander Kanavin
2016-03-09 15:05 ` [PATCH 08/38] libxklavier: " Alexander Kanavin
2016-03-09 15:05 ` [PATCH 09/38] goffice: " Alexander Kanavin
2016-03-09 15:05 ` [PATCH 10/38] tracker: " Alexander Kanavin
2016-03-09 15:05 ` [PATCH 11/38] gupnp: " Alexander Kanavin
2016-03-09 15:05 ` [PATCH 12/38] rygel: " Alexander Kanavin
2016-03-09 15:05 ` [PATCH 13/38] media-service-demo: remove the recipe Alexander Kanavin
2016-03-09 15:05 ` [PATCH 14/38] python-gst: remove the 0.10 recipe Alexander Kanavin
2016-03-10 14:25   ` Martin Jansa
2016-03-10 16:02     ` Burton, Ross
2016-03-10 16:13       ` Martin Jansa
2016-03-10 16:51         ` Burton, Ross
2016-03-10 17:08           ` Martin Jansa
2016-03-11  9:27             ` Burton, Ross
2016-03-15 14:07     ` Alexander Kanavin
2016-03-09 15:05 ` [PATCH 15/38] gstreamer-0.10: disable gobject introspection Alexander Kanavin
2016-03-09 15:05 ` [PATCH 16/38] libmediaart: fix " Alexander Kanavin
2016-03-09 15:05 ` [PATCH 17/38] bluez4: use real introspection instead of legacy pygobject Alexander Kanavin
2016-03-09 15:05 ` [PATCH 18/38] modemmanager: fix vala support Alexander Kanavin
2016-03-09 15:05 ` [PATCH 19/38] networkmanager: fix introspection and " Alexander Kanavin
2016-03-09 15:05 ` [PATCH 20/38] telepathy-glib: fix gobject introspection support Alexander Kanavin
2016-03-09 15:05 ` [PATCH 21/38] libgee: " Alexander Kanavin
2016-03-09 15:05 ` [PATCH 22/38] polkit: " Alexander Kanavin
2016-03-09 15:05 ` [PATCH 23/38] gtkextra: " Alexander Kanavin
2016-03-09 15:05 ` [PATCH 24/38] libunique: " Alexander Kanavin
2016-03-09 15:05 ` [PATCH 25/38] babl: update to 0.1.16 Alexander Kanavin
2016-03-09 15:05 ` [PATCH 26/38] gegl: update to 0.3.4 Alexander Kanavin
2016-03-09 15:05 ` [PATCH 27/38] gimp: accept newer versins of babl and gegl Alexander Kanavin
2016-03-09 15:05 ` [PATCH 28/38] omgps: remove the recipe Alexander Kanavin
2016-03-09 15:05 ` [PATCH 29/38] poppler: fix gobject introspection Alexander Kanavin
2016-03-09 15:05 ` [PATCH 30/38] udisks2: " Alexander Kanavin
2016-03-09 15:05 ` [PATCH 31/38] upower: " Alexander Kanavin
2016-03-09 15:05 ` [PATCH 32/38] python-dbusmock: use real introspection instead on legacy pygobject Alexander Kanavin
2016-03-09 15:05 ` [PATCH 33/38] gnome-menus: fix gobject introspection Alexander Kanavin
2016-03-09 15:05 ` [PATCH 34/38] libgdata: " Alexander Kanavin
2016-03-09 15:05 ` [PATCH 35/38] libgtop: " Alexander Kanavin
2016-03-09 15:05 ` [PATCH 36/38] nautilus: " Alexander Kanavin
2016-03-09 15:05 ` [PATCH 37/38] network-manager-applet: " Alexander Kanavin
2016-03-09 15:05 ` [PATCH 38/38] gnome-panel: " 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=449d0421eaf9b47d1981a34f68dc70e1e9b08170.1457535831.git.alexander.kanavin@linux.intel.com \
    --to=alexander.kanavin@linux.intel.com \
    --cc=openembedded-devel@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.