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

Accepting request 612211 from home:1Antoine1:branches:electronics

Browse Source 
- Fix build with CMake 3.11 (deb#897100):
  * Add kicad-4.0.7-remove-internal-CheckCXXSymbolExists.patch,
    picked from upstream.
- Use %license for license file instead of %doc (boo#1082318).
- Use SPDX 3 license identifier.
- Don't call empty macros in %post and %postun.

OBS-URL: https://build.opensuse.org/request/show/612211
OBS-URL: https://build.opensuse.org/package/show/electronics/kicad?expand=0&rev=39
This commit is contained in:
Dave Plater 2018-05-25 15:17:34 +00:00 committed by Git OBS Bridge
parent da747f6d6e
commit a0a55a28b2
3 changed files with 76 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
kicad-4.0.7-remove-internal-CheckCXXSymbolExists.patch Normal file
View File

@ -0,0 +1,58 @@
From 2e0b75c058d676f427328506bbf3bc10079da117 Mon Sep 17 00:00:00 2001
From: Seth Hillbrand <hillbrand@ucdavis.edu>
Date: Fri, 30 Mar 2018 14:47:16 -0700
Subject: Remove internal CheckCXXSymbolExists
Since Cmake 2.8.6, Cmake provides this macro. Our use references
internal Cmake variables that have changes in Cmake 3.11.
diff --git a/CMakeModules/CheckCXXSymbolExists.cmake b/CMakeModules/CheckCXXSymbolExists.cmake
deleted file mode 100644
index 2100973..0000000
--- a/CMakeModules/CheckCXXSymbolExists.cmake
+++ /dev/null
@@ -1,42 +0,0 @@
-# - Check if a symbol exists as a function, variable, or macro in C++
-# CHECK_CXX_SYMBOL_EXISTS(<symbol> <files> <variable>)
-#
-# Check that the <symbol> is available after including given header
-# <files> and store the result in a <variable>. Specify the list
-# of files in one argument as a semicolon-separated list.
-# CHECK_CXX_SYMBOL_EXISTS() can be used to check in C++ files, as opposed
-# to CHECK_SYMBOL_EXISTS(), which works only for C.
-#
-# If the header files define the symbol as a macro it is considered
-# available and assumed to work. If the header files declare the
-# symbol as a function or variable then the symbol must also be
-# available for linking. If the symbol is a type or enum value
-# it will not be recognized (consider using CheckTypeSize or
-# CheckCSourceCompiles).
-#
-# The following variables may be set before calling this macro to
-# modify the way the check is run:
-#
-# CMAKE_REQUIRED_FLAGS = string of compile command line flags
-# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
-# CMAKE_REQUIRED_INCLUDES = list of include directories
-# CMAKE_REQUIRED_LIBRARIES = list of libraries to link
-
-#=============================================================================
-# Copyright 2003-2011 Kitware, Inc.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-# License text for the above reference.)
-
-include(CheckSymbolExists)
-
-macro(CHECK_CXX_SYMBOL_EXISTS SYMBOL FILES VARIABLE)
- _CHECK_SYMBOL_EXISTS("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx" "${SYMBOL}" "${FILES}" "${VARIABLE}" )
-endmacro()
--
cgit v0.10.2

10
kicad.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Fri May 25 09:05:03 UTC 2018 - antoine.belvire@opensuse.org
- Fix build with CMake 3.11 (deb#897100):
* Add kicad-4.0.7-remove-internal-CheckCXXSymbolExists.patch,
picked from upstream.
- Use %license for license file instead of %doc (boo#1082318).
- Use SPDX 3 license identifier.
- Don't call empty macros in %post and %postun.
-------------------------------------------------------------------
Mon Sep 4 13:38:17 UTC 2017 - davejplater@gmail.com

10
kicad.spec
View File

@ -20,7 +20,7 @@ Name: kicad
Version: 4.0.7
Release: 0
Summary: EDA software suite for the creation of schematics and PCB
License: GPL-2.0+ and GPL-3.0+
License: GPL-2.0-or-later AND GPL-3.0-or-later
Group: Productivity/Scientific/Electronics
Url: http://kicad-pcb.org
Source: https://launchpad.net/kicad/4.0/%{version}/+download/kicad-%{version}.tar.xz
@ -40,6 +40,8 @@ Patch4: kicad-boost-1_61-boost-context-changes.patch
# PATCH-OPENSUSE kicad-set-cxx-standard.diff -- use C++14 by default and decay to 11, required by boost 1.61 patch
Patch5: kicad-set-cxx-version.patch
%endif
# PATCH-FIX-UPSTREAM kicad-4.0.7-remove-internal-CheckCXXSymbolExists.patch -- Fix build with latest CMake, picked from upstream
Patch6: kicad-4.0.7-remove-internal-CheckCXXSymbolExists.patch
%if 0%{?suse_version} > 1325
BuildRequires: libboost_context-devel
BuildRequires: libboost_filesystem-devel
@ -115,6 +117,7 @@ This package contains script for KiCad libraries downloading.
%patch4
%patch5 -p0
%endif
%patch6 -p1
cp %{SOURCE2} .
@ -158,6 +161,7 @@ install -D scripts/library-repos-install.sh %{buildroot}%{_bindir}/kicad-library
%fdupes -s %{buildroot}%{_datadir}/kicad
%fdupes -s %{buildroot}%{_datadir}/icons/hicolor
%if 0%{?suse_version} < 1330
%post
%desktop_database_post
%icon_theme_cache_post
@ -167,10 +171,12 @@ install -D scripts/library-repos-install.sh %{buildroot}%{_bindir}/kicad-library
%desktop_database_postun
%icon_theme_cache_postun
%mime_database_postun
%endif
%files
%defattr(-,root,root)
%doc CHANGELOG.txt COPYRIGHT.txt
%doc CHANGELOG.txt
%license COPYRIGHT.txt
%{_bindir}/*
%exclude %{_bindir}/kicad-library-install.sh
%{_libdir}/kicad/