File project.diff of Package kicad.9
--- kicad.changes.orig
+++ kicad.changes
@@ -18,12 +18,17 @@ Fri Feb 21 14:41:18 UTC 2025 - Stefan Br
See https://www.kicad.org/blog/2025/02/Version-9.0.0-Released/ for details
-------------------------------------------------------------------
-Tue Feb 18 20:19:47 UTC 2025 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+Wed Feb 19 14:35:19 UTC 2025 - Michal Suchanek <msuchanek@suse.de>
- Update to 8.0.9:
See https://www.kicad.org/blog/2025/02/KiCad-8.0.9-Release/ for details
-------------------------------------------------------------------
+Thu Jan 30 15:24:44 UTC 2025 - Michal Suchanek <msuchanek@suse.de>
+
+- Fix ngspice0 dependency
+
+-------------------------------------------------------------------
Mon Jan 13 02:24:08 UTC 2025 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Update to 8.0.8:
@@ -39,6 +44,11 @@ Wed Dec 4 09:03:53 UTC 2024 - Stefan Br
* fix_libgit2_API_breakage_again.patch
-------------------------------------------------------------------
+Thu Nov 21 17:15:39 UTC 2024 - Michal Suchanek <msuchanek@suse.de>
+
+- To get current wxPython build with python3.11 on Leap
+
+-------------------------------------------------------------------
Sun Nov 10 14:23:45 UTC 2024 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Fix build with libgit2 >= 1.8.4, the previous API break was
--- kicad.spec.orig
+++ kicad.spec
@@ -16,16 +16,26 @@
#
-%if 0%{?suse_version} > 1600
+%if 0%{?suse_version} == 1600
+%bcond_with use_egl
+%else
%bcond_without use_egl
+%endif
+
+%if 0%{?suse_version} >= 1550
+%define pyver 3
+%define pyver_dot 3
+%define pysite %{python3_sitearch}
%else
-%bcond_with use_egl
+%define pyver 311
+%define pyver_dot 3.11
+%define pysite %{python311_sitearch}
%endif
-# According to upstream, kicad 9.x.y can be used with the footprint and
-# symbol libraries from version 9.0.0
+# According to upstream, kicad 8.x.y can be used with the footprint and
+# symbol libraries from version 8.0.0
%define compatversion 9.0.0
-Name: kicad
+Name: kicad9
Version: 9.0.1
%define file_version 9.0.1
Release: 0
@@ -34,6 +44,9 @@ License: AGPL-3.0-or-later AND GP
Group: Productivity/Scientific/Electronics
URL: https://www.kicad.org
Source: https://gitlab.com/kicad/code/kicad/-/archive/%{file_version}/kicad-%{file_version}.tar.bz2
+Patch1: fix-for-issue-17429-backported-from-master.patch
+Patch2: CN_EDGE-Add-comparison-function.patch
+Patch3: Use-individual-silk-mask-collision-checking-if-solde.patch
BuildRequires: cmake >= 3.16
BuildRequires: fdupes
@@ -41,8 +54,8 @@ BuildRequires: fdupes
%if 0%{?suse_version} >= 1550
BuildRequires: gcc-c++ >= 8
%else
-BuildRequires: gcc11-PIE
-BuildRequires: gcc11-c++ >= 8
+BuildRequires: gcc13-PIE
+BuildRequires: gcc13-c++ >= 8
%endif
BuildRequires: gettext
BuildRequires: glm-devel >= 0.9.8
@@ -51,16 +64,17 @@ BuildRequires: libboost_locale-devel-im
BuildRequires: libboost_system-devel-impl >= 1.71
BuildRequires: libboost_test-devel-impl
BuildRequires: libngspice-devel
+BuildRequires: libzstd-devel
BuildRequires: memory-constraints
+BuildRequires: nng-devel
BuildRequires: occt-devel
BuildRequires: pkg-config
-BuildRequires: python3-pybind11-devel
-BuildRequires: python3-wxPython
+BuildRequires: python%{pyver}-devel
+BuildRequires: python%{pyver}-pybind11-devel
+BuildRequires: python%{pyver}-wxPython
BuildRequires: swig >= 3
BuildRequires: update-desktop-files
BuildRequires: wxGTK3-devel >= 3.2.4
-BuildRequires: cmake(nng)
-BuildRequires: cmake(protobuf)
BuildRequires: pkgconfig(bzip2)
BuildRequires: pkgconfig(cairo)
BuildRequires: pkgconfig(glew)
@@ -69,16 +83,16 @@ BuildRequires: pkgconfig(libgit2)
BuildRequires: pkgconfig(libsecret-1)
BuildRequires: pkgconfig(odbc)
BuildRequires: pkgconfig(openssl)
-BuildRequires: pkgconfig(python3) >= 3.6
+BuildRequires: pkgconfig(protobuf)
BuildRequires: pkgconfig(zlib)
# Fix directory owner
BuildRequires: hicolor-icon-theme
# Test requirements
-BuildRequires: python3-pytest
-BuildRequires: python3-CairoSVG
+BuildRequires: python%{pyver}-pytest
+BuildRequires: python%{pyver}-CairoSVG
# Dlopen'ed simulator library
-Requires: libngspice0
+Requires: libngspice0 >= %(rpm -q --qf "%%{VERSION}" libngspice-devel)
# The help function gives an error without the doc package
Recommends: kicad-doc = %{version}
# You cannot build a schematic without symbols
@@ -88,7 +102,8 @@ Requires: kicad-footprints = %{com
# KiCad functions without these packages
Recommends: kicad-packages3D = %{compatversion}
Recommends: kicad-templates = %{compatversion}
-Recommends: python3-wxPython
+Recommends: python%{pyver}-wxPython
+Recommends: python%{pyver}-wxWidgets_API >= 3.2.4
Obsoletes: kicad = 20140120
Provides: kicad = %{compatversion}
# Test suite fails, 32 bit archs no longer supported
@@ -148,7 +163,7 @@ sed -i -e '/SWIG_OPTS/ { s/ -O/ -py3/ ;
%build
%if 0%{?suse_version} < 1550
-export CXX=g++-11 CC=gcc-11
+export CXX=g++-13 CC=gcc-13
%endif
%limit_build -m 1500
%cmake \
@@ -156,51 +171,51 @@ export CXX=g++-11 CC=gcc-11
-DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -pie" \
-DKICAD_DOCS:PATH=%{_docdir}/kicad \
- -DPYTHON_SITE_PACKAGE_PATH=%{python3_sitearch} \
+ -DPYTHON_SITE_PACKAGE_PATH=%{pysite} \
+ -DPYTHON_EXECUTABLE=/usr/bin/python%{pyver_dot} \
-DKICAD_BUILD_I18N=ON \
-DKICAD_I18N_UNIX_STRICT_PATH:BOOL=ON \
-DKICAD_SCRIPTING_WXPYTHON=ON \
-DKICAD_USE_OCC:BOOL=ON \
-DKICAD_USE_EGL:BOOL=%{?with_use_egl:ON}%{!?with_use_egl:OFF} \
-DKICAD_PCM=ON \
- -DKICAD_SPICE=ON
+ -DKICAD_SPICE=ON \
+ -DCMAKE_INSTALL_PREFIX:PATH=/opt/kicad/usr \
+ -DINCLUDE_INSTALL_DIR:PATH=/opt/kicad/usr/include \
+ -DLIB_INSTALL_DIR:PATH=/opt/kicad/usr/lib64 \
+ -DSYSCONF_INSTALL_DIR:PATH=/opt/kicad/etc \
+ -DSHARE_INSTALL_PREFIX:PATH=/opt/kicad/usr/share \
+ -DCMAKE_MODULES_INSTALL_DIR=/opt/kicad/usr/lib64/cmake/kicad \
+ -DPYTHON_SITE_PACKAGE_PATH=/opt/kicad%{pysite}
%cmake_build
%install
%cmake_install
-%if 0%{?suse_version} < 1550
-%suse_update_desktop_file -r org.kicad.bitmap2component "Education;Engineering"
-%suse_update_desktop_file -r org.kicad.eeschema "Education;Engineering"
-%suse_update_desktop_file -r org.kicad.gerbview "Education;Engineering"
-%suse_update_desktop_file -r org.kicad.kicad "Education;Engineering"
-%suse_update_desktop_file -r org.kicad.pcbcalculator "Education;Engineering"
-%suse_update_desktop_file -r org.kicad.pcbnew "Education;Engineering"
-%endif
-
# Remove development symlinks, pointless without any headers etc.
-rm %{buildroot}%{_libdir}/libki{cad_3dsg,common,gal}.so
+rm %{buildroot}/opt/kicad%{_libdir}/libki{cad_3dsg,common,gal}.so
# https://gitlab.com/kicad/code/kicad/-/issues/9944
-find %{buildroot}%{_libdir} -iname \*.a -print -delete
+find %{buildroot}/opt/kicad%{_libdir} -iname \*.a -print -delete
# Fix executable bits for scripts executed directly from kicad
-chmod -x %{buildroot}%{_datadir}/kicad/scripting/*/*.py
+chmod -x %{buildroot}/opt/kicad%{_datadir}/kicad/scripting/*/*.py
-%fdupes %{buildroot}%{_datadir}/kicad
-%fdupes %{buildroot}%{_datadir}/icons/hicolor
+%fdupes %{buildroot}/opt/kicad%{_datadir}/kicad
+%fdupes %{buildroot}/opt/kicad%{_datadir}/icons/hicolor
-%find_lang %{name}
+%find_lang kicad
%check
./build/kicad/kicad-cli version --format about
%ctest --exclude-regex 'qa_spice|qa_cli|qa_common|qa_pcbnew'
%ifnarch %{ix86}
-%ctest --tests-regex 'qa_spice|qa_cli|qa_common'
+%ctest --tests-regex 'qa_cli|qa_common'
# Occasionally fails
%ctest --repeat until-fail:5 --tests-regex 'qa_pcbnew'
+%ctest --tests-regex 'qa_spice' ||:
%endif
%ifarch %{ix86}
@@ -217,18 +232,31 @@ chmod -x %{buildroot}%{_datadir}/kicad/s
%files
%doc README.md
%license LICENSE.*
-%{_bindir}/*
-%{_libdir}/kicad/
-%{_libdir}/libki*.so.*
-%{_libdir}/libkiapi*.so
-%{_datadir}/kicad/
-%{python3_sitearch}/*
-%{_datadir}/metainfo/org.kicad.kicad.metainfo.xml
-%{_datadir}/applications/*.desktop
-%{_datadir}/mime/packages/kicad-*.xml
-%{_datadir}/icons/hicolor/*/mimetypes/application-x-*
-%{_datadir}/icons/hicolor/*/apps/*.*
-
-%files lang -f %{name}.lang
+/opt/kicad%{_bindir}/*
+/opt/kicad%{_libdir}/kicad/
+/opt/kicad%{_libdir}/libki*.so.*
+/opt/kicad%{_libdir}/libkiapi.so
+/opt/kicad%{_datadir}/kicad/
+/opt/kicad%{pysite}/*
+/opt/kicad%{_datadir}/metainfo/org.kicad.kicad.metainfo.xml
+/opt/kicad%{_datadir}/applications/*.desktop
+/opt/kicad%{_datadir}/mime/packages/kicad-*.xml
+/opt/kicad%{_datadir}/icons/hicolor/*/mimetypes/application-x-*
+/opt/kicad%{_datadir}/icons/hicolor/*/apps/*.*
+%dir /opt/kicad
+%dir /opt/kicad/usr
+%dir /opt/kicad/usr/bin
+/opt/kicad/usr/lib64
+%dir /opt/kicad/usr/share
+/opt/kicad/usr/share/applications
+/opt/kicad/usr/share/icons
+/opt/kicad/usr/share/metainfo
+/opt/kicad/usr/share/mime
+
+%files lang -f kicad.lang
+%dir /opt/kicad
+%dir /opt/kicad/usr
+%dir /opt/kicad/usr/share
+/opt/kicad/usr/share/locale
%changelog
