Fix compilation with GCC 4.7 with patch from Debian, bug #423021

Package-Manager: portage-2.2.0_alpha113/cvs/Linux x86_64

4 files changed, 345 insertions, 4 deletions

diff --git a/x11-misc/google-gadgets/ChangeLog b/x11-misc/google-gadgets/ChangeLog
index 176c322ec24c..bf512cc88955 100644
--- a/x11-misc/google-gadgets/ChangeLog
+++ b/x11-misc/google-gadgets/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/google-gadgets
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/ChangeLog,v 1.46 2012/05/05 04:53:45 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/ChangeLog,v 1.47 2012/06/27 09:48:43 voyageur Exp $
+
+  27 Jun 2012; Bernard Cafarelli <voyageur@gentoo.org>
+  google-gadgets-0.11.2.ebuild, +files/google-gadgets-0.11.2-gcc-4.7.patch:
+  Fix compilation with GCC 4.7 with patch from Debian, bug #423021
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> google-gadgets-0.11.2.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/x11-misc/google-gadgets/Manifest b/x11-misc/google-gadgets/Manifest
index 9ea51ebd55b0..f12f124382cb 100644
--- a/x11-misc/google-gadgets/Manifest
+++ b/x11-misc/google-gadgets/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX google-gadgets-0.11.2-gcc-4.7.patch 14151 RMD160 c0a0473c9127dd7fc8419b1a1f70fbda4b4eca51 SHA1 22c771d0335403c9b98e81459b9f5562904a62be SHA256 b5f2df31bb1bdad257adc83b1298d5cdac8ca0b0f1e179a6d724480903f86dab
 AUX google-gadgets-0.11.2-glib-2.31.patch 522 RMD160 656c543a03bdf874c82dc0588e02c175b6b6dc92 SHA1 628339aeec9c745cf80f4b28419b9b2ab3d6c925 SHA256 44f9cb40ef7eaee7f5ff456593f81605724b5a61d21dc03bad16945cdb7605ee
 DIST google-gadgets-for-linux-0.11.2.tar.bz2 2539750 RMD160 6497189e64793d2cab16058b4baeb42f3198b97b SHA1 22716f5ae640c7f201012d9d75868137c23ebc79 SHA256 2f129ae6c294876b3bc29bdf66c0f02e2c1000f97aadb3540d296560a14f343f
-EBUILD google-gadgets-0.11.2.ebuild 4374 RMD160 3610a783d10731d9001fa00e1e7bb8621392dacf SHA1 7e33555c996c7e0db29bb61259171b22a07271b5 SHA256 6ace2554f33ebc8082126fda35b8ab6b1213a962518a66f69bbcbd68e463fe33
-MISC ChangeLog 8981 RMD160 37bc81f3e4c36ea28d17c4b134c1fe8ef287dc14 SHA1 41752a12ee748db52be6c3423038409c90d68793 SHA256 a4df30cf4d912f1fe6036e8f274f5a8b406768941449ca771784bb4cb0a4bb8e
+EBUILD google-gadgets-0.11.2.ebuild 4417 RMD160 b550012ede159d8f11cff9d9f16d051bf6028f14 SHA1 13fd8ea8f68a4aa62041dc2c9163b09e81187a00 SHA256 dff9fa15c626187fbf8ef5f423c01ad5c0e44a2133a6a1654b6cf3ccfc350e2d
+MISC ChangeLog 9182 RMD160 9cdfeef1031df595980cf6657c6b9bbd11a99393 SHA1 e0f1991c86dbd4f29270ab54554e58f62ae5f0ab SHA256 682ec85f7de01d2b81f8634d12fcf450a599416d0c757a8e04d5fdf512a9797c
 MISC metadata.xml 464 RMD160 1c08fe6baa5fc02e03021ba76b2ac2bfbba0f735 SHA1 a1972f67e17c9449bbd43e3664da04cab8fdf21d SHA256 0743b51beb0949fc2f82bebe1a74f71c4c825214c90e10bf9ba6633e7f0658d6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAk/q1wsACgkQFYEBGcdFJfJ5LwEAg6SYZQiJMzSmGoTQ4C0EDx+q
+gZLAqsre3vHgzw7ED34A/3TcmfLDKKdeQBtR3jvm5r1V9y6GkNzY4LyOo1pwnUq+
+=zeGU
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/google-gadgets/files/google-gadgets-0.11.2-gcc-4.7.patch b/x11-misc/google-gadgets/files/google-gadgets-0.11.2-gcc-4.7.patch
new file mode 100644
index 000000000000..2e77e10fd552
--- /dev/null
+++ b/x11-misc/google-gadgets/files/google-gadgets-0.11.2-gcc-4.7.patch
@@ -0,0 +1,325 @@
+Author: Pino Toscano <pino@debian.org>
+Description: Fix building with GCC 4.7
+ This patch fixes the two kinds of issues that arise with GCC 4.7:
+ - include <unistd.h> for functions like access(), fork(), readlink(), etc
+ - fix argument-dependent lookup issues by qualifying the lookup of functions
+Forwarded: no
+Last-Update: 2012-04-04
+
+--- a/ggadget/scriptable_enumerator.h
++++ b/ggadget/scriptable_enumerator.h
+@@ -68,22 +68,22 @@
+ 
+  protected:
+   virtual void DoClassRegister() {
+-    RegisterMethod("atEnd",
++    this->RegisterMethod("atEnd",
+                    NewSlot(&E::AtEnd,
+                            &ScriptableEnumerator<E, Wrapper, Param, ClassId>
+                                ::enumerator_));
+-    RegisterMethod("moveFirst",
++    this->RegisterMethod("moveFirst",
+                    NewSlot(&E::MoveFirst,
+                            &ScriptableEnumerator<E, Wrapper, Param, ClassId>
+                                ::enumerator_));
+-    RegisterMethod("moveNext",
++    this->RegisterMethod("moveNext",
+                    NewSlot(&E::MoveNext,
+                            &ScriptableEnumerator<E, Wrapper, Param, ClassId>
+                                ::enumerator_));
+-    RegisterMethod("item",
++    this->RegisterMethod("item",
+                    NewSlot(&ScriptableEnumerator<E, Wrapper, Param, ClassId>
+                                ::GetItem));
+-    RegisterProperty("count",
++    this->RegisterProperty("count",
+                      NewSlot(&E::GetCount,
+                              &ScriptableEnumerator<E, Wrapper, Param, ClassId>
+                                  ::enumerator_),
+--- a/ggadget/uuid.cc
++++ b/ggadget/uuid.cc
+@@ -24,6 +24,7 @@
+ #include <cstdlib>
+ #include <cstring>
+ #include <ctime>
++#include <unistd.h>
+ 
+ #include "string_utils.h"
+ 
+--- a/ggadget/xml_dom.cc
++++ b/ggadget/xml_dom.cc
+@@ -1327,15 +1327,15 @@
+ 
+   virtual void DoClassRegister() {
+     Super::DoClassRegister();
+-    RegisterProperty("data", NewSlot(&DOMCharacterData::GetData),
++    this->RegisterProperty("data", NewSlot(&DOMCharacterData::GetData),
+                      NewSlot(&DOMCharacterData::SetData));
+-    RegisterProperty("length", NewSlot(&DOMCharacterData::GetLength), NULL);
+-    RegisterMethod("substringData",
++    this->RegisterProperty("length", NewSlot(&DOMCharacterData::GetLength), NULL);
++    this->RegisterMethod("substringData",
+                    NewSlot(&DOMCharacterData::ScriptSubstringData));
+-    RegisterMethod("appendData", NewSlot(&DOMCharacterData::AppendData));
+-    RegisterMethod("insertData", NewSlot(&DOMCharacterData::ScriptInsertData));
+-    RegisterMethod("deleteData", NewSlot(&DOMCharacterData::ScriptDeleteData));
+-    RegisterMethod("replaceData",
++    this->RegisterMethod("appendData", NewSlot(&DOMCharacterData::AppendData));
++    this->RegisterMethod("insertData", NewSlot(&DOMCharacterData::ScriptInsertData));
++    this->RegisterMethod("deleteData", NewSlot(&DOMCharacterData::ScriptDeleteData));
++    this->RegisterMethod("replaceData",
+                    NewSlot(&DOMCharacterData::ScriptReplaceData));
+   }
+ 
+@@ -1377,20 +1377,20 @@
+  private:
+   UTF16String ScriptSubstringData(size_t offset, size_t count) {
+     UTF16String result;
+-    CheckException(SubstringData(offset, count, &result));
++    this->CheckException(SubstringData(offset, count, &result));
+     return result;
+   }
+ 
+   void ScriptInsertData(size_t offset, const UTF16String &arg) {
+-    CheckException(InsertData(offset, arg));
++    this->CheckException(InsertData(offset, arg));
+   }
+ 
+   void ScriptDeleteData(size_t offset, size_t count) {
+-    CheckException(DeleteData(offset, count));
++    this->CheckException(DeleteData(offset, count));
+   }
+ 
+   void ScriptReplaceData(size_t offset, size_t count, const UTF16String &arg) {
+-    CheckException(ReplaceData(offset, count, arg));
++    this->CheckException(ReplaceData(offset, count, arg));
+   }
+ 
+   DOMCharacterDataImpl impl_;
+@@ -1417,10 +1417,10 @@
+ 
+   virtual void DoClassRegister() {
+     Super::DoClassRegister();
+-    RegisterProperty("name", NewSlot(&DOMAttr::GetName), NULL);
++    this->RegisterProperty("name", NewSlot(&DOMAttr::GetName), NULL);
+     // Our DOMAttrs are always specified, because we don't support DTD for now.
+-    RegisterConstant("specified", true);
+-    RegisterProperty("value", NewSlot(&DOMAttr::GetValue),
++    this->RegisterConstant("specified", true);
++    this->RegisterProperty("value", NewSlot(&DOMAttr::GetValue),
+                      NewSlot(&DOMAttr::SetValue));
+     // ownerElement is a DOM2 property, so not registered for now.
+   }
+@@ -1516,19 +1516,19 @@
+ 
+   virtual void DoClassRegister() {
+     Super::DoClassRegister();
+-    RegisterProperty("tagName", NewSlot(&DOMElement::GetTagName), NULL);
+-    RegisterMethod("getAttribute", NewSlot(&DOMElement::GetAttribute));
+-    RegisterMethod("setAttribute",
++    this->RegisterProperty("tagName", NewSlot(&DOMElement::GetTagName), NULL);
++    this->RegisterMethod("getAttribute", NewSlot(&DOMElement::GetAttribute));
++    this->RegisterMethod("setAttribute",
+                    NewSlot(&DOMElement::ScriptSetAttribute));
+-    RegisterMethod("removeAttribute",
++    this->RegisterMethod("removeAttribute",
+                    NewSlot(&DOMElement::RemoveAttribute));
+-    RegisterMethod("getAttributeNode",
++    this->RegisterMethod("getAttributeNode",
+                    NewSlot(&DOMElement::GetAttributeNodeNotConst));
+-    RegisterMethod("setAttributeNode",
++    this->RegisterMethod("setAttributeNode",
+                    NewSlot(&DOMElement::ScriptSetAttributeNode));
+-    RegisterMethod("removeAttributeNode",
++    this->RegisterMethod("removeAttributeNode",
+                    NewSlot(&DOMElement::ScriptRemoveAttributeNode));
+-    RegisterMethod("getElementsByTagName",
++    this->RegisterMethod("getElementsByTagName",
+                    NewSlot(&Super::GetElementsByTagNameNotConst));
+   }
+ 
+@@ -1696,16 +1696,16 @@
+     }
+ 
+     virtual void DoClassRegister() {
+-      RegisterProperty("length", NewSlot(&AttrsNamedMap::GetLength), NULL);
+-      RegisterMethod("getNamedItem",
++      this->RegisterProperty("length", NewSlot(&AttrsNamedMap::GetLength), NULL);
++      this->RegisterMethod("getNamedItem",
+                      NewSlot(&AttrsNamedMap::GetNamedItemNotConst));
+-      RegisterMethod("setNamedItem",
++      this->RegisterMethod("setNamedItem",
+                      NewSlot(&AttrsNamedMap::ScriptSetNamedItem));
+-      RegisterMethod("removeNamedItem",
++      this->RegisterMethod("removeNamedItem",
+                      NewSlot(&AttrsNamedMap::ScriptRemoveNamedItem));
+-      RegisterMethod("item", NewSlot(&AttrsNamedMap::GetItemNotConst));
++      this->RegisterMethod("item", NewSlot(&AttrsNamedMap::GetItemNotConst));
+       // Microsoft compatibility.
+-      RegisterMethod("", NewSlot(&AttrsNamedMap::GetItemNotConst));
++      this->RegisterMethod("", NewSlot(&AttrsNamedMap::GetItemNotConst));
+     }
+ 
+     virtual DOMNodeInterface *GetNamedItem(const std::string &name) {
+@@ -1875,7 +1875,7 @@
+ 
+   virtual void DoClassRegister() {
+     Super::DoClassRegister();
+-    RegisterMethod("splitText", NewSlot(&DOMText::ScriptSplitText));
++    this->RegisterMethod("splitText", NewSlot(&DOMText::ScriptSplitText));
+   }
+ 
+   virtual NodeType GetNodeType() const { return TEXT_NODE; }
+@@ -2060,9 +2060,9 @@
+ 
+   virtual void DoClassRegister() {
+     Super::DoClassRegister();
+-    RegisterProperty("target",
++    this->RegisterProperty("target",
+                      NewSlot(&DOMProcessingInstruction::GetTarget), NULL);
+-    RegisterProperty("data", NewSlot(&DOMProcessingInstruction::GetData),
++    this->RegisterProperty("data", NewSlot(&DOMProcessingInstruction::GetData),
+                      NewSlot(&DOMProcessingInstruction::SetData));
+   }
+ 
+@@ -2109,7 +2109,7 @@
+   DEFINE_CLASS_ID(0xd23149a89cf24e12, DOMImplementationInterface);
+ 
+   virtual void DoClassRegister() {
+-    RegisterMethod("hasFeature", NewSlot(&DOMImplementation::HasFeature));
++    this->RegisterMethod("hasFeature", NewSlot(&DOMImplementation::HasFeature));
+   }
+ 
+   virtual bool HasFeature(const char *feature, const char *version) const {
+@@ -2129,13 +2129,13 @@
+   void SetCode(int code) { code_ = code; }
+ 
+   virtual void DoClassRegister() {
+-    RegisterProperty("errorCode", NewSlot(&ParseError::GetCode), NULL);
+-    RegisterConstant("filepos", 0);
+-    RegisterConstant("line", 0);
+-    RegisterConstant("linepos", 0);
+-    RegisterConstant("reason", "");
+-    RegisterConstant("srcText", "");
+-    RegisterConstant("url", "");
++    this->RegisterProperty("errorCode", NewSlot(&ParseError::GetCode), NULL);
++    this->RegisterConstant("filepos", 0);
++    this->RegisterConstant("line", 0);
++    this->RegisterConstant("linepos", 0);
++    this->RegisterConstant("reason", "");
++    this->RegisterConstant("srcText", "");
++    this->RegisterConstant("url", "");
+   }
+ 
+  private:
+@@ -2180,45 +2180,45 @@
+ 
+   virtual void DoClassRegister() {
+     Super::DoClassRegister();
+-    RegisterConstant("doctype", static_cast<ScriptableInterface *>(NULL));
+-    RegisterConstant("implementation", &dom_implementation_);
+-    RegisterProperty("documentElement",
++    this->RegisterConstant("doctype", static_cast<ScriptableInterface *>(NULL));
++    this->RegisterConstant("implementation", &dom_implementation_);
++    this->RegisterProperty("documentElement",
+                      NewSlot(&DOMDocument::GetDocumentElementNotConst), NULL);
+-    RegisterMethod("loadXML", NewSlot(&DOMDocument::LoadXML));
+-    RegisterMethod("createElement",
++    this->RegisterMethod("loadXML", NewSlot(&DOMDocument::LoadXML));
++    this->RegisterMethod("createElement",
+                    NewSlot(&DOMDocument::ScriptCreateElement));
+-    RegisterMethod("createDocumentFragment",
++    this->RegisterMethod("createDocumentFragment",
+                    NewSlot(&DOMDocument::CreateDocumentFragment));
+-    RegisterMethod("createTextNode",
++    this->RegisterMethod("createTextNode",
+                    NewSlot(&DOMDocument::CreateTextNode));
+-    RegisterMethod("createComment", NewSlot(&DOMDocument::CreateComment));
+-    RegisterMethod("createCDATASection",
++    this->RegisterMethod("createComment", NewSlot(&DOMDocument::CreateComment));
++    this->RegisterMethod("createCDATASection",
+                    NewSlot(&DOMDocument::CreateCDATASection));
+-    RegisterMethod("createProcessingInstruction",
++    this->RegisterMethod("createProcessingInstruction",
+                    NewSlot(&DOMDocument::ScriptCreateProcessingInstruction));
+-    RegisterMethod("createAttribute",
++    this->RegisterMethod("createAttribute",
+                    NewSlot(&DOMDocument::ScriptCreateAttribute));
+-    RegisterMethod("createEntityReference",
++    this->RegisterMethod("createEntityReference",
+                    NewSlot(&DOMDocument::ScriptCreateEntityReference));
+-    RegisterMethod("getElementsByTagName",
++    this->RegisterMethod("getElementsByTagName",
+                    NewSlot(&Super::GetElementsByTagNameNotConst));
+-    RegisterMethod("importNode", NewSlot(&DOMDocument::ScriptImportNode));
++    this->RegisterMethod("importNode", NewSlot(&DOMDocument::ScriptImportNode));
+     // Compatibility with Microsoft DOM.
+-    RegisterProperty("parsed", NewFixedGetterSlot(true), NULL);
+-    RegisterProperty("parseError", NewSlot(&DOMDocument::GetParseError), NULL);
+-    RegisterProperty("resolveExternals", NULL, NewSlot(&DummySetter));
+-    RegisterProperty("validateOnParse", NULL, NewSlot(&DummySetter));
+-    RegisterProperty("preserveWhiteSpace",
++    this->RegisterProperty("parsed", NewFixedGetterSlot(true), NULL);
++    this->RegisterProperty("parseError", NewSlot(&DOMDocument::GetParseError), NULL);
++    this->RegisterProperty("resolveExternals", NULL, NewSlot(&DummySetter));
++    this->RegisterProperty("validateOnParse", NULL, NewSlot(&DummySetter));
++    this->RegisterProperty("preserveWhiteSpace",
+                      NewSlot(&DOMDocument::PreservesWhiteSpace),
+                      NewSlot(&DOMDocument::SetPreserveWhiteSpace));
+-    RegisterMethod("getProperty", NewSlot(DummyGetProperty));
+-    RegisterMethod("setProperty", NewSlot(DummySetProperty));
++    this->RegisterMethod("getProperty", NewSlot(DummyGetProperty));
++    this->RegisterMethod("setProperty", NewSlot(DummySetProperty));
+     // Compatibility with Microsoft DOM: XMLHttpRequest functions.
+-    RegisterProperty("async", NewSlot(&DOMDocument::IsAsync),
++    this->RegisterProperty("async", NewSlot(&DOMDocument::IsAsync),
+                      NewSlot(&DOMDocument::SetAsync));
+-    RegisterProperty("readyState", NewSlot(&DOMDocument::GetReadyState), NULL);
+-    RegisterMethod("load", NewSlot(&DOMDocument::Load));
+-    RegisterClassSignal("onreadystatechange",
++    this->RegisterProperty("readyState", NewSlot(&DOMDocument::GetReadyState), NULL);
++    this->RegisterMethod("load", NewSlot(&DOMDocument::Load));
++    this->RegisterClassSignal("onreadystatechange",
+                         &DOMDocument::onreadystatechange_signal_);
+   }
+ 
+--- a/ggadget/xdg/icon_theme.cc
++++ b/ggadget/xdg/icon_theme.cc
+@@ -16,6 +16,7 @@
+ #include <sys/time.h>
+ #include <time.h>
+ #include <cstdlib>
++#include <unistd.h>
+ 
+ #include <map>
+ #include <vector>
+--- a/extensions/qt_system_framework/qt_system_framework.cc
++++ b/extensions/qt_system_framework/qt_system_framework.cc
+@@ -32,6 +32,7 @@
+ #include <ggadget/xdg/desktop_entry.h>
+ #include <ggadget/xdg/icon_theme.h>
+ #include <ggadget/xdg/utilities.h>
++#include <unistd.h>
+ 
+ #define Initialize qt_system_framework_LTX_Initialize
+ #define Finalize qt_system_framework_LTX_Finalize
+--- a/extensions/linux_system_framework/process.cc
++++ b/extensions/linux_system_framework/process.cc
+@@ -17,6 +17,7 @@
+ #include <sys/types.h>
+ #include <dirent.h>
+ #include <cstdlib>
++#include <unistd.h>
+ 
+ #ifdef HAVE_X11
+ #include <X11/Xlib.h>
+--- a/gadgets/designer/designer_script_utils.cc
++++ b/gadgets/designer/designer_script_utils.cc
+@@ -39,6 +39,7 @@
+ #include <ggadget/system_utils.h>
+ #include <ggadget/uuid.h>
+ #include <ggadget/view_interface.h>
++#include <unistd.h>
+ 
+ namespace ggadget {
+ namespace designer {
diff --git a/x11-misc/google-gadgets/google-gadgets-0.11.2.ebuild b/x11-misc/google-gadgets/google-gadgets-0.11.2.ebuild
index 2a8e43102026..e9e39c538f70 100644
--- a/x11-misc/google-gadgets/google-gadgets-0.11.2.ebuild
+++ b/x11-misc/google-gadgets/google-gadgets-0.11.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/google-gadgets-0.11.2.ebuild,v 1.16 2012/05/05 04:53:45 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/google-gadgets-0.11.2.ebuild,v 1.17 2012/06/27 09:48:43 voyageur Exp $
 
 EAPI=4
 inherit autotools eutils fdo-mime multilib
@@ -82,6 +82,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-glib-2.31.patch
+	epatch "${FILESDIR}"/${P}-gcc-4.7.patch
 
 	sed -i -r \
 		-e '/^GGL_SYSDEPS_INCLUDE_DIR/ c\GGL_SYSDEPS_INCLUDE_DIR=$GGL_INCLUDE_DIR' \