* [PATCH 00/26] Use gtk-doc-stub
@ 2012-07-19 16:10 Ross Burton
2012-07-19 16:10 ` [PATCH 01/26] Add gtk-doc-stub Ross Burton
` (27 more replies)
0 siblings, 28 replies; 34+ messages in thread
From: Ross Burton @ 2012-07-19 16:10 UTC (permalink / raw)
To: openembedded-core
That nice Colin Walters had the same problem in ostree that we have in Poky
- gtk-doc and modules that autoregen. He solved it in a cleaner manner and
created gtk-doc-stub, which has the external interface of gtk-doc but
(obviously) does nothing.
This patch series:
- packages gtk-doc-stub
- changes the gtk-doc class to depend on gtk-doc-stub-native and pass
--disable-gtk-doc to the configure script
- updates every recipe in oe-core that mentions gtk-doc
One question: is the dependency addition in gtk-doc.bbclass correct?
Different recipies have different way of adding dependencies, and I'm not
sure if the native line is required.
For packages in other layers, you can:
- inherit gtk-doc
- remove gtk-doc from your DEPENDS
- remove --disable-gtk-doc from your OECONF
- stop creating gtk-doc.make in do_configure_prepend
I've compared buildhistory before and after this series, the only change was
that glib-2.0-doc packaged the existing documentation in the tarball. I'm
not sure why it didn't do this before, but that's a bug fixed for free.
Ross
The following changes since commit 2665be9dd5730c3f1135b92d7d91de479c397a29:
buildhistory.bbclass: Fix python whitespace (2012-07-19 12:33:20 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib ross/gtkdoc
for you to fetch changes up to 7c586b3b9b06e0f9f50f085419083c63830b7900:
Remove gtk-doc (2012-07-19 17:05:54 +0100)
----------------------------------------------------------------
Ross Burton (26):
Add gtk-doc-stub
change gtk-doc.bbclass to pull in depends and oeconf
glib-2.0: cleanup thanks to new gtk-doc.bbclass
gconf: cleanup thanks to new gtk-doc.bbclass
gobject-introspection: cleanup thanks to new gtk-doc.bbclass
cogl: cleanup thanks to new gtk-doc.bbclass
gypsy: inherit gtk-doc
gconf: cleanup thanks to new gtk-doc.bbclass
connman: cleanup thanks to new gtk-doc.bbclass
polkit: cleanup thanks to new gtk-doc.bbclass
polkit-gnome: cleanup thanks to new gtk-doc.bbclass
gail: cleanup thanks to new gtk-doc.bbclass
gnome-keyring: cleanup thanks to new gtk-doc.bbclass
libart_lgpl: cleanup thanks to new gtk-doc.bbclass
libgnome-keyring: cleanup thanks to new gtk-doc.bbclass
gtk+: cleanup thanks to new gtk-doc.bbclass
libglade: cleanup thanks to new gtk-doc.bbclass
librsvg: cleanup thanks to new gtk-doc.bbclass
clutter: cleanup thanks to new gtk-doc.bbclass
pango: cleanup thanks to new gtk-doc.bbclass
kmod: inherit gtk-doc, gnome-doc-utils-native isn't the package you were looking for
evolution-data-server: cleanup thanks to new gtk-doc.bbclass
webkit-gtk: cleanup thanks to new gtk-doc.bbclass
atk: cleanup thanks to new gtk-doc.bbclass
vte: cleanup thanks to new gtk-doc.bbclass
Remove gtk-doc
meta/classes/gtk-doc.bbclass | 20 +++++--
meta/recipes-connectivity/connman/connman.inc | 5 +-
meta/recipes-connectivity/gypsy/gypsy.inc | 6 +-
meta/recipes-connectivity/gypsy/gypsy_0.8.bb | 2 +-
meta/recipes-connectivity/gypsy/gypsy_git.bb | 2 +
meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb | 5 +-
meta/recipes-core/glib-2.0/glib.inc | 6 +-
meta/recipes-extended/polkit/polkit-gnome_0.102.bb | 5 +-
meta/recipes-extended/polkit/polkit_0.104.bb | 6 +-
meta/recipes-gnome/gnome/gail_1.20.2.bb | 6 +-
meta/recipes-gnome/gnome/gconf_3.2.3.bb | 10 +---
meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb | 6 +-
.../gnome/gobject-introspection_1.32.1.bb | 11 ++--
.../gnome/gobject-introspection_git.bb | 11 +---
meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb | 7 +--
.../recipes-gnome/gnome/libgnome-keyring_2.32.0.bb | 6 +-
meta/recipes-gnome/gtk+/gtk+.inc | 4 +-
meta/recipes-gnome/gtk+/gtk+_2.12.7.bb | 2 +-
meta/recipes-gnome/gtk+/gtk+_2.16.6.bb | 2 +-
meta/recipes-gnome/gtk+/gtk+_2.24.8.bb | 2 +-
.../recipes-gnome/gtk-doc-stub/gtk-doc-stub_git.bb | 19 ++++++
meta/recipes-gnome/gtk-doc/gtk-doc.bb | 19 ------
meta/recipes-gnome/gtk-doc/gtk-doc.m4 | 61 --------------------
meta/recipes-gnome/libglade/libglade_2.6.4.bb | 6 +-
meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 5 +-
meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb | 2 +
meta/recipes-graphics/clutter/clutter-1.8_git.bb | 2 +-
meta/recipes-graphics/clutter/clutter.inc | 4 +-
meta/recipes-graphics/clutter/cogl.inc | 4 +-
meta/recipes-graphics/clutter/cogl_1.8.2.bb | 2 +-
meta/recipes-graphics/clutter/cogl_git.bb | 2 +-
meta/recipes-graphics/pango/pango.inc | 4 +-
meta/recipes-graphics/pango/pango_1.28.4.bb | 2 +-
meta/recipes-kernel/kmod/kmod.inc | 6 +-
meta/recipes-sato/eds/evolution-data-server_git.bb | 10 +---
meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb | 5 +-
meta/recipes-support/atk/atk_2.2.0.bb | 6 +-
meta/recipes-support/vte/vte.inc | 4 +-
meta/recipes-support/vte/vte_0.28.2.bb | 2 +-
39 files changed, 106 insertions(+), 183 deletions(-)
create mode 100644 meta/recipes-gnome/gtk-doc-stub/gtk-doc-stub_git.bb
delete mode 100644 meta/recipes-gnome/gtk-doc/gtk-doc.bb
delete mode 100644 meta/recipes-gnome/gtk-doc/gtk-doc.m4
Ross Burton (26):
Add gtk-doc-stub
change gtk-doc.bbclass to pull in depends and oeconf
glib-2.0: cleanup thanks to new gtk-doc.bbclass
gconf: cleanup thanks to new gtk-doc.bbclass
gobject-introspection: cleanup thanks to new gtk-doc.bbclass
cogl: cleanup thanks to new gtk-doc.bbclass
gypsy: inherit gtk-doc
gconf: cleanup thanks to new gtk-doc.bbclass
connman: cleanup thanks to new gtk-doc.bbclass
polkit: cleanup thanks to new gtk-doc.bbclass
polkit-gnome: cleanup thanks to new gtk-doc.bbclass
gail: cleanup thanks to new gtk-doc.bbclass
gnome-keyring: cleanup thanks to new gtk-doc.bbclass
libart_lgpl: cleanup thanks to new gtk-doc.bbclass
libgnome-keyring: cleanup thanks to new gtk-doc.bbclass
gtk+: cleanup thanks to new gtk-doc.bbclass
libglade: cleanup thanks to new gtk-doc.bbclass
librsvg: cleanup thanks to new gtk-doc.bbclass
clutter: cleanup thanks to new gtk-doc.bbclass
pango: cleanup thanks to new gtk-doc.bbclass
kmod: inherit gtk-doc, gnome-doc-utils-native isn't the package you
were looking for
evolution-data-server: cleanup thanks to new gtk-doc.bbclass
webkit-gtk: cleanup thanks to new gtk-doc.bbclass
atk: cleanup thanks to new gtk-doc.bbclass
vte: cleanup thanks to new gtk-doc.bbclass
Remove gtk-doc
meta/classes/gtk-doc.bbclass | 20 +++++--
meta/recipes-connectivity/connman/connman.inc | 5 +-
meta/recipes-connectivity/gypsy/gypsy.inc | 6 +-
meta/recipes-connectivity/gypsy/gypsy_0.8.bb | 2 +-
meta/recipes-connectivity/gypsy/gypsy_git.bb | 2 +
meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb | 5 +-
meta/recipes-core/glib-2.0/glib.inc | 6 +-
meta/recipes-extended/polkit/polkit-gnome_0.102.bb | 5 +-
meta/recipes-extended/polkit/polkit_0.104.bb | 6 +-
meta/recipes-gnome/gnome/gail_1.20.2.bb | 6 +-
meta/recipes-gnome/gnome/gconf_3.2.3.bb | 10 +---
meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb | 6 +-
.../gnome/gobject-introspection_1.32.1.bb | 11 ++--
.../gnome/gobject-introspection_git.bb | 11 +---
meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb | 7 +--
.../recipes-gnome/gnome/libgnome-keyring_2.32.0.bb | 6 +-
meta/recipes-gnome/gtk+/gtk+.inc | 4 +-
meta/recipes-gnome/gtk+/gtk+_2.12.7.bb | 2 +-
meta/recipes-gnome/gtk+/gtk+_2.16.6.bb | 2 +-
meta/recipes-gnome/gtk+/gtk+_2.24.8.bb | 2 +-
.../recipes-gnome/gtk-doc-stub/gtk-doc-stub_git.bb | 19 ++++++
meta/recipes-gnome/gtk-doc/gtk-doc.bb | 19 ------
meta/recipes-gnome/gtk-doc/gtk-doc.m4 | 61 --------------------
meta/recipes-gnome/libglade/libglade_2.6.4.bb | 6 +-
meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 5 +-
meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb | 2 +
meta/recipes-graphics/clutter/clutter-1.8_git.bb | 2 +-
meta/recipes-graphics/clutter/clutter.inc | 4 +-
meta/recipes-graphics/clutter/cogl.inc | 4 +-
meta/recipes-graphics/clutter/cogl_1.8.2.bb | 2 +-
meta/recipes-graphics/clutter/cogl_git.bb | 2 +-
meta/recipes-graphics/pango/pango.inc | 4 +-
meta/recipes-graphics/pango/pango_1.28.4.bb | 2 +-
meta/recipes-kernel/kmod/kmod.inc | 6 +-
meta/recipes-sato/eds/evolution-data-server_git.bb | 10 +---
meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb | 5 +-
meta/recipes-support/atk/atk_2.2.0.bb | 6 +-
meta/recipes-support/vte/vte.inc | 4 +-
meta/recipes-support/vte/vte_0.28.2.bb | 2 +-
39 files changed, 106 insertions(+), 183 deletions(-)
create mode 100644 meta/recipes-gnome/gtk-doc-stub/gtk-doc-stub_git.bb
delete mode 100644 meta/recipes-gnome/gtk-doc/gtk-doc.bb
delete mode 100644 meta/recipes-gnome/gtk-doc/gtk-doc.m4
--
1.7.10
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH 01/26] Add gtk-doc-stub
2012-07-19 16:10 [PATCH 00/26] Use gtk-doc-stub Ross Burton
@ 2012-07-19 16:10 ` Ross Burton
2012-07-19 16:10 ` [PATCH 02/26] change gtk-doc.bbclass to pull in depends and oeconf Ross Burton
` (26 subsequent siblings)
27 siblings, 0 replies; 34+ messages in thread
From: Ross Burton @ 2012-07-19 16:10 UTC (permalink / raw)
To: openembedded-core
This is a maintained stub for gtk-doc (and gobject-introspection) that was
created by Colin Walters for his Poky-powered ostree project.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-gnome/gtk-doc-stub/gtk-doc-stub_git.bb | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 meta/recipes-gnome/gtk-doc-stub/gtk-doc-stub_git.bb
diff --git a/meta/recipes-gnome/gtk-doc-stub/gtk-doc-stub_git.bb b/meta/recipes-gnome/gtk-doc-stub/gtk-doc-stub_git.bb
new file mode 100644
index 0000000..195fc41
--- /dev/null
+++ b/meta/recipes-gnome/gtk-doc-stub/gtk-doc-stub_git.bb
@@ -0,0 +1,19 @@
+SUMMARY = "Stub implementation of gtk-doc"
+DESCRIPTION = "Stub implementation of gtk-doc, as we don't want to build the API documentation"
+SECTION = "x11/base"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+
+PROVIDES = "gtk-doc"
+
+SRCREV = "3dfd0a09de696ec8c544762747f8a0f77153622e"
+PV = "0.0+git${SRCPV}"
+PR = "r0"
+
+SRC_URI = "git://git.gnome.org/${BPN};protocol=git"
+
+S = "${WORKDIR}/git"
+
+inherit autotools
+
+BBCLASSEXTEND = "native"
--
1.7.10
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 02/26] change gtk-doc.bbclass to pull in depends and oeconf
2012-07-19 16:10 [PATCH 00/26] Use gtk-doc-stub Ross Burton
2012-07-19 16:10 ` [PATCH 01/26] Add gtk-doc-stub Ross Burton
@ 2012-07-19 16:10 ` Ross Burton
2012-07-19 16:43 ` Richard Purdie
2012-07-19 16:10 ` [PATCH 03/26] glib-2.0: cleanup thanks to new gtk-doc.bbclass Ross Burton
` (25 subsequent siblings)
27 siblings, 1 reply; 34+ messages in thread
From: Ross Burton @ 2012-07-19 16:10 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/classes/gtk-doc.bbclass | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/meta/classes/gtk-doc.bbclass b/meta/classes/gtk-doc.bbclass
index 58daaf3..6a3854f 100644
--- a/meta/classes/gtk-doc.bbclass
+++ b/meta/classes/gtk-doc.bbclass
@@ -1,4 +1,16 @@
-# We don't have gtk-doc so disable it
-do_configure_prepend() {
- echo "EXTRA_DIST=">> ${S}/gtk-doc.make
-}
+# Helper class to pull in the right gtk-doc dependencies and disable
+# gtk-doc.
+#
+# Long-term it would be great if this class could be toggled between
+# gtk-doc-stub-native and the real gtk-doc-native, which would enable
+# re-generation of documentation. For now, we'll make do with this which
+# packages up any existing documentation (so from tarball builds).
+
+DEPENDS += "gtk-doc-stub-native"
+DEPENDS_virtclass-native += "gtk-doc-stub-native"
+
+EXTRA_OECONF_append = "\
+ --disable-gtk-doc \
+ --disable-gtk-doc-html \
+ --disable-gtk-doc-pdf \
+"
--
1.7.10
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 03/26] glib-2.0: cleanup thanks to new gtk-doc.bbclass
2012-07-19 16:10 [PATCH 00/26] Use gtk-doc-stub Ross Burton
2012-07-19 16:10 ` [PATCH 01/26] Add gtk-doc-stub Ross Burton
2012-07-19 16:10 ` [PATCH 02/26] change gtk-doc.bbclass to pull in depends and oeconf Ross Burton
@ 2012-07-19 16:10 ` Ross Burton
2012-07-19 16:10 ` [PATCH 04/26] gconf: " Ross Burton
` (24 subsequent siblings)
27 siblings, 0 replies; 34+ messages in thread
From: Ross Burton @ 2012-07-19 16:10 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb | 5 +----
meta/recipes-core/glib-2.0/glib.inc | 6 +++---
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb
index 1f8ad7d..988494b 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb
@@ -1,6 +1,6 @@
require glib.inc
-PR = "r2"
+PR = "r3"
PE = "1"
DEPENDS += "libffi python-argparse-native zlib"
@@ -23,9 +23,6 @@ SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch"
BBCLASSEXTEND = "native nativesdk"
do_configure_prepend() {
- # missing ${topdir}/gtk-doc.make and --disable-gtk-doc* is not enough, because it calls gtkdocize (not provided by gtk-doc-native)
- sed -i '/^docs/d' ${S}/configure.ac
- sed -i 's/SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs/SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po/g' ${S}/Makefile.am
sed -i -e "s:TEST_PROGS += gdbus-serialization::g" ${S}/gio/tests/Makefile.am
sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in
}
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 2f48e27..3540cd5 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -13,15 +13,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
BUGTRACKER = "http://bugzilla.gnome.org"
SECTION = "libs"
-DEPENDS = "glib-2.0-native gtk-doc-native zip virtual/libiconv"
-DEPENDS_virtclass-native = "gtk-doc-native pkgconfig-native gettext-native"
+DEPENDS = "glib-2.0-native zip virtual/libiconv"
+DEPENDS_virtclass-native = "pkgconfig-native gettext-native"
DEPENDS_virtclass-nativesdk = "libtool-nativesdk"
PACKAGES =+ "${PN}-utils ${PN}-bash-completion ${PN}-codegen"
LEAD_SONAME = "libglib-2.0.*"
FILES_${PN}-utils = "${bindir}/* ${datadir}/glib-2.0/gettext"
-inherit autotools pkgconfig gettext
+inherit autotools gettext gtk-doc pkgconfig
S = "${WORKDIR}/glib-${PV}"
--
1.7.10
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 04/26] gconf: cleanup thanks to new gtk-doc.bbclass
2012-07-19 16:10 [PATCH 00/26] Use gtk-doc-stub Ross Burton
` (2 preceding siblings ...)
2012-07-19 16:10 ` [PATCH 03/26] glib-2.0: cleanup thanks to new gtk-doc.bbclass Ross Burton
@ 2012-07-19 16:10 ` Ross Burton
2012-07-19 16:10 ` [PATCH 05/26] gobject-introspection: " Ross Burton
` (23 subsequent siblings)
27 siblings, 0 replies; 34+ messages in thread
From: Ross Burton @ 2012-07-19 16:10 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-gnome/gnome/gconf_3.2.3.bb | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.3.bb b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
index 1da7203..d84f981 100644
--- a/meta/recipes-gnome/gnome/gconf_3.2.3.bb
+++ b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
@@ -9,9 +9,9 @@ POLKIT_libc-uclibc = ""
DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native ${POLKIT}"
DEPENDS_virtclass-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native"
-PR = "r9"
+PR = "r10"
-inherit gnomebase
+inherit gnomebase gtk-doc
SRC_URI = "${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.bz2;name=archive \
file://nointro.patch \
@@ -29,10 +29,6 @@ POLKIT_OECONF_libc-uclibc = "--disable-default-service"
EXTRA_OECONF = "--disable-gtk-doc --enable-shared --disable-static --enable-debug=yes \
--disable-introspection --disable-orbit --with-openldap=no ${POLKIT_OECONF} --disable-gtk"
-do_configure_prepend () {
- touch gtk-doc.make
-}
-
do_install_append() {
# this directory need to be created to avoid an Error 256 at gdm launch
install -d ${D}${sysconfdir}/gconf/gconf.xml.system
--
1.7.10
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 05/26] gobject-introspection: cleanup thanks to new gtk-doc.bbclass
2012-07-19 16:10 [PATCH 00/26] Use gtk-doc-stub Ross Burton
` (3 preceding siblings ...)
2012-07-19 16:10 ` [PATCH 04/26] gconf: " Ross Burton
@ 2012-07-19 16:10 ` Ross Burton
2012-07-19 16:10 ` [PATCH 06/26] cogl: " Ross Burton
` (22 subsequent siblings)
27 siblings, 0 replies; 34+ messages in thread
From: Ross Burton @ 2012-07-19 16:10 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb | 11 ++++-------
meta/recipes-gnome/gnome/gobject-introspection_git.bb | 11 +++--------
2 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb b/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb
index f51e83e..2be10be 100644
--- a/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb
+++ b/meta/recipes-gnome/gnome/gobject-introspection_1.32.1.bb
@@ -3,6 +3,8 @@ DEPENDS = "glib-2.0 libffi python-native gobject-introspection-native"
DEPENDS_virtclass-native = "glib-2.0-native libffi-native python-native bison-native flex-native"
BBCLASSEXTEND = "native"
+PR = "r1"
+
SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
SRC_URI = "\
${GNOME_MIRROR}/${BPN}/${SHRT_VER}/${BP}.tar.xz \
@@ -17,15 +19,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=90d577535a3898e1ae5dbf0ae3509a8c \
file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f \
file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7"
-inherit autotools
+inherit autotools gtk-doc
do_configure_prepend () {
echo "EXTRA_DIST = " > ${S}/gtk-doc.make
}
-EXTRA_OECONF = "\
- --disable-gtk-doc \
- --disable-gtk-doc-html \
- --disable-gtk-doc-pdf \
- --disable-tests \
-"
+EXTRA_OECONF = "--disable-tests"
diff --git a/meta/recipes-gnome/gnome/gobject-introspection_git.bb b/meta/recipes-gnome/gnome/gobject-introspection_git.bb
index 8352384..1e0dd61 100644
--- a/meta/recipes-gnome/gnome/gobject-introspection_git.bb
+++ b/meta/recipes-gnome/gnome/gobject-introspection_git.bb
@@ -13,21 +13,16 @@ LIC_FILES_CHKSUM = "file://COPYING.tools;md5=94d55d512a9ba36caa9b7df079bae19f \
SRCREV = "8d64bc23d2b837421ecf9c7b0e4b8d5d95ca0d21"
PV = "1.29.0+gitr${SRCPV}"
+PR = "r1"
+
DEFAULT_PREFERENCE = "-1"
S = "${WORKDIR}/git"
-inherit autotools
+inherit autotools gtk-doc
BBCLASSEXTEND = "native"
-do_configure_prepend () {
- echo "EXTRA_DIST = " > ${S}/gtk-doc.make
-}
-
EXTRA_OECONF = "\
- --disable-gtk-doc \
- --disable-gtk-doc-html \
- --disable-gtk-doc-pdf \
--disable-tests \
"
--
1.7.10
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 06/26] cogl: cleanup thanks to new gtk-doc.bbclass
2012-07-19 16:10 [PATCH 00/26] Use gtk-doc-stub Ross Burton
` (4 preceding siblings ...)
2012-07-19 16:10 ` [PATCH 05/26] gobject-introspection: " Ross Burton
@ 2012-07-19 16:10 ` Ross Burton
2012-07-19 16:10 ` [PATCH 07/26] gypsy: inherit gtk-doc Ross Burton
` (21 subsequent siblings)
27 siblings, 0 replies; 34+ messages in thread
From: Ross Burton @ 2012-07-19 16:10 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-graphics/clutter/cogl.inc | 4 ++--
meta/recipes-graphics/clutter/cogl_1.8.2.bb | 2 +-
meta/recipes-graphics/clutter/cogl_git.bb | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-graphics/clutter/cogl.inc b/meta/recipes-graphics/clutter/cogl.inc
index f2ad6d1..7d840be 100644
--- a/meta/recipes-graphics/clutter/cogl.inc
+++ b/meta/recipes-graphics/clutter/cogl.inc
@@ -2,8 +2,8 @@ DESCRIPTION = "a modern 3D graphics API with associated utility APIs"
HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl"
LICENSE = "LGPLv2.1+"
-STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes gdk-pixbuf libxi"
-BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}"
+STDDEPENDS = "virtual/libx11 pango glib-2.0 libxfixes gdk-pixbuf libxi"
+BASE_CONF = "${@get_clutter_fpu_setting(bb, d)}"
DEPENDS = "${STDDEPENDS} virtual/libgl libxcomposite"
EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx"
diff --git a/meta/recipes-graphics/clutter/cogl_1.8.2.bb b/meta/recipes-graphics/clutter/cogl_1.8.2.bb
index 25875f3..f733598 100644
--- a/meta/recipes-graphics/clutter/cogl_1.8.2.bb
+++ b/meta/recipes-graphics/clutter/cogl_1.8.2.bb
@@ -1,6 +1,6 @@
require cogl.inc
-PR = "r1"
+PR = "r2"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
diff --git a/meta/recipes-graphics/clutter/cogl_git.bb b/meta/recipes-graphics/clutter/cogl_git.bb
index 689b965..682f931 100644
--- a/meta/recipes-graphics/clutter/cogl_git.bb
+++ b/meta/recipes-graphics/clutter/cogl_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
# the 1.8.2 tag
SRCREV = "e398e374e2ff0e88bc1d63577a192f8ca04a1cb5"
PV = "1.8.2+git${SRCPV}"
-PR = "r1"
+PR = "r2"
DEFAULT_PREFERENCE = "-1"
--
1.7.10
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 07/26] gypsy: inherit gtk-doc
2012-07-19 16:10 [PATCH 00/26] Use gtk-doc-stub Ross Burton
` (5 preceding siblings ...)
2012-07-19 16:10 ` [PATCH 06/26] cogl: " Ross Burton
@ 2012-07-19 16:10 ` Ross Burton
2012-07-19 16:10 ` [PATCH 08/26] gconf: cleanup thanks to new gtk-doc.bbclass Ross Burton
` (20 subsequent siblings)
27 siblings, 0 replies; 34+ messages in thread
From: Ross Burton @ 2012-07-19 16:10 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-connectivity/gypsy/gypsy.inc | 6 +-----
meta/recipes-connectivity/gypsy/gypsy_0.8.bb | 2 +-
meta/recipes-connectivity/gypsy/gypsy_git.bb | 2 ++
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-connectivity/gypsy/gypsy.inc b/meta/recipes-connectivity/gypsy/gypsy.inc
index 11a7204..0c1735e 100644
--- a/meta/recipes-connectivity/gypsy/gypsy.inc
+++ b/meta/recipes-connectivity/gypsy/gypsy.inc
@@ -8,12 +8,8 @@ LICENSE = "GPLv2.0 & LGPLv2.1"
SECTION = "x11"
DEPENDS = "glib-2.0 dbus bluez4 dbus-glib"
-inherit autotools pkgconfig
+inherit autotools pkgconfig gtk-doc
EXTRA_OECONF += "--with-distro=debian"
-do_configure_prepend () {
- touch ${S}/gtk-doc.make
-}
-
FILES_${PN} += "/usr/share/dbus-1/services/"
diff --git a/meta/recipes-connectivity/gypsy/gypsy_0.8.bb b/meta/recipes-connectivity/gypsy/gypsy_0.8.bb
index 59a34fa..e701838 100644
--- a/meta/recipes-connectivity/gypsy/gypsy_0.8.bb
+++ b/meta/recipes-connectivity/gypsy/gypsy_0.8.bb
@@ -16,7 +16,7 @@ DEPENDS = "glib-2.0 dbus bluez4 dbus-glib libxslt"
SRC_URI = "http://gypsy.freedesktop.org/releases/gypsy-${PV}.tar.gz \
file://fix-unused-but-set-variable-warning.patch \
"
-PR = "r2"
+PR = "r3"
inherit autotools pkgconfig
diff --git a/meta/recipes-connectivity/gypsy/gypsy_git.bb b/meta/recipes-connectivity/gypsy/gypsy_git.bb
index b123e11..495467e 100644
--- a/meta/recipes-connectivity/gypsy/gypsy_git.bb
+++ b/meta/recipes-connectivity/gypsy/gypsy_git.bb
@@ -4,6 +4,8 @@ DEFAULT_PREFERENCE = "-1"
SRCREV = "3652e1f37e82b8e63983e30fda3482cd099a8cf5"
PV = "0.8+git${SRCPV}"
+PR = "r1"
+
S = "${WORKDIR}/git"
LICENSE = "GPLv2+ & LGPLv2+"
--
1.7.10
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 08/26] gconf: cleanup thanks to new gtk-doc.bbclass
2012-07-19 16:10 [PATCH 00/26] Use gtk-doc-stub Ross Burton
` (6 preceding siblings ...)
2012-07-19 16:10 ` [PATCH 07/26] gypsy: inherit gtk-doc Ross Burton
@ 2012-07-19 16:10 ` Ross Burton
2012-07-19 16:10 ` [PATCH 09/26] connman: " Ross Burton
` (19 subsequent siblings)
27 siblings, 0 replies; 34+ messages in thread
From: Ross Burton @ 2012-07-19 16:10 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-gnome/gnome/gconf_3.2.3.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.3.bb b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
index d84f981..60c2be2 100644
--- a/meta/recipes-gnome/gnome/gconf_3.2.3.bb
+++ b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
@@ -9,7 +9,7 @@ POLKIT_libc-uclibc = ""
DEPENDS = "glib-2.0 dbus dbus-glib libxml2 intltool-native ${POLKIT}"
DEPENDS_virtclass-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native"
-PR = "r10"
+PR = "r11"
inherit gnomebase gtk-doc
@@ -26,7 +26,7 @@ POLKIT_OECONF = "--enable-defaults-service"
POLKIT_OECONF_virtclass-native = "--disable-defaults-service"
POLKIT_OECONF_libc-uclibc = "--disable-default-service"
-EXTRA_OECONF = "--disable-gtk-doc --enable-shared --disable-static --enable-debug=yes \
+EXTRA_OECONF = "--enable-shared --disable-static --enable-debug=yes \
--disable-introspection --disable-orbit --with-openldap=no ${POLKIT_OECONF} --disable-gtk"
do_install_append() {
--
1.7.10
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 09/26] connman: cleanup thanks to new gtk-doc.bbclass
2012-07-19 16:10 [PATCH 00/26] Use gtk-doc-stub Ross Burton
` (7 preceding siblings ...)
2012-07-19 16:10 ` [PATCH 08/26] gconf: cleanup thanks to new gtk-doc.bbclass Ross Burton
@ 2012-07-19 16:10 ` Ross Burton
2012-07-19 16:10 ` [PATCH 10/26] polkit: " Ross Burton
` (18 subsequent siblings)
27 siblings, 0 replies; 34+ messages in thread
From: Ross Burton @ 2012-07-19 16:10 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-connectivity/connman/connman.inc | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 9966f87..11ac0e4 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -20,7 +20,7 @@ DEPENDS = "dbus glib-2.0 ppp iptables gnutls \
${@base_contains('DISTRO_FEATURES', '3g','ofono', '', d)} \
"
-INC_PR = "r12"
+INC_PR = "r13"
TIST = "--enable-tist"
TIST_powerpc = ""
@@ -28,7 +28,6 @@ TIST_powerpc = ""
EXTRA_OECONF += "\
ac_cv_path_WPASUPPLICANT=${sbindir}/wpa_supplicant \
ac_cv_path_PPPD=${sbindir}/pppd \
- --disable-gtk-doc \
--enable-debug \
--enable-threads \
--enable-loopback \
@@ -53,7 +52,7 @@ USERADD_PARAM_${PN} = "--create-home \
--groups video,tty,audio \
--user-group xuser"
-inherit autotools pkgconfig update-rc.d useradd
+inherit autotools gtk-doc pkgconfig update-rc.d useradd
# This allows *everyone* to access ConnMan over DBus, without any access
# control. Really the at_console flag should work, which would mean that
--
1.7.10
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 10/26] polkit: cleanup thanks to new gtk-doc.bbclass
2012-07-19 16:10 [PATCH 00/26] Use gtk-doc-stub Ross Burton
` (8 preceding siblings ...)
2012-07-19 16:10 ` [PATCH 09/26] connman: " Ross Burton
@ 2012-07-19 16:10 ` Ross Burton
2012-07-19 16:10 ` [PATCH 11/26] polkit-gnome: " Ross Burton
` (17 subsequent siblings)
27 siblings, 0 replies; 34+ messages in thread
From: Ross Burton @ 2012-07-19 16:10 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-extended/polkit/polkit_0.104.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-extended/polkit/polkit_0.104.bb b/meta/recipes-extended/polkit/polkit_0.104.bb
index 6a8fdd6..8435c26 100644
--- a/meta/recipes-extended/polkit/polkit_0.104.bb
+++ b/meta/recipes-extended/polkit/polkit_0.104.bb
@@ -11,7 +11,7 @@ DEPENDS = "expat dbus-glib eggdbus intltool-native"
PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=shadow,libpam,libpam"
-PR = "r5"
+PR = "r6"
PAM_SRC_URI = "file://polkit-1_pam.patch"
SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz \
@@ -24,9 +24,9 @@ SRC_URI = "http://hal.freedesktop.org/releases/polkit-${PV}.tar.gz \
SRC_URI[md5sum] = "e380b4c6fb1e7bccf854e92edc0a8ce1"
SRC_URI[sha256sum] = "6b0a13d8381e4a7b7e37c18a54595191b50757e0fcd186cd9918e9ad0f18c7f9"
-EXTRA_OECONF = "--with-os-type=moblin --disable-man-pages --disable-gtk-doc --disable-introspection"
+EXTRA_OECONF = "--with-os-type=moblin --disable-man-pages --disable-introspection"
-inherit autotools pkgconfig
+inherit autotools gtk-doc pkgconfig
do_install_append() {
rm -f ${D}${libdir}/${PN}-1/extensions/*.a
--
1.7.10
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 11/26] polkit-gnome: cleanup thanks to new gtk-doc.bbclass
2012-07-19 16:10 [PATCH 00/26] Use gtk-doc-stub Ross Burton
` (9 preceding siblings ...)
2012-07-19 16:10 ` [PATCH 10/26] polkit: " Ross Burton
@ 2012-07-19 16:10 ` Ross Burton
2012-07-19 16:10 ` [PATCH 12/26] gail: " Ross Burton
` (16 subsequent siblings)
27 siblings, 0 replies; 34+ messages in thread
From: Ross Burton @ 2012-07-19 16:10 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-extended/polkit/polkit-gnome_0.102.bb | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-extended/polkit/polkit-gnome_0.102.bb b/meta/recipes-extended/polkit/polkit-gnome_0.102.bb
index bba917c..7e9fc2b 100644
--- a/meta/recipes-extended/polkit/polkit-gnome_0.102.bb
+++ b/meta/recipes-extended/polkit/polkit-gnome_0.102.bb
@@ -10,15 +10,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=74579fab173e4c5e12aac0cd83ee98ec \
SRC_URI = "http://hal.freedesktop.org/releases/polkit-gnome-${PV}.tar.bz2 \
"
-PR = "r1"
+PR = "r2"
EXTRA_OECONF = " --disable-scrollkeeper \
--disable-man-pages \
--disable-examples \
- --disable-gtk-doc \
--disable-introspection "
-inherit autotools pkgconfig
+inherit autotools gtk-doc pkgconfig
FILES_${PN} += " ${datadir}/dbus-1 \
${datadir}/PolicyKit \
--
1.7.10
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 12/26] gail: cleanup thanks to new gtk-doc.bbclass
2012-07-19 16:10 [PATCH 00/26] Use gtk-doc-stub Ross Burton
` (10 preceding siblings ...)
2012-07-19 16:10 ` [PATCH 11/26] polkit-gnome: " Ross Burton
@ 2012-07-19 16:10 ` Ross Burton
2012-07-19 16:11 ` [PATCH 13/26] gnome-keyring: " Ross Burton
` (15 subsequent siblings)
27 siblings, 0 replies; 34+ messages in thread
From: Ross Burton @ 2012-07-19 16:10 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-gnome/gnome/gail_1.20.2.bb | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-gnome/gnome/gail_1.20.2.bb b/meta/recipes-gnome/gnome/gail_1.20.2.bb
index 32ef6c5..df6cd03 100644
--- a/meta/recipes-gnome/gnome/gail_1.20.2.bb
+++ b/meta/recipes-gnome/gnome/gail_1.20.2.bb
@@ -7,15 +7,13 @@ PROVIDES = "virtual/gail"
LICENSE = "LGPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
-PR = "r1"
+PR = "r2"
-inherit gnome
+inherit gnome gtk-doc
SRC_URI[archive.md5sum] = "e805806f897cf6040e1f3e9c0cd2151b"
SRC_URI[archive.sha256sum] = "5025b13a4f3b960c8ab7c3e5c7d6d86082e2e1af6ee18e61e37fd4ce3dcc0153"
-EXTRA_OECONF = "--disable-gtk-doc"
-
FILES_${PN} += "${libdir}/gtk-2.0/modules/*.so"
FILES_${PN}-dbg += "${libdir}/gtk-2.0/modules/.debug"
--
1.7.10
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 13/26] gnome-keyring: cleanup thanks to new gtk-doc.bbclass
2012-07-19 16:10 [PATCH 00/26] Use gtk-doc-stub Ross Burton
` (11 preceding siblings ...)
2012-07-19 16:10 ` [PATCH 12/26] gail: " Ross Burton
@ 2012-07-19 16:11 ` Ross Burton
2012-07-19 16:11 ` [PATCH 14/26] libart_lgpl: " Ross Burton
` (14 subsequent siblings)
27 siblings, 0 replies; 34+ messages in thread
From: Ross Burton @ 2012-07-19 16:11 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb b/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb
index ad60094..1fd42b4 100644
--- a/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb
+++ b/meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb
@@ -11,14 +11,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
SECTION = "x11/gnome"
-PR = "r7"
+PR = "r8"
-inherit autotools gnome pkgconfig
+inherit autotools gnome gtk-doc pkgconfig
DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
RDEPENDS_${PN} = "libgnome-keyring glib-2.0-utils"
-EXTRA_OECONF = "--disable-gtk-doc ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam --with-pam-dir=${base_libdir}/security', '--disable-pam', d)}"
+EXTRA_OECONF = "${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam --with-pam-dir=${base_libdir}/security', '--disable-pam', d)}"
SRC_URI += "file://org.gnome.keyring.service"
--
1.7.10
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 14/26] libart_lgpl: cleanup thanks to new gtk-doc.bbclass
2012-07-19 16:10 [PATCH 00/26] Use gtk-doc-stub Ross Burton
` (12 preceding siblings ...)
2012-07-19 16:11 ` [PATCH 13/26] gnome-keyring: " Ross Burton
@ 2012-07-19 16:11 ` Ross Burton
2012-07-19 16:11 ` [PATCH 15/26] libgnome-keyring: " Ross Burton
` (13 subsequent siblings)
27 siblings, 0 replies; 34+ messages in thread
From: Ross Burton @ 2012-07-19 16:11 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb b/meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb
index d82ea19..d0bfe28 100644
--- a/meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb
+++ b/meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Library of functions for 2D graphics"
SECTION = "x11/gnome"
LICENSE = "LGPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
-PR = "r1"
+PR = "r2"
ART_CONFIG = "${HOST_ARCH}/art_config.h"
@@ -14,7 +14,7 @@ SRC_URI = "${GNOME_MIRROR}/libart_lgpl/2.3/libart_lgpl-${PV}.tar.bz2 \
SRC_URI[md5sum] = "08559ff3c67fd95d57b0c5e91a6b4302"
SRC_URI[sha256sum] = "fdc11e74c10fc9ffe4188537e2b370c0abacca7d89021d4d303afdf7fd7476fa"
-inherit autotools pkgconfig
+inherit autotools gtk-doc pkgconfig
DEPENDS = ""
@@ -26,6 +26,3 @@ S = "${WORKDIR}/libart_lgpl-${PV}"
do_configure_prepend() {
cp ${WORKDIR}/${ART_CONFIG} ${S}/art_config.h
}
-
-EXTRA_OECONF = "--disable-gtk-doc"
-
--
1.7.10
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 15/26] libgnome-keyring: cleanup thanks to new gtk-doc.bbclass
2012-07-19 16:10 [PATCH 00/26] Use gtk-doc-stub Ross Burton
` (13 preceding siblings ...)
2012-07-19 16:11 ` [PATCH 14/26] libart_lgpl: " Ross Burton
@ 2012-07-19 16:11 ` Ross Burton
2012-07-19 16:11 ` [PATCH 16/26] gtk+: " Ross Burton
` (12 subsequent siblings)
27 siblings, 0 replies; 34+ messages in thread
From: Ross Burton @ 2012-07-19 16:11 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-gnome/gnome/libgnome-keyring_2.32.0.bb | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-gnome/gnome/libgnome-keyring_2.32.0.bb b/meta/recipes-gnome/gnome/libgnome-keyring_2.32.0.bb
index 53e583e..e5cb628 100644
--- a/meta/recipes-gnome/gnome/libgnome-keyring_2.32.0.bb
+++ b/meta/recipes-gnome/gnome/libgnome-keyring_2.32.0.bb
@@ -9,13 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0914b9d3ebaba41ef2e3e0ae16f296cf \
file://egg/egg-dh.h;endline=22;md5=1626c16af2a8da1f88324cf3ced33f08"
SECTION = "x11/gnome/libs"
-PR = "r1"
+PR = "r2"
-inherit gnome
+inherit gnome gtk-doc
DEPENDS = "dbus eggdbus libgcrypt"
-EXTRA_OECONF = "--disable-gtk-doc"
-
SRC_URI[archive.md5sum] = "c42b2ca66204835d901d3dbfc1fa5ae6"
SRC_URI[archive.sha256sum] = "56388c0d81ddfdb57d30e4963c83ecc1c18498aab99395420e0fff69929a0f0c"
--
1.7.10
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 16/26] gtk+: cleanup thanks to new gtk-doc.bbclass
2012-07-19 16:10 [PATCH 00/26] Use gtk-doc-stub Ross Burton
` (14 preceding siblings ...)
2012-07-19 16:11 ` [PATCH 15/26] libgnome-keyring: " Ross Burton
@ 2012-07-19 16:11 ` Ross Burton
2012-07-19 16:11 ` [PATCH 17/26] libglade: " Ross Burton
` (11 subsequent siblings)
27 siblings, 0 replies; 34+ messages in thread
From: Ross Burton @ 2012-07-19 16:11 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-gnome/gtk+/gtk+.inc | 4 ++--
meta/recipes-gnome/gtk+/gtk+_2.12.7.bb | 2 +-
meta/recipes-gnome/gtk+/gtk+_2.16.6.bb | 2 +-
meta/recipes-gnome/gtk+/gtk+_2.24.8.bb | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc
index 4e03670..c6d235f 100644
--- a/meta/recipes-gnome/gtk+/gtk+.inc
+++ b/meta/recipes-gnome/gtk+/gtk+.inc
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
SECTION = "libs"
X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage libxrender libxcomposite"
-DEPENDS = "glib-2.0 pango atk jpeg libpng gtk-doc-native gdk-pixbuf-native docbook-utils-native \
+DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native docbook-utils-native \
libgcrypt cairo gdk-pixbuf"
PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
@@ -23,7 +23,7 @@ PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}"
PACKAGECONFIG[gtk-directfb] = "--with-gdktarget=directfb,,directfb"
-inherit autotools pkgconfig
+inherit autotools gtk-doc pkgconfig
PACKAGES += "libgail gtk-demo"
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb b/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
index 1d4121c..ac4e0cd 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
@@ -1,6 +1,6 @@
require gtk+.inc
-PR = "r14"
+PR = "r15"
SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \
file://xsettings.patch \
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb b/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
index 16aa693..0b989da 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
@@ -1,6 +1,6 @@
require gtk+.inc
-PR = "r10"
+PR = "r11"
SRC_URI = "http://download.gnome.org/sources/gtk+/2.16/gtk+-${PV}.tar.bz2 \
file://xsettings.patch \
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
index 3b85759..529f8e1 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
@@ -27,7 +27,7 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.24/gtk+-${PV}.tar.bz2 \
# file://combo-arrow-size.patch;striplevel=0
# file://configurefix.patch
-PR = "r4"
+PR = "r5"
SRC_URI[md5sum] = "0413187f7e596aef00ccd1b54776ff03"
SRC_URI[sha256sum] = "ac2325a65312922a6722a7c02a389f3f4072d79e13131485cc7b7226e2537043"
--
1.7.10
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 17/26] libglade: cleanup thanks to new gtk-doc.bbclass
2012-07-19 16:10 [PATCH 00/26] Use gtk-doc-stub Ross Burton
` (15 preceding siblings ...)
2012-07-19 16:11 ` [PATCH 16/26] gtk+: " Ross Burton
@ 2012-07-19 16:11 ` Ross Burton
2012-07-19 16:11 ` [PATCH 18/26] librsvg: " Ross Burton
` (10 subsequent siblings)
27 siblings, 0 replies; 34+ messages in thread
From: Ross Burton @ 2012-07-19 16:11 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-gnome/libglade/libglade_2.6.4.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-gnome/libglade/libglade_2.6.4.bb b/meta/recipes-gnome/libglade/libglade_2.6.4.bb
index 747b4ed..0b01dc1 100644
--- a/meta/recipes-gnome/libglade/libglade_2.6.4.bb
+++ b/meta/recipes-gnome/libglade/libglade_2.6.4.bb
@@ -8,10 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \
file://glade/glade-gtk.c;endline=22;md5=766f993433e2642fec87936d319990ff"
SECTION = "libs"
-PR = "r3"
-DEPENDS = "zlib gdk-pixbuf gtk+ gtk-doc-native"
+PR = "r4"
+DEPENDS = "zlib gdk-pixbuf gtk+"
-inherit autotools pkgconfig gnome
+inherit autotools pkgconfig gnome gtk-doc
SRC_URI += "file://glade-cruft.patch file://no-xml2.patch file://python_environment.patch"
--
1.7.10
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 18/26] librsvg: cleanup thanks to new gtk-doc.bbclass
2012-07-19 16:10 [PATCH 00/26] Use gtk-doc-stub Ross Burton
` (16 preceding siblings ...)
2012-07-19 16:11 ` [PATCH 17/26] libglade: " Ross Burton
@ 2012-07-19 16:11 ` Ross Burton
2012-07-19 16:11 ` [PATCH 19/26] clutter: " Ross Burton
` (9 subsequent siblings)
27 siblings, 0 replies; 34+ messages in thread
From: Ross Burton @ 2012-07-19 16:11 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
index a3e8f0f..6eba686 100644
--- a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
+++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb
@@ -11,9 +11,9 @@ DEPENDS = "gtk+ libcroco cairo libxml2 popt"
DEPENDS_virtclass-native = "cairo-native pango-native gdk-pixbuf-native"
BBCLASSEXTEND = "native"
-PR = "r6"
+PR = "r7"
-inherit autotools pkgconfig gnome
+inherit autotools pkgconfig gnome gtk-doc
EXTRA_OECONF = "--disable-mozilla-plugin --without-svgz --without-croco --disable-gnome-vfs"
@@ -24,7 +24,6 @@ SRC_URI[archive.sha256sum] = "91b98051f352fab8a6257688d6b2fd665b4648ed66144861f2
do_configure_prepend () {
export GDK_PIXBUF_QUERYLOADERS="${libdir}/gtk-2.0/version/loaders"
- echo "CLEANFILES=" > gtk-doc.make
}
PACKAGES =+ "librsvg-gtk librsvg-gtk-dbg librsvg-gtk-dev rsvg"
--
1.7.10
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 19/26] clutter: cleanup thanks to new gtk-doc.bbclass
2012-07-19 16:10 [PATCH 00/26] Use gtk-doc-stub Ross Burton
` (17 preceding siblings ...)
2012-07-19 16:11 ` [PATCH 18/26] librsvg: " Ross Burton
@ 2012-07-19 16:11 ` Ross Burton
2012-07-19 16:11 ` [PATCH 20/26] pango: " Ross Burton
` (8 subsequent siblings)
27 siblings, 0 replies; 34+ messages in thread
From: Ross Burton @ 2012-07-19 16:11 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb | 2 ++
meta/recipes-graphics/clutter/clutter-1.8_git.bb | 2 +-
meta/recipes-graphics/clutter/clutter.inc | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb b/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb
index 378b6fe..a370568 100644
--- a/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb
+++ b/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb
@@ -1,6 +1,8 @@
require recipes-graphics/clutter/clutter.inc
require recipes-graphics/clutter/clutter-package.inc
+PR = "r1"
+
# We're API/ABI compatible and this may make things easier for layers
PROVIDES += "clutter-1.6"
diff --git a/meta/recipes-graphics/clutter/clutter-1.8_git.bb b/meta/recipes-graphics/clutter/clutter-1.8_git.bb
index 9f7b048..7d8bcb3 100644
--- a/meta/recipes-graphics/clutter/clutter-1.8_git.bb
+++ b/meta/recipes-graphics/clutter/clutter-1.8_git.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
# the 1.8.4 tag
SRCREV = "f2183fa8df3d173afbee09cc4230ab8f4e03f459"
PV = "1.8.4+git${SRCPV}"
-PR = "r0"
+PR = "r1"
DEFAULT_PREFERENCE = "-1"
diff --git a/meta/recipes-graphics/clutter/clutter.inc b/meta/recipes-graphics/clutter/clutter.inc
index 9d7760f..ce54ac2 100644
--- a/meta/recipes-graphics/clutter/clutter.inc
+++ b/meta/recipes-graphics/clutter/clutter.inc
@@ -3,8 +3,8 @@ HOMEPAGE = "http://www.clutter-project.org/"
LICENSE = "LGPLv2.1+"
# Internal json-glib was removed in Clutter 1.5.2, cogl was removed in 1.8, atk required since 1.8
-STDDEPENDS = "virtual/libx11 gtk-doc-native pango glib-2.0 libxfixes libxi json-glib cogl atk"
-BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}"
+STDDEPENDS = "virtual/libx11 pango glib-2.0 libxfixes libxi json-glib cogl atk"
+BASE_CONF = "${@get_clutter_fpu_setting(bb, d)}"
DEPENDS = "${STDDEPENDS} virtual/libgl"
EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx"
--
1.7.10
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 20/26] pango: cleanup thanks to new gtk-doc.bbclass
2012-07-19 16:10 [PATCH 00/26] Use gtk-doc-stub Ross Burton
` (18 preceding siblings ...)
2012-07-19 16:11 ` [PATCH 19/26] clutter: " Ross Burton
@ 2012-07-19 16:11 ` Ross Burton
2012-07-19 16:11 ` [PATCH 21/26] kmod: inherit gtk-doc, gnome-doc-utils-native isn't the package you were looking for Ross Burton
` (7 subsequent siblings)
27 siblings, 0 replies; 34+ messages in thread
From: Ross Burton @ 2012-07-19 16:11 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-graphics/pango/pango.inc | 4 ++--
meta/recipes-graphics/pango/pango_1.28.4.bb | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
index 4fcc94f..c9e92f0 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -10,7 +10,7 @@ SECTION = "libs"
LICENSE = "LGPLv2.0+"
X11DEPENDS = "virtual/libx11 libxft"
-DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc-native cairo elfutils"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv cairo elfutils"
PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
PACKAGECONFIG[x11] = "--with-x,--without-x,${X11DEPENDS}"
@@ -22,7 +22,7 @@ PACKAGES_DYNAMIC = "pango-module-*"
RRECOMMENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'x11', 'pango-module-basic-x', '', d)} pango-module-basic-fc"
-inherit gnomebase
+inherit gnomebase gtk-doc
# Create a pango-modules package
ALLOW_EMPTY_${BPN}-modules = "1"
PACKAGES += "${BPN}-modules"
diff --git a/meta/recipes-graphics/pango/pango_1.28.4.bb b/meta/recipes-graphics/pango/pango_1.28.4.bb
index 7055158..4869592 100644
--- a/meta/recipes-graphics/pango/pango_1.28.4.bb
+++ b/meta/recipes-graphics/pango/pango_1.28.4.bb
@@ -2,7 +2,7 @@ require pango.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
-PR = "r8"
+PR = "r9"
SRC_URI += "file://no-tests.patch \
file://noconst.patch \
--
1.7.10
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 21/26] kmod: inherit gtk-doc, gnome-doc-utils-native isn't the package you were looking for
2012-07-19 16:10 [PATCH 00/26] Use gtk-doc-stub Ross Burton
` (19 preceding siblings ...)
2012-07-19 16:11 ` [PATCH 20/26] pango: " Ross Burton
@ 2012-07-19 16:11 ` Ross Burton
2012-07-19 16:11 ` [PATCH 22/26] evolution-data-server: cleanup thanks to new gtk-doc.bbclass Ross Burton
` (6 subsequent siblings)
27 siblings, 0 replies; 34+ messages in thread
From: Ross Burton @ 2012-07-19 16:11 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-kernel/kmod/kmod.inc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc
index 5f655fd..4723ee3 100644
--- a/meta/recipes-kernel/kmod/kmod.inc
+++ b/meta/recipes-kernel/kmod/kmod.inc
@@ -8,12 +8,12 @@ LICENSE = "GPL-2.0+ & LGPL-2.1+"
LICENSE_libkmod = "LGPL-2.1+"
SECTION = "base"
PV = "8"
-INC_PR = "r0"
-DEPENDS += "gnome-doc-utils-native"
+INC_PR = "r1"
+
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://libkmod/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
"
-inherit autotools
+inherit autotools gtk-doc
SRC_URI = "git://git.profusion.mobi/kmod.git;protocol=git;branch=master \
file://depmod-search.conf \
--
1.7.10
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 22/26] evolution-data-server: cleanup thanks to new gtk-doc.bbclass
2012-07-19 16:10 [PATCH 00/26] Use gtk-doc-stub Ross Burton
` (20 preceding siblings ...)
2012-07-19 16:11 ` [PATCH 21/26] kmod: inherit gtk-doc, gnome-doc-utils-native isn't the package you were looking for Ross Burton
@ 2012-07-19 16:11 ` Ross Burton
2012-07-19 16:11 ` [PATCH 23/26] webkit-gtk: " Ross Burton
` (5 subsequent siblings)
27 siblings, 0 replies; 34+ messages in thread
From: Ross Burton @ 2012-07-19 16:11 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-sato/eds/evolution-data-server_git.bb | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-sato/eds/evolution-data-server_git.bb b/meta/recipes-sato/eds/evolution-data-server_git.bb
index 2ad81e4..c114c0e 100644
--- a/meta/recipes-sato/eds/evolution-data-server_git.bb
+++ b/meta/recipes-sato/eds/evolution-data-server_git.bb
@@ -13,7 +13,7 @@ DEPENDS = "intltool-native glib-2.0 gtk+ gconf dbus db gnome-common virtual/libi
SRCREV = "3ca578d968d09785933ebbb45b66b3bccdbd5832"
PV = "2.30+git${SRCPV}"
-PR = "r1"
+PR = "r2"
SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \
file://oh-contact.patch;striplevel=0 \
@@ -28,7 +28,7 @@ SRC_URI = "git://git.gnome.org/evolution-data-server;protocol=git \
S = "${WORKDIR}/git"
-inherit autotools pkgconfig
+inherit autotools gtk-doc pkgconfig
# -ldb needs this on some platforms
LDFLAGS += "-lpthread"
@@ -38,10 +38,6 @@ LDFLAGS += "-lpthread"
# directories by make resulting in truncated/corrupt .la files
#PARALLEL_MAKE = ""
-do_configure_prepend () {
- echo "EXTRA_DIST = " > ${S}/gtk-doc.make
-}
-
do_configure_append () {
cp ${WORKDIR}/iconv-detect.h ${S}
sed -i 's/-DG_DISABLE_DEPRECATED//g' ${S}/libedataserver/Makefile
@@ -49,7 +45,7 @@ do_configure_append () {
EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy \
--with-soup --with-libdb=${STAGING_DIR_HOST}${prefix} \
- --disable-smime --disable-ssl --disable-nntp --disable-gtk-doc --without-weather"
+ --disable-smime --disable-ssl --disable-nntp --without-weather"
PACKAGES =+ "libcamel libcamel-dev libebook libebook-dev libecal libecal-dev \
libedata-book libedata-book-dev libedata-cal libedata-cal-dev \
--
1.7.10
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 23/26] webkit-gtk: cleanup thanks to new gtk-doc.bbclass
2012-07-19 16:10 [PATCH 00/26] Use gtk-doc-stub Ross Burton
` (21 preceding siblings ...)
2012-07-19 16:11 ` [PATCH 22/26] evolution-data-server: cleanup thanks to new gtk-doc.bbclass Ross Burton
@ 2012-07-19 16:11 ` Ross Burton
2012-07-19 16:11 ` [PATCH 24/26] atk: " Ross Burton
` (4 subsequent siblings)
27 siblings, 0 replies; 34+ messages in thread
From: Ross Burton @ 2012-07-19 16:11 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb b/meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb
index 180861e..58f467c 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb
@@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md
file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \
file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f"
+PR = "r1"
+
# Choice of language backends - icu has issues on Big Endian machines so use pango
ICU_LIB = "icu"
ICU_LIB_powerpc = "pango"
@@ -25,7 +27,7 @@ SRC_URI = "\
SRC_URI[md5sum] = "f2f01b1fdc7262a2eede81ebed0970b2"
SRC_URI[sha256sum] = "9a126a76b40ca61adb1f1626e1567f976740af2332948cc5189489dbd01e3b28"
-inherit autotools lib_package pkgconfig
+inherit autotools lib_package gtk-doc pkgconfig
S = "${WORKDIR}/webkit-${PV}/"
@@ -38,7 +40,6 @@ EXTRA_OECONF = "\
--enable-link-prefetch \
--with-gtk=2.0 \
--disable-geolocation \
- --disable-gtk-doc \
${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-webgl', '--disable-webgl', d)} \
UNICODE_CFLAGS=-D_REENTRANT \
"
--
1.7.10
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 24/26] atk: cleanup thanks to new gtk-doc.bbclass
2012-07-19 16:10 [PATCH 00/26] Use gtk-doc-stub Ross Burton
` (22 preceding siblings ...)
2012-07-19 16:11 ` [PATCH 23/26] webkit-gtk: " Ross Burton
@ 2012-07-19 16:11 ` Ross Burton
2012-07-19 16:11 ` [PATCH 25/26] vte: " Ross Burton
` (3 subsequent siblings)
27 siblings, 0 replies; 34+ messages in thread
From: Ross Burton @ 2012-07-19 16:11 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-support/atk/atk_2.2.0.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-support/atk/atk_2.2.0.bb b/meta/recipes-support/atk/atk_2.2.0.bb
index 74e7288..d8706ff 100644
--- a/meta/recipes-support/atk/atk_2.2.0.bb
+++ b/meta/recipes-support/atk/atk_2.2.0.bb
@@ -7,11 +7,11 @@ LICENSE = "GPLv2+ & LGPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
file://atk/atkutil.c;endline=20;md5=db21b0bdbef9da4dc6eb122debc9f9bc \
file://atk/atk.h;endline=20;md5=c58238d688c24387376d6c69d06248a7"
-PR = "r2"
+PR = "r3"
-DEPENDS = "glib-2.0 gtk-doc-native"
+DEPENDS = "glib-2.0"
-inherit autotools pkgconfig
+inherit autotools gtk-doc pkgconfig
SRC_URI = "http://download.gnome.org/sources/atk/2.2/${BPN}-${PV}.tar.bz2"
SRC_URI[md5sum] = "4894e9b04f0a9f1c37a624a1e8d6d73f"
--
1.7.10
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 25/26] vte: cleanup thanks to new gtk-doc.bbclass
2012-07-19 16:10 [PATCH 00/26] Use gtk-doc-stub Ross Burton
` (23 preceding siblings ...)
2012-07-19 16:11 ` [PATCH 24/26] atk: " Ross Burton
@ 2012-07-19 16:11 ` Ross Burton
2012-07-19 16:11 ` [PATCH 26/26] Remove gtk-doc Ross Burton
` (2 subsequent siblings)
27 siblings, 0 replies; 34+ messages in thread
From: Ross Burton @ 2012-07-19 16:11 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-support/vte/vte.inc | 4 ++--
meta/recipes-support/vte/vte_0.28.2.bb | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-support/vte/vte.inc b/meta/recipes-support/vte/vte.inc
index 7971673..9fe7956 100644
--- a/meta/recipes-support/vte/vte.inc
+++ b/meta/recipes-support/vte/vte.inc
@@ -4,11 +4,11 @@ LICENSE = "LGPLv2.1+"
DEPENDS = " glib-2.0 gtk+ intltool-native ncurses"
RDEPENDS_libvte = "vte-termcap"
-inherit gnome
+inherit gnome gtk-doc
SRC_URI += "file://introspection.patch"
-EXTRA_OECONF = "--disable-gtk-doc --disable-python --disable-introspection"
+EXTRA_OECONF = "--disable-python --disable-introspection"
PACKAGES =+ "libvte vte-termcap"
FILES_libvte = "${libdir}/*.so.* ${libexecdir}/gnome-pty-helper"
diff --git a/meta/recipes-support/vte/vte_0.28.2.bb b/meta/recipes-support/vte/vte_0.28.2.bb
index 6111ccf..2cb1871 100644
--- a/meta/recipes-support/vte/vte_0.28.2.bb
+++ b/meta/recipes-support/vte/vte_0.28.2.bb
@@ -2,7 +2,7 @@ require vte.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
-PR = "r3"
+PR = "r4"
SRC_URI[archive.md5sum] = "f07a4bf943194f94b7f142db8f7f36dc"
SRC_URI[archive.sha256sum] = "8d04e202b617373dfb47689e5e628febe2c58840b34cccc4af4feb88c48df903"
--
1.7.10
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH 26/26] Remove gtk-doc
2012-07-19 16:10 [PATCH 00/26] Use gtk-doc-stub Ross Burton
` (24 preceding siblings ...)
2012-07-19 16:11 ` [PATCH 25/26] vte: " Ross Burton
@ 2012-07-19 16:11 ` Ross Burton
2012-07-20 4:42 ` [PATCH 00/26] Use gtk-doc-stub Saul Wold
2012-07-23 18:12 ` Saul Wold
27 siblings, 0 replies; 34+ messages in thread
From: Ross Burton @ 2012-07-19 16:11 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-gnome/gtk-doc/gtk-doc.bb | 19 ----------
meta/recipes-gnome/gtk-doc/gtk-doc.m4 | 61 ---------------------------------
2 files changed, 80 deletions(-)
delete mode 100644 meta/recipes-gnome/gtk-doc/gtk-doc.bb
delete mode 100644 meta/recipes-gnome/gtk-doc/gtk-doc.m4
diff --git a/meta/recipes-gnome/gtk-doc/gtk-doc.bb b/meta/recipes-gnome/gtk-doc/gtk-doc.bb
deleted file mode 100644
index 3147d4a..0000000
--- a/meta/recipes-gnome/gtk-doc/gtk-doc.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "API documentation generation tool for GTK+ and GNOME"
-DESCRIPTION = "gtk-doc is a tool for generating API reference documentation. \
-It is used for generating the documentation for GTK+, GLib \
-and GNOME."
-SECTION = "x11/base"
-SRC_URI = "file://gtk-doc.m4"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://../gtk-doc.m4;endline=10;md5=868a952d8bb2d825d724854cfaf8f14e"
-
-PR = "r4"
-
-ALLOW_EMPTY_${PN} = "1"
-
-BBCLASSEXTEND = "native"
-
-do_install () {
- install -d ${D}${datadir}/aclocal/
- install -m 0644 ${WORKDIR}/gtk-doc.m4 ${D}${datadir}/aclocal/
-}
diff --git a/meta/recipes-gnome/gtk-doc/gtk-doc.m4 b/meta/recipes-gnome/gtk-doc/gtk-doc.m4
deleted file mode 100644
index 2cfa1e7..0000000
--- a/meta/recipes-gnome/gtk-doc/gtk-doc.m4
+++ /dev/null
@@ -1,61 +0,0 @@
-dnl -*- mode: autoconf -*-
-
-# serial 1
-
-dnl Usage:
-dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
-AC_DEFUN([GTK_DOC_CHECK],
-[
- AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
- AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-
- dnl check for tools we added during development
- AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
- AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
- AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
-
- dnl for overriding the documentation installation directory
- AC_ARG_WITH([html-dir],
- AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
- [with_html_dir='${datadir}/gtk-doc/html'])
- HTML_DIR="$with_html_dir"
- AC_SUBST([HTML_DIR])
-
- dnl enable/disable documentation building
- AC_ARG_ENABLE([gtk-doc],
- AS_HELP_STRING([--enable-gtk-doc],
- [use gtk-doc to build documentation [[default=no]]]),,
- [enable_gtk_doc=no])
-
- if test x$enable_gtk_doc = xyes; then
- ifelse([$1],[],
- [PKG_CHECK_EXISTS([gtk-doc],,
- AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
- [PKG_CHECK_EXISTS([gtk-doc >= $1],,
- AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
- fi
-
- AC_MSG_CHECKING([whether to build gtk-doc documentation])
- AC_MSG_RESULT($enable_gtk_doc)
-
- dnl enable/disable output formats
- AC_ARG_ENABLE([gtk-doc-html],
- AS_HELP_STRING([--enable-gtk-doc-html],
- [build documentation in html format [[default=yes]]]),,
- [enable_gtk_doc_html=yes])
- AC_ARG_ENABLE([gtk-doc-pdf],
- AS_HELP_STRING([--enable-gtk-doc-pdf],
- [build documentation in pdf format [[default=no]]]),,
- [enable_gtk_doc_pdf=no])
-
- if test -z "$GTKDOC_MKPDF"; then
- enable_gtk_doc_pdf=no
- fi
-
-
- AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
- AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
- AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
- AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
- AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
-])
--
1.7.10
^ permalink raw reply related [flat|nested] 34+ messages in thread
* Re: [PATCH 02/26] change gtk-doc.bbclass to pull in depends and oeconf
2012-07-19 16:10 ` [PATCH 02/26] change gtk-doc.bbclass to pull in depends and oeconf Ross Burton
@ 2012-07-19 16:43 ` Richard Purdie
2012-07-19 18:47 ` Ross Burton
0 siblings, 1 reply; 34+ messages in thread
From: Richard Purdie @ 2012-07-19 16:43 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, 2012-07-19 at 17:10 +0100, Ross Burton wrote:
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
> meta/classes/gtk-doc.bbclass | 20 ++++++++++++++++----
> 1 file changed, 16 insertions(+), 4 deletions(-)
>
> diff --git a/meta/classes/gtk-doc.bbclass b/meta/classes/gtk-doc.bbclass
> index 58daaf3..6a3854f 100644
> --- a/meta/classes/gtk-doc.bbclass
> +++ b/meta/classes/gtk-doc.bbclass
> @@ -1,4 +1,16 @@
> -# We don't have gtk-doc so disable it
> -do_configure_prepend() {
> - echo "EXTRA_DIST=">> ${S}/gtk-doc.make
> -}
> +# Helper class to pull in the right gtk-doc dependencies and disable
> +# gtk-doc.
> +#
> +# Long-term it would be great if this class could be toggled between
> +# gtk-doc-stub-native and the real gtk-doc-native, which would enable
> +# re-generation of documentation. For now, we'll make do with this which
> +# packages up any existing documentation (so from tarball builds).
> +
> +DEPENDS += "gtk-doc-stub-native"
> +DEPENDS_virtclass-native += "gtk-doc-stub-native"
> +
Ok, now I understand why this needs to be an append.
Take a recipe like glib which has:
DEPENDS = "x"
DEPENDS_virtclass-native = "y"
Depending on inherit order,
DEPENDS_virtclass-native += "gtk-doc-stub-native"
may append to DEPENDS_virtclass-native, or it may get overwritten by the
direct assignment if that happens second.
On the other hand, if you do:
DEPENDS_virtclass-native_append = " gtk-doc-stub-native"
you stand a better change of getting the behaviour you want as it can't
get overwritten.
Cheers,
Richard
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 02/26] change gtk-doc.bbclass to pull in depends and oeconf
2012-07-19 16:43 ` Richard Purdie
@ 2012-07-19 18:47 ` Ross Burton
2012-07-19 18:47 ` [PATCH] " Ross Burton
0 siblings, 1 reply; 34+ messages in thread
From: Ross Burton @ 2012-07-19 18:47 UTC (permalink / raw)
To: openembedded-core
(attempting manual git send-email mojo to avoid sending another huge thread. Sorry if this goes terribly wrong!)
Revised patch attached. I've rebased the ross/gtkdoc branch with this commit.
Ross
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH] change gtk-doc.bbclass to pull in depends and oeconf
2012-07-19 18:47 ` Ross Burton
@ 2012-07-19 18:47 ` Ross Burton
0 siblings, 0 replies; 34+ messages in thread
From: Ross Burton @ 2012-07-19 18:47 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/classes/gtk-doc.bbclass | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/meta/classes/gtk-doc.bbclass b/meta/classes/gtk-doc.bbclass
index 58daaf3..603b191 100644
--- a/meta/classes/gtk-doc.bbclass
+++ b/meta/classes/gtk-doc.bbclass
@@ -1,4 +1,16 @@
-# We don't have gtk-doc so disable it
-do_configure_prepend() {
- echo "EXTRA_DIST=">> ${S}/gtk-doc.make
-}
+# Helper class to pull in the right gtk-doc dependencies and disable
+# gtk-doc.
+#
+# Long-term it would be great if this class could be toggled between
+# gtk-doc-stub-native and the real gtk-doc-native, which would enable
+# re-generation of documentation. For now, we'll make do with this which
+# packages up any existing documentation (so from tarball builds).
+
+DEPENDS_append = " gtk-doc-stub-native"
+DEPENDS_virtclass-native_append = " gtk-doc-stub-native"
+
+EXTRA_OECONF_append = "\
+ --disable-gtk-doc \
+ --disable-gtk-doc-html \
+ --disable-gtk-doc-pdf \
+"
--
1.7.10
^ permalink raw reply related [flat|nested] 34+ messages in thread
* Re: [PATCH 00/26] Use gtk-doc-stub
2012-07-19 16:10 [PATCH 00/26] Use gtk-doc-stub Ross Burton
` (25 preceding siblings ...)
2012-07-19 16:11 ` [PATCH 26/26] Remove gtk-doc Ross Burton
@ 2012-07-20 4:42 ` Saul Wold
2012-07-20 7:03 ` Ross Burton
2012-07-23 18:12 ` Saul Wold
27 siblings, 1 reply; 34+ messages in thread
From: Saul Wold @ 2012-07-20 4:42 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 07/19/2012 09:10 AM, Ross Burton wrote:
> That nice Colin Walters had the same problem in ostree that we have in Poky
> - gtk-doc and modules that autoregen. He solved it in a cleaner manner and
> created gtk-doc-stub, which has the external interface of gtk-doc but
> (obviously) does nothing.
>
> This patch series:
> - packages gtk-doc-stub
> - changes the gtk-doc class to depend on gtk-doc-stub-native and pass
> --disable-gtk-doc to the configure script
> - updates every recipe in oe-core that mentions gtk-doc
>
> One question: is the dependency addition in gtk-doc.bbclass correct?
> Different recipies have different way of adding dependencies, and I'm not
> sure if the native line is required.
>
> For packages in other layers, you can:
> - inherit gtk-doc
> - remove gtk-doc from your DEPENDS
> - remove --disable-gtk-doc from your OECONF
> - stop creating gtk-doc.make in do_configure_prepend
>
> I've compared buildhistory before and after this series, the only change was
> that glib-2.0-doc packaged the existing documentation in the tarball. I'm
> not sure why it didn't do this before, but that's a bug fixed for free.
>
> Ross
>
> The following changes since commit 2665be9dd5730c3f1135b92d7d91de479c397a29:
>
> buildhistory.bbclass: Fix python whitespace (2012-07-19 12:33:20 +0100)
>
> are available in the git repository at:
>
> git://git.yoctoproject.org/poky-contrib ross/gtkdoc
>
While you have SOB's in the email, the branch itself does not have any
SOBs which is where I was pulling from.
Sau!
> for you to fetch changes up to 7c586b3b9b06e0f9f50f085419083c63830b7900:
>
> Remove gtk-doc (2012-07-19 17:05:54 +0100)
>
> ----------------------------------------------------------------
> Ross Burton (26):
> Add gtk-doc-stub
> change gtk-doc.bbclass to pull in depends and oeconf
> glib-2.0: cleanup thanks to new gtk-doc.bbclass
> gconf: cleanup thanks to new gtk-doc.bbclass
> gobject-introspection: cleanup thanks to new gtk-doc.bbclass
> cogl: cleanup thanks to new gtk-doc.bbclass
> gypsy: inherit gtk-doc
> gconf: cleanup thanks to new gtk-doc.bbclass
> connman: cleanup thanks to new gtk-doc.bbclass
> polkit: cleanup thanks to new gtk-doc.bbclass
> polkit-gnome: cleanup thanks to new gtk-doc.bbclass
> gail: cleanup thanks to new gtk-doc.bbclass
> gnome-keyring: cleanup thanks to new gtk-doc.bbclass
> libart_lgpl: cleanup thanks to new gtk-doc.bbclass
> libgnome-keyring: cleanup thanks to new gtk-doc.bbclass
> gtk+: cleanup thanks to new gtk-doc.bbclass
> libglade: cleanup thanks to new gtk-doc.bbclass
> librsvg: cleanup thanks to new gtk-doc.bbclass
> clutter: cleanup thanks to new gtk-doc.bbclass
> pango: cleanup thanks to new gtk-doc.bbclass
> kmod: inherit gtk-doc, gnome-doc-utils-native isn't the package you were looking for
> evolution-data-server: cleanup thanks to new gtk-doc.bbclass
> webkit-gtk: cleanup thanks to new gtk-doc.bbclass
> atk: cleanup thanks to new gtk-doc.bbclass
> vte: cleanup thanks to new gtk-doc.bbclass
> Remove gtk-doc
>
> meta/classes/gtk-doc.bbclass | 20 +++++--
> meta/recipes-connectivity/connman/connman.inc | 5 +-
> meta/recipes-connectivity/gypsy/gypsy.inc | 6 +-
> meta/recipes-connectivity/gypsy/gypsy_0.8.bb | 2 +-
> meta/recipes-connectivity/gypsy/gypsy_git.bb | 2 +
> meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb | 5 +-
> meta/recipes-core/glib-2.0/glib.inc | 6 +-
> meta/recipes-extended/polkit/polkit-gnome_0.102.bb | 5 +-
> meta/recipes-extended/polkit/polkit_0.104.bb | 6 +-
> meta/recipes-gnome/gnome/gail_1.20.2.bb | 6 +-
> meta/recipes-gnome/gnome/gconf_3.2.3.bb | 10 +---
> meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb | 6 +-
> .../gnome/gobject-introspection_1.32.1.bb | 11 ++--
> .../gnome/gobject-introspection_git.bb | 11 +---
> meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb | 7 +--
> .../recipes-gnome/gnome/libgnome-keyring_2.32.0.bb | 6 +-
> meta/recipes-gnome/gtk+/gtk+.inc | 4 +-
> meta/recipes-gnome/gtk+/gtk+_2.12.7.bb | 2 +-
> meta/recipes-gnome/gtk+/gtk+_2.16.6.bb | 2 +-
> meta/recipes-gnome/gtk+/gtk+_2.24.8.bb | 2 +-
> .../recipes-gnome/gtk-doc-stub/gtk-doc-stub_git.bb | 19 ++++++
> meta/recipes-gnome/gtk-doc/gtk-doc.bb | 19 ------
> meta/recipes-gnome/gtk-doc/gtk-doc.m4 | 61 --------------------
> meta/recipes-gnome/libglade/libglade_2.6.4.bb | 6 +-
> meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 5 +-
> meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb | 2 +
> meta/recipes-graphics/clutter/clutter-1.8_git.bb | 2 +-
> meta/recipes-graphics/clutter/clutter.inc | 4 +-
> meta/recipes-graphics/clutter/cogl.inc | 4 +-
> meta/recipes-graphics/clutter/cogl_1.8.2.bb | 2 +-
> meta/recipes-graphics/clutter/cogl_git.bb | 2 +-
> meta/recipes-graphics/pango/pango.inc | 4 +-
> meta/recipes-graphics/pango/pango_1.28.4.bb | 2 +-
> meta/recipes-kernel/kmod/kmod.inc | 6 +-
> meta/recipes-sato/eds/evolution-data-server_git.bb | 10 +---
> meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb | 5 +-
> meta/recipes-support/atk/atk_2.2.0.bb | 6 +-
> meta/recipes-support/vte/vte.inc | 4 +-
> meta/recipes-support/vte/vte_0.28.2.bb | 2 +-
> 39 files changed, 106 insertions(+), 183 deletions(-)
> create mode 100644 meta/recipes-gnome/gtk-doc-stub/gtk-doc-stub_git.bb
> delete mode 100644 meta/recipes-gnome/gtk-doc/gtk-doc.bb
> delete mode 100644 meta/recipes-gnome/gtk-doc/gtk-doc.m4
>
> Ross Burton (26):
> Add gtk-doc-stub
> change gtk-doc.bbclass to pull in depends and oeconf
> glib-2.0: cleanup thanks to new gtk-doc.bbclass
> gconf: cleanup thanks to new gtk-doc.bbclass
> gobject-introspection: cleanup thanks to new gtk-doc.bbclass
> cogl: cleanup thanks to new gtk-doc.bbclass
> gypsy: inherit gtk-doc
> gconf: cleanup thanks to new gtk-doc.bbclass
> connman: cleanup thanks to new gtk-doc.bbclass
> polkit: cleanup thanks to new gtk-doc.bbclass
> polkit-gnome: cleanup thanks to new gtk-doc.bbclass
> gail: cleanup thanks to new gtk-doc.bbclass
> gnome-keyring: cleanup thanks to new gtk-doc.bbclass
> libart_lgpl: cleanup thanks to new gtk-doc.bbclass
> libgnome-keyring: cleanup thanks to new gtk-doc.bbclass
> gtk+: cleanup thanks to new gtk-doc.bbclass
> libglade: cleanup thanks to new gtk-doc.bbclass
> librsvg: cleanup thanks to new gtk-doc.bbclass
> clutter: cleanup thanks to new gtk-doc.bbclass
> pango: cleanup thanks to new gtk-doc.bbclass
> kmod: inherit gtk-doc, gnome-doc-utils-native isn't the package you
> were looking for
> evolution-data-server: cleanup thanks to new gtk-doc.bbclass
> webkit-gtk: cleanup thanks to new gtk-doc.bbclass
> atk: cleanup thanks to new gtk-doc.bbclass
> vte: cleanup thanks to new gtk-doc.bbclass
> Remove gtk-doc
>
> meta/classes/gtk-doc.bbclass | 20 +++++--
> meta/recipes-connectivity/connman/connman.inc | 5 +-
> meta/recipes-connectivity/gypsy/gypsy.inc | 6 +-
> meta/recipes-connectivity/gypsy/gypsy_0.8.bb | 2 +-
> meta/recipes-connectivity/gypsy/gypsy_git.bb | 2 +
> meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb | 5 +-
> meta/recipes-core/glib-2.0/glib.inc | 6 +-
> meta/recipes-extended/polkit/polkit-gnome_0.102.bb | 5 +-
> meta/recipes-extended/polkit/polkit_0.104.bb | 6 +-
> meta/recipes-gnome/gnome/gail_1.20.2.bb | 6 +-
> meta/recipes-gnome/gnome/gconf_3.2.3.bb | 10 +---
> meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb | 6 +-
> .../gnome/gobject-introspection_1.32.1.bb | 11 ++--
> .../gnome/gobject-introspection_git.bb | 11 +---
> meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb | 7 +--
> .../recipes-gnome/gnome/libgnome-keyring_2.32.0.bb | 6 +-
> meta/recipes-gnome/gtk+/gtk+.inc | 4 +-
> meta/recipes-gnome/gtk+/gtk+_2.12.7.bb | 2 +-
> meta/recipes-gnome/gtk+/gtk+_2.16.6.bb | 2 +-
> meta/recipes-gnome/gtk+/gtk+_2.24.8.bb | 2 +-
> .../recipes-gnome/gtk-doc-stub/gtk-doc-stub_git.bb | 19 ++++++
> meta/recipes-gnome/gtk-doc/gtk-doc.bb | 19 ------
> meta/recipes-gnome/gtk-doc/gtk-doc.m4 | 61 --------------------
> meta/recipes-gnome/libglade/libglade_2.6.4.bb | 6 +-
> meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 5 +-
> meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb | 2 +
> meta/recipes-graphics/clutter/clutter-1.8_git.bb | 2 +-
> meta/recipes-graphics/clutter/clutter.inc | 4 +-
> meta/recipes-graphics/clutter/cogl.inc | 4 +-
> meta/recipes-graphics/clutter/cogl_1.8.2.bb | 2 +-
> meta/recipes-graphics/clutter/cogl_git.bb | 2 +-
> meta/recipes-graphics/pango/pango.inc | 4 +-
> meta/recipes-graphics/pango/pango_1.28.4.bb | 2 +-
> meta/recipes-kernel/kmod/kmod.inc | 6 +-
> meta/recipes-sato/eds/evolution-data-server_git.bb | 10 +---
> meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb | 5 +-
> meta/recipes-support/atk/atk_2.2.0.bb | 6 +-
> meta/recipes-support/vte/vte.inc | 4 +-
> meta/recipes-support/vte/vte_0.28.2.bb | 2 +-
> 39 files changed, 106 insertions(+), 183 deletions(-)
> create mode 100644 meta/recipes-gnome/gtk-doc-stub/gtk-doc-stub_git.bb
> delete mode 100644 meta/recipes-gnome/gtk-doc/gtk-doc.bb
> delete mode 100644 meta/recipes-gnome/gtk-doc/gtk-doc.m4
>
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 00/26] Use gtk-doc-stub
2012-07-20 4:42 ` [PATCH 00/26] Use gtk-doc-stub Saul Wold
@ 2012-07-20 7:03 ` Ross Burton
2012-07-20 9:28 ` Burton, Ross
0 siblings, 1 reply; 34+ messages in thread
From: Ross Burton @ 2012-07-20 7:03 UTC (permalink / raw)
To: Saul Wold; +Cc: Patches and discussions about the oe-core layer
On Friday, 20 July 2012 at 05:42, Saul Wold wrote:
> While you have SOB's in the email, the branch itself does not have any
> SOBs which is where I was pulling from.
That's a very good point. I'll SOB it and repush shortly.
Ross
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 00/26] Use gtk-doc-stub
2012-07-20 7:03 ` Ross Burton
@ 2012-07-20 9:28 ` Burton, Ross
0 siblings, 0 replies; 34+ messages in thread
From: Burton, Ross @ 2012-07-20 9:28 UTC (permalink / raw)
To: Saul Wold; +Cc: Patches and discussions about the oe-core layer
On 20 July 2012 08:03, Ross Burton <ross.burton@intel.com> wrote:
> On Friday, 20 July 2012 at 05:42, Saul Wold wrote:
>> While you have SOB's in the email, the branch itself does not have any
>> SOBs which is where I was pulling from.
>
> That's a very good point. I'll SOB it and repush shortly.
Signed-off and re-pushed.
Ross
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH 00/26] Use gtk-doc-stub
2012-07-19 16:10 [PATCH 00/26] Use gtk-doc-stub Ross Burton
` (26 preceding siblings ...)
2012-07-20 4:42 ` [PATCH 00/26] Use gtk-doc-stub Saul Wold
@ 2012-07-23 18:12 ` Saul Wold
27 siblings, 0 replies; 34+ messages in thread
From: Saul Wold @ 2012-07-23 18:12 UTC (permalink / raw)
To: openembedded-core
On 07/19/2012 09:10 AM, Ross Burton wrote:
> That nice Colin Walters had the same problem in ostree that we have in Poky
> - gtk-doc and modules that autoregen. He solved it in a cleaner manner and
> created gtk-doc-stub, which has the external interface of gtk-doc but
> (obviously) does nothing.
>
> This patch series:
> - packages gtk-doc-stub
> - changes the gtk-doc class to depend on gtk-doc-stub-native and pass
> --disable-gtk-doc to the configure script
> - updates every recipe in oe-core that mentions gtk-doc
>
> One question: is the dependency addition in gtk-doc.bbclass correct?
> Different recipies have different way of adding dependencies, and I'm not
> sure if the native line is required.
>
> For packages in other layers, you can:
> - inherit gtk-doc
> - remove gtk-doc from your DEPENDS
> - remove --disable-gtk-doc from your OECONF
> - stop creating gtk-doc.make in do_configure_prepend
>
> I've compared buildhistory before and after this series, the only change was
> that glib-2.0-doc packaged the existing documentation in the tarball. I'm
> not sure why it didn't do this before, but that's a bug fixed for free.
>
> Ross
>
> The following changes since commit 2665be9dd5730c3f1135b92d7d91de479c397a29:
>
> buildhistory.bbclass: Fix python whitespace (2012-07-19 12:33:20 +0100)
>
> are available in the git repository at:
>
> git://git.yoctoproject.org/poky-contrib ross/gtkdoc
>
> for you to fetch changes up to 7c586b3b9b06e0f9f50f085419083c63830b7900:
>
> Remove gtk-doc (2012-07-19 17:05:54 +0100)
>
> ----------------------------------------------------------------
> Ross Burton (26):
> Add gtk-doc-stub
> change gtk-doc.bbclass to pull in depends and oeconf
> glib-2.0: cleanup thanks to new gtk-doc.bbclass
> gconf: cleanup thanks to new gtk-doc.bbclass
> gobject-introspection: cleanup thanks to new gtk-doc.bbclass
> cogl: cleanup thanks to new gtk-doc.bbclass
> gypsy: inherit gtk-doc
> gconf: cleanup thanks to new gtk-doc.bbclass
> connman: cleanup thanks to new gtk-doc.bbclass
> polkit: cleanup thanks to new gtk-doc.bbclass
> polkit-gnome: cleanup thanks to new gtk-doc.bbclass
> gail: cleanup thanks to new gtk-doc.bbclass
> gnome-keyring: cleanup thanks to new gtk-doc.bbclass
> libart_lgpl: cleanup thanks to new gtk-doc.bbclass
> libgnome-keyring: cleanup thanks to new gtk-doc.bbclass
> gtk+: cleanup thanks to new gtk-doc.bbclass
> libglade: cleanup thanks to new gtk-doc.bbclass
> librsvg: cleanup thanks to new gtk-doc.bbclass
> clutter: cleanup thanks to new gtk-doc.bbclass
> pango: cleanup thanks to new gtk-doc.bbclass
> kmod: inherit gtk-doc, gnome-doc-utils-native isn't the package you were looking for
> evolution-data-server: cleanup thanks to new gtk-doc.bbclass
> webkit-gtk: cleanup thanks to new gtk-doc.bbclass
> atk: cleanup thanks to new gtk-doc.bbclass
> vte: cleanup thanks to new gtk-doc.bbclass
> Remove gtk-doc
>
> meta/classes/gtk-doc.bbclass | 20 +++++--
> meta/recipes-connectivity/connman/connman.inc | 5 +-
> meta/recipes-connectivity/gypsy/gypsy.inc | 6 +-
> meta/recipes-connectivity/gypsy/gypsy_0.8.bb | 2 +-
> meta/recipes-connectivity/gypsy/gypsy_git.bb | 2 +
> meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb | 5 +-
> meta/recipes-core/glib-2.0/glib.inc | 6 +-
> meta/recipes-extended/polkit/polkit-gnome_0.102.bb | 5 +-
> meta/recipes-extended/polkit/polkit_0.104.bb | 6 +-
> meta/recipes-gnome/gnome/gail_1.20.2.bb | 6 +-
> meta/recipes-gnome/gnome/gconf_3.2.3.bb | 10 +---
> meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb | 6 +-
> .../gnome/gobject-introspection_1.32.1.bb | 11 ++--
> .../gnome/gobject-introspection_git.bb | 11 +---
> meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb | 7 +--
> .../recipes-gnome/gnome/libgnome-keyring_2.32.0.bb | 6 +-
> meta/recipes-gnome/gtk+/gtk+.inc | 4 +-
> meta/recipes-gnome/gtk+/gtk+_2.12.7.bb | 2 +-
> meta/recipes-gnome/gtk+/gtk+_2.16.6.bb | 2 +-
> meta/recipes-gnome/gtk+/gtk+_2.24.8.bb | 2 +-
> .../recipes-gnome/gtk-doc-stub/gtk-doc-stub_git.bb | 19 ++++++
> meta/recipes-gnome/gtk-doc/gtk-doc.bb | 19 ------
> meta/recipes-gnome/gtk-doc/gtk-doc.m4 | 61 --------------------
> meta/recipes-gnome/libglade/libglade_2.6.4.bb | 6 +-
> meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 5 +-
> meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb | 2 +
> meta/recipes-graphics/clutter/clutter-1.8_git.bb | 2 +-
> meta/recipes-graphics/clutter/clutter.inc | 4 +-
> meta/recipes-graphics/clutter/cogl.inc | 4 +-
> meta/recipes-graphics/clutter/cogl_1.8.2.bb | 2 +-
> meta/recipes-graphics/clutter/cogl_git.bb | 2 +-
> meta/recipes-graphics/pango/pango.inc | 4 +-
> meta/recipes-graphics/pango/pango_1.28.4.bb | 2 +-
> meta/recipes-kernel/kmod/kmod.inc | 6 +-
> meta/recipes-sato/eds/evolution-data-server_git.bb | 10 +---
> meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb | 5 +-
> meta/recipes-support/atk/atk_2.2.0.bb | 6 +-
> meta/recipes-support/vte/vte.inc | 4 +-
> meta/recipes-support/vte/vte_0.28.2.bb | 2 +-
> 39 files changed, 106 insertions(+), 183 deletions(-)
> create mode 100644 meta/recipes-gnome/gtk-doc-stub/gtk-doc-stub_git.bb
> delete mode 100644 meta/recipes-gnome/gtk-doc/gtk-doc.bb
> delete mode 100644 meta/recipes-gnome/gtk-doc/gtk-doc.m4
>
> Ross Burton (26):
> Add gtk-doc-stub
> change gtk-doc.bbclass to pull in depends and oeconf
> glib-2.0: cleanup thanks to new gtk-doc.bbclass
> gconf: cleanup thanks to new gtk-doc.bbclass
> gobject-introspection: cleanup thanks to new gtk-doc.bbclass
> cogl: cleanup thanks to new gtk-doc.bbclass
> gypsy: inherit gtk-doc
> gconf: cleanup thanks to new gtk-doc.bbclass
> connman: cleanup thanks to new gtk-doc.bbclass
> polkit: cleanup thanks to new gtk-doc.bbclass
> polkit-gnome: cleanup thanks to new gtk-doc.bbclass
> gail: cleanup thanks to new gtk-doc.bbclass
> gnome-keyring: cleanup thanks to new gtk-doc.bbclass
> libart_lgpl: cleanup thanks to new gtk-doc.bbclass
> libgnome-keyring: cleanup thanks to new gtk-doc.bbclass
> gtk+: cleanup thanks to new gtk-doc.bbclass
> libglade: cleanup thanks to new gtk-doc.bbclass
> librsvg: cleanup thanks to new gtk-doc.bbclass
> clutter: cleanup thanks to new gtk-doc.bbclass
> pango: cleanup thanks to new gtk-doc.bbclass
> kmod: inherit gtk-doc, gnome-doc-utils-native isn't the package you
> were looking for
> evolution-data-server: cleanup thanks to new gtk-doc.bbclass
> webkit-gtk: cleanup thanks to new gtk-doc.bbclass
> atk: cleanup thanks to new gtk-doc.bbclass
> vte: cleanup thanks to new gtk-doc.bbclass
> Remove gtk-doc
>
> meta/classes/gtk-doc.bbclass | 20 +++++--
> meta/recipes-connectivity/connman/connman.inc | 5 +-
> meta/recipes-connectivity/gypsy/gypsy.inc | 6 +-
> meta/recipes-connectivity/gypsy/gypsy_0.8.bb | 2 +-
> meta/recipes-connectivity/gypsy/gypsy_git.bb | 2 +
> meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb | 5 +-
> meta/recipes-core/glib-2.0/glib.inc | 6 +-
> meta/recipes-extended/polkit/polkit-gnome_0.102.bb | 5 +-
> meta/recipes-extended/polkit/polkit_0.104.bb | 6 +-
> meta/recipes-gnome/gnome/gail_1.20.2.bb | 6 +-
> meta/recipes-gnome/gnome/gconf_3.2.3.bb | 10 +---
> meta/recipes-gnome/gnome/gnome-keyring_2.32.1.bb | 6 +-
> .../gnome/gobject-introspection_1.32.1.bb | 11 ++--
> .../gnome/gobject-introspection_git.bb | 11 +---
> meta/recipes-gnome/gnome/libart-lgpl_2.3.21.bb | 7 +--
> .../recipes-gnome/gnome/libgnome-keyring_2.32.0.bb | 6 +-
> meta/recipes-gnome/gtk+/gtk+.inc | 4 +-
> meta/recipes-gnome/gtk+/gtk+_2.12.7.bb | 2 +-
> meta/recipes-gnome/gtk+/gtk+_2.16.6.bb | 2 +-
> meta/recipes-gnome/gtk+/gtk+_2.24.8.bb | 2 +-
> .../recipes-gnome/gtk-doc-stub/gtk-doc-stub_git.bb | 19 ++++++
> meta/recipes-gnome/gtk-doc/gtk-doc.bb | 19 ------
> meta/recipes-gnome/gtk-doc/gtk-doc.m4 | 61 --------------------
> meta/recipes-gnome/libglade/libglade_2.6.4.bb | 6 +-
> meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 5 +-
> meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb | 2 +
> meta/recipes-graphics/clutter/clutter-1.8_git.bb | 2 +-
> meta/recipes-graphics/clutter/clutter.inc | 4 +-
> meta/recipes-graphics/clutter/cogl.inc | 4 +-
> meta/recipes-graphics/clutter/cogl_1.8.2.bb | 2 +-
> meta/recipes-graphics/clutter/cogl_git.bb | 2 +-
> meta/recipes-graphics/pango/pango.inc | 4 +-
> meta/recipes-graphics/pango/pango_1.28.4.bb | 2 +-
> meta/recipes-kernel/kmod/kmod.inc | 6 +-
> meta/recipes-sato/eds/evolution-data-server_git.bb | 10 +---
> meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb | 5 +-
> meta/recipes-support/atk/atk_2.2.0.bb | 6 +-
> meta/recipes-support/vte/vte.inc | 4 +-
> meta/recipes-support/vte/vte_0.28.2.bb | 2 +-
> 39 files changed, 106 insertions(+), 183 deletions(-)
> create mode 100644 meta/recipes-gnome/gtk-doc-stub/gtk-doc-stub_git.bb
> delete mode 100644 meta/recipes-gnome/gtk-doc/gtk-doc.bb
> delete mode 100644 meta/recipes-gnome/gtk-doc/gtk-doc.m4
>
Updated version was merged into OE-Core
Thanks
Sau!
^ permalink raw reply [flat|nested] 34+ messages in thread
end of thread, other threads:[~2012-07-23 18:24 UTC | newest]
Thread overview: 34+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-19 16:10 [PATCH 00/26] Use gtk-doc-stub Ross Burton
2012-07-19 16:10 ` [PATCH 01/26] Add gtk-doc-stub Ross Burton
2012-07-19 16:10 ` [PATCH 02/26] change gtk-doc.bbclass to pull in depends and oeconf Ross Burton
2012-07-19 16:43 ` Richard Purdie
2012-07-19 18:47 ` Ross Burton
2012-07-19 18:47 ` [PATCH] " Ross Burton
2012-07-19 16:10 ` [PATCH 03/26] glib-2.0: cleanup thanks to new gtk-doc.bbclass Ross Burton
2012-07-19 16:10 ` [PATCH 04/26] gconf: " Ross Burton
2012-07-19 16:10 ` [PATCH 05/26] gobject-introspection: " Ross Burton
2012-07-19 16:10 ` [PATCH 06/26] cogl: " Ross Burton
2012-07-19 16:10 ` [PATCH 07/26] gypsy: inherit gtk-doc Ross Burton
2012-07-19 16:10 ` [PATCH 08/26] gconf: cleanup thanks to new gtk-doc.bbclass Ross Burton
2012-07-19 16:10 ` [PATCH 09/26] connman: " Ross Burton
2012-07-19 16:10 ` [PATCH 10/26] polkit: " Ross Burton
2012-07-19 16:10 ` [PATCH 11/26] polkit-gnome: " Ross Burton
2012-07-19 16:10 ` [PATCH 12/26] gail: " Ross Burton
2012-07-19 16:11 ` [PATCH 13/26] gnome-keyring: " Ross Burton
2012-07-19 16:11 ` [PATCH 14/26] libart_lgpl: " Ross Burton
2012-07-19 16:11 ` [PATCH 15/26] libgnome-keyring: " Ross Burton
2012-07-19 16:11 ` [PATCH 16/26] gtk+: " Ross Burton
2012-07-19 16:11 ` [PATCH 17/26] libglade: " Ross Burton
2012-07-19 16:11 ` [PATCH 18/26] librsvg: " Ross Burton
2012-07-19 16:11 ` [PATCH 19/26] clutter: " Ross Burton
2012-07-19 16:11 ` [PATCH 20/26] pango: " Ross Burton
2012-07-19 16:11 ` [PATCH 21/26] kmod: inherit gtk-doc, gnome-doc-utils-native isn't the package you were looking for Ross Burton
2012-07-19 16:11 ` [PATCH 22/26] evolution-data-server: cleanup thanks to new gtk-doc.bbclass Ross Burton
2012-07-19 16:11 ` [PATCH 23/26] webkit-gtk: " Ross Burton
2012-07-19 16:11 ` [PATCH 24/26] atk: " Ross Burton
2012-07-19 16:11 ` [PATCH 25/26] vte: " Ross Burton
2012-07-19 16:11 ` [PATCH 26/26] Remove gtk-doc Ross Burton
2012-07-20 4:42 ` [PATCH 00/26] Use gtk-doc-stub Saul Wold
2012-07-20 7:03 ` Ross Burton
2012-07-20 9:28 ` Burton, Ross
2012-07-23 18:12 ` Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox