summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2015-08-13 10:01:07 +0200
committerMichał Górny <mgorny@gentoo.org>2015-08-13 10:01:07 +0200
commit876131b7c5ee4b57abdda2ed12e19d9a689a0bd8 (patch)
tree25ebf30648e648daa17ec40ad111432717cb179a /net-wireless
parentdev-lang/mono mask 3.12.1 with doc flag due xattr bug (diff)
downloadgentoo-876131b7c5ee4b57abdda2ed12e19d9a689a0bd8.tar.gz
gentoo-876131b7c5ee4b57abdda2ed12e19d9a689a0bd8.tar.bz2
gentoo-876131b7c5ee4b57abdda2ed12e19d9a689a0bd8.zip
net-wireless/blueman-9999: remove the codeset patch thas has been merged upstream
Package-Manager: portage-2.2.20
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/blueman/blueman-9999.ebuild2
-rw-r--r--net-wireless/blueman/files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch267
2 files changed, 0 insertions, 269 deletions
diff --git a/net-wireless/blueman/blueman-9999.ebuild b/net-wireless/blueman/blueman-9999.ebuild
index caa2c00d0e8..be9d0db7d3a 100644
--- a/net-wireless/blueman/blueman-9999.ebuild
+++ b/net-wireless/blueman/blueman-9999.ebuild
@@ -75,8 +75,6 @@ pkg_setup() {
}
src_prepare() {
- epatch \
- "${FILESDIR}/${PN}-9999-set-codeset-for-gettext-to-UTF-8-always.patch"
[[ ${PV} == 9999 ]] && eautoreconf
}
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
deleted file mode 100644
index fa536b27c42..00000000000
--- a/net-wireless/blueman/files/blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch
+++ /dev/null
@@ -1,267 +0,0 @@
-From a28a982ba05a3b84dcfed43e5bd6801067b5d0c5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 8 Aug 2015 14:57:51 +0200
-Subject: [PATCH] Always set codeset for gettext to utf8
-
----
- apps/blueman-adapters | 2 ++
- apps/blueman-assistant | 2 ++
- apps/blueman-manager | 2 ++
- apps/blueman-sendto | 2 ++
- apps/blueman-services | 2 ++
- blueman/gui/GsmSettings.py | 3 +++
- blueman/gui/applet/PluginDialog.py | 3 +++
- blueman/gui/manager/ManagerDeviceMenu.py | 2 ++
- blueman/main/applet/BluezAgent.py | 2 ++
- blueman/plugins/applet/NetUsage.py | 3 ++-
- blueman/plugins/services/Network.py | 2 ++
- blueman/plugins/services/Transfer.py | 3 +++
- 12 files changed, 27 insertions(+), 1 deletion(-)
-
-diff --git a/apps/blueman-adapters b/apps/blueman-adapters
-index 4ac81fe..c8d8c06 100755
---- a/apps/blueman-adapters
-+++ b/apps/blueman-adapters
-@@ -11,6 +11,7 @@ from gi.repository import Pango
- import os.path
- import sys
- import signal
-+from locale import bind_textdomain_codeset
-
- #support running uninstalled
- _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
-@@ -40,6 +41,7 @@ class BluemanAdapters:
-
- builder = Gtk.Builder()
- builder.set_translation_domain("blueman")
-+ bind_textdomain_codeset("blueman", "UTF-8")
- builder.add_from_file(UI_PATH + "/adapters.ui")
- self.dialog = builder.get_object("dialog")
-
-diff --git a/apps/blueman-assistant b/apps/blueman-assistant
-index 0b8544b..b23150f 100755
---- a/apps/blueman-assistant
-+++ b/apps/blueman-assistant
-@@ -19,6 +19,7 @@ import os
- import sys
- import signal
- from optparse import OptionParser
-+from locale import bind_textdomain_codeset
-
- #support running uninstalled
- _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
-@@ -60,6 +61,7 @@ class Assistant:
-
- self.Builder = Gtk.Builder()
- self.Builder.set_translation_domain("blueman")
-+ bind_textdomain_codeset("blueman", "UTF-8")
- self.Builder.add_from_file(UI_PATH + "/assistant.ui")
- self.assistant = self.Builder.get_object("assistant")
- self.assistant.set_title(_("Bluetooth Assistant"))
-diff --git a/apps/blueman-manager b/apps/blueman-manager
-index d276692..e272528 100755
---- a/apps/blueman-manager
-+++ b/apps/blueman-manager
-@@ -14,6 +14,7 @@ from blueman.Constants import *
- import gi
- gi.require_version("Gtk", "3.0")
- from gi.repository import Gtk
-+from locale import bind_textdomain_codeset
-
- #support running uninstalled
- _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
-@@ -47,6 +48,7 @@ class Blueman:
-
- self.Builder = Gtk.Builder()
- self.Builder.set_translation_domain("blueman")
-+ bind_textdomain_codeset("blueman", "UTF-8")
- self.Builder.add_from_file(UI_PATH + "/manager-main.ui")
-
- self.window = self.Builder.get_object("window")
-diff --git a/apps/blueman-sendto b/apps/blueman-sendto
-index 54e30b4..3f99d1e 100755
---- a/apps/blueman-sendto
-+++ b/apps/blueman-sendto
-@@ -17,6 +17,7 @@ from optparse import OptionParser
- import gettext
- import urllib
- import time
-+from locale import bind_textdomain_codeset
-
- from blueman.Constants import *
- import gi
-@@ -52,6 +53,7 @@ class Sender(GObject.GObject):
- GObject.GObject.__init__(self)
- self.Builder = Gtk.Builder()
- self.Builder.set_translation_domain("blueman")
-+ bind_textdomain_codeset("blueman", "UTF-8")
- self.Builder.add_from_file(UI_PATH + "/send-dialog.ui")
- self.window = self.Builder.get_object("window")
-
-diff --git a/apps/blueman-services b/apps/blueman-services
-index 3e343ca..5e41261 100755
---- a/apps/blueman-services
-+++ b/apps/blueman-services
-@@ -7,6 +7,7 @@ from __future__ import unicode_literals
-
- import os
- import sys
-+from locale import bind_textdomain_codeset
- #support running uninstalled
- _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
- if os.path.exists(os.path.join(_dirname, "CHANGELOG.md")):
-@@ -35,6 +36,7 @@ class BluemanServices:
-
- self.Builder = Gtk.Builder()
- self.Builder.set_translation_domain("blueman")
-+ bind_textdomain_codeset("blueman", "UTF-8")
- self.Builder.add_from_file(UI_PATH + "/services.ui")
-
- self.Config = Config("org.blueman.general")
-diff --git a/blueman/gui/GsmSettings.py b/blueman/gui/GsmSettings.py
-index 2919a69..3cb7057 100644
---- a/blueman/gui/GsmSettings.py
-+++ b/blueman/gui/GsmSettings.py
-@@ -3,6 +3,8 @@ from __future__ import division
- from __future__ import absolute_import
- from __future__ import unicode_literals
-
-+from locale import bind_textdomain_codeset
-+
- from blueman.main.Config import Config
- from blueman.Functions import *
- from blueman.Constants import *
-@@ -20,6 +22,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 eb70b45..def7e48 100644
---- a/blueman/gui/applet/PluginDialog.py
-+++ b/blueman/gui/applet/PluginDialog.py
-@@ -3,6 +3,8 @@ from __future__ import division
- from __future__ import absolute_import
- from __future__ import unicode_literals
-
-+from locale import bind_textdomain_codeset
-+
- import gi
- gi.require_version("Gtk", "3.0")
- from gi.repository import Gtk
-@@ -105,6 +107,7 @@ class PluginDialog(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 + "/applet-plugins-widget.ui")
-
- self.set_title(_("Plugins"))
-diff --git a/blueman/gui/manager/ManagerDeviceMenu.py b/blueman/gui/manager/ManagerDeviceMenu.py
-index f0dea5a..031b456 100644
---- a/blueman/gui/manager/ManagerDeviceMenu.py
-+++ b/blueman/gui/manager/ManagerDeviceMenu.py
-@@ -3,6 +3,7 @@ from __future__ import division
- from __future__ import absolute_import
- from __future__ import unicode_literals
-
-+from locale import bind_textdomain_codeset
- from operator import itemgetter
- from blueman.Sdp import uuid128_to_uuid16, SERIAL_PORT_SVCLASS_ID, OBEX_OBJPUSH_SVCLASS_ID, OBEX_FILETRANS_SVCLASS_ID
- from blueman.Functions import *
-@@ -312,6 +313,7 @@ class ManagerDeviceMenu(Gtk.Menu):
-
- builder = Gtk.Builder()
- builder.set_translation_domain("blueman")
-+ bind_textdomain_codeset("blueman", "UTF-8")
- builder.add_from_file(UI_PATH + "/rename-device.ui")
- dialog = builder.get_object("dialog")
- dialog.set_transient_for(self.Blueman.window)
-diff --git a/blueman/main/applet/BluezAgent.py b/blueman/main/applet/BluezAgent.py
-index f49946d..e930963 100644
---- a/blueman/main/applet/BluezAgent.py
-+++ b/blueman/main/applet/BluezAgent.py
-@@ -6,6 +6,7 @@ from __future__ import unicode_literals
- import dbus
- from dbus.mainloop.glib import DBusGMainLoop
- import dbus.service
-+from locale import bind_textdomain_codeset
- from blueman.Functions import get_icon, dprint
-
- import gi
-@@ -68,6 +69,7 @@ class BluezAgent(_GObjectAgent, Agent, GObject.GObject):
- builder = Gtk.Builder()
- builder.add_from_file(UI_PATH + "/applet-passkey.ui")
- builder.set_translation_domain("blueman")
-+ bind_textdomain_codeset("blueman", "UTF-8")
- dialog = builder.get_object("dialog")
-
- dialog.props.icon_name = "blueman"
-diff --git a/blueman/plugins/applet/NetUsage.py b/blueman/plugins/applet/NetUsage.py
-index 1f3ad04..a498f98 100644
---- a/blueman/plugins/applet/NetUsage.py
-+++ b/blueman/plugins/applet/NetUsage.py
-@@ -24,7 +24,7 @@ import dbus
- import time
- import datetime
- import gettext
--
-+from locale import bind_textdomain_codeset
-
- class MonitorBase(GObject.GObject):
- __gsignals__ = {
-@@ -135,6 +135,7 @@ class Dialog:
- builder = Gtk.Builder()
- builder.add_from_file(UI_PATH + "/net-usage.ui")
- builder.set_translation_domain("blueman")
-+ bind_textdomain_codeset("blueman", "UTF-8")
-
- self.dialog = builder.get_object("dialog")
- self.dialog.connect("response", self.on_response)
-diff --git a/blueman/plugins/services/Network.py b/blueman/plugins/services/Network.py
-index 59e1da3..f36691a 100644
---- a/blueman/plugins/services/Network.py
-+++ b/blueman/plugins/services/Network.py
-@@ -18,6 +18,7 @@ from blueman.main.Mechanism import Mechanism
- from blueman.main.AppletService import AppletService
- from blueman.gui.Dialogs import NetworkErrorDialog
- from random import randint
-+from locale import bind_textdomain_codeset
-
-
- class Network(ServicePlugin):
-@@ -27,6 +28,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")
-
-diff --git a/blueman/plugins/services/Transfer.py b/blueman/plugins/services/Transfer.py
-index 61b9db1..4474e93 100644
---- a/blueman/plugins/services/Transfer.py
-+++ b/blueman/plugins/services/Transfer.py
-@@ -3,6 +3,8 @@ from __future__ import division
- from __future__ import absolute_import
- from __future__ import unicode_literals
-
-+from locale import bind_textdomain_codeset
-+
- import gi
- gi.require_version("Gtk", "3.0")
- from gi.repository import Gtk
-@@ -21,6 +23,7 @@ class Transfer(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-transfer.ui")
- self.widget = self.Builder.get_object("transfer")
-
---
-2.5.0
-