- updated to 5.1.0

diff --git a/3d_plugindir.patch b/3d_plugindir.patch
deleted file mode 100644 (file)
index a6342b4..0000000
--- a/3d_plugindir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- kicad-5.0.0/3d-viewer/3d_plugin_dir.h.in.orig      2018-08-15 21:40:42.199391486 +0200
-+++ kicad-5.0.0/3d-viewer/3d_plugin_dir.h.in   2018-08-15 21:40:57.405953832 +0200
-@@ -1 +1 @@
--#define PLUGINDIR "@CMAKE_INSTALL_LIBDIR@"
-+#define PLUGINDIR "@CMAKE_INSTALL_FULL_LIBDIR@"
---- kicad-5.0.0/3d-viewer/3d_cache/3d_plugin_manager.cpp.orig  2018-07-13 21:53:52.000000000 +0200
-+++ kicad-5.0.0/3d-viewer/3d_cache/3d_plugin_manager.cpp       2018-08-15 21:44:37.981095083 +0200
-@@ -149,15 +149,7 @@
-     #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.
--
--        fn.Assign( wxStandardPaths::Get().GetExecutablePath() );
--        fn.RemoveLastDir();
--        wxString tfname = fn.GetPathWithSep();
--        tfname.Append( wxString::FromUTF8Unchecked( PLUGINDIR ) );
--        fn.Assign( tfname, "");
-+        fn.Assign( wxString::FromUTF8Unchecked( PLUGINDIR ), "");
-         fn.AppendDir( "kicad" );
-     #else
-         // on windows the plugins directory is within the executable's directory

diff --git a/kicad.spec b/kicad.spec
index 4cb0dd72984f0993417f0d0d116bc02d9f1007c0..53f7d9e88c784930935bee1647af16f60793ced6 100644 (file)
--- a/kicad.spec
+++ b/kicad.spec
@@ -4,32 +4,29 @@
 Summary:       KiCad - is a GPL'd suite of programs for EDA
 Summary(pl.UTF-8):     KiCad - zestaw programów na licencji GPL zaliczany do kategorii EDA
 Name:          kicad
-Version:       5.0.2
+Version:       5.1.0
 Release:       1
 Epoch:         1
 License:       GPL v2+
 Group:         X11/Applications
 Source0:       https://launchpad.net/kicad/5.0/%{version}/+download/%{name}-%{version}.tar.xz
-# Source0-md5: bf50bb859a722f02c1dbb53d5b69ad5d
+# Source0-md5: 735cb4d87d3819bf309495746eb13792
 Source1:       https://github.com/KiCad/kicad-doc/archive/%{version}/%{name}-doc-%{version}.tar.gz
-# Source1-md5: 27d3623a32a1776b119dc103debca521
+# Source1-md5: 47142ec31256c1dea25bcd6f4dcd7071
 Source2:       https://github.com/KiCad/kicad-i18n/archive/%{version}/%{name}-i18n-%{version}.tar.gz
-# Source2-md5: 540eb9bbfb2004749ded2553adfcefd1
+# Source2-md5: c1e8fdd7bf4d1377f7ee0968fb5ab1d6
 Source3:       https://github.com/KiCad/kicad-symbols/archive/%{version}/%{name}-symbols-%{version}.tar.gz
-# Source3-md5: 12d1baa4b77f6aa90c0ebe013934bf11
+# Source3-md5: f78847a49329c9d8bfd4f5aac7dc36b1
 Source4:       https://github.com/KiCad/kicad-footprints/archive/%{version}/%{name}-footprints-%{version}.tar.gz
-# Source4-md5: caa7a7e263fb2520a95032485c3e2d13
+# Source4-md5: cbdc858a0657878df24cec5eb0ab64a0
 Source5:       https://github.com/KiCad/kicad-packages3D/archive/%{version}/%{name}-packages3D-%{version}.tar.gz
-# Source5-md5: 9166a728ba291fd943165f14c04399b0
+# Source5-md5: dde395e19f69881930a8820a922f239a
 Source6:       https://github.com/KiCad/kicad-templates/archive/%{version}/%{name}-templates-%{version}.tar.gz
-# Source6-md5: 8ad047f22a0ee9ddcf113300d83a7d83
+# Source6-md5: 451fc7de145ff122f1de08dfcef368d6
 Patch0:                nostrip.patch
-# https://code.launchpad.net/~lkundrak/kicad/appstream-data/+merge/293391
 Patch1:                lto.patch
-Patch2:                python.patch
-Patch3:                3d_plugindir.patch
 URL:           http://www.kicad-pcb.org/
-BuildRequires: GLM
+BuildRequires: GLM >= 0.9.9.4
 BuildRequires: OCE-devel
 BuildRequires: appstream-glib
 BuildRequires: asciidoc
@@ -198,17 +195,6 @@ BuildArch: noarch
 %description doc-ja
 Documentation and tutorials for Kicad in Japanese.
 
