From 7e92e75676a68eca406219c8303ab0d88c811b58 Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Mon, 8 Sep 2003 03:13:39 +0000 Subject: [PATCH] mp3info: removed gcc33 patch (does not apply) and cleanups git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1336 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- Documentation/Developers/CHANGELOG-RENE | 1 + package/rene/mp3info/hotfix.patch | 53 ------------------- .../mp3info/{usr-local.patch => mp3info.conf} | 16 ++---- 3 files changed, 5 insertions(+), 65 deletions(-) delete mode 100644 package/rene/mp3info/hotfix.patch rename package/rene/mp3info/{usr-local.patch => mp3info.conf} (69%) diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index 4502197d9..738d5d9de 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -10,6 +10,7 @@ - bootdisk target cleanup and tiny refactoring to make it possible to skip the /boot directory content from the bootdisk (on PowerPC the 2nd stage increased to over 64MB ...) + - mp3info: removed gcc33 patch (does not apply) and cleanups *) 2003-09-06 (2.0.0-rc1 - 2.0.0-rc2) diff --git a/package/rene/mp3info/hotfix.patch b/package/rene/mp3info/hotfix.patch deleted file mode 100644 index c356e028f..000000000 --- a/package/rene/mp3info/hotfix.patch +++ /dev/null @@ -1,53 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/rene/mp3info/hotfix.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -diff -urN -x '*~' mp3info-0.8.4/gmp3info.c mp3info-0.8.4-gcc-3.3.1/gmp3info.c ---- mp3info-0.8.4/gmp3info.c 2001-07-16 11:17:16.000000000 +0200 -+++ mp3info-0.8.4-gcc-3.3.1/gmp3info.c 2003-08-19 22:49:53.000000000 +0200 -@@ -79,8 +79,6 @@ - mp3.id3.genre[0]=gget_genre(tmp); - strcpy(tmp,gtk_entry_get_text(GTK_ENTRY(id3win_text_track))); - mp3.id3.track[0]=atoi(tmp); -- if (mp3.id3.track[0] > 255) -- mp3.id3.track[0]=255; - write_tag(&mp3); - } - -@@ -484,12 +482,12 @@ - } - - void about_mp3info(void) { -- quick_popup(VERSION,"MP3Info -- An ID3 Tag Editor\n\n -- Original author: Ricardo Cerqueira -- Current maintainer: Cedric Tefft -- GTK Version: Ricardo Cerqueira \n\n -- Ricardo Cerqueira, Cedric Tefft 1999-2001\n\n"); -+ quick_popup(VERSION,"MP3Info\n" -+" An ID3 Tag Editor\n\n" -+" Original author: Ricardo Cerqueira \n" -+" Current maintainer: Cedric Tefft \n" -+" GTK Version: Ricardo Cerqueira \n\n" -+" Ricardo Cerqueira, Cedric Tefft 1999-2001\n\n"); - } - - /* rmcc has left the building */ diff --git a/package/rene/mp3info/usr-local.patch b/package/rene/mp3info/mp3info.conf similarity index 69% rename from package/rene/mp3info/usr-local.patch rename to package/rene/mp3info/mp3info.conf index bb5529a75..5f62ed6b2 100644 --- a/package/rene/mp3info/usr-local.patch +++ b/package/rene/mp3info/mp3info.conf @@ -5,7 +5,7 @@ # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # -# ROCK Linux: rock-src/package/rene/mp3info/usr-local.patch +# ROCK Linux: rock-src/package/rene/mp3info/mp3info.conf # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf # # This program is free software; you can redistribute it and/or modify @@ -20,14 +20,6 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- ---- ./Makefile~ Fri Aug 18 17:42:22 2000 -+++ ./Makefile Sat Jan 13 21:51:56 2001 -@@ -28,7 +28,7 @@ - # bindir = where binaries get installed (default = /usr/local/bin) - # mandir = where the manual page gets installed (default = /usr/local/man/man1) - --prefix=/usr/local -+prefix=/usr - bindir=${prefix}/bin - mandir = $(prefix)/man/man1 - +var_append maktopt " " "prefix=$root/$prefix" +var_append makeinstopt " " "prefix=$root/$prefix" +