summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2013-02-18 15:43:35 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-22 06:09:21 -0800
commit4baf4ca011cf761eaffefa7d46af474b4a4aae98 (patch)
tree937200319d1a83953842551ddb416b00d772c352 /meta
parentaf3c53f0bb0b06f8b60dd60f0a1e0b97b0faa42d (diff)
downloadpoky-4baf4ca011cf761eaffefa7d46af474b4a4aae98.tar.gz
gnome-common: upgrade to 3.7.4
- gnome-common finally is GPLv2+ - omf.patch is included in the new version (From OE-Core rev: dba2105d2f6f5788d8f827edad4e8c601a409d1f) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-gnome/gnome/gnome-common-2.28.0/omf.patch15
-rw-r--r--meta/recipes-gnome/gnome/gnome-common_2.28.0.bb26
-rw-r--r--meta/recipes-gnome/gnome/gnome-common_3.7.4.bb23
3 files changed, 23 insertions, 41 deletions
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 @@
1Upstream-Status: Pending
2
3--- gnome-common-2.4.0/doc-build/omf.make 2003-05-24 08:16:25.000000000 -0700
4+++ gnome-common-2.4.0.new/doc-build/omf.make 2004-11-15 14:01:12.185155192 -0700
5@@ -43,7 +43,9 @@
6 install-data-hook-omf:
7 $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
8 for file in $(omffile); do \
9- $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
10+ if [ -f $$file.out ]; then \
11+ $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
12+ fi; \
13 done
14 -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
15
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 @@
1DESCRIPTION = "Common macros for building GNOME applications"
2HOMEPAGE = "http://www.gnome.org/"
3BUGTRACKER = "https://bugzilla.gnome.org/"
4
5LICENSE = "GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
7
8SECTION = "x11/gnome"
9PR = "r3"
10inherit gnome allarch
11
12# The omf.make file failed if scrollkeeper doesn't happen to be
13# installed
14
15SRC_URI += "file://omf.patch"
16
17SRC_URI[archive.md5sum] = "30daabb0ca4898fea2647999e7813e8f"
18SRC_URI[archive.sha256sum] = "dd4817103d23745d00c735dd137951552ba7b576cb8f68e6a529d06661e9b6a1"
19
20EXTRA_AUTORECONF = ""
21DEPENDS = ""
22
23FILES_${PN} += "${datadir}/aclocal"
24FILES_${PN}-dev = ""
25
26BBCLASSEXTEND = "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 @@
1DESCRIPTION = "Common macros for building GNOME applications"
2HOMEPAGE = "http://www.gnome.org/"
3BUGTRACKER = "https://bugzilla.gnome.org/"
4
5LICENSE = "GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
7
8SECTION = "x11/gnome"
9PR = "r0"
10inherit gnome allarch
11
12GNOME_COMPRESS_TYPE = "xz"
13
14SRC_URI[archive.md5sum] = "974cd54626f1d1787481288ef26bd4ba"
15SRC_URI[archive.sha256sum] = "2af2d97010d2a9aeb3b99dd2ce07d1ef023e15a27b412ffe4f067f016ff7117b"
16
17EXTRA_AUTORECONF = ""
18DEPENDS = ""
19
20FILES_${PN} += "${datadir}/aclocal"
21FILES_${PN}-dev = ""
22
23BBCLASSEXTEND = "native"