[arch-commits] Commit in electron/trunk (PKGBUILD gtk3-warnings.patch)

[Nicola Squartini]

    Date: Saturday, September 10, 2016 @ 09:44:10
  Author: tensor5
Revision: 189091

electron: fix some gtk3 warnings

Added:
  electron/trunk/gtk3-warnings.patch
Modified:
  electron/trunk/PKGBUILD

---------------------+
 PKGBUILD            |    3 ++
 gtk3-warnings.patch |   65 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-09-10 03:47:01 UTC (rev 189090)
+++ PKGBUILD	2016-09-10 09:44:10 UTC (rev 189091)
@@ -31,6 +31,7 @@
         'dont-use-sysroot.patch'
         'allow-i686.patch'
         'gtk3-menu-bar.patch'
+        'gtk3-warnings.patch'
         'use-system-clang.patch'
         'use-system-libraries-in-node.patch'
         'use-system-ninja.patch'
@@ -66,6 +67,7 @@
             '75b2e9827f0593e59a35c36c6039ad10d35d7499fed6d97c4ed48ef1cce54c2b'
             'c209475c16b506d8d888a54c8564718cf9775f450d1867e19e86a03d99a119be'
             '4834c8573587c133d02a21cdfeffd9ef3ad7d71360ba548f33e100448e2cb821'
+            '00506737d1005f76caa8d5505acd4c1d19b42ca62e9f07a26664659447413694'
             'e56184ddcceb29cfb1fcbca52678f72b7b8f8c8e69791016062f381aa78182f2'
             'eb8f4d2b376dce69bec4741301696e9a9b7796fcdb00e80281438d84dc4d8659'
             'dc3286a1947240ab6ec562263af0b3c9971da2a4ab45970e3e664563e877280f'
@@ -117,6 +119,7 @@
   cd "${srcdir}"/electron
 
   patch -Np1 -i "${srcdir}"/gtk3-menu-bar.patch
+  patch -Np1 -i "${srcdir}"/gtk3-warnings.patch
   patch -Np1 -i "${srcdir}"/use-system-clang.patch
   patch -Np1 -i "${srcdir}"/use-system-libraries-in-node.patch
   patch -Np1 -i "${srcdir}"/use-system-ninja.patch

Added: gtk3-warnings.patch
===================================================================
--- gtk3-warnings.patch	                        (rev 0)
+++ gtk3-warnings.patch	2016-09-10 09:44:10 UTC (rev 189091)
@@ -0,0 +1,65 @@
+--- a/atom/browser/ui/file_dialog_gtk.cc
++++ b/atom/browser/ui/file_dialog_gtk.cc
+@@ -2,6 +2,8 @@
+ // Use of this source code is governed by the MIT license that can be
+ // found in the LICENSE file.
+ 
++#include <glib/gi18n.h>
++
+ #include "atom/browser/ui/file_dialog.h"
+ 
+ #include "atom/browser/native_window_views.h"
+@@ -43,20 +45,20 @@ class FileChooserDialog {
+                     const Filters& filters)
+       : parent_(static_cast<atom::NativeWindowViews*>(parent_window)),
+         filters_(filters) {
+-    const char* confirm_text = GTK_STOCK_OK;
++    const char* confirm_text = _("_OK");
+ 
+     if (!button_label.empty())
+       confirm_text = button_label.c_str();
+     else if (action == GTK_FILE_CHOOSER_ACTION_SAVE)
+-      confirm_text = GTK_STOCK_SAVE;
++      confirm_text = _("_Save");
+     else if (action == GTK_FILE_CHOOSER_ACTION_OPEN)
+-      confirm_text = GTK_STOCK_OPEN;
++      confirm_text = _("_Open");
+ 
+     dialog_ = gtk_file_chooser_dialog_new(
+         title.c_str(),
+         NULL,
+         action,
+-        GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
++        _("_Cancel"), GTK_RESPONSE_CANCEL,
+         confirm_text, GTK_RESPONSE_ACCEPT,
+         NULL);
+     if (parent_) {
+--- a/atom/browser/ui/message_box_gtk.cc
++++ b/atom/browser/ui/message_box_gtk.cc
+@@ -2,6 +2,8 @@
+ // Use of this source code is governed by the MIT license that can be
+ // found in the LICENSE file.
+ 
++#include <glib/gi18n.h>
++
+ #include "atom/browser/ui/message_box.h"
+ 
+ #include "atom/browser/browser.h"
+@@ -107,13 +109,13 @@ class GtkMessageBox {
+   const char* TranslateToStock(int id, const std::string& text) {
+     std::string lower = base::ToLowerASCII(text);
+     if (lower == "cancel")
+-      return GTK_STOCK_CANCEL;
++      return _("_Cancel");
+     else if (lower == "no")
+-      return GTK_STOCK_NO;
++      return _("_No");
+     else if (lower == "ok")
+-      return GTK_STOCK_OK;
++      return _("_OK");
+     else if (lower == "yes")
+-      return GTK_STOCK_YES;
++      return _("_Yes");
+     else
+       return text.c_str();
+   }