[arch-commits] Commit in vino/trunk (PKGBUILD dont-crash-on-wayland.patch)

[Jan Steffens]

    Date: Wednesday, September 12, 2018 @ 16:40:51
  Author: heftig
Revision: 334419

3.22.0+19+g15eb3c5-1

Modified:
  vino/trunk/PKGBUILD
Deleted:
  vino/trunk/dont-crash-on-wayland.patch

-----------------------------+
 PKGBUILD                    |   13 ++++---------
 dont-crash-on-wayland.patch |   41 -----------------------------------------
 2 files changed, 4 insertions(+), 50 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-12 16:34:09 UTC (rev 334418)
+++ PKGBUILD	2018-09-12 16:40:51 UTC (rev 334419)
@@ -2,7 +2,7 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=vino
-pkgver=3.22.0+11+g3977943
+pkgver=3.22.0+19+g15eb3c5
 pkgrel=1
 pkgdesc="A VNC server for the GNOME desktop"
 url="https://wiki.gnome.org/Projects/Vino"
@@ -11,11 +11,9 @@
 depends=(libnotify libxtst libsm telepathy-glib gtk3 libsecret avahi gnutls)
 makedepends=(intltool networkmanager gnome-common git)
 groups=(gnome)
-_commit=39779437dba89027cfa38b3f0b2c2559d128e53b  # master
-source=("git+https://git.gnome.org/browse/vino#commit=$_commit"
-        dont-crash-on-wayland.patch)
-sha256sums=('SKIP'
-            'd49376d49e56c545d47367c3bdd4aa9df717d60d9bcb24d0991d5ba8d29fd64a')
+_commit=15eb3c5e51b799aa22fff547dd88921d9cc4b5f2  # master
+source=("git+https://gitlab.gnome.org/GNOME/vino.git#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -24,9 +22,6 @@
 
 prepare() {
   cd $pkgname
-  # Fixup missing tag for pkgver()
-  git tag -f 3.22.0 2448f101df88d8f50c82b2969cd3cb4e9c755fc6
-  patch -Np1 -i ../dont-crash-on-wayland.patch
   NOCONFIGURE=1 ./autogen.sh
 }
 

Deleted: dont-crash-on-wayland.patch
===================================================================
--- dont-crash-on-wayland.patch	2018-09-12 16:34:09 UTC (rev 334418)
+++ dont-crash-on-wayland.patch	2018-09-12 16:40:51 UTC (rev 334419)
@@ -1,41 +0,0 @@
-From 5e49ab2d125388b843eca4f1f47849d18ccabcd3 Mon Sep 17 00:00:00 2001
-From: Ondrej Holy <oholy at redhat.com>
-Date: Tue, 20 Feb 2018 12:26:18 +0100
-Subject: [PATCH] Return error if X11 is not detected
-
-Vino-server crashes on Wayland in XQueryExtension. Since vino-server is
-not expected to work on displays other than X11, let's exit immediately
-if GDK_IS_X11_DISPLAY fail.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=761120
----
- server/vino-main.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/server/vino-main.c b/server/vino-main.c
-index dd95de7..7be3fff 100644
---- a/server/vino-main.c
-+++ b/server/vino-main.c
-@@ -28,6 +28,7 @@
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
- #include <locale.h>
-+#include <gdk/gdkx.h>
- 
- #include "vino-input.h"
- #include "vino-mdns.h"
-@@ -273,6 +274,12 @@ main (int argc, char **argv)
-     g_option_context_free (context);
-   }
- 
-+  if (!GDK_IS_X11_DISPLAY (gdk_display_get_default ()))
-+    {
-+      g_printerr ("X11 is not detected\n");
-+      return 1;
-+    }
-+
-   /* GSettings */
-   vino.settings = g_settings_new ("org.gnome.Vino");
- 
--- 
-2.16.2
\ No newline at end of file