[arch-commits] Commit in libportal/repos/extra-x86_64 (4 files)

[Bartłomiej Piotrowski]

    Date: Thursday, December 12, 2019 @ 20:44:29
  Author: bpiotrowski
Revision: 371316

archrelease: copy trunk to extra-x86_64

Added:
  libportal/repos/extra-x86_64/0001-filechooser-Don-t-try-to-free-the-method-name-it-s-s.patch
    (from rev 371315, libportal/trunk/0001-filechooser-Don-t-try-to-free-the-method-name-it-s-s.patch)
  libportal/repos/extra-x86_64/PKGBUILD
    (from rev 371315, libportal/trunk/PKGBUILD)
Deleted:
  libportal/repos/extra-x86_64/0001-filechooser-Don-t-try-to-free-the-method-name-it-s-s.patch
  libportal/repos/extra-x86_64/PKGBUILD

-----------------------------------------------------------------+
 0001-filechooser-Don-t-try-to-free-the-method-name-it-s-s.patch |   48 +++---
 PKGBUILD                                                        |   77 ++++------
 2 files changed, 60 insertions(+), 65 deletions(-)

Deleted: 0001-filechooser-Don-t-try-to-free-the-method-name-it-s-s.patch
===================================================================
--- 0001-filechooser-Don-t-try-to-free-the-method-name-it-s-s.patch	2019-12-12 20:44:24 UTC (rev 371315)
+++ 0001-filechooser-Don-t-try-to-free-the-method-name-it-s-s.patch	2019-12-12 20:44:29 UTC (rev 371316)
@@ -1,24 +0,0 @@
-From 902917eb4f66f69496e977b3c72e0fa178775f89 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Wed, 27 Nov 2019 22:29:48 +0000
-Subject: [PATCH] filechooser: Don't try to free the method name; it's static
-
----
- libportal/filechooser.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/libportal/filechooser.c b/libportal/filechooser.c
-index 2b665b8..135c269 100644
---- a/libportal/filechooser.c
-+++ b/libportal/filechooser.c
-@@ -78,7 +78,6 @@ file_call_free (FileCall *call)
-   g_object_unref (call->portal);
-   g_object_unref (call->task);
- 
--  g_free (call->method);
-   g_free (call->title);
-   g_free (call->current_name);
-   g_free (call->current_folder);
--- 
-2.24.0
-

Copied: libportal/repos/extra-x86_64/0001-filechooser-Don-t-try-to-free-the-method-name-it-s-s.patch (from rev 371315, libportal/trunk/0001-filechooser-Don-t-try-to-free-the-method-name-it-s-s.patch)
===================================================================
--- 0001-filechooser-Don-t-try-to-free-the-method-name-it-s-s.patch	                        (rev 0)
+++ 0001-filechooser-Don-t-try-to-free-the-method-name-it-s-s.patch	2019-12-12 20:44:29 UTC (rev 371316)
@@ -0,0 +1,24 @@
+From 902917eb4f66f69496e977b3c72e0fa178775f89 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Wed, 27 Nov 2019 22:29:48 +0000
+Subject: [PATCH] filechooser: Don't try to free the method name; it's static
+
+---
+ libportal/filechooser.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/libportal/filechooser.c b/libportal/filechooser.c
+index 2b665b8..135c269 100644
+--- a/libportal/filechooser.c
++++ b/libportal/filechooser.c
+@@ -78,7 +78,6 @@ file_call_free (FileCall *call)
+   g_object_unref (call->portal);
+   g_object_unref (call->task);
+ 
+-  g_free (call->method);
+   g_free (call->title);
+   g_free (call->current_name);
+   g_free (call->current_folder);
+-- 
+2.24.0
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-12 20:44:24 UTC (rev 371315)
+++ PKGBUILD	2019-12-12 20:44:29 UTC (rev 371316)
@@ -1,41 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
- 
-pkgname=libportal
-pkgver=0.1
-pkgrel=1
-pkgdesc="GIO-style async APIs for most Flatpak portals"
-url="https://github.com/flatpak/libportal"
-arch=(x86_64)
-license=(LGPL)
-depends=(glib2)
-makedepends=(git meson gtk-doc)
-_commit=a7a1edcaeceb53652b7d76adadfec390f7b09178  # tags/0.1^0
-source=("git+https://github.com/flatpak/libportal#commit=$_commit"
-        0001-filechooser-Don-t-try-to-free-the-method-name-it-s-s.patch)
-sha256sums=('SKIP'
-            '934374cb20a3bb76df2c1982a56a15e1c9808a1dfa46273db6529dd6213bde1f')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-  git apply -3 ../0001-filechooser-Don-t-try-to-free-the-method-name-it-s-s.patch
-}
-
-build() {
-  arch-meson $pkgname build
-  ninja -C build
-}
-
-check() {
-  meson test -C build --print-errorlogs
-}
-
-package() {
-  DESTDIR="$pkgdir" meson install -C build
-}
-
-# vim:set sw=2 et:

Copied: libportal/repos/extra-x86_64/PKGBUILD (from rev 371315, libportal/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-12-12 20:44:29 UTC (rev 371316)
@@ -0,0 +1,36 @@
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+ 
+pkgname=libportal
+pkgver=0.1.r24.g7355b1e
+pkgrel=1
+pkgdesc="GIO-style async APIs for most Flatpak portals"
+url="https://github.com/flatpak/libportal"
+arch=(x86_64)
+license=(LGPL)
+depends=(glib2)
+makedepends=(git meson gtk-doc)
+_commit=7355b1e2e98b7c0f8f3d0601ef4d78369b91aad3  # master
+source=("git+https://github.com/flatpak/libportal#commit=$_commit"
+        0001-filechooser-Don-t-try-to-free-the-method-name-it-s-s.patch)
+sha256sums=('SKIP'
+            '934374cb20a3bb76df2c1982a56a15e1c9808a1dfa46273db6529dd6213bde1f')
+
+pkgver() {
+  cd "$pkgname"
+  git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+build() {
+  arch-meson $pkgname build
+  ninja -C build
+}
+
+check() {
+  meson test -C build --print-errorlogs
+}
+
+package() {
+  DESTDIR="$pkgdir" meson install -C build
+}
+
+# vim:set sw=2 et: