summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Dittrich <markusle@gentoo.org>2008-11-01 15:10:31 +0000
committerMarkus Dittrich <markusle@gentoo.org>2008-11-01 15:10:31 +0000
commit73e0e5ea7d0146c31732ac0ec250d4102e4ec4d4 (patch)
tree10d2ca57913f0099b3a440b04209ab00cd6327b9 /sci-misc/gri
parentFix bug #245147. Thanks to Graham Derryberry <asterion@alum.mit.edu> for the ... (diff)
downloadhistorical-73e0e5ea7d0146c31732ac0ec250d4102e4ec4d4.tar.gz
historical-73e0e5ea7d0146c31732ac0ec250d4102e4ec4d4.tar.bz2
historical-73e0e5ea7d0146c31732ac0ec250d4102e4ec4d4.zip
Added patch to support proper postscript output (see bug #158828).
Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-SENTINEL-1 i686
Diffstat (limited to 'sci-misc/gri')
-rw-r--r--sci-misc/gri/ChangeLog7
-rw-r--r--sci-misc/gri/Manifest5
-rw-r--r--sci-misc/gri/files/gri-2.12.18-postscript.patch97
-rw-r--r--sci-misc/gri/gri-2.12.18.ebuild8
4 files changed, 113 insertions, 4 deletions
diff --git a/sci-misc/gri/ChangeLog b/sci-misc/gri/ChangeLog
index a904a43d1b75..7f3b5c580713 100644
--- a/sci-misc/gri/ChangeLog
+++ b/sci-misc/gri/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sci-misc/gri
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/gri/ChangeLog,v 1.23 2008/09/27 11:01:32 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/gri/ChangeLog,v 1.24 2008/11/01 15:10:31 markusle Exp $
+
+ 01 Nov 2008; Markus Dittrich <markusle@gentoo.org>
+ +files/gri-2.12.18-postscript.patch, gri-2.12.18.ebuild:
+ Added patch to support proper postscript output (see bug #158828).
+ Thanks much to Sebastiaan for his patch.
*gri-2.12.18 (27 Sep 2008)
diff --git a/sci-misc/gri/Manifest b/sci-misc/gri/Manifest
index fc8e85a2a052..ea19a0266bc8 100644
--- a/sci-misc/gri/Manifest
+++ b/sci-misc/gri/Manifest
@@ -1,9 +1,10 @@
AUX 50gri-gentoo.el 194 RMD160 11c28779dbc9bfcf77fa0a6a050ebbbeed46447d SHA1 6ede13b897b046a5b96fd83c11020f6d8b002c2f SHA256 cbb65e82e4b35f63c3006fe386d4d930f604a12ae12159d1b6c61b9223b68efa
+AUX gri-2.12.18-postscript.patch 3997 RMD160 4b390be9c915573812ba2e3d2289b2d9037e85ad SHA1 c2993812fc3fbbbbb21bd0516c43e094d6a78090 SHA256 2d3c2d44f39507270581744de930fb92bdcab6c5e3d846653e08ccfec07375b9
DIST gri-2.12.16.tar.gz 1431717 RMD160 c42d77d4af370b7a0119e6b10ba69e18a1ed775a SHA1 941881ad6d8c766b0112d15cfab10889fc6da2f6 SHA256 dfe384cc8ebd82760b9c8a1af9644a69a995b2d4bd0f166abb667c918bd68df3
DIST gri-2.12.17.tar.gz 1670243 RMD160 772f77d78948219db7b2c604a03f488681abc427 SHA1 b7d277f05dd789505e7679612f2d9a87b74a8054 SHA256 e0e58308eda79001bce91ac70f3e84423d51219b52cfb988a874c6ac5eb6dfd4
DIST gri-2.12.18.tar.gz 1672471 RMD160 fbf66ac8c40010749c40ed96bf5f6b0086cfa0e9 SHA1 978f7ebcff13bbc830b90a5d58b01acbf0321057 SHA256 0f434b0d11775767030ff33d63aefcdf4ae5077b3dd8fd0ea1dbd0d20b3a0ca7
EBUILD gri-2.12.16-r1.ebuild 2009 RMD160 ed60f65be286c077c6e608608225d82cc638413a SHA1 cabbd3cdc8604080c8cb4c842188c3f21efa8106 SHA256 5304caae621c0c8d05df4171a6b947fddbf71e77ce07e875ac6e121e74ba4d79
EBUILD gri-2.12.17.ebuild 2008 RMD160 c3d50d90183c1fb9ee339c2b02b80708f707c1e4 SHA1 de99915ed0d14a140376c9685ef2f1bc33352d2b SHA256 8b6e16d43640ce33f941abdad0882696fc445009b34a93f2529de1835988ee4d
-EBUILD gri-2.12.18.ebuild 2013 RMD160 9481f8ab83f46d933b4acd4f9830bb7e55ba3197 SHA1 e283f4c01c814f240f93228654abad7e551bb3e8 SHA256 e778b70344c68efd9201fb3ac988291557fb2b2239ca1c847f9b0a4e34d6eb71
-MISC ChangeLog 5267 RMD160 2ff42331dee8851759215a7054a5713916505ee0 SHA1 f116e37d9fd3f1e9d94b92cc58af1358aceb1d53 SHA256 bcb6c42038c8fb84279c232af5d75c522570794cacea20952b4612dcc3498b84
+EBUILD gri-2.12.18.ebuild 2099 RMD160 ac2cbbb50742271a93c7e29c88a434868299fb80 SHA1 e083117c22fad88153d7c0004e4e17b88be058c2 SHA256 f93e4563215f3e4a65bac6f5a8489ca33aac20d6328ed7031529be34416d257d
+MISC ChangeLog 5493 RMD160 f02442be6ed54f6a361118da59b25b96abcd424e SHA1 f33b1970e3991b33b9754896b95310c5de3ffd60 SHA256 734acc7fdc79902332ec0aac38574c48089deff9687d7b8407713e1a93f24e08
MISC metadata.xml 175 RMD160 369480802064328bcb4b293dcdf9b0db2acc1a14 SHA1 5b64fbb76e5bd297a21b64990d5c87ecd3c3ade0 SHA256 65307ae1ea731454f30f453db37e77be6595a54f7889777b02cf34becf5b6675
diff --git a/sci-misc/gri/files/gri-2.12.18-postscript.patch b/sci-misc/gri/files/gri-2.12.18-postscript.patch
new file mode 100644
index 000000000000..b3f3b7301975
--- /dev/null
+++ b/sci-misc/gri/files/gri-2.12.18-postscript.patch
@@ -0,0 +1,97 @@
+diff -Naur gri-2.12.18/src/extern.hh gri-2.12.18.new/src/extern.hh
+--- gri-2.12.18/src/extern.hh 2003-06-07 13:37:55.000000000 -0400
++++ gri-2.12.18.new/src/extern.hh 2008-11-01 10:46:40.000000000 -0400
+@@ -137,6 +137,7 @@
+
+ extern int _arrow_type;
+ extern bool _warn_offpage;
++extern bool _export_postscript;
+
+ extern std::vector<double> _dash;
+
+diff -Naur gri-2.12.18/src/gr.cc gri-2.12.18.new/src/gr.cc
+--- gri-2.12.18/src/gr.cc 2008-09-04 13:32:21.000000000 -0400
++++ gri-2.12.18.new/src/gr.cc 2008-11-01 10:52:24.000000000 -0400
+@@ -397,7 +397,16 @@
+ /*
+ * write conforming postscript prolog
+ */
+- fprintf(fp, "%%!PS-Adobe-2.0 EPSF-1.2\n");
++ //fprintf(fp, "%%!PS-Adobe-2.0 EPSF-1.2\n");
++ extern bool _export_postscript;
++ if (_export_postscript)
++ {
++ fprintf(fp, "%%!PS-Adobe-2.0\n");
++ }
++ else
++ {
++ fprintf(fp, "%%!PS-Adobe-2.0 EPSF-1.2\n");
++ }
+ if (privacy)
+ fprintf(fp, "%%%%Creator: %s\n", "");
+ else
+diff -Naur gri-2.12.18/src/gri.cc gri-2.12.18.new/src/gri.cc
+--- gri-2.12.18/src/gri.cc 2006-06-16 19:18:40.000000000 -0400
++++ gri-2.12.18.new/src/gri.cc 2008-11-01 10:46:40.000000000 -0400
+@@ -35,6 +35,7 @@
+ // Globals used elsewhere (variables begin with _).
+ int _arrow_type;
+ bool _warn_offpage;
++bool _export_postscript;
+ std::vector<double> _dash;
+ std::vector<DataFile> _dataFILE;
+ std::vector<CmdFile> _cmdFILE;
+diff -Naur gri-2.12.18/src/startup.cc gri-2.12.18.new/src/startup.cc
+--- gri-2.12.18/src/startup.cc 2008-06-12 08:57:26.000000000 -0400
++++ gri-2.12.18.new/src/startup.cc 2008-11-01 10:57:26.000000000 -0400
+@@ -188,6 +188,7 @@
+ _axes_offset = 0.0;
+ _use_default_for_query = false;
+ _warn_offpage = true;
++ _export_postscript = false;
+ PUT_VAR("..use_default_for_query..", 0.0);
+ PUT_VAR("..words_in_dataline..", 0.0); // just in case tested
+ PUT_VAR("..batch..", 0.0);
+@@ -681,6 +682,7 @@
+ #define FLAG_PUBLICATION 1009
+ #define FLAG_SUPERUSER 1010
+ #define FLAG_WARN_OFFPAGE 1011
++#define FLAG_POSTSCRIPT 1012
+ // I use the 'FLAG_...' numbers for options that lack single-character abbreviations.
+ static struct poptOption optionsTable[] = {
+ { "batch", 'b', POPT_ARG_NONE | POPT_ARGFLAG_ONEDASH, NULL, 'b' },
+@@ -703,6 +705,7 @@
+ { "version", 'v', POPT_ARG_NONE | POPT_ARGFLAG_ONEDASH, NULL, 'v' },
+ { "warn_offpage", '\0', POPT_ARG_NONE | POPT_ARGFLAG_ONEDASH, NULL, FLAG_WARN_OFFPAGE },
+ { "yes", 'y', POPT_ARG_NONE | POPT_ARGFLAG_ONEDASH, NULL, 'y' },
++ { "postscript", '\0', POPT_ARG_NONE | POPT_ARGFLAG_ONEDASH, NULL, FLAG_POSTSCRIPT },
+ { 0, 0, 0, 0, 0 }
+ };
+ const poptContext optCon =
+@@ -872,6 +875,8 @@
+ printf("Gri cannot read in '%s'\n",optArg);
+ }
+ break;
++ case FLAG_POSTSCRIPT
++ _export_postscript = true;
+ default:
+ printf("Unknown option\n");
+ break;
+@@ -1058,6 +1063,8 @@
+ } else if (!strcmp(argv[i], "-y") || !strcmp(argv[i], "-yes")) {
+ _use_default_for_query = true;
+ PUT_VAR("..use_default_for_query..", 1.0);
++ } else if (!strcmp(argv[i], "-postscript")){
++ _export_postscript = true;
+ #if 0
+ } else if (!strcmp(argv[i], "-e")) {
+ // User wants to do cmd in argv[i+1]
+@@ -1190,6 +1197,8 @@
+ gr_textput(" Makes Gri print out command lines as they are executed.\n");
+ gr_textput(" -true or -y\n");
+ gr_textput(" Makes Gri think the answer to all `query's is RETURN.\n");
++ gr_textput(" -postscript\n");
++ gr_textput(" Export a PostScript file instead of an EPS file.\n");
+ #if 0
+ gr_textput(" -e cmd\n");
+ gr_textput(" BUG: NOT IMPLEMENTED YET!\n");
diff --git a/sci-misc/gri/gri-2.12.18.ebuild b/sci-misc/gri/gri-2.12.18.ebuild
index 146f5aa1d51f..79874b775ae6 100644
--- a/sci-misc/gri/gri-2.12.18.ebuild
+++ b/sci-misc/gri/gri-2.12.18.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/gri/gri-2.12.18.ebuild,v 1.1 2008/09/27 11:01:32 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/gri/gri-2.12.18.ebuild,v 1.2 2008/11/01 15:10:31 markusle Exp $
inherit eutils elisp-common
@@ -22,6 +22,12 @@ DEPEND=">=sci-libs/netcdf-3.5.0
SITEFILE="50gri-gentoo.el"
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-postscript.patch
+}
+
src_compile() {
econf || die "econf failed."
emake || die "emake failed."