diff options
author | Daniel Drake <dsd@gentoo.org> | 2005-01-02 13:24:10 +0000 |
---|---|---|
committer | Daniel Drake <dsd@gentoo.org> | 2005-01-02 13:24:10 +0000 |
commit | f98ec9f994d675865ecb1202c5b02391732c1354 (patch) | |
tree | a20e8026dedbc33fb45b1123c2c37136239358d1 /media-sound/easytag | |
parent | Version bump, bug #76392. (Manifest recommit) (diff) | |
download | gentoo-2-f98ec9f994d675865ecb1202c5b02391732c1354.tar.gz gentoo-2-f98ec9f994d675865ecb1202c5b02391732c1354.tar.bz2 gentoo-2-f98ec9f994d675865ecb1202c5b02391732c1354.zip |
Remove old versions
Diffstat (limited to 'media-sound/easytag')
-rw-r--r-- | media-sound/easytag/easytag-0.30d.ebuild | 64 | ||||
-rw-r--r-- | media-sound/easytag/easytag-0.31.ebuild | 69 | ||||
-rw-r--r-- | media-sound/easytag/easytag-1.99.1.ebuild | 51 | ||||
-rw-r--r-- | media-sound/easytag/easytag-1.99.2.ebuild | 51 | ||||
-rw-r--r-- | media-sound/easytag/files/digest-easytag-0.30d | 5 | ||||
-rw-r--r-- | media-sound/easytag/files/digest-easytag-0.31 | 2 | ||||
-rw-r--r-- | media-sound/easytag/files/digest-easytag-1.99.1 | 1 | ||||
-rw-r--r-- | media-sound/easytag/files/digest-easytag-1.99.2 | 1 | ||||
-rw-r--r-- | media-sound/easytag/files/easytag-0.30.2-fix-configure.patch | 16 | ||||
-rw-r--r-- | media-sound/easytag/files/easytag-0.30.2-gcc2.patch | 291 | ||||
-rw-r--r-- | media-sound/easytag/files/easytag-0.31_pre2-gcc2.patch | 66 |
11 files changed, 0 insertions, 617 deletions
diff --git a/media-sound/easytag/easytag-0.30d.ebuild b/media-sound/easytag/easytag-0.30d.ebuild deleted file mode 100644 index 2af16b59cd65..000000000000 --- a/media-sound/easytag/easytag-0.30d.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-0.30d.ebuild,v 1.4 2005/01/01 19:28:00 dsd Exp $ - -IUSE="nls oggvorbis" - -inherit eutils - -MY_PV=${PV/%[a-zA-Z]/} -MY_P=${PN}-${MY_PV} -MY_P2=${MY_P/-/_} -MY_P2=${MY_P2/./} - -S=${WORKDIR}/${MY_P} -DESCRIPTION="EasyTAG mp3/ogg ID3 tag editor" -HOMEPAGE="http://easytag.sourceforge.net/" -SRC_URI="mirror://sourceforge/easytag/${MY_P}.tar.bz2 - mirror://sourceforge/easytag/patch_${MY_P2}_${MY_PV/./}a.diff - mirror://sourceforge/easytag/patch_${MY_P2}a_${MY_PV/./}b.diff - mirror://sourceforge/easytag/patch_${MY_P2}b_${MY_PV/./}c.diff - mirror://sourceforge/easytag/patch_${MY_P2}c_${PV/./}.diff" - -RDEPEND="=x11-libs/gtk+-1.2* - >=media-libs/id3lib-3.8.2 - media-libs/flac - oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )" - -DEPEND="${RDEPEND} - >=sys-apps/sed-4.0.5" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="x86 ppc sparc ~alpha ~hppa ~amd64" - -src_unpack() { - unpack ${MY_P}.tar.bz2 - cd ${S} - - epatch ${DISTDIR}/patch_${MY_P2}_${MY_PV/./}a.diff - epatch ${DISTDIR}/patch_${MY_P2}a_${MY_PV/./}b.diff - epatch ${DISTDIR}/patch_${MY_P2}b_${MY_PV/./}c.diff - epatch ${DISTDIR}/patch_${MY_P2}c_${PV/./}.diff - -} - - -src_compile() { - local myconf - - #use_enable breaks this - use oggvorbis || myconf="${myconf} --disable-ogg" - - econf `use_enable nls` || die - emake || die -} - -src_install() { - einstall \ - sysdir=${D}/usr/share/applets/Multimedia \ - GNOME_SYSCONFDIR=${D}/etc \ - || die - - dodoc ChangeLog COPYING NEWS README TODO THANKS USERS-GUIDE -} diff --git a/media-sound/easytag/easytag-0.31.ebuild b/media-sound/easytag/easytag-0.31.ebuild deleted file mode 100644 index c9233d341b77..000000000000 --- a/media-sound/easytag/easytag-0.31.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-0.31.ebuild,v 1.7 2005/01/01 19:28:00 dsd Exp $ - -inherit eutils - -IUSE="nls oggvorbis flac gtk2" - -DSD_PATCH=${P}-dsd1.patch.bz2 -DESCRIPTION="EasyTAG mp3/ogg ID3 tag editor" -HOMEPAGE="http://easytag.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2 - gtk2? http://www.reactivated.net/patches/${PN}/${PV}/${DSD_PATCH}" - -RDEPEND=">=media-libs/id3lib-3.8.2 - gtk2? ( =x11-libs/gtk+-2.4* ) - !gtk2? ( =x11-libs/gtk+-1.2* ) - flac? ( >=media-libs/flac-1.1.0 >=media-libs/libvorbis-1.0_beta4 ) - oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )" - -DEPEND="${RDEPEND} - gtk2? ( >=sys-devel/automake-1.7 >=sys-devel/autoconf-2.5 )" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="x86 ~ppc sparc ~alpha ~hppa amd64" - -src_unpack() { - unpack ${P}.tar.bz2 - cd ${S} - - if use gtk2; then - epatch ${DISTDIR}/${DSD_PATCH} - - export WANT_AUTOMAKE=1.7 - export WANT_AUTOCONF=2.5 - ebegin "Remaking configure script (be patient)" - autoreconf &>/dev/null - eend $? - fi -} - -src_compile() { - local myconf - - econf \ - $(use_enable oggvorbis ogg) \ - $(use_enable nls) \ - $(use_enable flac) \ - ${myconf} || die "econf failed" - emake || die -} - -src_install() { - einstall \ - sysdir=${D}/usr/share/applets/Multimedia \ - GNOME_SYSCONFDIR=${D}/etc \ - || die - - dodoc ChangeLog COPYING NEWS README TODO THANKS USERS-GUIDE -} - -pkg_postinst() { - if use gtk2; then - einfo "You merged with the \"gtk2\" USE flag set" - ewarn "GTK+ 2 support for this program is still experimental" - ewarn "Please report bugs to http://bugs.gentoo.org" - fi -} diff --git a/media-sound/easytag/easytag-1.99.1.ebuild b/media-sound/easytag/easytag-1.99.1.ebuild deleted file mode 100644 index db40a854f932..000000000000 --- a/media-sound/easytag/easytag-1.99.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-1.99.1.ebuild,v 1.2 2005/01/01 19:28:00 dsd Exp $ - -inherit eutils gnuconfig - -IUSE="nls oggvorbis flac" - -DESCRIPTION="EasyTAG mp3/ogg ID3 tag editor" -HOMEPAGE="http://easytag.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -RDEPEND=">=media-libs/id3lib-3.8.2 - >=x11-libs/gtk+-2.4.1 - flac? ( >=media-libs/flac-1.1.0 >=media-libs/libvorbis-1.0 ) - oggvorbis? ( >=media-libs/libvorbis-1.0 )" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ppc64" - -src_unpack() { - unpack ${A} - cd ${S} - use ppc64 && gnuconfig_update -} - -src_compile() { - econf \ - $(use_enable oggvorbis ogg) \ - $(use_enable nls) \ - $(use_enable flac) \ - || die "econf failed" - emake || die -} - -src_install() { - einstall \ - sysdir=${D}/usr/share/applets/Multimedia \ - GNOME_SYSCONFDIR=${D}/etc \ - || die - - dodoc ChangeLog COPYING NEWS README TODO THANKS USERS-GUIDE -} - -pkg_postinst() { - einfo "This version of EasyTAG is GTK+ 2.4 based only, with no GTK+ 1.x support" - einfo "Please use EasyTAG 1.0 if you are looking for the stable GTK+ 1.x version" - ewarn "GTK+ 2 support for this program is still experimental" - ewarn "Please report bugs to http://bugs.gentoo.org" -} diff --git a/media-sound/easytag/easytag-1.99.2.ebuild b/media-sound/easytag/easytag-1.99.2.ebuild deleted file mode 100644 index 1a80b1c037a3..000000000000 --- a/media-sound/easytag/easytag-1.99.2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-1.99.2.ebuild,v 1.2 2005/01/01 19:28:00 dsd Exp $ - -inherit eutils gnuconfig - -IUSE="nls oggvorbis flac" - -DESCRIPTION="EasyTAG mp3/ogg ID3 tag editor" -HOMEPAGE="http://easytag.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -RDEPEND=">=media-libs/id3lib-3.8.2 - >=x11-libs/gtk+-2.4.1 - flac? ( >=media-libs/flac-1.1.0 >=media-libs/libvorbis-1.0 ) - oggvorbis? ( >=media-libs/libvorbis-1.0 )" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ppc64" - -src_unpack() { - unpack ${A} - cd ${S} - use ppc64 && gnuconfig_update -} - -src_compile() { - econf \ - $(use_enable oggvorbis ogg) \ - $(use_enable nls) \ - $(use_enable flac) \ - || die "econf failed" - emake || die -} - -src_install() { - einstall \ - sysdir=${D}/usr/share/applets/Multimedia \ - GNOME_SYSCONFDIR=${D}/etc \ - || die - - dodoc ChangeLog COPYING NEWS README TODO THANKS USERS-GUIDE -} - -pkg_postinst() { - einfo "This version of EasyTAG is GTK+ 2.4 based only, with no GTK+ 1.x support" - einfo "Please use EasyTAG 1.0 if you are looking for the stable GTK+ 1.x version" - ewarn "GTK+ 2 support for this program is still experimental" - ewarn "Please report bugs to http://bugs.gentoo.org" -} diff --git a/media-sound/easytag/files/digest-easytag-0.30d b/media-sound/easytag/files/digest-easytag-0.30d deleted file mode 100644 index c60990cb2bad..000000000000 --- a/media-sound/easytag/files/digest-easytag-0.30d +++ /dev/null @@ -1,5 +0,0 @@ -MD5 9f0dfde219c0422676f21afc49cc44bf easytag-0.30.tar.bz2 1094337 -MD5 210c0e49ad524181420a481b214a5917 patch_easytag_030_030a.diff 4382 -MD5 d38d94d319471c8b051f76df71de66e9 patch_easytag_030a_030b.diff 9160 -MD5 f48e07056ebd5d4b7b960d8f787c4f12 patch_easytag_030b_030c.diff 6036 -MD5 f6219b66a073743429e8385af8bb56ac patch_easytag_030c_030d.diff 4673 diff --git a/media-sound/easytag/files/digest-easytag-0.31 b/media-sound/easytag/files/digest-easytag-0.31 deleted file mode 100644 index a1afbdf36f5c..000000000000 --- a/media-sound/easytag/files/digest-easytag-0.31 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 9cfb29a81f251891ec4dbae4cd39821d easytag-0.31.tar.bz2 1054585 -MD5 4fc63528e4e100d55e8b11b53f5f22ca easytag-0.31-dsd1.patch.bz2 206560 diff --git a/media-sound/easytag/files/digest-easytag-1.99.1 b/media-sound/easytag/files/digest-easytag-1.99.1 deleted file mode 100644 index 48b1fe7e2b4b..000000000000 --- a/media-sound/easytag/files/digest-easytag-1.99.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 23ab19b5b8a57c4ac34bee167d0f05a9 easytag-1.99.1.tar.bz2 1100793 diff --git a/media-sound/easytag/files/digest-easytag-1.99.2 b/media-sound/easytag/files/digest-easytag-1.99.2 deleted file mode 100644 index f785d6723677..000000000000 --- a/media-sound/easytag/files/digest-easytag-1.99.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 f5452c6ce7752dc2ebd9a984bc038a9d easytag-1.99.2.tar.bz2 1130960 diff --git a/media-sound/easytag/files/easytag-0.30.2-fix-configure.patch b/media-sound/easytag/files/easytag-0.30.2-fix-configure.patch deleted file mode 100644 index 5e0068f088b7..000000000000 --- a/media-sound/easytag/files/easytag-0.30.2-fix-configure.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- easytag-0.30.2/configure.in 2004-03-24 23:33:51.000000000 +0000 -+++ easytag-0.30.2-dsd/configure.in 2004-04-04 18:54:07.826952264 +0100 -@@ -34,11 +34,11 @@ - dnl ------------------------------- - AC_ARG_ENABLE(ogg, - AC_HELP_STRING([--disable-ogg], [Disable support for Ogg Vorbis files (default=enabled)]), -- enable_ogg=no, enable_ogg=yes) -+ , enable_ogg=yes) - - AC_ARG_ENABLE(flac, - AC_HELP_STRING([--disable-flac],[Disable support for FLAC files (default=enabled)]), -- enable_flac=no, enable_flac=yes) -+ , enable_flac=yes) - - - dnl ------------------------------- diff --git a/media-sound/easytag/files/easytag-0.30.2-gcc2.patch b/media-sound/easytag/files/easytag-0.30.2-gcc2.patch deleted file mode 100644 index 330743a94c45..000000000000 --- a/media-sound/easytag/files/easytag-0.30.2-gcc2.patch +++ /dev/null @@ -1,291 +0,0 @@ -diff -Naur easytag-0.30.2.orig/src/browser.c easytag-0.30.2/src/browser.c ---- easytag-0.30.2.orig/src/browser.c 2004-04-22 06:48:52.000000000 -0400 -+++ easytag-0.30.2/src/browser.c 2004-04-22 06:56:26.000000000 -0400 -@@ -1131,14 +1131,14 @@ - */ - void Browser_List_Remove_File (ET_File *searchETFile) - { -- if (searchETFile == NULL) -- return; -- - gint row; - GtkTreePath *currentPath = NULL; - GtkTreeIter currentIter; - ET_File *currentETFile; - -+ if (searchETFile == NULL) -+ return; -+ - // Go through the file list until it is found - for (row=0; row < gtk_tree_model_iter_n_children(GTK_TREE_MODEL(fileListModel), NULL); row++) { - if (row == 0) -@@ -1162,13 +1162,13 @@ - */ - void Browser_List_Select_File_By_Etfile (ET_File *searchETFile, gboolean select_it) - { -- if (searchETFile == NULL) -- return; -- - gint row; - GtkTreePath *currentPath = NULL; - GtkTreeIter currentIter; - ET_File *currentETFile; -+ -+ if (searchETFile == NULL) -+ return; - - // Go through the file list until it is found - for (row=0; row < gtk_tree_model_iter_n_children(GTK_TREE_MODEL(fileListModel), NULL); row++) { -@@ -1227,13 +1227,13 @@ - */ - void Browser_List_Unselect_File_By_Etfile(ET_File *searchETFile) - { -- if (searchETFile == NULL) -- return; -- - gint row; - GtkTreePath *currentPath = NULL; - GtkTreeIter currentIter; - ET_File *currentETFile; -+ -+ if (searchETFile == NULL) -+ return; - - // Go through the file list until it is found - for (row=0; row < gtk_tree_model_iter_n_children(GTK_TREE_MODEL(fileListModel), NULL); row++) { -@@ -1603,6 +1603,7 @@ - GtkTreePath *currentPath2 = NULL; - gint row; - gint row2; -+ GList *list = NULL; - - // Save the current displayed data - ET_Save_File_Data_From_UI(ETCore->ETFileDisplayed); -@@ -1637,7 +1638,6 @@ - if (!AlbumList) - continue; - -- GList *list = NULL; - while (AlbumList && !list) // list!=NULL => We have found the BrowserArtistList row... - { - list = g_list_find((GList *)AlbumList->data,etfile); -diff -Naur easytag-0.30.2.orig/src/cddb.c easytag-0.30.2/src/cddb.c ---- easytag-0.30.2.orig/src/cddb.c 2004-04-22 06:48:52.000000000 -0400 -+++ easytag-0.30.2/src/cddb.c 2004-04-22 06:48:38.000000000 -0400 -@@ -822,6 +822,7 @@ - GtkTreePath *rowpath; - gboolean result; - gboolean itemselected = FALSE; -+ GtkTreeIter itercopy; - - if (!entry || !button) - return; -@@ -853,7 +854,7 @@ - result = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(CddbAlbumListModel), &iter); - } - -- GtkTreeIter itercopy = iter; -+ itercopy = iter; - - /* If list entries follow the previously selected item, loop through them looking for a match */ - if(result == TRUE) { -@@ -2084,6 +2085,7 @@ - GtkTreePath *currentPath = NULL; - GtkTreeIter currentIter; - GList *selectedrows = NULL; -+ CddbTrackAlbum *cddbtrackalbum = NULL; - - if (!ETCore->ETFileDisplayedList) return FALSE; - -@@ -2164,7 +2166,6 @@ - } - - gtk_tree_model_get_iter(GTK_TREE_MODEL(CddbTrackListModel), ¤tIter, currentPath); -- CddbTrackAlbum *cddbtrackalbum = NULL; - gtk_tree_model_get(GTK_TREE_MODEL(CddbTrackListModel), ¤tIter, CDDB_TRACK_LIST_DATA, &cddbtrackalbum, -1); - - if (cddbtrackalbum && selected_etfilelist) -diff -Naur easytag-0.30.2.orig/src/easytag.c easytag-0.30.2/src/easytag.c ---- easytag-0.30.2.orig/src/easytag.c 2004-04-22 06:48:52.000000000 -0400 -+++ easytag-0.30.2/src/easytag.c 2004-04-22 07:18:41.000000000 -0400 -@@ -1072,6 +1072,7 @@ - { - gint progress_bar_index; - GList *etfilelist = NULL; -+ double fraction; - - if (!ETCore->ETFileDisplayedList) return; - -@@ -1098,7 +1099,7 @@ - Scan_Select_Mode_And_Run_Scanner((ET_File *)etfilelist->data); - etfilelist = g_list_next(etfilelist); - progress_bar_index++; -- double fraction = progress_bar_index / (double) ETCore->ETFileSelectionList_Length; -+ fraction = progress_bar_index / (double) ETCore->ETFileSelectionList_Length; - gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ProgressBar), fraction); - /* Needed to refresh status bar */ - while (gtk_events_pending()) -@@ -1126,6 +1127,7 @@ - GList *etfilelist = NULL; - File_Tag *FileTag; - gint progress_bar_index; -+ double fraction; - - if (!ETCore->ETFileDisplayedList) return; - -@@ -1143,7 +1145,7 @@ - FileTag = ET_File_Tag_Item_New(); - ET_Manage_Changes_Of_File_Data(etfilelist->data,NULL,FileTag); - etfilelist = g_list_next(etfilelist); -- double fraction = (++progress_bar_index) / (double) ETCore->ETFileSelectionList_Length; -+ fraction = (++progress_bar_index) / (double) ETCore->ETFileSelectionList_Length; - gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ProgressBar), fraction); - /* Needed to refresh status bar */ - while (gtk_events_pending()) -@@ -1315,7 +1317,8 @@ - ET_File *etfile_save_position = NULL; - File_Tag *FileTag; - File_Name *FileNameNew; -- -+ double fraction; -+ gchar progress_bar_text[30]; - - if (!ETCore) return FALSE; - -@@ -1341,7 +1344,6 @@ - /* Initialize status bar */ - gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ProgressBar),0); - progress_bar_index = 0; -- gchar progress_bar_text[30]; - g_snprintf(progress_bar_text, 30, "%d/%d", progress_bar_index, nb_files_to_save); - gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ProgressBar), progress_bar_text); - -@@ -1370,7 +1372,7 @@ - ET_Display_File_Data_To_UI((ET_File *)etfilelist_tmp->data); - Browser_List_Select_File_By_Etfile((ET_File *)etfilelist_tmp->data,FALSE); - -- double fraction = (++progress_bar_index) / (double) nb_files_to_save; -+ fraction = (++progress_bar_index) / (double) nb_files_to_save; - gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ProgressBar), fraction); - g_snprintf(progress_bar_text, 30, "%d/%d", progress_bar_index, nb_files_to_save); - gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ProgressBar), progress_bar_text); -@@ -1451,7 +1453,8 @@ - gint nb_files_to_delete; - gint nb_files_deleted = 0; - gchar *msg; -- -+ double fraction; -+ gchar progress_bar_text[30]; - - if (!ETCore->ETFileDisplayedList) return FALSE; - -@@ -1464,7 +1467,6 @@ - /* Initialize status bar */ - gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ProgressBar),0); - progress_bar_index = 0; -- gchar progress_bar_text[30]; - g_snprintf(progress_bar_text, 30, "%d/%d", progress_bar_index, nb_files_to_delete); - gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ProgressBar), progress_bar_text); - -@@ -1485,7 +1487,7 @@ - ETFile = (ET_File *)etfilelist->data; - ET_Display_File_Data_To_UI(ETFile); - Browser_List_Select_File_By_Etfile(ETFile,FALSE); -- double fraction = (++progress_bar_index) / (double) nb_files_to_delete; -+ fraction = (++progress_bar_index) / (double) nb_files_to_delete; - gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ProgressBar), fraction); - g_snprintf(progress_bar_text, 30, "%d/%d", progress_bar_index, nb_files_to_delete); - gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ProgressBar), progress_bar_text); -@@ -1950,8 +1952,11 @@ - { - DIR *dir; - gchar *msg, *tmp; -+ gchar progress_bar_text[30]; -+ double fraction; - guint nbrfile = 0; - GList *FileList = NULL; -+ gint progress_bar_index = 0; - - ReadingDirectory = TRUE; /* A flag to avoid to start an other reading */ - -@@ -1972,8 +1977,6 @@ - gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(TBShowBrowserButton),FALSE); - Browser_Display_Tree_Or_Artist_Album_List(); // To show the corresponding lists... - -- gint progress_bar_index = 0; -- - /* Placed only here, to empty the previous list of files */ - if (path == NULL) return; - if ((dir=opendir(path)) == NULL) -@@ -2005,7 +2008,6 @@ - // Search the supported files - FileList = Read_Directory_Recursively(FileList,path,BROWSE_SUBDIR); - nbrfile = g_list_length(FileList); -- gchar progress_bar_text[30]; - gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ProgressBar), 0.0); - g_snprintf(progress_bar_text, 30, "%d/%d", 0, nbrfile); - gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ProgressBar), progress_bar_text); -@@ -2026,7 +2028,7 @@ - g_free(filename); - - // Update the progress bar -- double fraction = (++progress_bar_index) / (double) nbrfile; -+ fraction = (++progress_bar_index) / (double) nbrfile; - gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ProgressBar), fraction); - g_snprintf(progress_bar_text, 30, "%d/%d", progress_bar_index, nbrfile); - gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ProgressBar), progress_bar_text); -diff -Naur easytag-0.30.2.orig/src/misc.c easytag-0.30.2/src/misc.c ---- easytag-0.30.2.orig/src/misc.c 2004-04-22 06:48:52.000000000 -0400 -+++ easytag-0.30.2/src/misc.c 2004-04-22 07:35:05.000000000 -0400 -@@ -734,13 +734,12 @@ - GtkTreeIter iter; - GtkTreeSelection *selection; - GtkTreeModel *artistListModel; -+ GList *AlbumList, *etfilelist; -+ GList *concatenated_list = NULL; - selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(BrowserArtistList)); - if(!gtk_tree_selection_get_selected(selection, &artistListModel, &iter)) - return; - -- GList *AlbumList, *etfilelist; -- GList *concatenated_list = NULL; -- - gtk_tree_model_get(artistListModel, &iter, colnum, &AlbumList, -1); - - while (AlbumList) -@@ -1678,8 +1677,9 @@ - gchar *temp = NULL; - gchar *filename; - gchar *filename_base; -- gchar *string_to_search2; - gint resultCount = 0; -+ gchar *title2, *artist2, *album2, *year2, *track2, *track_total2, *genre2, *comment2, *string_to_search2; -+ - - if (!SearchStringEntry || !SearchInFilename || !SearchInTag || !SearchResultList) - return; -@@ -1734,15 +1734,15 @@ - File_Tag *FileTag = (File_Tag *)ETFile->FileTag->data; - - // Duplicate and UTF8-convert the strings -- gchar *title2 = g_strdup(FileTag->title); TRANSLATE_USER(title2, temp); -- gchar *artist2 = g_strdup(FileTag->artist); TRANSLATE_USER(artist2, temp); -- gchar *album2 = g_strdup(FileTag->album); TRANSLATE_USER(album2, temp); -- gchar *year2 = g_strdup(FileTag->year); TRANSLATE_USER(year2, temp); -- gchar *track2 = g_strdup(FileTag->track); TRANSLATE_USER(track2, temp); -- gchar *track_total2 = g_strdup(FileTag->track_total); TRANSLATE_USER(track_total2, temp); -- gchar *genre2 = g_strdup(FileTag->genre); TRANSLATE_USER(genre2, temp); -- gchar *comment2 = g_strdup(FileTag->comment); TRANSLATE_USER(comment2, temp); -- gchar *string_to_search2 = g_strdup(string_to_search);TRANSLATE_USER(string_to_search2, temp); -+ title2 = g_strdup(FileTag->title); TRANSLATE_USER(title2, temp); -+ artist2 = g_strdup(FileTag->artist); TRANSLATE_USER(artist2, temp); -+ album2 = g_strdup(FileTag->album); TRANSLATE_USER(album2, temp); -+ year2 = g_strdup(FileTag->year); TRANSLATE_USER(year2, temp); -+ track2 = g_strdup(FileTag->track); TRANSLATE_USER(track2, temp); -+ track_total2 = g_strdup(FileTag->track_total); TRANSLATE_USER(track_total2, temp); -+ genre2 = g_strdup(FileTag->genre); TRANSLATE_USER(genre2, temp); -+ comment2 = g_strdup(FileTag->comment); TRANSLATE_USER(comment2, temp); -+ string_to_search2 = g_strdup(string_to_search);TRANSLATE_USER(string_to_search2, temp); - - // To search without case sensivity - if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(SearchCaseSensitive))) diff --git a/media-sound/easytag/files/easytag-0.31_pre2-gcc2.patch b/media-sound/easytag/files/easytag-0.31_pre2-gcc2.patch deleted file mode 100644 index 36b3fdfa3f7e..000000000000 --- a/media-sound/easytag/files/easytag-0.31_pre2-gcc2.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -Naur easytag-0.30.2.orig/src/easytag.c easytag-0.30.2/src/easytag.c ---- easytag-0.30.2.orig/src/easytag.c 2004-04-29 07:13:46.000000000 -0400 -+++ easytag-0.30.2/src/easytag.c 2004-04-29 07:15:50.000000000 -0400 -@@ -1133,6 +1133,7 @@ - GList *etfilelist = NULL; - File_Tag *FileTag; - gint progress_bar_index; -+ double fraction; - - if (!ETCore->ETFileDisplayedList) return; - -@@ -1150,7 +1151,7 @@ - FileTag = ET_File_Tag_Item_New(); - ET_Manage_Changes_Of_File_Data(etfilelist->data,NULL,FileTag); - etfilelist = g_list_next(etfilelist); -- double fraction = (++progress_bar_index) / (double) ETCore->ETFileSelectionList_Length; -+ fraction = (++progress_bar_index) / (double) ETCore->ETFileSelectionList_Length; - gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ProgressBar), fraction); - /* Needed to refresh status bar */ - while (gtk_events_pending()) -@@ -1322,7 +1323,8 @@ - ET_File *etfile_save_position = NULL; - File_Tag *FileTag; - File_Name *FileNameNew; -- -+ gchar progress_bar_text[30]; -+ double fraction; - - if (!ETCore) return FALSE; - -@@ -1348,7 +1350,6 @@ - /* Initialize status bar */ - gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ProgressBar),0); - progress_bar_index = 0; -- gchar progress_bar_text[30]; - g_snprintf(progress_bar_text, 30, "%d/%d", progress_bar_index, nb_files_to_save); - gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ProgressBar), progress_bar_text); - -@@ -1377,7 +1378,7 @@ - ET_Display_File_Data_To_UI((ET_File *)etfilelist_tmp->data); - Browser_List_Select_File_By_Etfile((ET_File *)etfilelist_tmp->data,FALSE); - -- double fraction = (++progress_bar_index) / (double) nb_files_to_save; -+ fraction = (++progress_bar_index) / (double) nb_files_to_save; - gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ProgressBar), fraction); - g_snprintf(progress_bar_text, 30, "%d/%d", progress_bar_index, nb_files_to_save); - gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ProgressBar), progress_bar_text); -diff -Naur easytag-0.30.2.orig/src/et_core.c easytag-0.30.2/src/et_core.c ---- easytag-0.30.2.orig/src/et_core.c 2004-04-29 07:13:46.000000000 -0400 -+++ easytag-0.30.2/src/et_core.c 2004-04-29 07:14:38.000000000 -0400 -@@ -2336,13 +2336,13 @@ - gboolean ET_Display_File_Info_To_UI(ET_File_Info *ETFileInfo) - { - -- g_print("ET_Display_File_Infotoui\n"); -- - gchar *text; - gchar *time = NULL; - gchar *time1 = NULL; - gchar *size = NULL; - gchar *size1 = NULL; -+ -+ g_print("ET_Display_File_Infotoui\n"); - - /* MPEG, Layer versions */ - text = g_strdup_printf("%d, Layer %d",ETFileInfo->version,ETFileInfo->layer); |