[oe-commits] org.oe.dev merge of '9ffaf3c87a0ed022e4d1a5278dd3fa333a996305'

[hrw commit]

merge of '9ffaf3c87a0ed022e4d1a5278dd3fa333a996305'
     and 'c6e16b4a6d0e111359e2359ddc437db8a41fbd3a'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: bb0941c6eb0d7eb6f9d46101e8bc68c672d6ccc4
ViewMTN: http://monotone.openembedded.org/revision.psp?id=bb0941c6eb0d7eb6f9d46101e8bc68c672d6ccc4
Files:
1
packages/gnuplot/gnuplot-4.2.0
packages/gnuplot/gnuplot-4.2.0/subdirs.patch
packages/gnuplot/gnuplot_4.2.0.bb
packages/python/python-dbus/python-path.patch
packages/python/python-pygobject-native_2.12.2.bb
packages/python/python-pygobject_2.12.2.bb
Diffs:

#
# mt diff -r9ffaf3c87a0ed022e4d1a5278dd3fa333a996305 -rbb0941c6eb0d7eb6f9d46101e8bc68c672d6ccc4
#
# 
# 
# add_dir "packages/gnuplot/gnuplot-4.2.0"
# 
# add_file "packages/gnuplot/gnuplot-4.2.0/subdirs.patch"
#  content [88702c005e97394a0b14b28aeb80f53cfc20e908]
# 
# add_file "packages/gnuplot/gnuplot_4.2.0.bb"
#  content [d0d263d1d61f807aceb758a99edb727172c050bf]
# 
============================================================
--- packages/gnuplot/gnuplot-4.2.0/subdirs.patch	88702c005e97394a0b14b28aeb80f53cfc20e908
+++ packages/gnuplot/gnuplot-4.2.0/subdirs.patch	88702c005e97394a0b14b28aeb80f53cfc20e908
@@ -0,0 +1,11 @@
+--- /tmp/Makefile.am	2007-08-23 13:10:15.560659023 +0200
++++ gnuplot-4.2.0/Makefile.am	2007-08-23 13:10:34.961764629 +0200
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in -*-Makefile-*-
+ AUTOMAKE_OPTIONS = foreign 1.2h
+ 
+-SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share
++SUBDIRS = config m4 term src  $(LISPDIR) man share
+ 
+ EXTRA_DIST = BUGS CodeStyle Copyright FAQ GNUmakefile INSTALL INSTALL.gnu \
+ Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST README.exp \
============================================================
--- packages/gnuplot/gnuplot_4.2.0.bb	d0d263d1d61f807aceb758a99edb727172c050bf
+++ packages/gnuplot/gnuplot_4.2.0.bb	d0d263d1d61f807aceb758a99edb727172c050bf
@@ -0,0 +1,41 @@
+DESCRIPTION = "Gnuplot is a portable command-line driven interactive datafile \
+(text or binary) and function plotting utility."
+SECTION = "console/scientific"
+LICENSE = "BSD-4"
+PRIORITY = "optional"
+DEPENDS = "pango cairo virtual/libx11 libpng gd readline"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${PN}-${PV}.tar.gz \
+	   file://subdirs.patch;patch=1 \
+           file://matrix.patch;patch=1 \
+	   file://gnuplot.desktop \
+	   file://gnuplot.png"
+
+inherit autotools
+
+acpaths = ""
+EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR}/.. \
+		--without-plot \
+		--with-png=${STAGING_LIBDIR}/.. \
+		--with-gd=${STAGING_LIBDIR}/.. \
+		--without-lisp-files \
+		--without-tutorial"
+
+do_install_append() {
+	install -d ${D}${datadir}/applications/
+	install -m 0644 ${WORKDIR}/gnuplot.desktop ${D}${datadir}/applications/
+	install -d ${D}${datadir}/pixmaps/
+	install -m 0644 ${WORKDIR}/gnuplot.png ${D}${datadir}/pixmaps/
+}
+
+
+PACKAGES =+ "${PN}-x11-dbg ${PN}-x11"
+DESCRIPTION_${PN}-x11 = "X11 display terminal for Gnuplot."
+SECTION_${PN}-x11 = "x11/scientific"
+FILES_${PN}-x11 = "${libexecdir} ${datadir}/applications ${datadir}/pixmaps ${libdir}/X11 "
+
+FILES_${PN} += "${datadir}/texmf"
+FILES_${PN}-x11-dbg += "${libexecdir}/gnuplot/*/.debug"
+
+


