Ticket #10114: pari-2.4.3.alpha0.p0.patch

File pari-2.4.3.alpha0.p0.patch, 8.3 KB (added by jdemeyer, 12 years ago)

spkg patch for reference

  • SPKG.txt

    # HG changeset patch
    # User Jeroen Demeyer <jdemeyer@cage.ugent.be>
    # Date 1288901471 -3600
    # Node ID 66fcd4b37c83ea7a764fc9ab5189afb17689e2ad
    # Parent  68dcdadb38db85a0f16db725a48619a8af50ee05
    #10114: Upgrade PARI to 2.4.3
    === pari-2.4.3.alpha.p0 (Jeroen Demeyer, November 4th, 2010) ===
     * Update to PARI 2.4.3 (by using SVN revision 12623).  Note that the
       PARI developers consider version 2.4.3 to be an "alpha" version with
       the idea that 2.4.4 might be a "beta" version and 2.5 will then be
       the "stable" version.
     * Removed patch for gphelp.in which is now upstream
     * Removed patch for paripriv.h because of an upstream change removing
       the need for the patch
     * Rebased patch for config/get_fltk
    
    diff -r 68dcdadb38db -r 66fcd4b37c83 SPKG.txt
    a b  
    4242in the script spkg-make.  Normally, the following should work.  In case
    4343of doubt, have a look at the file spkg-make.
    4444
    45   0) Edit the line "svn update -r 12577" in spkg-make and set the
     45  0) Edit the line "svn update -r 12623" in spkg-make and set the
    4646     desired SVN version.
    4747
    4848  1) ./spkg-make
     
    8383
    8484== Changelog ==
    8585
     86=== pari-2.4.3.alpha.p0 (Jeroen Demeyer, November 4th, 2010) ===
     87 * Update to PARI 2.4.3 (by using SVN revision 12623).  Note that the
     88   PARI developers consider version 2.4.3 to be an "alpha" version with
     89   the idea that 2.4.4 might be a "beta" version and 2.5 will then be
     90   the "stable" version.
     91 * Removed patch for gphelp.in which is now upstream
     92 * Removed patch for paripriv.h because of an upstream change removing
     93   the need for the patch
     94 * Rebased patch for config/get_fltk
     95
    8696=== pari-2.4.3.svn-12577.p9 (Jeroen Demeyer, September 24th, 2010) ===
    8797 * Add gprc.expect file to be installed in $SAGE_LOCAL/etc
    8898 * Remove $detex = 1; from gphelp.in patch
  • patches/README.txt

    diff -r 68dcdadb38db -r 66fcd4b37c83 patches/README.txt
    a b  
    33longer, or are still but now for a different reason. (Do not delete that!)
    44
    55======================================================================
    6 Files patched as of pari-2.4.3.svn-12577.p7:
     6Files patched as of pari-2.4.3.alpha.p0:
    77======================================================================
    88
    99Configuration files:
     
    1717* config/get_dlcflags: Add -fno-common to DLCFLAGS on Darwin.  Fixed
    1818  upstream, but probably in a bad way.
    1919
    20 Documentation:
    21 * doc/gphelp.in: cwitty: allow bz2 compression.
    22 
    23 Header files:
    24 * src/headers/paripriv.h: *After* building, on {OS X, SunOS, CYGWIN},
    25                           rename "ECHO".
    26 
    2720C files:
    2821* src/kernel/gmp/mp.c: Needed so that Sage can catch PARI's error signals.
    2922                       Also allow disabling use of "GMP internals".
     
    6861  in spkg-install.
    6962* src/basemath/base2.c and src/basemath/polarit3.c: Fix PARI bug 1079.
    7063  Now fixed upstream.
     64* doc/gphelp.in: cwitty: allow bz2 compression.  Now upstream.
     65* src/headers/paripriv.h: *After* building, on {OS X, SunOS, CYGWIN},
     66  rename "ECHO".  Upstream changed ECHO to gpd_ECHO, so the patch is
     67  not needed anymore.
     68
  • patches/get_fltk.patch

    diff -r 68dcdadb38db -r 66fcd4b37c83 patches/get_fltk.patch
    a b  
    1 --- config/get_fltk     2010-08-22 21:26:01.000000000 +0200
    2 +++ config/get_fltk     2010-09-06 10:23:09.000000000 +0200
    3 @@ -10,19 +10,25 @@
     1--- config/get_fltk     2010-11-04 14:51:50.910510930 +0100
     2+++ config/get_fltk     2010-11-04 14:59:12.158786073 +0100
     3@@ -10,18 +10,24 @@
    44    fi
    55    ;;
    66 *) if test ! -d "$with_fltk"; then
     
    1111   fi;;
    1212 esac
    1313 if test -n "$FLTKDIR"; then
    14    case "$FLTKDIR" in /) FLTKDIR=;; esac
    1514-  echo "Using FLTK library, FLTKDIR = $FLTKDIR"
    1615+  if test -d "$FLTKDIR/include/FL"; then
    1716+    echo "Using FLTK library, FLTKDIR = \"$FLTKDIR\""
  • deleted file patches/gphelp.in.patch

    diff -r 68dcdadb38db -r 66fcd4b37c83 patches/gphelp.in.patch
    + -  
    1 --- doc/gphelp.in       (revision 12541)
    2 +++ doc/gphelp.in       (working copy)
    3 @@ -51,6 +51,8 @@
    4  $xdviref = $ENV{GPXDVIREF} || "$xdvi -paper 29.7x21cm";
    5  $gzip = "gzip";
    6  $zcat = "$gzip -dc";
    7 +$bzip = "bzip2";
    8 +$bzcat = "$bzip -dc";
    9  $docdir = &get_docdir();
    10  
    11  $refcard = (@ARGV and $ARGV[-1] =~ /refcard/i);
    12 @@ -171,8 +175,14 @@
    13      die "Cannot find $docfile"
    14        if (! -r "$docfile.z" &&
    15            ! -r "$docfile.gz" &&
    16 -          ! -r "$docfile.Z");
    17 -    $pipe = $zcat;
    18 +          ! -r "$docfile.Z" &&
    19 +          ! -r "$docfile.bz2");
    20 +    if (-r "$docfile.bz2") {
    21 +        $pipe = $bzcat;
    22 +        $docfile = "$docfile.bz2";
    23 +    } else {
    24 +        $pipe = $zcat;
    25 +    }
    26    }
    27  }
    28  
  • deleted file patches/paripriv.h.patch

    diff -r 68dcdadb38db -r 66fcd4b37c83 patches/paripriv.h.patch
    + -  
    1 --- src/headers/paripriv.h      (revision 12541)
    2 +++ src/headers/paripriv.h      (working copy)
    3 @@ -333,7 +333,11 @@
    4    pari_timer *T;
    5  } gp_data;
    6    /* GP_DATA->flags */
    7 -enum { QUIET=1, TEST=2, SIMPLIFY=4, CHRONO=8, ECHO=16, STRICTMATCH=32,
    8 +
    9 +/* The ECHO symbol is already defined in Sage when building on OS X. Since this is paripriv.h,
    10 +   it's very unlikely that anything in here is used, so this should be safe. */
    11 +
    12 +enum { QUIET=1, TEST=2, SIMPLIFY=4, CHRONO=8, xxECHOxx=16, STRICTMATCH=32,
    13         USE_READLINE=64, SECURE=128, EMACS=256, TEXMACS=512, BREAKLOOP=1024,
    14         RECOVER=2048};
    15  
  • spkg-install

    diff -r 68dcdadb38db -r 66fcd4b37c83 spkg-install
    a b  
    3131# cwitty: Disable -rpath:
    3232cp "$PATCHED/get_ld" config/
    3333
    34 # cwitty: Disable TeX; allow bz2 compression:
    35 cp "$PATCHED/gphelp.in" doc/
    36 
    3734# John Cremona: Copy over a lightly patched get_tests, so that "make
    3835# test-all" does not test ellglobalred (which requires the elldata
    3936# package Sage does not install, nor ship, since it is about 14 MB):
     
    281278        cd "`config/objdir`"
    282279        cp -f libpari* "$SAGE_LOCAL"/lib
    283280        cd "$CUR"
    284 
    285         # Also another patch since paripriv.h won't compile right on OS X
    286         # when used by client Sage code.  So we replace it by a slightly
    287         # modified version:
    288         echo "Patching include/pari/paripriv.h so it works on Mac OS X..."
    289         cp -pf "$PATCHED/paripriv.h" "$SAGE_LOCAL/include/pari/paripriv.h"
    290 
    291     elif [ "$UNAME" = "SunOS" ]; then
    292         # Like on Mac OS X (see above), the Sage library would not build
    293         # without some changes on Solaris, though the changes are much simpler:
    294         echo "Patching include/pari/paripriv.h so it works on Solaris..."
    295         cp -f "$PATCHED/paripriv.h" "$SAGE_LOCAL/include/pari/paripriv.h"
    296 
    297     elif [ "$UNAME" = "CYGWIN" ]; then
    298         # We need to the same thing on Cygwin that we have to do on Solaris
    299         echo "Patching include/pari/paripriv.h so it works on Cygwin..."
    300         cp -f "$PATCHED/paripriv.h" "$SAGE_LOCAL/include/pari/paripriv.h"
    301281    fi
    302282
    303283    echo "Installing extra Galois groups data..."
  • spkg-make

    diff -r 68dcdadb38db -r 66fcd4b37c83 spkg-make
    a b  
    5959
    6060# Use the specified SVN version
    6161cd parisvn
    62 svn update -r 12577
    63 
    64 # Patch config/Makefile.SH (for Solaris)
    65 # <http://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?bug=1091>
    66 svn update -r 12588 config/Makefile.SH
    67 
    68 # Patch src/test/tune.c (fix tuning)
    69 # <http://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?bug=1089>
    70 svn update -r 12588 src/test/tune.c
    71 
    72 # Add -fno-common to DLCFLAGS on Darwin
    73 # <http://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?bug=1088>
    74 svn update -r 12594 config/get_dlcflags
    75 
    76 # Fix bnfinit() and the rnfkummer test
    77 # <http://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?bug=1099>
    78 svn update -r 12596 src/test/*/rnfkummer src/basemath/buch2.c
    79 
    80 # Fix segmentation fault in rnfequation(,,1) over Q
    81 # <http://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?bug=1079>
    82 svn update -r 12605 src/basemath/polarit3.c src/basemath/base2.c
     62svn update -r 12623   # 12623 is PARI 2.4.3
    8363
    8464
    8565# make pari (must run bison, etc...) but disable optimization to speed