* [gentoo-commits] repo/gentoo:master commit in: net-wireless/blueman/, net-wireless/blueman/files/
@ 2015-08-13 8:01 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2015-08-13 8:01 UTC (permalink / raw
To: gentoo-commits
commit: 876131b7c5ee4b57abdda2ed12e19d9a689a0bd8
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 13 08:01:07 2015 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 13 08:01:07 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=876131b7
net-wireless/blueman-9999: remove the codeset patch thas has been merged upstream
Package-Manager: portage-2.2.20
net-wireless/blueman/blueman-9999.ebuild | 2 -
...9-set-codeset-for-gettext-to-UTF-8-always.patch | 267 ---------------------
2 files changed, 269 deletions(-)
diff --git a/net-wireless/blueman/blueman-9999.ebuild b/net-wireless/blueman/blueman-9999.ebuild
index caa2c00..be9d0db 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 fa536b2..0000000
--- 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
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/blueman/, net-wireless/blueman/files/
@ 2016-06-04 18:11 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2016-06-04 18:11 UTC (permalink / raw
To: gentoo-commits
commit: 7724be2064e7f967ff1678165c514a698d8c526c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 4 18:02:04 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jun 4 18:11:15 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7724be20
net-wireless/blueman: include polkit rules for network setup, #584300
Add a set of polkit rules that allow active users belonging to
the plugdev group to perform network setup actions via blueman. This
resembles the rules used by NetworkManager.
Bug: https://bugs.gentoo.org/show_bug.cgi?id=584300
net-wireless/blueman/blueman-9999.ebuild | 6 ++++++
net-wireless/blueman/files/01-org.blueman.rules | 11 +++++++++++
2 files changed, 17 insertions(+)
diff --git a/net-wireless/blueman/blueman-9999.ebuild b/net-wireless/blueman/blueman-9999.ebuild
index 011f2ef..69c82c7 100644
--- a/net-wireless/blueman/blueman-9999.ebuild
+++ b/net-wireless/blueman/blueman-9999.ebuild
@@ -97,6 +97,12 @@ src_configure() {
src_install() {
default
+ if use policykit; then
+ # Allow users in plugdev group to modify connections
+ insinto /usr/share/polkit-1/rules.d
+ doins "${FILESDIR}/01-org.blueman.rules"
+ fi
+
python_fix_shebang "${D}"
rm "${D}"/$(python_get_sitedir)/*.la || die
}
diff --git a/net-wireless/blueman/files/01-org.blueman.rules b/net-wireless/blueman/files/01-org.blueman.rules
new file mode 100644
index 0000000..2f1a2bd
--- /dev/null
+++ b/net-wireless/blueman/files/01-org.blueman.rules
@@ -0,0 +1,11 @@
+// Let users in plugdev group modify network connections using blueman
+polkit.addRule(function(action, subject) {
+ if ((action.id == "org.blueman.network.setup" ||
+ action.id == "org.blueman.dhcp.client" ||
+ action.id == "org.blueman.rfkill.setstate" ||
+ action.id == "org.blueman.pppd.pppconnect") &&
+ subject.isInGroup("plugdev") && subject.active) {
+
+ return polkit.Result.YES;
+ }
+});
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-wireless/blueman/, net-wireless/blueman/files/
@ 2018-03-18 14:21 Pacho Ramos
0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2018-03-18 14:21 UTC (permalink / raw
To: gentoo-commits
commit: 1545bce9baf8d390a7ad2939b8057001f8101b05
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 18 14:21:10 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Mar 18 14:21:20 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1545bce9
net-wireless/blueman: Drop old to make repoman happy
Package-Manager: Portage-2.3.24, Repoman-2.3.6
net-wireless/blueman/Manifest | 1 -
net-wireless/blueman/blueman-2.0.4.ebuild | 116 -----------
...0-set-codeset-for-gettext-to-UTF-8-always.patch | 219 ---------------------
net-wireless/blueman/metadata.xml | 1 -
4 files changed, 337 deletions(-)
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index 700a6d28f5d..8bfb88933d5 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -1,2 +1 @@
-DIST blueman-2.0.4.tar.xz 1951988 BLAKE2B f359a24447a8d9f446e7e28b16f34756a43ee6dd9e714267611355421ef511ea96c75d1739b6d0308fb24dd95979a99feb571fa194cae1cd7a382d57c30df2e4 SHA512 98dbe0ac706cf8d33ada6e520c0952fbb930aaa4ec62e35e989f60880287634c2ee947a47b4883063a0aabf27069210774432416278b190b1ca5e1c93d42f614
DIST blueman-2.1.alpha2.tar.xz 977344 BLAKE2B c5d3d0a96c1220596647ade310263342cdaaeef511a2fb36973d182025330a29b41fb805ce54e10a2f48c1c66312006858789233f8f0a93923952bb03ac32b19 SHA512 bde4922a93087d07fd99b165255ded8d9465866e62662f644beaafe363d5618a107abbd9d951cfbd034b02b6ece11fb8117efdd5d453632e4a2fea13d3825643
diff --git a/net-wireless/blueman/blueman-2.0.4.ebuild b/net-wireless/blueman/blueman-2.0.4.ebuild
deleted file mode 100644
index f4a7ed9cf06..00000000000
--- a/net-wireless/blueman/blueman-2.0.4.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-inherit gnome2-utils linux-info python-single-r1
-
-DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
-HOMEPAGE="https://github.com/blueman-project/blueman"
-
-if [[ ${PV} == "9999" ]] ; then
- inherit autotools git-r3
- EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
- KEYWORDS=""
-else
- SRC_URI="https://github.com/blueman-project/${PN}/releases/download/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="appindicator network nls policykit pulseaudio thunar"
-
-COMMON_DEPEND="
- dev-python/pygobject:3
- >=net-wireless/bluez-4.61:=
- ${PYTHON_DEPS}"
-DEPEND="${COMMON_DEPEND}
- dev-python/cython[${PYTHON_USEDEP}]
- virtual/pkgconfig
- nls? ( dev-util/intltool sys-devel/gettext )"
-RDEPEND="${COMMON_DEPEND}
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- sys-apps/dbus
- x11-libs/gtk+:3[introspection]
- x11-libs/libnotify[introspection]
- || (
- x11-themes/faenza-icon-theme
- x11-themes/gnome-icon-theme
- x11-themes/mate-icon-theme
- )
- appindicator? ( dev-libs/libappindicator:3[introspection] )
- network? (
- net-dns/avahi[autoipd]
- net-firewall/iptables
- sys-apps/net-tools
- || (
- net-dns/dnsmasq
- net-misc/dhcp
- >=net-misc/networkmanager-0.8
- )
- )
- policykit? ( sys-auth/polkit )
- pulseaudio? ( media-sound/pulseaudio[bluetooth] )
- thunar? ( xfce-base/thunar )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_pretend() {
- if use network; then
- local CONFIG_CHECK="~BRIDGE ~IP_NF_IPTABLES
- ~IP_NF_NAT ~IP_NF_TARGET_MASQUERADE"
- linux-info_pkg_setup
- fi
-}
-
-pkg_setup() {
- pkg_pretend
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}/${PN}-2.0-set-codeset-for-gettext-to-UTF-8-always.patch"
- )
- default
- [[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
- econf \
- --docdir=/usr/share/doc/${PF} \
- --disable-runtime-deps-check \
- --disable-static \
- $(use_enable policykit polkit) \
- $(use_enable nls) \
- $(use_enable thunar thunar-sendto)
-}
-
-src_install() {
- default
-
- python_fix_shebang "${D}"
- rm "${D}"/$(python_get_sitedir)/*.la || die
-
- use appindicator || { rm "${D}"/$(python_get_sitedir)/${PN}/plugins/applet/AppIndicator.py* || die; }
- use pulseaudio || { rm "${D}"/$(python_get_sitedir)/${PN}/{main/Pulse*.py*,plugins/manager/Pulse*.py*} || die; }
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
- gnome2_schemas_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- gnome2_schemas_update
-}
diff --git a/net-wireless/blueman/files/blueman-2.0-set-codeset-for-gettext-to-UTF-8-always.patch b/net-wireless/blueman/files/blueman-2.0-set-codeset-for-gettext-to-UTF-8-always.patch
deleted file mode 100644
index 5d3d1bd3c0e..00000000000
--- a/net-wireless/blueman/files/blueman-2.0-set-codeset-for-gettext-to-UTF-8-always.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-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 a961480..3759ba8 100755
---- a/apps/blueman-adapters
-+++ b/apps/blueman-adapters
-@@ -6,6 +6,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__), '..'))
-@@ -36,6 +37,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 7d96ec7..c322256 100755
---- a/apps/blueman-assistant
-+++ b/apps/blueman-assistant
-@@ -16,6 +16,7 @@ import random
- import signal
- import dbus.glib
- from optparse import OptionParser
-+from locale import bind_textdomain_codeset
-
- #support running uninstalled
- _dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
-@@ -62,6 +63,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 666f16c..af23015 100755
---- a/apps/blueman-manager
-+++ b/apps/blueman-manager
-@@ -8,6 +8,7 @@ from dbus.mainloop.glib import DBusGMainLoop
- from blueman.Constants import *
- import gi
- gi.require_version("Gtk", "3.0")
-+from locale import bind_textdomain_codeset
- from gi.repository import Gtk
- from gi.repository import GObject
- from blueman.bluez.BlueZInterface import BlueZInterface
-@@ -46,6 +47,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 06ad626..a7099ab 100755
---- a/apps/blueman-sendto
-+++ b/apps/blueman-sendto
-@@ -13,6 +13,7 @@ from optparse import OptionParser
- import gettext
- import urllib
- import time
-+from locale import bind_textdomain_codeset
-
- from blueman.Constants import *
- import gi
-@@ -48,6 +49,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 fb1428d..e3e708b 100755
---- a/apps/blueman-services
-+++ b/apps/blueman-services
-@@ -2,6 +2,7 @@
-
- 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")):
-@@ -29,6 +30,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()
-diff --git a/blueman/gui/GsmSettings.py b/blueman/gui/GsmSettings.py
-index b12f77f..cc80492 100644
---- a/blueman/gui/GsmSettings.py
-+++ b/blueman/gui/GsmSettings.py
-@@ -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):
-@@ -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 71dd742..3a1f932 100644
---- a/blueman/gui/applet/PluginDialog.py
-+++ b/blueman/gui/applet/PluginDialog.py
-@@ -1,4 +1,5 @@
- from gi.repository import Gtk
-+from locale import bind_textdomain_codeset
- from blueman.Constants import *
- from blueman.Functions import *
-
-@@ -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"))
- self.props.icon_name = "blueman"
-diff --git a/blueman/plugins/applet/NetUsage.py b/blueman/plugins/applet/NetUsage.py
-index f6acb1f..5545112 100644
---- a/blueman/plugins/applet/NetUsage.py
-+++ b/blueman/plugins/applet/NetUsage.py
-@@ -17,7 +17,7 @@ import dbus
- import time
- import datetime
- import gettext
--
-+from locale import bind_textdomain_codeset
-
- class MonitorBase(GObject.GObject):
- __gsignals__ = {
-@@ -134,6 +134,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 278121e..e688e68 100644
---- a/blueman/plugins/services/Network.py
-+++ b/blueman/plugins/services/Network.py
-@@ -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
-@@ -19,7 +19,8 @@ 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")
-
- self.ignored_keys = []
-diff --git a/blueman/plugins/services/Transfer.py b/blueman/plugins/services/Transfer.py
-index d14d0eb..c3e71ad 100644
---- a/blueman/plugins/services/Transfer.py
-+++ b/blueman/plugins/services/Transfer.py
-@@ -1,4 +1,5 @@
- from gi.repository import Gtk
-+from locale import bind_textdomain_codeset
- from blueman.Constants import *
- from blueman.plugins.ServicePlugin import ServicePlugin
-
-@@ -14,6 +15,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.3.1
-
diff --git a/net-wireless/blueman/metadata.xml b/net-wireless/blueman/metadata.xml
index 9ebda01a38f..5f955d47579 100644
--- a/net-wireless/blueman/metadata.xml
+++ b/net-wireless/blueman/metadata.xml
@@ -11,7 +11,6 @@
<use>
<flag name="appindicator">Enable usage of <pkg>dev-libs/libappindicator</pkg> to export menu options</flag>
<flag name="network">Add functionality to setup (host) PAN connections using either <pkg>net-dns/dnsmasq</pkg> or <pkg>net-misc/dhcp</pkg></flag>
- <flag name="thunar">Install the sendto-plugin for <pkg>xfce-base/thunar</pkg></flag>
</use>
<upstream>
<remote-id type="github">blueman-project/blueman</remote-id>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-03-18 14:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-13 8:01 [gentoo-commits] repo/gentoo:master commit in: net-wireless/blueman/, net-wireless/blueman/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2016-06-04 18:11 Michał Górny
2018-03-18 14:21 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox