gcc-4 patch update

Package-Manager: portage-2.0.53_rc7

5 files changed, 149 insertions, 18 deletions

diff --git a/app-editors/nvu/ChangeLog b/app-editors/nvu/ChangeLog
index cb0ee04da279..f955f14a2efe 100644
--- a/app-editors/nvu/ChangeLog
+++ b/app-editors/nvu/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/nvu
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvu/ChangeLog,v 1.13 2005/11/17 19:16:30 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvu/ChangeLog,v 1.14 2005/11/18 03:03:27 anarchy Exp $
+
+*nvu-1.0-r2 (18 Nov 2005)
+
+  18 Nov 2005; <anarchy@gentoo.org> +files/1.0/nvu-1.0-gcc4-1.patch,
+  -nvu-1.0-r1.ebuild, +nvu-1.0-r2.ebuild:
+  gcc-4 patch update
 
   17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> nvu-1.0-r1.ebuild:
   Fix multilib-strict issue, bug 104431.
diff --git a/app-editors/nvu/Manifest b/app-editors/nvu/Manifest
index 284436d2cba3..b53b33307420 100644
--- a/app-editors/nvu/Manifest
+++ b/app-editors/nvu/Manifest
@@ -1,23 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 eb0f00098a6e1813829e7d89d85c7066 ChangeLog 4781
+MD5 5c373eba2329362112eb26c95503c130 ChangeLog 4943
 MD5 565f1133c57a789f0cf51c02510a6f9c files/1.0/mozconfig-1.0 1367
 MD5 841f7a0a89c5d8be3841444ce2dd0b85 files/1.0/nvu-0.50-dir.patch 713
 MD5 952edf776beb47f9ddeeed1eb3a9407f files/1.0/nvu-0.50-freetype-compile.patch 13641
 MD5 7880f1109c0f8a9df0830238e70b0d62 files/1.0/nvu-0.50-nvu.patch 674
+MD5 c4ea99043fc3f4591a6e11bb3028f04e files/1.0/nvu-1.0-gcc4-1.patch 6860
 MD5 c68ab50fa971f53df6ae113289920242 files/1.0/nvu-1.0-gcc4.patch 1924
 MD5 bde161b6920a9f919de3eb400506b6a7 files/1.0/nvu.desktop 182
 MD5 ffdec5b2a9933225ba5f03bafd9fcc2a files/digest-nvu-0.90-r2 71
-MD5 a05fdf2c14ab81e5c9e6827958cc4a2c files/digest-nvu-1.0-r1 70
+MD5 a05fdf2c14ab81e5c9e6827958cc4a2c files/digest-nvu-1.0-r2 70
 MD5 91bb5e61f505e2e53aa42345431c8fa7 files/mozconfig2 2160
 MD5 2f058933e09a68513c1ca3022b81a441 metadata.xml 433
 MD5 c3c4cbc233f87340d78fab34edbc469e nvu-0.90-r2.ebuild 2298
