summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Hill <rhill@gentoo.org>2008-05-04 23:16:18 +0000
committerRyan Hill <rhill@gentoo.org>2008-05-04 23:16:18 +0000
commit7a4093963e60318a0e418eb9a4d0a9d08b645812 (patch)
tree4106bf471c7c2efa4cf74ed882e938117c5fcf0d /app-cdr
parentVersion bump. Fixes bug #189443. Thanks to Mario Fetka <mario-fetka@gmx.at>. (diff)
downloadhistorical-7a4093963e60318a0e418eb9a4d0a9d08b645812.tar.gz
historical-7a4093963e60318a0e418eb9a4d0a9d08b645812.tar.bz2
historical-7a4093963e60318a0e418eb9a4d0a9d08b645812.zip
Update GCC 4.3 patch to fix FormatMp3.cc. Bug #213191.
Package-Manager: portage-2.2_pre5
Diffstat (limited to 'app-cdr')
-rw-r--r--app-cdr/cdrdao/ChangeLog6
-rw-r--r--app-cdr/cdrdao/Manifest10
-rw-r--r--app-cdr/cdrdao/files/cdrdao-1.2.2-gcc43.patch11
3 files changed, 21 insertions, 6 deletions
diff --git a/app-cdr/cdrdao/ChangeLog b/app-cdr/cdrdao/ChangeLog
index 569df1e22e6e..2161530d591d 100644
--- a/app-cdr/cdrdao/ChangeLog
+++ b/app-cdr/cdrdao/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-cdr/cdrdao
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.107 2008/04/20 23:54:20 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrdao/ChangeLog,v 1.108 2008/05/04 23:16:17 dirtyepic Exp $
+
+ 04 May 2008; Ryan Hill <dirtyepic@gentoo.org>
+ files/cdrdao-1.2.2-gcc43.patch:
+ Update GCC 4.3 patch to fix FormatMp3.cc. Bug #213191.
20 Apr 2008; Ryan Hill <dirtyepic@gentoo.org>
+files/cdrdao-1.2.2-gcc43.patch, cdrdao-1.2.2-r1.ebuild:
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
index ca3bb6a8ad72..c81cace8ea45 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -3,7 +3,7 @@ Hash: SHA1
AUX cdrdao-1.2.0-gcc4.patch 869 RMD160 4b8baf7677640ff035705eef04bc0df27e0c07eb SHA1 d70d532a6e958744f5b98efc8ba156e895c75f55 SHA256 2b87b7c9b971d2a253caa76ae89b061c35394aacd004e5c0199c1a16fd821215
AUX cdrdao-1.2.1-gcc41.patch 421 RMD160 374d62319984001921f03d89ab22c736f874190e SHA1 702ba18a2d62c4166af051364ef46a933d3dec7d SHA256 bb546f4a8060a188afb346af0f34894d03afc29d4874f3b561a17211ffd4dbd5
-AUX cdrdao-1.2.2-gcc43.patch 2040 RMD160 1adaa7803d280051f079fbe3556076aa4d1f7333 SHA1 9026dc7196c205a20dc9afeee88c2b5e5102a56f SHA256 365af59c6d7736f243b283a58f05411fe96d035aa1af3e62812e98b044c6648d
+AUX cdrdao-1.2.2-gcc43.patch 2450 RMD160 b59c8bdb0c4590cd21cefa4f2bdac059e1267122 SHA1 4dd068df0a6978e6dae8395dd07ba88b76455301 SHA256 695bc5da74689c6cc6269d73bc158835810b05b452fc55afd56e48627d596f16
AUX cdrdao-1.2.2-nonlinux.patch 380 RMD160 d58247e7faeb12b3bf416845f41aa9a77aa6d1ef SHA1 955a6e56e3264e773241d89ac0fd603ba5bcff31 SHA256 e15d0d3302272e958d8d5df705cd4146653aff2a55b5b582f04e70814cab7cd3
AUX cdrdao-1.2.2-use-new-sigc++-API.patch 481 RMD160 48f39ef4b6f9db81a00b6fbbe6b44c0f0cd49a5b SHA1 092bd7a492026d5dd47e9c2ff9e2b2acf3f8a3bc SHA256 3d0159dfa815c92f82d16407977fe875f005224d28ccc00238a73df2474bba63
AUX gcdmaster.desktop 127 RMD160 565c477fb1e8b937b97ce4767c2343741e22a425 SHA1 9d8b154482860ca49686e47f850c64b0628633b2 SHA256 2cd560f369ae9b40e4c63c099c851290809493df8d8be50deec592dcecb5005d
@@ -13,12 +13,12 @@ EBUILD cdrdao-1.2.1-r1.ebuild 1673 RMD160 d7c17430f7230b2f5e12af913c82ad9d1a48a3
EBUILD cdrdao-1.2.1.ebuild 1551 RMD160 267398a684c3acfd13a90ee5a676c3d6fcc060a2 SHA1 836385c495296769e1475eff142aa2240e53cce2 SHA256 8c908639ea692c83fad34671ee7d13355561290a86c4b09f0bde33a041423ef3
EBUILD cdrdao-1.2.2-r1.ebuild 1962 RMD160 223e5c82393b78ddcc1a5b9671ac80f099c5bd04 SHA1 026bfc4be97592abb3772b55f95e82324172ec2f SHA256 0cd9ddae5db6caa7af2eea6664b052fc51c7c33ab12d8a9c6c5b44568e21e341
EBUILD cdrdao-1.2.2.ebuild 1768 RMD160 c09f8368a94aad488b1a99d27b01618f720e0c9d SHA1 1781d9936192c1f6a15e8cda2e9c9e387e2c5978 SHA256 a2c5d0972a78a72746f84010b8035ad1317c82c3a674e3af5011e9114126bb86
-MISC ChangeLog 14533 RMD160 941a1a6f315e71314e28614e7bed5e85563080a1 SHA1 02ec5445f52812dd76b6c4423d22115f43263eef SHA256 fd140391b4716bb61f215e5d0dd2449aa8870f5aea6b670c2e7ec6c06038501e
+MISC ChangeLog 14673 RMD160 d53e01f4dd1755b51a848886e6c727ac50c18c73 SHA1 93776df4395e4e01fc16aa638de1fe1701227430 SHA256 d36bf181ff000eef4d2d02963b383fb437c63016ec710537bc8be13a148f85a6
MISC metadata.xml 319 RMD160 54559b717de30245b4e3369d398d0d4b8786cb94 SHA1 37ad6871b8179ee4180b374c9a4693253aa0bdc0 SHA256 449cdb691234e9d248959657370e866690fa998b7652124e8af2065447b042ea
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkgL15QACgkQiqiDRvmkBmJXDQCfe153pdBMAqcmlqevxFhR6BZb
-5gsAoJw7Fh0cWULPU9I9hDjNRK4ES1FM
-=qT6n
+iEYEARECAAYFAkgeQ7MACgkQiqiDRvmkBmJi3wCgsx1X1jsTb7H4XIYtxUvQjf/3
+oTsAoJe8RBZ3Aywh4C1SJvCtF7KKPjiA
+=m7bN
-----END PGP SIGNATURE-----
diff --git a/app-cdr/cdrdao/files/cdrdao-1.2.2-gcc43.patch b/app-cdr/cdrdao/files/cdrdao-1.2.2-gcc43.patch
index 9f626ae58385..f6707a965b9c 100644
--- a/app-cdr/cdrdao/files/cdrdao-1.2.2-gcc43.patch
+++ b/app-cdr/cdrdao/files/cdrdao-1.2.2-gcc43.patch
@@ -27,6 +27,17 @@ diff -Naurp cdrdao-1.2.2.orig/trackdb/FormatOgg.cc cdrdao-1.2.2/trackdb/FormatOg
#include "util.h"
#include "FormatOgg.h"
+diff -Naurp cdrdao-1.2.2.orig/trackdb/FormatMp3.cc cdrdao-1.2.2/trackdb/FormatMp3.cc
+--- cdrdao-1.2.2.orig/trackdb/FormatMp3.cc 2005-09-24 20:28:43.000000000 +0000
++++ cdrdao-1.2.2/trackdb/FormatMp3.cc 2008-03-07 11.14.07.000000000 +0000
+@@ -25,6 +25,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <fcntl.h>
++#include <cstring>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/mman.h>
diff -Naurp cdrdao-1.2.2.orig/trackdb/TempFileManager.cc cdrdao-1.2.2/trackdb/TempFileManager.cc
--- cdrdao-1.2.2.orig/trackdb/TempFileManager.cc 2005-04-22 02:01:46.000000000 +0000
+++ cdrdao-1.2.2/trackdb/TempFileManager.cc 2008-03-07 11:14:07.000000000 +0000