gentoo resync : 13.06.2020

7 files changed, 75 insertions, 129 deletions

diff --git a/sci-electronics/kicad/files/kicad-5.1.0-help.patch b/sci-electronics/kicad/files/kicad-5.1.0-help.patch
deleted file mode 100644
index e89b7e45c24e..000000000000
--- a/sci-electronics/kicad/files/kicad-5.1.0-help.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-diff -Naur /tmp/kicad-5.1.0-orig/CMakeLists.txt kicad-5.1.0/CMakeLists.txt
---- /tmp/kicad-5.1.0-orig/CMakeLists.txt	2019-03-08 04:31:50.000000000 -0800
-+++ kicad-5.1.0/CMakeLists.txt	2019-03-24 16:16:58.287376258 -0700
-@@ -427,6 +427,10 @@
- set( KIFACE_PREFIX  "_" )
- #message( STATUS "KIFACE_SUFFIX:${KIFACE_SUFFIX}  KIFACE_PREFIX:${KIFACE_PREFIX}" )
- 
-+# KICAD_HELP is the location of the help files accessed from the UI
-+# (usually provided via kicad-doc package)
-+set ( KICAD_HELP share/doc/kicad
-+    CACHE PATH "Alternative location of KiCad help files.")
- 
- #================================================
- # Locations for install targets.
-diff -Naur /tmp/kicad-5.1.0-orig/CMakeModules/config.h.cmake kicad-5.1.0/CMakeModules/config.h.cmake
---- /tmp/kicad-5.1.0-orig/CMakeModules/config.h.cmake	2019-03-08 04:31:50.000000000 -0800
-+++ kicad-5.1.0/CMakeModules/config.h.cmake	2019-03-24 16:16:58.287376258 -0700
-@@ -59,6 +59,10 @@
- /// The install prefix defined during CMake configuration or fall back to CMAKE_INSTALL_PREFIX.
- #define DEFAULT_INSTALL_PATH            "@DEFAULT_INSTALL_PATH@"
- 
-+/// KiCad help files path can be different on some systems allow adding alternative,
-+/// search path for them. Defaults to CMAKE_INSTALL_PREFIX/share/doc/kicad
-+#define KICAD_HELP                       "@KICAD_HELP@"
-+
- /// The wxPython version found during configuration.
- #if defined( KICAD_SCRIPTING_WXPYTHON )
- #define WXPYTHON_VERSION                "@WXPYTHON_VERSION@"
-diff -Naur /tmp/kicad-5.1.0-orig/common/searchhelpfilefullpath.cpp kicad-5.1.0/common/searchhelpfilefullpath.cpp
---- /tmp/kicad-5.1.0-orig/common/searchhelpfilefullpath.cpp	2019-03-08 04:31:50.000000000 -0800
-+++ kicad-5.1.0/common/searchhelpfilefullpath.cpp	2019-03-24 16:17:31.527588523 -0700
-@@ -25,7 +25,7 @@
- 
- #include <pgm_base.h>
- #include <common.h>
--#include <config.h>     // to define DEFAULT_INSTALL_PATH
-+#include <config.h>     // to define DEFAULT_INSTALL_PATH and KICAD_HELP
- #include <macros.h>
- #include <trace_helpers.h>
- 
-@@ -69,6 +69,10 @@
-     wxArrayString   subdirs;
-     wxArrayString   altsubdirs;
-     SEARCH_STACK    ss = aSStack;
-+#if ! defined(__WXMAC__) // && defined(__linux__)
-+    SEARCH_STACK    altss;
-+    wxArrayString   moresubdirs;
-+#endif
- 
-     // It might already be in aSStack, but why depend on other code
-     // far away when it's so easy to add it again (to our copy) as the first place to look.
-@@ -76,6 +80,7 @@
-     // This is CMAKE_INSTALL_PREFIX unless DEFAULT_INSTALL_PATH was defined during
-     // build configuration:
-     ss.AddPaths( wxT( DEFAULT_INSTALL_PATH ), 0 );
-+    altss.AddPaths( wxT( KICAD_HELP ), 0 );
- 
- #if defined(__WXMAC__)
-     ss.AddPaths( GetOSXKicadMachineDataDir() );
-@@ -104,16 +109,17 @@
- 
-     // Based on kicad-doc.bzr/CMakeLists.txt, line 20, the help files are
-     // installed into "<CMAKE_INSTALL_PREFIX>/share/doc/kicad/help" for linux.
--    // This is ${KICAD_HELP} var in that CMakeLists.txt file.
-     // Below we account for an international subdirectory.
-     subdirs.Add( "share" );
-     subdirs.Add( "doc" );
-     subdirs.Add( "kicad" );
-     subdirs.Add( "help" );
- 
-+    // For custom help path installations via ${KICAD_HELP}
-+    moresubdirs.Add( "help" );
-+
-     // Based on kicad-doc.bzr/CMakeLists.txt, line 35, the help files are
-     // installed into "<CMAKE_INSTALL_PREFIX>/doc/help" for Windows.
--    // This is ${KICAD_HELP} var in that CMakeLists.txt file.
-     // Below we account for an international subdirectory.
-     altsubdirs.Add( "doc" );
-     altsubdirs.Add( "help" );
-@@ -159,6 +165,9 @@
-     {
-         subdirs.Add( locale_name_dirs[ii] );
-         altsubdirs.Add( locale_name_dirs[ii] );
-+#if ! defined(__WXMAC__) // && defined(__linux__)
-+        moresubdirs.Add( locale_name_dirs[ii] );
-+#endif
- 
-         fn = FindFileInSearchPaths( ss, aBaseName + wxT( ".html" ), &altsubdirs );
- 
-@@ -188,8 +197,27 @@
-         if( !fn.IsEmpty() )
-             break;
- 
-+#if ! defined(__WXMAC__) // && defined(__linux__)
-+        fn = FindFileInSearchPaths( altss, aBaseName + wxT( ".html" ), &moresubdirs );
-+
-+        if( !fn.IsEmpty() )
-+        {
-+            // Prepend URI protocol since we will open in a browser
-+            fn = wxT( "file://" ) + fn;
-+            break;
-+        }
-+
-+        fn = FindFileInSearchPaths( altss, aBaseName + wxT( ".pdf" ), &moresubdirs );
-+
-+        if( !fn.IsEmpty() )
-+            break;
-+#endif
-+
-         subdirs.RemoveAt( subdirs.GetCount() - 1 );
-         altsubdirs.RemoveAt( altsubdirs.GetCount() - 1 );
-+#if ! defined(__WXMAC__) // && defined(__linux__)
-+        moresubdirs.RemoveAt( altsubdirs.GetCount() - 1 );
-+#endif
-     }
- 
-     return fn;
diff --git a/sci-electronics/kicad/files/kicad-5.1.0-swig-4.0.0.patch b/sci-electronics/kicad/files/kicad-5.1.0-swig-4.0.0.patch
deleted file mode 100644
index 3ab6677e5e18..000000000000
--- a/sci-electronics/kicad/files/kicad-5.1.0-swig-4.0.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/scripting/build_tools/fix_swig_imports.py	2019-04-22 23:14:54.000000000 +0200
-+++ b/scripting/build_tools/fix_swig_imports.py	2019-07-18 15:44:24.255754237 +0200
-@@ -40,6 +40,9 @@
- txt = b""
- 
- for l in lines:
-+    if l.startswith(b"if _swig_python_version_info < (2, 7, 0):"):     # ok with swig version >= 4.0.0
-+        l = l.replace(b"_swig_python_version_info < (2, 7, 0)", b"False")
-+        doneOk = True
-     if l.startswith(b"if _swig_python_version_info >= (2, 7, 0):"):     # ok with swig version >= 3.0.10
-         l = l.replace(b"_swig_python_version_info >= (2, 7, 0)", b"False")
-         doneOk = True
diff --git a/sci-electronics/kicad/files/kicad-algorithm-header.patch b/sci-electronics/kicad/files/kicad-5.1.5-algorithm-header.patch
index aa118ea6f860..aa118ea6f860 100644
--- a/sci-electronics/kicad/files/kicad-algorithm-header.patch
+++ b/sci-electronics/kicad/files/kicad-5.1.5-algorithm-header.patch
diff --git a/sci-electronics/kicad/files/ldflags.patch b/sci-electronics/kicad/files/kicad-5.1.5-ldflags.patch
index 1495037b1b72..1495037b1b72 100644
--- a/sci-electronics/kicad/files/ldflags.patch
+++ b/sci-electronics/kicad/files/kicad-5.1.5-ldflags.patch
diff --git a/sci-electronics/kicad/files/kicad-metainfo.patch b/sci-electronics/kicad/files/kicad-5.1.5-metainfo.patch
index 48a5ef5be507..48a5ef5be507 100644
--- a/sci-electronics/kicad/files/kicad-metainfo.patch
+++ b/sci-electronics/kicad/files/kicad-5.1.5-metainfo.patch
diff --git a/sci-electronics/kicad/files/kicad-5.1.6-metainfo.patch b/sci-electronics/kicad/files/kicad-5.1.6-metainfo.patch
new file mode 100644
index 000000000000..675ff749de8d
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-5.1.6-metainfo.patch
@@ -0,0 +1,30 @@
+diff -Naur kicad-5.1.6-orig/CMakeLists.txt kicad-5.1.6/CMakeLists.txt
+--- kicad-5.1.6-orig/CMakeLists.txt	2020-05-11 11:27:08.000000000 -0700
++++ kicad-5.1.6/CMakeLists.txt	2020-05-25 20:45:57.199559075 -0700
+@@ -929,7 +929,7 @@
+     set( UNIX_MIME_FILES ${UNIX_MIME_DIR}/mime )
+     set( UNIX_ICON_FILES ${UNIX_MIME_DIR}/icons )
+     set( UNIX_APPLICATIONS_FILES ${UNIX_MIME_DIR}/applications )
+-    set( UNIX_APPDATA_FILES ${PROJECT_BINARY_DIR}/resources/linux/appdata )
++    set( UNIX_APPDATA_FILES ${PROJECT_BINARY_DIR}/resources/linux/metainfo )
+ 
+     # Install Mime directory
+     install( DIRECTORY ${UNIX_ICON_FILES}
+diff -Naur kicad-5.1.6-orig/CMakeModules/WritePlatformMetadata_linux.cmake kicad-5.1.6/CMakeModules/WritePlatformMetadata_linux.cmake
+--- kicad-5.1.6-orig/CMakeModules/WritePlatformMetadata_linux.cmake	2020-05-11 11:27:08.000000000 -0700
++++ kicad-5.1.6/CMakeModules/WritePlatformMetadata_linux.cmake	2020-05-25 20:54:51.927438936 -0700
+@@ -36,11 +36,11 @@
+ string( TIMESTAMP KICAD_CONFIG_TIMESTAMP "%Y-%m-%d" )
+ 
+ # Configure the KiCad appdata file
+-configure_file( ${PROJECT_SOURCE_DIR}/resources/linux/appdata/kicad.appdata.xml.in
+-                ${PROJECT_BINARY_DIR}/resources/linux/appdata/kicad.appdata.xml
++configure_file( ${PROJECT_SOURCE_DIR}/resources/linux/metainfo/kicad.appdata.xml.in
++                ${PROJECT_BINARY_DIR}/resources/linux/metainfo/kicad.appdata.xml
+                 @ONLY )
+ 
+ # Ensure the file was configured successfully
+-if( NOT EXISTS ${PROJECT_BINARY_DIR}/resources/linux/appdata/kicad.appdata.xml )
++if( NOT EXISTS ${PROJECT_BINARY_DIR}/resources/linux/metainfo/kicad.appdata.xml )
+     message( FATAL_ERROR "Configuration failed to write file kicad.appdata.xml." )
+ endif()
diff --git a/sci-electronics/kicad/files/kicad-5.1.6-ninja-build.patch b/sci-electronics/kicad/files/kicad-5.1.6-ninja-build.patch
new file mode 100644
index 000000000000..baff144fbd85
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-5.1.6-ninja-build.patch
@@ -0,0 +1,45 @@
+diff -Naur kicad-5.1.6-orig/pcbnew/CMakeLists.txt kicad-5.1.6/pcbnew/CMakeLists.txt
+--- kicad-5.1.6-orig/pcbnew/CMakeLists.txt	2020-05-11 11:27:08.000000000 -0700
++++ kicad-5.1.6/pcbnew/CMakeLists.txt	2020-05-25 20:57:03.387859088 -0700
+@@ -805,11 +805,7 @@
+         add_dependencies( ScriptingModulesPcbnewSoCopy ScriptingPythonDirectoryCreation )
+         set( PYMOD_EXT "so" )
+     else()  # only linux remains among supported platforms
+-        add_library( pcbnew_python MODULE $<TARGET_OBJECTS:pcbnew_kiface_objects> )
+-        target_link_libraries( pcbnew_python ${PCBNEW_KIFACE_LIBRARIES} )
+-        set_target_properties( pcbnew_python PROPERTIES OUTPUT_NAME pcbnew PREFIX "_" SUFFIX ".so" )
+-        install( TARGETS pcbnew_python DESTINATION ${PYTHON_DEST} COMPONENT binary )
+-
++        install( FILES ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.kiface DESTINATION ${PYTHON_DEST} COMPONENT binary RENAME "_pcbnew.so" )
+         set( PYMOD_EXT "so" )
+     endif()
+ 
+@@ -824,18 +820,16 @@
+             DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT}
+             )
+     else()
+-
+-
+-    # For phase 1, copy _pcbnew.kiface to the python module.
+-    add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT}
+-        DEPENDS pcbnew_kiface
+-        COMMAND ${CMAKE_COMMAND} -E copy _pcbnew.kiface _pcbnew.${PYMOD_EXT}
+-        COMMENT "Creating python's pcbnew native module _pcbnew.${PYMOD_EXT} for command line use."
+-        )
+-    add_custom_target(
+-        pcbnew_python_module ALL
+-        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT}
+-        )
++        # For phase 1, copy _pcbnew.kiface to the python module.
++        add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT}
++            DEPENDS pcbnew_kiface
++            COMMAND ${CMAKE_COMMAND} -E copy _pcbnew.kiface _pcbnew.${PYMOD_EXT}
++            COMMENT "Creating python's pcbnew native module _pcbnew.${PYMOD_EXT} for command line use."
++            )
++        add_custom_target(
++            pcbnew_python_module ALL
++            DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT}
++            )
+     endif()
+ 
+ endif()