[oe-commits] org.oe.dev merge of '9bdc778b4db6a77bfd983ea418ef07f57f411bcd'
mickeyl commit
openembedded-commits at lists.openembedded.org
Fri Nov 16 13:09:45 UTC 2007
merge of '9bdc778b4db6a77bfd983ea418ef07f57f411bcd'
and 'f04ba9d8f1f4caa6f8c95f3fec8cd70c6cde452c'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 1f7683762524792792553ad13dd0a8f461f233ae
ViewMTN: http://monotone.openembedded.org/revision/info/1f7683762524792792553ad13dd0a8f461f233ae
Files:
1
packages/gnuplot/gnuplot-4.2.0/term.patch
packages/gnuplot/gnuplot.inc
MAINTAINERS
packages/gnuplot/files/gnuplot.desktop
packages/gnuplot/gnuplot_4.0.0.bb
packages/gnuplot/gnuplot_4.2.0.bb
packages/tinymail/libtinymail-0.0.3
packages/tinymail/files/no-iconv-detect.patch
packages/tinymail/libtinymail-0.0.1/no-iconv-detect.patch
packages/tinymail/libtinymail-0.0.3/no-iconv-detect.patch
packages/tinymail/libtinymail-0.0.1
packages/tinymail/libtinymail_0.0.5.bb
packages/tinymail/tmut_1.1.0.bb
Diffs:
#
# mt diff -r9bdc778b4db6a77bfd983ea418ef07f57f411bcd -r1f7683762524792792553ad13dd0a8f461f233ae
#
#
#
# add_file "packages/gnuplot/gnuplot-4.2.0/term.patch"
# content [aefcc8ce9a8c2edda11563b2ce65f3bb5a6d39ab]
#
# add_file "packages/gnuplot/gnuplot.inc"
# content [b5e69f41a9e8e5a0ed2bfe41cc35e1f90f02f6f9]
#
# patch "MAINTAINERS"
# from [e05fb121d8d9d73708452efe2116dfd550479c52]
# to [1ded1e429f8171d33e507e4cebb7bd6cd431d85f]
#
# patch "packages/gnuplot/files/gnuplot.desktop"
# from [78ac2651ced8cc0ea22fa6d779fbc281bc64edf2]
# to [b8db9cdaaeb7153c1935e667ec072d05f23776ab]
#
# patch "packages/gnuplot/gnuplot_4.0.0.bb"
# from [0647b6c5b568e4157c3dc9492d68d736e3bce331]
# to [87abbc86f29e81b6a1a2491e194323a8218723b7]
#
# patch "packages/gnuplot/gnuplot_4.2.0.bb"
# from [120e6f9d0bc3eff2d1ea2ed71cc801ee358cb0db]
# to [03f32275753ca6d0330c16d5e953d3076ae0a61c]
#
============================================================
--- packages/gnuplot/gnuplot-4.2.0/term.patch aefcc8ce9a8c2edda11563b2ce65f3bb5a6d39ab
+++ packages/gnuplot/gnuplot-4.2.0/term.patch aefcc8ce9a8c2edda11563b2ce65f3bb5a6d39ab
@@ -0,0 +1,20 @@
+--- gnuplot-4.2.0/src/term.h.old 2007-11-16 01:21:09.000000000 -0600
++++ gnuplot-4.2.0/src/term.h 2007-11-16 01:22:45.000000000 -0600
+@@ -70,6 +70,7 @@
+ */
+ #ifdef SHORT_TERMLIST
+ # include "dumb.trm" /* dumb terminal */
++# include "qtopia.trm" /* QTopia terminal */
+
+ # ifdef GP_ENH_EST
+ # include "estimate.trm" /* used for enhanced text processing */
+@@ -436,6 +437,9 @@
+ /* TeXDraw drawing package for LaTeX */
+ #include "texdraw.trm"
+
++/* Qtopia */
++#include "qtopia.trm"
++
+ /* METAFONT */
+ #include "metafont.trm"
+
============================================================
--- packages/gnuplot/gnuplot.inc b5e69f41a9e8e5a0ed2bfe41cc35e1f90f02f6f9
+++ packages/gnuplot/gnuplot.inc b5e69f41a9e8e5a0ed2bfe41cc35e1f90f02f6f9
@@ -0,0 +1,37 @@
+DESCRIPTION = "Gnuplot is a portable command-line driven interactive datafile \
+(text or binary) and function plotting utility."
+HOMEPAGE = "http://www.gnuplot.info/"
+SECTION = "console/scientific"
+LICENSE = "BSD-4"
+PRIORITY = "optional"
+DEPENDS = "pango cairo virtual/libx11 libpng gd readline"
+
+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_compile_prepend() {
+ install -m 0644 ${WORKDIR}/qtplot-0.2/qtopia.trm ${S}/term/
+}
+
+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"
============================================================
--- MAINTAINERS e05fb121d8d9d73708452efe2116dfd550479c52
+++ MAINTAINERS 1ded1e429f8171d33e507e4cebb7bd6cd431d85f
@@ -90,6 +90,12 @@ Recipes: gtk+, gtkmm
Mail: joaquinduran at adtelecom.es
Recipes: gtk+, gtkmm
+Person: Junqian Gordon Xu 'xjqian'
+Mail: xjqian at gmail.com
+Machines: tosa, borzoi, nokia770
+Distros: Ångström
+Recipes: gnuplot
+
Person: Justin Patrin
Mail: papercrane at reversefold.com
Website: http://www.reversefold.com
============================================================
--- packages/gnuplot/files/gnuplot.desktop 78ac2651ced8cc0ea22fa6d779fbc281bc64edf2
+++ packages/gnuplot/files/gnuplot.desktop b8db9cdaaeb7153c1935e667ec072d05f23776ab
@@ -1,8 +1,8 @@ Exec=x-terminal-emulator -e gnuplot
[Desktop Entry]
Name=Gnuplot
Comment=Plot data and function graphs
Exec=x-terminal-emulator -e gnuplot
-Terminal=0
+Terminal=false
Type=Application
+Icon=gnuplot
+Categories=Science;
-Icon=gnuplot.png
-Categories=Scientific
============================================================
--- packages/gnuplot/gnuplot_4.0.0.bb 0647b6c5b568e4157c3dc9492d68d736e3bce331
+++ packages/gnuplot/gnuplot_4.0.0.bb 87abbc86f29e81b6a1a2491e194323a8218723b7
@@ -1,11 +1,7 @@
-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 = "virtual/libx11 libpng gd readline"
-PR = "r3"
+require gnuplot.inc
+PR = "r4"
+
SRC_URI = "ftp://ftp.gnuplot.info/pub/gnuplot/gnuplot-${PV}.tar.gz \
file://subdirs.patch;patch=1 \
file://debian-separate-x11-package.patch;patch=1 \
@@ -14,29 +10,3 @@ SRC_URI = "ftp://ftp.gnuplot.info/pub/gn
file://term.patch;patch=1 \
file://gnuplot.desktop \
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"
-
-do_compile_prepend() {
- install -m 0644 ${WORKDIR}/qtplot-0.2/qtopia.trm ${S}/term/
-}
-
-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/gnuplot/gnuplot_4.2.0.bb 120e6f9d0bc3eff2d1ea2ed71cc801ee358cb0db
+++ packages/gnuplot/gnuplot_4.2.0.bb 03f32275753ca6d0330c16d5e953d3076ae0a61c
@@ -1,40 +1,10 @@
-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"
+require gnuplot.inc
+PR = "r1"
+
SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${PN}-${PV}.tar.gz \
+ http://www.mneuroth.de/privat/zaurus/qtplot-0.2.tar.gz \
file://subdirs.patch;patch=1 \
+ file://term.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 -rf04ba9d8f1f4caa6f8c95f3fec8cd70c6cde452c -r1f7683762524792792553ad13dd0a8f461f233ae
#
#
#
# delete "packages/tinymail/libtinymail-0.0.3"
#
# rename "packages/tinymail/files/no-iconv-detect.patch"
# to "packages/tinymail/libtinymail-0.0.1/no-iconv-detect.patch"
#
# rename "packages/tinymail/libtinymail-0.0.3/no-iconv-detect.patch"
# to "packages/tinymail/files/no-iconv-detect.patch"
#
# add_dir "packages/tinymail/libtinymail-0.0.1"
#
# add_file "packages/tinymail/libtinymail_0.0.5.bb"
# content [d2635acd582c1d1f33e7d14c7db4069c3a400b31]
#
# add_file "packages/tinymail/tmut_1.1.0.bb"
# content [b489c05ebaddb9839ab54e21e7585549dbfa629e]
#
============================================================
--- packages/tinymail/libtinymail_0.0.5.bb d2635acd582c1d1f33e7d14c7db4069c3a400b31
+++ packages/tinymail/libtinymail_0.0.5.bb d2635acd582c1d1f33e7d14c7db4069c3a400b31
@@ -0,0 +1 @@
+require libtinymail.inc
============================================================
--- packages/tinymail/tmut_1.1.0.bb b489c05ebaddb9839ab54e21e7585549dbfa629e
+++ packages/tinymail/tmut_1.1.0.bb b489c05ebaddb9839ab54e21e7585549dbfa629e
@@ -0,0 +1,9 @@
+DESCRIPTION = "Tmut is a really small E-Mail client based on Tinymail"
+SECTION = "x11/utils"
+LICENSE = "LGPL"
+DEPENDS = "gtk+ glib-2.0 gnome-vfs gconf-dbus libtinymail"
+PR = "r0"
+
+SRC_URI = "http://tinymail.org/files/tmut/releases/v1.1/v${PV}/${PN}-${PV}.tar.bz2"
+
+inherit pkgconfig autotools
More information about the Openembedded-commits
mailing list