All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-oe][PATCH 0/5] Fixes for oe-core changes
@ 2012-07-24  8:02 Martin Jansa
  2012-07-24  8:02 ` [meta-oe][PATCH 1/5] gpsd: inherit pythonnative Martin Jansa
                   ` (4 more replies)
  0 siblings, 5 replies; 7+ messages in thread
From: Martin Jansa @ 2012-07-24  8:02 UTC (permalink / raw)
  To: openembedded-devel

The following changes since commit 8f0de34919eb56f0e1e8565d024729cd8d7264a5:

  cramfs_cvs.bb: fix compile step so it can be rerun without failing (2012-07-23 12:47:11 +0200)

are available in the git repository at:
  git://git.openembedded.org/meta-openembedded-contrib jansa/pull
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull

Martin Jansa (5):
  gpsd: inherit pythonnative
  webkit-efl: inherit pythonnative
  orbit2: cleanup thanks to new gtk-doc.bbclass
  libbonoboui: cleanup thanks to new gtk-doc.bbclass
  libgpewidget: cleanup thanks to new gtk-doc.bbclass

 meta-efl/recipes-efl/webkit/webkit-efl_svn.bb      |    4 +-
 .../recipes-gnome/bonobo/libbonoboui_2.24.3.bb     |    8 +-
 .../recipes-gnome/orbit2/orbit2-2.14.17/gtk-doc.m4 |   53 ------
 .../orbit2/orbit2-2.14.17/gtk-doc.make             |  173 --------------------
 meta-gnome/recipes-gnome/orbit2/orbit2_2.14.17.bb  |   19 +--
 .../libgpewidget/libgpewidget_0.117.bb             |    6 +-
 meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb        |    4 +-
 meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb        |    4 +-
 meta-oe/recipes-navigation/gpsd/gpsd_git.bb        |    4 +-
 9 files changed, 20 insertions(+), 255 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/gtk-doc.m4
 delete mode 100644 meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/gtk-doc.make

-- 
1.7.8.6




^ permalink raw reply	[flat|nested] 7+ messages in thread

* [meta-oe][PATCH 1/5] gpsd: inherit pythonnative
  2012-07-24  8:02 [meta-oe][PATCH 0/5] Fixes for oe-core changes Martin Jansa
@ 2012-07-24  8:02 ` Martin Jansa
  2012-07-24  8:02 ` [meta-oe][PATCH 2/5] webkit-efl: " Martin Jansa
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 7+ messages in thread
From: Martin Jansa @ 2012-07-24  8:02 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb |    4 ++--
 meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb |    4 ++--
 meta-oe/recipes-navigation/gpsd/gpsd_git.bb |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb
index 4f3d2d7..16fa739 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.4.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
 DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-native"
 PROVIDES = "virtual/gpsd"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
   file://0001-SConstruct-fix-DSO-build-for-ntpshm-garmin_monitor.patch \
@@ -21,7 +21,7 @@ SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
 SRC_URI[md5sum] = "c01353459faa68834309109d4e868460"
 SRC_URI[sha256sum] = "79f7de9ead63c7f5d2c9a92e85b5f82e53323c4d451ef8e27ea265ac3ef9a70f"
 
-inherit scons update-rc.d python-dir
+inherit scons update-rc.d python-dir pythonnative
 
 INITSCRIPT_NAME = "gpsd"
 INITSCRIPT_PARAMS = "defaults 35"
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb
index 3cac186..1b1809f 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.5.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
 DEPENDS = "dbus dbus-glib ncurses python libusb1"
 PROVIDES = "virtual/gpsd"
 
-PR = "r3"
+PR = "r4"
 
 DEFAULT_PREFERENCE = "-1"
 SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
@@ -22,7 +22,7 @@ SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \
 SRC_URI[md5sum] = "e96881798a0ab67aa3cd5f3249f0e536"
 SRC_URI[sha256sum] = "5ebb0b00c49421eb8fbead81342e5ce63e82065e5ff27da586f10e342b999171"
 
-inherit scons update-rc.d python-dir
+inherit scons update-rc.d python-dir pythonnative
 
 INITSCRIPT_NAME = "gpsd"
 INITSCRIPT_PARAMS = "defaults 35"
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_git.bb b/meta-oe/recipes-navigation/gpsd/gpsd_git.bb
index 1c7d76f..8404ba1 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_git.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
 DEPENDS = "dbus dbus-glib ncurses python libusb1"
 PROVIDES = "virtual/gpsd"
 
