[arch-commits] Commit in xdg-desktop-portal-gtk/trunk (2 files)

[Jan Steffens]

    Date: Wednesday, November 27, 2019 @ 22:43:20
  Author: heftig
Revision: 369851

1.5.1-1

Modified:
  xdg-desktop-portal-gtk/trunk/PKGBUILD
Deleted:
  xdg-desktop-portal-gtk/trunk/0001-configure-Add-missing-dep-on-libX11.patch

------------------------------------------------+
 0001-configure-Add-missing-dep-on-libX11.patch |   31 -----------------------
 PKGBUILD                                       |   13 +++------
 2 files changed, 5 insertions(+), 39 deletions(-)

Deleted: 0001-configure-Add-missing-dep-on-libX11.patch
===================================================================
--- 0001-configure-Add-missing-dep-on-libX11.patch	2019-11-27 22:35:36 UTC (rev 369850)
+++ 0001-configure-Add-missing-dep-on-libX11.patch	2019-11-27 22:43:20 UTC (rev 369851)
@@ -1,31 +0,0 @@
-From 92f478e907094004dbe367db3f6fb42f7fecf5af Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Fri, 4 Oct 2019 21:04:17 +0000
-Subject: [PATCH] configure: Add missing dep on libX11
-
-Fixes a link error:
-
-  CCLD     xdg-desktop-portal-gtk
-/usr/bin/ld: src/xdg_desktop_portal_gtk-gsd-remote-display-manager.o: undefined reference to symbol 'XQueryExtension'
-/usr/bin/ld: /usr/lib/libX11.so.6: error adding symbols: DSO missing from command line
-collect2: error: ld returned 1 exit status
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 88a9cba..b532412 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -61,7 +61,7 @@ PKG_CHECK_MODULES(GTK, [xdg-desktop-portal >= 1.0 glib-2.0 >= 2.44 gio-unix-2.0
- AC_SUBST(GTK_CFLAGS)
- AC_SUBST(GTK_LIBS)
- 
--PKG_CHECK_MODULES(GTK_X11, gtk+-x11-3.0,
-+PKG_CHECK_MODULES(GTK_X11, [gtk+-x11-3.0 x11],
- 		  have_gtk_x11=yes, have_gtk_x11=no)
- if test "$have_gtk_x11" = "yes"; then
- 	AC_DEFINE(HAVE_GTK_X11, 1, [define if we we have gtk+-x11])
--- 
-2.23.0
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-27 22:35:36 UTC (rev 369850)
+++ PKGBUILD	2019-11-27 22:43:20 UTC (rev 369851)
@@ -2,21 +2,19 @@
 # Contributor: Patrick Griffis <tingping at tingping.se>
 
 pkgname=xdg-desktop-portal-gtk
-pkgver=1.5.0
+pkgver=1.5.1
 pkgrel=1
 pkgdesc="A GTK+ backend for xdg-desktop-portal"
 url="https://github.com/flatpak/xdg-desktop-portal-gtk"
 arch=(x86_64)
 license=(LGPL2.1)
-depends=(gtk3)
+depends=(gtk3 gnome-desktop)
 makedepends=(xdg-desktop-portal python git evince)
 optdepends=("evince: Print preview")
 provides=(xdg-desktop-portal-impl)
-_commit=ffbbf4ef155f904e697acb7c33c0fe691a5fa49e  # tags/1.5.0^0
-source=("git+https://github.com/flatpak/xdg-desktop-portal-gtk#commit=$_commit"
-        0001-configure-Add-missing-dep-on-libX11.patch)
-sha256sums=('SKIP'
-            '1b855ddbe3aebfa8a21340bab6804b0f244d1885e5197f1d49df4fbd0b4b1bd0')
+_commit=40118d36f3a19c25433f87ba2ba83a66d3a71e28  # tags/1.5.1^0
+source=("git+https://github.com/flatpak/xdg-desktop-portal-gtk#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -25,7 +23,6 @@
 
 prepare() {
   cd $pkgname
-  git apply -3 ../0001-configure-Add-missing-dep-on-libX11.patch
   NOCONFIGURE=1 ./autogen.sh
 }