[oe-commits] [meta-openembedded] 35/69: tracker: fix gobject introspection and packaging issues

[git at git.openembedded.org]

martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.

commit aaa3a03fd2b572aab21643dce51a47fafc66d9e8
Author: Alexander Kanavin <alexander.kanavin at linux.intel.com>
AuthorDate: Mon Feb 22 19:17:22 2016 +0200

    tracker: fix gobject introspection and packaging issues
    
    ERROR: tracker-0.14.2-r7 do_package_qa: QA Issue: -dev package contains non-symlink .so: tracker-dev path 'work/armv5te-oe-linux-gnueabi/tracker/0.14.2-r7/packages-split/tracker-dev/usr/lib/tracker-0.14/writeback-modules/libwriteback-taglib.so'
    -dev package contains non-symlink .so: tracker-dev path 'work/armv5te-oe-linux-gnueabi/tracker/0.14.2-r7/packages-split/tracker-dev/usr/lib/tracker-0.14/extract-modules/libextract-pdf.so'
    -dev package contains non-symlink .so: tracker-dev path 'work/armv5te-oe-linux-gnueabi/tracker/0.14.2-r7/packages-split/tracker-dev/usr/lib/tracker-0.14/extract-modules/libextract-tiff.so'
    -dev package contains non-symlink .so: tracker-dev path 'work/armv5te-oe-linux-gnueabi/tracker/0.14.2-r7/packages-split/tracker-dev/usr/lib/tracker-0.14/extract-modules/libextract-mp3.so'
    -dev package contains non-symlink .so: tracker-dev path 'work/armv5te-oe-linux-gnueabi/tracker/0.14.2-r7/packages-split/tracker-dev/usr/lib/tracker-0.14/extract-modules/libextract-abw.so'
    -dev package contains non-symlink .so: tracker-dev path 'work/armv5te-oe-linux-gnueabi/tracker/0.14.2-r7/packages-split/tracker-dev/usr/lib/tracker-0.14/extract-modules/libextract-jpeg.so'
    -dev package contains non-symlink .so: tracker-dev path 'work/armv5te-oe-linux-gnueabi/tracker/0.14.2-r7/packages-split/tracker-dev/usr/lib/tracker-0.14/extract-modules/libextract-ps.so'
    -dev package contains non-symlink .so: tracker-dev path 'work/armv5te-oe-linux-gnueabi/tracker/0.14.2-r7/packages-split/tracker-dev/usr/lib/tracker-0.14/extract-modules/libextract-icon.so'
    -dev package contains non-symlink .so: tracker-dev path 'work/armv5te-oe-linux-gnueabi/tracker/0.14.2-r7/packages-split/tracker-dev/usr/lib/tracker-0.14/extract-modules/libextract-text.so'
    -dev package contains non-symlink .so: tracker-dev path 'work/armv5te-oe-linux-gnueabi/tracker/0.14.2-r7/packages-split/tracker-dev/usr/lib/tracker-0.14/extract-modules/libextract-gstreamer.so'
    -dev package contains non-symlink .so: tracker-dev path 'work/armv5te-oe-linux-gnueabi/tracker/0.14.2-r7/packages-split/tracker-dev/usr/lib/tracker-0.14/extract-modules/libextract-epub.so'
    -dev package contains non-symlink .so: tracker-dev path 'work/armv5te-oe-linux-gnueabi/tracker/0.14.2-r7/packages-split/tracker-dev/usr/lib/tracker-0.14/extract-modules/libextract-msoffice-xml.so'
    -dev package contains non-symlink .so: tracker-dev path 'work/armv5te-oe-linux-gnueabi/tracker/0.14.2-r7/packages-split/tracker-dev/usr/lib/tracker-0.14/extract-modules/libextract-oasis.so'
    -dev package contains non-symlink .so: tracker-dev path 'work/armv5te-oe-linux-gnueabi/tracker/0.14.2-r7/packages-split/tracker-dev/usr/lib/tracker-0.14/extract-modules/libextract-png.so'
    -dev package contains non-symlink .so: tracker-dev path 'work/armv5te-oe-linux-gnueabi/tracker/0.14.2-r7/packages-split/tracker-dev/usr/lib/tracker-0.14/extract-modules/libextract-html.so'
    -dev package contains non-symlink .so: tracker-dev path 'work/armv5te-oe-linux-gnueabi/tracker/0.14.2-r7/packages-split/tracker-dev/usr/lib/tracker-0.14/extract-modules/libextract-gif.so'
    -dev package contains non-symlink .so: tracker-dev path 'work/armv5te-oe-linux-gnueabi/tracker/0.14.2-r7/packages-split/tracker-dev/usr/lib/tracker-0.14/extract-modules/libextract-msoffice.so' [dev-elf]
    
    Signed-off-by: Alexander Kanavin <alexander.kanavin at linux.intel.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 .../0005-Fix-missing-gobject-introspection-checks.patch | 17 -----------------
 meta-gnome/recipes-support/tracker/tracker_0.14.2.bb    |  7 +++++--
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/meta-gnome/recipes-support/tracker/tracker-0.14.2/0005-Fix-missing-gobject-introspection-checks.patch b/meta-gnome/recipes-support/tracker/tracker-0.14.2/0005-Fix-missing-gobject-introspection-checks.patch
deleted file mode 100644
index 8701f58..0000000
--- a/meta-gnome/recipes-support/tracker/tracker-0.14.2/0005-Fix-missing-gobject-introspection-checks.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur ../tracker-0.10.8/configure.ac tracker-0.10.8//configure.ac
---- ../tracker-0.10.8/configure.ac	2011-04-08 15:03:30.000000000 +0300
-+++ tracker-0.10.8//configure.ac	2011-04-11 13:47:16.625914002 +0300
-@@ -218,7 +218,12 @@
- 
- # Needed to generate .gir files,
- # see http://live.gnome.org/GnomeGoals/AddGObjectIntrospectionSupport
--GOBJECT_INTROSPECTION_CHECK([0.9.5])
-+#GOBJECT_INTROSPECTION_CHECK([0.9.5])
-+# Satisfy missing introspection foo
-+AM_CONDITIONAL(HAVE_INTROSPECTION, test "0" == "1")
-+
-+INTROSPECTION_CFLAGS=""
-+AC_SUBST(INTROSPECTION_CFLAGS)
- 
- # NOTE: dbus and dbus-glib-1 are only used now for libtracker-client
- # which is deprecated and tracker-writeback which will be refactored
diff --git a/meta-gnome/recipes-support/tracker/tracker_0.14.2.bb b/meta-gnome/recipes-support/tracker/tracker_0.14.2.bb
index d84978d..9f848f1 100644
--- a/meta-gnome/recipes-support/tracker/tracker_0.14.2.bb
+++ b/meta-gnome/recipes-support/tracker/tracker_0.14.2.bb
@@ -12,7 +12,6 @@ inherit autotools pkgconfig gnomebase gettext gsettings systemd
 
 VER_DIR = "${@gnome_verdir("${PV}")}"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/tracker/${VER_DIR}/tracker-${PV}.tar.xz \