-PR = "r2"
+PR = "r3"
 
 SRCREV = "f8744f4af8cef211de698df5d8e6caddfe33f29d"
 
@@ -25,7 +25,7 @@ SRC_URI = "git://git.sv.gnu.org/gpsd.git;protocol=git;branch=master \
 "
 S = "${WORKDIR}/git"
 
-inherit scons update-rc.d python-dir
+inherit scons update-rc.d python-dir pythonnative
 
 INITSCRIPT_NAME = "gpsd"
 INITSCRIPT_PARAMS = "defaults 35"
-- 
1.7.8.6




^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [meta-oe][PATCH 2/5] webkit-efl: inherit pythonnative
  2012-07-24  8:02 [meta-oe][PATCH 0/5] Fixes for oe-core changes Martin Jansa
  2012-07-24  8:02 ` [meta-oe][PATCH 1/5] gpsd: inherit pythonnative Martin Jansa
@ 2012-07-24  8:02 ` Martin Jansa
  2012-07-24  8:02 ` [meta-oe][PATCH 3/5] orbit2: cleanup thanks to new gtk-doc.bbclass Martin Jansa
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 7+ messages in thread
From: Martin Jansa @ 2012-07-24  8:02 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

Conflicts:

	meta-efl/recipes-efl/webkit/webkit-efl_svn.bb
---
 meta-efl/recipes-efl/webkit/webkit-efl_svn.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb b/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb
index 0c490c3..7719212 100644
--- a/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb
+++ b/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb
@@ -11,7 +11,7 @@ DEPENDS = "icu libxslt sqlite3 gperf-native bison-native flex-native jpeg \
 
 SRCREV = "105069"
 PV = "1.7.3+svnr${SRCPV}"
-PR = "r2"
+PR = "r3"
 
 SRCREV_FORMAT = "source"
 
@@ -30,7 +30,7 @@ do_configure_prepend() {
   cp ${WORKDIR}/CMakeLists.txt ${S};
 }
 
-inherit cmake lib_package pkgconfig perlnative
+inherit cmake lib_package pkgconfig perlnative pythonnative
 
 ARM_INSTRUCTION_SET = "arm"
 
-- 
1.7.8.6




^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [meta-oe][PATCH 3/5] orbit2: cleanup thanks to new gtk-doc.bbclass
  2012-07-24  8:02 [meta-oe][PATCH 0/5] Fixes for oe-core changes Martin Jansa
  2012-07-24  8:02 ` [meta-oe][PATCH 1/5] gpsd: inherit pythonnative Martin Jansa
  2012-07-24  8:02 ` [meta-oe][PATCH 2/5] webkit-efl: " Martin Jansa
@ 2012-07-24  8:02 ` Martin Jansa
  2012-07-24  8:02 ` [meta-oe][PATCH 4/5] libbonoboui: " Martin Jansa
  2012-07-24  8:02 ` [meta-oe][PATCH 5/5] libgpewidget: " Martin Jansa
  4 siblings, 0 replies; 7+ messages in thread
From: Martin Jansa @ 2012-07-24  8:02 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-gnome/orbit2/orbit2-2.14.17/gtk-doc.m4 |   53 ------
 .../orbit2/orbit2-2.14.17/gtk-doc.make             |  173 --------------------
 meta-gnome/recipes-gnome/orbit2/orbit2_2.14.17.bb  |   19 +--
 3 files changed, 5 insertions(+), 240 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/gtk-doc.m4
 delete mode 100644 meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/gtk-doc.make

diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/gtk-doc.m4 b/meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/gtk-doc.m4
deleted file mode 100644
index 3ec4166..0000000
--- a/meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/gtk-doc.m4
+++ /dev/null
@@ -1,53 +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 for overriding the documentation installation directory
-  AC_ARG_WITH(html-dir,
-    AC_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,
-    AC_HELP_STRING([--enable-gtk-doc],
-                   [use gtk-doc to build documentation [default=no]]),,
-    enable_gtk_doc=no)
-
-  have_gtk_doc=no
-  if test -z "$PKG_CONFIG"; then
-    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-  fi
-  if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
-    have_gtk_doc=yes
-  fi
-
-  dnl do we want to do a version check?
-ifelse([$1],[],,
-  [gtk_doc_min_version=$1
-  if test "$have_gtk_doc" = yes; then
-    AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
-    if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
-      AC_MSG_RESULT(yes)
-    else
-      AC_MSG_RESULT(no)
-      have_gtk_doc=no
-    fi
-  fi
-])
-  if test x$enable_gtk_doc = xyes; then
-    if test "$have_gtk_doc" != yes; then
-      enable_gtk_doc=no
-    fi
-  fi
-
-  AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
-  AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
-])
diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/gtk-doc.make b/meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/gtk-doc.make
deleted file mode 100644
index 354ffb7..0000000
--- a/meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/gtk-doc.make
+++ /dev/null
@@ -1,173 +0,0 @@
-# -*- mode: makefile -*-
-
-####################################
-# Everything below here is generic #
-####################################
-
-if GTK_DOC_USE_LIBTOOL
-GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-else
-GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
-endif
-
-# We set GPATH here; this gives us semantics for GNU make
-# which are more like other make's VPATH, when it comes to
-# whether a source that is a target of one rule is then
-# searched for in VPATH/GPATH.
-#
-GPATH = $(srcdir)
-
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
-
-EXTRA_DIST = 				\
-	$(content_files)		\
-	$(HTML_IMAGES)			\
-	$(DOC_MAIN_SGML_FILE)		\
-	$(DOC_MODULE)-sections.txt	\
-	$(DOC_MODULE)-overrides.txt
-
-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
-
-SCANOBJ_FILES = 		 \
-	$(DOC_MODULE).args 	 \
-	$(DOC_MODULE).hierarchy  \
-	$(DOC_MODULE).interfaces \
-	$(DOC_MODULE).prerequisites \
-	$(DOC_MODULE).signals
-
-REPORT_FILES = \
-	$(DOC_MODULE)-undocumented.txt \
-	$(DOC_MODULE)-undeclared.txt \
-	$(DOC_MODULE)-unused.txt
-
-CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
-
-if ENABLE_GTK_DOC
-all-local: html-build.stamp
-else
-all-local:
-endif
-
-docs: html-build.stamp
-
-#### scan ####
-
-scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-	@echo 'gtk-doc: Scanning header files'
-	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && \
-	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
-	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
-	else \
-	    cd $(srcdir) ; \
-	    for i in $(SCANOBJ_FILES) ; do \
-               test -f $$i || touch $$i ; \
-	    done \
-	fi
-	touch scan-build.stamp
-
-$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
-	@true
-
-#### templates ####
-
-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	@echo 'gtk-doc: Rebuilding template files'
-	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-	touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
-	@true
-
-tmpl/*.sgml:
-	@true
-
-
-#### xml ####
-
-sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
-	@echo 'gtk-doc: Building XML'
-	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && \
-	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
-	touch sgml-build.stamp
-
-sgml.stamp: sgml-build.stamp
-	@true
-
-#### html ####
-
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo 'gtk-doc: Building HTML'
-	@-chmod -R u+w $(srcdir)
-	rm -rf $(srcdir)/html
-	mkdir $(srcdir)/html
-	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
-	@echo 'gtk-doc: Fixing cross-references'
-	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-	touch html-build.stamp
-
-##############
-
-clean-local:
-	rm -f *~ *.bak
-	rm -rf .libs
-
-distclean-local:
-	cd $(srcdir) && \
-	  rm -rf xml $(REPORT_FILES) \
-	         $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
-maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf xml html
-
-install-data-local:
-	-installfiles=`echo $(srcdir)/html/*`; \
-	if test "$$installfiles" = '$(srcdir)/html/*'; \
-	then echo '-- Nothing to install' ; \
-	else \
-	  $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
-	  for i in $$installfiles; do \
-	    echo '-- Installing '$$i ; \
-	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
-	  done; \
-	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
-	  which gtkdoc-rebase >/dev/null && \
-	    gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
-	fi
-	
-
-uninstall-local:
-	rm -f $(DESTDIR)$(TARGET_DIR)/*
-
-#
-# Require gtk-doc when making dist
-#
-if ENABLE_GTK_DOC
-dist-check-gtkdoc:
-else
-dist-check-gtkdoc:
-	@echo "*** gtk-doc must be installed and enabled in order to make dist"
-	@false
-endif
-
-dist-hook: dist-check-gtkdoc dist-hook-local
-	mkdir $(distdir)/tmpl
-	mkdir $(distdir)/xml
-	mkdir $(distdir)/html
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	-cp $(srcdir)/xml/*.xml $(distdir)/xml
-	cp $(srcdir)/html/* $(distdir)/html
-	-cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
-	-cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
-	cd $(distdir) && rm -f $(DISTCLEANFILES)
-	-gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
-
-.PHONY : dist-hook-local docs
diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.17.bb b/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.17.bb
index fb7e93e..8f3e4e1 100644
--- a/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.17.bb
+++ b/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.17.bb
@@ -6,22 +6,20 @@ SRC_NAME = "ORBit2"
 SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 SRC_URI = "${GNOME_MIRROR}/${SRC_NAME}/${SHRT_VER}/${SRC_NAME}-${PV}.tar.bz2 \
            file://configure-lossage.patch \
-           file://pkgconfig-fix.patch \
-	   file://gtk-doc.m4 \
-	   file://gtk-doc.make"
+           file://pkgconfig-fix.patch"
 SRC_URI[md5sum] = "10bfb957fa4a8935a0b4afaee7d71df7"
 SRC_URI[sha256sum] = "62bfce3f678f9347a19c766944e8aef7b89bc32b25ac23eb3e4c25929ce8974c"
 
-PR = "r2"
+PR = "r3"
 BBCLASSEXTEND = "native"
 
 IDL_COMPILER_DEPENDS = "orbit2-native"
 IDL_COMPILER_DEPENDS_virtclass-native = " "
-DEPENDS = "libidl popt gtk-doc ${IDL_COMPILER_DEPENDS}"
+DEPENDS = "libidl popt ${IDL_COMPILER_DEPENDS}"
 
 # IDL_COMPILER_DEPENDS_virtclass-native for some reason didn't work and orbit2-native
 # was still in orbit2-native DEPENDS causing circular dependency
-DEPENDS_virtclass-native = "libidl-native popt-native gtk-doc-native"
+DEPENDS_virtclass-native = "libidl-native popt-native"
 PARALLEL_MAKE = ""
 
 
@@ -33,14 +31,7 @@ S = "${WORKDIR}/${SRC_NAME}-${PV}"
 
 LEAD_SONAME = "libORBit-2.so"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig gtk-doc
 
-EXTRA_OECONF = "--disable-gtk-doc"
 EXTRA_OEMAKE = "IDL_COMPILER='${STAGING_BINDIR_NATIVE}/orbit-idl-2'"
 EXTRA_OEMAKE_virtclass-native = " "
-
-do_configure_prepend() {
-	mkdir -p m4
-	install ${WORKDIR}/gtk-doc.m4 ./m4/
-	install ${WORKDIR}/gtk-doc.make ./
-}
-- 
1.7.8.6




^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [meta-oe][PATCH 4/5] libbonoboui: cleanup thanks to new gtk-doc.bbclass
  2012-07-24  8:02 [meta-oe][PATCH 0/5] Fixes for oe-core changes Martin Jansa
                   ` (2 preceding siblings ...)
  2012-07-24  8:02 ` [meta-oe][PATCH 3/5] orbit2: cleanup thanks to new gtk-doc.bbclass Martin Jansa
@ 2012-07-24  8:02 ` Martin Jansa
  2012-07-24  8:02 ` [meta-oe][PATCH 5/5] libgpewidget: " Martin Jansa
  4 siblings, 0 replies; 7+ messages in thread
From: Martin Jansa @ 2012-07-24  8:02 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../recipes-gnome/bonobo/libbonoboui_2.24.3.bb     |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.3.bb b/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.3.bb
index cf37ccf..328183f 100644
--- a/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.3.bb
+++ b/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.3.bb
@@ -3,14 +3,14 @@ LICENSE = "GPLv2 & LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://COPYING.LIB;md5=7fbc338309ac38fefcd64b04bb903e34"
 
-inherit gnome pkgconfig
+inherit gnome pkgconfig gtk-doc
+
+PR = "r1"
 
 SRC_URI[archive.md5sum] = "3a754b1df0a4d5fd4836a05020a0bb4a"
 SRC_URI[archive.sha256sum] = "0be51ee3069a2ef21d98561ee28036dd263ac08b401776fe9164e084825ffd84"
 
-DEPENDS = "libgnomecanvas libbonobo libgnome glib-2.0 gtk-doc gconf libxml2 libglade"
-
-EXTRA_OECONF = "--disable-gtk-doc"
+DEPENDS = "libgnomecanvas libbonobo libgnome glib-2.0 gconf libxml2 libglade"
 
 FILES_${PN} += "${libdir}/libglade/2.0/*.so"
 FILES_${PN}-dev += "${libdir}/libglade/2.0/* ${datadir}/gnome-2.0/ui \
-- 
1.7.8.6




^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [meta-oe][PATCH 5/5] libgpewidget: cleanup thanks to new gtk-doc.bbclass
  2012-07-24  8:02 [meta-oe][PATCH 0/5] Fixes for oe-core changes Martin Jansa
                   ` (3 preceding siblings ...)
  2012-07-24  8:02 ` [meta-oe][PATCH 4/5] libbonoboui: " Martin Jansa
@ 2012-07-24  8:02 ` Martin Jansa
  4 siblings, 0 replies; 7+ messages in thread
From: Martin Jansa @ 2012-07-24  8:02 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../libgpewidget/libgpewidget_0.117.bb             |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb b/meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb
index e8abc43..ef0329e 100644
--- a/meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb
+++ b/meta-gpe/recipes-graphics/libgpewidget/libgpewidget_0.117.bb
@@ -4,10 +4,10 @@ SECTION = "gpe/libs"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499"
 
-DEPENDS = "gtk+ cairo libxinerama libxcomposite libxrender gtk-doc"
-PR = "r2"
+DEPENDS = "gtk+ cairo libxinerama libxcomposite libxrender" 
+PR = "r3"
 
-inherit gpe pkgconfig autotools
+inherit gpe pkgconfig autotools gtk-doc
 
 SRC_URI += "file://pkgconfig.patch;striplevel=0 \
   file://glib-2.32.patch \
-- 
1.7.8.6




^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [meta-oe][PATCH 0/5] Fixes for oe-core changes
@ 2012-07-28 12:33 Martin Jansa
  0 siblings, 0 replies; 7+ messages in thread
From: Martin Jansa @ 2012-07-28 12:33 UTC (permalink / raw)
  To: openembedded-devel

The following changes since commit 9afc488a1b97bfc5378f139ba04a7a5297b15fdb:

  nano: add PACKAGECONFIG for 'tiny' build (2012-07-25 09:18:12 +0200)

are available in the git repository at:
  git://git.openembedded.org/meta-openembedded-contrib jansa/pull
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull

Martin Jansa (5):
  tcpdump: bump PR to rebuild against libpcap1 instead libpcap
  vala-dbus-binding-tool: bump SRCREV and add recipe for 0.4.0 tarball
  libwnck: use gobject-introspection-stub instead of -native which was
    removed in oe-core
  libgee: use gobject-introspection-stub instead of -native which was
    removed in oe-core
  upower: use gobject-introspection-stub instead of -native which was
    removed in oe-core

 meta-gnome/recipes-gnome/libwnck/libwnck3_3.0.2.bb |   10 +++-------
 meta-gnome/recipes-gnome/libwnck/libwnck_2.30.5.bb |   10 ++--------
 meta-oe/recipes-devtools/libgee/libgee_0.6.4.bb    |    7 +++----
 .../vala-dbus-binding-tool.inc                     |    2 +-
 .../vala-dbus-binding-tool_0.4.0.bb                |    4 ++++
 .../vala-dbus-binding-tool_git.bb                  |    7 +++++--
 meta-oe/recipes-support/tcpdump/tcpdump_4.1.1.bb   |    2 +-
 meta-oe/recipes-support/upower/upower_0.9.14.bb    |    4 ++--
 8 files changed, 21 insertions(+), 25 deletions(-)
 create mode 100644 meta-oe/recipes-devtools/vala-dbus-binding-tool/vala-dbus-binding-tool_0.4.0.bb

-- 
1.7.8.6




^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2012-07-28 12:44 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-24  8:02 [meta-oe][PATCH 0/5] Fixes for oe-core changes Martin Jansa
2012-07-24  8:02 ` [meta-oe][PATCH 1/5] gpsd: inherit pythonnative Martin Jansa
2012-07-24  8:02 ` [meta-oe][PATCH 2/5] webkit-efl: " Martin Jansa
2012-07-24  8:02 ` [meta-oe][PATCH 3/5] orbit2: cleanup thanks to new gtk-doc.bbclass Martin Jansa
2012-07-24  8:02 ` [meta-oe][PATCH 4/5] libbonoboui: " Martin Jansa
2012-07-24  8:02 ` [meta-oe][PATCH 5/5] libgpewidget: " Martin Jansa
  -- strict thread matches above, loose matches on Subject: below --
2012-07-28 12:33 [meta-oe][PATCH 0/5] Fixes for oe-core changes Martin Jansa

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.