Update the codeset patch for -9999.

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

2 files changed, 72 insertions, 88 deletions

diff --git a/net-wireless/blueman/ChangeLog b/net-wireless/blueman/ChangeLog
index cda6f7ce557b..bbdc035ce403 100644
--- a/net-wireless/blueman/ChangeLog
+++ b/net-wireless/blueman/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/blueman
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/ChangeLog,v 1.31 2015/01/09 17:53:09 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/ChangeLog,v 1.32 2015/03/01 22:18:20 mgorny Exp $
+
+  01 Mar 2015; Michał Górny <mgorny@gentoo.org>
+  files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch:
+  Update the codeset patch for -9999.
 
   05 Jan 2015;  Rick Farina<zerochaos@gentoo.org> 
   -blueman-1.21-r1.ebuild, blueman-1.23-r1.ebuild,
diff --git a/net-wireless/blueman/files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch b/net-wireless/blueman/files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch
index ce341c866cd9..90929ca6bde0 100644
--- a/net-wireless/blueman/files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch
+++ b/net-wireless/blueman/files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch
@@ -1,5 +1,23 @@
+From aebfe594584e7c5cca30062d643618fc2ab8144b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 1 Mar 2015 23:08:02 +0100
+Subject: [PATCH] set codeset for gettext to utf-8
+
+---
+ apps/blueman-adapters                |  2 ++
+ apps/blueman-assistant               |  2 ++
+ apps/blueman-manager                 |  2 ++
+ apps/blueman-sendto                  |  2 ++
+ apps/blueman-services                |  2 ++
+ blueman/gui/GsmSettings.py           |  2 ++
+ blueman/gui/applet/PluginDialog.py   |  4 +++-
+ blueman/plugins/applet/NetUsage.py   |  3 ++-
+ blueman/plugins/services/Network.py  |  3 ++-
+ blueman/plugins/services/Transfer.py |  2 ++
+ 11 files changed, 29 insertions(+), 6 deletions(-)
+
 diff --git a/apps/blueman-adapters b/apps/blueman-adapters
-index ed80a4f..9f27b9e 100755
+index a961480..3759ba8 100755
 --- a/apps/blueman-adapters
 +++ b/apps/blueman-adapters
 @@ -6,6 +6,7 @@ from gi.repository import Pango
@@ -10,7 +28,7 @@ index ed80a4f..9f27b9e 100755
  
  #support running uninstalled
  _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
-@@ -34,6 +35,7 @@ class BluemanAdapters:
+@@ -36,6 +37,7 @@ class BluemanAdapters:
  
          builder = Gtk.Builder()
          builder.set_translation_domain("blueman")
@@ -19,7 +37,7 @@ index ed80a4f..9f27b9e 100755
          self.dialog = builder.get_object("dialog")
  
 diff --git a/apps/blueman-assistant b/apps/blueman-assistant
-index 7e602c8..fab3355 100755
+index 7d96ec7..c322256 100755
 --- a/apps/blueman-assistant
 +++ b/apps/blueman-assistant
 @@ -16,6 +16,7 @@ import random
@@ -39,10 +57,10 @@ index 7e602c8..fab3355 100755
          self.assistant = self.Builder.get_object("assistant")
          self.assistant.set_title(_("Bluetooth Assistant"))
 diff --git a/apps/blueman-manager b/apps/blueman-manager
-index b152044..395257b 100755
+index 666f16c..af23015 100755
 --- a/apps/blueman-manager
 +++ b/apps/blueman-manager
-@@ -7,6 +7,7 @@ import dbus, dbus.glib
+@@ -8,6 +8,7 @@ from dbus.mainloop.glib import DBusGMainLoop
  from blueman.Constants import *
  import gi
  gi.require_version("Gtk", "3.0")
@@ -50,7 +68,7 @@ index b152044..395257b 100755
  from gi.repository import Gtk
  from gi.repository import GObject
  from blueman.bluez.BlueZInterface import BlueZInterface
-@@ -43,6 +44,7 @@ class Blueman:
+@@ -46,6 +47,7 @@ class Blueman:
  
          self.Builder = Gtk.Builder()
          self.Builder.set_translation_domain("blueman")
@@ -59,7 +77,7 @@ index b152044..395257b 100755
  
          self.window = self.Builder.get_object("window")
 diff --git a/apps/blueman-sendto b/apps/blueman-sendto
