diff options
Diffstat (limited to 'meta/recipes-support/shared-mime-info')
-rw-r--r-- | meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch | 14 | ||||
-rw-r--r-- | meta/recipes-support/shared-mime-info/shared-mime-info/parallelmake.patch | 12 |
2 files changed, 14 insertions, 12 deletions
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch b/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch index 3c9f1ea438..262ff7562c 100644 --- a/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch +++ b/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch | |||
@@ -8,16 +8,18 @@ Upstream-Status: Pending | |||
8 | 8 | ||
9 | Signed-off-by: Joe Slater <jslater@windriver.com> | 9 | Signed-off-by: Joe Slater <jslater@windriver.com> |
10 | 10 | ||
11 | --- a/Makefile.am | 11 | Index: shared-mime-info-1.9/Makefile.am |
12 | +++ b/Makefile.am | 12 | =================================================================== |
13 | @@ -44,7 +44,9 @@ $(pkgconfig_DATA): config.status | 13 | --- shared-mime-info-1.9.orig/Makefile.am |
14 | @INTLTOOL_XML_RULE@ | 14 | +++ shared-mime-info-1.9/Makefile.am |
15 | @INTLTOOL_DESKTOP_RULE@ | 15 | @@ -50,7 +50,9 @@ else |
16 | update_mime_database="$(top_builddir)/update-mime-database$(EXEEXT)" | ||
17 | endif | ||
16 | 18 | ||
17 | -install-data-hook: install-binPROGRAMS | 19 | -install-data-hook: install-binPROGRAMS |
18 | +# do NOT make this dependent on anything! | 20 | +# do NOT make this dependent on anything! |
19 | +# | 21 | +# |
20 | +install-data-hook: | 22 | +install-data-hook: |
21 | if ENABLE_UPDATE_MIMEDB | 23 | if ENABLE_UPDATE_MIMEDB |
22 | $(DESTDIR)"$(bindir)/update-mime-database" -V "$(DESTDIR)$(datadir)/mime" | 24 | $(update_mime_database) -V "$(DESTDIR)$(datadir)/mime" |
23 | endif | 25 | endif |
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 84c4d03731..fea34a55a2 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 | |||
@@ -11,17 +11,17 @@ RP 10/10/2011 | |||
11 | Upstream-Status: Pending | 11 | Upstream-Status: Pending |
12 | Signed-off-by: Constantin Musca <constantinx.musca@intel.com> | 12 | Signed-off-by: Constantin Musca <constantinx.musca@intel.com> |
13 | 13 | ||
14 | Index: shared-mime-info-1.0/Makefile.am | 14 | Index: shared-mime-info-1.9/Makefile.am |
15 | =================================================================== | 15 | =================================================================== |
16 | --- shared-mime-info-1.0.orig/Makefile.am | 16 | --- shared-mime-info-1.9.orig/Makefile.am |
17 | +++ shared-mime-info-1.0/Makefile.am | 17 | +++ shared-mime-info-1.9/Makefile.am |
18 | @@ -1,5 +1,3 @@ | 18 | @@ -1,5 +1,3 @@ |
19 | -SUBDIRS=. po | 19 | -SUBDIRS=. po |
20 | - | 20 | - |
21 | AM_CPPFLAGS = $(ALL_CFLAGS) | 21 | AM_CPPFLAGS = $(ALL_CFLAGS) |
22 | 22 | ||
23 | packagesdir = $(datadir)/mime/packages | 23 | packagesdir = $(datadir)/mime/packages |
24 | @@ -72,8 +70,7 @@ uninstall-hook: | 24 | @@ -81,8 +79,7 @@ endif |
25 | 25 | ||
26 | all: $(defaultmakedeps) | 26 | all: $(defaultmakedeps) |
27 | 27 | ||
@@ -29,5 +29,5 @@ Index: shared-mime-info-1.0/Makefile.am | |||
29 | - $(AM_V_GEN) $(MAKE) -C po shared-mime-info.pot | 29 | - $(AM_V_GEN) $(MAKE) -C po shared-mime-info.pot |
30 | +create-pot: po | 30 | +create-pot: po |
31 | 31 | ||
32 | check: create-pot freedesktop.org.xml update-mime-database check-translations | 32 | local-test: create-pot freedesktop.org.xml update-mime-database$(EXEEXT) |
33 | if test -e $(top_builddir)/freedesktop.org.xml; then \ | 33 | if CROSS_COMPILING |