[PATCH] gnome-common: upgrade to 3.7.4

[PATCH] gnome-common: upgrade to 3.7.4

[Constantin Musca]

- gnome-common finally is GPLv2+
- omf.patch is included in the new version

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
 meta/recipes-gnome/gnome/gnome-common-2.28.0/omf.patch    | 15 ---------------
 .../{gnome-common_2.28.0.bb => gnome-common_3.7.4.bb}     | 10 +++++-----
 2 files changed, 5 insertions(+), 20 deletions(-)
 delete mode 100644 meta/recipes-gnome/gnome/gnome-common-2.28.0/omf.patch
 rename meta/recipes-gnome/gnome/{gnome-common_2.28.0.bb => gnome-common_3.7.4.bb} (59%)

diff --git a/meta/recipes-gnome/gnome/gnome-common-2.28.0/omf.patch b/meta/recipes-gnome/gnome/gnome-common-2.28.0/omf.patch
deleted file mode 100644
index 0f9b13c..0000000
--- a/meta/recipes-gnome/gnome/gnome-common-2.28.0/omf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Pending
-
---- gnome-common-2.4.0/doc-build/omf.make	2003-05-24 08:16:25.000000000 -0700
-+++ gnome-common-2.4.0.new/doc-build/omf.make	2004-11-15 14:01:12.185155192 -0700
-@@ -43,7 +43,9 @@
- install-data-hook-omf:
- 	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
- 	for file in $(omffile); do \
--		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
-+		if [ -f $$file.out ]; then \
-+			$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
-+		fi; \
- 	done
- 	-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
- 
diff --git a/meta/recipes-gnome/gnome/gnome-common_2.28.0.bb b/meta/recipes-gnome/gnome/gnome-common_3.7.4.bb
similarity index 59%
rename from meta/recipes-gnome/gnome/gnome-common_2.28.0.bb
rename to meta/recipes-gnome/gnome/gnome-common_3.7.4.bb
index e094ccf..7f8d49d 100644
--- a/meta/recipes-gnome/gnome/gnome-common_2.28.0.bb
+++ b/meta/recipes-gnome/gnome/gnome-common_3.7.4.bb
@@ -3,19 +3,19 @@ HOMEPAGE = "http://www.gnome.org/"
 BUGTRACKER = "https://bugzilla.gnome.org/"
 
 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SECTION = "x11/gnome"
-PR = "r3"
+PR = "r0"
 inherit gnome allarch
 
 # The omf.make file failed if scrollkeeper doesn't happen to be
 # installed
 
-SRC_URI += "file://omf.patch"
+GNOME_COMPRESS_TYPE = "xz"
 
-SRC_URI[archive.md5sum] = "30daabb0ca4898fea2647999e7813e8f"
-SRC_URI[archive.sha256sum] = "dd4817103d23745d00c735dd137951552ba7b576cb8f68e6a529d06661e9b6a1"
+SRC_URI[archive.md5sum] = "974cd54626f1d1787481288ef26bd4ba"
+SRC_URI[archive.sha256sum] = "2af2d97010d2a9aeb3b99dd2ce07d1ef023e15a27b412ffe4f067f016ff7117b"
 
 EXTRA_AUTORECONF = ""
 DEPENDS = ""
-- 
1.7.11.7

Re: [PATCH] gnome-common: upgrade to 3.7.4

[Burton, Ross]

On 18 February 2013 13:25, Constantin Musca <constantinx.musca@intel.com> wrote:
>  # The omf.make file failed if scrollkeeper doesn't happen to be
>  # installed

Remove this comment too.

Also I'll note that whilst this is strictly speaking a development
release, gnome-common doesn't really follow that cycle and this
upgrade should be safe (and brings in the license clarification work I
did, so it's clearly super important).

Ross