diff options
| author | Sven Neumann <s.neumann@raumfeld.com> | 2011-07-14 09:16:28 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-07-18 22:38:39 +0200 |
| commit | b9187818daa207d4781a3e07659c08e66e23fd4b (patch) | |
| tree | ebe6dbdc6d1c41047cc109806d7385e6de37d1f4 | |
| parent | 604b576854cef8b0bdb3a0e101a519c1d12aab07 (diff) | |
shared-mime-info: update to version 0.90
Need to use $(MAKE1) as parallel builds appear to be broken.
Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rw-r--r-- | package/shared-mime-info/shared-mime-info-0.60-fix-xmllint.patch | 17 | ||||
| -rw-r--r-- | package/shared-mime-info/shared-mime-info.mk | 7 |
2 files changed, 4 insertions, 20 deletions
diff --git a/package/shared-mime-info/shared-mime-info-0.60-fix-xmllint.patch b/package/shared-mime-info/shared-mime-info-0.60-fix-xmllint.patch deleted file mode 100644 index 921333e3d..000000000 --- a/package/shared-mime-info/shared-mime-info-0.60-fix-xmllint.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: shared-mime-info-0.60/Makefile.am -=================================================================== ---- shared-mime-info-0.60.orig/Makefile.am -+++ shared-mime-info-0.60/Makefile.am -@@ -72,7 +72,7 @@ - - check: freedesktop.org.xml - if test -n $(XMLLINT) ; then \ -- xmllint --noout --valid $(top_srcdir)/freedesktop.org.xml; \ -+ $(XMLLINT) --noout --valid $(top_srcdir)/freedesktop.org.xml; \ - fi - if test -d CVS/ && test -x ../xdgmime/src/test-mime-data && test -x $(top_builddir)/test-tree-magic ; then \ - mkdir -p $(top_builddir)/temp-mime-dir/mime/packages ; \ diff --git a/package/shared-mime-info/shared-mime-info.mk b/package/shared-mime-info/shared-mime-info.mk index 6abfa7531..50b0f2515 100644 --- a/package/shared-mime-info/shared-mime-info.mk +++ b/package/shared-mime-info/shared-mime-info.mk @@ -3,7 +3,7 @@ # shared-mime-info # ############################################################# -SHARED_MIME_INFO_VERSION = 0.60 +SHARED_MIME_INFO_VERSION = 0.90 SHARED_MIME_INFO_SOURCE = shared-mime-info-$(SHARED_MIME_INFO_VERSION).tar.bz2 SHARED_MIME_INFO_SITE = http://freedesktop.org/~hadess @@ -15,11 +15,12 @@ SHARED_MIME_INFO_CONF_ENV = XMLLINT=$(HOST_DIR)/usr/bin/xmllint SHARED_MIME_INFO_DEPENDENCIES = host-pkg-config host-libglib2 host-libxml2 host-shared-mime-info libxml2 libglib2 SHARED_MIME_INFO_CONF_OPT = --disable-update-mimedb +SHARED_MIME_INFO_MAKE = $(MAKE1) HOST_SHARED_MIME_INFO_DEPENDENCIES = host-pkg-config host-intltool -HOST_SHARED_MIME_INFO_CONF_OPT = \ - --disable-update-mimedb +HOST_SHARED_MIME_INFO_CONF_OPT = --disable-update-mimedb +HOST_SHARED_MIME_INFO_MAKE = $(MAKE1) define SHARED_MIME_INFO_INSTALL_TARGET_CMDS $(HOST_MAKE_ENV) $(SHARED_MIME_INFO_HOST_BINARY) $(STAGING_DIR)/usr/share/mime |