git » libqmi.git » commit d44c826

1.34.0-2: Namcap fixes, split docs

author Jan Alexander Steffens (heftig)
2024-10-01 16:50:00 UTC
committer Jan Alexander Steffens (heftig)
2024-10-01 16:50:00 UTC
parent 903020acb69f0b8c3254fd303991d1e7d47eddbe

1.34.0-2: Namcap fixes, split docs

.SRCINFO +14 -5
.nvchecker.toml +6 -0
PKGBUILD +29 -13
keys/pgp/A814D09B9C5BC01945A64308AECE0239C6606AD5.asc +52 -0

diff --git a/.SRCINFO b/.SRCINFO
index a13c446..f552526 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,30 @@
 pkgbase = libqmi
 	pkgdesc = QMI modem protocol helper library
 	pkgver = 1.34.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.freedesktop.org/wiki/Software/libqmi/
 	arch = x86_64
-	license = GPL2
+	license = GPL-2.0-or-later
 	makedepends = bash-completion
 	makedepends = git
 	makedepends = gobject-introspection
 	makedepends = gtk-doc
 	makedepends = help2man
 	makedepends = meson
+	depends = bash
+	depends = gcc-libs
+	depends = glib2
+	depends = glibc
 	depends = libgudev
 	depends = libmbim
 	depends = libqrtr-glib
-	provides = libqmi-glib.so
-	source = git+https://gitlab.freedesktop.org/mobile-broadband/libqmi.git#commit=3f07d6e5b4677558543b3b4484ea88ad92257e92
-	b2sums = SKIP
+	source = git+https://gitlab.freedesktop.org/mobile-broadband/libqmi.git?signed#tag=1.34.0
+	validpgpkeys = A814D09B9C5BC01945A64308AECE0239C6606AD5
+	b2sums = 4f86ffd67bd969440db12a2f15eb562fe5b54e2e403f1e8c717a45fe4cf1814d4d78350d9bb2cb0eeaf6c356638e34cf0e4aa844bddb7bf2b8b424feac91e87b
 
 pkgname = libqmi
+	provides = libqmi-glib.so
+
+pkgname = libqmi-docs
+	pkgdesc = QMI modem protocol helper library (documentation)
+	depends = 
diff --git a/.nvchecker.toml b/.nvchecker.toml
new file mode 100644
index 0000000..4e04a32
--- /dev/null
+++ b/.nvchecker.toml
@@ -0,0 +1,6 @@
+[libqmi]
+source = "git"
+git = "https://gitlab.freedesktop.org/mobile-broadband/libqmi.git"
+include_regex = '\d+\.\d*[02468]\.\d+'
+from_pattern = '-([a-z])'
+to_pattern = '\1'
diff --git a/PKGBUILD b/PKGBUILD
index 604ce34..74ca529 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,21 @@
 # Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
 
-pkgname=libqmi
+pkgbase=libqmi
+pkgname=(
+  libqmi
+  libqmi-docs
+)
 pkgver=1.34.0
-pkgrel=1
+pkgrel=2
 pkgdesc="QMI modem protocol helper library"
 url="https://www.freedesktop.org/wiki/Software/libqmi/"
 arch=(x86_64)
-license=(GPL2)
+license=(GPL-2.0-or-later)
 depends=(
+  bash
+  gcc-libs
+  glib2
+  glibc
   libgudev
   libmbim
   libqrtr-glib
@@ -20,15 +28,11 @@ makedepends=(
   help2man
   meson
 )
-provides=(libqmi-glib.so)
-_commit=3f07d6e5b4677558543b3b4484ea88ad92257e92  # tags/1.34.0^0
-source=("git+https://gitlab.freedesktop.org/mobile-broadband/libqmi.git#commit=$_commit")
-b2sums=('SKIP')
-
-pkgver() {
-  cd libqmi
-  git describe --tags | sed 's/-rc/rc/;s/[^-]*-g/r&/;s/-/+/g'
-}
+source=("git+https://gitlab.freedesktop.org/mobile-broadband/libqmi.git?signed#tag=${pkgver/[a-z]/-&}")
+b2sums=('4f86ffd67bd969440db12a2f15eb562fe5b54e2e403f1e8c717a45fe4cf1814d4d78350d9bb2cb0eeaf6c356638e34cf0e4aa844bddb7bf2b8b424feac91e87b')
+validpgpkeys=(
+  A814D09B9C5BC01945A64308AECE0239C6606AD5 # Aleksander Morgado <aleksandermj@chromium.org>
+)
 
 prepare() {
   cd libqmi
@@ -47,8 +51,20 @@ check() {
   meson test -C build --print-errorlogs --no-rebuild
 }
 
-package() {
+package_libqmi() {
+  provides=(libqmi-glib.so)
+
   meson install -C build --destdir "$pkgdir" --no-rebuild
+
+  mkdir -p doc/usr/share
+  mv {"$pkgdir",doc}/usr/share/gtk-doc
+}
+
+package_libqmi-docs() {
+  pkgdesc+=" (documentation)"
+  depends=()
+
+  mv doc/* "$pkgdir"
 }
 
 # vim:set sw=2 sts=-1 et:
diff --git a/keys/pgp/A814D09B9C5BC01945A64308AECE0239C6606AD5.asc b/keys/pgp/A814D09B9C5BC01945A64308AECE0239C6606AD5.asc
new file mode 100644
index 0000000..f555c0d
--- /dev/null
+++ b/keys/pgp/A814D09B9C5BC01945A64308AECE0239C6606AD5.asc
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+MGUY
+=+Ikk
+-----END PGP PUBLIC KEY BLOCK-----