summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/shared-mime-info
diff options
context:
space:
mode:
authorTudor Florea <tudor.florea@enea.com>2015-10-09 22:59:03 +0200
committerTudor Florea <tudor.florea@enea.com>2015-10-09 22:59:03 +0200
commit972dcfcdbfe75dcfeb777150c136576cf1a71e99 (patch)
tree97a61cd7e293d7ae9d56ef7ed0f81253365bb026 /meta/recipes-support/shared-mime-info
downloadpoky-972dcfcdbfe75dcfeb777150c136576cf1a71e99.tar.gz
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-support/shared-mime-info')
-rw-r--r--meta/recipes-support/shared-mime-info/shared-mime-info.inc36
-rw-r--r--meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch23
-rw-r--r--meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch33
-rw-r--r--meta/recipes-support/shared-mime-info/shared-mime-info_1.3.bb7
4 files changed, 99 insertions, 0 deletions
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 @@
1SUMMARY = "Shared MIME type database and specification"
2HOMEPAGE = "http://freedesktop.org/wiki/Software/shared-mime-info"
3SECTION = "base"
4
5LICENSE = "LGPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
7
8DEPENDS = "libxml2 intltool-native glib-2.0 shared-mime-info-native"
9DEPENDS_class-native = "libxml2-native intltool-native glib-2.0-native"
10
11SRC_URI = "http://freedesktop.org/~hadess/shared-mime-info-${PV}.tar.xz"
12
13inherit autotools pkgconfig gettext
14
15EXTRA_OECONF = "--disable-update-mimedb"
16
17FILES_${PN} += "${datadir}/mime"
18FILES_${PN}-dev += "${datadir}/pkgconfig/shared-mime-info.pc"
19
20# freedesktop.org.xml is only required when updating the mime database,
21# package it separately
22PACKAGES =+ "shared-mime-info-data"
23FILES_shared-mime-info-data = "${datadir}/mime/packages/freedesktop.org.xml"
24RDEPENDS_shared-mime-info-data = "shared-mime-info"
25
26do_install () {
27 autotools_do_install
28
29 update-mime-database ${D}${datadir}/mime
30}
31
32do_install_class-native () {
33 autotools_do_install
34}
35
36BBCLASSEXTEND = "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 @@
1fix shared-mime-info build race condition
2
3The definition of install-data-hook in Makefile.am leads
4to multiple, overlapping, executions of install-binPROGRAMS
5target. We modify the definition to avoid that.
6
7Upstream-Status: Pending
8
9Signed-off-by: Joe Slater <jslater@windriver.com>
10
11--- a/Makefile.am
12+++ b/Makefile.am
13@@ -44,7 +44,9 @@ $(pkgconfig_DATA): config.status
14 @INTLTOOL_XML_RULE@
15 @INTLTOOL_DESKTOP_RULE@
16
17-install-data-hook: install-binPROGRAMS
18+# do NOT make this dependent on anything!
19+#
20+install-data-hook:
21 if ENABLE_UPDATE_MIMEDB
22 $(DESTDIR)"$(bindir)/update-mime-database" -V "$(DESTDIR)$(datadir)/mime"
23 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 @@
1The Makefile used by shared-mime-info is one big race with the SUBDIRS
2option and the dependency specifically calling make all combining to
3create multiple make instances all of which may try and build targets
4like update-mime-database.
5
6This patch removes those options meaning make can correctly identify
7dependencies and stop itself racing itself.
8
9RP 10/10/2011
10
11Upstream-Status: Pending
12Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
13
14Index: shared-mime-info-1.0/Makefile.am
15===================================================================
16--- shared-mime-info-1.0.orig/Makefile.am
17+++ shared-mime-info-1.0/Makefile.am
18@@ -1,5 +1,3 @@
19-SUBDIRS=. po
20-
21 AM_CPPFLAGS = $(ALL_CFLAGS)
22
23 packagesdir = $(datadir)/mime/packages
24@@ -72,8 +70,7 @@ uninstall-hook:
25
26 all: $(defaultmakedeps)
27
28-create-pot:
29- $(AM_V_GEN) $(MAKE) -C po shared-mime-info.pot
30+create-pot: po
31
32 check: create-pot freedesktop.org.xml update-mime-database check-translations
33 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 @@
1require shared-mime-info.inc
2
3SRC_URI[md5sum] = "743720bc4803dd69f55449013d350f31"
4SRC_URI[sha256sum] = "4fd49c8c7ca9ecb10c59845094a18dbb73b69c72b4bad3db5e864f2111cb323a"
5
6SRC_URI =+ "file://parallelmake.patch \
7 file://install-data-hook.patch"