-%package doc-nl
-Summary:       Documentation for Kicad in Dutch
-Group:         Documentation
-Requires:      %{name}-doc = %{epoch}:%{version}-%{release}
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
-
-%description doc-nl
-Documentation and tutorials for Kicad in Dutch.
-
 %package doc-pl
 Summary:       Documentation for Kicad in Polish
 Summary(fr.UTF-8):     Documentations pour kicad en polonais
@@ -249,8 +235,6 @@ Documentation and tutorials for Kicad in Chinese.
 %setup -q -a 1 -a 2 -a 3 -a 4 -a 5 -a 6
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 
@@ -437,10 +421,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %lang(ja) %{_docdir}/%{name}/help/ja
 
-%files doc-nl
-%defattr(644,root,root,755)
-%lang(nl) %{_docdir}/%{name}/help/nl
-
 %files doc-pl
 %defattr(644,root,root,755)
 %lang(pl) %{_docdir}/%{name}/help/pl

diff --git a/lto.patch b/lto.patch
index f44498f6da9f3ecf97b2dae804d1e99bf5c819c9..ad2c2f023eb7ffeefef2c1fd4cff1fdc9f6b3156 100644 (file)
--- a/lto.patch
+++ b/lto.patch
@@ -99,8 +99,8 @@
  
  #endif
  
---- kicad-5.0.0/include/system/libcontext.h.orig       2018-07-13 21:53:52.000000000 +0200
-+++ kicad-5.0.0/include/system/libcontext.h    2018-08-12 11:59:20.941248992 +0200
+--- kicad-5.1.0/include/system/libcontext.h.orig       2019-03-08 13:31:50.000000000 +0100
++++ kicad-5.1.0/include/system/libcontext.h    2019-03-15 22:51:14.620823853 +0100
 @@ -30,15 +30,19 @@
      #if defined(__x86_64__) || defined(__amd64__)
          #define LIBCONTEXT_PLATFORM_linux_x86_64
@@ -118,10 +118,10 @@
          #define LIBCONTEXT_PLATFORM_linux_arm64
          #define LIBCONTEXT_CALL_CONVENTION
 +        #define LIBCONTEXT_FUNCTION_ALIGN 2
-     #endif
- 
-     #elif defined(__MINGW32__) || defined(__MINGW64__)
-@@ -74,22 +78,15 @@
+     #elif (__mips__ && _MIPS_SIM == _ABI64)
+         #define LIBCONTEXT_PLATFORM_linux_mips_n64
+         #define LIBCONTEXT_CALL_CONVENTION
+@@ -85,22 +89,15 @@
  
  typedef void* fcontext_t;
  

diff --git a/nostrip.patch b/nostrip.patch
index 7259f5af1c309492d7054a24df9c3144412d4ae0..7437af27c77957c5a2f64060c64e1dbbd5d7a698 100644 (file)
--- a/nostrip.patch
+++ b/nostrip.patch
@@ -1,21 +1,19 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ec4c5b7..1350307 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -187,7 +187,6 @@ if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
+--- kicad-5.1.0/CMakeLists.txt.orig    2019-03-08 13:31:50.000000000 +0100
++++ kicad-5.1.0/CMakeLists.txt 2019-03-15 22:45:43.123178290 +0100
+@@ -311,7 +311,6 @@
      endif()
  
      if( MINGW )
 -        set( CMAKE_EXE_LINKER_FLAGS_RELEASE "-s" )
  
-         # _UNICODE definition seems needed under mingw/gcc 4.8
-         # (Kicad uses unicode, and on Windows, wxWidgets >= 2.9.4 is mandatory
-@@ -236,8 +235,6 @@ if( CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
-             set( CMAKE_SHARED_LINKER_FLAGS "${TO_LINKER},--no-undefined" )
-             set( CMAKE_MODULE_LINKER_FLAGS "${TO_LINKER},--no-undefined" )
+         # Since version 2.8.5, Cmake uses a response file (.rsp) to
+         # pass the list of include paths to gcc
+@@ -343,8 +342,6 @@
+         set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" )
+         set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
  
--            set( CMAKE_EXE_LINKER_FLAGS_RELEASE "-s" )
+-        set( CMAKE_EXE_LINKER_FLAGS_RELEASE "-s" )
 -
-             # Defeat ELF's ability to use the GOT to replace locally implemented functions
-             # with ones from another module.
-             # https://bugs.launchpad.net/kicad/+bug/1322354
+         # Defeat ELF's ability to use the GOT to replace locally implemented functions
+         # with ones from another module.
+         # https://bugs.launchpad.net/kicad/+bug/1322354

diff --git a/python.patch b/python.patch
deleted file mode 100644 (file)
index 988039f..0000000
--- a/python.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- kicad-5.0.0/pcbnew/python/plugins/touch_slider_wizard.py.orig      2018-07-13 21:53:52.000000000 +0200
-+++ kicad-5.0.0/pcbnew/python/plugins/touch_slider_wizard.py   2018-08-13 08:32:44.840047256 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- 
- #
- # This program source code file is part of KiCad, a free EDA CAD application.