From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mail.openembedded.org (Postfix) with ESMTP id 6F6906018C for ; Wed, 9 Mar 2016 15:10:02 +0000 (UTC) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga104.fm.intel.com with ESMTP; 09 Mar 2016 07:10:03 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,311,1455004800"; d="scan'208";a="62868924" Received: from kanavin-desktop.fi.intel.com ([10.237.68.161]) by fmsmga004.fm.intel.com with ESMTP; 09 Mar 2016 07:10:03 -0800 From: Alexander Kanavin To: openembedded-devel@lists.openembedded.org Date: Wed, 9 Mar 2016 17:05:25 +0200 Message-Id: <7ad280ce84ac6d1f01412c05a2309677f41eeb70.1457535831.git.alexander.kanavin@linux.intel.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: References: In-Reply-To: References: Subject: [PATCH 09/38] goffice: fix gobject introspection X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Mar 2016 15:10:02 -0000 Signed-off-by: Alexander Kanavin --- ...igure.ac-fix-paths-to-introspection-tools.patch | 41 ++++++++++++++++++++++ .../recipes-support/goffice/goffice_0.10.1.bb | 4 ++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 meta-gnome/recipes-support/goffice/goffice/0001-configure.ac-fix-paths-to-introspection-tools.patch diff --git a/meta-gnome/recipes-support/goffice/goffice/0001-configure.ac-fix-paths-to-introspection-tools.patch b/meta-gnome/recipes-support/goffice/goffice/0001-configure.ac-fix-paths-to-introspection-tools.patch new file mode 100644 index 0000000..a645978 --- /dev/null +++ b/meta-gnome/recipes-support/goffice/goffice/0001-configure.ac-fix-paths-to-introspection-tools.patch @@ -0,0 +1,41 @@ +From 8e158c16cd15fff08b42ed86edc55816d3387837 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 19 Feb 2016 16:04:24 +0200 +Subject: [PATCH] configure.ac: fix paths to introspection tools + +They need to be prefixed with $PKG_CONFIG_SYSROOT_DIR + +Signed-off-by: Alexander Kanavin +--- + configure.ac | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 6d2b747..3b28463 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -706,9 +706,9 @@ if test "x$found_introspection" = "xyes"; then + dnl python where to find libgoffice, so you might also need to set + dnl LD_LIBRARY_PATH. + +- 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_SCANNER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` ++ INTROSPECTION_COMPILER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` ++ INTROSPECTION_GENERATE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` + if test "x$INTROSPECTION_GIRDIR" = x; then + INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` + fi +@@ -717,7 +717,7 @@ if test "x$found_introspection" = "xyes"; then + fi + 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 ++ INTROSPECTION_MAKEFILE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection + else + INTROSPECTION_SCANNER= + INTROSPECTION_COMPILER= +-- +2.7.0 + diff --git a/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb b/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb index 1e9ec4c..919aa7b 100644 --- a/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb +++ b/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb @@ -5,10 +5,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6dc33ff21e1ba1ac1a2a1069d361e29e" DEPENDS = "libxml-parser-perl-native glib-2.0 gtk+3 pango cairo libgsf libpcre libxml2 libart-lgpl librsvg intltool" -inherit gnomebase pkgconfig perlnative +inherit gnomebase pkgconfig perlnative gobject-introspection GNOME_COMPRESS_TYPE = "xz" +SRC_URI += "file://0001-configure.ac-fix-paths-to-introspection-tools.patch" + SRC_URI[archive.md5sum] = "90fd17c6fe205b779571e00d9b0b4727" SRC_URI[archive.sha256sum] = "5c38f4e81e874cc8e89481b080f77c47c72bfd6fe2526f4fc2ef87c17f96cad0" -- 2.7.0