diff options
| -rw-r--r-- | net-wireless/blueman/ChangeLog | 9 | ||||
| -rw-r--r-- | net-wireless/blueman/Manifest | 35 | ||||
| -rw-r--r-- | net-wireless/blueman/blueman-2.0.ebuild | 96 | ||||
| -rw-r--r-- | net-wireless/blueman/blueman-9999.ebuild | 7 | ||||
| -rw-r--r-- | net-wireless/blueman/files/blueman-2.0-set-codeset-for-gettext-to-UTF-8-always.patch | 219 |
5 files changed, 347 insertions, 19 deletions
diff --git a/net-wireless/blueman/ChangeLog b/net-wireless/blueman/ChangeLog index b617dd0963ee..0f7cc46863c9 100644 --- a/net-wireless/blueman/ChangeLog +++ b/net-wireless/blueman/ChangeLog @@ -1,6 +1,13 @@ # 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.36 2015/08/08 15:11:45 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/ChangeLog,v 1.37 2015/08/08 15:35:02 mgorny Exp $ + +*blueman-2.0 (08 Aug 2015) + + 08 Aug 2015; Michał Górny <mgorny@gentoo.org> +blueman-2.0.ebuild, + +files/blueman-2.0-set-codeset-for-gettext-to-UTF-8-always.patch, + blueman-9999.ebuild: + Version bump with schema install fix to the live ebuild. 08 Aug 2015; Michał Górny <mgorny@gentoo.org> blueman-9999.ebuild: Fix USE=appindicator and deps for USE=pulseaudio. diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest index 210a50b1bd51..8c4bfecf5aba 100644 --- a/net-wireless/blueman/Manifest +++ b/net-wireless/blueman/Manifest @@ -6,34 +6,37 @@ AUX blueman-1.23-plugins-conf-file.patch 988 SHA256 58132546cf913af396d189503e7e AUX blueman-1.23-set-codeset-for-gettext-to-UTF-8-always.patch 9343 SHA256 6d2cd72f41fc054f023dfeb894bb4049441fc01e6e0f936120603021c305bbcc SHA512 0f264599331b518ce5c6573324fffad9b202b66c993284d907db38b6736a25f3d62d38973ac78adb542381bd0c8d09d710612ba0f373f0ba9153d70fbacb6302 WHIRLPOOL 1e29293f77b919cad790e43391231bee07304d938d44b981a67fd806a392547c8b1c426debf881a0cebb9c0df37e4d43bd97ef237ca76a5d23613e05b20a9096 AUX blueman-1.23_p20140717-set-codeset-for-gettext-to-UTF-8-always.patch 8717 SHA256 91f6351614a8bdbb51155399f77c384a86407deb609c9e7bb61ffac17a56d81d SHA512 524afc7729564b5355f38648840b783426cf5aeaffd1bf157f725100b780d35b7524bc81144d3453e34683ea9f7af6982176d45b4488c8176c10224f74452f4d WHIRLPOOL ed053972b26a018276c221a51893bc0b1ab7b2b15e3900905444cfce03a41dd5eade845cd3e4ce3511ebf724e5a1c4e9dbd1f5024518ad8834fa2779bd1253a1 AUX blueman-1.98_p20150105-set-codeset-for-gettext-to-UTF-8-always.patch 8655 SHA256 f6acf4c846d3ccc1168a9dbc7fb31ecebae7488e544cc9778ec15ec5b468d23d SHA512 7d3834476d3a82e05853404733b26408fad76a6a4fa809f7f4eeb2de48fca7820a98fd28022d5e92b401c4c80ff1ea2992b97550172ac4dc4b433a840d32d355 WHIRLPOOL be7a9785a7a80b00f5966423585ace349effbc75a7ed8e77ce251809b5c3a9cae33636274e78175ce9051e4af30c32aca8f29499a7eed32dfb69336568e678fe +AUX blueman-2.0-set-codeset-for-gettext-to-UTF-8-always.patch 8113 SHA256 42e18bc6e5e1562a1773c22c8935cf054a9583918691cfc5c560749440333735 SHA512 81ec04a7b4ea0cd71e94ba2f5bdd36354e7958a42a5386faccb7e1b9c743edc7f218e2f1110eaeaae85a327dc451f335b284444f43d20cad25b69b661bf9494f WHIRLPOOL 3f919130553144e779f111c0902c1b2460a474f73e4b6a53e973cac540652a557143f0b8a4af6a8e0848e4eec546bda168d809f84e42ad822668641821239f7a AUX blueman-9999-set-codeset-for-gettext-to-UTF-8-always.patch 10085 SHA256 dd1189f5d0f38ee2db43f0281f62c18772f7992bfa833d8778190050ebac75ac SHA512 b8fffff0887efef5d5e3e1fbc475a94c3b90a0b35b7466ab728edc428f262d9806b22c938b4365db5e6d35ba1f326b53beea4d2a726e2e037497ef5083ea80ca WHIRLPOOL cbed09b5ae3ebffec1b88ff70cf21ccc6c66347c1bccf037507aa7c69724a263c657e7d35fe0168ec193be35843b502e0d644df09eb964411ef6c10459cd4da1 DIST blueman-1.23.tar.gz 1223094 SHA256 50b261bcdc2e99e176c7c194825da1259500aaacaccb92714d97af0209a4f011 SHA512 529a43dace73bf362baac69404a9e87d14f5bcb7b07b18194434c7a6c1dbc22f8fecdb4923c92a77b65656405a492b9e147e77cb7a161df4a93e8b78a003eba7 WHIRLPOOL 4070b4d86cbe743278730e4ee3022bcfdea590b5b76e545cc67912a3498de993ed0c62cb67ac2cd3ad3b8e3c17c5d5a8b1f8fa6e214234a64a784146c6d6d542 DIST blueman-1.23_p20140717.tar.xz 1679284 SHA256 3b4bbd68e6613299b7577e6a73a9efb86fa1ee2b033e0eb5849e6acd61135fc9 SHA512 ce279aaa7ed85dedc1329534c99f0d660c00c1b887efb543f7b62217bc329c03d400f60847e01b1a25ea4dbbad8f67077b865ac484d88e0e00a4791dcd8c4156 WHIRLPOOL f1b01633062c6a779be6755e039065d7a3ebefefc26025ddc28156968ea1b39c7509ee05f077d574786293d999d586bd2e0ca1eb18da05cf3593b06b28110cc9 DIST blueman-1.98_p20150105.tar.xz 1698524 SHA256 cb610b0c4799d87989a2f6147059fb850f71984909f761af875c3106f51d543a SHA512 c988ff6cf9769d7653be252bda59bb41388a4d41d7b1f5aa01df63278018fc637634ea96a08b183b78cb5b966c3d2dc189021f437eabf674e8f93812798d4a6b WHIRLPOOL 7070a1bff973fe682af3b0103c99424401e5c3c5bc5632aefbaa9b5c9835d3f001b0656a17893feaffdcc3bfe173aac0c17789b634f937c54906774c9acde22f +DIST blueman-2.0.tar.xz 1941332 SHA256 81a5ca95124f12bfb62d2d2d0d265af70cdae1d43b0c6e4fc6d2bad8f82958f1 SHA512 44d3967d031f7482e7700674970eff08fee53d8cbeb96e46b2f97e2a2fb6b5790f663ed73129eab241545ebaa6c5748dc6cf6b90a2c4795b27e90b5399d71f80 WHIRLPOOL 394bac3e0b457fdbb79c69fe9181abafde3f9b1138ff71c4dc23bc78424b76284e3ad9cf02dc168848fa461541f86fa2bba5aee0f014e460f0852e1bfa163dae EBUILD blueman-1.23-r1.ebuild 2394 SHA256 4ba9035e3c2b315e3edf3909390f1c8e5d45f77e5e67b0fc8eca1389fc62b4b0 SHA512 c0cbbc30c52d5fc8f905fe49ab6c8fe29e621703c7fd1c69fbaf64a84c196f7df0d378ee389413580fed16c7014541bea3ef36dfbb927a11d76dcc6675136bb1 WHIRLPOOL 699fdd123d93fe109f83c07e066c3e157d45f06e286fec81145702bac7dbe0192a4d9c12a650d9bbba7d5bec07658c3cd63f664b1198f3bae59fa6c0af3c2e29 EBUILD blueman-1.23-r2.ebuild 2488 SHA256 99a27d58912568511a4febbe41a48c507ee069bce3400692bfa4dd2e6d7c3377 SHA512 f2377a71c38ac477aac8715b886987d7a663694aefca42e06113ddbf94878050f55568e9cbfb81993478efe85bcd6616b72152fcb9a42a81cb1329d7a490de49 WHIRLPOOL 360c19c52fdcdb1e13282d96b6931f7c2b6b7f01d94e9c94dd958ce95a6125bba4af38361767cf368b34948d587950eccd4787ed6951c567a092387d93d35297 EBUILD blueman-1.23.ebuild 2318 SHA256 0c1626d9ec3db5bc63a01e10999f6baf8c7720bb8ea59e5080954c2db06ac550 SHA512 8b8408c02798bccec24b2ce6ef5cfcd7fb37701c84c678a4269bd61d2d40df1c9da6840c9b35fea0998f4ffbc262d32bf77af43fd81295ebbaaff7289eefe40c WHIRLPOOL cfad818e6fb3bfffedcc49486a46868d0fd21bdab22a65311f66dc54da15df5f3861a0b359cfd1a4a5046f91372b3f77e6f15b7f7a6cc58c40491617f4757ca9 EBUILD blueman-1.23_p20140717-r1.ebuild 2755 SHA256 df2106cca7a2cf993ee646d6490b532325217dd2cc42252e344da9ca2136c73a SHA512 5bcb3fba0666e8b22611d53223fcaab2b28484c7646f33f1a0659f62110fdb918c2363936dbd02d12aa4c5a8732a78a474bab1626fb919baaf1aed7159ec3118 WHIRLPOOL 7ce9ad57a3a35da6ab6c9dc21c09ddebdd0e3157215aed09d8f330c279ed4dd2ec111387efd4d76fc04a234d8c0b3c62e494668e80def17661fca8cdc922cb18 EBUILD blueman-1.98_p20150105.ebuild 2822 SHA256 59afad2427b1d1f1d7ae86893827bd840e5a2103d3f23f5e116c25787e288f62 SHA512 71b39c0ecd2e05a0543174626fabbbcf109f4fbf20f9f88c92e92712a3ce910284d1fa1f40dcda13f7be6f96f730d1f155e13c804e28bcf010692c5734c3e5e1 WHIRLPOOL 1d4d0745b278040f3dd468faeb892ddc56da63fc5eb05dffbdbcf869bdff7d0669a6cc7ea771f27e5c5a3956fb0a3b69911d9af6cb14dffcbc93e8ba30dd6be2 -EBUILD blueman-9999.ebuild 2267 SHA256 194158794541f367d7053ee471231e5cedd9bd9074f71e7aeb52605ef5c9552e SHA512 89cdf14bf47eb3386b6da01581d58e7944095975699ac8b3cc6381374a6d47c419092a993de667802ed316f11330b3d562a9a0e136eaeb25a94f9c3cc707f9c6 WHIRLPOOL d8756029b7af011fa08b0d9c3bec9ca0d4dadc1daeff42ec4029c6df50738b86a4c5a685c3eca6166845465ba318c7a482b993fc3a0bcf1798fa5cb9143a421d -MISC ChangeLog 7220 SHA256 8c9e9ed6c05453142fcc11a51cac62d325d8eb6c87bcba20dd7d66a2e07459b7 SHA512 f074d6e6cf22424f17cd48a9469b2431c28ea80f4e1c3826179abe0e81742edb854cb3fa75d86b20043ef93a6ad2a60e631acbc0edba0ca29ffb70d775463054 WHIRLPOOL ffc70feddc38f9f5a76ba142761f2d96f7cd86fe0471836d6a13f8c85e57d307f39c4976d63bce433c871bdb36f9982dbb8b095bddb1f291cf754fd732feb5ea +EBUILD blueman-2.0.ebuild 2503 SHA256 ec3590e7eb3a9c5ba5c76cc92c540da23c40e23d82a2b9c6b90e912f7f0c9a9d SHA512 4caae331326acf82a497368951908e17abed2865d5fecc731b0c3bfef1d32836440fcb6f91a52e05ca893bbf4f71b130a56a81a862d14d6cb8a4e55ee62e4321 WHIRLPOOL fdef6648d15eb36c179db8f837046939bf64a33acb5be8217a57f0998de9652803e97b7a8edc211c5559de9f0773badfcef99f07f51616bdad01ae165d6d7843 +EBUILD blueman-9999.ebuild 2361 SHA256 8178af3f6c8f6d97a257033d1878017614982a34f3ca2dfaa5c07d7b048a0cb9 SHA512 67253742423fa4716a07104b5ffb3135254949ff570f1525268d2223b962048dac8e7fea237687fba05e6108bcf13f61fed9fc8d0b2bf2b3d997d9e207870cea WHIRLPOOL 24db33c52deaf444b299c87cba726d96a1f4ba8c255dfe92cb682afe27597b5714d58d996aaef1231b6745c502c8c7bef73bd7310a05643223e35d9cf90392dd +MISC ChangeLog 7470 SHA256 cdd0a8867a7b5ad0cfcde7dbbaa78b5e1f39efc9940b38ad0929b542f525bead SHA512 c88c836e98144597f95e878c4446ea337c1b34194a57377dee6dfb5d58a83a9c563b5a71c43c1dfadd6097ed880603393f17aad392c772a420e3627a0d25e806 WHIRLPOOL 2ee6ddb3ed4dbfc2cefb07f8237b15e380a9a1352ede255305d972f2e17562e2bfddab613d4190e0b6f7f9039a8a64c2d884761a7bfb2000c153ef3b6621bb40 MISC metadata.xml 905 SHA256 a09e159e540efe4f25a9ec03094e5df5f1e75c86554f9501b31aa87d5c7710cd SHA512 47c056ea98bb3910a3515cb766841d60509d914ecced9fc9059f8805d700a3607a9c46e0a483a2fee2a94bb8fcb426247557ed3609de36550fabc5d9e0ea98b2 WHIRLPOOL 76cfd935e45cb63afb6447836b6b84f8559cdc7723acce30358bb2f36379813858b5f010c9f2517b0b67a04c5fdbcb6474caccd96807900cfbaf8f389626ef63 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQJ8BAEBCABmBQJVxhwyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJVxiGoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOIKcP/R6mb8pRxn7iDmJ7BLAZlJ3w -WU0Ru8GIpUutfI94K/WlaGPhAJH131Wf367p1mQeYfHp9eqOTb5BxUVW9Uu+4YLn -XK2i77ZClOs0nrVI2HocvUzHBWJ3RhSh3Zyv3tje0aPmQTYGJyQdtb10k1qi/hm0 -v9W7NUqtienOE8IUzF4GClZQpvQEOZrl8Oszk3rzhvswg1PMQn3qpH+7Thqc97bz -1dr2WIxO+TsS/HlU3cIJwjd8ZocmfUo0nGXqneEgEQXka4t7R1AzZPwOySWYgvLw -7H8S0/czDV6Cou6h9SH0A6gZ2dVLvTVpJlwU8bY/dm/0kpEssCfQIAabxfpqYLEr -abG8oCKXGWpCb6CLIrXbUJgXLq1ltP0pp2Jgh+U8acx42k6VetpZ/0nrxPnQleKi -e+TE7LGGEYRoz6NsHbmRukAZo83RHeEzdR7hnMfLJepYWRU5pHcfevn0jkKzKXhD -C31zT9sRp/fQabr/iKNYfLBC5qMcnsJ9/1PPPHR+0F02jOXxmVbnj+TV7jkP1DOf -ac4rXOivz/9h1GcuT6hCoR94QVDArTLRfD25KxdxzvsJh/Hw9W/XurKpwwTN3YNl -IyBE+870V8GuBFksrt9NXOx10WWLiXIEC1phjpREBP9/OHEvyEUs+bVClYcmT6jD -o3n8HcXKK7hjWE3eYiGg -=aebN +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOBZYQAJ05XO8rvRs71OZLSw6cvzZB +SRnxoOk/oy4ZVzLlzHrmVABoKVpR35SgeCp2ohmdN4ffBqj2eELCTF4MA0ULJEg2 +uHJ/avI4xozcvb7tqu5QxHURoIXX3DolQwxRR9rmj9RuIuhsgBvTPsQi87le+j2i +x3/Yc0WMwvNlp5FTL7ifOTYhjUitykUsy+x9RXh4alobKX/1Ggx+axvm3csPYRj6 +QDTLnad2GuJbKRQzGPFFy7TYZZjpa8fO8xCWDNln6j+c0HOm+nVQFCEoHIGTy36n +59H0MC5iWlKKVFTqrmoVqgimHuMhjSvgVvYPB6N2rTg/cD4Tf7rAOK8a4p4WhJ6z +hD2RwBcJPykAEEt4ht1lrUnya5U6wHDZc3M8rxSBz3EKHc8jwbwpTFhxCfCQk48Z +az2DDFNiU0vFT/qKgj7By19J/fj6ofTxldC0yM836nB40XjShPku7QwjkZmukQzI +j7kqXq86BiyjaHJux+Y4bmySsG1capqM/r4PeyR7TpPVXLvfZm1/IlxdpLo+cyLD +ClK3AIxPFc/HwtbnwqqzV88U8XiPBwxwVxGegDX1eBA0KuP+60KLubHRU1aj1eiD +p+kj+6NxkPicefns017CX5fPrvtvJQixZvIaPLV3rQv95JBGHuUkOQS7tCQUI4af +BO7iAGkTkKLWdvYNNMr3 +=nUJp -----END PGP SIGNATURE----- diff --git a/net-wireless/blueman/blueman-2.0.ebuild b/net-wireless/blueman/blueman-2.0.ebuild new file mode 100644 index 000000000000..386a10e8eebe --- /dev/null +++ b/net-wireless/blueman/blueman-2.0.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-2.0.ebuild,v 1.1 2015/08/08 15:35:02 mgorny Exp $ + +EAPI="5" + +PYTHON_COMPAT=( python2_7 ) +inherit eutils python-single-r1 gnome2-utils autotools + +DESCRIPTION="GTK+ Bluetooth Manager, designed to be simple and intuitive for everyday bluetooth tasks" +HOMEPAGE="https://github.com/blueman-project/blueman" + +if [[ ${PV} == "9999" ]] ; then + inherit 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 ~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/dnsmasq + net-misc/dhcp + >=net-misc/networkmanager-0.8 ) ) + policykit? ( sys-auth/polkit ) + pulseaudio? ( media-sound/pulseaudio[bluetooth] ) + thunar? ( xfce-base/thunar ) + !net-wireless/gnome-bluetooth +" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +src_prepare() { + epatch \ + "${FILESDIR}/${P}-set-codeset-for-gettext-to-UTF-8-always.patch" + [[ ${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/blueman-9999.ebuild b/net-wireless/blueman/blueman-9999.ebuild index f0f2621f1a80..dbcf31398bc4 100644 --- a/net-wireless/blueman/blueman-9999.ebuild +++ b/net-wireless/blueman/blueman-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-9999.ebuild,v 1.10 2015/08/08 15:11:45 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/blueman/blueman-9999.ebuild,v 1.11 2015/08/08 15:35:02 mgorny Exp $ EAPI="5" @@ -57,7 +57,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" src_prepare() { epatch \ "${FILESDIR}/${PN}-9999-set-codeset-for-gettext-to-UTF-8-always.patch" - eautoreconf + [[ ${PV} == 9999 ]] && eautoreconf } src_configure() { @@ -81,12 +81,15 @@ src_install() { 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 new file mode 100644 index 000000000000..02747d178d36 --- /dev/null +++ b/net-wireless/blueman/files/blueman-2.0-set-codeset-for-gettext-to-UTF-8-always.patch @@ -0,0 +1,219 @@ +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 +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 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 + |