diff options
3 files changed, 14 insertions, 13 deletions
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 index 8b6f9e524e..82ab1d2bbe 100644 --- a/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch +++ b/meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch | |||
| @@ -9,23 +9,24 @@ dependencies and stop itself racing itself. | |||
| 9 | RP 10/10/2011 | 9 | RP 10/10/2011 |
| 10 | 10 | ||
| 11 | Upstream-Status: Pending | 11 | Upstream-Status: Pending |
| 12 | Signed-off-by: Constantin Musca <constantinx.musca@intel.com> | ||
| 12 | 13 | ||
| 13 | Index: shared-mime-info-0.91/Makefile.am | 14 | Index: shared-mime-info-1.0/Makefile.am |
| 14 | =================================================================== | 15 | =================================================================== |
| 15 | --- shared-mime-info-0.91.orig/Makefile.am 2011-10-10 21:47:19.834173921 +0100 | 16 | --- shared-mime-info-1.0.orig/Makefile.am |
| 16 | +++ shared-mime-info-0.91/Makefile.am 2011-10-10 21:45:57.000000000 +0100 | 17 | +++ shared-mime-info-1.0/Makefile.am |
| 17 | @@ -1,5 +1,3 @@ | 18 | @@ -1,5 +1,3 @@ |
| 18 | -SUBDIRS=. po | 19 | -SUBDIRS=. po |
| 19 | - | 20 | - |
| 20 | INCLUDES = $(ALL_CFLAGS) | 21 | INCLUDES = $(ALL_CFLAGS) |
| 21 | 22 | ||
| 22 | packagesdir = $(datadir)/mime/packages | 23 | packagesdir = $(datadir)/mime/packages |
| 23 | @@ -70,8 +68,7 @@ | 24 | @@ -72,8 +70,7 @@ uninstall-hook: |
| 24 | 25 | ||
| 25 | all: check create-pot | 26 | all: check create-pot |
| 26 | 27 | ||
| 27 | -create-pot: | 28 | -create-pot: |
| 28 | - $(MAKE) -C po shared-mime-info.pot | 29 | - $(AM_V_GEN) $(MAKE) -C po shared-mime-info.pot |
| 29 | +create-pot: po | 30 | +create-pot: po |
| 30 | 31 | ||
| 31 | check: create-pot freedesktop.org.xml update-mime-database check-translations | 32 | check: create-pot freedesktop.org.xml update-mime-database check-translations |
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 deleted file mode 100644 index 910cb7fc5d..0000000000 --- a/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb +++ /dev/null | |||
| @@ -1,8 +0,0 @@ | |||
| 1 | require shared-mime-info.inc | ||
| 2 | PR = "r4" | ||
| 3 | |||
| 4 | SRC_URI[md5sum] = "982a211560ba4c47dc791ccff34e8fbc" | ||
| 5 | SRC_URI[sha256sum] = "98cfebe1d809afb24934e634373821e2a1dfa86fc6462cab230589a1c80988bd" | ||
| 6 | |||
| 7 | SRC_URI =+ "file://parallelmake.patch \ | ||
| 8 | file://install-data-hook.patch" | ||
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_1.0.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_1.0.bb new file mode 100644 index 0000000000..d9b7b5149b --- /dev/null +++ b/meta/recipes-support/shared-mime-info/shared-mime-info_1.0.bb | |||
| @@ -0,0 +1,8 @@ | |||
| 1 | require shared-mime-info.inc | ||
| 2 | PR = "r0" | ||
| 3 | |||
| 4 | SRC_URI[md5sum] = "901b7977dbb2b71d12d30d4d8fb97028" | ||
| 5 | SRC_URI[sha256sum] = "d2e830e5aae213dd906e64495e9618cc4ef40d7b249e0971a190b04d5802ae8f" | ||
| 6 | |||
| 7 | SRC_URI =+ "file://parallelmake.patch \ | ||
| 8 | file://install-data-hook.patch" | ||
