gcc 4.4 updated with glibc 2.10 support, limit xulrunner support in -r1 to 1.9.1, revision bump that drops the mozilla plugin, bug #308825

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

2 files changed, 71 insertions, 31 deletions

diff --git a/media-gfx/freepv/files/freepv-0.3.0-gcc44.patch b/media-gfx/freepv/files/freepv-0.3.0-gcc44.patch
index 60d55f8b002c..af5b1a0d196e 100644
--- a/media-gfx/freepv/files/freepv-0.3.0-gcc44.patch
+++ b/media-gfx/freepv/files/freepv-0.3.0-gcc44.patch
@@ -1,19 +1,19 @@
-Index: freepv/trunk/src/libfreepv/Utils/signatures.cpp
-===================================================================
---- freepv/trunk/src/libfreepv/Utils/signatures.cpp	(révision 162)
-+++ freepv/trunk/src/libfreepv/Utils/signatures.cpp	(révision 163)
-@@ -24,6 +24,7 @@
+diff -Naur freepv-0.3.0.orig/src/libfreepv/OpenGLRenderer.cpp freepv-0.3.0/src/libfreepv/OpenGLRenderer.cpp
+--- freepv-0.3.0.orig/src/libfreepv/OpenGLRenderer.cpp	2010-03-11 16:15:04.000000000 +0100
++++ freepv-0.3.0/src/libfreepv/OpenGLRenderer.cpp	2010-03-11 16:25:15.000000000 +0100
+@@ -26,7 +26,8 @@
+ #include <config.h>
  
- #include "signatures.h"
- #include <iostream>
+ #include <vector>
+-#include <math.h>
++#include <cmath>
 +#include <cstdio>
  
