Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages / 
avogadrolibs


Commits:
67b6c968 by Antonio Rojas at 2024-04-29T23:23:32+02:00
upgpkg: 1.99.0-4: hdf5 1.14.4 rebuild

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = avogadrolibs
        pkgdesc = Libraries that provide 3D rendering, visualization, analysis 
and data processing useful in computational chemistry, molecular modeling, 
bioinformatics, materials science, and related areas
        pkgver = 1.99.0
-       pkgrel = 3
+       pkgrel = 4
        url = https://www.openchemistry.org/
        arch = x86_64
        license = custom
@@ -10,6 +10,7 @@ pkgbase = avogadrolibs
        makedepends = eigen
        makedepends = fast_float
        makedepends = fmt
+       makedepends = git
        makedepends = hdf5
        makedepends = genxrdpattern
        makedepends = glew
@@ -26,10 +27,8 @@ pkgbase = avogadrolibs
        makedepends = utf8cpp
        makedepends = verdict
        makedepends = vtk
-       source = 
https://github.com/OpenChemistry/avogadrolibs/archive/1.99.0/avogadrolibs-1.99.0.tar.gz
-       source = 
https://github.com/antonio-rojas/avogadrolibs/commit/6e2e84db.patch
-       sha256sums = 
34808e3c602b0f60f3c160ff0220832aee777db86e962e3f958c6327fb434063
-       sha256sums = 
285d7b8aef7cd489a2829840519051dbdbe232c06a540268860a3a6dbc8d5ca9
+       source = git+https://github.com/OpenChemistry/avogadrolibs#tag=1.99.0
+       sha256sums = 
ad26ef7d887924a867c5aba68ecc3803b2684652d65a442516903c9343a332ff
 
 pkgname = avogadrolibs
        depends = avogadro-crystals


=====================================
PKGBUILD
=====================================
@@ -4,7 +4,7 @@ pkgbase=avogadrolibs
 pkgname=(avogadrolibs
          avogadrolibs-qt5)
 pkgver=1.99.0
-pkgrel=3
+pkgrel=4
 pkgdesc='Libraries that provide 3D rendering, visualization, analysis and data 
processing useful in computational chemistry, molecular modeling, 
bioinformatics, materials science, and related areas'
 arch=(x86_64)
 url='https://www.openchemistry.org/'
@@ -14,6 +14,7 @@ makedepends=(boost
              eigen
              fast_float
              fmt
+             git
              hdf5
              genxrdpattern
              glew
@@ -30,18 +31,17 @@ makedepends=(boost
              utf8cpp
              verdict
              vtk)
-source=(https://github.com/OpenChemistry/avogadrolibs/archive/$pkgver/$pkgname-$pkgver.tar.gz
-        https://github.com/antonio-rojas/avogadrolibs/commit/6e2e84db.patch)
-sha256sums=('34808e3c602b0f60f3c160ff0220832aee777db86e962e3f958c6327fb434063'
-            '285d7b8aef7cd489a2829840519051dbdbe232c06a540268860a3a6dbc8d5ca9')
+source=(git+https://github.com/OpenChemistry/avogadrolibs#tag=$pkgver)
+sha256sums=('ad26ef7d887924a867c5aba68ecc3803b2684652d65a442516903c9343a332ff')
 
 prepare() {
   mkdir crystals fragments molecules # Dummy dirs to trick cmake, actually 
provided by avogadro-{crystals,fragments,molecules}
-  patch -d $pkgname-$pkgver -p1 < 6e2e84db.patch # Fix wrong cmake variable 
name
+  cd $pkgname
+  git cherry-pick -n 6e2e84dbb088a40d69117c1836f4306792f57acd # Fix wrong 
cmake variable name
 }
 
 build() {
-  cmake -B build -S $pkgname-$pkgver \
+  cmake -B build -S $pkgname \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_C_FLAGS="$CFLAGS -ffat-lto-objects" \
     -DCMAKE_CXX_FLAGS="$CXXFLAGS -ffat-lto-objects" \
@@ -77,7 +77,7 @@ package_avogadrolibs() {
         "$pkgdir"/usr/include/avogadro/{molequeue,qt*,vtk} \
         "$pkgdir"/usr/lib/avogadro2/{scripts,staticplugins}
 
-  install -Dm644 $pkgname-$pkgver/LICENSE -t 
"$pkgdir"/usr/share/licenses/$pkgname
+  install -Dm644 $pkgname/LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
 }
 
 package_avogadrolibs-qt5() {
@@ -102,5 +102,5 @@ package_avogadrolibs-qt5() {
   DESTDIR="$pkgdir" cmake --install build/avogadro/qtplugins
   DESTDIR="$pkgdir" cmake --install build/avogadro/vtk
 
-  install -Dm644 $pkgbase-$pkgver/LICENSE -t 
"$pkgdir"/usr/share/licenses/$pkgname
+  install -Dm644 $pkgbase/LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
 }



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/avogadrolibs/-/commit/67b6c968a959b0e82bf06b6015637df4844b9d19

-- 
This project does not include diff previews in email notifications.
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/avogadrolibs/-/commit/67b6c968a959b0e82bf06b6015637df4844b9d19
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to