summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRene Wagner <rw@handhelds.org>2005-03-03 22:55:27 +0000
committerRene Wagner <rw@handhelds.org>2005-03-03 22:55:27 +0000
commitb61893ae19edc009182bad57b92a9df0f13172cc (patch)
tree451024c3dc81afe30204cb6071a175d1264a0bfd
parent2e2baff3f7cc9749ed76d70a3bd2947bf47886b6 (diff)
Merge oe-devel@oe-devel.bkbits.net:openembedded
into sugarcube.dyndns.org:/home2/oe/bakery/openembedded 2005/03/03 23:55:00+01:00 dyndns.org!reenoo gnuplot: - remove obsolete -x11 and -qt .bbs - import (and slightly clean up) updated .bb courtesy of Philip Frampton - add patch from debian to avoid crash when -x11 package isn't installed BKrev: 422795dfdDP0PLj_p4raeMFkjyHxtw
-rw-r--r--packages/gnuplot/files/debian-separate-x11-package.patch (renamed from packages/gnuplot/gnuplot-qt_4.0.0.bb)0
-rw-r--r--packages/gnuplot/gnuplot-x11_4.0.0.bb0
-rw-r--r--packages/gnuplot/gnuplot_4.0.0.bb25
3 files changed, 15 insertions, 10 deletions
diff --git a/packages/gnuplot/gnuplot-qt_4.0.0.bb b/packages/gnuplot/files/debian-separate-x11-package.patch
index e69de29bb2..e69de29bb2 100644
--- a/packages/gnuplot/gnuplot-qt_4.0.0.bb
+++ b/packages/gnuplot/files/debian-separate-x11-package.patch
diff --git a/packages/gnuplot/gnuplot-x11_4.0.0.bb b/packages/gnuplot/gnuplot-x11_4.0.0.bb
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gnuplot/gnuplot-x11_4.0.0.bb
+++ /dev/null
diff --git a/packages/gnuplot/gnuplot_4.0.0.bb b/packages/gnuplot/gnuplot_4.0.0.bb
index 3c9c4bc61c..0fead5ff4c 100644
--- a/packages/gnuplot/gnuplot_4.0.0.bb
+++ b/packages/gnuplot/gnuplot_4.0.0.bb
@@ -4,30 +4,35 @@ SECTION = "console/scientific"
LICENSE = "BSD-4"
PRIORITY = "optional"
MAINTAINER = "Philip Frampton"
-DEPENDS = "libpng gd readline"
-RCONFLICTS = "gnuplot-qt gnuplot-x11"
-PR = "r2"
+DEPENDS = "x11 libpng gd readline"
+PR = "r3"
SRC_URI = "ftp://ftp.gnuplot.info/pub/gnuplot/gnuplot-${PV}.tar.gz \
- file://matrix.patch;patch=1 \
file://subdirs.patch;patch=1 \
+ file://debian-separate-x11-package.patch;patch=1 \
+ http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz \
+ file://matrix.patch;patch=1 \
file://term.patch;patch=1 \
file://gnuplot.desktop \
- file://gnuplot.png \
- file://qtopia.trm"
+ file://gnuplot.png"
inherit autotools
+
+PACKAGES =+ "${PN}-x11"
+DESCRIPTION_${PN}-x11 = "X11 display terminal for Gnuplot."
+SECTION_${PN}-x11 = "x11/scientific"
+FILES_${PN}-x11 = "${libexecdir} ${datadir}/applications ${datadir}/pixmaps"
+
acpaths = ""
EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR}/.. \
--without-plot \
--with-png=${STAGING_LIBDIR}/.. \
--with-gd=${STAGING_LIBDIR}/.. \
--without-lisp-files \
- --without-tutorial \
- --without-x"
+ --without-tutorial"
-do_compile_prepend(){
- install -m 0644 ${WORKDIR}/qtopia.trm ${S}/term/
+do_compile_prepend() {
+ install -m 0644 ${WORKDIR}/qtplot-0.2/qtopia.trm ${S}/term/
}
do_install_append() {