diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-05-24 14:57:01 +0300 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-06-08 14:55:26 +0200 |
| commit | b4d7caaff9ee7e3ba2f5756b3d2ea2de498d4c2f (patch) | |
| tree | a6c368b68b1a6181cca37fda37bf5444e20e4512 /meta-gnome/recipes-gnome/gthumb | |
| parent | f0de8ed2c3301b8629d87a4e3357d580d4db154a (diff) | |
| download | meta-openembedded-b4d7caaff9ee7e3ba2f5756b3d2ea2de498d4c2f.tar.gz | |
gnome-doc-utils-stub: add a recipe
Real gnome-doc-utils can no longer be build (because
it requires both python 2 and libxml2, which can only be
build for one version of Python), so a stub recipe which
provides just m4 macros is provided, and usage of
gnome-doc-utils is disabled where needed.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome/recipes-gnome/gthumb')
| -rw-r--r-- | meta-gnome/recipes-gnome/gthumb/files/0001-Drop-help-directory-from-build.patch | 25 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb | 7 |
2 files changed, 31 insertions, 1 deletions
diff --git a/meta-gnome/recipes-gnome/gthumb/files/0001-Drop-help-directory-from-build.patch b/meta-gnome/recipes-gnome/gthumb/files/0001-Drop-help-directory-from-build.patch new file mode 100644 index 0000000000..d116968a6d --- /dev/null +++ b/meta-gnome/recipes-gnome/gthumb/files/0001-Drop-help-directory-from-build.patch | |||
| @@ -0,0 +1,25 @@ | |||
| 1 | From 48cb878cb724e7a509260f014db6365510b8b541 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 3 | Date: Tue, 17 May 2016 14:05:29 +0300 | ||
| 4 | Subject: [PATCH] Drop help directory from build | ||
| 5 | |||
| 6 | It hardcodes the use of xml2po tool form gnome-doc-utils | ||
| 7 | |||
| 8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 9 | --- | ||
| 10 | Makefile.am | 2 +- | ||
| 11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 12 | |||
| 13 | diff --git a/Makefile.am b/Makefile.am | ||
| 14 | index d056875..3fc4a41 100644 | ||
| 15 | --- a/Makefile.am | ||
| 16 | +++ b/Makefile.am | ||
| 17 | @@ -1,4 +1,4 @@ | ||
| 18 | -SUBDIRS = m4 copy-n-paste data po gthumb extensions tests help | ||
| 19 | +SUBDIRS = m4 copy-n-paste data po gthumb extensions tests | ||
| 20 | |||
| 21 | ACLOCAL_AMFLAGS = -I m4 | ||
| 22 | AMCFLAGS = -fPIC -DPIC | ||
| 23 | -- | ||
| 24 | 2.8.1 | ||
| 25 | |||
diff --git a/meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb b/meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb index 0bf1321de8..d22d5da8ea 100644 --- a/meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb +++ b/meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb | |||
| @@ -14,7 +14,12 @@ SRC_URI[archive.md5sum] = "97fc13221b0c5d80c27a2e25a3a3ac6f" | |||
| 14 | SRC_URI[archive.sha256sum] = "cf809695230ab8892a078be454a42ade865754c72ec1da7c3d74d4310de54f1d" | 14 | SRC_URI[archive.sha256sum] = "cf809695230ab8892a078be454a42ade865754c72ec1da7c3d74d4310de54f1d" |
| 15 | GNOME_COMPRESS_TYPE="bz2" | 15 | GNOME_COMPRESS_TYPE="bz2" |
| 16 | 16 | ||
| 17 | SRC_URI += "file://parallel.patch" | 17 | SRC_URI += "file://parallel.patch \ |
| 18 | file://0001-Drop-help-directory-from-build.patch" | ||
| 19 | |||
| 20 | do_configure_prepend () { | ||
| 21 | rm -r ${S}/m4/gnome-doc-utils.m4 | ||
| 22 | } | ||
| 18 | 23 | ||
| 19 | do_install_append () { | 24 | do_install_append () { |
| 20 | rm -f ${D}${libdir}/${BPN}/extensions/*.a | 25 | rm -f ${D}${libdir}/${BPN}/extensions/*.a |
