From 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 9 Dec 2004 09:47:41 +0000 Subject: Merge oe-devel@oe-devel.bkbits.net:openembedded into hyperion.kergoth.com:/home/kergoth/code/openembedded 2004/12/09 03:39:39-06:00 kergoth.com!kergoth Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit. BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA --- packages/gnuplot/files/gnuplot.desktop | 0 packages/gnuplot/files/gnuplot.png | 0 packages/gnuplot/gnuplot-4.0.0/subdirs.patch | 0 packages/gnuplot/gnuplot_4.0.0.bb | 0 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 packages/gnuplot/files/gnuplot.desktop create mode 100644 packages/gnuplot/files/gnuplot.png create mode 100644 packages/gnuplot/gnuplot-4.0.0/subdirs.patch create mode 100644 packages/gnuplot/gnuplot_4.0.0.bb (limited to 'packages/gnuplot') diff --git a/packages/gnuplot/files/gnuplot.desktop b/packages/gnuplot/files/gnuplot.desktop new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gnuplot/files/gnuplot.png b/packages/gnuplot/files/gnuplot.png new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gnuplot/gnuplot-4.0.0/subdirs.patch b/packages/gnuplot/gnuplot-4.0.0/subdirs.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gnuplot/gnuplot_4.0.0.bb b/packages/gnuplot/gnuplot_4.0.0.bb new file mode 100644 index 0000000000..e69de29bb2 -- cgit v1.2.3 From 5e6024e4131b93603b842dc7a400f918c535d36e Mon Sep 17 00:00:00 2001 From: Rene Wagner Date: Sun, 19 Dec 2004 16:20:42 +0000 Subject: gnuplot: improved icon BKrev: 41c5aa5a7IWF5Ube0D2iBFyvlqa7Ww --- packages/gnuplot/files/gnuplot.png | Bin 0 -> 9383 bytes packages/gnuplot/gnuplot_4.0.0.bb | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) (limited to 'packages/gnuplot') diff --git a/packages/gnuplot/files/gnuplot.png b/packages/gnuplot/files/gnuplot.png index e69de29bb2..054cd9e7c7 100644 Binary files a/packages/gnuplot/files/gnuplot.png and b/packages/gnuplot/files/gnuplot.png differ diff --git a/packages/gnuplot/gnuplot_4.0.0.bb b/packages/gnuplot/gnuplot_4.0.0.bb index e69de29bb2..ca7194ff99 100644 --- a/packages/gnuplot/gnuplot_4.0.0.bb +++ b/packages/gnuplot/gnuplot_4.0.0.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "Gnuplot is a portable command-line driven interactive datafile \ +(text or binary) and function plotting utility." +SECTION = "x11/utils" +PRIORITY = "optional" +MAINTAINER = "Chris Larson " +DEPENDS = "x11 libpng gd readline" +PR = "r1" + +SRC_URI = "ftp://ftp.gnuplot.info/pub/gnuplot/gnuplot-${PV}.tar.gz \ + file://subdirs.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/ +} -- cgit v1.2.3 From 8ba79f8f234d8a6b7b4fdcdc3a8889d18929bda5 Mon Sep 17 00:00:00 2001 From: Greg Gilbert Date: Tue, 25 Jan 2005 22:51:21 +0000 Subject: xxf86vmext_cvs.bb: Adding license to xxf86vmext/xxf86vmext_cvs.bb xxf86dgaext_cvs.bb: Adding license to xxf86dgaext/xxf86dgaext_cvs.bb xtrans_cvs.bb: Adding license to xtrans/xtrans_cvs.bb xtrans_0.1.bb: Adding license to xtrans/xtrans_0.1.bb xset_20040817.bb: Adding license to xset/xset_20040817.bb xserver-xorg_cvs.bb: Adding license to xserver/xserver-xorg_cvs.bb xserver-xorg_6.8.bb: Adding license to xserver/xserver-xorg_6.8.bb xserver-kdrive_cvs.bb: Adding license to xserver/xserver-kdrive_cvs.bb xqt_0.0.9.bb: Adding license to xqt/xqt_0.0.9.bb xprop_cvs.bb: Adding license to xprop/xprop_cvs.bb xprint_0.9.001.bb: Adding license to xprint/xprint_0.9.001.bb xmu_cvs.bb: Adding license to xmu/xmu_cvs.bb xmodmap_cvs.bb: Adding license to xmodmap/xmodmap_cvs.bb xmame_0.87.bb: Adding license to xmame/xmame_0.87.bb xmame_0.86.bb: Adding license to xmame/xmame_0.86.bb xinerama_cvs.bb: Adding license to xinerama/xinerama_cvs.bb xinerama_1.0.2.bb: Adding license to xinerama/xinerama_1.0.2.bb xhost_20040413.bb: Adding license to xhost/xhost_20040413.bb xfonts-xorg_6.8.bb: Adding license to xfonts/xfonts-xorg_6.8.bb xfont_cvs.bb: Adding license to xfont/xfont_cvs.bb xfont_1.4.2.bb: Adding license to xfont/xfont_1.4.2.bb xdpyinfo_cvs.bb: Adding license to xdpyinfo/xdpyinfo_cvs.bb xdemineur_2.1.1.bb: Adding license to xdemineur/xdemineur_2.1.1.bb xcompmgr_cvs.bb: Adding license to xcompmgr/xcompmgr_cvs.bb xcalibrate_cvs.bb: Adding license to xcalibrate/xcalibrate_cvs.bb xaw_cvs.bb: Adding license to xaw/xaw_cvs.bb xaw_7.0.2.bb: Adding license to xaw/xaw_7.0.2.bb xauth_cvs.bb: Adding license to xauth/xauth_cvs.bb resourceext_1.0.bb: Adding license to resourceext/resourceext_1.0.bb recordext_cvs.bb: Adding license to recordext/recordext_cvs.bb libxxf86vm_cvs.bb: Adding license to libxxf86vm/libxxf86vm_cvs.bb libxxf86dga_cvs.bb: Adding license to libxxf86dga/libxxf86dga_cvs.bb libxsettings-client_0.12.bb: Adding license to libxsettings-client/libxsettings-client_0.12.bb libxrandr_cvs.bb: Adding license to libxrandr/libxrandr_cvs.bb libxrandr_1.0.2.bb: Adding license to libxrandr/libxrandr_1.0.2.bb libxp_cvs.bb: Adding license to libxp/libxp_cvs.bb ipaq-sleep_0.8.bb: Adding license to ipaq-sleep/ipaq-sleep_0.8.bb ipaq-sleep_0.7-9.bb: Adding license to ipaq-sleep/ipaq-sleep_0.7-9.bb ipaq-boot-params.bb: Adding license to ipaq-boot-params/ipaq-boot-params.bb imlib2_1.2.0.bb: Adding license to imlib2/imlib2_1.2.0.bb imlib2-native_1.1.0.bb: Adding license to imlib2/imlib2-native_1.1.0.bb gtk2-theme-angelistic_0.3.bb: Adding license to gtk2-theme-angelistic/gtk2-theme-angelistic_0.3.bb osb-nrcit_0.5.0.bb: Adding license to gtk-webcore/osb-nrcit_0.5.0.bb gtk-doc.bb: Adding license to gtk-doc/gtk-doc.bb gnuplot_4.0.0.bb: Adding license to gnuplot/gnuplot_4.0.0.bb fsi-client_20040803.bb: Adding license to fsi-client/fsi-client_20040803.bb fs_cvs.bb: Adding license to fs/fs_cvs.bb freetype_2.1.8.bb: Adding license to freetype/freetype_2.1.8.bb freetype_2.1.7.bb: Adding license to freetype/freetype_2.1.7.bb freetype-native_2.1.8.bb: Adding license to freetype/freetype-native_2.1.8.bb freetype-native_2.1.7.bb: Adding license to freetype/freetype-native_2.1.7.bb fget_1.2.9.bb: Adding license to fget/fget_1.2.9.bb fdclock_cvs.bb: Adding license to fdclock/fdclock_cvs.bb drm_cvs.bb: Adding license to dri/drm_cvs.bb drm-kernel_cvs.bb: Adding license to dri/drm-kernel_cvs.bb detect-stylus_0.13.bb: Adding license to detect-stylus/detect-stylus_0.13.bb detect-stylus_0.10.bb: Adding license to detect-stylus/detect-stylus_0.10.bb bl_cvs.bb: Adding license to bl/bl_cvs.bb BKrev: 41f6cd69S7RQhBxixpSbW_wAmpo_lQ --- packages/gnuplot/gnuplot_4.0.0.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'packages/gnuplot') diff --git a/packages/gnuplot/gnuplot_4.0.0.bb b/packages/gnuplot/gnuplot_4.0.0.bb index ca7194ff99..8fae783654 100644 --- a/packages/gnuplot/gnuplot_4.0.0.bb +++ b/packages/gnuplot/gnuplot_4.0.0.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Gnuplot is a portable command-line driven interactive datafile \ (text or binary) and function plotting utility." SECTION = "x11/utils" +LICENSE = "BSD-4" PRIORITY = "optional" MAINTAINER = "Chris Larson " DEPENDS = "x11 libpng gd readline" -- cgit v1.2.3 From dba2b89720b0318a28ebe7778294873b9353f71d Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Wed, 23 Feb 2005 12:47:30 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/02/23 12:40:33+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/02/23 12:36:37+01:00 uni-frankfurt.de!mickeyl Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/02/23 11:34:13+01:00 mn-solutions.de!schurig Merge http://oe-devel@openembedded.bkbits.net/openembedded into mnz66.mn-solutions.de:/usr/src/oe/p 2005/02/23 11:33:31+01:00 mn-solutions.de!schurig fix installation stage 2005/02/23 09:27:44+00:00 (none)!xora New upstream version of kismet, fixes for compilation problems, and change of maintainer with Brunos permission 2005/02/23 01:11:25+01:00 uni-frankfurt.de!mickeyl add a sharprom-compatible distro configuration. relies on an external 2.95.3 toolchain (for now... until someone adds it to OE) and needs further work. It's a start for someone interested though. 2005/02/23 01:09:23+01:00 uni-frankfurt.de!mickeyl bump cvsdate on oz-3.5.3 2005/02/22 17:37:44-06:00 ti.com!kergoth Fix the quilt PATCHCMD to stop rampantly chmod'ing, which made the CVS directories not executable, thereby screwing up the ability to rm -rf tmp. Thanks to holger freyther for pointing it out. BKrev: 421c7b62hBWfitoVhb3IO3ZT5nS71A --- packages/gnuplot/gnuplot_4.0.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/gnuplot') diff --git a/packages/gnuplot/gnuplot_4.0.0.bb b/packages/gnuplot/gnuplot_4.0.0.bb index 8fae783654..6f475e37f6 100644 --- a/packages/gnuplot/gnuplot_4.0.0.bb +++ b/packages/gnuplot/gnuplot_4.0.0.bb @@ -23,7 +23,7 @@ EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR}/.. \ do_install_append() { install -d ${D}${datadir}/applications/ - install -m 0644 ${WORKDIR}/gnuplot.desktop ${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/ } -- cgit v1.2.3 From 1355303914be1425c03dee529fc65badbfec9386 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 3 Mar 2005 15:42:16 +0000 Subject: add updated gnuplot stuff courtesy Philip Frampton BKrev: 422730585MVRGwh5lsoHCNdVd1_Q_Q --- packages/gnuplot/files/matrix.patch | 0 packages/gnuplot/files/qtopia.trm | 0 packages/gnuplot/files/subdirs.patch | 0 packages/gnuplot/files/term.patch | 0 packages/gnuplot/gnuplot-4.0.0/subdirs.patch | 0 packages/gnuplot/gnuplot-qt_4.0.0.bb | 0 packages/gnuplot/gnuplot-x11_4.0.0.bb | 0 packages/gnuplot/gnuplot_4.0.0.bb | 21 +++++++++++++++------ 8 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 packages/gnuplot/files/matrix.patch create mode 100644 packages/gnuplot/files/qtopia.trm create mode 100644 packages/gnuplot/files/subdirs.patch create mode 100644 packages/gnuplot/files/term.patch delete mode 100644 packages/gnuplot/gnuplot-4.0.0/subdirs.patch create mode 100644 packages/gnuplot/gnuplot-qt_4.0.0.bb create mode 100644 packages/gnuplot/gnuplot-x11_4.0.0.bb (limited to 'packages/gnuplot') diff --git a/packages/gnuplot/files/matrix.patch b/packages/gnuplot/files/matrix.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gnuplot/files/qtopia.trm b/packages/gnuplot/files/qtopia.trm new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gnuplot/files/subdirs.patch b/packages/gnuplot/files/subdirs.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gnuplot/files/term.patch b/packages/gnuplot/files/term.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gnuplot/gnuplot-4.0.0/subdirs.patch b/packages/gnuplot/gnuplot-4.0.0/subdirs.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gnuplot/gnuplot-qt_4.0.0.bb b/packages/gnuplot/gnuplot-qt_4.0.0.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gnuplot/gnuplot-x11_4.0.0.bb b/packages/gnuplot/gnuplot-x11_4.0.0.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gnuplot/gnuplot_4.0.0.bb b/packages/gnuplot/gnuplot_4.0.0.bb index 6f475e37f6..3c9c4bc61c 100644 --- a/packages/gnuplot/gnuplot_4.0.0.bb +++ b/packages/gnuplot/gnuplot_4.0.0.bb @@ -1,16 +1,20 @@ DESCRIPTION = "Gnuplot is a portable command-line driven interactive datafile \ (text or binary) and function plotting utility." -SECTION = "x11/utils" +SECTION = "console/scientific" LICENSE = "BSD-4" PRIORITY = "optional" -MAINTAINER = "Chris Larson " -DEPENDS = "x11 libpng gd readline" -PR = "r1" +MAINTAINER = "Philip Frampton" +DEPENDS = "libpng gd readline" +RCONFLICTS = "gnuplot-qt gnuplot-x11" +PR = "r2" SRC_URI = "ftp://ftp.gnuplot.info/pub/gnuplot/gnuplot-${PV}.tar.gz \ + file://matrix.patch;patch=1 \ file://subdirs.patch;patch=1 \ + file://term.patch;patch=1 \ file://gnuplot.desktop \ - file://gnuplot.png" + file://gnuplot.png \ + file://qtopia.trm" inherit autotools acpaths = "" @@ -19,7 +23,12 @@ EXTRA_OECONF = "--with-readline=${STAGING_LIBDIR}/.. \ --with-png=${STAGING_LIBDIR}/.. \ --with-gd=${STAGING_LIBDIR}/.. \ --without-lisp-files \ - --without-tutorial" + --without-tutorial \ + --without-x" + +do_compile_prepend(){ + install -m 0644 ${WORKDIR}/qtopia.trm ${S}/term/ +} do_install_append() { install -d ${D}${datadir}/applications/ -- cgit v1.2.3 From b61893ae19edc009182bad57b92a9df0f13172cc Mon Sep 17 00:00:00 2001 From: Rene Wagner Date: Thu, 3 Mar 2005 22:55:27 +0000 Subject: 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 --- .../files/debian-separate-x11-package.patch | 0 packages/gnuplot/gnuplot-qt_4.0.0.bb | 0 packages/gnuplot/gnuplot-x11_4.0.0.bb | 0 packages/gnuplot/gnuplot_4.0.0.bb | 25 +++++++++++++--------- 4 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 packages/gnuplot/files/debian-separate-x11-package.patch delete mode 100644 packages/gnuplot/gnuplot-qt_4.0.0.bb delete mode 100644 packages/gnuplot/gnuplot-x11_4.0.0.bb (limited to 'packages/gnuplot') diff --git a/packages/gnuplot/files/debian-separate-x11-package.patch b/packages/gnuplot/files/debian-separate-x11-package.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gnuplot/gnuplot-qt_4.0.0.bb b/packages/gnuplot/gnuplot-qt_4.0.0.bb deleted file mode 100644 index e69de29bb2..0000000000 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 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() { -- cgit v1.2.3 From 1a2e6c445e603732bbeaa20be89c33400e90ac80 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 6 Mar 2005 16:32:42 +0000 Subject: Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into handhelds.org:/home/ich/programming/oe/openembedded 2005/03/06 17:32:12+01:00 handhelds.org!zecke xine for Opie: -Do not try to build caca video output plugins 2005/03/05 16:45:28+01:00 handhelds.org!zecke Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into handhelds.org:/home/ich/programming/oe/openembedded 2005/03/05 16:44:50+01:00 handhelds.org!zecke Qt Plot: On request of Rene Wagner add qtplot bb to oe BKrev: 422b30aav7PznehYtlvNIYlUtLtj6Q --- packages/gnuplot/qtplot_0.2.bb | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 packages/gnuplot/qtplot_0.2.bb (limited to 'packages/gnuplot') diff --git a/packages/gnuplot/qtplot_0.2.bb b/packages/gnuplot/qtplot_0.2.bb new file mode 100644 index 0000000000..e69de29bb2 -- cgit v1.2.3 From c8e5702127e507e82e6f68a4b8c546803accea9d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 30 Jun 2005 08:19:37 +0000 Subject: import clean BK tree at cset 1.3670 --- packages/gnuplot/.mtn2git_empty | 0 packages/gnuplot/files/.mtn2git_empty | 0 .../files/debian-separate-x11-package.patch | 59 +++ packages/gnuplot/files/gnuplot.desktop | 8 + packages/gnuplot/files/matrix.patch | 17 + packages/gnuplot/files/qtopia.trm | 483 +++++++++++++++++++++ packages/gnuplot/files/subdirs.patch | 16 + packages/gnuplot/files/term.patch | 20 + packages/gnuplot/qtplot_0.2.bb | 26 ++ 9 files changed, 629 insertions(+) create mode 100644 packages/gnuplot/.mtn2git_empty create mode 100644 packages/gnuplot/files/.mtn2git_empty (limited to 'packages/gnuplot') diff --git a/packages/gnuplot/.mtn2git_empty b/packages/gnuplot/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gnuplot/files/.mtn2git_empty b/packages/gnuplot/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gnuplot/files/debian-separate-x11-package.patch b/packages/gnuplot/files/debian-separate-x11-package.patch index e69de29bb2..7afa0ee00e 100644 --- a/packages/gnuplot/files/debian-separate-x11-package.patch +++ b/packages/gnuplot/files/debian-separate-x11-package.patch @@ -0,0 +1,59 @@ +--- gnuplot-4.0.0.orig/src/term.c ++++ gnuplot-4.0.0/src/term.c +@@ -1278,6 +1278,33 @@ + return (t); + } + ++#ifdef X11 ++int ++x11driver_found() ++{ ++ char *binname = "/gnuplot_x11"; ++ char *fullname; ++ struct stat buf; ++ ++ fullname = (char*)malloc(sizeof(X11_DRIVER_DIR) + sizeof(binname) + 1); ++ strcat(fullname, X11_DRIVER_DIR); ++ strcat(fullname, binname); ++ ++ /* exists? */ ++ if (stat(fullname, &buf)) { ++ free(fullname); ++ return 0; ++ } ++ ++ free(fullname); ++ /* executable? */ ++ if (buf.st_mode && S_IXOTH) ++ return 1; ++ ++ return 0; ++} ++#endif ++ + /* + * Routine to detect what terminal is being used (or do anything else + * that would be nice). One anticipated (or allowed for) side effect +@@ -1356,12 +1383,18 @@ + env_term = getenv("TERM"); /* try $TERM */ + if (term_name == (char *) NULL + && env_term != (char *) NULL && strcmp(env_term, "xterm") == 0) +- term_name = "x11"; ++ term_name = "x11"; + display = getenv("DISPLAY"); + if (term_name == (char *) NULL && display != (char *) NULL) +- term_name = "x11"; ++ term_name = "x11"; + if (X11_Display) +- term_name = "x11"; ++ term_name = "x11"; ++ /* if x11 was selected check for driver */ ++ if (term_name && (strcmp(term_name, "x11") == 0) && !x11driver_found() && isatty(fileno(stdin))) { ++ printf("*** X11 output driver not found, switching to dumb terminal!\n"); ++ printf("*** If you want to use the X11 output, please install the ""gnuplot-x11"" package\n"); ++ term_name = "dumb"; ++ }; + #endif /* x11 */ + + #ifdef AMIGA + diff --git a/packages/gnuplot/files/gnuplot.desktop b/packages/gnuplot/files/gnuplot.desktop index e69de29bb2..f108e3f46f 100644 --- a/packages/gnuplot/files/gnuplot.desktop +++ b/packages/gnuplot/files/gnuplot.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Gnuplot +Comment=Plot data and function graphs +Exec=x-terminal-emulator -e gnuplot +Terminal=0 +Type=Application +Icon=gnuplot.png +Categories=Scientific diff --git a/packages/gnuplot/files/matrix.patch b/packages/gnuplot/files/matrix.patch index e69de29bb2..10f56d9f6a 100644 --- a/packages/gnuplot/files/matrix.patch +++ b/packages/gnuplot/files/matrix.patch @@ -0,0 +1,17 @@ +--- gnuplot-4.0.0/src/matrix.c.old 2004-04-13 18:23:58.000000000 +0100 ++++ gnuplot-4.0.0/src/matrix.c 2005-03-01 12:38:07.068232748 +0000 +@@ -290,9 +290,12 @@ + *d = 1.0; + for (ar = a, lim = &(a[n]); ar < lim; ar++) { + large = 0.0; +- for (ac = *ar, limc = &(ac[n]); ac < limc;) +- if ((temp = fabs(*ac++)) > large) ++ for (ac = *ar, limc = &(ac[n]); ac < limc;){ ++ temp = *ac++; ++ temp = fabs(temp); ++ if (temp > large) + large = temp; ++ } + if (large == 0.0) + int_error(NO_CARET, "Singular matrix in LU-DECOMP"); + *dp++ = 1 / large; diff --git a/packages/gnuplot/files/qtopia.trm b/packages/gnuplot/files/qtopia.trm index e69de29bb2..b52f9bb975 100644 --- a/packages/gnuplot/files/qtopia.trm +++ b/packages/gnuplot/files/qtopia.trm @@ -0,0 +1,483 @@ +/* + * $Id: dumb.trm,v 1.16 2004/04/13 17:24:16 broeker Exp $ + * + */ + +/* GNUPLOT - qtopia.trm */ + +/*[ + * Copyright 1991 - 1993, 1998, 2004 Thomas Williams, Colin Kelley + * + * Permission to use, copy, and distribute this software and its + * documentation for any purpose with or without fee is hereby granted, + * provided that the above copyright notice appear in all copies and + * that both that copyright notice and this permission notice appear + * in supporting documentation. + * + * Permission to modify the software is granted, but not the right to + * distribute the complete modified source code. Modifications are to + * be distributed as patches to the released version. Permission to + * distribute binaries produced by compiling modified sources is granted, + * provided you + * 1. distribute the corresponding source modifications from the + * released version in the form of a patch file along with the binaries, + * 2. add special version identification to distinguish your version + * in addition to the base release version number, + * 3. provide your name and address as the primary contact for the + * support of your modified version, and + * 4. retain our contact information in regard to use of the base + * software. + * Permission to distribute the released version of the source code along + * with corresponding source modifications in the form of a patch file is + * granted with same provisions 2 through 4 for binary distributions. + * + * This software is provided "as is" without express or implied warranty + * to the extent permitted by applicable law. +]*/ + +/* + * This file is included by ../term.c. + * + * This terminal driver supports: + * qtopia terminals + * + * AUTHORS + * Michael Neuroth, 2004-05-16 + * INTERNET: michael.neuroth@freenet.de + * + * send your comments or suggestions to (gnuplot-info@lists.sourceforge.net). + * + */ +#include "driver.h" + +#define NO_QTOPIA_ENHANCED_SUPPORT + +#ifdef TERM_REGISTER +register_term(qtopia_driver) +#endif + +#ifdef TERM_PROTO +TERM_PUBLIC void QTOPIA_options __PROTO((void)); +TERM_PUBLIC void QTOPIA_init __PROTO((void)); +TERM_PUBLIC void QTOPIA_graphics __PROTO((void)); +TERM_PUBLIC void QTOPIA_text __PROTO((void)); +TERM_PUBLIC void QTOPIA_reset __PROTO((void)); +TERM_PUBLIC void QTOPIA_linetype __PROTO((int linetype)); +TERM_PUBLIC void QTOPIA_move __PROTO((unsigned int x, unsigned int y)); +TERM_PUBLIC void QTOPIA_point __PROTO((unsigned int x, unsigned int y, + int point)); +TERM_PUBLIC void QTOPIA_vector __PROTO((unsigned int x, unsigned int y)); +TERM_PUBLIC void QTOPIA_put_text __PROTO((unsigned int x, unsigned int y, + const char *str)); +TERM_PUBLIC void QTOPIA_arrow __PROTO((unsigned int sx, unsigned int sy, + unsigned int ex, unsigned int ey, + int head)); + +#define ENHqtopia_put_text NULL + + +#define QTOPIA_XMAX 4096 +#define QTOPIA_YMAX 4096 + +#ifdef ZAURUS +#define QTOPIA_VCHAR (QTOPIA_YMAX/25) +#define QTOPIA_HCHAR (QTOPIA_XMAX/40) +#define QTOPIA_VTIC (QTOPIA_YMAX/50) +#define QTOPIA_HTIC (QTOPIA_XMAX/40) +#else +#define QTOPIA_VCHAR (QTOPIA_YMAX/25) +#define QTOPIA_HCHAR (QTOPIA_XMAX/50) +#define QTOPIA_VTIC (QTOPIA_YMAX/100) +#define QTOPIA_HTIC (QTOPIA_XMAX/150) +#endif + +#endif /* TERM_PROTO */ + +#ifdef TERM_BODY + +/*#include */ +/* needs: ws2_32.lib */ +#ifndef _MSC_VER +#include +#include +#include +#include +#endif + +#define QTOPIA_MAX_BUFFER 512 +#define QTOPIA_MAX_DELAY_COUNT 20 /* * 100 ms = 2 s */ + +#ifdef _MSC_VER +#define QTOPIA_BAD_SOCKET INVALID_SOCKET /* -1 */ +#define QTOPIA_BAD_CONNECT SOCKET_ERROR +#else +#define QTOPIA_BAD_SOCKET -1 +#define QTOPIA_BAD_CONNECT -1 +#endif +#define QTOPIA_PORT_NO 5050 + +static int qtopia_client_socket = QTOPIA_BAD_SOCKET; +static unsigned short qtopia_port_no = QTOPIA_PORT_NO; +static char qtopia_host_name[QTOPIA_MAX_BUFFER+1] = { "localhost" }; + +static int OpenClient __PROTO(( int test)); +static void CloseClient(); + +static void MySleep( delay ) +int delay; +{ +#ifdef _MSC_VER + Sleep( delay ); +#else + usleep( delay ); +#endif +} + +static void InitSockets() +{ +#ifdef _MSC_VER + WORD wVersionRequested; + WSADATA wsaData; + int err; + + wVersionRequested = MAKEWORD( 2, 2 ); + + err = WSAStartup( wVersionRequested, &wsaData ); +#endif +} + +static void ExitSockets() +{ +#ifdef _MSC_VER + WSACleanup(); +#endif +} + +static int CheckForQtplot( count ) +int count; +{ + /* test (via sockets) if qtplot is allready running */ + if( !OpenClient( 1 ) ) + { + /* give qtplot a litle bit time to start... */ + if( count < QTOPIA_MAX_DELAY_COUNT ) + { + if( count == 0 ) + { +#ifdef _MSC_VER + system( "start qtplot" ); +#else + system( "qtplot&" ); +#endif + } + + MySleep(100); + + return CheckForQtplot( count+1 ); + } + else + { + return 0; + } + } + else + { + CloseClient(); + + return 1; + } +} + +static int OpenClient( test ) +int test; +{ + int len; + struct sockaddr_in address; + int result; + + /* Create a socket for the client. */ + + qtopia_client_socket = socket(AF_INET, SOCK_STREAM, 0); + + if( qtopia_client_socket != QTOPIA_BAD_SOCKET ) + { + /* Name the socket, as agreed with the server. */ + + address.sin_family = AF_INET; + address.sin_addr.s_addr = inet_addr(/*qtopia_host_name*/"127.0.0.1"); /* localhost */ + address.sin_port = htons(qtopia_port_no); + len = sizeof(address); + + /* Now connect our socket to the server's socket. */ + + result = connect(qtopia_client_socket, (struct sockaddr *)&address, len); + + if( result == QTOPIA_BAD_SOCKET ) + { + /* mark this socket as bad */ + + close( qtopia_client_socket ); + + qtopia_client_socket = QTOPIA_BAD_SOCKET; + + if( !test ) + { + fprintf( gpoutfile, "error connecting to server !\n" ); + } + return 0; /* something went wrong */ + } + } + else + { + if( !test ) + { + fprintf( gpoutfile, "error creating socket !\n" ); + } + return 0; /* something went wrong */ + } + + return 1; /* everything ist ok ! */ +} + +static void CloseClient() +{ + close( qtopia_client_socket ); +} + +static int IsClientOk() +{ + return qtopia_client_socket != QTOPIA_BAD_SOCKET; +} + +static void SendDataToSocket( sLine ) +const char * sLine; +{ + if( IsClientOk() ) + { + int send_count; + + send_count = send( qtopia_client_socket, sLine, strlen( sLine ), 0 ); + + if( send_count <= 0 ) + { + fprintf( gpoutfile, "error writing to socket str=%s!\n", sLine ); + } + /* + else + { + fprintf( gpoutfile, "wrote %d bytes\n", send_count ); + } + */ + } + else + { + /* for testing... */ + /*fprintf( gpoutfile, sLine );*/ + } +} + +/* ************************************************** */ + +enum QTOPIA_id { QTOPIA_PORT, QTOPIA_HOST, QTOPIA_OTHER }; + +static struct gen_table QTOPIA_opts[] = +{ + { "po$rt", QTOPIA_PORT }, + { "ho$st", QTOPIA_HOST }, + { NULL, QTOPIA_OTHER } +}; + +TERM_PUBLIC void +QTOPIA_options() +{ + /* this is not for the qtopia terminal ! */ + /*SendDataToSocket( "qtd options\n" );*/ + + int x, y; + struct value a; + + while (!END_OF_COMMAND) + { + switch(lookup_table(&QTOPIA_opts[0],c_token)) + { + case QTOPIA_PORT: + c_token++; + if (END_OF_COMMAND) + int_error(c_token, "expecting port number"); + qtopia_port_no = (int) real(const_express(&a)); + break; + case QTOPIA_HOST: + c_token++; + if (END_OF_COMMAND) + int_error(c_token, "expecting host name"); + if (isstring(c_token)) + quote_str( qtopia_host_name, c_token, sizeof(qtopia_host_name) ); + else + copy_str( qtopia_host_name, c_token, sizeof(qtopia_host_name) ); + c_token++; + break; + case QTOPIA_OTHER: + default: + break; + } + } + + sprintf(term_options, "host=%s port=%d",qtopia_host_name,qtopia_port_no); +} + + +TERM_PUBLIC void +QTOPIA_init() +{ + /* initialize lib (if necassary) */ + InitSockets(); + CheckForQtplot( 0 ); + OpenClient( 0 ); + + SendDataToSocket( "qtd init\n" ); +} + + +TERM_PUBLIC void +QTOPIA_graphics() +{ + SendDataToSocket( "qtd graphics\n" ); +} + +TERM_PUBLIC void +QTOPIA_text() +{ + SendDataToSocket( "qtd text\n" ); +} + + +TERM_PUBLIC void +QTOPIA_reset() +{ + SendDataToSocket( "qtd reset\n" ); + + /* give the qtplot a litle bit time to shutdown */ + MySleep(100); + + CloseClient(); + ExitSockets(); +} + + +TERM_PUBLIC void +QTOPIA_linetype(linetype) +int linetype; +{ + char sBuffer[QTOPIA_MAX_BUFFER]; + + sprintf( sBuffer, "qtd linetype type=%d\n",linetype ); + + SendDataToSocket( sBuffer ); +} + + +TERM_PUBLIC void +QTOPIA_move(x, y) +unsigned int x, y; +{ + char sBuffer[QTOPIA_MAX_BUFFER]; + + sprintf( sBuffer, "qtd move x=%d y=%d\n",x,y ); + + SendDataToSocket( sBuffer ); +} + + +TERM_PUBLIC void +QTOPIA_point(x, y, point) +unsigned int x, y; +int point; +{ + char sBuffer[QTOPIA_MAX_BUFFER]; + + sprintf( sBuffer, "qtd point x=%d y=%d point=%d\n",x,y,point ); + + SendDataToSocket( sBuffer ); +} + + +TERM_PUBLIC void +QTOPIA_vector(_x, _y) +unsigned int _x, _y; +{ + char sBuffer[QTOPIA_MAX_BUFFER]; + + sprintf( sBuffer, "qtd vector x=%d y=%d\n",_x,_y ); + + SendDataToSocket( sBuffer ); +} + + +TERM_PUBLIC void +QTOPIA_put_text(x, y, str) +unsigned int x, y; +const char *str; +{ + char sBuffer[QTOPIA_MAX_BUFFER]; + + sprintf( sBuffer, "qtd put_text x=%d y=%d str=%s\n",x,y,str ); + + SendDataToSocket( sBuffer ); +} + +/* not suported yet ! */ +TERM_PUBLIC void +QTOPIA_arrow(sx, sy, ex, ey, head) + unsigned int sx, sy, ex, ey; + int head; /* ignored */ +{ + char sBuffer[QTOPIA_MAX_BUFFER]; + + sprintf( sBuffer, "qtd arrow sx=%d sy=%d ex=%d ey=%d head=%d\n",sx,sy,ex,ey,head ); + + SendDataToSocket( sBuffer ); +} + + +#endif /* TERM_BODY */ + +#ifdef TERM_TABLE +TERM_TABLE_START(qtopia_driver) + "qtopia", "qtopia or Qt", + QTOPIA_XMAX, QTOPIA_YMAX, QTOPIA_VCHAR, QTOPIA_HCHAR, + QTOPIA_VTIC, QTOPIA_HTIC, QTOPIA_options, QTOPIA_init, QTOPIA_reset, + QTOPIA_text, null_scale, QTOPIA_graphics, QTOPIA_move, QTOPIA_vector, + QTOPIA_linetype, QTOPIA_put_text, null_text_angle, + null_justify_text, QTOPIA_point, /*QTOPIA_arrow*/0, set_font_null, + 0, /* pointsize */ + TERM_CAN_MULTIPLOT, + NULL, NULL, NULL, NULL +#ifdef USE_MOUSE + , NULL, NULL, NULL, NULL, NULL +#endif +#ifdef PM3D + , NULL, NULL, NULL, NULL +#endif +TERM_TABLE_END(qtopia_driver) + +#undef LAST_TERM +#define LAST_TERM qtopia_driver + +#endif /* TERM_TABLE */ + +#ifdef TERM_HELP +START_HELP(qtopia) +"1 qtopia", +"?commands set terminal qtopia", +"?set terminal qtopia", +"?set term qtopia", +"?terminal qtopia", +"?term qtopia", +"?qtopia", +" The `qtopia` terminal driver has no additional options.", +"", +" Syntax:", +" set terminal qtopia", +"" +END_HELP(qtopia) +#endif /* TERM_HELP */ diff --git a/packages/gnuplot/files/subdirs.patch b/packages/gnuplot/files/subdirs.patch index e69de29bb2..69c7753973 100644 --- a/packages/gnuplot/files/subdirs.patch +++ b/packages/gnuplot/files/subdirs.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- gnuplot-4.0.0/Makefile.am~nodocs ++++ gnuplot-4.0.0/Makefile.am +@@ -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 lisp man demo tutorial ++SUBDIRS = config m4 term src man tutorial + + EXTRA_DIST = BUGS CodeStyle Copyright FAQ GNUmakefile INSTALL INSTALL.gnu \ + Makefile.maint PATCHLEVEL PGPKEYS PORTING README README.1ST README.exp \ diff --git a/packages/gnuplot/files/term.patch b/packages/gnuplot/files/term.patch index e69de29bb2..2979b5ec9e 100644 --- a/packages/gnuplot/files/term.patch +++ b/packages/gnuplot/files/term.patch @@ -0,0 +1,20 @@ +--- gnuplot-4.0.0/src/term.h.old 2005-03-01 15:17:46.424111687 +0000 ++++ gnuplot-4.0.0/src/term.h 2005-03-01 15:18:50.961405665 +0000 +@@ -54,6 +54,7 @@ + */ + #ifdef SHORT_TERMLIST + # include "dumb.trm" /* dumb terminal */ ++# include "qtopia.trm" /* QTopia terminal */ + # include "post.trm" /* postscript */ + # include "table.trm" /* built-in, but used for the documentation */ + # if !(defined(OS2) || defined(MSDOS) || defined(_Windows) || defined(ATARI) || defined(MTOS) || defined(AMIGA)) +@@ -432,6 +433,9 @@ + /* TeXDraw drawing package for LaTeX */ + #include "texdraw.trm" + ++/* Qtopia */ ++#include "qtopia.trm" ++ + /* METAFONT */ + #include "metafont.trm" + diff --git a/packages/gnuplot/qtplot_0.2.bb b/packages/gnuplot/qtplot_0.2.bb index e69de29bb2..0f7ddf1937 100644 --- a/packages/gnuplot/qtplot_0.2.bb +++ b/packages/gnuplot/qtplot_0.2.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "QT Gnuplot is a front end for Gnuplot. Install Opie-Embedded \ +console to enable the Launch Gnuplot menu option." +SECTION = "opie/applications" +PRIORITY = "optional" +MAINTAINER = "Philip Frampton" +LICENSE = "GPL" +PRIORITY = "optional" + +DEPENDS = "gnuplot" +RDEPDENDS = "gnuplot" + +HOMEPAGE = "http://www.mneuroth.de/privat/zaurus/gnuplot.html" +SRC_URI = "http://www.mneuroth.de/privat/zaurus/qtplot-${PV}.tar.gz" + +APPTYPE = "binary" +APPDESKTOP = "${S}" + +inherit opie + +do_install_prepend() { + install -d ${D}${palmtopdir}/pics + install -d ${D}${palmtopdir}/help/html + + install -m 644 Qtplot.png ${D}${palmtopdir}/pics/ + install -m 644 qtplot.html ${D}${palmtopdir}/help/html/ +} -- cgit v1.2.3