Patchwork shared-mime-info: upgrade to 1.2

login
register
mail settings
Submitter Valentin Popa
Date Oct. 29, 2013, 1:14 p.m.
Message ID <1383052445-3099-1-git-send-email-valentin.popa@intel.com>
Download mbox | patch
Permalink /patch/60705/
State New
Headers show

Comments

Valentin Popa - Oct. 29, 2013, 1:14 p.m.
Adapted parallelmake.patch to the new Makefile.am.

Signed-off-by: Valentin Popa <valentin.popa@intel.com>
---
 .../shared-mime-info/shared-mime-info/parallelmake.patch             | 4 ++--
 .../{shared-mime-info_1.1.bb => shared-mime-info_1.2.bb}             | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)
 rename meta/recipes-support/shared-mime-info/{shared-mime-info_1.1.bb => shared-mime-info_1.2.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 82ab1d2..84c4d03 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
@@ -18,12 +18,12 @@  Index: shared-mime-info-1.0/Makefile.am
 @@ -1,5 +1,3 @@
 -SUBDIRS=. po
 -
- INCLUDES = $(ALL_CFLAGS)
+ AM_CPPFLAGS = $(ALL_CFLAGS)
  
  packagesdir = $(datadir)/mime/packages
 @@ -72,8 +70,7 @@ uninstall-hook:
  
- all: check create-pot
+ all: $(defaultmakedeps)
  
 -create-pot:
 -	$(AM_V_GEN) $(MAKE) -C po shared-mime-info.pot
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_1.1.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_1.2.bb
similarity index 41%
rename from meta/recipes-support/shared-mime-info/shared-mime-info_1.1.bb
rename to meta/recipes-support/shared-mime-info/shared-mime-info_1.2.bb
index 301cf27..11fd6de 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info_1.1.bb
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info_1.2.bb
@@ -1,8 +1,7 @@ 
 require shared-mime-info.inc
-PR = "r0"
 
-SRC_URI[md5sum] = "12ba00bf1cb2e69bfba73127e708e833"
-SRC_URI[sha256sum] = "184d094b157a9ec2607ad26a1a1837e6e07f3fcbeb38d8b6d412906156f9e06c"
+SRC_URI[md5sum] = "8f90f3f2b8478fa47e70678d34013f99"
+SRC_URI[sha256sum] = "a5516ae241b95a948a6749b1cbf65dc20c3bb563a73cc7bedb7065933788bb78"
 
 SRC_URI =+ "file://parallelmake.patch \
 	    file://install-data-hook.patch"