summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-10-05 12:46:12 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-10 10:00:10 +0100
commit3a1fa7dd5982e812a449e5220d64e511821b07df (patch)
tree92a5355f4d8dab9e3cdfcf8d2ed35321edae9d03
parent4050aa4252d4209e44dbc0367a3192dc82664061 (diff)
downloadpoky-3a1fa7dd5982e812a449e5220d64e511821b07df.tar.gz
shared-mime-info: Upgrade recipes from 0.90 -> 0.91
The parallel build problems are solved upstream therefore removed License file has been corrected to use 'GNU Lesser GPL' instead of 'GNU library GPL' and some indentation changes The license is LGPLv2+ therefore mark it so (From OE-Core rev: 30e8ceb8d78d9dd0a381dd4e47da2ec6c449beaf) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/shared-mime-info/files/fix-parallel-build-backport.patch26
-rw-r--r--meta/recipes-support/shared-mime-info/files/fix-parallel-build.patch33
-rw-r--r--meta/recipes-support/shared-mime-info/shared-mime-info.inc6
-rw-r--r--meta/recipes-support/shared-mime-info/shared-mime-info_0.90.bb8
-rw-r--r--meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb6
5 files changed, 9 insertions, 70 deletions
diff --git a/meta/recipes-support/shared-mime-info/files/fix-parallel-build-backport.patch b/meta/recipes-support/shared-mime-info/files/fix-parallel-build-backport.patch
deleted file mode 100644
index a78e6a8de6..0000000000
--- a/meta/recipes-support/shared-mime-info/files/fix-parallel-build-backport.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1Backport fix for https://bugs.freedesktop.org/show_bug.cgi?id=32127
2
3Upstream-Status: Inappropriate [Backport]
4
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6
7From 68e31f61f5e50e5222bc05437d1123e932922796 Mon Sep 17 00:00:00 2001
8From: Samuli Suominen <ssuominen@gentoo.org>
9Date: Mon, 06 Dec 2010 19:46:57 +0000
10Subject: Fix parallel build
11
12https://bugs.freedesktop.org/show_bug.cgi?id=32127
13---
14Index: shared-mime-info-0.90/Makefile.am
15===================================================================
16--- shared-mime-info-0.90.orig/Makefile.am 2011-05-25 15:50:18.000000000 -0700
17+++ shared-mime-info-0.90/Makefile.am 2011-05-25 15:50:45.153489305 -0700
18@@ -72,7 +72,7 @@
19 create-pot:
20 $(MAKE) -C po shared-mime-info.pot
21
22-check: freedesktop.org.xml check-translations
23+check: create-pot freedesktop.org.xml check-translations
24 if test -n $(XMLLINT) ; then \
25 if test -e $(top_builddir)/freedesktop.org.xml; then \
26 xmllint --noout --valid $(top_builddir)/freedesktop.org.xml; \
diff --git a/meta/recipes-support/shared-mime-info/files/fix-parallel-build.patch b/meta/recipes-support/shared-mime-info/files/fix-parallel-build.patch
deleted file mode 100644
index ea8b05eae3..0000000000
--- a/meta/recipes-support/shared-mime-info/files/fix-parallel-build.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1the check rule will trigger a weird dependency issue in automake,
2it's possible that update-mime-database are invoked simultaneously in
3two different threads at the same time.
4
5As a workaround, revert it to the logic in 0.80
6
7Upstream-Status: Inappropriate [workaround]
8
9Signed-off-by: qing He <qing.he@intel.com>
10
11diff --git a/Makefile.am b/Makefile.am
12index 1a887bc..9df581e 100644
13--- a/Makefile.am
14+++ b/Makefile.am
15@@ -72,7 +72,7 @@ uninstall-hook:
16 create-pot:
17 $(MAKE) -C po shared-mime-info.pot
18
19-check: freedesktop.org.xml update-mime-database check-translations
20+check: freedesktop.org.xml check-translations
21 if test -n $(XMLLINT) ; then \
22 if test -e $(top_builddir)/freedesktop.org.xml; then \
23 xmllint --noout --valid $(top_builddir)/freedesktop.org.xml; \
24@@ -80,9 +80,6 @@ check: freedesktop.org.xml update-mime-database check-translations
25 xmllint --noout --valid $(top_srcdir)/freedesktop.org.xml; \
26 fi \
27 fi
28- if test -d .git/ && test -x $(top_builddir)/update-mime-database && test -d $(top_srcdir)/mime-db-tests ; then \
29- $(top_builddir)/update-mime-database mime-db-tests/ ; \
30- fi
31 if test -d .git/ && test -x ../xdgmime/src/test-mime-data && test -x $(top_builddir)/test-tree-magic ; then \
32 mkdir -p $(top_builddir)/temp-mime-dir/mime/packages ; \
33 cp -a $(top_builddir)/freedesktop.org.xml $(top_builddir)/temp-mime-dir/mime/packages/ ; \
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info.inc b/meta/recipes-support/shared-mime-info/shared-mime-info.inc
index 64eef9d379..c8cab291da 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info.inc
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info.inc
@@ -2,13 +2,13 @@ DESCRIPTION = "shared MIME database and spec"
2HOMEPAGE = "http://freedesktop.org/wiki/Software/shared-mime-info" 2HOMEPAGE = "http://freedesktop.org/wiki/Software/shared-mime-info"
3SECTION = "base" 3SECTION = "base"
4 4
5LICENSE = "GPLv2+" 5LICENSE = "LGPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" 6LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
7 7
8DEPENDS = "libxml2 intltool-native glib-2.0 shared-mime-info-native" 8DEPENDS = "libxml2 intltool-native glib-2.0 shared-mime-info-native"
9DEPENDS_virtclass-native = "libxml2-native intltool-native glib-2.0-native" 9DEPENDS_virtclass-native = "libxml2-native intltool-native glib-2.0-native"
10 10
11SRC_URI = "http://freedesktop.org/~hadess/shared-mime-info-${PV}.tar.bz2" 11SRC_URI = "http://freedesktop.org/~hadess/shared-mime-info-${PV}.tar.xz"
12 12
13inherit autotools pkgconfig gettext 13inherit autotools pkgconfig gettext
14 14
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_0.90.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_0.90.bb
deleted file mode 100644
index cbbd0feed5..0000000000
--- a/meta/recipes-support/shared-mime-info/shared-mime-info_0.90.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require shared-mime-info.inc
2PR = "r0"
3
4SRC_URI += "file://fix-parallel-build.patch \
5 file://fix-parallel-build-backport.patch \
6 "
7SRC_URI[md5sum] = "967d68d3890ba3994cfce3adf5b8f15b"
8SRC_URI[sha256sum] = "52c9f84a8c72de631a0458542980b1728560f59845eb5e93e1dbe825f4b72304"
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
new file mode 100644
index 0000000000..76d27563a3
--- /dev/null
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
@@ -0,0 +1,6 @@
1require shared-mime-info.inc
2PR = "r0"
3
4SRC_URI[md5sum] = "982a211560ba4c47dc791ccff34e8fbc"
5SRC_URI[sha256sum] = "98cfebe1d809afb24934e634373821e2a1dfa86fc6462cab230589a1c80988bd"
6