From d5ee59790ee8298b8599b0aa0fa21a98b972a44d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 30 Jun 2024 08:00:51 +0100 Subject: gentoo auto-resync : 30:06:2024 - 08:00:50 --- media-sound/gstreamripper/Manifest | 3 +- .../files/gstreamripper-0.2-C99-fixes.patch | 85 ++++++++++++++++++++++ .../gstreamripper/gstreamripper-0.2-r1.ebuild | 44 +++++++++++ media-sound/gstreamripper/gstreamripper-0.2.ebuild | 40 ---------- 4 files changed, 131 insertions(+), 41 deletions(-) create mode 100644 media-sound/gstreamripper/files/gstreamripper-0.2-C99-fixes.patch create mode 100644 media-sound/gstreamripper/gstreamripper-0.2-r1.ebuild delete mode 100644 media-sound/gstreamripper/gstreamripper-0.2.ebuild (limited to 'media-sound/gstreamripper') diff --git a/media-sound/gstreamripper/Manifest b/media-sound/gstreamripper/Manifest index 19fd861fc381..3b43582f5ea2 100644 --- a/media-sound/gstreamripper/Manifest +++ b/media-sound/gstreamripper/Manifest @@ -1,3 +1,4 @@ +AUX gstreamripper-0.2-C99-fixes.patch 2541 BLAKE2B 91c0bae76715e3a39edb0126dccc35b8b24f149c4325d4ab93a9bbef35220b149d83cec81442bb9f048c4ecc4f3b7603beed9fe6e63bc395b1529d72015fed45 SHA512 73d5bbd1ee7dc68905ad638ddff6dad045940414373f1d568c3b9f46764c65854da8b50a4d8ec75e37fa3c3355586edc8ba18c54cb0d9bdfbf87237d971e8494 DIST GStreamripperX-0.2.tar.gz 187186 BLAKE2B 66beccb382316331efcea25b5c97d31a3a7c8e59c3f50026909872f761704182bdca1ec919a4350d8324688634c3b9e654e86db1c750cf0992aa538db9c7939a SHA512 6b4253d7b9f02bcba3e5815390bfc284e3d04f5518055d650efc61e650c6c7a8a6bcf0d86cbe56fd8b59969d77e83aab6d09c0fe12d0e77c621e91ed5ce3253c -EBUILD gstreamripper-0.2.ebuild 828 BLAKE2B 83dd1b9a6b494aef2b9f93951dae57e795f142380e442a893b6cd1ed0ebd579d5beae2b361de070cb7635133feb58b2e2e17a523c969c3777d161f700a174ec3 SHA512 4bd23b57e8a98f50aab8ae93b7be8f8a77f330bb50168ba553c94d9ff7d885367a05ff4778b3c9697d8ff379be98e626c0f76788f7b2aee618ab9d11d3112278 +EBUILD gstreamripper-0.2-r1.ebuild 875 BLAKE2B f9d0bb1f9cc832632f161dc22ca7b73004a83f93c997ef52a6e13822f138886159e410480bd439362160d394b75a0cd110aa97771a35f9b905815cc50cd358c5 SHA512 8dd2ea49ec52a7153f92c4ff209087d49b1781ddf8fd02fdc951de0b7b192dc6381b6ff4f8fbdfac69d7a1b0679997f87618ad079851f17dc8c76dec95f3b1c2 MISC metadata.xml 337 BLAKE2B 5eb27b94b412037f04979c8e241c9b37a8dfde78ec88e2941d01eeba2c7b35b07f0eae16bf2d5d9c9cb2a94758e15a44fd3d8e9b6a28ba43308793b9fdf4253e SHA512 7ab6ae6f749d188077b9398638c55229234e0fe76e1af2baeb2c6041b3d02d42f1291e257d0b7935d9c85aa9106ffc95630aabf4b21dafb62509635d494cb76e diff --git a/media-sound/gstreamripper/files/gstreamripper-0.2-C99-fixes.patch b/media-sound/gstreamripper/files/gstreamripper-0.2-C99-fixes.patch new file mode 100644 index 000000000000..915e7a201451 --- /dev/null +++ b/media-sound/gstreamripper/files/gstreamripper-0.2-C99-fixes.patch @@ -0,0 +1,85 @@ +https://bugs.gentoo.org/885531 +--- a/src/callbacks.c 2024-04-03 16:35:36.682662231 +0000 ++++ b/src/callbacks.c 2024-04-03 16:44:09.332605097 +0000 +@@ -410,7 +410,7 @@ + + + gboolean +-on_window1_delete_event(GtkWidget * widget, ++on_window1_delete_event(GtkButton * widget, + GdkEvent * event, gpointer user_data) + { + on_quit_button_clicked((widget), user_data); +--- a/src/callbacks.h 2024-04-03 16:35:36.682662231 +0000 ++++ b/src/callbacks.h 2024-04-03 16:46:35.340734393 +0000 +@@ -36,7 +36,7 @@ + + void on_locateButton_clicked(); + +-gboolean on_window1_delete_event(GtkWidget * widget,GdkEvent * event, ++gboolean on_window1_delete_event(GtkButton * button,GdkEvent * event, + gpointer user_data); + + void loadPrefs(); +--- a/src/interface.c 2024-04-03 16:35:36.682662231 +0000 ++++ b/src/interface.c 2024-04-03 16:53:11.479371945 +0000 +@@ -76,7 +76,7 @@ + gtk_box_pack_start(GTK_BOX(hbox2), button1, FALSE, FALSE, 5); + + notebook1 = gtk_notebook_new(); +- gtk_notebook_set_scrollable(notebook1, TRUE); ++ gtk_notebook_set_scrollable(GTK_NOTEBOOK(notebook1), TRUE); + gtk_widget_show(notebook1); + gtk_box_pack_start(GTK_BOX(vbox1), notebook1, TRUE, TRUE, 0); + +https://bugs.gentoo.org/871012 +https://bugs.gentoo.org/919182 +--- a/src/main.c 2024-04-03 16:35:36.682662231 +0000 ++++ b/src/main.c 2024-04-03 16:42:23.412236742 +0000 +@@ -11,7 +11,7 @@ + + #include "interface.h" + #include "support.h" +- ++#include "callbacks.h" + int + main (int argc, char *argv[]) + { +--- a/src/callbacks.c 2024-04-03 17:00:00.604930862 +0000 ++++ b/src/callbacks.c 2024-04-03 17:05:23.965001507 +0000 +@@ -23,7 +23,7 @@ + #include "support.h" + #include "parse.h" + +-gint pids[256][2]; //pids[numberOFpidsAllowed][pid#,g_io_channel,ip] ++GIOChannel *pids[256][2]; //pids[numberOFpidsAllowed][pid#,g_io_channel,ip] + gchar *ips[256][1]; + gint streams = 0; + gchar *binpath = "streamripper"; +@@ -165,7 +165,7 @@ + return 0; + } + +- pids[streams][0] = child_pid; ++ pids[streams][0] = g_io_channel_unix_new(child_pid); + ips[streams][0] = g_strdup(ip); + + +@@ -365,7 +365,7 @@ + gint i = 0; + for(; i < streams; i++) + { +- if(kill(pids[i][0], SIGKILL) == -1) ++ if(kill(g_io_channel_unix_get_fd(pids[i][0]), SIGKILL) == -1) + { + switch (errno) + { +@@ -389,7 +389,7 @@ + } + if(!all) //just want to close one tab + { +- if((kill(pids[curtab][0], SIGKILL)) != -1) ++ if((kill(g_io_channel_unix_get_fd(pids[curtab][0]), SIGKILL)) != -1) + { + g_io_channel_shutdown((pids[curtab][1]), FALSE, NULL); + } diff --git a/media-sound/gstreamripper/gstreamripper-0.2-r1.ebuild b/media-sound/gstreamripper/gstreamripper-0.2-r1.ebuild new file mode 100644 index 000000000000..0413f8eac1cb --- /dev/null +++ b/media-sound/gstreamripper/gstreamripper-0.2-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop + +MY_P=GStreamripperX-${PV} + +DESCRIPTION="A GTK+ toolkit based frontend for streamripper" +HOMEPAGE="https://sourceforge.net/projects/gstreamripper/" +SRC_URI="https://downloads.sourceforge.net/gstreamripper/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc ppc64 sparc x86" + +RDEPEND=" + x11-libs/gtk+:2 + media-sound/streamripper" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=" + ${FILESDIR}/${P}-C99-fixes.patch +" + +src_compile() { + emake CFLAGS="${CFLAGS}" +} + +src_install() { + local docdir="${EPREFIX}/usr/share/doc/${PF}" + emake \ + DESTDIR="${D}" \ + gstreamripperxdocdir="${docdir}" \ + install + einstalldocs + + rm "${ED}"/${docdir}/COPYING || die + + make_desktop_entry gstreamripperx GStreamripperX +} diff --git a/media-sound/gstreamripper/gstreamripper-0.2.ebuild b/media-sound/gstreamripper/gstreamripper-0.2.ebuild deleted file mode 100644 index 98a7de6e4bf2..000000000000 --- a/media-sound/gstreamripper/gstreamripper-0.2.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop - -MY_P=GStreamripperX-${PV} - -DESCRIPTION="A GTK+ toolkit based frontend for streamripper" -HOMEPAGE="https://sourceforge.net/projects/gstreamripper/" -SRC_URI="https://downloads.sourceforge.net/gstreamripper/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 sparc x86" - -RDEPEND=" - x11-libs/gtk+:2 - media-sound/streamripper" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_compile() { - emake CFLAGS="${CFLAGS}" -} - -src_install() { - local docdir="${EPREFIX}/usr/share/doc/${PF}" - emake \ - DESTDIR="${D}" \ - gstreamripperxdocdir="${docdir}" \ - install - einstalldocs - - rm "${ED}"/${docdir}/COPYING || die - - make_desktop_entry gstreamripperx GStreamripperX -} -- cgit v1.2.3