Accepting request 838872 from home:StefanBruens:branches:electronics
- Update to version 5.1.7, no changelog provided - Drop now upstream 0001-Remove-creation-on-the-fly-of-wxPaintEvent-instances.patch - Update to version 5.1.6 See http://kicad-pcb.org/blog/2020/05/KiCad-5.1.6-Release/ for details. - Switch from OCE to OCC OpenCascade implementation, as recommended by upstream (FreeCAD uses OCC now as well). - Fix compilation with latest wxWidgets: 0001-Remove-creation-on-the-fly-of-wxPaintEvent-instances.patch - Drop kicad-user-library.patch, only relevant for KiCad 4.0 footprint libraries. OBS-URL: https://build.opensuse.org/request/show/838872 OBS-URL: https://build.opensuse.org/package/show/electronics/kicad?expand=0&rev=73
This commit is contained in:
Stefan Brüns
Git OBS Bridge
parent
1d4944578f
commit
10f01dd76b
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:80625a1da876e1be683dc08268fe43fe67bb704e841e977431f7a82bdc096474
|
||||
size 14203632
|
||||
3
kicad-5.1.7.tar.bz2
Normal file
3
kicad-5.1.7.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6554cb3d6e9e4262472a2e2fd97623d64def68686cacb3fa76a7fb5787791c42
|
||||
size 18279204
|
||||
@ -1,18 +0,0 @@
|
||||
Index: common/kiface_i.cpp
|
||||
===================================================================
|
||||
--- common/kiface_i.cpp.orig 2018-07-13 21:53:52.000000000 +0200
|
||||
+++ common/kiface_i.cpp 2018-07-20 16:03:55.529317649 +0200
|
||||
@@ -61,6 +62,13 @@ static void setSearchPaths( SEARCH_STACK
|
||||
fn.RemoveLastDir();
|
||||
fn.RemoveLastDir(); // "../../" up twice, removing library/doc/
|
||||
}
|
||||
+ // user local library
|
||||
+ wxString homeDir = wxFileName::GetHomeDir();
|
||||
+ aDst->AddPaths( homeDir + wxT( "/.local/share/kicad/library-repos/kicad-library/library" ) );
|
||||
+ aDst->AddPaths( homeDir + wxT( "/.local/share/kicad/library-repos/kicad-library/modules" ) );
|
||||
+ aDst->AddPaths( homeDir + wxT( "/.local/share/kicad/library-repos/kicad-library/modules/packages3d" ) );
|
||||
+ aDst->AddPaths( homeDir + wxT( "/.local/share/kicad/library-repos/kicad-library/template" ) );
|
||||
+
|
||||
|
||||
// Add PCB library file path to search path list.
|
||||
if( aId == KIWAY::FACE_PCB || aId == KIWAY::FACE_CVPCB )
|
||||
@ -1,3 +1,22 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 28 19:42:19 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||
|
||||
- Update to version 5.1.7, no changelog provided
|
||||
- Drop now upstream
|
||||
0001-Remove-creation-on-the-fly-of-wxPaintEvent-instances.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 31 18:57:32 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||
|
||||
- Update to version 5.1.6
|
||||
See http://kicad-pcb.org/blog/2020/05/KiCad-5.1.6-Release/ for details.
|
||||
- Switch from OCE to OCC OpenCascade implementation, as recommended
|
||||
by upstream (FreeCAD uses OCC now as well).
|
||||
- Fix compilation with latest wxWidgets:
|
||||
0001-Remove-creation-on-the-fly-of-wxPaintEvent-instances.patch
|
||||
- Drop kicad-user-library.patch, only relevant for KiCad 4.0
|
||||
footprint libraries.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 18 22:01:57 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||
|
||||
|
||||
81
kicad.spec
81
kicad.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package kicad
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LLC.
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -16,72 +16,78 @@
|
||||
#
|
||||
|
||||
|
||||
%if %{suse_version} >= 1550
|
||||
%bcond_without python3
|
||||
%else
|
||||
%bcond_with python3
|
||||
%endif
|
||||
|
||||
# According to upstream, kicad 5.x.y can be used with the footprint and
|
||||
# symbol libraries from version 5.0.0
|
||||
%define compatversion 5.0.0
|
||||
Name: kicad
|
||||
Version: 5.1.5
|
||||
Version: 5.1.7
|
||||
Release: 0
|
||||
Summary: EDA software suite for the creation of schematics and PCB
|
||||
License: GPL-3.0-or-later AND AGPL-3.0-or-later
|
||||
Group: Productivity/Scientific/Electronics
|
||||
URL: http://kicad-pcb.org
|
||||
Source: https://launchpad.net/kicad/5.0/%{version}/+download/kicad-%{version}.tar.xz
|
||||
# PATCH-FEATURE-OPENSUSE kicad-user-library.patch -- add user library path
|
||||
Patch1: kicad-user-library.patch
|
||||
URL: https://kicad-pcb.org
|
||||
Source: https://gitlab.com/kicad/code/kicad/-/archive/%{version}/kicad-%{version}.tar.bz2
|
||||
# PATCH-FIX-OPENSUSE davejplater@gmail.com -kicad-suse-help-path.patch - kicad looks in /usr/share/doc/kicad for help files and doesn't find them.
|
||||
# this patch adds packges/ befor kicad and enables help to function.
|
||||
Patch3: kicad-suse-help-path.patch
|
||||
|
||||
%if 0%{?suse_version} >= 1500
|
||||
BuildRequires: libboost_filesystem-devel
|
||||
BuildRequires: libboost_system-devel
|
||||
BuildRequires: libboost_test-devel
|
||||
%else
|
||||
BuildRequires: boost-devel >= 1.56
|
||||
%endif
|
||||
BuildRequires: cmake
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: glm-devel
|
||||
BuildRequires: libboost_filesystem-devel
|
||||
BuildRequires: libboost_system-devel
|
||||
BuildRequires: libboost_test-devel
|
||||
BuildRequires: libngspice-devel
|
||||
BuildRequires: oce-devel
|
||||
BuildRequires: occt-devel
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: update-desktop-files
|
||||
# Use direct version to avoid problems with wx 3.2
|
||||
BuildRequires: wxWidgets-3_0-devel >= 3
|
||||
# Fix bug in old python-wxWidgets-3_0-devel
|
||||
BuildRequires: python-wxWidgets-3_0 >= 3
|
||||
BuildRequires: python-wxWidgets-3_0-devel >= 3
|
||||
BuildRequires: swig >= 3
|
||||
BuildRequires: update-desktop-files
|
||||
|
||||
%if %{with python3}
|
||||
BuildRequires: wxGTK3-devel >= 3
|
||||
BuildRequires: pkgconfig(python3)
|
||||
BuildRequires: python3-wxPython
|
||||
Recommends: python3-wxPython
|
||||
%else
|
||||
# Use direct version to avoid problems with wx 3.2
|
||||
BuildRequires: python-wxWidgets-3_0-devel >= 3
|
||||
BuildRequires: wxWidgets-3_0-devel >= 3
|
||||
BuildRequires: pkgconfig(python)
|
||||
Requires: python-wxWidgets-3_0 >= 3
|
||||
%endif
|
||||
|
||||
BuildRequires: pkgconfig(bzip2)
|
||||
BuildRequires: pkgconfig(cairo)
|
||||
BuildRequires: pkgconfig(glew)
|
||||
BuildRequires: pkgconfig(libcurl)
|
||||
BuildRequires: pkgconfig(openssl)
|
||||
BuildRequires: pkgconfig(python)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
# Fix directory owner
|
||||
BuildRequires: hicolor-icon-theme
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
# Dlopen'ed simulator library
|
||||
Requires: libngspice0
|
||||
Requires: python-wxWidgets-3_0 >= 3
|
||||
# The help function gives an error without the doc package
|
||||
Requires: %{name}-doc = %{version}
|
||||
# You cannot build a schematic without symbols
|
||||
Requires: %{name}-symbols = %{compatversion}
|
||||
# You cannot create a pcb layout without footprints
|
||||
Requires: %{name}-footprints = %{compatversion}
|
||||
# Kicad functions without these packages
|
||||
# KiCad functions without these packages
|
||||
Recommends: %{name}-packages3D = %{compatversion}
|
||||
Recommends: %{name}-templates = %{compatversion}
|
||||
Obsoletes: kicad = 20140120
|
||||
Provides: kicad = %{compatversion}
|
||||
|
||||
%description
|
||||
Kicad is an open source (GPL) software for the creation of electronic schematic
|
||||
KiCad is an open source (GPL) software for the creation of electronic schematic
|
||||
diagrams and printed circuit with up to 32 copper layers and additional techinical layers.
|
||||
|
||||
KiCad includes a project manager and four main independent software tools:
|
||||
@ -92,7 +98,6 @@ KiCad includes a project manager and four main independent software tools:
|
||||
|
||||
%prep
|
||||
%setup -q -n kicad-%{version}
|
||||
%patch1 -p0
|
||||
%patch3
|
||||
|
||||
%build
|
||||
@ -109,6 +114,11 @@ KiCad includes a project manager and four main independent software tools:
|
||||
-DKICAD_SCRIPTING=ON \
|
||||
-DKICAD_SCRIPTING_MODULES=ON \
|
||||
-DKICAD_SCRIPTING_WXPYTHON=ON \
|
||||
%if %{with python3}
|
||||
-DKICAD_SCRIPTING_PYTHON3=ON \
|
||||
-DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON \
|
||||
%endif
|
||||
-DKICAD_USE_OCC:BOOL=ON \
|
||||
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -pie" \
|
||||
-DPYTHON_SITE_PACKAGE_PATH=%{python_sitearch} \
|
||||
-DKICAD_SPICE=ON
|
||||
@ -134,7 +144,11 @@ for f in test_kicad_plugin.py test_plugin.py ; do
|
||||
done
|
||||
# Move remaining standalone scripts to kicad directory
|
||||
mv %{buildroot}%{_docdir}/kicad/scripts %{buildroot}%{_datadir}/kicad/
|
||||
%if %{with python3}
|
||||
sed -i '1s@^#!.*python.*@#!/usr/bin/python3@' %{buildroot}%{_datadir}/kicad/scripts/*.py
|
||||
%else
|
||||
sed -i '1s@^#!.*python.*@#!/usr/bin/python2@' %{buildroot}%{_datadir}/kicad/scripts/*.py
|
||||
%endif
|
||||
chmod +x %{buildroot}%{_datadir}/kicad/scripts/*.py
|
||||
|
||||
# Fix executable bits for scripts executed directly from kicad, remove she-bangs
|
||||
@ -147,23 +161,8 @@ sed -i '1s@^#!.*@@' %{buildroot}%{_datadir}/kicad/scripting/*/*.py
|
||||
cmp --quiet %{buildroot}%{_bindir}/_pcbnew.kiface %{buildroot}%{python_sitearch}/_pcbnew.so && \
|
||||
ln -sf %{_bindir}/_pcbnew.kiface %{buildroot}%{python_sitearch}/_pcbnew.so
|
||||
|
||||
%if 0%{?suse_version} < 1330
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
%desktop_database_post
|
||||
%icon_theme_cache_post
|
||||
%mime_database_post
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
%desktop_database_postun
|
||||
%icon_theme_cache_postun
|
||||
%mime_database_postun
|
||||
%else
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%files
|
||||
%doc README.txt Documentation/changelogs
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user