diff options
| author | Andreas Müller <schnitzeltony@googlemail.com> | 2012-09-28 06:35:49 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-10-16 15:01:13 +0200 |
| commit | c2a0882c52f4416252cb4ce9bd964eb9daf9b85a (patch) | |
| tree | f55aec6efe639b33595f8c105c3278844877f165 | |
| parent | 7eb2c6f8459fdcad5eb0f0dc2d8ca17a327dc0f6 (diff) | |
| download | meta-openembedded-c2a0882c52f4416252cb4ce9bd964eb9daf9b85a.tar.gz | |
glade3: initial add 3.8.2
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
| -rw-r--r-- | meta-oe/recipes-devtools/glade/files/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch | 51 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/glade/glade3_3.8.2.bb | 19 |
2 files changed, 70 insertions, 0 deletions
diff --git a/meta-oe/recipes-devtools/glade/files/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch b/meta-oe/recipes-devtools/glade/files/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch new file mode 100644 index 0000000000..1b24c39ce8 --- /dev/null +++ b/meta-oe/recipes-devtools/glade/files/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch | |||
| @@ -0,0 +1,51 @@ | |||
| 1 | From aed002cd9ff9e8f972120fbac33b4a65aba952e1 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
| 3 | Date: Tue, 25 Sep 2012 10:28:33 +0200 | ||
| 4 | Subject: [PATCH] gnome-doc-utils.make: sysrooted pkg-config | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | same approach as used used in gnome-disk-utility: | ||
| 10 | |||
| 11 | In cross environment we have to prepend the sysroot to the path found by | ||
| 12 | pkgconfig since the path returned from pkgconfig does not have sysroot prefixed | ||
| 13 | it ends up using the files from host system. Now usually people have gnome installed | ||
| 14 | so the build succeeds but if you dont have gnome installed on build host then | ||
| 15 | it wont find the files on host system and packages using gnome-doc-utils wont | ||
| 16 | compile. | ||
| 17 | |||
| 18 | This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR | ||
| 19 | will be empty | ||
| 20 | |||
| 21 | Upstream-Status: pending | ||
| 22 | |||
| 23 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
| 24 | --- | ||
| 25 | gnome-doc-utils.make | 10 +++++----- | ||
| 26 | 1 files changed, 5 insertions(+), 5 deletions(-) | ||
| 27 | |||
| 28 | diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make | ||
| 29 | index 42d9df3..f71bbfa 100644 | ||
| 30 | --- a/gnome-doc-utils.make | ||
| 31 | +++ b/gnome-doc-utils.make | ||
| 32 | @@ -133,11 +133,11 @@ _DOC_ABS_SRCDIR = @abs_srcdir@ | ||
| 33 | _xml2po ?= `which xml2po` | ||
| 34 | _xml2po_mode = $(if $(DOC_ID),mallard,docbook) | ||
| 35 | |||
| 36 | -_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` | ||
| 37 | -_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` | ||
| 38 | -_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl | ||
| 39 | -_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl | ||
| 40 | -_ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl | ||
| 41 | +_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils` | ||
| 42 | +_db2omf ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils` | ||
| 43 | +_chunks ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl | ||
| 44 | +_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl | ||
| 45 | +_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl | ||
| 46 | |||
| 47 | if ENABLE_SK | ||
| 48 | _ENABLE_SK = true | ||
| 49 | -- | ||
| 50 | 1.7.6.5 | ||
| 51 | |||
diff --git a/meta-oe/recipes-devtools/glade/glade3_3.8.2.bb b/meta-oe/recipes-devtools/glade/glade3_3.8.2.bb new file mode 100644 index 0000000000..8cd6a0e97d --- /dev/null +++ b/meta-oe/recipes-devtools/glade/glade3_3.8.2.bb | |||
| @@ -0,0 +1,19 @@ | |||
| 1 | DESCRIPTION = "Glade - A User Interface Designer" | ||
| 2 | HOMEPAGE = "http://www.gnu.org/software/gnash" | ||
| 3 | LICENSE = "GPLv2 & LGPLv2" | ||
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \ | ||
| 5 | file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7" | ||
| 6 | DEPENDS = "gtk+ gnome-doc-utils-native" | ||
| 7 | |||
| 8 | inherit autotools pkgconfig pythonnative | ||
| 9 | |||
| 10 | SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glade3/3.8/glade3-${PV}.tar.xz \ | ||
| 11 | file://0001-gnome-doc-utils.make-sysrooted-pkg-config.patch" | ||
| 12 | SRC_URI[md5sum] = "b5da0ce717b2dc710e93a10b97c0f9ce" | ||
| 13 | SRC_URI[sha256sum] = "f180a5018eee6e3fe574854cb025af897dd9962b01d17d5752e626876d388b19" | ||
| 14 | |||
| 15 | EXTRA_OECONF += "--disable-scrollkeeper" | ||
| 16 | |||
| 17 | FILES_${PN} += "${datadir}/icons" | ||
| 18 | FILES_${PN}-dbg += "${libdir}/glade3/modules/.debug" | ||
| 19 | FILES_${PN}-dev += "${libdir}/glade3/modules/*.la" | ||
