forked from pool/gnuplot
Updating link to change in openSUSE:Factory/gnuplot revision 22.0
OBS-URL: https://build.opensuse.org/package/show/Publishing/gnuplot?expand=0&rev=a172cc558c942c02cdfef5fccc91af46
This commit is contained in:
parent
ed3d389896
commit
98d6fc3c00
@ -2,4 +2,5 @@
|
|||||||
===============================
|
===============================
|
||||||
|
|
||||||
Requires libpdf which is a commercial library and therefore not
|
Requires libpdf which is a commercial library and therefore not
|
||||||
part of SuSE LINUX.
|
part of SuSE LINUX. As a replacement the `pdfcairo' terminal
|
||||||
|
can be used to generate output in pdf.
|
||||||
|
@ -223,33 +223,57 @@
|
|||||||
pause -1 "Hit return to continue"
|
pause -1 "Hit return to continue"
|
||||||
|
|
||||||
reset
|
reset
|
||||||
|
--- src/show.c
|
||||||
|
+++ src/show.c 2010-05-10 14:04:43.814925577 +0200
|
||||||
|
@@ -1054,6 +1054,15 @@ show_version(FILE *fp)
|
||||||
|
p /* hit 'h' */
|
||||||
|
);
|
||||||
|
|
||||||
|
+#ifdef GNUPLOT_LIB_DEFAULT
|
||||||
|
+ {
|
||||||
|
+ struct stat st;
|
||||||
|
+ if ((stat(GNUPLOT_LIB_DEFAULT, &st) == 0) && S_ISDIR(st.st_mode)) {
|
||||||
|
+ fprintf(fp, "\n%s\tType `load \"all.dem\"` to display a large number of examples.", p);
|
||||||
|
+ fprintf(fp, "\n%s\tThey are located at %s/*\n\n", p, GNUPLOT_LIB_DEFAULT);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
/* show version long */
|
||||||
|
if (almost_equals(c_token, "l$ong")) {
|
||||||
--- src/variable.c
|
--- src/variable.c
|
||||||
+++ src/variable.c 2009-06-15 12:01:39.000000000 +0000
|
+++ src/variable.c 2009-06-15 12:01:39.000000000 +0000
|
||||||
@@ -37,7 +37,7 @@ static char *RCSid() { return RCSid("$Id
|
@@ -37,7 +37,10 @@ static char *RCSid() { return RCSid("$Id
|
||||||
/* The Death of Global Variables - part one. */
|
/* The Death of Global Variables - part one. */
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
-
|
-
|
||||||
+#include <stdio.h>
|
+#include <stdio.h>
|
||||||
|
+#include <sys/types.h>
|
||||||
|
+#include <sys/stat.h>
|
||||||
|
+#include <unistd.h>
|
||||||
#include "variable.h"
|
#include "variable.h"
|
||||||
|
|
||||||
#include "alloc.h"
|
#include "alloc.h"
|
||||||
@@ -95,6 +95,14 @@ loadpath_handler(int action, char *path)
|
@@ -95,6 +98,17 @@ loadpath_handler(int action, char *path)
|
||||||
if (!loadpath)
|
if (!loadpath)
|
||||||
{
|
{
|
||||||
char *envlib = getenv("GNUPLOT_LIB");
|
char *envlib = getenv("GNUPLOT_LIB");
|
||||||
+#ifdef GNUPLOT_LIB_DEFAULT
|
+#ifdef GNUPLOT_LIB_DEFAULT
|
||||||
+ char *defenvlib = (char*)0;
|
+ char *defenvlib = (char*)0;
|
||||||
+ if (envlib) {
|
+ struct stat st;
|
||||||
+ if (asprintf(&defenvlib, "%s:%s", envlib, GNUPLOT_LIB_DEFAULT) > 0)
|
+ if ((stat(GNUPLOT_LIB_DEFAULT, &st) == 0) && S_ISDIR(st.st_mode)) {
|
||||||
+ envlib = defenvlib;
|
+ if (envlib) {
|
||||||
+ } else
|
+ if (asprintf(&defenvlib, "%s:%s", envlib, GNUPLOT_LIB_DEFAULT) > 0)
|
||||||
+ envlib = GNUPLOT_LIB_DEFAULT;
|
+ envlib = defenvlib;
|
||||||
|
+ } else
|
||||||
|
+ envlib = GNUPLOT_LIB_DEFAULT;
|
||||||
|
+ }
|
||||||
+#endif /* GNUPLOT_LIB_DEFAULT */
|
+#endif /* GNUPLOT_LIB_DEFAULT */
|
||||||
if (envlib) {
|
if (envlib) {
|
||||||
int len = strlen(envlib);
|
int len = strlen(envlib);
|
||||||
loadpath = gp_strdup(envlib);
|
loadpath = gp_strdup(envlib);
|
||||||
@@ -103,6 +111,10 @@ loadpath_handler(int action, char *path)
|
@@ -103,6 +117,10 @@ loadpath_handler(int action, char *path)
|
||||||
/* convert all PATHSEPs to \0 */
|
/* convert all PATHSEPs to \0 */
|
||||||
PATHSEP_TO_NUL(loadpath);
|
PATHSEP_TO_NUL(loadpath);
|
||||||
} /* else: NULL = empty */
|
} /* else: NULL = empty */
|
||||||
|
@ -76,6 +76,17 @@
|
|||||||
%c l .
|
%c l .
|
||||||
%Touche fléchée@Fonction
|
%Touche fléchée@Fonction
|
||||||
%_
|
%_
|
||||||
|
--- src/gadgets.h
|
||||||
|
+++ src/gadgets.h 2010-05-10 10:57:45.850924766 +0000
|
||||||
|
@@ -389,7 +389,7 @@ extern TBOOLEAN clip_lines1;
|
||||||
|
extern TBOOLEAN clip_lines2;
|
||||||
|
extern TBOOLEAN clip_points;
|
||||||
|
|
||||||
|
-#define SAMPLES 100 /* default number of samples for a plot */
|
||||||
|
+#define SAMPLES 500 /* default number of samples for a plot */
|
||||||
|
extern int samples_1;
|
||||||
|
extern int samples_2;
|
||||||
|
|
||||||
--- src/gplt_x11.c
|
--- src/gplt_x11.c
|
||||||
+++ src/gplt_x11.c 2009-05-09 11:32:24.000000000 +0000
|
+++ src/gplt_x11.c 2009-05-09 11:32:24.000000000 +0000
|
||||||
@@ -2256,8 +2256,11 @@ exec_cmd(plot_struct *plot, char *comman
|
@@ -2256,8 +2256,11 @@ exec_cmd(plot_struct *plot, char *comman
|
||||||
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun May 9 00:00:00 CEST 2010 - dieter.jurzitza@t-online.de
|
||||||
|
|
||||||
|
- Fix AppDefDir vs. XAPPLRESDIR inconsistency, increase default number of samples.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Apr 7 10:50:19 CEST 2010 - werner@suse.de
|
Wed Apr 7 10:50:19 CEST 2010 - werner@suse.de
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@ License: BSD3c(or similar)
|
|||||||
Group: Productivity/Graphics/Visualization/Graph
|
Group: Productivity/Graphics/Visualization/Graph
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
Version: 4.4.0
|
Version: 4.4.0
|
||||||
Release: 1
|
Release: 2
|
||||||
Summary: GNUplot a Function Plotting Utility
|
Summary: GNUplot a Function Plotting Utility
|
||||||
Source0: gnuplot-%{version}.tar.bz2
|
Source0: gnuplot-%{version}.tar.bz2
|
||||||
Source2: gnuplot-fr.doc.bz2
|
Source2: gnuplot-fr.doc.bz2
|
||||||
@ -113,7 +113,7 @@ test $? -eq 0 || exit 1
|
|||||||
aclocal -I m4
|
aclocal -I m4
|
||||||
autoconf
|
autoconf
|
||||||
./configure \
|
./configure \
|
||||||
--prefix=%{_prefix} \
|
--prefix=%{_prefix} \
|
||||||
--mandir=%{_mandir} \
|
--mandir=%{_mandir} \
|
||||||
--infodir=%{_infodir} \
|
--infodir=%{_infodir} \
|
||||||
--libexecdir=%{_libdir} \
|
--libexecdir=%{_libdir} \
|
||||||
@ -122,6 +122,7 @@ test $? -eq 0 || exit 1
|
|||||||
--with-x \
|
--with-x \
|
||||||
--x-includes=%{_x11inc} \
|
--x-includes=%{_x11inc} \
|
||||||
--x-libraries=%{_x11lib}\
|
--x-libraries=%{_x11lib}\
|
||||||
|
--with-x-app-defaultdir=%{_appdef}\
|
||||||
--with-readline=gnu \
|
--with-readline=gnu \
|
||||||
--enable-history-file \
|
--enable-history-file \
|
||||||
--with-linux-vga \
|
--with-linux-vga \
|
||||||
|
Loading…
Reference in New Issue
Block a user