* 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
Signed-off-by: Andreas Müller <[email protected]> --- .../shared-mime-info/install-data-hook.patch | 25 -------------- .../shared-mime-info/parallelmake.patch | 33 ------------------- .../shared-mime-info/shared-mime-info_1.10.bb | 7 ---- ...mime-info.inc => shared-mime-info_1.15.bb} | 8 +++-- 4 files changed, 5 insertions(+), 68 deletions(-) delete mode 100644 meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch delete mode 100644 meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch delete mode 100644 meta/recipes-support/shared-mime-info/shared-mime-info_1.10.bb rename meta/recipes-support/shared-mime-info/{shared-mime-info.inc => shared-mime-info_1.15.bb} (69%) 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 @@ -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 <[email protected]> - -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 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 @@ -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 <[email protected]> - -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 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 @@ -require shared-mime-info.inc - -SRC_URI += "file://parallelmake.patch \ - file://install-data-hook.patch" - -SRC_URI[md5sum] = "418c2ced9dc4dd5ca8b06a755e6d64e9" -SRC_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_1.15.bb similarity index 69% rename from meta/recipes-support/shared-mime-info/shared-mime-info.inc rename to meta/recipes-support/shared-mime-info/shared-mime-info_1.15.bb index 3fe1a445b0..163e74f362 100644 --- a/meta/recipes-support/shared-mime-info/shared-mime-info.inc +++ b/meta/recipes-support/shared-mime-info/shared-mime-info_1.15.bb @@ -5,11 +5,13 @@ SECTION = "base" LICENSE = "GPLv2" 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 = "https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/b27eb88e4155d8fccb8bb3cd12025d5b/${BPN}-${PV}.tar.xz"; +SRC_URI[md5sum] = "5215f3d679a817de97eb8b0b911e9393" +SRC_URI[sha256sum] = "f482b027437c99e53b81037a9843fccd549243fd52145d016e9c7174a4f5db90" -inherit autotools pkgconfig gettext +inherit autotools pkgconfig gettext python3native EXTRA_OECONF = "--disable-update-mimedb" -- 2.21.0 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
