[gnome-online-accounts]: upgrade to v3.48.0

1 files changed, 103 insertions, 59 deletions

diff --git a/nonprism/gnome-online-accounts/PKGBUILD b/nonprism/gnome-online-accounts/PKGBUILD
index c953c6669..3b794c9a6 100644
--- a/nonprism/gnome-online-accounts/PKGBUILD
+++ b/nonprism/gnome-online-accounts/PKGBUILD
@@ -1,78 +1,122 @@
-# $Id$
+# Maintainer (arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Andreas Grapentin <andreas@grapentin.org>
 # Contributor: Márcio Silva <coadde@hyperbola.info>
 # Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info>
 # Maintainer: Parabola Hackers <dev@lists.parabola.nu>
 
+
 # parabola changes and rationale:
-#  - removed support for possibly unsafe protocols
+# privacy:
+#   - removed support for possibly unsafe protocols
+# technical:
+#   - build from versioned source-ball, rather than VCS sources
+
 
-pkgname=gnome-online-accounts
-pkgver=3.34.1
-pkgrel=1.nonprism1
-pkgdesc="Single sign-on framework for GNOME, without support for unsafe and dangerous for privacy protocols"
+pkgbase=gnome-online-accounts
+pkgname=(
+  gnome-online-accounts
+  libgoa
+)
+pkgver=3.48.0
+pkgrel=2
+pkgrel+=.nonprism1
+pkgdesc="Single sign-on framework for GNOME"
+pkgdesc+=", without support for unsafe and dangerous for privacy protocols"
 url="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
-arch=(x86_64 i686 armv7h)
+arch=(x86_64)
+arch+=(armv7h i686)
 license=(LGPL)
-depends=(webkit2gtk json-glib libnotify rest libsecret telepathy-glib krb5 gcr)
-makedepends=(gobject-introspection gtk-doc vala autoconf-archive gnome-common git)
-optdepends=('gvfs-goa: Virtual file systems (e.g. OwnCloud)')
-
-_commit=a57487846b75dccd7a272f8682d647766ce222cd  # tags/3.34.1^0
-source=("git+https://git.gnome.org/browse/gnome-online-accounts#commit=$_commit"
-        "git+https://git.gnome.org/browse/telepathy-account-widgets")
-sha256sums=('SKIP'
-            'SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/-/+/g'
-}
+depends=(
+  gcr
+  json-glib
+  krb5
+  libnotify
+  librest
+  libsecret
+  webkit2gtk-4.1
+)
+makedepends=(
+  git
+  gobject-introspection
+  gtk-doc
+  meson
+  vala
+)
+makedepends=( ${makedepends[*]/git/} )
+source=(https://download.gnome.org/sources/gnome-online-accounts/3.48/gnome-online-accounts-3.48.0.tar.xz)
+sha256sums=('418bb9fcffdbd72a98205ad365137617fc1e3551a54de74f6a98d45d266175bf')
+
 
 prepare() {
-  cd $pkgname
+  cd ${pkgname}-${pkgver}
+}
 
-  git submodule init
-  git config --local submodule.telepathy-account-widgets.url "$srcdir/telepathy-account-widgets"
-  git submodule update
+build() {
+  local meson_options=(
+    -D gtk_doc=true
+    -D man=true
+    -D media_server=true
+  )
+  local privacy_options=( -D exchange=false              \
+                          -D fedora=false                \
+                          -D google=false                \
+                          -D google_client_id=NONE       \
+                          -D google_client_secret=NONE   \
+                          -D imap_smtp=true              \
+                          -D kerberos=true               \
+                          -D lastfm=false                \
+                          -D lastfm_client_id=NONE       \
+                          -D lastfm_client_secret=NONE   \
+                          -D media_server=false          \
+                          -D owncloud=true               \
+                          -D windows_live=false          \
+                          -D windows_live_client_id=NONE )
 
-  NOCONFIGURE=1 ./autogen.sh
+  arch-meson ${pkgname}-${pkgver} build "${meson_options[@]}" "${privacy_options[@]}"
+  meson compile -C build
 }
 
-build() {
-  cd $pkgname
-
-  ./configure \
-    --prefix=/usr \
-    --libexecdir=/usr/lib \
-    --disable-static \
-    --enable-compile-warnings=minimum \
-    --enable-inspector \
-    --enable-media-server \
-    --enable-kerberos \
-    --enable-telepathy \
-    --enable-owncloud \
-    --enable-imap-smtp \
-    --disable-lastfm \
-    --disable-todoist \
-    --disable-exchange \
-    --disable-facebook \
-    --disable-flickr \
-    --disable-google \
-    --disable-pocket \
-    --disable-windows-live \
-    --disable-twitter \
-    --disable-yahoo \
-    --disable-foursquare \
-    --enable-gtk-doc
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
+check() {
+  meson test -C build --print-errorlogs
 }
 
-package() {
-  cd $pkgname
-  make DESTDIR="$pkgdir" install
+_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
+}
+
+package_gnome-online-accounts() {
+  depends+=("libgoa=$pkgver-$pkgrel")
+  optdepends=(
+    'gvfs-goa: Virtual file systems, e.g. OwnCloud'
+    'gvfs-google: Google Drive'
+  )
+  provides=(libgoa-backend-1.0.so)
+
+  meson install -C build --destdir "$pkgdir"
+
+  cd "$pkgdir"
+
+  _pick goa usr/include/goa-1.0/goa
+  _pick goa usr/lib/libgoa-1.0.so*
+  _pick goa usr/lib/girepository-1.0/Goa-1.0.typelib
+  _pick goa usr/lib/goa-1.0/include
+  _pick goa usr/lib/pkgconfig/goa-1.0.pc
+  _pick goa usr/share/gir-1.0/Goa-1.0.gir
+  _pick goa usr/share/vala/vapi/goa-1.0.*
+  _pick goa usr/share/gtk-doc
+}
+
+package_libgoa() {
+  pkgdesc+=" - client library"
+  depends=(libg{lib,object,io}-2.0.so)
+  provides=(libgoa-1.0.so)
+
+  mv goa/* "$pkgdir"
 }