mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-21 21:17:37 -08:00
media-sound/mangler: bump EAPI 7 -> 8, switch to media-libs/libpulse
Add missing patch file, amends 9f99a203a92aa552908410e1b0e4353946d65eb1 Closes: https://bugs.gentoo.org/569006 Closes: https://bugs.gentoo.org/961796 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
parent
4e2751f444
commit
657f12ed29
45
media-sound/mangler/files/mangler-1.2.5-hostname-fix.patch
Normal file
45
media-sound/mangler/files/mangler-1.2.5-hostname-fix.patch
Normal file
@ -0,0 +1,45 @@
|
||||
Source: https://salsa.debian.org/debian/mangler/-/blob/master/debian/patches/hostname-fix.patch?ref_type=heads
|
||||
|
||||
Description: Fix mangled hostname/port strings in connection dialog
|
||||
Forwarded: no
|
||||
Author: Scott <spruett345@gmail.com>
|
||||
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1507232
|
||||
Last-Update: 2016-04-27
|
||||
|
||||
--- a/src/mangler.cpp
|
||||
+++ b/src/mangler.cpp
|
||||
@@ -567,13 +567,13 @@ void Mangler::quickConnectButton_clicked_cb(void) {/*{{{*/
|
||||
dialog->set_icon(icons["tray_icon"]);
|
||||
|
||||
builder->get_widget("qcServerName", entry);
|
||||
- entry->set_text(config["qc_lastserver.hostname"].toCString());
|
||||
+ entry->set_text(config["qc_lastserver.hostname"].toUString());
|
||||
builder->get_widget("qcPort", entry);
|
||||
- entry->set_text(config["qc_lastserver.port"].toCString());
|
||||
+ entry->set_text(config["qc_lastserver.port"].toUString());
|
||||
builder->get_widget("qcUsername", entry);
|
||||
- entry->set_text(config["qc_lastserver.username"].toCString());
|
||||
+ entry->set_text(config["qc_lastserver.username"].toUString());
|
||||
builder->get_widget("qcPassword", entry);
|
||||
- entry->set_text(config["qc_lastserver.password"].toCString());
|
||||
+ entry->set_text(config["qc_lastserver.password"].toUString());
|
||||
|
||||
builder->get_widget("qcConnectButton", button);
|
||||
button->set_sensitive(!v3_is_loggedin());
|
||||
@@ -605,11 +605,11 @@ void Mangler::connectButton_clicked_cb(void) {/*{{{*/
|
||||
Gtk::TreeModel::Row row = *iter;
|
||||
connectedServerName = Glib::ustring( row[serverList->serverListColumns.name] );
|
||||
iniSection &server(config.servers[connectedServerName]);
|
||||
- Glib::ustring hostname = server["hostname"].toCString();
|
||||
- Glib::ustring port = server["port"].toCString();
|
||||
- Glib::ustring username = server["username"].toCString();
|
||||
- Glib::ustring password = server["password"].toCString();
|
||||
- Glib::ustring phonetic = server["phonetic"].toCString();
|
||||
+ Glib::ustring hostname = server["hostname"].toUString();
|
||||
+ Glib::ustring port = server["port"].toUString();
|
||||
+ Glib::ustring username = server["username"].toUString();
|
||||
+ Glib::ustring password = server["password"].toUString();
|
||||
+ Glib::ustring phonetic = server["phonetic"].toUString();
|
||||
if (!server.size() || hostname.empty() || port.empty() || username.empty()) {
|
||||
builder->get_widget("statusbar", statusbar);
|
||||
statusbar->pop();
|
||||
@ -12,7 +12,7 @@ SRC_URI="http://www.mangler.org/downloads/${P}.tar.bz2"
|
||||
LICENSE="GPL-3 LGPL-2.1 ZLIB"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="+alsa opus espeak g15 +gsm oss pulseaudio +speex +xosd"
|
||||
IUSE="+alsa opus espeak +gsm oss pulseaudio +speex +xosd"
|
||||
|
||||
RDEPEND="
|
||||
dev-cpp/gtkmm:2.4
|
||||
@ -25,9 +25,8 @@ RDEPEND="
|
||||
alsa? ( media-libs/alsa-lib )
|
||||
opus? ( media-libs/opus )
|
||||
espeak? ( app-accessibility/espeak-ng )
|
||||
g15? ( app-misc/g15daemon )
|
||||
gsm? ( media-sound/gsm )
|
||||
pulseaudio? ( >=media-sound/pulseaudio-0.9.14 )
|
||||
pulseaudio? ( media-libs/libpulse )
|
||||
speex? ( >=media-libs/speex-1.2_rc1 )
|
||||
xosd? ( x11-libs/xosd )
|
||||
"
|
||||
@ -35,10 +34,10 @@ DEPEND="${RDEPEND}"
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/mangler-version-info.patch"
|
||||
"${FILESDIR}/fix_ftbfs_narrowing_conversion.patch"
|
||||
"${FILESDIR}/mangler-1.2.5-espeak-ng.patch"
|
||||
"${FILESDIR}/mangler-1.2.5-hostname-fix.patch"
|
||||
"${FILESDIR}/${P}-version-info.patch"
|
||||
"${FILESDIR}/${P}-narrowing_conversion.patch"
|
||||
"${FILESDIR}/${P}-espeak-ng.patch"
|
||||
"${FILESDIR}/${P}-hostname-fix.patch" # bug 569006
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
@ -50,12 +49,11 @@ src_configure() {
|
||||
tc-export CC
|
||||
|
||||
econf \
|
||||
--disable-static \
|
||||
--disable-g15 \
|
||||
$(use_enable gsm) \
|
||||
$(use_enable speex) \
|
||||
$(use_enable opus) \
|
||||
$(use_enable xosd) \
|
||||
$(use_enable g15) \
|
||||
$(use_enable espeak) \
|
||||
$(use_with pulseaudio) \
|
||||
$(use_with alsa) \
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
<pkgmetadata>
|
||||
<use>
|
||||
<flag name="espeak">Text to speech engine</flag>
|
||||
<flag name="g15">Logitech g15 lcd support</flag>
|
||||
</use>
|
||||
<maintainer type="person">
|
||||
<email>prometheanfire@gentoo.org</email>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user