[arch-commits] Commit in coordgen/trunk (PKGBUILD coordgen-fix-build.patch)

[Antonio Rojas]

    Date: Friday, June 26, 2020 @ 06:47:17
  Author: arojas
Revision: 390465

Update to 1.4.1

Modified:
  coordgen/trunk/PKGBUILD
Deleted:
  coordgen/trunk/coordgen-fix-build.patch

--------------------------+
 PKGBUILD                 |   29 +++++++++--------------------
 coordgen-fix-build.patch |   13 -------------
 2 files changed, 9 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-26 06:37:26 UTC (rev 390464)
+++ PKGBUILD	2020-06-26 06:47:17 UTC (rev 390465)
@@ -1,8 +1,8 @@
 # Maintainer: Antonio Rojas <arojas at archlinux.org>
 
 pkgname=coordgen
-pkgver=1.4.0
-pkgrel=2
+pkgver=1.4.1
+pkgrel=1
 pkgdesc="Schrodinger-developed 2D Coordinate Generation"
 arch=(x86_64)
 url="https://github.com/schrodinger/coordgenlibs"
@@ -9,30 +9,19 @@
 license=(BSD)
 depends=(maeparser)
 makedepends=(cmake boost)
-source=($pkgname-$pkgver.tar.gz::"https://github.com/schrodinger/coordgenlibs/archive/v$pkgver.tar.gz"
-        coordgen-fix-build.patch)
-sha256sums=('2c739be72d04958c158e16c8402ad0dd2171859da6486096ba1b691c18d286e7'
-            'b7d23ba17d4dbe6ebd1ac3f6c113d9a7519492cde0ab7534e477ac3fbc54860b')
+source=($pkgname-$pkgver.tar.gz::"https://github.com/schrodinger/coordgenlibs/archive/v$pkgver.tar.gz")
+sha256sums=('9036bc332638e0f0cc5ec0693301bff19d276c16e336ea7e5c217c18cba76dd1')
 
-prepare() {
-  mkdir -p build
-
-  cd coordgenlibs-$pkgver
-  patch -p1 -i ../coordgen-fix-build.patch
-}
-
 build() {
-  cd build
-  cmake ../coordgenlibs-$pkgver \
+  cmake -B build -S coordgenlibs-$pkgver \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCOORDGEN_USE_MAEPARSER=ON
-  make
+  cmake --build build
 }
 
 package() {
-  cd build
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build
 
-  install -Dm644 "$srcdir"/coordgenlibs-$pkgver/templates.mae -t "$pkgdir"/usr/share/coordgen
-  install -Dm644 "$srcdir"/coordgenlibs-$pkgver/LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
+  install -Dm644 coordgenlibs-$pkgver/templates.mae -t "$pkgdir"/usr/share/coordgen
+  install -Dm644 coordgenlibs-$pkgver/LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
 }

Deleted: coordgen-fix-build.patch
===================================================================
--- coordgen-fix-build.patch	2020-06-26 06:37:26 UTC (rev 390464)
+++ coordgen-fix-build.patch	2020-06-26 06:47:17 UTC (rev 390465)
@@ -1,13 +0,0 @@
-diff --git a/sketcherMinimizer.cpp b/sketcherMinimizer.cpp
-index b284374..0f2f599 100644
---- a/sketcherMinimizer.cpp
-+++ b/sketcherMinimizer.cpp
-@@ -3551,7 +3551,7 @@ void sketcherMinimizer::loadTemplates()
-     }
- #ifdef USE_MAEPARSER
- 
--    filename = getUserTemplateFileName();
-+    string filename = getUserTemplateFileName();
-     loadTemplate(filename, m_templates.getTemplates());
- 
- #endif