diff options
| author | Florian Franzmann | 2013-03-07 20:10:41 +0100 |
|---|---|---|
| committer | Florian Franzmann | 2013-03-07 20:11:39 +0100 |
| commit | 04f240a7a468dda42ea834c18b5af3fa45b4dd84 (patch) | |
| tree | 4feadc61182c0b028030a7bae14c1ad4e4d87130 | |
| parent | 440b94e2311b13de00e64bc2e6ad7a3c30f3d4fa (diff) | |
utils/gnuplot: version 4.6.1
| -rwxr-xr-x | utils/gnuplot/DETAILS | 6 | ||||
| -rw-r--r-- | utils/gnuplot/HISTORY | 4 | ||||
| -rwxr-xr-x | utils/gnuplot/PRE_BUILD | 5 | ||||
| -rw-r--r-- | utils/gnuplot/automake-1.12.patch | 36 |
4 files changed, 8 insertions, 43 deletions
diff --git a/utils/gnuplot/DETAILS b/utils/gnuplot/DETAILS index 7e4552ba12..af7773f021 100755 --- a/utils/gnuplot/DETAILS +++ b/utils/gnuplot/DETAILS @@ -11,11 +11,11 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-cvs SOURCE_URL[0]=cvs://:pserver:anonymous@gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot:gnuplot SOURCE_IGNORE=volatile else - VERSION=4.6.0 + VERSION=4.6.1 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION - SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE - SOURCE_HASH=sha512:a4358c20577f978215a22db041f4d369ab69a88624b2fe831d2a1124fffb84d4dafa7f0f5a8bfdb388c663073570adb084949195c6eebd0f11f9b0ac4485debc + SOURCE_URL[0]=${SOURCEFORGE_URL}/${SPELL}/${SPELL}/${VERSION}/${SOURCE} + SOURCE_HASH=sha512:a6a05da6708a7f5629d8356901e93ab622d4a3a6325e050fc1f8dce652e6061164783a98ff5cbc2dede65f6f0cb5be6a1ab2fcaeb778f6879215bae7056bd3ed fi WEB_SITE=http://www.gnuplot.info ENTERED=20020210 diff --git a/utils/gnuplot/HISTORY b/utils/gnuplot/HISTORY index 42d40d3966..235543c135 100644 --- a/utils/gnuplot/HISTORY +++ b/utils/gnuplot/HISTORY @@ -1,3 +1,7 @@ +2013-03-07 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * DETAILS: version 4.6.1, fix SOURCE_URL[0] + * PRE_BUILD, automake-1.12.patch: removed patch + 2012-06-11 Sukneet Basuta <sukneet@sourcemage.org> * PRE_BUILD: apply fix for automake-1.12 * automake-1.12.patch: added, patch for automake 1.12. diff --git a/utils/gnuplot/PRE_BUILD b/utils/gnuplot/PRE_BUILD index fa1663b627..5d1ed15174 100755 --- a/utils/gnuplot/PRE_BUILD +++ b/utils/gnuplot/PRE_BUILD @@ -4,10 +4,7 @@ cd "$SOURCE_DIRECTORY" && # Hopefully fixed in gnuplot 4.7 . patch -Np0 < "$SPELL_DIRECTORY/crossbuild.patch" && -patch -p0 < $SPELL_DIRECTORY/automake-1.12.patch && - -# remove the true when removing the patch above -if true || [[ $GNUPLOT_BRANCH == scm ]]; then +if [[ $GNUPLOT_BRANCH == scm ]]; then cd "$SOURCE_DIRECTORY" && autoreconf -iv fi diff --git a/utils/gnuplot/automake-1.12.patch b/utils/gnuplot/automake-1.12.patch deleted file mode 100644 index 30d976ddb8..0000000000 --- a/utils/gnuplot/automake-1.12.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- Makefile.am 2012/01/14 08:18:00 1.20.2.1 -+++ Makefile.am 2012/05/08 20:28:19 1.20.2.2 -@@ -1,5 +1,5 @@ - ## Process this file with automake to produce Makefile.in -*-Makefile-*- --AUTOMAKE_OPTIONS = foreign 1.2h -+AUTOMAKE_OPTIONS = foreign - - SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share - ---- src/Makefile.am 2012/01/19 07:03:27 1.86.2.3 -+++ src/Makefile.am 2012/05/08 20:28:20 1.86.2.4 -@@ -1,5 +1,5 @@ - ## Process this file with automake to produce Makefile.in -*-Makefile-*- --AUTOMAKE_OPTIONS = ansi2knr foreign 1.2h -+AUTOMAKE_OPTIONS = foreign - - # in the spirit of automake ... - pkglibexecdir = $(libexecdir)/@PACKAGE@/@VERSION_MAJOR@ ---- configure.in 2012/04/26 22:53:11 1.297.2.14 -+++ configure.in 2012/05/08 20:28:19 1.297.2.15 -@@ -20,11 +20,12 @@ - dnl configure.in body - - dnl Compiler characteristics --dnl Check for ANSI C prototypes, the const and inline keywords, --dnl and ANSI style stringification -+dnl Check for the const and inline keywords and ANSI style stringification -+dnl automake 1.12 dropped support for AM_C_PROTOTYPES and ansi2knr -+dnl But our code still tests for #ifdef PROTOTYPES, so define it here -+AC_DEFINE(PROTOTYPES,1,[Automake 1.12 dropped support for building without prototypes]) - AC_GNU_SOURCE - AC_PROG_CC --AM_C_PROTOTYPES - AC_PROG_CPP - AC_C_CONST - AC_C_INLINE |