#
# mt diff -rc6e16b4a6d0e111359e2359ddc437db8a41fbd3a -rbb0941c6eb0d7eb6f9d46101e8bc68c672d6ccc4
#
# 
# 
# delete "packages/python/python-dbus/python-path.patch"
# 
# add_file "packages/python/python-dbus/python-path.patch"
#  content [82cbc113e66f67ef9fac47fe70ef097309fe50e9]
# 
# add_file "packages/python/python-pygobject-native_2.12.2.bb"
#  content [4919e0f135ff74036bb0effdae616d58f1c15f3a]
# 
# add_file "packages/python/python-pygobject_2.12.2.bb"
#  content [2608f9e9a904319912666247a24388fb2c10d258]
# 
============================================================
--- packages/python/python-dbus/python-path.patch	82cbc113e66f67ef9fac47fe70ef097309fe50e9
+++ packages/python/python-dbus/python-path.patch	82cbc113e66f67ef9fac47fe70ef097309fe50e9
@@ -0,0 +1,21 @@
+--- dbus-python-0.81.1/m4.orig/am-check-python-headers.m4
++++ dbus-python-0.81.1/m4/am-check-python-headers.m4
+@@ -7214,12 +7214,18 @@
+ [AC_REQUIRE([AM_PATH_PYTHON])
+ AC_MSG_CHECKING(for headers required to compile python extensions)
+ dnl deduce PYTHON_INCLUDES
++AC_ARG_WITH(python-includes,
++	[  --with-python-includes=DIR  path to Python includes], py_exec_prefix=$withval)
++if test x$py_exec_prefix != x; then
++PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}"
++else
+ py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+ py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+ PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+ if test "$py_prefix" != "$py_exec_prefix"; then
+   PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+ fi
++fi
+ AC_SUBST(PYTHON_INCLUDES)
+ dnl check if the headers exist:
+ save_CPPFLAGS="$CPPFLAGS"
============================================================
--- packages/python/python-pygobject-native_2.12.2.bb	4919e0f135ff74036bb0effdae616d58f1c15f3a
+++ packages/python/python-pygobject-native_2.12.2.bb	4919e0f135ff74036bb0effdae616d58f1c15f3a
@@ -0,0 +1,3 @@
+require python-pygobject_${PV}.bb
+
+DEPENDS = "python-native"
============================================================
--- packages/python/python-pygobject_2.12.2.bb	2608f9e9a904319912666247a24388fb2c10d258
+++ packages/python/python-pygobject_2.12.2.bb	2608f9e9a904319912666247a24388fb2c10d258
@@ -0,0 +1,23 @@
+DESCRIPTION = "Python GObject bindings"
+SECTION = "devel/python"
+LICENSE = "LGPL"
+DEPENDS = "python-pygobject-native"
+PR = "ml2"
+
+SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/2.12/pygobject-${PV}.tar.bz2"
+S = "${WORKDIR}/pygobject-${PV}"
+
+inherit autotools distutils-base pkgconfig
+
+# otherwise the main package keeps snatching the .pc file away
+# and therefore depends on glib-2.0-dev (which only the -dev
+# package should).
+PACKAGES =+ "${PN}-dev"
+
+do_stage() {
+	autotools_stage_all
+	install -d ${STAGING_LIBDIR}/../share/pygobject/
+	cp -dpfR docs/* ${STAGING_LIBDIR}/../share/pygobject/
+	install -d ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/
+	cp docs/style.css ${STAGING_LIBDIR}/../share/gtk-doc/html/pygobject/
+}