pool/kicad
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 314516 from home:tjcw:branches:electronics

Browse Source 
Added fix for build break

OBS-URL: https://build.opensuse.org/request/show/314516
OBS-URL: https://build.opensuse.org/package/show/electronics/kicad?expand=0&rev=4
This commit is contained in:
Dmitry Roshchin 2015-06-30 15:18:35 +00:00 committed by Git OBS Bridge
parent d81da12d6c
commit 8dcd2c4bd3
5 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
container_fwd.hpp.patch Normal file
View File

@ -0,0 +1,12 @@
--- kicad-20140120/include/boost/detail/container_fwd.hpp.orig 2015-06-30 11:25:12.116188042 +0100
+++ kicad-20140120/include/boost/detail/container_fwd.hpp 2015-06-30 11:26:03.009468476 +0100
@@ -136,7 +136,8 @@
template <class T, class Allocator> class deque;
#endif
- template <class T, class Allocator> class list;
+ // 'list' is set up in the c++11 headers
+ //template <class T, class Allocator> class list;
template <class T, class Allocator> class vector;
template <class Key, class T, class Compare, class Allocator> class map;
template <class Key, class T, class Compare, class Allocator>

6
kicad-gost.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jun 30 13:16:28 UTC 2015 - tjcw@physics.org
- Same build fix as kicad
* container_fwd.hpp.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 25 23:27:53 UTC 2015 - jengelh@inai.de Wed Mar 25 23:27:53 UTC 2015 - jengelh@inai.de

2
kicad-gost.spec
View File

@ -44,6 +44,7 @@ Url: http://kicad-pcb.org
Source: kicad-%{version}.tar.bz2 Source: kicad-%{version}.tar.bz2
Source9: pre_checkin.sh Source9: pre_checkin.sh
Patch1: kikad-no-templates-install.patch Patch1: kikad-no-templates-install.patch
Patch2: container_fwd.hpp.patch
BuildRequires: boost-devel BuildRequires: boost-devel
BuildRequires: cmake >= 2.4.6 BuildRequires: cmake >= 2.4.6
@ -82,6 +83,7 @@ Kicad is a set of four softwares and a project manager:
%prep %prep
%setup -q -n kicad-%{version} %setup -q -n kicad-%{version}
%patch1 -p1 %patch1 -p1
%patch2 -p1
# fix plugin directory # fix plugin directory
sed -i 's|KICAD_PLUGINS lib/kicad/plugins|KICAD_PLUGINS %{_lib}/kicad/plugins|' CMakeLists.txt sed -i 's|KICAD_PLUGINS lib/kicad/plugins|KICAD_PLUGINS %{_lib}/kicad/plugins|' CMakeLists.txt

6
kicad.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jun 30 10:38:49 UTC 2015 - tjcw@physics.org
- Mend build breakage by using 'system' list class rather than kicad/boost one
* container_fwd.hpp.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 25 23:27:53 UTC 2015 - jengelh@inai.de Wed Mar 25 23:27:53 UTC 2015 - jengelh@inai.de

2
kicad.spec
View File

@ -44,6 +44,7 @@ Url: http://kicad-pcb.org
Source: kicad-%{version}.tar.bz2 Source: kicad-%{version}.tar.bz2
Source9: pre_checkin.sh Source9: pre_checkin.sh
Patch1: kikad-no-templates-install.patch Patch1: kikad-no-templates-install.patch
Patch2: container_fwd.hpp.patch
BuildRequires: boost-devel BuildRequires: boost-devel
BuildRequires: cmake >= 2.4.6 BuildRequires: cmake >= 2.4.6
@ -82,6 +83,7 @@ Kicad is a set of four softwares and a project manager:
%prep %prep
%setup -q -n kicad-%{version} %setup -q -n kicad-%{version}
%patch1 -p1 %patch1 -p1
%patch2 -p1
# fix plugin directory # fix plugin directory
sed -i 's|KICAD_PLUGINS lib/kicad/plugins|KICAD_PLUGINS %{_lib}/kicad/plugins|' CMakeLists.txt sed -i 's|KICAD_PLUGINS lib/kicad/plugins|KICAD_PLUGINS %{_lib}/kicad/plugins|' CMakeLists.txt