Gentoo Archives: gentoo-commits

From: "Christoph Mende (angelos)" <angelos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-misc/granule/files: granule-1.4.0-fix-template-with-permissive.patch
Date: Sat, 22 Mar 2014 19:34:02
Message-Id: 20140322193359.E299A2004F@flycatcher.gentoo.org
1 angelos 14/03/22 19:33:59
2
3 Added: granule-1.4.0-fix-template-with-permissive.patch
4 Log:
5 Import patch from debian to fix compilation with gcc4.8
6
7 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 84F20B43)
8
9 Revision Changes Path
10 1.1 app-misc/granule/files/granule-1.4.0-fix-template-with-permissive.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/granule/files/granule-1.4.0-fix-template-with-permissive.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/granule/files/granule-1.4.0-fix-template-with-permissive.patch?rev=1.1&content-type=text/plain
14
15 Index: granule-1.4.0-fix-template-with-permissive.patch
16 ===================================================================
17 Description: Fix build with gcc4.8 and -fpermissive
18 Bug-Debian: http://bugs.debian.org/701292
19 Last-Update: 2013-08-11
20
21 --- granule-1.4.0-7.orig/src/Granule.cpp
22 +++ granule-1.4.0-7/src/Granule.cpp
23 @@ -56,7 +56,7 @@ ASSA_DECL_SINGLETON(Granule);
24
25 static const int TIMEOUT = 2000; // 2 seconds (1,000 mls = 1 sec).
26
27 -template <> xmlExternalEntityLoader Granule::m_default_entity_loader = 0;
28 +xmlExternalEntityLoader Granule::m_default_entity_loader = 0;
29
30 /*******************************************************************************
31 Member Functions