Skip to contentSkip to conversation

shared-mime-info: update to version 0.90

PATCH New Sven Neumann 2 participants 3 messages Jul 13, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 shared-mime-info: update to version 0.90

Need to pass -j1 to make as parallel builds appear to be broken.

---
 .../shared-mime-info-0.60-fix-xmllint.patch        |   17 -----------------
 package/shared-mime-info/shared-mime-info.mk       |    7 ++++---
 2 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 package/shared-mime-info/shared-mime-info-0.60-fix-xmllint.patch
package/shared-mime-info/shared-mime-info-0.60-fix-xmllint.patch deleted +0 -17
deleted file mode 100644
index 921333e..0000000
@@ -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 ; \
package/shared-mime-info/shared-mime-info.mk +4 -3
index 6abfa75..44733ce 100644
@@ -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_OPT = -j1
 
 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_OPT = -j1
 
 define SHARED_MIME_INFO_INSTALL_TARGET_CMDS
 	$(HOST_MAKE_ENV) $(SHARED_MIME_INFO_HOST_BINARY) $(STAGING_DIR)/usr/share/mime
Signature · 1 line
1.7.1
#1 lore raw

PATCH 1/1 shared-mime-info: update to version 0.90

Le Wed, 13 Jul 2011 18:48:12 +0200,
Sven Neumann <[email protected]> a ?crit :

Quoted 1 line
 .../shared-mime-info-0.60-fix-xmllint.patch        |   17 -----------------

Patch mainlined ?

package/shared-mime-info/shared-mime-info.mk SHARED_MIME_INFO_CONF_ENV = XMLLINT=$(HOST_DIR)/usr/bin/xmllint · line 23

Quoted 9 lines

SHARED_MIME_INFO_CONF_OPT = --disable-update-mimedb

package/shared-mime-info/shared-mime-info.mk +3 -2
+SHARED_MIME_INFO_MAKE_OPT = -j1
 
 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_OPT = -j1

Usually, we do :

<pkg>_MAKE = $(MAKE1)

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#2 lore raw

PATCH 1/1 shared-mime-info: update to version 0.90

Quoted 6 lines · Thomas Petazzoni

Le Wed, 13 Jul 2011 18:48:12 +0200,
Sven Neumann <[email protected]> a ?crit :

Quoted 1 line
 .../shared-mime-info-0.60-fix-xmllint.patch        |   17 -----------------

Patch mainlined ?

Yes, this has been fixed in mainline.

Quoted 13 lines

package/shared-mime-info/shared-mime-info.mk SHARED_MIME_INFO_CONF_ENV = XMLLINT=$(HOST_DIR)/usr/bin/xmllint · line 23

Quoted 9 lines

SHARED_MIME_INFO_CONF_OPT = --disable-update-mimedb

package/shared-mime-info/shared-mime-info.mk +3 -2
+SHARED_MIME_INFO_MAKE_OPT = -j1
 
 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_OPT = -j1

Usually, we do :

Quoted 1 line

<pkg>_MAKE = $(MAKE1)

Ah, I see. I'll submit an updated patch then unless someone beats me to it...

Sven