summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2014-09-07 12:41:18 +0000
committerPacho Ramos <pacho@gentoo.org>2014-09-07 12:41:18 +0000
commite25ffc0db0865faea2bcd505dff03801b605ae4e (patch)
tree08e011b44732074383da303f869510a4e053f3b2 /dev-libs/libsigc++
parentRestrict libebook dependency. (diff)
downloadgentoo-2-e25ffc0db0865faea2bcd505dff03801b605ae4e.tar.gz
gentoo-2-e25ffc0db0865faea2bcd505dff03801b605ae4e.tar.bz2
gentoo-2-e25ffc0db0865faea2bcd505dff03801b605ae4e.zip
Add missing include (#522166 by Juergen Rose and Franz Fellner)
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'dev-libs/libsigc++')
-rw-r--r--dev-libs/libsigc++/ChangeLog9
-rw-r--r--dev-libs/libsigc++/files/libsigc++-2.3.2-missing-include.patch24
-rw-r--r--dev-libs/libsigc++/libsigc++-2.3.2-r1.ebuild (renamed from dev-libs/libsigc++/libsigc++-2.3.2.ebuild)7
3 files changed, 37 insertions, 3 deletions
diff --git a/dev-libs/libsigc++/ChangeLog b/dev-libs/libsigc++/ChangeLog
index b7953525e449..600e24ebfd72 100644
--- a/dev-libs/libsigc++/ChangeLog
+++ b/dev-libs/libsigc++/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-libs/libsigc++
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/ChangeLog,v 1.192 2014/09/04 10:20:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/ChangeLog,v 1.193 2014/09/07 12:41:18 pacho Exp $
+
+*libsigc++-2.3.2-r1 (07 Sep 2014)
+
+ 07 Sep 2014; Pacho Ramos <pacho@gentoo.org>
+ +files/libsigc++-2.3.2-missing-include.patch, +libsigc++-2.3.2-r1.ebuild,
+ -libsigc++-2.3.2.ebuild:
+ Add missing include (#522166 by Juergen Rose and Franz Fellner)
*libsigc++-2.3.2 (04 Sep 2014)
diff --git a/dev-libs/libsigc++/files/libsigc++-2.3.2-missing-include.patch b/dev-libs/libsigc++/files/libsigc++-2.3.2-missing-include.patch
new file mode 100644
index 000000000000..360694887e92
--- /dev/null
+++ b/dev-libs/libsigc++/files/libsigc++-2.3.2-missing-include.patch
@@ -0,0 +1,24 @@
+From df361299c3f9a0922a683e5fa3869764932bb19a Mon Sep 17 00:00:00 2001
+From: Kjell Ahlstedt <kjell.ahlstedt@bredband.net>
+Date: Fri, 8 Aug 2014 12:47:02 +0200
+Subject: Add an include in limit_reference.h
+
+* sigc++/macros/limit_reference.h.m4: limit_reference.h must include
+visit_each.h, with the primary definition of template struct visitor.
+https://mail.gnome.org/archives/libsigc-list/2014-August/msg00001.html
+
+diff --git a/sigc++/macros/limit_reference.h.m4 b/sigc++/macros/limit_reference.h.m4
+index 802446c..bb4b3b7 100644
+--- a/sigc++/macros/limit_reference.h.m4
++++ b/sigc++/macros/limit_reference.h.m4
+@@ -137,6 +137,7 @@ divert(0)
+
+ _FIREWALL([LIMIT_REFERENCE])
+
++#include <sigc++/visit_each.h>
+ #include <sigc++/type_traits.h>
+ #include <sigc++/trackable.h>
+
+--
+cgit v0.10.1
+
diff --git a/dev-libs/libsigc++/libsigc++-2.3.2.ebuild b/dev-libs/libsigc++/libsigc++-2.3.2-r1.ebuild
index b270fd171a6e..3f241d98520b 100644
--- a/dev-libs/libsigc++/libsigc++-2.3.2.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.3.2-r1.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-2.3.2.ebuild,v 1.1 2014/09/04 10:20:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsigc++/libsigc++-2.3.2-r1.ebuild,v 1.1 2014/09/07 12:41:18 pacho Exp $
EAPI="5"
GCONF_DEBUG="no"
-inherit gnome2 flag-o-matic
+inherit eutils gnome2 flag-o-matic
DESCRIPTION="Typesafe callback system for standard C++"
HOMEPAGE="http://libsigc.sourceforge.net/"
@@ -30,6 +30,9 @@ src_prepare() {
Makefile.am Makefile.in || die "sed tests failed"
fi
+ # Add an include in limit_reference.h (from 'master'), bug #522166
+ epatch "${FILESDIR}/${P}-missing-include.patch"
+
gnome2_src_prepare
}