[arch-commits] Commit in electron/trunk (3 files)

[Nicola Squartini]

    Date: Wednesday, September 14, 2016 @ 03:43:58
  Author: tensor5
Revision: 189286

upgpkg: electron 1.3.5-4

Use gdk_set_allowed_backends().

Added:
  electron/trunk/chromium-gtk3-use-x11-backend.patch
Modified:
  electron/trunk/PKGBUILD
  electron/trunk/electron.sh

-------------------------------------+
 PKGBUILD                            |    7 +++++--
 chromium-gtk3-use-x11-backend.patch |   12 ++++++++++++
 electron.sh                         |    2 --
 3 files changed, 17 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-09-14 02:55:27 UTC (rev 189285)
+++ PKGBUILD	2016-09-14 03:43:58 UTC (rev 189286)
@@ -4,7 +4,7 @@
 _chromiumver=52.0.2743.82
 pkgname=electron
 pkgver=1.3.5
-pkgrel=3
+pkgrel=4
 pkgdesc='Build cross platform desktop apps with web technologies'
 arch=('i686' 'x86_64')
 url='http://electron.atom.io/'
@@ -44,6 +44,7 @@
         'libchromiumcontent-static-library-only.patch'
         'libchromiumcontent-use-system-ffmpeg.patch'
         'libchromiumcontent-use-system-tools.patch'
+        'chromium-gtk3-use-x11-backend.patch'
         'chromium-unset-madv_free.patch'
         'chromium-use-system-ffmpeg.patch'
         'chromium-use-system-libpng.patch'
@@ -80,11 +81,12 @@
             '7bc4cc154643712556f2cfbcba72bc08d032a52a39bccc61c91a7b230fe9a80e'
             '1c4c4ad492cd5bb437d4b0ee1001e3e01e952eee23b56e697e44294c715c97ba'
             '2fb2157c854dab173a2ef9b4aa0ab5bb3c0dd077447c4719c7554eee6e0546b6'
+            '2ecc112e797a0de512dc267be1be6bd86a2c8adde0a308c341896fb0dadb4366'
             'ccba3002243fb1f9a67c8a60af310706caa591d12aef45f1d0f4bda47626f3ab'
             'f890e35922a5e049491259354c221c8a51baff84092ef566ea590495e615445f'
             'caaa63eabcfdced965638b3353448fabda9bc4e6d898d8ec278ecac31502ded1'
             'ae8db257191600e5d1e3d3142c8b430652047c2b3575d82696573f1649154c62'
-            '7d49a587633c1a4a773f2a1510a12250de6b3c7a8fbb7928489c49f7ec6997ca'
+            'c4d171ea37c421e5e586f8735595012ad4aada9a3be9bfe86bc8abb5c5d1488e'
            )
 
 _chromium_flags=('fastbuild=2'
@@ -175,6 +177,7 @@
     echo "${_chromiumver}" > src/.version
   fi
   cd src
+  patch -Np1 -i "${srcdir}"/chromium-gtk3-use-x11-backend.patch
   patch -Np1 -i "${srcdir}"/chromium-unset-madv_free.patch  # fixes crash with kernels < 4.5
   patch -Np1 -i "${srcdir}"/chromium-use-system-ffmpeg.patch
   patch -Np1 -i "${srcdir}"/chromium-use-system-libpng.patch

Added: chromium-gtk3-use-x11-backend.patch
===================================================================
--- chromium-gtk3-use-x11-backend.patch	                        (rev 0)
+++ chromium-gtk3-use-x11-backend.patch	2016-09-14 03:43:58 UTC (rev 189286)
@@ -0,0 +1,12 @@
+--- a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
++++ b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
+@@ -487,6 +487,9 @@
+       default_font_style_(gfx::Font::NORMAL),
+       middle_click_action_(GetDefaultMiddleClickAction()),
+       device_scale_factor_(1.0) {
++#if GTK_MAJOR_VERSION > 2
++  gdk_set_allowed_backends("x11");
++#endif
+   GtkInitFromCommandLine(*base::CommandLine::ForCurrentProcess());
+ }
+ 

Modified: electron.sh
===================================================================
--- electron.sh	2016-09-14 02:55:27 UTC (rev 189285)
+++ electron.sh	2016-09-14 03:43:58 UTC (rev 189286)
@@ -1,7 +1,5 @@
 #!/usr/bin/bash
 
-export GDK_BACKEND=x11
-
 # Workaround for scaling issues on HiDPI displays
 export GDK_SCALE=${GDK_SCALE:-1}