-index 852f99a..fdbff01 100755
+index 06ad626..a7099ab 100755
 --- a/apps/blueman-sendto
 +++ b/apps/blueman-sendto
 @@ -13,6 +13,7 @@ from optparse import OptionParser
@@ -70,7 +88,7 @@ index 852f99a..fdbff01 100755
  
  from blueman.Constants import *
  import gi
-@@ -46,6 +47,7 @@ class Sender(GObject.GObject):
+@@ -48,6 +49,7 @@ class Sender(GObject.GObject):
          GObject.GObject.__init__(self)
          self.Builder = Gtk.Builder()
          self.Builder.set_translation_domain("blueman")
@@ -79,7 +97,7 @@ index 852f99a..fdbff01 100755
          self.window = self.Builder.get_object("window")
  
 diff --git a/apps/blueman-services b/apps/blueman-services
-index 25a529b..4b4419c 100755
+index fb1428d..e3e708b 100755
 --- a/apps/blueman-services
 +++ b/apps/blueman-services
 @@ -2,6 +2,7 @@
@@ -99,67 +117,47 @@ index 25a529b..4b4419c 100755
  
          self.Config = Config()
 diff --git a/blueman/gui/GsmSettings.py b/blueman/gui/GsmSettings.py
-index ee07e62..e58277b 100644
+index b12f77f..cc80492 100644
 --- a/blueman/gui/GsmSettings.py
 +++ b/blueman/gui/GsmSettings.py
-@@ -21,6 +21,7 @@ from blueman.Functions import *
+@@ -3,6 +3,7 @@ from blueman.Functions import *
  from blueman.Constants import *
  
  from gi.repository import Gtk
 +from locale import bind_textdomain_codeset
  
+ 
  class GsmSettings(Gtk.Dialog):
- 	def __init__(self, bd_address):
-@@ -30,6 +31,7 @@ class GsmSettings(Gtk.Dialog):
- 		
- 		self.Builder = Gtk.Builder()
- 		self.Builder.set_translation_domain("blueman")
-+		bind_textdomain_codeset("blueman", "UTF-8")
- 		self.Builder.add_from_file(UI_PATH +"/gsm-settings.ui")
- 		
- 		vbox = self.Builder.get_object("vbox1")
+@@ -13,6 +14,7 @@ class GsmSettings(Gtk.Dialog):
+ 
+         self.Builder = Gtk.Builder()
+         self.Builder.set_translation_domain("blueman")
++        bind_textdomain_codeset("blueman", "UTF-8")
+         self.Builder.add_from_file(UI_PATH + "/gsm-settings.ui")
+ 
+         vbox = self.Builder.get_object("vbox1")
 diff --git a/blueman/gui/applet/PluginDialog.py b/blueman/gui/applet/PluginDialog.py
-index f994cc9..84d6370 100644
+index 71dd742..3a1f932 100644
 --- a/blueman/gui/applet/PluginDialog.py
 +++ b/blueman/gui/applet/PluginDialog.py
-@@ -23,6 +23,7 @@ from blueman.Functions import *
- 
- from blueman.gui.GenericList import GenericList
- import weakref
+@@ -1,4 +1,5 @@
+ from gi.repository import Gtk
 +from locale import bind_textdomain_codeset
+ from blueman.Constants import *
+ from blueman.Functions import *
  
- class SettingsWidget(Gtk.VBox):
- 	def __init__(self, inst):
-@@ -118,6 +119,7 @@ class PluginDialog(Gtk.Dialog):
- 		
- 		self.Builder = Gtk.Builder()
- 		self.Builder.set_translation_domain("blueman")
+@@ -97,7 +98,8 @@ class PluginDialog(Gtk.Dialog):
+ 
+         self.Builder = Gtk.Builder()
+         self.Builder.set_translation_domain("blueman")
+-        self.Builder.add_from_file(UI_PATH + "/applet-plugins-widget.ui")
 +		bind_textdomain_codeset("blueman", "UTF-8")
- 		self.Builder.add_from_file(UI_PATH +"/applet-plugins-widget.ui")
- 		
- 		self.set_title(_("Plugins"))
-diff --git a/blueman/main/applet/BluezAgent.py b/blueman/main/applet/BluezAgent.py
-index 072958d..207659c 100644
---- a/blueman/main/applet/BluezAgent.py
-+++ b/blueman/main/applet/BluezAgent.py
-@@ -7,6 +7,7 @@ from gi.repository import Gtk
- from gi.repository import GObject
- from gi.types import GObjectMeta
- import cgi
-+from locale import bind_textdomain_codeset
- import blueman.bluez as Bluez
- from blueman.Sdp import *
- from blueman.Constants import *
-@@ -50,6 +51,7 @@ class CommonAgent(GObject.GObject, Agent):
-                 editable.stop_emission("insert-text")
++		self.Builder.add_from_file(UI_PATH + "/applet-plugins-widget.ui")
  
