diff options
| author |   Alexandre Buisse <nattfodd@gentoo.org> | 2006-03-08 22:13:02 +0000 |
|---|---|---|
| committer | Alexandre Buisse <nattfodd@gentoo.org> | 2006-03-08 22:13:02 +0000 |
| commit | 6d7a4d165c37f2e197e87cebd4cd9cacf6a3907d (patch) | |
| tree | bbbb5a80c5781895b8dfe9c1296a71e3e1c6b5dc | |
| parent | New mplayer-bin per bug #125090 (diff) | |
| download | historical-6d7a4d165c37f2e197e87cebd4cd9cacf6a3907d.tar.gz historical-6d7a4d165c37f2e197e87cebd4cd9cacf6a3907d.tar.bz2 historical-6d7a4d165c37f2e197e87cebd4cd9cacf6a3907d.zip | |
Fix utf8 issues with vorbiscomment (bug #125116).
Package-Manager: portage-2.1_pre5-r4
| -rw-r--r-- | media-sound/vorbis-tools/ChangeLog | 9 | ||||
| -rw-r--r-- | media-sound/vorbis-tools/Manifest | 31 | ||||
| -rw-r--r-- | media-sound/vorbis-tools/files/digest-vorbis-tools-1.1.1-r2 | 3 | ||||
| -rw-r--r-- | media-sound/vorbis-tools/files/vorbis-tools-1.1.1-utf8.patch | 42 | ||||
| -rw-r--r-- | media-sound/vorbis-tools/vorbis-tools-1.1.1-r2.ebuild (renamed from media-sound/vorbis-tools/vorbis-tools-1.1.1-r1.ebuild) | 10 |
5 files changed, 83 insertions, 12 deletions
diff --git a/media-sound/vorbis-tools/ChangeLog b/media-sound/vorbis-tools/ChangeLog index d8f62df11a1d..a297958393d0 100644 --- a/media-sound/vorbis-tools/ChangeLog +++ b/media-sound/vorbis-tools/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-sound/vorbis-tools # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/ChangeLog,v 1.38 2006/02/27 17:54:45 chutzpah Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/ChangeLog,v 1.39 2006/03/08 22:13:02 nattfodd Exp $ + +*vorbis-tools-1.1.1-r2 (08 Mar 2006) + + 08 Mar 2006; Alexandre Buisse <nattfodd@gentoo.org> + +files/vorbis-tools-1.1.1-utf8.patch, -vorbis-tools-1.1.1-r1.ebuild, + +vorbis-tools-1.1.1-r2.ebuild: + Fix utf8 issues in vorbiscomment (bug #125116). 27 Feb 2006; Patrick McLean <chutzpah@gentoo.org> vorbis-tools-1.0.1-r1.ebuild: diff --git a/media-sound/vorbis-tools/Manifest b/media-sound/vorbis-tools/Manifest index e8dbfeea70ad..02d59ec3b79f 100644 --- a/media-sound/vorbis-tools/Manifest +++ b/media-sound/vorbis-tools/Manifest @@ -1,6 +1,9 @@ -MD5 dac6b2933d28674ddd8a81fd4e5d7078 ChangeLog 5336 -RMD160 467bc416839653719ed15899af5d623face9da8f ChangeLog 5336 -SHA256 93c55f57dd3fa0a061a4fa8403943babaddbaa86ecc057d2a8f457dd53c80335 ChangeLog 5336 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 1e2c3fc602753f549e7c743baf2fa633 ChangeLog 5583 +RMD160 f45de2ae57f0d7168a197ae9ec5af0cd38b8fddf ChangeLog 5583 +SHA256 dc573ed6534e2dd6469248fc741c90cccc32668c42a61317946049bc0e1839f4 ChangeLog 5583 MD5 59ac94a6db4621c0ebd90d8b8fe8d9c0 files/digest-vorbis-tools-1.0-r2 68 RMD160 b8ad82163df70280f4fb8127379d86363eb698ad files/digest-vorbis-tools-1.0-r2 68 SHA256 2738406b3dd946a4c026a900f5945d6eeebb71cb17e2b573ae4111c654f6c103 files/digest-vorbis-tools-1.0-r2 68 @@ -13,12 +16,15 @@ SHA256 2c11413c52a8d2d9bcc9266c345b53d6d9d675fe775e942d4003ff6265c51665 files/di MD5 c6c7f9c0dab0b7b1372a866773587178 files/digest-vorbis-tools-1.1.1 70 RMD160 dd35d49c594180aa9b5a763ce6a0501af77d5bf9 files/digest-vorbis-tools-1.1.1 70 SHA256 3e8d5efaa9a6188452396e5e225bfbb3aa02577522e993e1d30d2084142a6e2e files/digest-vorbis-tools-1.1.1 70 -MD5 c6c7f9c0dab0b7b1372a866773587178 files/digest-vorbis-tools-1.1.1-r1 70 -RMD160 dd35d49c594180aa9b5a763ce6a0501af77d5bf9 files/digest-vorbis-tools-1.1.1-r1 70 -SHA256 3e8d5efaa9a6188452396e5e225bfbb3aa02577522e993e1d30d2084142a6e2e files/digest-vorbis-tools-1.1.1-r1 70 +MD5 73f1e0d720f815fec15a227f37d4a4de files/digest-vorbis-tools-1.1.1-r2 256 +RMD160 0776cd58cf1eefca88a1f5cb590d91699f546786 files/digest-vorbis-tools-1.1.1-r2 256 +SHA256 3852a9d9af24fffe51fcb912cd4499ad17d3752fab8fe396a11f2ca65ca03f26 files/digest-vorbis-tools-1.1.1-r2 256 MD5 bc135048b370b69a479ec79194774283 files/vorbis-tools-1.0.1-largefile.patch 458 RMD160 b21d8d7b75077b0596dfa670fa4e73c6a59f8f0d files/vorbis-tools-1.0.1-largefile.patch 458 SHA256 186201fa3079a653f4cc4b04d6c562820c40ba332b272fff42f2d54eb7bc7d1a files/vorbis-tools-1.0.1-largefile.patch 458 +MD5 107a8e0513369351db754cfb06e196aa files/vorbis-tools-1.1.1-utf8.patch 1307 +RMD160 dbdd6a8394fc3cbdc4ded5ab067fdbcde15fddf1 files/vorbis-tools-1.1.1-utf8.patch 1307 +SHA256 e35ffa1b9eeadd218580dc947941b469cf886976a588425b2d53e1b98b4332f1 files/vorbis-tools-1.1.1-utf8.patch 1307 MD5 527dcfe3ce0f0b53c6b6aa8b82eb930c metadata.xml 252 RMD160 68406e733c1a9f26b7ab37e79ab53b3f59305b3a metadata.xml 252 SHA256 5ab00710d822d203a1a38e1b6a9754137de4fe2cf5c4e79470419ed3f3927450 metadata.xml 252 @@ -31,9 +37,16 @@ SHA256 7799528acd3c3e2e7076456073f2ce3a7097b35873c969644cf16ab407238da2 vorbis-t MD5 08f7faecc3e956ee8567026b16977ce3 vorbis-tools-1.0.1.ebuild 1300 RMD160 6e9c295e4eb7203665e5c97b542b493e78c4bb72 vorbis-tools-1.0.1.ebuild 1300 SHA256 38a592773e514455241b2fc7a6c95ce33c95c872551ce795716798f2c1f80f5e vorbis-tools-1.0.1.ebuild 1300 -MD5 232ab4aeb041bc746a09cf1507dde7cc vorbis-tools-1.1.1-r1.ebuild 1543 -RMD160 e52f2b707b2b6be504f01dcd86d2be766f2b5411 vorbis-tools-1.1.1-r1.ebuild 1543 -SHA256 b40612b4dd2091f10935e719a5cb9a983b1219980264749173030682d1f4b5b8 vorbis-tools-1.1.1-r1.ebuild 1543 +MD5 43c83f4e58cfb87f9866b433d6796469 vorbis-tools-1.1.1-r2.ebuild 1619 +RMD160 0a7f624b53a6b9de0da4ad103cd8d3ffa74b844b vorbis-tools-1.1.1-r2.ebuild 1619 +SHA256 bde5ecdfed94f1bee25df287287ac194f4ea4b74d4d3d5f05639f0bf122ede3c vorbis-tools-1.1.1-r2.ebuild 1619 MD5 2e2513113b32c5e3bbe336e25533bde2 vorbis-tools-1.1.1.ebuild 1274 RMD160 0067633e7fbeeed28e18c6b950f9d801122033db vorbis-tools-1.1.1.ebuild 1274 SHA256 6c641649f1db85db95ce2c55c91bf4ae956ea39d22833d03a60d03050ea89dd3 vorbis-tools-1.1.1.ebuild 1274 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2.1 (GNU/Linux) + +iD8DBQFED2Uuwx9vvAARv2sRAgj8AJ46ovUYRlRVP4HJrzFVD0N9oqDC2wCfU/mp +Aac/q8F4gtB2/VajPf3Pxvw= +=BCTI +-----END PGP SIGNATURE----- diff --git a/media-sound/vorbis-tools/files/digest-vorbis-tools-1.1.1-r2 b/media-sound/vorbis-tools/files/digest-vorbis-tools-1.1.1-r2 new file mode 100644 index 000000000000..6e41b3b90627 --- /dev/null +++ b/media-sound/vorbis-tools/files/digest-vorbis-tools-1.1.1-r2 @@ -0,0 +1,3 @@ +MD5 47845fd76f5f2354a3619c4097575487 vorbis-tools-1.1.1.tar.gz 948837 +RMD160 ed38929b8a81f833f726e489e55e9f62d5ed69ec vorbis-tools-1.1.1.tar.gz 948837 +SHA256 617b4aa69e600c215b34fa3fd5764bc1d9d205d9d7d9fe7812bde7ec956fcaad vorbis-tools-1.1.1.tar.gz 948837 diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.1.1-utf8.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.1.1-utf8.patch new file mode 100644 index 000000000000..3dd19547606a --- /dev/null +++ b/media-sound/vorbis-tools/files/vorbis-tools-1.1.1-utf8.patch @@ -0,0 +1,42 @@ +diff -urN vorbis-tools-1.1.1.orig/share/charset.c vorbis-tools-1.1.1/share/charset.c +--- vorbis-tools-1.1.1.orig/share/charset.c 2005-06-03 06:15:10.000000000 -0400 ++++ vorbis-tools-1.1.1/share/charset.c 2006-03-08 08:49:56.000000000 -0500 +@@ -27,6 +27,10 @@ + * 8-bit char, 16-bit short and 32-bit int. + */ + ++#ifdef HAVE_CONFIG_H ++# include <config.h> ++#endif ++ + #ifndef HAVE_ICONV /* should be ifdef USE_CHARSET_CONVERT */ + + #include <stdlib.h> +diff -urN vorbis-tools-1.1.1.orig/share/iconvert.c vorbis-tools-1.1.1/share/iconvert.c +--- vorbis-tools-1.1.1.orig/share/iconvert.c 2005-06-03 06:15:10.000000000 -0400 ++++ vorbis-tools-1.1.1/share/iconvert.c 2006-03-08 08:49:56.000000000 -0500 +@@ -16,6 +16,10 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + ++#ifdef HAVE_CONFIG_H ++# include <config.h> ++#endif ++ + #ifdef HAVE_ICONV + + #include <assert.h> +diff -urN vorbis-tools-1.1.1.orig/share/utf8.c vorbis-tools-1.1.1/share/utf8.c +--- vorbis-tools-1.1.1.orig/share/utf8.c 2005-06-03 06:15:10.000000000 -0400 ++++ vorbis-tools-1.1.1/share/utf8.c 2006-03-08 08:49:56.000000000 -0500 +@@ -21,6 +21,10 @@ + * Convert a string between UTF-8 and the locale's charset. + */ + ++#ifdef HAVE_CONFIG_H ++# include <config.h> ++#endif ++ + #include <stdlib.h> + #include <string.h> + diff --git a/media-sound/vorbis-tools/vorbis-tools-1.1.1-r1.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.1.1-r2.ebuild index 0eca804971de..4dee3703edad 100644 --- a/media-sound/vorbis-tools/vorbis-tools-1.1.1-r1.ebuild +++ b/media-sound/vorbis-tools/vorbis-tools-1.1.1-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/vorbis-tools-1.1.1-r1.ebuild,v 1.3 2005/12/09 21:53:02 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/vorbis-tools-1.1.1-r2.ebuild,v 1.1 2006/03/08 22:13:02 nattfodd Exp $ IUSE="nls flac speex" @@ -31,6 +31,12 @@ pkg_setup() { fi } +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${P}-utf8.patch +} + src_compile() { use hppa && [ "`gcc-fullversion`" == "3.3.2" ] && replace-flags -march=2.0 -march=1.0 local myconf |