From 02e2208f46f4e2c00fb9743cbc47350bdd233bfa Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 16 Jan 2018 17:34:21 +0000 Subject: gentoo resync : 16.01.2018 --- .../pari/files/pari-2.9.4-no-automagic.patch | 66 ++++++++++++++++++++++ sci-mathematics/pari/files/pari-2.9.4-ppc.patch | 9 +++ sci-mathematics/pari/files/pari-2.9.4-strip.patch | 10 ++++ 3 files changed, 85 insertions(+) create mode 100644 sci-mathematics/pari/files/pari-2.9.4-no-automagic.patch create mode 100644 sci-mathematics/pari/files/pari-2.9.4-ppc.patch create mode 100644 sci-mathematics/pari/files/pari-2.9.4-strip.patch (limited to 'sci-mathematics/pari/files') diff --git a/sci-mathematics/pari/files/pari-2.9.4-no-automagic.patch b/sci-mathematics/pari/files/pari-2.9.4-no-automagic.patch new file mode 100644 index 000000000000..3612d8f020fc --- /dev/null +++ b/sci-mathematics/pari/files/pari-2.9.4-no-automagic.patch @@ -0,0 +1,66 @@ +diff -r -U2 pari-2.9.4.orig/config/Makefile.SH pari-2.9.4/config/Makefile.SH +--- pari-2.9.4.orig/config/Makefile.SH 2017-11-09 16:26:14.000000000 +0700 ++++ pari-2.9.4/config/Makefile.SH 2018-01-13 17:31:02.404210285 +0700 +@@ -80,10 +80,10 @@ + graph=plotQt;; + Qt4) +- PLOTCFLAGS='-D__FANCY_WIN__ -I$(QTDIR)/include' +- PLOTLIBS="-L\$(QTDIR)/lib $QTLIB" ++ PLOTCFLAGS='-D__FANCY_WIN__ `pkg-config --cflags QtGui`' ++ PLOTLIBS="`pkg-config --libs QtGui`" + graph=plotQt4;; + fltk) +- PLOTCFLAGS= +- PLOTLIBS="$FLTK_LIBS" ++ PLOTCFLAGS="`fltk-config --cxxflags` $X11_INC" ++ PLOTLIBS="`fltk-config --ldflags`" + postconfig='fltk-config --post ' + graph=plotfltk;; +@@ -277,5 +277,5 @@ + # Graphic library. + QTDIR = "$QTDIR" +-MOC = \$(QTDIR)/bin/moc ++MOC = "`which moc`" + PLOTCFLAGS = $PLOTCFLAGS + PLOTLIBS = $PLOTLIBS +diff -r -U2 pari-2.9.4.orig/config/get_Qt pari-2.9.4/config/get_Qt +--- pari-2.9.4.orig/config/get_Qt 2017-05-12 16:45:12.000000000 +0700 ++++ pari-2.9.4/config/get_Qt 2018-01-13 17:35:49.481198212 +0700 +@@ -6,5 +6,5 @@ + yes) + pth="/usr/local/lib /usr/local/share /usr/lib /usr/share" +- QTDIR=`locatedir qt4/bin $pth` ++ QTDIR=`locatedir qt4 $pth` + if test -n "$QTDIR"; then + QTLIB="-lQtCore -lQtGui" +diff -r -U2 pari-2.9.4.orig/config/get_config_options pari-2.9.4/config/get_config_options +--- pari-2.9.4.orig/config/get_config_options 2017-11-09 16:26:14.000000000 +0700 ++++ pari-2.9.4/config/get_config_options 2018-01-13 17:38:39.264191072 +0700 +@@ -87,8 +87,10 @@ + with_ncurses_lib=`echo "$1" | sed -e 's/[-a-z]*=//'` ;; + ++ --without-qt|--with-qt=no) without_qt=yes ;; + --with-qt) with_qt=yes ;; + --with-qt=*) + with_qt=`echo "$1" | sed -e 's/[-a-z]*=//'` ;; + ++ --without-fltk|--with-fltk=no) without_fltk=yes ;; + --with-fltk) with_fltk=yes ;; + --with-fltk=*) +@@ -168,5 +170,7 @@ + + --with-qt[=DIR] use the Qt graphical library [prefix for Qt dir.] ++ --without-qt do not try to use the Qt lib + --with-fltk use the FLTK graphical library [need fltk-config] ++ --without-fltk do not try to use the FLTK lib + + Miscellaneous +diff -r -U2 pari-2.9.4.orig/config/get_graphic_lib pari-2.9.4/config/get_graphic_lib +--- pari-2.9.4.orig/config/get_graphic_lib 2017-11-09 16:26:14.000000000 +0700 ++++ pari-2.9.4/config/get_graphic_lib 2018-01-13 17:42:45.760180706 +0700 +@@ -8,4 +8,5 @@ + if test -n "$with_fltk"; then which_graphic_lib=fltk; fi + if test -n "$with_qt"; then which_graphic_lib=Qt; fi ++if test -n "$without_fltk" -a -n "$without_qt"; then which_graphic_lib=none; fi + if test "$fastread" != yes; then + cat << EOT diff --git a/sci-mathematics/pari/files/pari-2.9.4-ppc.patch b/sci-mathematics/pari/files/pari-2.9.4-ppc.patch new file mode 100644 index 000000000000..558f7eb9eda4 --- /dev/null +++ b/sci-mathematics/pari/files/pari-2.9.4-ppc.patch @@ -0,0 +1,9 @@ +diff -r -U2 pari-2.9.4.orig/config/arch-osname pari-2.9.4/config/arch-osname +--- pari-2.9.4.orig/config/arch-osname 2011-09-23 03:02:11.000000000 +0700 ++++ pari-2.9.4/config/arch-osname 2018-01-13 16:22:39.623382825 +0700 +@@ -40,4 +40,5 @@ + linux) arch=`uname -m` + case $arch in ++ ppc) arch=powerpc;; + sparc64) arch=sparcv9;; + parisc*) arch=hppa;; diff --git a/sci-mathematics/pari/files/pari-2.9.4-strip.patch b/sci-mathematics/pari/files/pari-2.9.4-strip.patch new file mode 100644 index 000000000000..f4a8af322c45 --- /dev/null +++ b/sci-mathematics/pari/files/pari-2.9.4-strip.patch @@ -0,0 +1,10 @@ +diff -r -U2 pari-2.9.4.orig/config/Makefile.SH pari-2.9.4/config/Makefile.SH +--- pari-2.9.4.orig/config/Makefile.SH 2017-11-09 16:26:14.000000000 +0700 ++++ pari-2.9.4/config/Makefile.SH 2018-01-13 16:18:04.208394407 +0700 +@@ -250,5 +250,5 @@ + LN = $ln_s + CP_F = cp -f +-STRIP = strip ++STRIP = true + STRIPFLAGS = + -- cgit v1.2.3