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
From 3f1f474f8ceab75acda7c1d0a36cc9c33c6124b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?=
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?=
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