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/gedit | |
| parent | f0de8ed2c3301b8629d87a4e3357d580d4db154a (diff) | |
| download | meta-openembedded-contrib-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/gedit')
| -rw-r--r-- | meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch | 29 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb | 12 |
2 files changed, 32 insertions, 9 deletions
diff --git a/meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch b/meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch new file mode 100644 index 0000000000..4ad57effe9 --- /dev/null +++ b/meta-gnome/recipes-gnome/gedit/files/0001-Remove-help-directory-from-build.patch @@ -0,0 +1,29 @@ +From 1d2e6165e3154e27ecde329a40c05f0880afb9e0 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Tue, 17 May 2016 14:14:03 +0300 +Subject: [PATCH] Remove help directory from build + +It hardcodes the use of xml2po utility, which is provided by obsolete gnome-doc-utils + +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + Makefile.am | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index e57b203..a88152d 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -3,9 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 + + SUBDIRS = gedit pixmaps po data plugin-loaders plugins docs tests win32 osx + +-if !OS_OSX +-SUBDIRS += help +-endif + + distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper + +-- +2.8.1 + diff --git a/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb b/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb index 1c7b7e3ed8..4ae5bbb815 100644 --- a/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb +++ b/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb @@ -3,12 +3,13 @@ SECTION = "x11/gnome" LICENSE = "GPLv2+" PR = "r2" -DEPENDS = "gvfs enchant gconf gnome-doc-utils gnome-doc-utils-native glib-2.0 gtk+ gtksourceview2 iso-codes" +DEPENDS = "gvfs enchant gconf gnome-doc-utils glib-2.0 gtk+ gtksourceview2 iso-codes" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" inherit gnome gettext pythonnative -SRC_URI+= "file://0001-workaround-void-pointer-arithmetic.patch" +SRC_URI+= "file://0001-workaround-void-pointer-arithmetic.patch \ + file://0001-Remove-help-directory-from-build.patch" SRC_URI[archive.md5sum] = "e1eecb0a92a1a363b3d375ec5ac0fb3b" SRC_URI[archive.sha256sum] = "a561fe3dd1d199baede1bd07c4ee65f06fc7c494dd4d3327117f04149a608e3c" GNOME_COMPRESS_TYPE="bz2" @@ -16,13 +17,6 @@ GNOME_COMPRESS_TYPE="bz2" EXTRA_OECONF = "--disable-scrollkeeper \ --enable-gvfs-metadata" -do_configure_prepend() { - cd ${S} - gnome-doc-common --copy || true - gnome-doc-prepare --force --copy || true - cd ${B} -} - FILES_${PN} += "${libdir}/gedit-2/plugin* ${datadir}/gedit-2" FILES_${PN}-dbg += "${libdir}/gedit-2/plugin-loaders/.debug ${libdir}/gedit-2/plugins/.debug" |