Patchwork [15/15] shared-mime-info: upgrade to 1.0

login
register
mail settings
Submitter Constantin Musca
Date Dec. 24, 2012, 8:34 a.m.
Message ID <3f5842a6a115b5c6a06b3b0312e9733e5560a16b.1356337650.git.constantinx.musca@intel.com>
Download mbox | patch
Permalink /patch/41643/
State New
Headers show

Comments

Constantin Musca - Dec. 24, 2012, 8:34 a.m.
parallelmake.patch: adapt to the new version

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
 .../shared-mime-info/shared-mime-info/parallelmake.patch      | 11 ++++++-----
 .../{shared-mime-info_0.91.bb => shared-mime-info_1.0.bb}     |  6 +++---
 2 files changed, 9 insertions(+), 8 deletions(-)
 rename meta/recipes-support/shared-mime-info/{shared-mime-info_0.91.bb => shared-mime-info_1.0.bb} (41%)

Patch

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 8b6f9e5..82ab1d2 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.
 RP 10/10/2011
 
 Upstream-Status: Pending
+Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
 
-Index: shared-mime-info-0.91/Makefile.am
+Index: shared-mime-info-1.0/Makefile.am
 ===================================================================
---- shared-mime-info-0.91.orig/Makefile.am	2011-10-10 21:47:19.834173921 +0100
-+++ shared-mime-info-0.91/Makefile.am	2011-10-10 21:45:57.000000000 +0100
+--- shared-mime-info-1.0.orig/Makefile.am
++++ shared-mime-info-1.0/Makefile.am
 @@ -1,5 +1,3 @@
 -SUBDIRS=. po
 -
  INCLUDES = $(ALL_CFLAGS)
  
  packagesdir = $(datadir)/mime/packages
-@@ -70,8 +68,7 @@
+@@ -72,8 +70,7 @@ uninstall-hook:
  
  all: check create-pot
  
 -create-pot:
--	$(MAKE) -C po shared-mime-info.pot
+-	$(AM_V_GEN) $(MAKE) -C po shared-mime-info.pot
 +create-pot: po
  
  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_1.0.bb
similarity index 41%
rename from meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
rename to meta/recipes-support/shared-mime-info/shared-mime-info_1.0.bb
index 910cb7f..d9b7b51 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info_1.0.bb
@@ -1,8 +1,8 @@ 
 require shared-mime-info.inc
-PR = "r4"
+PR = "r0"
 
-SRC_URI[md5sum] = "982a211560ba4c47dc791ccff34e8fbc"
-SRC_URI[sha256sum] = "98cfebe1d809afb24934e634373821e2a1dfa86fc6462cab230589a1c80988bd"
+SRC_URI[md5sum] = "901b7977dbb2b71d12d30d4d8fb97028"
+SRC_URI[sha256sum] = "d2e830e5aae213dd906e64495e9618cc4ef40d7b249e0971a190b04d5802ae8f"
 
 SRC_URI =+ "file://parallelmake.patch \
 	    file://install-data-hook.patch"