From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- .../grace/files/grace-5.1.21-fortran.patch | 26 ++++++++++ .../grace/files/grace-5.1.21-netcdf.patch | 11 +++++ .../grace/files/grace-5.1.22-dlmodule.patch | 12 +++++ .../grace/files/grace-5.1.22-ldflags.patch | 41 ++++++++++++++++ .../grace/files/grace-5.1.22-libpng15.patch | 19 ++++++++ .../grace/files/grace-5.1.22-mkstemp.patch | 55 ++++++++++++++++++++++ sci-visualization/grace/files/grace.desktop | 8 ++++ 7 files changed, 172 insertions(+) create mode 100644 sci-visualization/grace/files/grace-5.1.21-fortran.patch create mode 100644 sci-visualization/grace/files/grace-5.1.21-netcdf.patch create mode 100644 sci-visualization/grace/files/grace-5.1.22-dlmodule.patch create mode 100644 sci-visualization/grace/files/grace-5.1.22-ldflags.patch create mode 100644 sci-visualization/grace/files/grace-5.1.22-libpng15.patch create mode 100644 sci-visualization/grace/files/grace-5.1.22-mkstemp.patch create mode 100644 sci-visualization/grace/files/grace.desktop (limited to 'sci-visualization/grace/files') diff --git a/sci-visualization/grace/files/grace-5.1.21-fortran.patch b/sci-visualization/grace/files/grace-5.1.21-fortran.patch new file mode 100644 index 000000000000..921d965f3893 --- /dev/null +++ b/sci-visualization/grace/files/grace-5.1.21-fortran.patch @@ -0,0 +1,26 @@ +--- grace_np/gracef_np.c.orig 2008-03-03 11:45:12.000000000 +0000 ++++ grace_np/gracef_np.c 2008-03-03 12:05:37.000000000 +0000 +@@ -1,5 +1,11 @@ + #include + ++#ifdef NEED_F77_UNDERSCORE ++# define F77_FNAME(fname) fname ## _ ++#else ++# define F77_FNAME(fname) fname ++#endif ++ + #if defined(WITH_F77_WRAPPER) + + #include +@@ -8,11 +14,6 @@ + + #include "grace_np.h" + +-#ifdef NEED_F77_UNDERSCORE +-# define F77_FNAME(fname) fname ## _ +-#else +-# define F77_FNAME(fname) fname +-#endif + + typedef void (*GraceFortranFunctionType) (const char *str, int len); + static GraceFortranFunctionType fortran_error = (GraceFortranFunctionType) 0; diff --git a/sci-visualization/grace/files/grace-5.1.21-netcdf.patch b/sci-visualization/grace/files/grace-5.1.21-netcdf.patch new file mode 100644 index 000000000000..eabb27434e17 --- /dev/null +++ b/sci-visualization/grace/files/grace-5.1.21-netcdf.patch @@ -0,0 +1,11 @@ +--- configure.orig 2007-02-16 22:44:49.000000000 +0000 ++++ configure 2007-09-28 23:03:29.000000000 +0100 +@@ -15181,7 +15181,7 @@ + int main(void) { + char *vlib; + vlib = nc_inq_libvers(); +- if (strcmp(vlib, "3.0") < 0) { ++ if (((vlib[0] == '"') && (strcmp(vlib, "\"3.0") < 0)) || ((vlib[0] != '"') && (strcmp(vlib, "3.0") < 0))){ + exit(1); + } + exit(0); diff --git a/sci-visualization/grace/files/grace-5.1.22-dlmodule.patch b/sci-visualization/grace/files/grace-5.1.22-dlmodule.patch new file mode 100644 index 000000000000..9e36b34e06f4 --- /dev/null +++ b/sci-visualization/grace/files/grace-5.1.22-dlmodule.patch @@ -0,0 +1,12 @@ +--- src/dlmodule.c.orig 2005-11-13 07:45:16.000000000 +0900 ++++ src/dlmodule.c 2008-06-16 15:28:33.000000000 +0900 +@@ -89,6 +89,9 @@ + return RETURN_FAILURE; + } + ++ /* clear error indicator */ ++ dlerror(); ++ + newkey.data = dlsym(handle, dl_function); + if (!newkey.data && (error = dlerror()) != NULL) { + errmsg(error); diff --git a/sci-visualization/grace/files/grace-5.1.22-ldflags.patch b/sci-visualization/grace/files/grace-5.1.22-ldflags.patch new file mode 100644 index 000000000000..2a65cd233361 --- /dev/null +++ b/sci-visualization/grace/files/grace-5.1.22-ldflags.patch @@ -0,0 +1,41 @@ +Respect LDFLAGS + +http://bugs.gentoo.org/show_bug.cgi?id=336984 + +--- grace-5.1.22/src/Makefile ++++ grace-5.1.22/src/Makefile +@@ -37,10 +37,10 @@ + include Make.dep + + xmgrace$(EXE) : $(GROBJS) $(PARS_C) $(GUIOBJS) $(CEPHES_LIB) +- $(CC) $(CFLAGS) $(GROBJS) $(GUIOBJS) -o $@ $(LDFLAGS) $(LIBS) ++ $(CC) $(LDFLAGS) $(CFLAGS) $(GROBJS) $(GUIOBJS) -o $@ $(LIBS) + + grace$(EXE) : $(GROBJS) $(PARS_C) $(CEPHES_LIB) +- $(CC) $(CFLAGS) $(GROBJS) -o $@ $(LDFLAGS) $(LIBS) ++ $(CC) $(LDFLAGS) $(CFLAGS) $(GROBJS) -o $@ $(LIBS) + + + buildinfo$(EXE) : buildinfo$(O) +--- grace-5.1.22/auxiliary/Makefile ++++ grace-5.1.22/auxiliary/Makefile +@@ -22,7 +22,7 @@ + devclean : distclean + + convcal$(EXE) : convcal.c +- $(CC) $(CFLAGS0) $(CPPFLAGS) -o $@ convcal.c $(NOGUI_LIBS) ++ $(CC) $(LDFLAGS) $(CFLAGS0) $(CPPFLAGS) -o $@ convcal.c $(NOGUI_LIBS) + + install : $(AUXILIARIES) $(PROGRAMS) $(SCRIPTS) + $(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/auxiliary +--- grace-5.1.22/grconvert/Makefile ++++ grace-5.1.22/grconvert/Makefile +@@ -23,7 +23,7 @@ + all : $(PROG) + + $(PROG) : $(OBJS) +- $(CC) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) ++ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) + + $(OBJS) : grconvert.h + diff --git a/sci-visualization/grace/files/grace-5.1.22-libpng15.patch b/sci-visualization/grace/files/grace-5.1.22-libpng15.patch new file mode 100644 index 000000000000..43db9e0723a5 --- /dev/null +++ b/sci-visualization/grace/files/grace-5.1.22-libpng15.patch @@ -0,0 +1,19 @@ +--- src/rstdrv.c ++++ src/rstdrv.c +@@ -53,6 +53,7 @@ + #endif + + #ifdef HAVE_LIBPNG ++# include + # include + #endif + +@@ -885,7 +886,7 @@ + return; + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr, &info_ptr); + return; + } diff --git a/sci-visualization/grace/files/grace-5.1.22-mkstemp.patch b/sci-visualization/grace/files/grace-5.1.22-mkstemp.patch new file mode 100644 index 000000000000..402a5162c584 --- /dev/null +++ b/sci-visualization/grace/files/grace-5.1.22-mkstemp.patch @@ -0,0 +1,55 @@ +diff -Naur grace-5.1.22/src/editpwin.c grace-5.1.22.new/src/editpwin.c +--- grace-5.1.22/src/editpwin.c 2006-06-03 17:19:52.000000000 -0400 ++++ grace-5.1.22.new/src/editpwin.c 2008-07-26 12:45:21.000000000 -0400 +@@ -776,12 +776,12 @@ + */ + void do_ext_editor(int gno, int setno) + { +- char *fname, ebuf[256]; ++ char fname[64], ebuf[256]; + FILE *cp; + int save_autos; + +- fname = tmpnam(NULL); +- cp = grace_openw(fname); ++ strcpy(fname, "grace-XXXXXX"); ++ cp = fdopen(mkstemp(fname), "wb"); + if (cp == NULL) { + return; + } +diff -Naur grace-5.1.22/src/plotone.c grace-5.1.22.new/src/plotone.c +--- grace-5.1.22/src/plotone.c 2005-05-19 16:30:25.000000000 -0400 ++++ grace-5.1.22.new/src/plotone.c 2008-07-26 12:45:40.000000000 -0400 +@@ -121,19 +121,27 @@ + sprintf(print_file, "%s.%s", get_docbname(), dev.fext); + } + strcpy(fname, print_file); ++ prstream = grace_openw(fname); + } else { ++ int hdfd; + s = get_print_cmd(); + if (s == NULL || s[0] == '\0') { + errmsg("No print command defined, output aborted"); + return; + } +- tmpnam(fname); +- /* VMS doesn't like extensionless files */ +- strcat(fname, ".prn"); ++ strcpy(fname, "grace-hardcopy-XXXXXX"); ++ hdfd=mkstemp(fname); ++ if (hdfd == -1) { ++ errmsg("Could not create a temporary file, output aborted."); ++ return; ++ } ++ prstream = fdopen(hdfd, "wb"); ++ if (prstream == NULL) { ++ errmsg("Could not create a temporary file, output aborted."); ++ return; ++ } + } + +- prstream = grace_openw(fname); +- + if (prstream == NULL) { + return; + } diff --git a/sci-visualization/grace/files/grace.desktop b/sci-visualization/grace/files/grace.desktop new file mode 100644 index 000000000000..227d88d9cbe4 --- /dev/null +++ b/sci-visualization/grace/files/grace.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Grace +Comment=Numerical Data Processing and Visualization Tool +Exec=xmgrace +Icon=grace +Terminal=false +Type=Application +Categories=Graphics; -- cgit v1.2.3-65-gdbad