Skip to content

Commit

Permalink
recipe shared-mime-info, rolled back to 0.90, as recent versions mis-…
Browse files Browse the repository at this point in the history
…identify some text files. this old version circa 2010, works ok in Puppy/Quirky
  • Loading branch information
bkauler committed Nov 1, 2017
1 parent 47ea4d9 commit 421fb1a
Show file tree
Hide file tree
Showing 5 changed files with 127 additions and 0 deletions.
@@ -0,0 +1,37 @@
SUMMARY = "Shared MIME type database and specification"
HOMEPAGE = "http://freedesktop.org/wiki/Software/shared-mime-info"
SECTION = "base"

# BK
# 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"
@@ -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 <jslater@windriver.com>

--- 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
@@ -0,0 +1,32 @@
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

Index: shared-mime-info-0.91/Makefile.am
===================================================================
--- shared-mime-info-0.91.orig/Makefile.am 2011-10-10 21:47:19.834173921 +0100
+++ shared-mime-info-0.91/Makefile.am 2011-10-10 21:45:57.000000000 +0100
@@ -1,5 +1,3 @@
-SUBDIRS=. po
-
INCLUDES = $(ALL_CFLAGS)

packagesdir = $(datadir)/mime/packages
@@ -70,8 +68,7 @@

all: check create-pot

-create-pot:
- $(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 \
@@ -0,0 +1,11 @@
require shared-mime-info.inc

LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"

SRC_URI = "https://people.freedesktop.org/~hadess/shared-mime-info-${PV}.tar.bz2"
SRC_URI[md5sum] = "967d68d3890ba3994cfce3adf5b8f15b"
SRC_URI[sha256sum] = "52c9f84a8c72de631a0458542980b1728560f59845eb5e93e1dbe825f4b72304"

SRC_URI += "file://parallelmake.patch \
file://install-data-hook.patch"
@@ -0,0 +1,24 @@
# Recipe created by recipetool
# This is the basis of a recipe and may need further editing in order to be fully functional.
# (Feel free to remove these comments when editing.)

# WARNING: the following LICENSE and LIC_FILES_CHKSUM values are best guesses - it is
# your responsibility to verify that the values are complete and correct.
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"

SRC_URI = "https://people.freedesktop.org/~hadess/shared-mime-info-${PV}.tar.bz2"
SRC_URI[md5sum] = "967d68d3890ba3994cfce3adf5b8f15b"
SRC_URI[sha256sum] = "52c9f84a8c72de631a0458542980b1728560f59845eb5e93e1dbe825f4b72304"

# NOTE: the following prog dependencies are unknown, ignoring: xmllint
DEPENDS = "glib-2.0 libxml2 intltool-native"

# NOTE: if this software is not capable of being built in a separate build directory
# from the source, you should replace autotools with autotools-brokensep in the
# inherit line
inherit gettext pkgconfig autotools

# Specify any options you want to pass to the configure script using EXTRA_OECONF:
EXTRA_OECONF = ""

0 comments on commit 421fb1a

Please sign in to comment.