[arch-commits] Commit in singular/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Thursday, February 15, 2018 @ 22:20:44
  Author: arojas
Revision: 294781

Use upstream fix for the LOG2 conflict

Modified:
  singular/trunk/PKGBUILD

----------+
 PKGBUILD |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-15 20:29:34 UTC (rev 294780)
+++ PKGBUILD	2018-02-15 22:20:44 UTC (rev 294781)
@@ -7,7 +7,7 @@
 #_patchver=4
 #pkgver=${_majver//-/.}.p${_patchver}
 pkgver=${_majver//-/.}
-pkgrel=2
+pkgrel=3
 pkgdesc="Computer Algebra System for polynomial computations"
 arch=(x86_64)
 url="http://www.singular.uni-kl.de/"
@@ -16,8 +16,10 @@
 makedepends=(doxygen python2)
 optdepends=('python2: Python interface')
 #source=("http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/$_majver/singular-${_majver//-/.}p${_patchver}.tar.gz")
-source=("http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/$_majver/singular-${_majver//-/.}.tar.gz")
-sha256sums=('3792c5707b60c1748298bf47e2277de20303d60563b797372cc0e1eff4bbc583')
+source=("http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/$_majver/singular-${_majver//-/.}.tar.gz"
+        singular-log2.patch::https://github.com/Singular/Sources/commit/0803a180.patch)
+sha256sums=('3792c5707b60c1748298bf47e2277de20303d60563b797372cc0e1eff4bbc583'
+            'd985b80da4f0c20eb014093e74f59be7bcb36b25292b8b6c24df180684418489')
 options=(!zipman)
 
 prepare() {
@@ -24,7 +26,7 @@
   cd singular-${_majver//-/.}
   
 # Rename macro that conflicts with PARI
-  find -type f | xargs sed -e 's|LOG2|SINGULARLOG2|g' -i
+  patch -p1 -i ../singular-log2.patch
 }
 
 build() {