From 5a3ab4f2d17983a4e2c99c74083d786f6c440e64 Mon Sep 17 00:00:00 2001 From: Jaron Kent-Dobias Date: Fri, 23 Oct 2020 23:40:22 +0200 Subject: Upgraded to 12.1.1. --- MathKernel.patch | 20 -------------------- Mathematica.patch | 20 -------------------- PKGBUILD | 42 ++++++++++-------------------------------- WolframKernel.patch | 20 -------------------- math.patch | 20 -------------------- mathematica.patch | 20 -------------------- mcc.patch | 11 ----------- wolfram.patch | 20 -------------------- 8 files changed, 10 insertions(+), 163 deletions(-) delete mode 100644 MathKernel.patch delete mode 100644 Mathematica.patch delete mode 100644 WolframKernel.patch delete mode 100644 math.patch delete mode 100644 mathematica.patch delete mode 100644 mcc.patch delete mode 100644 wolfram.patch diff --git a/MathKernel.patch b/MathKernel.patch deleted file mode 100644 index 3e87db9..0000000 --- a/MathKernel.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/opt/Wolfram/WolframEngine/12.0/Executables/MathKernel 2019-06-23 23:13:31.000000000 -0400 -+++ b/opt/Wolfram/WolframEngine/12.0/Executables/MathKernel 2019-11-18 23:51:24.241464814 -0500 -@@ -28,6 +28,8 @@ - fi;; - armv?l) - SystemIDList="Linux-ARM";; -+ aarch64) -+ SystemIDList="Linux-ARM";; - *) - SystemIDList="Unknown";; - esac;; -@@ -117,7 +119,7 @@ - - SED_LIBRARY_PATH=`echo "${M_LIBRARY_PATH}" | sed -e 's/\\//\\\\\//g'` - -- LD_LIBRARY_PATH=`echo "${LD_LIBRARY_PATH}" | \ -+ LD_LIBRARY_PATH=`echo "/usr/libv6h:${LD_LIBRARY_PATH}" | \ - sed -e 's/^'"${SED_LIBRARY_PATH}"'://g' | \ - sed -e 's/:'"${SED_LIBRARY_PATH}"':/:/g' | \ - sed -e 's/:'"${SED_LIBRARY_PATH}"'$//g' | \ diff --git a/Mathematica.patch b/Mathematica.patch deleted file mode 100644 index d57775c..0000000 --- a/Mathematica.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/opt/Wolfram/WolframEngine/12.0/Executables/Mathematica 2019-06-24 18:28:09.000000000 -0400 -+++ b/opt/Wolfram/WolframEngine/12.0/Executables/Mathematica 2019-11-18 23:50:16.710994537 -0500 -@@ -18,6 +18,8 @@ - SystemIDList="Linux-x86-64 Linux";; - armv?l) - SystemIDList="Linux-ARM";; -+ aarch64) -+ SystemIDList="Linux-ARM";; - *) - SystemIDList="Unknown";; - esac;; -@@ -73,7 +75,7 @@ - export LD_LIBRARY_PATH="${M_LIBRARY_PATH}/Qt/lib/${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" - fi - --export LD_LIBRARY_PATH="${M_LIBRARY_PATH}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" -+export LD_LIBRARY_PATH="/usr/libv6h:${M_LIBRARY_PATH}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" - export PATH="${ExecutablesDirectory}:${PATH}" - - #set LIBGL flag on Linux-ARM version to prevent crash on startup diff --git a/PKGBUILD b/PKGBUILD index 7150589..a5badd7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,28 +2,14 @@ pkgbase=wolfram-engine pkgname=wolfram-engine-aarch64 -pkgver=12.0.1+2019062401 +pkgver=12.1.1+2020081901 pkgrel=1 arch=('aarch64') url="https://www.wolfram.com/raspberry-pi/" license=('proprietary') depends=('armv6h-libs') -source=("http://wac.36f4.edgecastcdn.net/0036F4/raspbian/wolfram-engine_12.0.1+2019062401_armhf.deb" - 'math.patch' - 'mathematica.patch' - 'wolfram.patch' - 'MathKernel.patch' - 'Mathematica.patch' - 'WolframKernel.patch' - 'mcc.patch') -sha512sums=('f7f9423b0c6f4e566d85deae5bbd7f47eae04f23e87b2c3ed6d1c128d3e6d6faea9bf71834f8d936f14d198500368698d6a5322dd4fcd9cfd2288bc71e46c41e' - 'f617e1ee73f288b4e1f84358b91d7961831f8858a881c3d0a552409081cf4b3d94ec998ebe71fefde80f8d354c84cfcfad8a5846f85dc4ce8bc51099bb764234' - '5a5e3fea51c5147fdb3950a96206345b96e574b40d68615c7a9c500a0a243bb3cead469f7b86fc7ca7a565c1e9f23c8d78ec5a7018faf24c422c142647d0c8d7' - '4dfd7e188d4014ec0bd623da6438a923d7bcf558251bbd345f15ed54714d54ccf03394871ef8648c069edf5888425496b1c2f56a833545d7c20e336aa259cf5b' - 'e6536dfd8abfd59e53fe14ffeb4daaca5f232a43565c1a29dfdcd287e337760d044549d10ce7f06d9dbfdb90e1f59c6b7006afb9438e56ad5810e029a0617ece' - '29d6a84ad993af07c45e277543bed51afa449d1f7c2c0b2ed566c8d8a1a4a4767d7a83a05f0cb00ca63eeb85a374bdd29bbc36b7e3e92d23b5049cf0002e5daf' - 'ccff08bc7fb01eabcc056c69e2786ef80c4c94a5eb9af349c6c526c620c9649a58ddbcc74d00859df0eeb97e48d74c19eb97a8869e21976af5b2dead2a148f58' - 'bf92c2bfad952185eb6ee82c682ad0fbc293b1e4e9aeae9afdf60291a45a3eab064f859e274aef7970b9a0321c75d97492c793fd2268d247008aec1ed30b004b') +source=("https://files.wolframcdn.com/raspbian/12.1.1.0/wolfram-engine_12.1.1+2020081901_armhf.deb") +md5sums=('aed07c54dd14d9a4d87b7d266649ff80') options=(!strip) # Compressing takes a long time and is not helpful for local installations. @@ -37,20 +23,12 @@ package() { cd ${pkgdir} tar -xf ${srcdir}/data.tar.xz - patch -p1 --input=../../MathKernel.patch - patch -p1 --input=../../Mathematica.patch - patch -p1 --input=../../WolframKernel.patch - patch -p1 --input=../../math.patch - patch -p1 --input=../../mathematica.patch - patch -p1 --input=../../wolfram.patch - patch -p1 --input=../../mcc.patch - mkdir usr/bin - ln -s /opt/Wolfram/WolframEngine/12.0/Executables/MathKernel usr/bin/MathKernel - ln -s /opt/Wolfram/WolframEngine/12.0/Executables/Mathematica usr/bin/Mathematica - ln -s /opt/Wolfram/WolframEngine/12.0/Executables/WolframKernel usr/bin/WolframKernel - ln -s /opt/Wolfram/WolframEngine/12.0/Executables/math usr/bin/math - ln -s /opt/Wolfram/WolframEngine/12.0/Executables/mathematica usr/bin/mathematica - ln -s /opt/Wolfram/WolframEngine/12.0/Executables/wolfram usr/bin/wolfram - ln -s /opt/Wolfram/WolframEngine/12.0/Executables/mcc usr/bin/mcc + ln -s /opt/Wolfram/WolframEngine/12.1/Executables/MathKernel usr/bin/MathKernel + ln -s /opt/Wolfram/WolframEngine/12.1/Executables/Mathematica usr/bin/Mathematica + ln -s /opt/Wolfram/WolframEngine/12.1/Executables/WolframKernel usr/bin/WolframKernel + ln -s /opt/Wolfram/WolframEngine/12.1/Executables/math usr/bin/math + ln -s /opt/Wolfram/WolframEngine/12.1/Executables/mathematica usr/bin/mathematica + ln -s /opt/Wolfram/WolframEngine/12.1/Executables/wolfram usr/bin/wolfram + ln -s /opt/Wolfram/WolframEngine/12.1/Executables/mcc usr/bin/mcc } diff --git a/WolframKernel.patch b/WolframKernel.patch deleted file mode 100644 index aa57a62..0000000 --- a/WolframKernel.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/opt/Wolfram/WolframEngine/12.0/Executables/WolframKernel 2019-06-23 23:13:31.000000000 -0400 -+++ b/opt/Wolfram/WolframEngine/12.0/Executables/WolframKernel 2019-11-18 23:50:47.001205476 -0500 -@@ -28,6 +28,8 @@ - fi;; - armv?l) - SystemIDList="Linux-ARM";; -+ aarch64) -+ SystemIDList="Linux-ARM";; - *) - SystemIDList="Unknown";; - esac;; -@@ -117,7 +119,7 @@ - - SED_LIBRARY_PATH=`echo "${M_LIBRARY_PATH}" | sed -e 's/\\//\\\\\//g'` - -- LD_LIBRARY_PATH=`echo "${LD_LIBRARY_PATH}" | \ -+ LD_LIBRARY_PATH=`echo "/usr/libv6h:${LD_LIBRARY_PATH}" | \ - sed -e 's/^'"${SED_LIBRARY_PATH}"'://g' | \ - sed -e 's/:'"${SED_LIBRARY_PATH}"':/:/g' | \ - sed -e 's/:'"${SED_LIBRARY_PATH}"'$//g' | \ diff --git a/math.patch b/math.patch deleted file mode 100644 index a11a1bd..0000000 --- a/math.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/opt/Wolfram/WolframEngine/12.0/Executables/math 2019-06-23 23:13:31.000000000 -0400 -+++ b/opt/Wolfram/WolframEngine/12.0/Executables/math 2019-11-18 23:49:15.410567645 -0500 -@@ -28,6 +28,8 @@ - fi;; - armv?l) - SystemIDList="Linux-ARM";; -+ aarch64) -+ SystemIDList="Linux-ARM";; - *) - SystemIDList="Unknown";; - esac;; -@@ -117,7 +119,7 @@ - - SED_LIBRARY_PATH=`echo "${M_LIBRARY_PATH}" | sed -e 's/\\//\\\\\//g'` - -- LD_LIBRARY_PATH=`echo "${LD_LIBRARY_PATH}" | \ -+ LD_LIBRARY_PATH=`echo "/usr/libv6h:${LD_LIBRARY_PATH}" | \ - sed -e 's/^'"${SED_LIBRARY_PATH}"'://g' | \ - sed -e 's/:'"${SED_LIBRARY_PATH}"':/:/g' | \ - sed -e 's/:'"${SED_LIBRARY_PATH}"'$//g' | \ diff --git a/mathematica.patch b/mathematica.patch deleted file mode 100644 index 159512c..0000000 --- a/mathematica.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/opt/Wolfram/WolframEngine/12.0/Executables/mathematica 2019-06-24 18:28:09.000000000 -0400 -+++ b/opt/Wolfram/WolframEngine/12.0/Executables/mathematica 2019-11-18 23:51:47.611627563 -0500 -@@ -18,6 +18,8 @@ - SystemIDList="Linux-x86-64 Linux";; - armv?l) - SystemIDList="Linux-ARM";; -+ aarch64) -+ SystemIDList="Linux-ARM";; - *) - SystemIDList="Unknown";; - esac;; -@@ -73,7 +75,7 @@ - export LD_LIBRARY_PATH="${M_LIBRARY_PATH}/Qt/lib/${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" - fi - --export LD_LIBRARY_PATH="${M_LIBRARY_PATH}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" -+export LD_LIBRARY_PATH="/usr/libv6h:${M_LIBRARY_PATH}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" - export PATH="${ExecutablesDirectory}:${PATH}" - - #set LIBGL flag on Linux-ARM version to prevent crash on startup diff --git a/mcc.patch b/mcc.patch deleted file mode 100644 index a1203b6..0000000 --- a/mcc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/opt/Wolfram/WolframEngine/12.0/Executables/mcc 2019-06-23 23:13:31.000000000 -0400 -+++ b/opt/Wolfram/WolframEngine/12.0/Executables/mcc 2019-11-18 23:52:21.191861413 -0500 -@@ -19,6 +19,8 @@ - SystemIDList="Linux-x86-64 Linux";; - armv?l) - SystemIDList="Linux-ARM";; -+ aarch64) -+ SystemIDList="Linux-ARM";; - *) - SystemIDList="Unknown";; - esac;; diff --git a/wolfram.patch b/wolfram.patch deleted file mode 100644 index 216ab7f..0000000 --- a/wolfram.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/opt/Wolfram/WolframEngine/12.0/Executables/wolfram 2019-06-23 23:13:31.000000000 -0400 -+++ b/opt/Wolfram/WolframEngine/12.0/Executables/wolfram 2019-11-18 23:52:57.982117618 -0500 -@@ -28,6 +28,8 @@ - fi;; - armv?l) - SystemIDList="Linux-ARM";; -+ aarch64) -+ SystemIDList="Linux-ARM";; - *) - SystemIDList="Unknown";; - esac;; -@@ -117,7 +119,7 @@ - - SED_LIBRARY_PATH=`echo "${M_LIBRARY_PATH}" | sed -e 's/\\//\\\\\//g'` - -- LD_LIBRARY_PATH=`echo "${LD_LIBRARY_PATH}" | \ -+ LD_LIBRARY_PATH=`echo "/usr/libv6h:${LD_LIBRARY_PATH}" | \ - sed -e 's/^'"${SED_LIBRARY_PATH}"'://g' | \ - sed -e 's/:'"${SED_LIBRARY_PATH}"':/:/g' | \ - sed -e 's/:'"${SED_LIBRARY_PATH}"'$//g' | \ -- cgit v1.2.3-54-g00ecf