summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@gmail.com>2020-01-17 22:29:01 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-19 13:24:38 +0000
commit3d3f59d2c8315ffd34ab9867870642fec4fe1c2b (patch)
treefa15ec80e694dfa186f6d64b82e02f9420fb4dfb /meta
parent25be13002bd4127f24e2273f44951862b4a481c7 (diff)
downloadpoky-3d3f59d2c8315ffd34ab9867870642fec4fe1c2b.tar.gz
shared-mime-info: upgrade 1.10 -> 1.15
* sources/development moved to freedesktop's gitlab * patches do not apply any more due to major changes in Makefile.am * give up bb/inc separation (From OE-Core rev: 09ef7f8e4b9742b17a0bf7a48970ece2298eaeba) Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch25
-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.10.bb7
-rw-r--r--meta/recipes-support/shared-mime-info/shared-mime-info_git.bb (renamed from meta/recipes-support/shared-mime-info/shared-mime-info.inc)9
4 files changed, 6 insertions, 68 deletions
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
deleted file mode 100644
index 262ff7562c..0000000000
--- a/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch
+++ /dev/null
@@ -1,25 +0,0 @@
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
11Index: shared-mime-info-1.9/Makefile.am
12===================================================================
13--- shared-mime-info-1.9.orig/Makefile.am
14+++ shared-mime-info-1.9/Makefile.am
15@@ -50,7 +50,9 @@ else
16 update_mime_database="$(top_builddir)/update-mime-database$(EXEEXT)"
17 endif
18
19-install-data-hook: install-binPROGRAMS
20+# do NOT make this dependent on anything!
21+#
22+install-data-hook:
23 if ENABLE_UPDATE_MIMEDB
24 $(update_mime_database) -V "$(DESTDIR)$(datadir)/mime"
25 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
deleted file mode 100644
index fea34a55a2..0000000000
--- a/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch
+++ /dev/null
@@ -1,33 +0,0 @@
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.9/Makefile.am
15===================================================================
16--- shared-mime-info-1.9.orig/Makefile.am
17+++ shared-mime-info-1.9/Makefile.am
18@@ -1,5 +1,3 @@
19-SUBDIRS=. po
20-
21 AM_CPPFLAGS = $(ALL_CFLAGS)
22
23 packagesdir = $(datadir)/mime/packages
24@@ -81,8 +79,7 @@ endif
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 local-test: create-pot freedesktop.org.xml update-mime-database$(EXEEXT)
33 if CROSS_COMPILING
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_1.10.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_1.10.bb
deleted file mode 100644
index 9fc210b718..0000000000
--- a/meta/recipes-support/shared-mime-info/shared-mime-info_1.10.bb
+++ /dev/null
@@ -1,7 +0,0 @@
1require shared-mime-info.inc
2
3SRC_URI += "file://parallelmake.patch \
4 file://install-data-hook.patch"
5
6SRC_URI[md5sum] = "418c2ced9dc4dd5ca8b06a755e6d64e9"
7SRC_URI[sha256sum] = "c625a83b4838befc8cafcd54e3619946515d9e44d63d61c4adf7f5513ddfbebf"
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info.inc b/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb
index 3fe1a445b0..bf48e453a0 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info.inc
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info_git.bb
@@ -5,11 +5,14 @@ SECTION = "base"
5LICENSE = "GPLv2" 5LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 6LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
7 7
8DEPENDS = "libxml2 intltool-native glib-2.0 shared-mime-info-native" 8DEPENDS = "libxml2 itstool glib-2.0 shared-mime-info-native"
9 9
10SRC_URI = "http://freedesktop.org/~hadess/shared-mime-info-${PV}.tar.xz" 10SRC_URI = "git://gitlab.freedesktop.org/xdg/shared-mime-info.git;protocol=https"
11SRCREV = "829b26d85e7d89a0caee03046c3bce373f04c80a"
12PV = "1.15"
13S = "${WORKDIR}/git"
11 14
12inherit autotools pkgconfig gettext 15inherit autotools pkgconfig gettext python3native
13 16
14EXTRA_OECONF = "--disable-update-mimedb" 17EXTRA_OECONF = "--disable-update-mimedb"
15 18