Fixed 402-oggzfbsd.patch (bug #336504).

Package-Manager: portage-2.2_rc78/cvs/Linux x86_64

4 files changed, 25 insertions, 5 deletions

diff --git a/www-client/icecat/ChangeLog b/www-client/icecat/ChangeLog
index 5cdfa8516ae9..8b79405f9319 100644
--- a/www-client/icecat/ChangeLog
+++ b/www-client/icecat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/icecat
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.39 2010/09/08 20:55:26 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/ChangeLog,v 1.40 2010/09/09 11:42:44 polynomial-c Exp $
+
+  09 Sep 2010; Lars Wendler <polynomial-c@gentoo.org>
+  +files/402-oggzfbsd.patch, icecat-3.6.9.ebuild:
+  Fixed 402-oggzfbsd.patch. Thanks to William Throwe who reported this issue
+  in bug #336504.
 
   08 Sep 2010; Lars Wendler <polynomial-c@gentoo.org> icecat-3.6.9.ebuild:
   Readded cups USE flag.
diff --git a/www-client/icecat/Manifest b/www-client/icecat/Manifest
index 8165e7c86b6a..1234bc7384fd 100644
--- a/www-client/icecat/Manifest
+++ b/www-client/icecat/Manifest
@@ -1,4 +1,5 @@
 AUX 137-bz460917_reload_new_plugins-gentoo-update-3.6.4.patch 2473 RMD160 cfbed88e1813f4880dabb18b6a9540cf3747f7f4 SHA1 5e0d98b3e3bf3ffb5f88eef30b1af095a6f0057d SHA256 be069b468eff7f06bb0fe160dea947c081cb00e1a8cbde2bd39c52ebf9aa2984
+AUX 402-oggzfbsd.patch 400 RMD160 cb7080ae62881007fb40025764e0d8fbdd19cad9 SHA1 1067e085526c75c462713c4f452988d62dba88d2 SHA256 96114e6c92cfcd6a9159709a9519d72810bdc572fa19691ec57f1b517da4cd1c
 AUX 801-enable-x86_64-tracemonkey.patch 501 RMD160 e8341671a9ab7f05cf58735a2b862ded55d82829 SHA1 d0c194c79993c3c47a8c46726d3f024e044766a0 SHA256 20f558efbf4ed1960b390c353c7eeb94108fcdb8aaf33f1fea6caf44468aeb7c
 AUX firefox-default-prefs.js 95 RMD160 805cdfec6fb31c224322cb71125547ad7a515f49 SHA1 7fab69d85b12a9f1b0c87fbb1821bdafd7485ac9 SHA256 8bc4cb870bc402db1f20b135a689f8c5dbfa5de8f1755b1926198d627c12c5f1
 AUX icon/icecat.desktop 245 RMD160 3cef06f5a0280d91ce56b3d1e29ac931c88b9cc2 SHA1 245a7edffd6d3a78f0d4f90269adbfa1076f467c SHA256 3797d3c1ceafe3951a8cd0c1c06520efabb4b38b6da1e6977b470a4b971ac909
@@ -151,6 +152,6 @@ DIST icecat-3.6.9-zh-TW.xpi 128870 RMD160 431187eadf614b238328860bcfcbfae1b0fde0
 DIST icecat-3.6.9.tar.bz2 48106577 RMD160 588be6a5b91f40fc96315afda79a0f3e1b867062 SHA1 037b4ed519ca462af956fd7e27643ae1234c06e6 SHA256 9be65001827a0ef9e5b4720a9fc2b83038d7ea44832102c37ba870de663f3d84
 DIST mozilla-firefox-3.6-patches-0.6.tar.bz2 5201 RMD160 d721f5b7070b978e61b27c1d138dd8f464cfa9a4 SHA1 00e9e6955fb405e462598e500f48b937d5085b41 SHA256 3ccc057da61bf6d174fe0e3fcb1f213c27813d78b09cc8526a86d95b043a5c64
 EBUILD icecat-3.6.8.ebuild 8640 RMD160 ef4534edefc591f16e28b2623f62cb8dfd15c124 SHA1 f99f6018d9a492256dd34628900dfe8623df24e0 SHA256 5c05b90148aaac29485fb5a7e797ca2f6044350b573dd18aff3fdaf1a671d40b
-EBUILD icecat-3.6.9.ebuild 8727 RMD160 00c03ce179dc33d8d7e919dac61ea4e1f005844d SHA1 90018e21403c25a74c542f7c3218d47edfbe699f SHA256 eb5b6e413eeeb927cce54f300f5c1d530fee93563adf1e448a77566307307116
-MISC ChangeLog 5702 RMD160 2e54976b0b7d31e65ab84be80c477ed427f26e36 SHA1 e56ad804e8197c7b7886c234ad9551006e612cca SHA256 6752f06099bb2457686aff8416ffdee72ce5d99c07d75b0a68ae816d0b6275cb
+EBUILD icecat-3.6.9.ebuild 8791 RMD160 48fd06c6070bc006487c74234f65903ec6fe033b SHA1 02eae66792775faf1beaaece472999727763fc9d SHA256 7f464c4990ed43516cca7a8f522398270b735e3c10e67f53a04afa7f0c6e5fe1
+MISC ChangeLog 5902 RMD160 2e454d0f543c44290bef2fd5fc374e389c3d8a7f SHA1 50e87f3017a4db9ecd66e263daa1bce4892d5595 SHA256 46e7fd2a9ef52d9f42a8a65776f7e905749958ed98b35187cbb03c45fdbb8f4b
 MISC metadata.xml 539 RMD160 1c03f865d6541dd4dcf565c5da2d9ff64675d8e5 SHA1 6007bf5a10fff04ae371bf625b855ddf9ab677bd SHA256 c7f2acb59cf5194b0c1d9215056765b908e2d71000ca3019bbf735be7d0c2f65
diff --git a/www-client/icecat/files/402-oggzfbsd.patch b/www-client/icecat/files/402-oggzfbsd.patch
new file mode 100644
index 000000000000..83d0db89e990
--- /dev/null
+++ b/www-client/icecat/files/402-oggzfbsd.patch
@@ -0,0 +1,11 @@
+--- a/media/liboggz/include/oggz/oggz_off_t_generated.h
++++ b/media/liboggz/include/oggz/oggz_off_t_generated.h
+@@ -59,7 +59,7 @@
+ 
+ #include <sys/types.h>
+ 
+-#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (_AIX)
++#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (_AIX) || defined(__FreeBSD__)
+ typedef off_t oggz_off_t;
+ #else
+ typedef loff_t oggz_off_t;
diff --git a/www-client/icecat/icecat-3.6.9.ebuild b/www-client/icecat/icecat-3.6.9.ebuild
index 5c98ec349495..93105babf021 100644
--- a/www-client/icecat/icecat-3.6.9.ebuild
+++ b/www-client/icecat/icecat-3.6.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-3.6.9.ebuild,v 1.2 2010/09/08 20:55:26 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/icecat/icecat-3.6.9.ebuild,v 1.3 2010/09/09 11:42:44 polynomial-c Exp $
 EAPI="2"
 WANT_AUTOCONF="2.1"
 
@@ -129,9 +129,12 @@ src_prepare() {
 	# Apply our patches
 	EPATCH_SUFFIX="patch" \
 	EPATCH_FORCE="yes" \
-	EPATCH_EXCLUDE="137-bz460917_att350845_reload_new_plugins-gentoo-update.patch" \
+	EPATCH_EXCLUDE="137-bz460917_att350845_reload_new_plugins-gentoo-update.patch
+			402-oggzfbsd.patch" \
 	epatch "${WORKDIR}"
 
+	epatch "${FILESDIR}"/402-oggzfbsd.patch
+
 	# The patch excluded above failed, ported patch is applied below
 	epatch "${FILESDIR}/137-bz460917_reload_new_plugins-gentoo-update-3.6.4.patch"