[arch-commits] Commit in polymake/trunk (PKGBUILD polymake-fix-lib-loading.patch)

[Antonio Rojas]

    Date: Saturday, April 20, 2019 @ 20:53:09
  Author: arojas
Revision: 452418

Update to 3.4

Modified:
  polymake/trunk/PKGBUILD
Deleted:
  polymake/trunk/polymake-fix-lib-loading.patch

--------------------------------+
 PKGBUILD                       |   21 +++++++--------------
 polymake-fix-lib-loading.patch |   13 -------------
 2 files changed, 7 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-20 20:52:07 UTC (rev 452417)
+++ PKGBUILD	2019-04-20 20:53:09 UTC (rev 452418)
@@ -1,11 +1,11 @@
 # Maintainer: Antonio Rojas <arojas at archlinux.org>
 
 pkgname=polymake
-_pkgver=3.3
-_patchver=4
-#pkgver=$_pkgver.r$_patchver
-pkgver=$_pkgver
-pkgrel=3
+_pkgver=3.4
+_patchver=
+pkgver=$_pkgver.r$_patchver
+#pkgver=$_pkgver
+pkgrel=1
 pkgdesc="Open source software for research in polyhedral geometry"
 arch=(x86_64)
 url="https://polymake.org/"
@@ -13,16 +13,9 @@
 depends=(mpfr normaliz singular ppl lrs perl-xml-writer perl-xml-libxml perl-xml-libxslt perl-term-readline-gnu perl-term-readkey perl-json)
 makedepends=(ninja cddlib ant boost bliss libnsl jdk8-openjdk)
 optdepends=('java-runtime: java module')
-source=("https://polymake.org/lib/exe/fetch.php/download/polymake-${_pkgver}-minimal.tar.bz2"
-        polymake-fix-lib-loading.patch)
-sha256sums=('f7867137f99d5e8b86035ba05b59a63c5b73a95b21b88059fd2439216c128792'
-            '491cf7ea37e58e9289b81feb5604473b960e3688969a8d7854378fd6f9deb93a')
+source=("https://polymake.org/lib/exe/fetch.php/download/polymake-${_pkgver}-minimal.tar.bz2")
+sha256sums=('f4ddfd8275b5b9fbf953e6b24f707d00081a1a6d32ac0e6a52165d016609b1e8')
 
-prepare() {
-  cd polymake-$_pkgver
-  patch -p1 -i ../polymake-fix-lib-loading.patch # Fix loading shared library from external programs
-}
-
 build() {
   cd polymake-$_pkgver
   ./configure --prefix=/usr

Deleted: polymake-fix-lib-loading.patch
===================================================================
--- polymake-fix-lib-loading.patch	2019-04-20 20:52:07 UTC (rev 452417)
+++ polymake-fix-lib-loading.patch	2019-04-20 20:53:09 UTC (rev 452418)
@@ -1,13 +0,0 @@
-diff --git a/lib/callable/src/perl/Main.cc b/lib/callable/src/perl/Main.cc
-index 6267025..2c96dc1 100644
---- a/lib/callable/src/perl/Main.cc
-+++ b/lib/callable/src/perl/Main.cc
-@@ -109,7 +109,7 @@ void deduce_install_dirs(std::string lib_path, std::string& install_top, std::st
- {
-    const char stem_name[]="libpolymake";
-    constexpr size_t stem_size=sizeof(stem_name)-1;
--   auto basename_start=lib_path.find(stem_name, stem_size);
-+   auto basename_start=lib_path.find(stem_name);
-    if (basename_start == std::string::npos)
-       throw std::runtime_error("polymake::Main - weird callable library path " + lib_path);
-