- namespace FPV{
- namespace Utils{
-Index: freepv/trunk/src/libfreepv/QTVRDecoder.cpp
-===================================================================
---- freepv/trunk/src/libfreepv/QTVRDecoder.cpp	(révision 162)
-+++ freepv/trunk/src/libfreepv/QTVRDecoder.cpp	(révision 163)
+ #include "OpenGLRenderer.h"
+ #include "Scene.h"
+diff -Naur freepv-0.3.0.orig/src/libfreepv/QTVRDecoder.cpp freepv-0.3.0/src/libfreepv/QTVRDecoder.cpp
+--- freepv-0.3.0.orig/src/libfreepv/QTVRDecoder.cpp	2010-03-11 16:15:04.000000000 +0100
++++ freepv-0.3.0/src/libfreepv/QTVRDecoder.cpp	2010-03-11 16:25:15.000000000 +0100
 @@ -42,6 +42,7 @@
  #include <errno.h>
  #include <vector>
@@ -22,10 +22,34 @@ Index: freepv/trunk/src/libfreepv/QTVRDecoder.cpp
  
  #include <zlib.h>
  
-Index: freepv/trunk/src/libfreepv/utils.cpp
-===================================================================
---- freepv/trunk/src/libfreepv/utils.cpp	(révision 162)
-+++ freepv/trunk/src/libfreepv/utils.cpp	(révision 163)
+diff -Naur freepv-0.3.0.orig/src/libfreepv/SPiVparser.cpp freepv-0.3.0/src/libfreepv/SPiVparser.cpp
+--- freepv-0.3.0.orig/src/libfreepv/SPiVparser.cpp	2010-03-11 16:15:04.000000000 +0100
++++ freepv-0.3.0/src/libfreepv/SPiVparser.cpp	2010-03-11 16:18:53.000000000 +0100
+@@ -488,8 +488,8 @@
+ //This method remplace the nodes that has src attributes
+ void SPiVparser::parseNodeURL(const char* _url)
+ {
+-    char * aux_url=NULL;
+-    char * url=(char*) _url;
++    const char * aux_url=NULL;
++    const char * url=(char*) _url;
+     if(aux_url = strrchr (_url,'/'))
+     {
+        url=aux_url;
+diff -Naur freepv-0.3.0.orig/src/libfreepv/Utils/signatures.cpp freepv-0.3.0/src/libfreepv/Utils/signatures.cpp
+--- freepv-0.3.0.orig/src/libfreepv/Utils/signatures.cpp	2010-03-11 16:15:04.000000000 +0100
++++ freepv-0.3.0/src/libfreepv/Utils/signatures.cpp	2010-03-11 16:25:15.000000000 +0100
+@@ -24,6 +24,7 @@
+ 
+ #include "signatures.h"
+ #include <iostream>
++#include <cstdio>
+ 
+ namespace FPV{
+ namespace Utils{
+diff -Naur freepv-0.3.0.orig/src/libfreepv/utils.cpp freepv-0.3.0/src/libfreepv/utils.cpp
+--- freepv-0.3.0.orig/src/libfreepv/utils.cpp	2010-03-11 16:15:04.000000000 +0100
++++ freepv-0.3.0/src/libfreepv/utils.cpp	2010-03-11 16:25:15.000000000 +0100
 @@ -23,6 +23,7 @@
   */
  
@@ -34,17 +58,3 @@ Index: freepv/trunk/src/libfreepv/utils.cpp
  
  #include "utils.h"
  
-Index: freepv/trunk/src/libfreepv/OpenGLRenderer.cpp
-===================================================================
---- freepv/trunk/src/libfreepv/OpenGLRenderer.cpp	(révision 162)
-+++ freepv/trunk/src/libfreepv/OpenGLRenderer.cpp	(révision 163)
-@@ -26,7 +26,8 @@
- #include <config.h>
- 
- #include <vector>
--#include <math.h>
-+#include <cmath>
-+#include <cstdio>
- 
- #include "OpenGLRenderer.h"
- #include "Scene.h"
diff --git a/media-gfx/freepv/files/freepv-0.3.0-noplugin.patch b/media-gfx/freepv/files/freepv-0.3.0-noplugin.patch
new file mode 100644
index 000000000000..4ea51d50b0cc
--- /dev/null
+++ b/media-gfx/freepv/files/freepv-0.3.0-noplugin.patch
@@ -0,0 +1,30 @@
+diff -Naur freepv-0.3.0.orig//CMakeLists.txt freepv-0.3.0/CMakeLists.txt
+--- freepv-0.3.0.orig//CMakeLists.txt	2010-03-11 16:05:09.000000000 +0100
++++ freepv-0.3.0/CMakeLists.txt	2010-03-11 16:05:18.000000000 +0100
+@@ -89,7 +89,6 @@
+ find_package(FREEGLUT REQUIRED)
+ find_package(OpenGL REQUIRED)
+ find_package(X11 REQUIRED)
+-find_package(GECKO REQUIRED)
+ find_package(LibXml2 REQUIRED)
+ find_package(PNG REQUIRED)
+ find_package(XF86VM REQUIRED)
+@@ -107,7 +106,6 @@
+                     ${OPENGL_INCLUDE_DIR}
+                     ${FREEGLUT_INCLUDE_DIR}
+ 		    ${X11_INCLUDE_DIR}
+-	            ${GECKO_INCLUDE_DIR}
+ 		    ${LIBXML2_INCLUDE_DIR}
+ 		    ${PNG_INCLUDE_DIR}
+ 		    ${XF86VM_INCLUDE_DIR})
+diff -Naur freepv-0.3.0.orig//src/CMakeLists.txt freepv-0.3.0/src/CMakeLists.txt
+--- freepv-0.3.0.orig//src/CMakeLists.txt	2010-03-11 16:05:09.000000000 +0100
++++ freepv-0.3.0/src/CMakeLists.txt	2010-03-11 16:05:28.000000000 +0100
+@@ -5,7 +5,6 @@
+ add_subdirectory (freepv-glut)
+ add_subdirectory (utils)
+ if(UNIX)
+-	add_subdirectory (freepv-mozilla)
+ 	add_subdirectory (freepv-glx)
+ endif(UNIX)
+