[arch-commits] Commit in rest/repos/extra-x86_64 (PKGBUILD PKGBUILD skip-test.diff)

[Jan Steffens]

    Date: Monday, January 17, 2022 @ 21:15:15
  Author: heftig
Revision: 434636

archrelease: copy trunk to extra-x86_64

Added:
  rest/repos/extra-x86_64/PKGBUILD
    (from rev 434634, rest/trunk/PKGBUILD)
  rest/repos/extra-x86_64/skip-test.diff
    (from rev 434634, rest/trunk/skip-test.diff)
Deleted:
  rest/repos/extra-x86_64/PKGBUILD

----------------+
 PKGBUILD       |   91 +++++++++++++++++++++++++++++++------------------------
 skip-test.diff |   13 +++++++
 2 files changed, 65 insertions(+), 39 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-17 21:15:15 UTC (rev 434635)
+++ PKGBUILD	2022-01-17 21:15:15 UTC (rev 434636)
@@ -1,39 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgname=rest
-pkgver=0.8.1
-pkgrel=3
-pkgdesc="Helper library for RESTful services"
-url="https://wiki.gnome.org/Projects/Librest"
-arch=(x86_64)
-license=(LGPL2.1)
-depends=(glib2 libxml2 libsoup)
-makedepends=(gobject-introspection gtk-doc git)
-provides=(librest{,-extras}-0.7.so)
-_commit=2971b3b92701f70fc368ad64bd25cefaea043f87  # tags/0.8.1^0
-source=("git+https://gitlab.gnome.org/GNOME/librest.git#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd librest
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd librest
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  cd librest
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-gtk-doc
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-package() {
-  cd librest
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:

Copied: rest/repos/extra-x86_64/PKGBUILD (from rev 434634, rest/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-01-17 21:15:15 UTC (rev 434636)
@@ -0,0 +1,52 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+
+pkgname=rest
+pkgver=0.8.1+r4+ge5ee6ef
+pkgrel=1
+pkgdesc="Library for accessing RESTful web services (legacy)"
+url="https://gitlab.gnome.org/GNOME/librest"
+arch=(x86_64)
+license=(LGPL2.1)
+depends=(glib2 libxml2 libsoup)
+makedepends=(gobject-introspection gtk-doc git)
+_commit=e5ee6ef751ee5a38d7b9fadcd631cf6ecec7b240  # librest-0-7
+source=("git+https://gitlab.gnome.org/GNOME/librest.git#commit=$_commit"
+        skip-test.diff)
+sha256sums=('SKIP'
+            'de88fef81a5bc060eff45003f4fd755802097e70a782111a9fa18310d123e8e2')
+
+pkgver() {
+  cd librest
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+  cd librest
+
+  # Skip tests trying to connect to oauthbin.com
+  git apply -3 ../skip-test.diff
+
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd librest
+  ./configure --prefix=/usr --sysconfdir=/etc --enable-gtk-doc
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
+
+check() {
+  cd librest
+  make check
+}
+
+package() {
+  depends+=(libg{lib,object,io}-2.0.so libxml2.so libsoup{,-gnome}-2.4.so)
+  provides+=(librest{,-extras}-0.7.so)
+
+  cd librest
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set sw=2 et:

Copied: rest/repos/extra-x86_64/skip-test.diff (from rev 434634, rest/trunk/skip-test.diff)
===================================================================
--- skip-test.diff	                        (rev 0)
+++ skip-test.diff	2022-01-17 21:15:15 UTC (rev 434636)
@@ -0,0 +1,13 @@
+ tests/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git c/tests/Makefile.am i/tests/Makefile.am
+index 5ffdd46..b326d47 100644
+--- c/tests/Makefile.am
++++ i/tests/Makefile.am
+@@ -1,4 +1,4 @@
+-TESTS = proxy proxy-continuous threaded oauth oauth-async oauth2 flickr lastfm xml custom-serialize
++TESTS = proxy proxy-continuous threaded oauth2 flickr lastfm xml custom-serialize
+ 
+ AM_CPPFLAGS = $(SOUP_CFLAGS) -I$(top_srcdir) $(GCOV_CFLAGS)
+ AM_LDFLAGS = $(SOUP_LIBS) $(GCOV_LDFLAGS) \