mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 21:09:03 +02:00
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>
This commit is contained in:
parent
25be13002b
commit
3d3f59d2c8
|
@ -1,25 +0,0 @@
|
||||||
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 <jslater@windriver.com>
|
|
||||||
|
|
||||||
Index: shared-mime-info-1.9/Makefile.am
|
|
||||||
===================================================================
|
|
||||||
--- shared-mime-info-1.9.orig/Makefile.am
|
|
||||||
+++ shared-mime-info-1.9/Makefile.am
|
|
||||||
@@ -50,7 +50,9 @@ else
|
|
||||||
update_mime_database="$(top_builddir)/update-mime-database$(EXEEXT)"
|
|
||||||
endif
|
|
||||||
|
|
||||||
-install-data-hook: install-binPROGRAMS
|
|
||||||
+# do NOT make this dependent on anything!
|
|
||||||
+#
|
|
||||||
+install-data-hook:
|
|
||||||
if ENABLE_UPDATE_MIMEDB
|
|
||||||
$(update_mime_database) -V "$(DESTDIR)$(datadir)/mime"
|
|
||||||
endif
|
|
|
@ -1,33 +0,0 @@
|
||||||
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 <constantinx.musca@intel.com>
|
|
||||||
|
|
||||||
Index: shared-mime-info-1.9/Makefile.am
|
|
||||||
===================================================================
|
|
||||||
--- shared-mime-info-1.9.orig/Makefile.am
|
|
||||||
+++ shared-mime-info-1.9/Makefile.am
|
|
||||||
@@ -1,5 +1,3 @@
|
|
||||||
-SUBDIRS=. po
|
|
||||||
-
|
|
||||||
AM_CPPFLAGS = $(ALL_CFLAGS)
|
|
||||||
|
|
||||||
packagesdir = $(datadir)/mime/packages
|
|
||||||
@@ -81,8 +79,7 @@ endif
|
|
||||||
|
|
||||||
all: $(defaultmakedeps)
|
|
||||||
|
|
||||||
-create-pot:
|
|
||||||
- $(AM_V_GEN) $(MAKE) -C po shared-mime-info.pot
|
|
||||||
+create-pot: po
|
|
||||||
|
|
||||||
local-test: create-pot freedesktop.org.xml update-mime-database$(EXEEXT)
|
|
||||||
if CROSS_COMPILING
|
|
|
@ -1,7 +0,0 @@
|
||||||
require shared-mime-info.inc
|
|
||||||
|
|
||||||
SRC_URI += "file://parallelmake.patch \
|
|
||||||
file://install-data-hook.patch"
|
|
||||||
|
|
||||||
SRC_URI[md5sum] = "418c2ced9dc4dd5ca8b06a755e6d64e9"
|
|
||||||
SRC_URI[sha256sum] = "c625a83b4838befc8cafcd54e3619946515d9e44d63d61c4adf7f5513ddfbebf"
|
|
|
@ -5,11 +5,14 @@ SECTION = "base"
|
||||||
LICENSE = "GPLv2"
|
LICENSE = "GPLv2"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
|
||||||
|
|
||||||
DEPENDS = "libxml2 intltool-native glib-2.0 shared-mime-info-native"
|
DEPENDS = "libxml2 itstool glib-2.0 shared-mime-info-native"
|
||||||
|
|
||||||
SRC_URI = "http://freedesktop.org/~hadess/shared-mime-info-${PV}.tar.xz"
|
SRC_URI = "git://gitlab.freedesktop.org/xdg/shared-mime-info.git;protocol=https"
|
||||||
|
SRCREV = "829b26d85e7d89a0caee03046c3bce373f04c80a"
|
||||||
|
PV = "1.15"
|
||||||
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
inherit autotools pkgconfig gettext
|
inherit autotools pkgconfig gettext python3native
|
||||||
|
|
||||||
EXTRA_OECONF = "--disable-update-mimedb"
|
EXTRA_OECONF = "--disable-update-mimedb"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user