[arch-commits] Commit in vino/repos/extra-x86_64 (3 files)

[Jan de Groot]

    Date: Sunday, May 6, 2018 @ 21:30:07
  Author: jgc
Revision: 323402

archrelease: copy trunk to extra-x86_64

Added:
  vino/repos/extra-x86_64/PKGBUILD
    (from rev 323401, vino/trunk/PKGBUILD)
  vino/repos/extra-x86_64/dont-crash-on-wayland.patch
    (from rev 323401, vino/trunk/dont-crash-on-wayland.patch)
Deleted:
  vino/repos/extra-x86_64/PKGBUILD

-----------------------------+
 PKGBUILD                    |   99 +++++++++++++++++++++---------------------
 dont-crash-on-wayland.patch |   41 +++++++++++++++++
 2 files changed, 92 insertions(+), 48 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-06 21:30:02 UTC (rev 323401)
+++ PKGBUILD	2018-05-06 21:30:07 UTC (rev 323402)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-pkgname=vino
-pkgver=3.22.0+7+g74dd40f
-pkgrel=1
-pkgdesc="A VNC server for the GNOME desktop"
-url="https://wiki.gnome.org/Projects/Vino"
-arch=(i686 x86_64)
-license=(GPL)
-depends=(libnotify libxtst libsm telepathy-glib gtk3 libsecret avahi gnutls)
-makedepends=(intltool networkmanager gnome-common git)
-groups=(gnome)
-_commit=74dd40f2c218fbe51c915c8acf7987a2d507667c  # master
-source=("git+https://git.gnome.org/browse/vino#commit=$_commit")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd $pkgname
-  # Fixup missing tag for pkgver()
-  git tag -f 3.22.0 2448f101df88d8f50c82b2969cd3cb4e9c755fc6
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  cd $pkgname
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/vino \
-      --localstatedir=/var \
-      --disable-http-server --with-secret
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
-}
-
-package() {
-  cd $pkgname
-  make DESTDIR="$pkgdir" install
-}

Copied: vino/repos/extra-x86_64/PKGBUILD (from rev 323401, vino/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-05-06 21:30:07 UTC (rev 323402)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=vino
+pkgver=3.22.0+11+g3977943
+pkgrel=1
+pkgdesc="A VNC server for the GNOME desktop"
+url="https://wiki.gnome.org/Projects/Vino"
+arch=(x86_64)
+license=(GPL)
+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')
+
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/-/+/g'
+}
+
+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
+}
+
+build() {
+  cd $pkgname
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --libexecdir=/usr/lib/vino \
+      --localstatedir=/var \
+      --disable-http-server --with-secret
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+package() {
+  cd $pkgname
+  make DESTDIR="$pkgdir" install
+}

Copied: vino/repos/extra-x86_64/dont-crash-on-wayland.patch (from rev 323401, vino/trunk/dont-crash-on-wayland.patch)
===================================================================
--- dont-crash-on-wayland.patch	                        (rev 0)
+++ dont-crash-on-wayland.patch	2018-05-06 21:30:07 UTC (rev 323402)
@@ -0,0 +1,41 @@
+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