From dba2105d2f6f5788d8f827edad4e8c601a409d1f Mon Sep 17 00:00:00 2001 From: Constantin Musca Date: Mon, 18 Feb 2013 15:43:35 +0200 Subject: gnome-common: upgrade to 3.7.4 - gnome-common finally is GPLv2+ - omf.patch is included in the new version Signed-off-by: Constantin Musca Signed-off-by: Saul Wold --- .../gnome/gnome-common-2.28.0/omf.patch | 15 ------------- meta/recipes-gnome/gnome/gnome-common_2.28.0.bb | 26 ---------------------- meta/recipes-gnome/gnome/gnome-common_3.7.4.bb | 23 +++++++++++++++++++ 3 files changed, 23 insertions(+), 41 deletions(-) delete mode 100644 meta/recipes-gnome/gnome/gnome-common-2.28.0/omf.patch delete mode 100644 meta/recipes-gnome/gnome/gnome-common_2.28.0.bb create mode 100644 meta/recipes-gnome/gnome/gnome-common_3.7.4.bb (limited to 'meta/recipes-gnome') 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 0f9b13c7eb..0000000000 --- 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_2.28.0.bb deleted file mode 100644 index e094ccf3c0..0000000000 --- a/meta/recipes-gnome/gnome/gnome-common_2.28.0.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "Common macros for building GNOME applications" -HOMEPAGE = "http://www.gnome.org/" -BUGTRACKER = "https://bugzilla.gnome.org/" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -SECTION = "x11/gnome" -PR = "r3" -inherit gnome allarch - -# The omf.make file failed if scrollkeeper doesn't happen to be -# installed - -SRC_URI += "file://omf.patch" - -SRC_URI[archive.md5sum] = "30daabb0ca4898fea2647999e7813e8f" -SRC_URI[archive.sha256sum] = "dd4817103d23745d00c735dd137951552ba7b576cb8f68e6a529d06661e9b6a1" - -EXTRA_AUTORECONF = "" -DEPENDS = "" - -FILES_${PN} += "${datadir}/aclocal" -FILES_${PN}-dev = "" - -BBCLASSEXTEND = "native" diff --git a/meta/recipes-gnome/gnome/gnome-common_3.7.4.bb b/meta/recipes-gnome/gnome/gnome-common_3.7.4.bb new file mode 100644 index 0000000000..ebf343ef43 --- /dev/null +++ b/meta/recipes-gnome/gnome/gnome-common_3.7.4.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Common macros for building GNOME applications" +HOMEPAGE = "http://www.gnome.org/" +BUGTRACKER = "https://bugzilla.gnome.org/" + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SECTION = "x11/gnome" +PR = "r0" +inherit gnome allarch + +GNOME_COMPRESS_TYPE = "xz" + +SRC_URI[archive.md5sum] = "974cd54626f1d1787481288ef26bd4ba" +SRC_URI[archive.sha256sum] = "2af2d97010d2a9aeb3b99dd2ce07d1ef023e15a27b412ffe4f067f016ff7117b" + +EXTRA_AUTORECONF = "" +DEPENDS = "" + +FILES_${PN} += "${datadir}/aclocal" +FILES_${PN}-dev = "" + +BBCLASSEXTEND = "native" -- cgit v1.2.3