diff --git a/gobject-introspection/PKGBUILD b/gobject-introspection/PKGBUILD index b73b1fd..b5ff3d0 100644 --- a/gobject-introspection/PKGBUILD +++ b/gobject-introspection/PKGBUILD @@ -1,24 +1,28 @@ #!/usr/bin/bash # JOBoRun : Jwm OpenBox Obarun RUNit -# Maintainer : Joe Bo Run +# Maintainer : Joe Bo Run # PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname" +# Website : https://pozol.eu #-----------------------------------------| DESCRIPTION |--------------------------------------- pkgbase=gobject-introspection -pkgname=(gobject-introspection gobject-introspection-runtime) -pkgver=1.74.0 +pkgname=( + gobject-introspection + gobject-introspection-runtime + libgirepository +) +pkgver=1.76.0 pkgrel=01 pkgdesc="Introspection system for GObject-based libraries" url="https://wiki.gnome.org/Projects/GObjectIntrospection" -arch=(x86_64) -depends=(python-mako python-markdown) -_glibver=2.74.0 -makedepends=(cairo git gtk-doc python-sphinx meson "glib2=$_glibver") -options=(!emptydirs) +_glibver=2.76.0 +makedepends=(cairo git "glib2=$_glibver" gtk-doc meson python-mako python-markdown python-sphinx) +#options=(!emptydirs) #options=(debug) -_commit=37bde613a7cb77e7399dafb25731e13208f0ae0b # tags/1.74.0^0 +_commit=7aec38488a4d5fbc8539f798a7ce9ae1cb4df711 # tags/1.76.0^0 + source=("git+https://gitlab.gnome.org/GNOME/gobject-introspection.git#commit=$_commit" - "git+https://gitlab.gnome.org/GNOME/glib.git?signed#tag=$_glibver") + "git+https://gitlab.gnome.org/GNOME/glib.git?signed#tag=$_glibver") pkgver() { cd $pkgbase @@ -30,14 +34,17 @@ prepare() { } build() { - arch-meson $pkgbase build \ - -D gtk_doc=true \ + local meson_options=( -D glib_src_dir="$srcdir/glib" + -D gtk_doc=true + ) + + arch-meson $pkgbase build "${meson_options[@]}" meson compile -C build } check() { - meson test -C build + meson test -C build --print-errorlogs } _pick() { @@ -51,7 +58,7 @@ _pick() { } package_gobject-introspection() { - depends+=("gobject-introspection-runtime=$pkgver-$pkgrel") + depends+=("gobject-introspection-runtime=$pkgver-$pkgrel" python-mako python-markdown) meson install -C build --destdir "$pkgdir" @@ -60,20 +67,37 @@ package_gobject-introspection() { python -m compileall -d /usr/lib/$pkgbase usr/lib/$pkgbase python -O -m compileall -d /usr/lib/$pkgbase usr/lib/$pkgbase - _pick runtime usr/lib/lib* - _pick runtime usr/lib/girepository-* + _pick libg usr/include/gobject-introspection-1.0 + _pick libg usr/lib/libgirepository-1.0.so* + _pick libg usr/lib/pkgconfig/gobject-introspection*-1.0.pc + _pick libg usr/lib/girepository-1.0/GIRepository-2.0.typelib + _pick libg usr/share/gir-1.0/GIRepository-2.0.gir + _pick libg usr/share/gtk-doc + + _pick runtime usr/lib/girepository-1.0 } package_gobject-introspection-runtime() { - pkgdesc+=" (runtime library)" - depends=(glib2) - provides+=(libgirepository-1.0.so) + pkgdesc+=" - runtime" + depends=("libgirepository=$pkgver-$pkgrel") mv runtime/* "$pkgdir" } +package_libgirepository() { + pkgdesc+=" - runtime library" + depends=( + libffi.so + libg{lib,object,module,io}-2.0.so + ) + provides=(libgirepository-1.0.so) -#---- license gpg-key sha256sums ---- + mv libg/* "$pkgdir" +} + +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=(LGPL GPL) @@ -83,4 +107,7 @@ validpgpkeys=(923B7025EE03C1C59F42684CF0942E894B2EAFA0 # Philip Withnall pkgbase=gobject-introspection -pkgname=(gobject-introspection gobject-introspection-runtime) -pkgver=1.74.0 +pkgname=( + gobject-introspection + gobject-introspection-runtime + libgirepository +) +pkgver=1.76.0 pkgrel=1 pkgdesc="Introspection system for GObject-based libraries" url="https://wiki.gnome.org/Projects/GObjectIntrospection" arch=(x86_64) license=(LGPL GPL) -_glibver=2.74.0 -depends=(python-mako python-markdown) -makedepends=(cairo git gtk-doc python-sphinx meson "glib2=$_glibver") -options=(debug) -_commit=37bde613a7cb77e7399dafb25731e13208f0ae0b # tags/1.74.0^0 -source=("git+https://gitlab.gnome.org/GNOME/gobject-introspection.git#commit=$_commit" - "git+https://gitlab.gnome.org/GNOME/glib.git?signed#tag=$_glibver") -sha512sums=('SKIP' - 'SKIP') +_glibver=2.76.0 +makedepends=( + cairo + git + "glib2=$_glibver" + gtk-doc + meson + python-mako + python-markdown + python-sphinx +) +_commit=7aec38488a4d5fbc8539f798a7ce9ae1cb4df711 # tags/1.76.0^0 +source=( + "git+https://gitlab.gnome.org/GNOME/gobject-introspection.git#commit=$_commit" + "git+https://gitlab.gnome.org/GNOME/glib.git?signed#tag=$_glibver" +) +b2sums=('SKIP' + 'SKIP') validpgpkeys=('923B7025EE03C1C59F42684CF0942E894B2EAFA0' # Philip Withnall 'D4C501DA48EB797A081750939449C2F50996635F') # Marco Trevisan @@ -31,14 +44,17 @@ prepare() { } build() { - arch-meson $pkgbase build \ - -D gtk_doc=true \ + local meson_options=( -D glib_src_dir="$srcdir/glib" + -D gtk_doc=true + ) + + arch-meson $pkgbase build "${meson_options[@]}" meson compile -C build } check() { - meson test -C build + meson test -C build --print-errorlogs } _pick() { @@ -52,7 +68,11 @@ _pick() { } package_gobject-introspection() { - depends+=("gobject-introspection-runtime=$pkgver-$pkgrel") + depends=( + "gobject-introspection-runtime=$pkgver-$pkgrel" + python-mako + python-markdown + ) meson install -C build --destdir "$pkgdir" @@ -61,14 +81,32 @@ package_gobject-introspection() { python -m compileall -d /usr/lib/$pkgbase usr/lib/$pkgbase python -O -m compileall -d /usr/lib/$pkgbase usr/lib/$pkgbase - _pick runtime usr/lib/lib* - _pick runtime usr/lib/girepository-* + _pick libg usr/include/gobject-introspection-1.0 + _pick libg usr/lib/libgirepository-1.0.so* + _pick libg usr/lib/pkgconfig/gobject-introspection*-1.0.pc + _pick libg usr/lib/girepository-1.0/GIRepository-2.0.typelib + _pick libg usr/share/gir-1.0/GIRepository-2.0.gir + _pick libg usr/share/gtk-doc + + _pick runtime usr/lib/girepository-1.0 } package_gobject-introspection-runtime() { - pkgdesc+=" (runtime library)" - depends=(glib2) - provides+=(libgirepository-1.0.so) + pkgdesc+=" - runtime" + depends=("libgirepository=$pkgver-$pkgrel") mv runtime/* "$pkgdir" } + +package_libgirepository() { + pkgdesc+=" - runtime library" + depends=( + libffi.so + libg{lib,object,module,io}-2.0.so + ) + provides=(libgirepository-1.0.so) + + mv libg/* "$pkgdir" +} + +# vim:set sw=2 sts=-1 et: diff --git a/gobject-introspection/key b/gobject-introspection/key index f57c1e0..0e69b30 100644 --- a/gobject-introspection/key +++ b/gobject-introspection/key @@ -1,2 +1 @@ -gpg -v --recv-key F0942E894B2EAFA0 -gpg -v --recv-keys 9449C2F50996635F +gpg -v --recv-key DCDF5885B1F3ED73 diff --git a/nftables/PKGBUILD b/nftables/PKGBUILD index eddde37..4f7c453 100644 --- a/nftables/PKGBUILD +++ b/nftables/PKGBUILD @@ -7,10 +7,9 @@ pkgname=nftables epoch=1 -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=01 pkgdesc='Netfilter tables userspace tools w/o systemd' -arch=('x86_64') url='https://netfilter.org/projects/nftables/' depends=('libmnl' 'libnftnl' 'gmp' 'readline' 'ncurses' 'jansson') optdepends=('python: Python bindings') @@ -60,12 +59,16 @@ package() { # install -Dm644 nftables.service "$pkgdir/usr/lib/systemd/system/nftables.service" } -#---- license gpg-key sha256sums ---- +#---- arch license gpg-key & sha256sums ---- + +arch=(x86_64) license=('GPL2') -sha256sums=(2407430ddd82987670e48dc2fda9e280baa8307abec04ab18d609df3db005e4c # nftables-1.0.6.tar.xz - 8bfb46d049eed2b7c52ad180dcb4649afea60fd3b24ead331a5abf4b84eaf197 # nftables-1.0.6.tar.xz.sig +sha256sums=(c12ac941fff9adaedf17367d5ce213789b98a0d314277bc22b3d71e10891f412 # nftables-1.0.7.tar.xz + ee39beda503fe0e29853bf102056484d9b21e3b000c7d3c7d5add27d5ebf6c78 # nftables-1.0.7.tar.xz.sig 2aff88019097d21dbfa4713f5b54c184751c86376e458b683f8d90f3abd232a8) # nftables.conf +## c464b8c23bf85341e07ffda694b57a66d947fd94e29cb4182c8f20559e7cde17 nftables-1:1.0.7-01-x86_64.pkg.tar.lz + diff --git a/nftables/PKGBUILD-arch b/nftables/PKGBUILD-arch index 2fc37e4..2ef6f24 100644 --- a/nftables/PKGBUILD-arch +++ b/nftables/PKGBUILD-arch @@ -2,7 +2,7 @@ pkgname=nftables epoch=1 -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=1 pkgdesc='Netfilter tables userspace tools' arch=('x86_64') @@ -17,7 +17,7 @@ source=("https://netfilter.org/projects/nftables/files/nftables-$pkgver.tar.xz"{ 'nftables.conf' 'nftables.service') install=nftables.install -sha256sums=('2407430ddd82987670e48dc2fda9e280baa8307abec04ab18d609df3db005e4c' +sha256sums=('c12ac941fff9adaedf17367d5ce213789b98a0d314277bc22b3d71e10891f412' 'SKIP' '2aff88019097d21dbfa4713f5b54c184751c86376e458b683f8d90f3abd232a8' 'deffeef36fe658867dd9203ec13dec85047a6d224ea63334dcf60db97e1809ea') diff --git a/nftables/deps b/nftables/deps index 7d8bce8..9ee1a8b 100644 --- a/nftables/deps +++ b/nftables/deps @@ -1,7 +1,6 @@ - asciidoc python - - autoconf automake + + diff --git a/nftables/time b/nftables/time index c13190c..dc2a188 100644 --- a/nftables/time +++ b/nftables/time @@ -1,6 +1,6 @@ -real 0m29.555s -user 0m27.712s -sys 0m1.761s +real 0m33.157s +user 0m29.970s +sys 0m3.558s