From 9452a6e87b6c2c70513bc47a2470bf9f1168920e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Jun 2020 10:39:22 +0100 Subject: gentoo resync : 13.06.2020 --- sci-electronics/kicad/files/kicad-5.1.0-help.patch | 117 --------------------- .../kicad/files/kicad-5.1.0-swig-4.0.0.patch | 12 --- .../kicad/files/kicad-5.1.5-algorithm-header.patch | 11 ++ .../kicad/files/kicad-5.1.5-ldflags.patch | 17 +++ .../kicad/files/kicad-5.1.5-metainfo.patch | 12 +++ .../kicad/files/kicad-5.1.6-metainfo.patch | 30 ++++++ .../kicad/files/kicad-5.1.6-ninja-build.patch | 45 ++++++++ .../kicad/files/kicad-algorithm-header.patch | 11 -- sci-electronics/kicad/files/kicad-metainfo.patch | 12 --- sci-electronics/kicad/files/ldflags.patch | 17 --- 10 files changed, 115 insertions(+), 169 deletions(-) delete mode 100644 sci-electronics/kicad/files/kicad-5.1.0-help.patch delete mode 100644 sci-electronics/kicad/files/kicad-5.1.0-swig-4.0.0.patch create mode 100644 sci-electronics/kicad/files/kicad-5.1.5-algorithm-header.patch create mode 100644 sci-electronics/kicad/files/kicad-5.1.5-ldflags.patch create mode 100644 sci-electronics/kicad/files/kicad-5.1.5-metainfo.patch create mode 100644 sci-electronics/kicad/files/kicad-5.1.6-metainfo.patch create mode 100644 sci-electronics/kicad/files/kicad-5.1.6-ninja-build.patch delete mode 100644 sci-electronics/kicad/files/kicad-algorithm-header.patch delete mode 100644 sci-electronics/kicad/files/kicad-metainfo.patch delete mode 100644 sci-electronics/kicad/files/ldflags.patch (limited to 'sci-electronics/kicad/files') 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 - #include --#include // to define DEFAULT_INSTALL_PATH -+#include // to define DEFAULT_INSTALL_PATH and KICAD_HELP - #include - #include - -@@ -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 "/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 "/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-5.1.5-algorithm-header.patch b/sci-electronics/kicad/files/kicad-5.1.5-algorithm-header.patch new file mode 100644 index 000000000000..aa118ea6f860 --- /dev/null +++ b/sci-electronics/kicad/files/kicad-5.1.5-algorithm-header.patch @@ -0,0 +1,11 @@ +diff -Naur kicad-5.1.5-orig/common/lib_tree_model.cpp kicad-5.1.5/common/lib_tree_model.cpp +--- kicad-5.1.5-orig/common/lib_tree_model.cpp 2020-05-11 00:36:36.568301297 +0200 ++++ kicad-5.1.5/common/lib_tree_model.cpp 2020-05-11 00:37:50.472359703 +0200 +@@ -21,6 +21,7 @@ + + #include + ++#include + #include + #include + #include diff --git a/sci-electronics/kicad/files/kicad-5.1.5-ldflags.patch b/sci-electronics/kicad/files/kicad-5.1.5-ldflags.patch new file mode 100644 index 000000000000..1495037b1b72 --- /dev/null +++ b/sci-electronics/kicad/files/kicad-5.1.5-ldflags.patch @@ -0,0 +1,17 @@ +diff -Naur kicad-5.1.5-orig/CMakeLists.txt kicad-5.1.5/CMakeLists.txt +--- kicad-5.1.5-orig/CMakeLists.txt 2019-11-14 09:09:45.000000000 -0800 ++++ kicad-5.1.5/CMakeLists.txt 2019-11-19 02:08:32.309282631 -0800 +@@ -355,10 +355,10 @@ + + elseif( NOT APPLE ) + # Thou shalt not link vaporware and tell us it's a valid DSO (apple ld doesn't support it) +- set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" ) +- set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" ) ++ set( CMAKE_SHARED_LINKER_FLAGS "$ENV{LDFLAGS} -Wl,--no-undefined" ) ++ set( CMAKE_MODULE_LINKER_FLAGS "$ENV{LDFLAGS} -Wl,--no-undefined" ) + +- set( CMAKE_EXE_LINKER_FLAGS_RELEASE "-s" ) ++ set( CMAKE_EXE_LINKER_FLAGS_RELEASE "$ENV{LDFLAGS} -s" ) + + # Defeat ELF's ability to use the GOT to replace locally implemented functions + # with ones from another module. diff --git a/sci-electronics/kicad/files/kicad-5.1.5-metainfo.patch b/sci-electronics/kicad/files/kicad-5.1.5-metainfo.patch new file mode 100644 index 000000000000..48a5ef5be507 --- /dev/null +++ b/sci-electronics/kicad/files/kicad-5.1.5-metainfo.patch @@ -0,0 +1,12 @@ +diff -Naur kicad-5.1.5-orig/CMakeLists.txt kicad-5.1.5/CMakeLists.txt +--- kicad-5.1.5-orig/CMakeLists.txt 2019-11-14 09:09:45.000000000 -0800 ++++ kicad-5.1.5/CMakeLists.txt 2020-05-11 23:51:52.122093410 -0700 +@@ -919,7 +919,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 resources/linux/appdata ) ++ set( UNIX_APPDATA_FILES resources/linux/metainfo ) + + # Install Mime directory + install( DIRECTORY ${UNIX_ICON_FILES} 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_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() diff --git a/sci-electronics/kicad/files/kicad-algorithm-header.patch b/sci-electronics/kicad/files/kicad-algorithm-header.patch deleted file mode 100644 index aa118ea6f860..000000000000 --- a/sci-electronics/kicad/files/kicad-algorithm-header.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur kicad-5.1.5-orig/common/lib_tree_model.cpp kicad-5.1.5/common/lib_tree_model.cpp ---- kicad-5.1.5-orig/common/lib_tree_model.cpp 2020-05-11 00:36:36.568301297 +0200 -+++ kicad-5.1.5/common/lib_tree_model.cpp 2020-05-11 00:37:50.472359703 +0200 -@@ -21,6 +21,7 @@ - - #include - -+#include - #include - #include - #include diff --git a/sci-electronics/kicad/files/kicad-metainfo.patch b/sci-electronics/kicad/files/kicad-metainfo.patch deleted file mode 100644 index 48a5ef5be507..000000000000 --- a/sci-electronics/kicad/files/kicad-metainfo.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur kicad-5.1.5-orig/CMakeLists.txt kicad-5.1.5/CMakeLists.txt ---- kicad-5.1.5-orig/CMakeLists.txt 2019-11-14 09:09:45.000000000 -0800 -+++ kicad-5.1.5/CMakeLists.txt 2020-05-11 23:51:52.122093410 -0700 -@@ -919,7 +919,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 resources/linux/appdata ) -+ set( UNIX_APPDATA_FILES resources/linux/metainfo ) - - # Install Mime directory - install( DIRECTORY ${UNIX_ICON_FILES} diff --git a/sci-electronics/kicad/files/ldflags.patch b/sci-electronics/kicad/files/ldflags.patch deleted file mode 100644 index 1495037b1b72..000000000000 --- a/sci-electronics/kicad/files/ldflags.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur kicad-5.1.5-orig/CMakeLists.txt kicad-5.1.5/CMakeLists.txt ---- kicad-5.1.5-orig/CMakeLists.txt 2019-11-14 09:09:45.000000000 -0800 -+++ kicad-5.1.5/CMakeLists.txt 2019-11-19 02:08:32.309282631 -0800 -@@ -355,10 +355,10 @@ - - elseif( NOT APPLE ) - # Thou shalt not link vaporware and tell us it's a valid DSO (apple ld doesn't support it) -- set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" ) -- set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" ) -+ set( CMAKE_SHARED_LINKER_FLAGS "$ENV{LDFLAGS} -Wl,--no-undefined" ) -+ set( CMAKE_MODULE_LINKER_FLAGS "$ENV{LDFLAGS} -Wl,--no-undefined" ) - -- set( CMAKE_EXE_LINKER_FLAGS_RELEASE "-s" ) -+ set( CMAKE_EXE_LINKER_FLAGS_RELEASE "$ENV{LDFLAGS} -s" ) - - # Defeat ELF's ability to use the GOT to replace locally implemented functions - # with ones from another module. -- cgit v1.2.3