From 972dcfcdbfe75dcfeb777150c136576cf1a71e99 Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Fri, 9 Oct 2015 22:59:03 +0200 Subject: initial commit for Enea Linux 5.0 arm Signed-off-by: Tudor Florea --- .../shared-mime-info/shared-mime-info.inc | 36 ++++++++++++++++++++++ .../shared-mime-info/install-data-hook.patch | 23 ++++++++++++++ .../shared-mime-info/parallelmake.patch | 33 ++++++++++++++++++++ .../shared-mime-info/shared-mime-info_1.3.bb | 7 +++++ 4 files changed, 99 insertions(+) create mode 100644 meta/recipes-support/shared-mime-info/shared-mime-info.inc create mode 100644 meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch create mode 100644 meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch create mode 100644 meta/recipes-support/shared-mime-info/shared-mime-info_1.3.bb (limited to 'meta/recipes-support/shared-mime-info') diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info.inc b/meta/recipes-support/shared-mime-info/shared-mime-info.inc new file mode 100644 index 0000000000..6eedb6d3fd --- /dev/null +++ b/meta/recipes-support/shared-mime-info/shared-mime-info.inc @@ -0,0 +1,36 @@ +SUMMARY = "Shared MIME type database and specification" +HOMEPAGE = "http://freedesktop.org/wiki/Software/shared-mime-info" +SECTION = "base" + +LICENSE = "LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "libxml2 intltool-native glib-2.0 shared-mime-info-native" +DEPENDS_class-native = "libxml2-native intltool-native glib-2.0-native" + +SRC_URI = "http://freedesktop.org/~hadess/shared-mime-info-${PV}.tar.xz" + +inherit autotools pkgconfig gettext + +EXTRA_OECONF = "--disable-update-mimedb" + +FILES_${PN} += "${datadir}/mime" +FILES_${PN}-dev += "${datadir}/pkgconfig/shared-mime-info.pc" + +# freedesktop.org.xml is only required when updating the mime database, +# package it separately +PACKAGES =+ "shared-mime-info-data" +FILES_shared-mime-info-data = "${datadir}/mime/packages/freedesktop.org.xml" +RDEPENDS_shared-mime-info-data = "shared-mime-info" + +do_install () { + autotools_do_install + + update-mime-database ${D}${datadir}/mime +} + +do_install_class-native () { + autotools_do_install +} + +BBCLASSEXTEND = "native" diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch b/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch new file mode 100644 index 0000000000..3c9f1ea438 --- /dev/null +++ b/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch @@ -0,0 +1,23 @@ +fix shared-mime-info build race condition + +The definition of install-data-hook in Makefile.am leads +to multiple, overlapping, executions of install-binPROGRAMS +target. We modify the definition to avoid that. + +Upstream-Status: Pending + +Signed-off-by: Joe Slater + +--- a/Makefile.am ++++ b/Makefile.am +@@ -44,7 +44,9 @@ $(pkgconfig_DATA): config.status + @INTLTOOL_XML_RULE@ + @INTLTOOL_DESKTOP_RULE@ + +-install-data-hook: install-binPROGRAMS ++# do NOT make this dependent on anything! ++# ++install-data-hook: + if ENABLE_UPDATE_MIMEDB + $(DESTDIR)"$(bindir)/update-mime-database" -V "$(DESTDIR)$(datadir)/mime" + endif diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch b/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch new file mode 100644 index 0000000000..84c4d03731 --- /dev/null +++ b/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch @@ -0,0 +1,33 @@ +The Makefile used by shared-mime-info is one big race with the SUBDIRS +option and the dependency specifically calling make all combining to +create multiple make instances all of which may try and build targets +like update-mime-database. + +This patch removes those options meaning make can correctly identify +dependencies and stop itself racing itself. + +RP 10/10/2011 + +Upstream-Status: Pending +Signed-off-by: Constantin Musca + +Index: shared-mime-info-1.0/Makefile.am +=================================================================== +--- shared-mime-info-1.0.orig/Makefile.am ++++ shared-mime-info-1.0/Makefile.am +@@ -1,5 +1,3 @@ +-SUBDIRS=. po +- + AM_CPPFLAGS = $(ALL_CFLAGS) + + packagesdir = $(datadir)/mime/packages +@@ -72,8 +70,7 @@ uninstall-hook: + + all: $(defaultmakedeps) + +-create-pot: +- $(AM_V_GEN) $(MAKE) -C po shared-mime-info.pot ++create-pot: po + + check: create-pot freedesktop.org.xml update-mime-database check-translations + if test -e $(top_builddir)/freedesktop.org.xml; then \ diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_1.3.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_1.3.bb new file mode 100644 index 0000000000..4bd81cd831 --- /dev/null +++ b/meta/recipes-support/shared-mime-info/shared-mime-info_1.3.bb @@ -0,0 +1,7 @@ +require shared-mime-info.inc + +SRC_URI[md5sum] = "743720bc4803dd69f55449013d350f31" +SRC_URI[sha256sum] = "4fd49c8c7ca9ecb10c59845094a18dbb73b69c72b4bad3db5e864f2111cb323a" + +SRC_URI =+ "file://parallelmake.patch \ + file://install-data-hook.patch" -- cgit v1.2.3-54-g00ecf