-MD5 f29d05cbc450c6b22ec68a629f700dcb nvu-1.0-r1.ebuild 2957
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDfNcd2G5bA0cA/ScRAkU6AJ49o2l34y4hBUzzIDn0ji23DgnHkgCdFfew
-AkjC1NvX/iLGrnC/NmkD+3A=
-=v3RC
------END PGP SIGNATURE-----
+MD5 aa01f12e0275c92402a7627f059f5866 nvu-1.0-r2.ebuild 2994
diff --git a/app-editors/nvu/files/1.0/nvu-1.0-gcc4-1.patch b/app-editors/nvu/files/1.0/nvu-1.0-gcc4-1.patch
new file mode 100644
index 000000000000..ff58d9b92ecb
--- /dev/null
+++ b/app-editors/nvu/files/1.0/nvu-1.0-gcc4-1.patch
@@ -0,0 +1,135 @@
+diff -ur mozilla-orig/security/nss/lib/pki1/oiddata.h mozilla/security/nss/lib/pki1/oiddata.h
+--- mozilla-orig/security/nss/lib/pki1/oiddata.h	2005-03-13 19:12:25.000000000 -0500
++++ mozilla/security/nss/lib/pki1/oiddata.h	2005-03-13 19:15:19.000000000 -0500
+@@ -43,12 +43,6 @@
+ #include "nsspki1t.h"
+ #endif /* NSSPKI1T_H */
+ 
+-extern const NSSOID nss_builtin_oids[];
+-extern const PRUint32 nss_builtin_oid_count;
+-
+-/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
+-/*extern const PRUint32 nss_attribute_type_alias_count;*/
+-
+ extern const NSSOID *NSS_OID_RFC1274_UID;
+ extern const NSSOID *NSS_OID_RFC1274_EMAIL;
+ extern const NSSOID *NSS_OID_RFC2247_DC;
+diff -ur mozilla-orig/security/nss/lib/pki1/oidgen.perl mozilla/security/nss/lib/pki1/oidgen.perl
+--- mozilla-orig/security/nss/lib/pki1/oidgen.perl	2005-03-13 19:12:25.000000000 -0500
++++ mozilla/security/nss/lib/pki1/oidgen.perl	2005-03-13 19:15:19.000000000 -0500
+@@ -233,12 +233,6 @@
+ #include "nsspki1t.h"
+ #endif /* NSSPKI1T_H */
+ 
+-extern const NSSOID nss_builtin_oids[];
+-extern const PRUint32 nss_builtin_oid_count;
+-
+-/*extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];*/
+-/*extern const PRUint32 nss_attribute_type_alias_count;*/
+-
+ EOD
+     ;
+ 
+diff -ur mozilla-orig/security/nss/lib/pki1/pki1.h mozilla/security/nss/lib/pki1/pki1.h
+--- mozilla-orig/security/nss/lib/pki1/pki1.h	2005-03-13 19:12:25.000000000 -0500
++++ mozilla/security/nss/lib/pki1/pki1.h	2005-03-13 19:15:19.000000000 -0500
+@@ -55,7 +55,9 @@
+ 
+ PR_BEGIN_EXTERN_C
+ 
+-/* fgmr 19990505 moved these here from oiddata.h */
++extern const NSSOID nss_builtin_oids[];
++extern const PRUint32 nss_builtin_oid_count;
++
+ extern const nssAttributeTypeAliasTable nss_attribute_type_aliases[];
+ extern const PRUint32 nss_attribute_type_alias_count;
+ 
+diff -ur mozilla-orig/xpcom/base/nscore.h mozilla/xpcom/base/nscore.h
+--- mozilla-orig/xpcom/base/nscore.h	2005-07-24 05:07:54.627311840 +0000
++++ mozilla/xpcom/base/nscore.h	2005-07-24 05:13:02.327534296 +0000
+@@ -365,8 +365,9 @@
+  * Use these macros to do 64bit safe pointer conversions.
+  */
+ 
+-#define NS_PTR_TO_INT32(x) ((char *)(x) - (char *)0)
+-#define NS_INT32_TO_PTR(x) ((void *)((char *)0 + (x)))
++#define NS_PTR_TO_INT32(x)  ((PRInt32)  (PRWord) (x))
++#define NS_PTR_TO_UINT32(x) ((PRUint32) (PRWord) (x))
++#define NS_INT32_TO_PTR(x)  ((void *)   (PRWord) (x))
+ 
+ /*
+  * These macros allow you to give a hint to the compiler about branch
+diff -ur mozilla-orig/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp
+--- mozilla-orig/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp	2005-07-24 05:07:51.199832896 +0000
++++ mozilla/netwerk/protocol/http/src/nsHttpConnectionMgr.cpp	2005-07-24 05:13:08.302625944 +0000
+@@ -834,8 +834,8 @@
+ void
+ nsHttpConnectionMgr::OnMsgUpdateParam(nsresult status, void *param)
+ {
+-    PRUint16 name  = (PRUint32(param) & 0xFFFF0000) >> 16;
+-    PRUint16 value =  PRUint32(param) & 0x0000FFFF;
++    PRUint16 name  = (NS_PTR_TO_UINT32(param) & 0xFFFF0000) >> 16;
++    PRUint16 value =  NS_PTR_TO_UINT32(param) & 0x0000FFFF;
+ 
+     switch (name) {
+     case MAX_CONNECTIONS:
+diff -ur mozilla-orig/widget/src/gtk2/nsDragService.cpp mozilla/widget/src/gtk2/nsDragService.cpp
+--- mozilla-orig/widget/src/gtk2/nsDragService.cpp	2005-07-24 05:08:57.666728392 +0000
++++ mozilla/widget/src/gtk2/nsDragService.cpp	2005-07-24 05:13:33.910732920 +0000
+@@ -838,7 +838,7 @@
+             (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+         listTarget->target = g_strdup(gMimeListType);
+         listTarget->flags = 0;
+-        listTarget->info = (guint)listAtom;
++        listTarget->info = GPOINTER_TO_UINT(listAtom);
+         PR_LOG(sDragLm, PR_LOG_DEBUG,
+                ("automatically adding target %s with id %ld\n",
+                listTarget->target, listAtom));
+@@ -877,7 +877,7 @@
+                              (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+                             listTarget->target = g_strdup(gTextUriListType);
+                             listTarget->flags = 0;
+-                            listTarget->info = (guint)listAtom;
++                            listTarget->info = GPOINTER_TO_UINT(listAtom);
+                             PR_LOG(sDragLm, PR_LOG_DEBUG,
+                                    ("automatically adding target %s with \
+                                    id %ld\n", listTarget->target, listAtom));
+@@ -914,7 +930,7 @@
+                           (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+                         target->target = g_strdup(flavorStr);
+                         target->flags = 0;
+-                        target->info = (guint)atom;
++                        target->info = GPOINTER_TO_UINT(atom);
+                         PR_LOG(sDragLm, PR_LOG_DEBUG,
+                                ("adding target %s with id %ld\n",
+                                target->target, atom));
+@@ -931,7 +947,7 @@
+                              (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+                             plainTarget->target = g_strdup(kTextMime);
+                             plainTarget->flags = 0;
+-                            plainTarget->info = (guint)plainAtom;
++                            plainTarget->info = GPOINTER_TO_UINT(plainAtom);
+                             PR_LOG(sDragLm, PR_LOG_DEBUG,
+                                    ("automatically adding target %s with \
+                                    id %ld\n", plainTarget->target, plainAtom));
+@@ -948,7 +964,7 @@
+                              (GtkTargetEntry *)g_malloc(sizeof(GtkTargetEntry));
+                             urlTarget->target = g_strdup(gMozUrlType);
+                             urlTarget->flags = 0;
+-                            urlTarget->info = (guint)urlAtom;
++                            urlTarget->info = GPOINTER_TO_UINT(urlAtom);
+                             PR_LOG(sDragLm, PR_LOG_DEBUG,
+                                    ("automatically adding target %s with \
+                                    id %ld\n", urlTarget->target, urlAtom));
+diff -urN mozilla-orig/gfx/src/freetype/nsFreeType.cpp mozilla/gfx/src/freetype/nsFreeType.cpp
+--- mozilla-orig/gfx/src/freetype/nsFreeType.cpp	2005-10-22 13:17:35.151589250 -0500
++++ mozilla/gfx/src/freetype/nsFreeType.cpp	2005-10-22 13:23:07.672370500 -0500
+@@ -96,7 +96,7 @@
+ // Define the FreeType2 functions we resolve at run time.
+ // see the comment near nsFreeType2::DoneFace() for more info
+ //
+-#define NS_FT2_OFFSET(f) (int)&((nsFreeType2*)0)->f
++#define NS_FT2_OFFSET(f) (NS_PTR_TO_INT32(&((nsFreeType2*)0)->f))
+ FtFuncList nsFreeType2::FtFuncs [] = {
+   {"FT_Done_Face",            NS_FT2_OFFSET(nsFT_Done_Face),            PR_TRUE},
+   {"FT_Done_FreeType",        NS_FT2_OFFSET(nsFT_Done_FreeType),        PR_TRUE},
diff --git a/app-editors/nvu/files/digest-nvu-1.0-r1 b/app-editors/nvu/files/digest-nvu-1.0-r2
index 0c332e743de9..0c332e743de9 100644
--- a/app-editors/nvu/files/digest-nvu-1.0-r1
+++ b/app-editors/nvu/files/digest-nvu-1.0-r2
diff --git a/app-editors/nvu/nvu-1.0-r1.ebuild b/app-editors/nvu/nvu-1.0-r2.ebuild
index fd62488380ea..914e756d40e6 100644
--- a/app-editors/nvu/nvu-1.0-r1.ebuild
+++ b/app-editors/nvu/nvu-1.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvu/nvu-1.0-r1.ebuild,v 1.3 2005/11/17 19:16:30 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvu/nvu-1.0-r2.ebuild,v 1.1 2005/11/18 03:03:27 anarchy Exp $
 
 inherit eutils mozconfig flag-o-matic multilib
 
@@ -25,7 +25,7 @@ src_unpack() {
 	# That can extend to future versions with much more ease. - Chris
 	epatch ${FILESDIR}/1.0/nvu-0.50-dir.patch || die "failed to apply dir. patch"
 	epatch ${FILESDIR}/1.0/nvu-0.50-freetype-compile.patch || die "failed to patch for freetype"
-	epatch ${FILESDIR}/1.0/${P}-gcc4.patch
+	epatch ${FILESDIR}/1.0/${P}-gcc4-1.patch || die "failed to apply gcc-4 patch"
 
 	# I had to manually edit the mozconfig.linux file as it
 	# has some quirks... just copy the darn thing over :) - Chris
@@ -38,8 +38,7 @@ src_unpack() {
 
 	# Set the lib directory
 	echo "ac_add_options --libdir=/usr/$(get_libdir)" >> .mozconfig
-	echo "ac_add_options --with-default-mozilla-five-home=/usr/$(get_libdir)/nvu" \
-		>> .mozconfig
+	echo "ac_add_options --with-default-mozilla-five-home=/usr/$(get_libdir)/nvu" >> .mozconfig
 
 	# copied from mozilla.eclass (modified slightly),
 	# otherwise it defaults to -O which crashes on startup for me - basic