[arch-commits] Commit in serd/trunk (4 files)

[David Runge]

    Date: Wednesday, July 20, 2022 @ 11:18:22
  Author: dvzrv
Revision: 1254862

upgpkg: serd 0.30.14-1: Upgrade to 0.30.14.

Replace waf with meson as build system (yay).
Split out documentation to separate package.

Added:
  serd/trunk/keys/
  serd/trunk/keys/pgp/
  serd/trunk/keys/pgp/907D226E7E13FA337F014A083672782A9BF368F3.asc
Modified:
  serd/trunk/PKGBUILD

-------------------------------------------------------+
 PKGBUILD                                              |   80 ++++++++--------
 keys/pgp/907D226E7E13FA337F014A083672782A9BF368F3.asc |    1 
 2 files changed, 41 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-07-20 11:05:31 UTC (rev 1254861)
+++ PKGBUILD	2022-07-20 11:18:22 UTC (rev 1254862)
@@ -2,60 +2,60 @@
 # Contributor: Ray Rashif <schiv at archlinux.org>
 # Contributor: speps <speps at aur dot archlinux dot org>
 
-pkgname=serd
-pkgver=0.30.12
-pkgrel=2
-pkgdesc="Lightweight C library for RDF syntax supporting reading/ writing Turtle and NTriples."
+pkgbase=serd
+pkgname=(serd serd-docs)
+pkgver=0.30.14
+pkgrel=1
+pkgdesc="Lightweight C library for RDF syntax supporting reading/ writing Turtle and NTriples"
 arch=(x86_64)
 url="https://drobilla.net/software/serd.html"
 license=(custom:ISC)
-depends=(glibc)
-makedepends=(waf)
-provides=(libserd-0.so)
+makedepends=(doxygen meson python-sphinx)
 options=(debug)
-source=(https://download.drobilla.net/$pkgname-$pkgver.tar.bz2{,.sig})
-sha512sums=('c330648eb2c947a6d220f42d0af63fd2744da496301483e58be3cda387da166711d6acd5cee2df8cbb837ab450e1802b3f9a0a2973e5ad6d976b69b863aecb7f'
+source=(https://download.drobilla.net/$pkgname-$pkgver.tar.xz{,.sig})
+sha512sums=('d753bf60d4ff37220e64fda6a5dc6c69dc1a52ef435ab5b1e698f72dc5a7280ea764bb53b015753c3dc0910f252ca96c0ebafcb902a9956fcbf0a4480ce4e1dc'
             'SKIP')
-b2sums=('acd065613494f05d1b2016c2097c1efbd1ebe3a5b901fac3a60d27140fee5c51ec17314df7ac2d3ad89d852dcb016dcf7255271f506f900445ce275335ed7d01'
+b2sums=('42ed92e8eed3564c2625dd2f8e9bff55b65d1c8c993f13f2aa7ea0ab41a4c261b6b8fe9d4c61a915157616df1dba11d37f3813cd7bf7cd4571cb535895cb8f9c'
         'SKIP')
 validpgpkeys=('907D226E7E13FA337F014A083672782A9BF368F3') # David Robillard <d at drobilla.net>
 
-prepare() {
-  cd $pkgname-$pkgver
-  # remove call to local ldconfig
-  sed -i "/ldconfig/d" wscript
-  # let wscript(s) find the custom waf scripts
-  mkdir -pv tools
-  touch __init__.py
-  cp -v waflib/extras/{autoship,autowaf,lv2}.py tools/
-  mkdir -pv plugins/tools/
-  cp -v waflib/extras/{autoship,autowaf,lv2}.py plugins/tools/
-  rm -rv waflib
-  sed -e 's/waflib.extras/tools/g' \
-      -e "s/load('autowaf'/load('autowaf', tooldir='tools'/g" \
-      -e "s/load('lv2'/load('lv2', tooldir='tools'/g" \
-      -i wscript
+_pick() {
+  local p="$1" f d; shift
+  for f; do
+    d="$srcdir/$p/${f#$pkgdir/}"
+    mkdir -p "$(dirname "$d")"
+    mv "$f" "$d"
+    rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+  done
 }
 
 build() {
-  export LINKFLAGS="$LDFLAGS"
-
-  cd $pkgname-$pkgver
-  waf configure --prefix=/usr \
-                --mandir=/usr/share/man \
-                --test
-  waf -v build
+  arch-meson $pkgname-$pkgver build
+  meson compile -C build
 }
 
 check() {
-  cd $pkgname-$pkgver
-  waf test
+  meson test -C build
 }
 
-package() {
-  cd $pkgname-$pkgver
-  waf install --destdir="$pkgdir"
-  install -vDm 644 COPYING -t "$pkgdir/usr/share/licenses/$pkgname/"
-  install -vDm 644 {AUTHORS,NEWS,README.md} -t "$pkgdir/usr/share/doc/$pkgname/"
+package_serd() {
+  depends=(glibc)
+  optdepends=('serd-docs: for developer documentation')
+  provides=(libserd-0.so)
+
+  meson install -C build --destdir "$pkgdir"
+  (
+    cd "$pkgdir"
+    _pick $pkgname-docs usr/share/doc
+  )
+
+  install -vDm 644 $pkgname-$pkgver/COPYING -t "$pkgdir/usr/share/licenses/$pkgname/"
+  install -vDm 644 $pkgname-$pkgver/{AUTHORS,NEWS,README.md} -t "$pkgdir/usr/share/doc/$pkgname/"
 }
-# vim:set ts=2 sw=2 et:
+
+package_serd-docs() {
+  pkgdesc+=" - documentation"
+
+  mv -v $pkgname/* "$pkgdir"
+  mv -v "$pkgdir/usr/share/doc/"serd{-0,}
+}

Added: keys/pgp/907D226E7E13FA337F014A083672782A9BF368F3.asc
===================================================================
(Binary files differ)

Index: serd/trunk/keys/pgp/907D226E7E13FA337F014A083672782A9BF368F3.asc
===================================================================
--- keys/pgp/907D226E7E13FA337F014A083672782A9BF368F3.asc	2022-07-20 11:05:31 UTC (rev 1254861)
+++ keys/pgp/907D226E7E13FA337F014A083672782A9BF368F3.asc	2022-07-20 11:18:22 UTC (rev 1254862)

Property changes on: serd/trunk/keys/pgp/907D226E7E13FA337F014A083672782A9BF368F3.asc
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/pgp-keys
\ No newline at end of property