[arch-commits] Commit in sage-mathematics/trunk (3 files)
Date: Friday, August 15, 2014 @ 04:26:52
Author: arcanis
Revision: 117415
upgpkg: sage-mathematics 6.3-1
Added:
sage-mathematics/trunk/ChangeLog
Modified:
sage-mathematics/trunk/PKGBUILD
Deleted:
sage-mathematics/trunk/python-readline.patch
---+
ChangeLog |2 ++
PKGBUILD | 16 +++-
python-readline.patch | 27 ---
3 files changed, 9 insertions(+), 36 deletions(-)
Added: ChangeLog
===
--- ChangeLog (rev 0)
+++ ChangeLog 2014-08-15 02:26:52 UTC (rev 117415)
@@ -0,0 +1,2 @@
+6.3:
+upstream update
Modified: PKGBUILD
===
--- PKGBUILD2014-08-15 02:18:19 UTC (rev 117414)
+++ PKGBUILD2014-08-15 02:26:52 UTC (rev 117415)
@@ -8,8 +8,8 @@
# Special thanks to Nareto for moving the compile from the .install to the
PKGBUILD
pkgname=sage-mathematics
-pkgver=6.2
-pkgrel=2
+pkgver=6.3
+pkgrel=1
pkgdesc=Open Source Mathematics Software, free alternative to Magma, Maple,
Mathematica, and Matlab
arch=('i686' 'x86_64')
url=http://www.sagemath.org;
@@ -22,15 +22,14 @@
'openssh: to use the notebook in secure mode'
'ffmpeg: to show animations'
'cairo: R plots')
-source=(http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar;
+source=(http://boxen.math.washington.edu/home/sagemath/sage-mirror/src/sage-${pkgver}.tar.gz;
sage.service
-gf2x-sse2-i686.patch
-python-readline.patch)
+gf2x-sse2-i686.patch)
install=${pkgname}.install
-md5sums=('71aa49875797c001ce0a31409f5a1762'
+md5sums=('668f080be70ffea8d67592ca00d161eb'
'985da1c1d1dcdc3ea9aa73035cb7996b'
- 'f9d7aba4f758f4605164eb84b9e1e3ba'
- '9b27884ba756eb7990728baedf162665')
+ 'f9d7aba4f758f4605164eb84b9e1e3ba')
+changelog=ChangeLog
prepare() {
# create *.desktop file
@@ -54,7 +53,6 @@
# according to FS#34769
sed -e 's/FREETYPE/#FREETYPE/' -i ${srcdir}/sage-${pkgver}/build/install
# according to FS#39533
- cp ${srcdir}/python-readline.patch
${srcdir}/sage-${pkgver}/build/pkgs/python/patches/readline.patch
sed -e 's/READLINE/#READLINE/' -i ${srcdir}/sage-${pkgver}/build/install
# disable building gf2x with sse2 for i686
if [ ${CARCH} == i686 ]; then
Deleted: python-readline.patch
===
--- python-readline.patch 2014-08-15 02:18:19 UTC (rev 117414)
+++ python-readline.patch 2014-08-15 02:26:52 UTC (rev 117415)
@@ -1,27 +0,0 @@
a/Modules/readline.c 2013-05-12 07:32:51.0 +0400
-+++ b/Modules/readline.c 2014-03-19 16:06:05.663684577 +0400
-@@ -850,7 +850,7 @@
- * before calling the normal completer */
-
- static char **
--flex_complete(char *text, int start, int end)
-+flex_complete(const char *text, int start, int end)
- {
- #ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
- rl_completion_append_character ='\0';
-@@ -898,12 +898,12 @@
- rl_bind_key_in_map ('\t', rl_complete, emacs_meta_keymap);
- rl_bind_key_in_map ('\033', rl_complete, emacs_meta_keymap);
- /* Set our hook functions */
--rl_startup_hook = (Function *)on_startup_hook;
-+rl_startup_hook = on_startup_hook;
- #ifdef HAVE_RL_PRE_INPUT_HOOK
--rl_pre_input_hook = (Function *)on_pre_input_hook;
-+rl_pre_input_hook = on_pre_input_hook;
- #endif
- /* Set our completion function */
--rl_attempted_completion_function = (CPPFunction *)flex_complete;
-+rl_attempted_completion_function = flex_complete;
- /* Set Python word break characters */
- completer_word_break_characters =
- rl_completer_word_break_characters =
[arch-commits] Commit in sage-mathematics/trunk (3 files)
Date: Sunday, May 11, 2014 @ 21:04:51
Author: arcanis
Revision: 110984
upgpkg: sage-mathematics 6.2-1
Added:
sage-mathematics/trunk/gf2x-sse2-i686.patch
Modified:
sage-mathematics/trunk/PKGBUILD
sage-mathematics/trunk/python-readline.patch
---+
PKGBUILD | 76
gf2x-sse2-i686.patch | 10 ++
python-readline.patch |7 +---
3 files changed, 39 insertions(+), 54 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-05-11 18:59:54 UTC (rev 110983)
+++ PKGBUILD2014-05-11 19:04:51 UTC (rev 110984)
@@ -8,14 +8,14 @@
# Special thanks to Nareto for moving the compile from the .install to the
PKGBUILD
pkgname=sage-mathematics
-pkgver=6.1.1
-pkgrel=2
+pkgver=6.2
+pkgrel=1
pkgdesc=Open Source Mathematics Software, free alternative to Magma, Maple,
Mathematica, and Matlab
arch=('i686' 'x86_64')
url=http://www.sagemath.org;
license=('GPL')
#depends=('desktop-file-utils' 'java-environment=7' 'libjpeg-turbo' 'libtiff'
'libxmu' 'sqlite' 'xz')
-depends=('libatomic_ops')
+depends=('freetype2' 'libatomic_ops')
makedepends=('desktop-file-utils' 'gcc-fortran' 'gendesk')
optdepends=('imagemagick: some plotting functionality benefits from it'
'texlive-core: some plotting functionality benefits from it, also
to use SageTeX'
@@ -24,11 +24,13 @@
'cairo: R plots')
source=(http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar;
sage.service
+gf2x-sse2-i686.patch
python-readline.patch)
install=${pkgname}.install
-md5sums=('800c59f7cfa32c012f358ae240cdb2e6'
+md5sums=('71aa49875797c001ce0a31409f5a1762'
'985da1c1d1dcdc3ea9aa73035cb7996b'
- 'dbfb66f38fb4d516d1078b73fd1d54a2')
+ 'f9d7aba4f758f4605164eb84b9e1e3ba'
+ '9b27884ba756eb7990728baedf162665')
prepare() {
# create *.desktop file
@@ -42,63 +44,39 @@
--custom=X-DCOP-ServiceType=
X-KDE-SubstituteUID=false
X-KDE-Username=
-
+
# create DOT_SAGE directory
if [[ -d ${srcdir}/build ]]; then
rm -rf ${srcdir}/build
fi
mkdir ${srcdir}/build
-
+
# according to FS#34769
sed -e 's/FREETYPE/#FREETYPE/' -i ${srcdir}/sage-${pkgver}/build/install
# according to FS#39533
- ## patching python
- cd ${srcdir}/sage-${pkgver}/upstream
- tar xjf python-2.7.5.tar.bz2
- rm -rf python-2.7.5.tar.bz2
- patch -p0 -i ${srcdir}/python-readline.patch
- tar cjf python-2.7.5.tar.bz2 python-2.7.5
- rm -rf python-2.7.5
- ## fix checksums
- SUMS=$(md5sum python-2.7.5.tar.bz2 | awk '{print $1}')
- sed s/md5=[0-9a-f]\{32\}/md5=${SUMS}/ -i
${srcdir}/sage-${pkgver}/build/pkgs/python/checksums.ini
- SUMS=$(sha1sum python-2.7.5.tar.bz2 | awk '{print $1}')
- sed s/sha1=[0-9a-f]\{40\}/sha1=${SUMS}/ -i
${srcdir}/sage-${pkgver}/build/pkgs/python/checksums.ini
- SUMS=$(cksum python-2.7.5.tar.bz2 | awk '{print $1}')
- sed s/cksum=[0-9a-f]\{10\}/cksum=${SUMS}/ -i
${srcdir}/sage-${pkgver}/build/pkgs/python/checksums.ini
- ## disable readline build
+ cp ${srcdir}/python-readline.patch
${srcdir}/sage-${pkgver}/build/pkgs/python/patches/readline.patch
sed -e 's/READLINE/#READLINE/' -i ${srcdir}/sage-${pkgver}/build/install
+ # disable building gf2x with sse2 for i686
+ if [ ${CARCH} == i686 ]; then
+cp ${srcdir}/gf2x-sse2-i686.patch
${srcdir}/sage-${pkgver}/build/pkgs/gf2x/patches/sse2-i686.patch
+ fi
}
build() {
cd sage-${pkgver}
-
- # fix missing sage.all error during build
- unset CFLAGS
- unset CXXFLAGS
- # fix build errors
- unset LDFLAGS
-
- export MAKE=make -j$(nproc)
-
- # use archlinux's fortran rather then the one that ships with sage to
compile sage's fortran
- export FC=/usr/bin/gfortran
-
- # disable building with debugging support
+
+ ## flags
+ # do not build own gcc
+ export SAGE_INSTALL_GCC='no'
+ # disable debug
export SAGE_DEBUG='no'
-
- # enable fat binaries (disables processor specific optimizations)
- # comment out if you're only building it for yourself
+ # enable fat binaries
export SAGE_FAT_BINARY='yes'
-
# can't write to root in a clean chroot
export DOT_SAGE=${srcdir}/build
-
# singular is broken
export CPP='/usr/bin/cpp'
-
- # only build sage, no documents
- #make build
+
make
}
@@ -105,10 +83,8 @@
COMMENT
check() {
cd sage-${pkgver}
-
+
make test
-
- # uncomment if we want to run all the tests (warning: very long)
#make ptestlong
}
COMMENT
@@ -119,15 +95,15 @@
rm -f *.log
rm -rf ${srcdir}/sage-${pkgver}/{logs,upstream}
# do NOT remove build directory!
-
+
# cp because make install is experimental and will corrupt the install
install -dm755 ${pkgdir}/opt/sage
cp -r * ${pkgdir}/opt/sage/
-
+
# move SageTeX files to more appropriate directory
install -dm755 ${pkgdir}/usr/share
mv ${pkgdir}/opt/sage/local/share/texmf
[arch-commits] Commit in sage-mathematics/trunk (3 files)
Date: Thursday, May 23, 2013 @ 23:46:32
Author: dwallace
Revision: 91565
upgpkg: sage-mathematics 5.9-1
upgpkg: sage-mathematics 5.9-1
Added:
sage-mathematics/trunk/sage.service
Modified:
sage-mathematics/trunk/PKGBUILD
sage-mathematics/trunk/sage-mathematics.install
--+
PKGBUILD | 30 ++
sage-mathematics.install |2 ++
sage.service |8
3 files changed, 28 insertions(+), 12 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-05-23 20:10:59 UTC (rev 91564)
+++ PKGBUILD2013-05-23 21:46:32 UTC (rev 91565)
@@ -7,7 +7,7 @@
# Special thanks to Nareto for moving the compile from the .install to the
PKGBUILD
pkgname=sage-mathematics
-pkgver=5.8
+pkgver=5.9
pkgrel=1
pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to
Magma, Maple, Mathematica, and Matlab.'
url='http://www.sagemath.org'
@@ -15,17 +15,16 @@
license=('GPL')
#depends=('xz' 'java-environment=7' 'desktop-file-utils' 'libxmu' 'libtiff'
'sqlite' 'libjpeg-turbo')
depends=('desktop-file-utils')
-makedepends=('gcc-fortran' )
+makedepends=('gcc-fortran' 'freetype2')
optdepends=('imagemagick: some plotting functionality benefits from it'
'texlive-core: some plotting functionality benefits from it, also
to use SageTeX'
'openssh: to use the notebook in secure mode'
-'ffmpeg: to show animations')
-options=('!makeflags')
+'ffmpeg: to show animations'
+'cairo: R plots')
install=${pkgname}.install
source=(http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar;
-'SAGE-notebook.desktop')
-md5sums=('fc5b401174ee1efa7aea163e804c2b42'
- 'b82f94383829eee26648feb977e2d89b')
+'SAGE-notebook.desktop'
+'sage.service')
build() {
cd sage-${pkgver}
@@ -38,8 +37,7 @@
unset LDFLAGS
# enable multiple threads while building, is this really needed? check if
uses MAKEFLAGS
- export SAGE_BUILD_THREADS=$(lscpu | awk '/^CPU\(s\):/ { print $2 }')
- export MAKE=make -j${SAGE_BUILD_THREADS}
+ export MAKE=make -j$(nproc)
# use archlinux's fortran rather then the one that ships with sage to
compile sage's fortran
export FC=/usr/bin/gfortran
@@ -52,8 +50,12 @@
export SAGE_FAT_BINARY='yes'
# can't write to root in a clean chroot
- export DOT_SAGE='/build/src/'
+ mkdir $srcdir/buiild
+ export DOT_SAGE=$srcdir/build
+ # Singular is broken
+ export CPP='/usr/bin/cpp'
+
# only build sage, no documents
#make build
make
@@ -95,8 +97,12 @@
# remove source packages, since they are rarely needed, they are 300mb in
size (compressed)
rm -f ${pkgdir}/opt/sage/spkg/base/*spkg
rm -f ${pkgdir}/opt/sage/spkg/standard/*spkg
+
+ # install a systemd user unit
+ install -Dm755 $srcdir/sage.service $pkgdir/usr/lib/systemd/user/sage.service
}
# vim :set ts=2 sw=2 et:
-md5sums=('b91d6c20798f396a9c875527c78b3587'
- 'b82f94383829eee26648feb977e2d89b')
+md5sums=('708520904f2d42039c714ac72a631948'
+ 'b82f94383829eee26648feb977e2d89b'
+ '985da1c1d1dcdc3ea9aa73035cb7996b')
Modified: sage-mathematics.install
===
--- sage-mathematics.install2013-05-23 20:10:59 UTC (rev 91564)
+++ sage-mathematics.install2013-05-23 21:46:32 UTC (rev 91565)
@@ -41,6 +41,8 @@
post_upgrade() {
post_install $1
+ echo There is now a user session unit included to run a sage notebook as
your user.
+ echo The wiki includes a guide on starting systemd user sessions
}
post_remove() {
Added: sage.service
===
--- sage.service(rev 0)
+++ sage.service2013-05-23 21:46:32 UTC (rev 91565)
@@ -0,0 +1,8 @@
+[Unit]
+Description=A free open-source mathematics software system
+
+[Service]
+ExecStart=/opt/sage/sage -n
+
+[Install]
+WantedBy=default.target
