1 |
mgorny 15/03/01 22:18:20 |
2 |
|
3 |
Modified: |
4 |
blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch |
5 |
Log: |
6 |
Update the codeset patch for -9999. |
7 |
|
8 |
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
9 |
|
10 |
Revision Changes Path |
11 |
1.4 net-wireless/blueman/files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/blueman/files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch?rev=1.4&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/blueman/files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch?rev=1.4&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/blueman/files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch?r1=1.3&r2=1.4 |
16 |
|
17 |
Index: blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-wireless/blueman/files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch,v |
20 |
retrieving revision 1.3 |
21 |
retrieving revision 1.4 |
22 |
diff -u -r1.3 -r1.4 |
23 |
--- blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch 20 Nov 2014 13:09:18 -0000 1.3 |
24 |
+++ blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch 1 Mar 2015 22:18:20 -0000 1.4 |
25 |
@@ -1,5 +1,23 @@ |
26 |
+From aebfe594584e7c5cca30062d643618fc2ab8144b Mon Sep 17 00:00:00 2001 |
27 |
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o> |
28 |
+Date: Sun, 1 Mar 2015 23:08:02 +0100 |
29 |
+Subject: [PATCH] set codeset for gettext to utf-8 |
30 |
+ |
31 |
+--- |
32 |
+ apps/blueman-adapters | 2 ++ |
33 |
+ apps/blueman-assistant | 2 ++ |
34 |
+ apps/blueman-manager | 2 ++ |
35 |
+ apps/blueman-sendto | 2 ++ |
36 |
+ apps/blueman-services | 2 ++ |
37 |
+ blueman/gui/GsmSettings.py | 2 ++ |
38 |
+ blueman/gui/applet/PluginDialog.py | 4 +++- |
39 |
+ blueman/plugins/applet/NetUsage.py | 3 ++- |
40 |
+ blueman/plugins/services/Network.py | 3 ++- |
41 |
+ blueman/plugins/services/Transfer.py | 2 ++ |
42 |
+ 11 files changed, 29 insertions(+), 6 deletions(-) |
43 |
+ |
44 |
diff --git a/apps/blueman-adapters b/apps/blueman-adapters |
45 |
-index ed80a4f..9f27b9e 100755 |
46 |
+index a961480..3759ba8 100755 |
47 |
--- a/apps/blueman-adapters |
48 |
+++ b/apps/blueman-adapters |
49 |
@@ -6,6 +6,7 @@ from gi.repository import Pango |
50 |
@@ -10,7 +28,7 @@ |
51 |
|
52 |
#support running uninstalled |
53 |
_dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..')) |
54 |
-@@ -34,6 +35,7 @@ class BluemanAdapters: |
55 |
+@@ -36,6 +37,7 @@ class BluemanAdapters: |
56 |
|
57 |
builder = Gtk.Builder() |
58 |
builder.set_translation_domain("blueman") |
59 |
@@ -19,7 +37,7 @@ |
60 |
self.dialog = builder.get_object("dialog") |
61 |
|
62 |
diff --git a/apps/blueman-assistant b/apps/blueman-assistant |
63 |
-index 7e602c8..fab3355 100755 |
64 |
+index 7d96ec7..c322256 100755 |
65 |
--- a/apps/blueman-assistant |
66 |
+++ b/apps/blueman-assistant |
67 |
@@ -16,6 +16,7 @@ import random |
68 |
@@ -39,10 +57,10 @@ |
69 |
self.assistant = self.Builder.get_object("assistant") |
70 |
self.assistant.set_title(_("Bluetooth Assistant")) |
71 |
diff --git a/apps/blueman-manager b/apps/blueman-manager |
72 |
-index b152044..395257b 100755 |
73 |
+index 666f16c..af23015 100755 |
74 |
--- a/apps/blueman-manager |
75 |
+++ b/apps/blueman-manager |
76 |
-@@ -7,6 +7,7 @@ import dbus, dbus.glib |
77 |
+@@ -8,6 +8,7 @@ from dbus.mainloop.glib import DBusGMainLoop |
78 |
from blueman.Constants import * |
79 |
import gi |
80 |
gi.require_version("Gtk", "3.0") |
81 |
@@ -50,7 +68,7 @@ |
82 |
from gi.repository import Gtk |
83 |
from gi.repository import GObject |
84 |
from blueman.bluez.BlueZInterface import BlueZInterface |
85 |
-@@ -43,6 +44,7 @@ class Blueman: |
86 |
+@@ -46,6 +47,7 @@ class Blueman: |
87 |
|
88 |
self.Builder = Gtk.Builder() |
89 |
self.Builder.set_translation_domain("blueman") |
90 |
@@ -59,7 +77,7 @@ |
91 |
|
92 |
self.window = self.Builder.get_object("window") |
93 |
diff --git a/apps/blueman-sendto b/apps/blueman-sendto |
94 |
-index 852f99a..fdbff01 100755 |
95 |
+index 06ad626..a7099ab 100755 |
96 |
--- a/apps/blueman-sendto |
97 |
+++ b/apps/blueman-sendto |
98 |
@@ -13,6 +13,7 @@ from optparse import OptionParser |
99 |
@@ -70,7 +88,7 @@ |
100 |
|
101 |
from blueman.Constants import * |
102 |
import gi |
103 |
-@@ -46,6 +47,7 @@ class Sender(GObject.GObject): |
104 |
+@@ -48,6 +49,7 @@ class Sender(GObject.GObject): |
105 |
GObject.GObject.__init__(self) |
106 |
self.Builder = Gtk.Builder() |
107 |
self.Builder.set_translation_domain("blueman") |
108 |
@@ -79,7 +97,7 @@ |
109 |
self.window = self.Builder.get_object("window") |
110 |
|
111 |
diff --git a/apps/blueman-services b/apps/blueman-services |
112 |
-index 25a529b..4b4419c 100755 |
113 |
+index fb1428d..e3e708b 100755 |
114 |
--- a/apps/blueman-services |
115 |
+++ b/apps/blueman-services |
116 |
@@ -2,6 +2,7 @@ |
117 |
@@ -99,67 +117,47 @@ |
118 |
|
119 |
self.Config = Config() |
120 |
diff --git a/blueman/gui/GsmSettings.py b/blueman/gui/GsmSettings.py |
121 |
-index ee07e62..e58277b 100644 |
122 |
+index b12f77f..cc80492 100644 |
123 |
--- a/blueman/gui/GsmSettings.py |
124 |
+++ b/blueman/gui/GsmSettings.py |
125 |
-@@ -21,6 +21,7 @@ from blueman.Functions import * |
126 |
+@@ -3,6 +3,7 @@ from blueman.Functions import * |
127 |
from blueman.Constants import * |
128 |
|
129 |
from gi.repository import Gtk |
130 |
+from locale import bind_textdomain_codeset |
131 |
|
132 |
+ |
133 |
class GsmSettings(Gtk.Dialog): |
134 |
- def __init__(self, bd_address): |
135 |
-@@ -30,6 +31,7 @@ class GsmSettings(Gtk.Dialog): |
136 |
- |
137 |
- self.Builder = Gtk.Builder() |
138 |
- self.Builder.set_translation_domain("blueman") |
139 |
-+ bind_textdomain_codeset("blueman", "UTF-8") |
140 |
- self.Builder.add_from_file(UI_PATH +"/gsm-settings.ui") |
141 |
- |
142 |
- vbox = self.Builder.get_object("vbox1") |
143 |
+@@ -13,6 +14,7 @@ class GsmSettings(Gtk.Dialog): |
144 |
+ |
145 |
+ self.Builder = Gtk.Builder() |
146 |
+ self.Builder.set_translation_domain("blueman") |
147 |
++ bind_textdomain_codeset("blueman", "UTF-8") |
148 |
+ self.Builder.add_from_file(UI_PATH + "/gsm-settings.ui") |
149 |
+ |
150 |
+ vbox = self.Builder.get_object("vbox1") |
151 |
diff --git a/blueman/gui/applet/PluginDialog.py b/blueman/gui/applet/PluginDialog.py |
152 |
-index f994cc9..84d6370 100644 |
153 |
+index 71dd742..3a1f932 100644 |
154 |
--- a/blueman/gui/applet/PluginDialog.py |
155 |
+++ b/blueman/gui/applet/PluginDialog.py |
156 |
-@@ -23,6 +23,7 @@ from blueman.Functions import * |
157 |
- |
158 |
- from blueman.gui.GenericList import GenericList |
159 |
- import weakref |
160 |
+@@ -1,4 +1,5 @@ |
161 |
+ from gi.repository import Gtk |
162 |
+from locale import bind_textdomain_codeset |
163 |
+ from blueman.Constants import * |
164 |
+ from blueman.Functions import * |
165 |
|
166 |
- class SettingsWidget(Gtk.VBox): |
167 |
- def __init__(self, inst): |
168 |
-@@ -118,6 +119,7 @@ class PluginDialog(Gtk.Dialog): |
169 |
- |
170 |
- self.Builder = Gtk.Builder() |
171 |
- self.Builder.set_translation_domain("blueman") |
172 |
+@@ -97,7 +98,8 @@ class PluginDialog(Gtk.Dialog): |
173 |
+ |
174 |
+ self.Builder = Gtk.Builder() |
175 |
+ self.Builder.set_translation_domain("blueman") |
176 |
+- self.Builder.add_from_file(UI_PATH + "/applet-plugins-widget.ui") |
177 |
+ bind_textdomain_codeset("blueman", "UTF-8") |
178 |
- self.Builder.add_from_file(UI_PATH +"/applet-plugins-widget.ui") |
179 |
- |
180 |
- self.set_title(_("Plugins")) |
181 |
-diff --git a/blueman/main/applet/BluezAgent.py b/blueman/main/applet/BluezAgent.py |
182 |
-index 072958d..207659c 100644 |
183 |
---- a/blueman/main/applet/BluezAgent.py |
184 |
-+++ b/blueman/main/applet/BluezAgent.py |
185 |
-@@ -7,6 +7,7 @@ from gi.repository import Gtk |
186 |
- from gi.repository import GObject |
187 |
- from gi.types import GObjectMeta |
188 |
- import cgi |
189 |
-+from locale import bind_textdomain_codeset |
190 |
- import blueman.bluez as Bluez |
191 |
- from blueman.Sdp import * |
192 |
- from blueman.Constants import * |
193 |
-@@ -50,6 +51,7 @@ class CommonAgent(GObject.GObject, Agent): |
194 |
- editable.stop_emission("insert-text") |
195 |
++ self.Builder.add_from_file(UI_PATH + "/applet-plugins-widget.ui") |
196 |
|
197 |
- builder = Gtk.Builder() |
198 |
-+ bind_textdomain_codeset("blueman", "UTF-8") |
199 |
- builder.add_from_file(UI_PATH + "/applet-passkey.ui") |
200 |
- builder.set_translation_domain("blueman") |
201 |
- dialog = builder.get_object("dialog") |
202 |
+ self.set_title(_("Plugins")) |
203 |
+ self.props.icon_name = "blueman" |
204 |
diff --git a/blueman/plugins/applet/NetUsage.py b/blueman/plugins/applet/NetUsage.py |
205 |
-index 9fd93c7..d6bc492 100644 |
206 |
+index f6acb1f..5545112 100644 |
207 |
--- a/blueman/plugins/applet/NetUsage.py |
208 |
+++ b/blueman/plugins/applet/NetUsage.py |
209 |
@@ -17,7 +17,7 @@ import dbus |
210 |
@@ -179,48 +177,27 @@ |
211 |
|
212 |
self.dialog = builder.get_object("dialog") |
213 |
self.dialog.connect("response", self.on_response) |
214 |
-diff --git a/blueman/plugins/services/Audio.py b/blueman/plugins/services/Audio.py |
215 |
-index b44d6b5..4b13e8f 100644 |
216 |
---- a/blueman/plugins/services/Audio.py |
217 |
-+++ b/blueman/plugins/services/Audio.py |
218 |
-@@ -19,6 +19,7 @@ |
219 |
- |
220 |
- from gi.repository import Gtk |
221 |
- import dbus |
222 |
-+from locale import bind_textdomain_codeset |
223 |
- from blueman.Constants import * |
224 |
- from blueman.plugins.ServicePlugin import ServicePlugin |
225 |
- |
226 |
-@@ -35,6 +36,7 @@ class Audio(ServicePlugin): |
227 |
- |
228 |
- self.Builder = Gtk.Builder() |
229 |
- self.Builder.set_translation_domain("blueman") |
230 |
-+ bind_textdomain_codeset("blueman", "UTF-8") |
231 |
- self.Builder.add_from_file(UI_PATH +"/services-audio.ui") |
232 |
- self.widget = self.Builder.get_object("audio") |
233 |
- |
234 |
diff --git a/blueman/plugins/services/Network.py b/blueman/plugins/services/Network.py |
235 |
-index 5fab49a..0dd88d9 100644 |
236 |
+index 278121e..e688e68 100644 |
237 |
--- a/blueman/plugins/services/Network.py |
238 |
+++ b/blueman/plugins/services/Network.py |
239 |
-@@ -18,6 +18,7 @@ |
240 |
- # |
241 |
- |
242 |
+@@ -1,4 +1,5 @@ |
243 |
from gi.repository import Gtk |
244 |
+from locale import bind_textdomain_codeset |
245 |
from blueman.Constants import * |
246 |
from blueman.Functions import have, dprint, mask_ip4_address |
247 |
from blueman.Lib import get_net_interfaces, get_net_address, get_net_netmask |
248 |
-@@ -36,6 +37,7 @@ class Network(ServicePlugin): |
249 |
- |
250 |
- self.Builder = Gtk.Builder() |
251 |
- self.Builder.set_translation_domain("blueman") |
252 |
-+ bind_textdomain_codeset("blueman", "UTF-8") |
253 |
- self.Builder.add_from_file(UI_PATH +"/services-network.ui") |
254 |
- self.widget = self.Builder.get_object("network") |
255 |
- |
256 |
+@@ -19,7 +20,7 @@ class Network(ServicePlugin): |
257 |
+ |
258 |
+ self.Builder = Gtk.Builder() |
259 |
+ self.Builder.set_translation_domain("blueman") |
260 |
+- self.Builder.add_from_file(UI_PATH + "/services-network.ui") |
261 |
++ bind_textdomain_codeset("blueman", "UTF-8") self.Builder.add_from_file(UI_PATH + "/services-network.ui") |
262 |
+ self.widget = self.Builder.get_object("network") |
263 |
+ |
264 |
+ self.ignored_keys = [] |
265 |
diff --git a/blueman/plugins/services/Transfer.py b/blueman/plugins/services/Transfer.py |
266 |
-index 189d0cc..8fa65d0 100644 |
267 |
+index d14d0eb..c3e71ad 100644 |
268 |
--- a/blueman/plugins/services/Transfer.py |
269 |
+++ b/blueman/plugins/services/Transfer.py |
270 |
@@ -1,4 +1,5 @@ |
271 |
@@ -237,3 +214,6 @@ |
272 |
self.Builder.add_from_file(UI_PATH + "/services-transfer.ui") |
273 |
self.widget = self.Builder.get_object("transfer") |
274 |
|
275 |
+-- |
276 |
+2.3.1 |
277 |
+ |