Hello community, here is the log from the commit of package kicad for openSUSE:Factory checked in at 2018-11-10 16:56:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kicad (Old) and /work/SRC/openSUSE:Factory/.kicad.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kicad" Sat Nov 10 16:56:49 2018 rev:27 rq:644975 version:5.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/kicad/kicad.changes 2018-10-17 08:25:44.506649509 +0200 +++ /work/SRC/openSUSE:Factory/.kicad.new/kicad.changes 2018-11-10 16:57:32.919887808 +0100 @@ -1,0 +2,19 @@ +Fri Oct 26 21:38:17 UTC 2018 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Add Requires: libngspice0 +- Fix name for dlopen'ed libngspice.so.0 + Add 0001-Use-fixed-version-for-libngspice.so.0.patch + +------------------------------------------------------------------- +Thu Oct 18 19:03:17 UTC 2018 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Update to bugfix release 5.0.1 + This version contains critical bugfixes and minor improvements. + See http://kicad-pcb.org/blog/2018/10/KiCad-5.0.1-Release/ for details. +- Do proper fix for 3d plugindir, use absolute LIBDIR instead of + deriving it from BINDIR: + Add 0001-Use-absolute-path-CMAKE_INSTALL_FULL_LIBDIR-for-3d-v.patch +- Drop upstream kicad-fix-boost168-build.patch. +- Add Recommends: for new kicad-templates package + +------------------------------------------------------------------- Old: ---- kicad-5.0.0.tar.xz kicad-fix-boost168-build.patch New: ---- 0001-Use-absolute-path-CMAKE_INSTALL_FULL_LIBDIR-for-3d-v.patch 0001-Use-fixed-version-for-libngspice.so.0.patch kicad-5.0.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kicad.spec ++++++ --- /var/tmp/diff_new_pack.Z8Yq14/_old 2018-11-10 16:57:33.747886794 +0100 +++ /var/tmp/diff_new_pack.Z8Yq14/_new 2018-11-10 16:57:33.751886789 +0100 @@ -12,12 +12,15 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +# According to upstream, kicad 5.0.x can be used with the footprint and +# symbol libraries from version 5.0.0 +%define compatversion 5.0.0 Name: kicad -Version: 5.0.0 +Version: 5.0.1 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 @@ -36,9 +39,12 @@ # PATCH-FIX-OPENSUSE davejpla...@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 -Patch4: kicad-fix-boost168-build.patch +# PATCH-FIX-UPSTREAM 0001-Use-absolute-path-CMAKE_INSTALL_FULL_LIBDIR-for-3d-v.patch +Patch4: 0001-Use-absolute-path-CMAKE_INSTALL_FULL_LIBDIR-for-3d-v.patch +# PATCH-FIX-OPENSUSE 0001-Use-fixed-version-for-libngspice.so.0.patch +Patch5: 0001-Use-fixed-version-for-libngspice.so.0.patch -%if 0%{?suse_version} > 1325 +%if 0%{?suse_version} >= 1500 BuildRequires: libboost_system-devel BuildRequires: libboost_test-devel %else @@ -69,17 +75,21 @@ # 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 = %{version} +Requires: %{name}-symbols = %{compatversion} # You cannot create a pcb layout without footprints -Requires: %{name}-footprints = %{version} +Requires: %{name}-footprints = %{compatversion} # Kicad functions without these packages Recommends: %{name}-library-install = %{version} Recommends: %{name}-packages3D +Recommends: %{name}-templates Obsoletes: kicad = 20140120 +Provides: kicad = %{compatversion} %description Kicad is an open source (GPL) software for the creation of electronic schematic @@ -110,7 +120,8 @@ %patch1 -p0 %patch2 -p1 %patch3 -%patch4 +%patch4 -p1 +%patch5 -p1 cp %{SOURCE2} ./LICENSE.GPLv3 cp %{SOURCE3} ./LICENSE.AGPLv3 @@ -129,7 +140,6 @@ -DKICAD_SCRIPTING=ON \ -DKICAD_SCRIPTING_MODULES=ON \ -DKICAD_SCRIPTING_WXPYTHON=ON \ - -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \ -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -pie" \ -DPYTHON_SITE_PACKAGE_PATH=%{python_sitearch} \ -DKICAD_SPICE=ON ++++++ 0001-Use-absolute-path-CMAKE_INSTALL_FULL_LIBDIR-for-3d-v.patch ++++++ >From 3f1f474f8ceab75acda7c1d0a36cc9c33c6124b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bru...@rwth-aachen.de> Date: Tue, 9 Oct 2018 17:35:55 +0200 Subject: [PATCH] Use absolute path CMAKE_INSTALL_FULL_LIBDIR for 3d viewer PLUGINDIR Currently, the plugindir in the plugin manager is constructed as {CMAKE_INSTALL_PREFIX}/bin/../{CMAKE_INSTALL_LIBDIR}/kicad/..., while CMakes install uses {CMAKE_INSTALL_LIBDIR}/kicad/... In case CMAKE_INSTALL_LIBDIR is a relative path "install" prefixes it with CMAKE_INSTALL_PREFIX and both paths happen to match, otherwise the constructed path ends up as e.g. "/usr/bin/../usr/lib/kicad/...". For these cases where an absolute path is wanted CMake provides the CMAKE_INSTALL_FULL_<dir> variants which works the same as CMAKE_INSTALL_<dir> when used as DIRECTORY for install. --- 3d-viewer/3d_cache/3d_plugin_manager.cpp | 10 +++------- 3d-viewer/3d_plugin_dir.h.in | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/3d-viewer/3d_cache/3d_plugin_manager.cpp b/3d-viewer/3d_cache/3d_plugin_manager.cpp index 52f2cef..fc561e7 100644 --- a/3d-viewer/3d_cache/3d_plugin_manager.cpp +++ b/3d-viewer/3d_cache/3d_plugin_manager.cpp @@ -149,14 +149,10 @@ void S3D_PLUGIN_MANAGER::loadPlugins( void ) #endif #ifndef _WIN32 - // multiarch friendly determination of the plugin directory: the executable dir - // is first determined via wxStandardPaths::Get().GetExecutablePath() and then - // the CMAKE_INSTALL_LIBDIR path is appended relative to the executable dir. + // PLUGINDIR = CMAKE_INSTALL_FULL_LIBDIR path is the absolute path + // corresponding to the install path used for constructing KICAD_USER_PLUGIN - fn.Assign( wxStandardPaths::Get().GetExecutablePath() ); - fn.RemoveLastDir(); - wxString tfname = fn.GetPathWithSep(); - tfname.Append( wxString::FromUTF8Unchecked( PLUGINDIR ) ); + wxString tfname = wxString::FromUTF8Unchecked( PLUGINDIR ); fn.Assign( tfname, ""); fn.AppendDir( "kicad" ); #else diff --git a/3d-viewer/3d_plugin_dir.h.in b/3d-viewer/3d_plugin_dir.h.in index 6cf6de2..fb923ec 100644 --- a/3d-viewer/3d_plugin_dir.h.in +++ b/3d-viewer/3d_plugin_dir.h.in @@ -1 +1 @@ -#define PLUGINDIR "@CMAKE_INSTALL_LIBDIR@" +#define PLUGINDIR "@CMAKE_INSTALL_FULL_LIBDIR@" -- 2.19.0 ++++++ 0001-Use-fixed-version-for-libngspice.so.0.patch ++++++ >From f197847f50622b6f20ade5ddae71d3c749cbd956 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bru...@rwth-aachen.de> Date: Fri, 26 Oct 2018 23:35:13 +0200 Subject: [PATCH] Use fixed version for libngspice.so.0 CanonicalizeName only adds the lib prefix and .so suffix, so loading libngspice.so fails until the development package is installed. MAC/Windows code paths lookup soversion 0 of ngspice as well, as this is the only compatible version. --- eeschema/sim/ngspice.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eeschema/sim/ngspice.cpp b/eeschema/sim/ngspice.cpp index 8818b50..3b6e4dd 100644 --- a/eeschema/sim/ngspice.cpp +++ b/eeschema/sim/ngspice.cpp @@ -318,8 +318,10 @@ void NGSPICE::init_dll() } if( !m_dll.IsLoaded() ) // try also the system libraries -#endif /* __WINDOWS || __WXMAC__ */ m_dll.Load( wxDynamicLibrary::CanonicalizeName( "ngspice" ) ); +#else + m_dll.Load("libngspice.so.0"); +#endif /* __WINDOWS || __WXMAC__ */ if( !m_dll.IsLoaded() ) throw std::runtime_error( "Missing ngspice shared library" ); -- 2.19.1 ++++++ kicad-5.0.0.tar.xz -> kicad-5.0.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/kicad/kicad-5.0.0.tar.xz /work/SRC/openSUSE:Factory/.kicad.new/kicad-5.0.1.tar.xz differ: char 26, line 1