-         builder = Gtk.Builder()
-+        bind_textdomain_codeset("blueman", "UTF-8")
-         builder.add_from_file(UI_PATH + "/applet-passkey.ui")
-         builder.set_translation_domain("blueman")
-         dialog = builder.get_object("dialog")
+         self.set_title(_("Plugins"))
+         self.props.icon_name = "blueman"
 diff --git a/blueman/plugins/applet/NetUsage.py b/blueman/plugins/applet/NetUsage.py
-index 9fd93c7..d6bc492 100644
+index f6acb1f..5545112 100644
 --- a/blueman/plugins/applet/NetUsage.py
 +++ b/blueman/plugins/applet/NetUsage.py
 @@ -17,7 +17,7 @@ import dbus
@@ -179,48 +177,27 @@ index 9fd93c7..d6bc492 100644
  
          self.dialog = builder.get_object("dialog")
          self.dialog.connect("response", self.on_response)
-diff --git a/blueman/plugins/services/Audio.py b/blueman/plugins/services/Audio.py
-index b44d6b5..4b13e8f 100644
---- a/blueman/plugins/services/Audio.py
-+++ b/blueman/plugins/services/Audio.py
-@@ -19,6 +19,7 @@
- 
- from gi.repository import Gtk
- import dbus
-+from locale import bind_textdomain_codeset
- from blueman.Constants import *
- from blueman.plugins.ServicePlugin import ServicePlugin
- 
-@@ -35,6 +36,7 @@ class Audio(ServicePlugin):
- 		
- 		self.Builder = Gtk.Builder()
- 		self.Builder.set_translation_domain("blueman")
-+		bind_textdomain_codeset("blueman", "UTF-8")
- 		self.Builder.add_from_file(UI_PATH +"/services-audio.ui")
- 		self.widget = self.Builder.get_object("audio")
- 		
 diff --git a/blueman/plugins/services/Network.py b/blueman/plugins/services/Network.py
-index 5fab49a..0dd88d9 100644
+index 278121e..e688e68 100644
 --- a/blueman/plugins/services/Network.py
 +++ b/blueman/plugins/services/Network.py
-@@ -18,6 +18,7 @@
- # 
- 
+@@ -1,4 +1,5 @@
  from gi.repository import Gtk
 +from locale import bind_textdomain_codeset
  from blueman.Constants import *
  from blueman.Functions import have, dprint, mask_ip4_address
  from blueman.Lib import get_net_interfaces, get_net_address, get_net_netmask
-@@ -36,6 +37,7 @@ class Network(ServicePlugin):
- 		
- 		self.Builder = Gtk.Builder()
- 		self.Builder.set_translation_domain("blueman")
-+		bind_textdomain_codeset("blueman", "UTF-8")
- 		self.Builder.add_from_file(UI_PATH +"/services-network.ui")
- 		self.widget = self.Builder.get_object("network")
- 		
+@@ -19,7 +20,7 @@ class Network(ServicePlugin):
+ 
+         self.Builder = Gtk.Builder()
+         self.Builder.set_translation_domain("blueman")
+-        self.Builder.add_from_file(UI_PATH + "/services-network.ui")
++        bind_textdomain_codeset("blueman", "UTF-8")        self.Builder.add_from_file(UI_PATH + "/services-network.ui")
+         self.widget = self.Builder.get_object("network")
+ 
+         self.ignored_keys = []
 diff --git a/blueman/plugins/services/Transfer.py b/blueman/plugins/services/Transfer.py
-index 189d0cc..8fa65d0 100644
+index d14d0eb..c3e71ad 100644
 --- a/blueman/plugins/services/Transfer.py
 +++ b/blueman/plugins/services/Transfer.py
 @@ -1,4 +1,5 @@
@@ -237,3 +214,6 @@ index 189d0cc..8fa65d0 100644
          self.Builder.add_from_file(UI_PATH + "/services-transfer.ui")
          self.widget = self.Builder.get_object("transfer")
  
+-- 
+2.3.1
+