-           file://0005-Fix-missing-gobject-introspection-checks.patch \
            file://enable-sqlite-crosscompile.patch \
 	   file://fix-removable-media-detection.patch \
            file://90tracker \
@@ -35,6 +34,10 @@ EXTRA_OECONF += "--disable-miner-thunderbird --disable-miner-firefox \
 
 LEAD_SONAME = "libtrackerclient.so.0"
 
+do_compile_prepend() {
+    export GIR_EXTRA_LIBS_PATH="${B}/src/libtracker-sparql-backend/.libs:${B}/src/libtracker-data/.libs:${B}/src/libtracker-common/.libs"
+}
+
 do_install_append() {
     cp -PpR ${D}${STAGING_DATADIR}/* ${D}${datadir}/ || true
 #   install -d ${D}/${sysconfdir}/X11/Xsession.d/
@@ -54,6 +57,7 @@ PACKAGES =+ "${PN}-tests ${PN}-vala ${PN}-nautilus-extension"
 FILES_${PN} += "${datadir}/dbus-1/ \
                 ${libdir}/tracker-${VER_DIR}/*.so.* \
                 ${libdir}/tracker-${VER_DIR}/extract-modules/*.so \
+                ${libdir}/tracker-${VER_DIR}/writeback-modules/*.so \
                 ${datadir}/icons/hicolor/*/apps/tracker.* \
                 ${libdir}/nautilus/extensions-2.0/*.la \
                 ${datadir}/glib-2.0/schemas/* \
@@ -64,7 +68,6 @@ FILES_${PN} += "${datadir}/dbus-1/ \
 
 FILES_${PN}-dev += "${libdir}/tracker-${VER_DIR}/*.la \
                     ${libdir}/tracker-${VER_DIR}/*.so \
-                    ${libdir}/tracker-${VER_DIR}/*/*.so \
                     ${libdir}/tracker-${VER_DIR}/*/*.la \
                     ${libdir}/tracker-${VER_DIR}/extract-modules/*.la"
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.