* [gentoo-commits] repo/gentoo:master commit in: media-sound/mangler/, media-sound/mangler/files/
@ 2023-05-06 14:18 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2023-05-06 14:18 UTC (permalink / raw
To: gentoo-commits
commit: 3428c19ea3f720363bb2b6ff56ccdc8fbd8dda18
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 6 14:17:01 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 6 14:17:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3428c19e
media-sound/mangler: support espeak-ng
At this point, you can't really have espeak installed anyway because so much
stuff unconditionally depends on espeak-ng, so hard-switch this too.
Bug: https://bugs.gentoo.org/877221
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-sound/mangler/files/mangler-1.2.5-espeak-ng.patch | 14 ++++++++++++++
.../{mangler-1.2.5-r3.ebuild => mangler-1.2.5-r4.ebuild} | 8 +++++---
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/media-sound/mangler/files/mangler-1.2.5-espeak-ng.patch b/media-sound/mangler/files/mangler-1.2.5-espeak-ng.patch
new file mode 100644
index 000000000000..45db427d70b4
--- /dev/null
+++ b/media-sound/mangler/files/mangler-1.2.5-espeak-ng.patch
@@ -0,0 +1,14 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -117,9 +117,9 @@ if test "$disable_ui" != "yes" ; then
+ fi
+
+ if test "$enable_espeak" != "no" ; then
+- AC_CHECK_LIB([espeak], [espeak_Initialize], [
++ AC_CHECK_LIB([espeak-ng], [espeak_Initialize], [
+ AC_DEFINE(HAVE_ESPEAK, 1, [have espeak])
+- LIBS="-lespeak $LIBS"
++ LIBS="-lespeak-ng $LIBS"
+ echo "Enabled optional eSpeak support."
+ ], [
+ echo "Optional eSpeak support is not enabled."
diff --git a/media-sound/mangler/mangler-1.2.5-r3.ebuild b/media-sound/mangler/mangler-1.2.5-r4.ebuild
similarity index 89%
rename from media-sound/mangler/mangler-1.2.5-r3.ebuild
rename to media-sound/mangler/mangler-1.2.5-r4.ebuild
index 8241de78acc2..4e9b84ac88b8 100644
--- a/media-sound/mangler/mangler-1.2.5-r3.ebuild
+++ b/media-sound/mangler/mangler-1.2.5-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -24,18 +24,20 @@ RDEPEND="
x11-libs/libXi
alsa? ( media-libs/alsa-lib )
opus? ( media-libs/opus )
- espeak? ( app-accessibility/espeak )
+ espeak? ( app-accessibility/espeak-ng )
g15? ( app-misc/g15daemon )
gsm? ( media-sound/gsm )
pulseaudio? ( >=media-sound/pulseaudio-0.9.14 )
speex? ( >=media-libs/speex-1.2_rc1 )
- xosd? ( x11-libs/xosd )"
+ xosd? ( x11-libs/xosd )
+"
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"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/mangler/, media-sound/mangler/files/
@ 2025-08-29 14:20 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2025-08-29 14:20 UTC (permalink / raw
To: gentoo-commits
commit: 657f12ed29907caa2ee96112284cb9d925aaffb8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 29 14:13:04 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 29 14:20:00 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=657f12ed
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 <AT> gentoo.org>
.../mangler/files/mangler-1.2.5-hostname-fix.patch | 45 ++++++++++++++++++++++
...ch => mangler-1.2.5-narrowing_conversion.patch} | 0
...info.patch => mangler-1.2.5-version-info.patch} | 0
media-sound/mangler/mangler-1.2.5-r5.ebuild | 16 ++++----
media-sound/mangler/metadata.xml | 1 -
5 files changed, 52 insertions(+), 10 deletions(-)
diff --git a/media-sound/mangler/files/mangler-1.2.5-hostname-fix.patch b/media-sound/mangler/files/mangler-1.2.5-hostname-fix.patch
new file mode 100644
index 000000000000..54d2b899cb7c
--- /dev/null
+++ b/media-sound/mangler/files/mangler-1.2.5-hostname-fix.patch
@@ -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();
diff --git a/media-sound/mangler/files/fix_ftbfs_narrowing_conversion.patch b/media-sound/mangler/files/mangler-1.2.5-narrowing_conversion.patch
similarity index 100%
rename from media-sound/mangler/files/fix_ftbfs_narrowing_conversion.patch
rename to media-sound/mangler/files/mangler-1.2.5-narrowing_conversion.patch
diff --git a/media-sound/mangler/files/mangler-version-info.patch b/media-sound/mangler/files/mangler-1.2.5-version-info.patch
similarity index 100%
rename from media-sound/mangler/files/mangler-version-info.patch
rename to media-sound/mangler/files/mangler-1.2.5-version-info.patch
diff --git a/media-sound/mangler/mangler-1.2.5-r5.ebuild b/media-sound/mangler/mangler-1.2.5-r5.ebuild
index edeb331d8119..508f22509d0a 100644
--- a/media-sound/mangler/mangler-1.2.5-r5.ebuild
+++ b/media-sound/mangler/mangler-1.2.5-r5.ebuild
@@ -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) \
diff --git a/media-sound/mangler/metadata.xml b/media-sound/mangler/metadata.xml
index ef8f41988dde..b91683634d76 100644
--- a/media-sound/mangler/metadata.xml
+++ b/media-sound/mangler/metadata.xml
@@ -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>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-08-29 14:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-08-29 14:20 [gentoo-commits] repo/gentoo:master commit in: media-sound/mangler/, media-sound/mangler/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-05-06 14:18 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox