* [gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/files/, media-sound/aqualung/
@ 2015-09-16 16:45 Alexis Ballier
0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2015-09-16 16:45 UTC (permalink / raw
To: gentoo-commits
commit: 936820fcba0b87dde366a7f4f6580100f54591d1
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 16 16:43:29 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Sep 16 16:45:01 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=936820fc
media-sound/aqualung: fix build with ffmpeg git master.
Package-Manager: portage-2.2.20.1
media-sound/aqualung/aqualung-1.0.ebuild | 4 ++++
media-sound/aqualung/files/ffmpeg29.patch | 13 +++++++++++++
2 files changed, 17 insertions(+)
diff --git a/media-sound/aqualung/aqualung-1.0.ebuild b/media-sound/aqualung/aqualung-1.0.ebuild
index b39de6c..c6954be 100644
--- a/media-sound/aqualung/aqualung-1.0.ebuild
+++ b/media-sound/aqualung/aqualung-1.0.ebuild
@@ -50,6 +50,10 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${PN}-${MY_PV}
+src_prepare() {
+ epatch "${FILESDIR}/ffmpeg29.patch"
+}
+
src_configure() {
econf \
--enable-nls \
diff --git a/media-sound/aqualung/files/ffmpeg29.patch b/media-sound/aqualung/files/ffmpeg29.patch
new file mode 100644
index 0000000..3cd0a01
--- /dev/null
+++ b/media-sound/aqualung/files/ffmpeg29.patch
@@ -0,0 +1,13 @@
+Index: aqualung-1.0/src/decoder/dec_lavc.c
+===================================================================
+--- aqualung-1.0.orig/src/decoder/dec_lavc.c
++++ aqualung-1.0/src/decoder/dec_lavc.c
+@@ -280,7 +280,7 @@ lavc_decoder_open(decoder_t * dec, char
+ return DECODER_OPEN_BADLIB;
+
+ pd->avCodecCtx = pd->avFormatCtx->streams[pd->audioStream]->codec;
+-#if LIBAVCODEC_VERSION_MAJOR >= 53
++#if LIBAVCODEC_VERSION_MAJOR >= 53 && LIBAVCODEC_VERSION_MAJOR < 57
+ pd->avCodecCtx->get_buffer = avcodec_default_get_buffer;
+ pd->avCodecCtx->release_buffer = avcodec_default_release_buffer;
+ #endif /* LIBAVCODEC_VERSION_MAJOR >= 53 */
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/files/, media-sound/aqualung/
@ 2017-02-18 16:53 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2017-02-18 16:53 UTC (permalink / raw
To: gentoo-commits
commit: cb29aeb2c84fedee88eab0fa4c987f3f85bbeaae
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 16:31:50 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 16:53:06 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb29aeb2
media-sound/aqualung: EAPI 6, sort deps, fix build w/ USE=mac
Gentoo-bug: 564366, 575880
Package-Manager: portage-2.3.3
media-sound/aqualung/aqualung-1.0-r1.ebuild | 99 ++++++++++++++++++++++
.../aqualung/files/aqualung-1.0-ffmpeg3.patch | 29 +++++++
media-sound/aqualung/files/aqualung-1.0-mac.patch | 26 ++++++
media-sound/aqualung/metadata.xml | 2 +-
4 files changed, 155 insertions(+), 1 deletion(-)
diff --git a/media-sound/aqualung/aqualung-1.0-r1.ebuild b/media-sound/aqualung/aqualung-1.0-r1.ebuild
new file mode 100644
index 0000000000..b7bdd48542
--- /dev/null
+++ b/media-sound/aqualung/aqualung-1.0-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Music player for a wide range of formats designed for gapless playback"
+HOMEPAGE="http://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung"
+SRC_URI="mirror://sourceforge/aqualung/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate lua
+ mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
+ vorbis wavpack"
+
+RDEPEND="
+ app-arch/bzip2
+ dev-libs/libxml2
+ sys-libs/zlib
+ x11-libs/gtk+:2
+ alsa? ( media-libs/alsa-lib )
+ cdda? ( dev-libs/libcdio-paranoia )
+ cddb? ( media-libs/libcddb )
+ ffmpeg? ( >=virtual/ffmpeg-0.6.90 )
+ flac? ( media-libs/flac )
+ ifp? ( media-libs/libifp )
+ jack? ( media-sound/jack-audio-connection-kit )
+ ladspa? ( media-libs/liblrdf )
+ lame? ( media-sound/lame )
+ libsamplerate? ( media-libs/libsamplerate )
+ lua? ( dev-lang/lua:0= )
+ mac? ( media-sound/mac )
+ modplug? ( media-libs/libmodplug )
+ mp3? ( media-libs/libmad )
+ musepack? ( >=media-sound/musepack-tools-444 )
+ pulseaudio? ( media-sound/pulseaudio )
+ sndfile? ( media-libs/libsndfile )
+ speex? ( media-libs/speex media-libs/liboggz media-libs/libogg )
+ vorbis? ( media-libs/libvorbis media-libs/libogg )
+ wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+PATCHES=(
+ "${FILESDIR}/${P}-ffmpeg3.patch"
+ "${FILESDIR}/${P}-mac.patch"
+)
+
+src_configure() {
+ econf \
+ --disable-rpath \
+ --enable-loop \
+ --enable-nls \
+ --enable-transcoding \
+ $(use_enable debug) \
+ $(use_enable podcast) \
+ $(use_enable systray) \
+ $(use_enable jack jack-mgmt) \
+ $(use_with alsa) \
+ $(use_with cdda) \
+ $(use_with cddb) \
+ $(use_with ffmpeg lavc) \
+ $(use_with flac) \
+ $(use_with ifp) \
+ $(use_with jack) \
+ $(use_with ladspa) \
+ $(use_with lame) \
+ $(use_with libsamplerate src) \
+ $(use_with lua) \
+ $(use_with mac) \
+ $(use_with modplug mod) \
+ $(use_with mp3 mpeg) \
+ $(use_with musepack mpc) \
+ $(use_with oss) \
+ $(use_with pulseaudio pulse) \
+ $(use_with sndfile) \
+ $(use_with speex) \
+ $(use_with vorbis vorbis) \
+ $(use_with vorbis vorbisenc) \
+ $(use_with wavpack)
+}
+
+src_install() {
+ default
+
+ newicon src/img/icon_64.png aqualung.png
+ make_desktop_entry aqualung Aqualung
+}
diff --git a/media-sound/aqualung/files/aqualung-1.0-ffmpeg3.patch b/media-sound/aqualung/files/aqualung-1.0-ffmpeg3.patch
new file mode 100644
index 0000000000..111ee70c87
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-1.0-ffmpeg3.patch
@@ -0,0 +1,29 @@
+From 3f60efe3dbab8e9d2c07a7b183fd009b3c999d60 Mon Sep 17 00:00:00 2001
+From: Jamie Heilman <jamie@audible.transient.net>
+Date: Sun, 8 May 2016 19:34:36 +0000
+Subject: [PATCH] ffmpeg/libav: support libavcodec API 55 and later
+
+With FFmpeg 1.0 and libav 10, AVCodecContext.{get,release}_buffer()
+were deprecated; the new default AVCodecContext.get_buffer2()
+implementation works fine for us.
+---
+ src/decoder/dec_lavc.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/decoder/dec_lavc.c b/src/decoder/dec_lavc.c
+index e2c81c6..5268a64 100644
+--- a/src/decoder/dec_lavc.c
++++ b/src/decoder/dec_lavc.c
+@@ -280,10 +280,12 @@ lavc_decoder_open(decoder_t * dec, char * filename) {
+ return DECODER_OPEN_BADLIB;
+
+ pd->avCodecCtx = pd->avFormatCtx->streams[pd->audioStream]->codec;
++#if LIBAVCODEC_VERSION_MAJOR < 55
+ #if LIBAVCODEC_VERSION_MAJOR >= 53
+ pd->avCodecCtx->get_buffer = avcodec_default_get_buffer;
+ pd->avCodecCtx->release_buffer = avcodec_default_release_buffer;
+ #endif /* LIBAVCODEC_VERSION_MAJOR >= 53 */
++#endif /* LIBAVCODEC_VERSION_MAJOR < 55 */
+
+ pd->time_base = pd->avFormatCtx->streams[pd->audioStream]->time_base;
+
diff --git a/media-sound/aqualung/files/aqualung-1.0-mac.patch b/media-sound/aqualung/files/aqualung-1.0-mac.patch
new file mode 100644
index 0000000000..16689ee0ae
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-1.0-mac.patch
@@ -0,0 +1,26 @@
+Revert this patch.
+
+From 12c3a45a6d5b6ef0da70e0cdc424beff993eeef6 Mon Sep 17 00:00:00 2001
+From: Tom Szilagyi <tszilagyi@users.sourceforge.net>
+Date: Mon, 9 Jun 2014 12:54:54 +0000
+Subject: [PATCH] Make the APE decoder compile with current libmac-dev
+ (4.11-u4-b5-s7-d)
+
+git-svn-id: https://svn.code.sf.net/p/aqualung/code/trunk@1303 3cd24cdc-1f22-0410-b8b1-dcf80e670293
+---
+ src/decoder/dec_mac.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/decoder/dec_mac.cpp b/src/decoder/dec_mac.cpp
+index 024c8b9..2e9bc01 100644
+--- a/src/decoder/dec_mac.cpp
++++ b/src/decoder/dec_mac.cpp
+@@ -174,7 +174,7 @@ mac_decoder_open(decoder_t * dec, char * filename) {
+
+
+ int ret = 0;
++ wchar_t * pUTF16 = GetUTF16FromANSI(filename);
+- wchar_t * pUTF16 = CAPECharacterHelper::GetUTF16FromANSI(filename);
+ pdecompress = CreateIAPEDecompress(pUTF16, &ret);
+ free(pUTF16);
+
diff --git a/media-sound/aqualung/metadata.xml b/media-sound/aqualung/metadata.xml
index f029410ea9..9b3dd59714 100644
--- a/media-sound/aqualung/metadata.xml
+++ b/media-sound/aqualung/metadata.xml
@@ -18,6 +18,6 @@
<flag name="systray">Enable system tray support</flag>
</use>
<upstream>
- <remote-id type="sourceforge">aqualung</remote-id>
+ <remote-id type="github">jeremyevans/aqualung</remote-id>
</upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/files/, media-sound/aqualung/
@ 2020-08-04 18:47 Daniel Pielmeier
0 siblings, 0 replies; 4+ messages in thread
From: Daniel Pielmeier @ 2020-08-04 18:47 UTC (permalink / raw
To: gentoo-commits
commit: 27926914b1af08c106fec7bb5cf0bda6dec4caad
Author: Jannis Achstetter <kripton <AT> kripserver <DOT> net>
AuthorDate: Sun Aug 2 19:05:10 2020 +0000
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Tue Aug 4 18:39:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27926914
media-sound/aqualung: Fix compile with gcc 10
And make USE=jack depend on `virtual/jack` instead of
`media-sound/jack-audio-connection-kit`. Adding this as new revision so we
have current `-r3` with stable keywords and this with unstable keywords.
Closes: https://bugs.gentoo.org/734928
Closes: https://bugs.gentoo.org/706828
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Jannis Achstetter <kripton <AT> kripserver.net>
Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>
media-sound/aqualung/aqualung-1.0-r4.ebuild | 101 +++++++++++++++++++++
.../aqualung/files/aqualung-1.0-gcc10.patch | 69 ++++++++++++++
2 files changed, 170 insertions(+)
diff --git a/media-sound/aqualung/aqualung-1.0-r4.ebuild b/media-sound/aqualung/aqualung-1.0-r4.ebuild
new file mode 100644
index 00000000000..c8a6ee5a672
--- /dev/null
+++ b/media-sound/aqualung/aqualung-1.0-r4.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Music player for a wide range of formats designed for gapless playback"
+HOMEPAGE="http://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung"
+SRC_URI="mirror://sourceforge/aqualung/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate
+ lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
+ vorbis wavpack"
+
+BDEPEND="
+ virtual/pkgconfig
+ sys-devel/gettext
+"
+RDEPEND="
+ app-arch/bzip2
+ dev-libs/libxml2
+ sys-libs/zlib
+ x11-libs/gtk+:2
+ alsa? ( media-libs/alsa-lib )
+ cdda? ( dev-libs/libcdio-paranoia )
+ cddb? ( media-libs/libcddb )
+ ffmpeg? ( media-video/ffmpeg:0= )
+ flac? ( media-libs/flac )
+ ifp? ( media-libs/libifp )
+ jack? ( virtual/jack )
+ ladspa? ( media-libs/liblrdf )
+ lame? ( media-sound/lame )
+ libsamplerate? ( media-libs/libsamplerate )
+ lua? ( dev-lang/lua:0= )
+ mac? ( media-sound/mac )
+ modplug? ( media-libs/libmodplug )
+ mp3? ( media-libs/libmad )
+ musepack? ( >=media-sound/musepack-tools-444 )
+ pulseaudio? ( media-sound/pulseaudio )
+ sndfile? ( media-libs/libsndfile )
+ speex? ( media-libs/speex media-libs/liboggz media-libs/libogg )
+ vorbis? ( media-libs/libvorbis media-libs/libogg )
+ wavpack? ( media-sound/wavpack )
+"
+DEPEND="
+ ${RDEPEND}
+"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+PATCHES=(
+ "${FILESDIR}/${P}-ffmpeg3.patch"
+ "${FILESDIR}/${P}-gcc10.patch"
+)
+
+src_configure() {
+ econf \
+ --disable-rpath \
+ --enable-loop \
+ --enable-nls \
+ --enable-transcoding \
+ $(use_enable debug) \
+ $(use_enable podcast) \
+ $(use_enable systray) \
+ $(use_enable jack jack-mgmt) \
+ $(use_with alsa) \
+ $(use_with cdda) \
+ $(use_with cddb) \
+ $(use_with ffmpeg lavc) \
+ $(use_with flac) \
+ $(use_with ifp) \
+ $(use_with jack) \
+ $(use_with ladspa) \
+ $(use_with lame) \
+ $(use_with libsamplerate src) \
+ $(use_with lua) \
+ $(use_with mac) \
+ $(use_with modplug mod) \
+ $(use_with mp3 mpeg) \
+ $(use_with musepack mpc) \
+ $(use_with oss) \
+ $(use_with pulseaudio pulse) \
+ $(use_with sndfile) \
+ $(use_with speex) \
+ $(use_with vorbis vorbis) \
+ $(use_with vorbis vorbisenc) \
+ $(use_with wavpack)
+}
+
+src_install() {
+ default
+
+ newicon src/img/icon_64.png aqualung.png
+ make_desktop_entry aqualung Aqualung
+}
diff --git a/media-sound/aqualung/files/aqualung-1.0-gcc10.patch b/media-sound/aqualung/files/aqualung-1.0-gcc10.patch
new file mode 100644
index 00000000000..620bcb873d9
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-1.0-gcc10.patch
@@ -0,0 +1,69 @@
+From de448507343a86ee97949eb4be0092d1659092da Mon Sep 17 00:00:00 2001
+From: Adam Sampson <ats@offog.org>
+Date: Sat, 18 Jul 2020 17:02:32 +0100
+Subject: [PATCH 1/2] Remove unused variable.
+
+This causes a duplicate symbol error with GCC 10 (-fno-common by
+default), but it's not used anyway.
+---
+ src/playlist.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/playlist.c b/src/playlist.c
+index 35483d1..96fac75 100644
+--- a/src/playlist.c
++++ b/src/playlist.c
+@@ -134,8 +134,6 @@ GtkWidget * plist__send_songs_to_iriver;
+ GtkWidget * plist__export;
+ #endif /* HAVE_TRANSCODING */
+
+-gchar command[RB_CONTROL_SIZE];
+-
+ GtkTreeIter * fileinfo_iter = NULL;
+
+ int playlist_dirty;
+
+From 7f5d1f266957b3fa73799d3edef6b19ff9716d02 Mon Sep 17 00:00:00 2001
+From: Adam Sampson <ats@offog.org>
+Date: Sat, 18 Jul 2020 17:06:41 +0100
+Subject: [PATCH 2/2] Rename timeout_tag to ports_timeout_tag.
+
+This causes a duplicate symbol error with GCC 10 (-fno-common by
+default), because there's also a global timeout_tag in main.c.
+
+Also correct the type to guint rather than gint.
+---
+ src/ports.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/ports.c b/src/ports.c
+index f17a5ab..f4de59d 100644
+--- a/src/ports.c
++++ b/src/ports.c
+@@ -63,7 +63,7 @@ GtkTreeViewColumn * column_out_R;
+ int n_clients;
+ GtkListStore * store_out_nb[MAX_JACK_CLIENTS];
+
+-gint timeout_tag;
++guint ports_timeout_tag;
+
+ int out_selector = 0;
+
+@@ -242,7 +242,7 @@ tree_out_L_selection_changed(GtkTreeSelection * selection, gpointer * data) {
+ fprintf(stderr, "ERROR: jack_disconnect() returned %d\n", res);
+ }
+ g_free(str);
+- timeout_tag = aqualung_timeout_add(100, ports_timeout_callback, GINT_TO_POINTER(1));
++ ports_timeout_tag = aqualung_timeout_add(100, ports_timeout_callback, GINT_TO_POINTER(1));
+ }
+ }
+
+@@ -262,7 +262,7 @@ tree_out_R_selection_changed(GtkTreeSelection *selection, gpointer * data) {
+ fprintf(stderr, "ERROR: jack_disconnect() returned %d\n", res);
+ }
+ g_free(str);
+- timeout_tag = aqualung_timeout_add(100, ports_timeout_callback, (gpointer)2);
++ ports_timeout_tag = aqualung_timeout_add(100, ports_timeout_callback, (gpointer)2);
+ }
+ }
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/files/, media-sound/aqualung/
@ 2020-11-04 17:50 Daniel Pielmeier
0 siblings, 0 replies; 4+ messages in thread
From: Daniel Pielmeier @ 2020-11-04 17:50 UTC (permalink / raw
To: gentoo-commits
commit: 860b716b29a547eb7bbd3a9e123962fa531713a9
Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 4 17:49:39 2020 +0000
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Wed Nov 4 17:49:39 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=860b716b
media-sound/aqualung: Fix bug #752993.
Thanks to Toralf Förster for the report.
Closes: https://bugs.gentoo.org/752993
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>
...{aqualung-1.1.ebuild => aqualung-1.1-r1.ebuild} | 4 +++
...ng-1.1-r100.ebuild => aqualung-1.1-r101.ebuild} | 4 +++
media-sound/aqualung/files/aqualung-1.1-ifp.patch | 41 ++++++++++++++++++++++
3 files changed, 49 insertions(+)
diff --git a/media-sound/aqualung/aqualung-1.1.ebuild b/media-sound/aqualung/aqualung-1.1-r1.ebuild
similarity index 98%
rename from media-sound/aqualung/aqualung-1.1.ebuild
rename to media-sound/aqualung/aqualung-1.1-r1.ebuild
index ea7f3d62f5a..33bb7a4e90c 100644
--- a/media-sound/aqualung/aqualung-1.1.ebuild
+++ b/media-sound/aqualung/aqualung-1.1-r1.ebuild
@@ -50,6 +50,10 @@ DEPEND="
${RDEPEND}
"
+PATCHES=(
+ "${FILESDIR}/${P}-ifp.patch"
+)
+
src_configure() {
econf \
--disable-rpath \
diff --git a/media-sound/aqualung/aqualung-1.1-r100.ebuild b/media-sound/aqualung/aqualung-1.1-r101.ebuild
similarity index 98%
rename from media-sound/aqualung/aqualung-1.1-r100.ebuild
rename to media-sound/aqualung/aqualung-1.1-r101.ebuild
index 57950edcbf4..fe7a974b3a4 100644
--- a/media-sound/aqualung/aqualung-1.1-r100.ebuild
+++ b/media-sound/aqualung/aqualung-1.1-r101.ebuild
@@ -52,6 +52,10 @@ DEPEND="
${RDEPEND}
"
+PATCHES=(
+ "${FILESDIR}/${P}-ifp.patch"
+)
+
src_configure() {
econf \
--disable-rpath \
diff --git a/media-sound/aqualung/files/aqualung-1.1-ifp.patch b/media-sound/aqualung/files/aqualung-1.1-ifp.patch
new file mode 100644
index 00000000000..490999be948
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-1.1-ifp.patch
@@ -0,0 +1,41 @@
+From 2a3732f1575d69b64ed5c9b76c6213c7d4fbc20b Mon Sep 17 00:00:00 2001
+From: Adam Sampson <ats@offog.org>
+Date: Tue, 8 Sep 2020 15:55:12 +0100
+Subject: [PATCH] Fix arr_strlcpy call in ifp_device.
+
+directory_chooser needs to know the length of the target.
+---
+ src/ifp_device.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/ifp_device.c b/src/ifp_device.c
+index 9ef5741..42236cb 100644
+--- a/src/ifp_device.c
++++ b/src/ifp_device.c
+@@ -824,7 +824,7 @@ gchar *npath;
+
+
+ void
+-directory_chooser(char * title, GtkWidget * parent, char * directory) {
++directory_chooser(char * title, GtkWidget * parent, char * directory, size_t directory_len) {
+
+ GtkWidget * dialog;
+ const gchar * selected_directory;
+@@ -855,7 +855,7 @@ directory_chooser(char * title, GtkWidget * parent, char * directory) {
+ gtk_widget_destroy(dialog);
+ }
+
+- arr_strlcpy(directory, selected_directory);
++ g_strlcpy(directory, selected_directory, directory_len);
+ g_free(utf8);
+ }
+
+@@ -865,7 +865,7 @@ directory_chooser(char * title, GtkWidget * parent, char * directory) {
+
+ void
+ local_path_selected_cb(GtkButton * button, gpointer data) {
+- directory_chooser(_("Please select a local path."), aifp_window, dest_dir);
++ directory_chooser(_("Please select a local path."), aifp_window, dest_dir, sizeof dest_dir);
+ gtk_entry_set_text(GTK_ENTRY(local_path_entry), dest_dir);
+ }
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-11-04 17:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-04 18:47 [gentoo-commits] repo/gentoo:master commit in: media-sound/aqualung/files/, media-sound/aqualung/ Daniel Pielmeier
-- strict thread matches above, loose matches on Subject: below --
2020-11-04 17:50 Daniel Pielmeier
2017-02-18 16:53 Andreas Sturmlechner
2015-09-16 16:45 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox