t-head/meta-openembedded
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-openembedded synced 2026-09-03 20:54:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

gnome-doc-utils-stub: add a recipe

Browse Source 
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>
This commit is contained in:
Alexander Kanavin
2016-05-24 14:57:01 +03:00
committed by Martin Jansa
parent f0de8ed2c3
commit b4d7caaff9
14 changed files with 882 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
meta-oe/recipes-devtools/geany/geany_1.27.bb
View File

@@ -2,7 +2,7 @@ SUMMARY = "A fast and lightweight IDE"
HOMEPAGE = "http://www.geany.org/"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=bd7b2c994af21d318bd2cd3b3f80c2d5"
DEPENDS = "gtk+ python-docutils-native"
DEPENDS = "gtk+ python3-docutils-native"
inherit autotools pkgconfig perlnative pythonnative
@@ -14,3 +14,5 @@ SRC_URI[md5sum] = "7c23f835f45def89d10884c1343fa29e"
SRC_URI[sha256sum] = "846ff699a5944c5c3c068ae0199d4c13946a668bfc6d03f8c79765667c20cadf"
FILES_${PN} += "${datadir}/icons"
EXTRA_OECONF = "--disable-html-docs"

6
meta-oe/recipes-devtools/glade/glade3_3.8.5.bb
View File

@@ -4,7 +4,7 @@ LICENSE = "GPLv2 & LGPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \
file://COPYING.GPL;md5=9ac2e7cff1ddaf48b6eab6028f23ef88 \
file://COPYING.LGPL;md5=252890d9eee26aab7b432e8b8a616475"
DEPENDS = "gtk+ gnome-doc-utils-native gnome-common libxml2"
DEPENDS = "gtk+ gnome-doc-utils gnome-common libxml2"
inherit autotools pkgconfig pythonnative
@@ -18,10 +18,6 @@ EXTRA_OECONF += "--disable-scrollkeeper"
PACKAGECONFIG ??= ""
PACKAGECONFIG[gnome] = "--enable-gnome,--disable-gnome,libbonoboui libgnomeui"
do_configure_prepend() {
sed -i '/^if HAVE_GNOME_DOC_UTILS/,/^endif/d' ${S}/Makefile.am
}
FILES_${PN} += "${datadir}/icons"
FILES_${PN}-dbg += "${libdir}/glade3/modules/.debug"
FILES_${PN}-dev += "${libdir}/glade3/modules/*.la"

61
meta-oe/recipes-gnome/gnome-doc-utils-stub/files/gnome-doc-utils.m4 Normal file
View File

@@ -0,0 +1,61 @@
dnl Do not call GNOME_DOC_DEFINES directly. It is split out from
dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself.
AC_DEFUN([GNOME_DOC_DEFINES],
[
AC_ARG_WITH([help-dir],
AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),,
[with_help_dir='${datadir}/gnome/help'])
HELP_DIR="$with_help_dir"
AC_SUBST(HELP_DIR)
AC_ARG_WITH([omf-dir],
AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),,
[with_omf_dir='${datadir}/omf'])
OMF_DIR="$with_omf_dir"
AC_SUBST(OMF_DIR)
AC_ARG_WITH([help-formats],
AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),,
[with_help_formats=''])
DOC_USER_FORMATS="$with_help_formats"
AC_SUBST(DOC_USER_FORMATS)
AC_ARG_ENABLE([scrollkeeper],
[AC_HELP_STRING([--disable-scrollkeeper],
[do not make updates to the scrollkeeper database])],,
enable_scrollkeeper=yes)
AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"])
dnl disable scrollkeeper automatically for distcheck
DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"])
])
# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
#
AC_DEFUN([GNOME_DOC_INIT],
[AC_REQUIRE([AC_PROG_LN_S])dnl
if test -z "$AM_DEFAULT_VERBOSITY"; then
AM_DEFAULT_VERBOSITY=1
fi
AC_SUBST([AM_DEFAULT_VERBOSITY])
ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1])
AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required])
PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required],
[gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no])
if test "$gdu_cv_have_gdu" = "yes"; then
AC_MSG_RESULT([yes])
ifelse([$2],,[:],[$2])
else
AC_MSG_RESULT([no])
ifelse([$3],,[:],[$3])
fi
GNOME_DOC_DEFINES
])

18
meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb Normal file
View File

@@ -0,0 +1,18 @@
SUMMARY = "Stub implementation of gnome-doc-utils"
DESCRIPTION = "This recipe provides m4 macros from gnome-doc-utils project, so \
that dependent recipes can build. Gnome-doc-utils itself is no longer packaged because \
it requires libxml2 and python 2 at the same time, which can no longer be satisfied. "
LICENSE = "GPLv2 & LGPLv2.1"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6 \
file://${COREBASE}/meta/files/common-licenses/LGPL-2.1;md5=1a6d268fd218675ffea8be556788b780"
SRC_URI = "file://gnome-doc-utils.m4"
PROVIDES = "gnome-doc-utils"
do_install_append() {
install -d ${D}${datadir}/aclocal/
install ${WORKDIR}/gnome-doc-utils.m4 ${D}${datadir}/aclocal/
}
FILES_${PN} += "${datadir}"