[arch-commits] Commit in gcr/trunk (10-gcr.conf PKGBUILD)

[Jan Steffens]

    Date: Sunday, March 8, 2020 @ 00:37:18
  Author: heftig
Revision: 376929

3.35.91+13+g9986760-1

Modified:
  gcr/trunk/PKGBUILD
Deleted:
  gcr/trunk/10-gcr.conf

-------------+
 10-gcr.conf |    3 ---
 PKGBUILD    |   38 ++++++++++++++------------------------
 2 files changed, 14 insertions(+), 27 deletions(-)

Deleted: 10-gcr.conf
===================================================================
--- 10-gcr.conf	2020-03-08 00:18:14 UTC (rev 376928)
+++ 10-gcr.conf	2020-03-08 00:37:18 UTC (rev 376929)
@@ -1,3 +0,0 @@
- at users - memlock 1024
-
-# vim:set ft=limits:

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-08 00:18:14 UTC (rev 376928)
+++ PKGBUILD	2020-03-08 00:37:18 UTC (rev 376929)
@@ -2,7 +2,7 @@
 # Contributor: Ionut Biru <ibiru at archlinux.org>
 
 pkgname=gcr
-pkgver=3.34.0
+pkgver=3.35.91+13+g9986760
 pkgrel=1
 pkgdesc="A library for bits of crypto UI and parsing"
 url="https://gitlab.gnome.org/GNOME/gcr"
@@ -9,12 +9,12 @@
 arch=(x86_64)
 license=(GPL2)
 depends=(gtk3 libgcrypt p11-kit)
-makedepends=(gobject-introspection python vala libxslt git gtk-doc)
-_commit=33972369eecfd880f23392f58ae484ab6b2ef62a  # tags/3.34.0^0
-source=("git+https://gitlab.gnome.org/GNOME/gcr.git#commit=$_commit"
-        10-gcr.conf)
-sha256sums=('SKIP'
-            '5f2eda7175ae9f23ee0e09d2beceb24fd2f6daafd7bddfcc1c1f5a3734eb60fc')
+makedepends=(gobject-introspection vala libxslt git gtk-doc meson)
+provides=(libgck-1.so libgcr-{base,ui}-3.so)
+_commit=99867606a94963c3d3743c943674801435c0f7e1  # master
+backup=(etc/security/limits.d/10-gcr.conf)
+source=("git+https://gitlab.gnome.org/GNOME/gcr.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -23,37 +23,27 @@
 
 prepare() {
   cd $pkgname
-  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd $pkgname
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib \
-    --enable-gtk-doc \
-    --disable-static \
-    --disable-update-mime \
-    --disable-schemas-compile
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
+  arch-meson $pkgname build
+  ninja -C build
 }
 
 check() {
-  cd $pkgname
   # Secure memory tests fail
-  dbus-run-session make -k check || :
+  dbus-run-session meson test -C build --print-errorlogs || :
 }
 
 package() {
-  cd $pkgname
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" meson install -C build
 
   # gcr wants to lock some memory to prevent swapping out private keys
   # https://bugs.archlinux.org/task/32616
   # https://bugzilla.gnome.org/show_bug.cgi?id=688161
-  install -Dt "$pkgdir/etc/security/limits.d" -m644 ../10-gcr.conf
+  install -Dm644 /dev/stdin "$pkgdir/etc/security/limits.d/10-gcr.conf" <<END
+ at users - memlock 1024
+END
 }
 
 # vim:set ts=2 sw=2 et: