Accepting request 246583 from GNOME:Factory

Fix inkscape build - patch from upstream

OBS-URL: https://build.opensuse.org/request/show/246583
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libsigc++2?expand=0&rev=34
This commit is contained in:
Stephan Kulow 2014-08-29 15:42:23 +00:00 committed by Git OBS Bridge
commit c4eaed7283
3 changed files with 34 additions and 0 deletions

25
libsigc++2-includes.patch Normal file
View File

@ -0,0 +1,25 @@
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

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Aug 26 20:09:45 UTC 2014 - dimstar@opensuse.org
- Add libsigc++2-includes.patch: Add an include in
limit_reference.h.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Aug 1 09:24:57 UTC 2014 - zaitor@opensuse.org Fri Aug 1 09:24:57 UTC 2014 - zaitor@opensuse.org

View File

@ -26,6 +26,8 @@ Group: System/Libraries
Url: http://libsigc.sourceforge.net/ Url: http://libsigc.sourceforge.net/
Source: http://download.gnome.org/sources/libsigc++/2.3/%{_name}-%{version}.tar.xz Source: http://download.gnome.org/sources/libsigc++/2.3/%{_name}-%{version}.tar.xz
Source99: baselibs.conf Source99: baselibs.conf
# PATCH-FIX-UPSTREAM libsigc++2-includes.patch dimstar@opensuse.org -- Add an include in limit_reference.h, taken from git
Patch0: libsigc++2-includes.patch
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -68,6 +70,7 @@ of use unmatched by other C++ callback libraries.
%prep %prep
%setup -q -n %{_name}-%{version} %setup -q -n %{_name}-%{version}
%patch0 -p1
%build %build
# FIXME: Cannot autoreconf, bad templates: # FIXME: Cannot autoreconf, bad templates: