Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kicad for openSUSE:Factory checked in at 2022-01-07 12:45:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kicad (Old) and /work/SRC/openSUSE:Factory/.kicad.new.1896 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kicad" Fri Jan 7 12:45:30 2022 rev:41 rq:944138 version:6.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kicad/kicad.changes 2021-11-28 21:30:30.126000701 +0100 +++ /work/SRC/openSUSE:Factory/.kicad.new.1896/kicad.changes 2022-01-07 12:46:50.871864899 +0100 @@ -1,0 +2,9 @@ +Sat Dec 25 16:56:09 UTC 2021 - Stefan Br??ns <stefan.bru...@rwth-aachen.de> + +- Update to version 6.0.0 + See https://www.kicad.org/blog/2021/12/KiCad-6.0.0-Release/ for details. +- Drop no longer necessary kicad-suse-help-path.patch +- Add 0001-Use-library-target-install-for-python-module-to-fix-.patch +- Adjust disk constraints (now 11G) + +------------------------------------------------------------------- Old: ---- kicad-5.1.12.tar.bz2 kicad-suse-help-path.patch New: ---- 0001-Use-library-target-install-for-python-module-to-fix-.patch kicad-6.0.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kicad.spec ++++++ --- /var/tmp/diff_new_pack.yfFL8y/_old 2022-01-07 12:46:51.699865473 +0100 +++ /var/tmp/diff_new_pack.yfFL8y/_new 2022-01-07 12:46:51.699865473 +0100 @@ -16,59 +16,42 @@ # -%if %{suse_version} >= 1550 -%bcond_without python3 -%else -%bcond_with python3 -%endif - -# According to upstream, kicad 5.x.y can be used with the footprint and -# symbol libraries from version 5.0.0 -%define compatversion 5.0.0 +# According to upstream, kicad 6.x.y can be used with the footprint and +# symbol libraries from version 6.0.0 +%define compatversion 6.0.0 Name: kicad -Version: 5.1.12 +Version: 6.0.0 +%define file_version 6.0.0 Release: 0 Summary: EDA software suite for the creation of schematics and PCB License: AGPL-3.0-or-later AND GPL-3.0-or-later Group: Productivity/Scientific/Electronics URL: https://www.kicad.org -Source: https://gitlab.com/kicad/code/kicad/-/archive/%{version}/kicad-%{version}.tar.bz2 -# PATCH-FIX-OPENSUSE davejpla...@gmail.com -kicad-suse-help-path.patch - kicad looks in /usr/share/doc/kicad for help files and doesn't find them. -# this patch adds packges/ befor kicad and enables help to function. -Patch3: kicad-suse-help-path.patch +Source: https://gitlab.com/kicad/code/kicad/-/archive/%{file_version}/kicad-%{file_version}.tar.bz2 +Patch0: 0001-Use-library-target-install-for-python-module-to-fix-.patch -BuildRequires: cmake -BuildRequires: doxygen +BuildRequires: cmake >= 3.14 BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: glm-devel +BuildRequires: gettext +BuildRequires: glm-devel >= 0.9.8 BuildRequires: libboost_filesystem-devel BuildRequires: libboost_system-devel BuildRequires: libboost_test-devel BuildRequires: libngspice-devel BuildRequires: occt-devel BuildRequires: pkg-config +BuildRequires: python3-pybind11-devel +BuildRequires: python3-wxPython BuildRequires: swig >= 3 BuildRequires: update-desktop-files - -%if %{with python3} -BuildRequires: python3-wxPython BuildRequires: wxGTK3-devel >= 3 -BuildRequires: pkgconfig(python3) -Recommends: python3-wxPython -%else -# Use direct version to avoid problems with wx 3.2 -BuildRequires: python-wxWidgets-3_0-devel >= 3 -BuildRequires: wxWidgets-3_0-devel >= 3 -BuildRequires: pkgconfig(python) -Requires: python-wxWidgets-3_0 >= 3 -%endif - BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(glew) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(python3) >= 3.6 BuildRequires: pkgconfig(zlib) # Fix directory owner BuildRequires: hicolor-icon-theme @@ -82,14 +65,15 @@ Requires: kicad-footprints = %{compatversion} # KiCad functions without these packages Recommends: kicad-packages3D = %{compatversion} -Recommends: kicad-i18n = %{version} Recommends: kicad-templates = %{compatversion} +Recommends: python3-wxPython Obsoletes: kicad = 20140120 Provides: kicad = %{compatversion} %description -KiCad is an open source (GPL) software for the creation of electronic schematic -diagrams and printed circuit with up to 32 copper layers and additional techinical layers. +KiCad is an open source (GPL) software for the creation of electronic +schematic diagrams and printed circuit with up to 32 copper layers and +additional technical layers. KiCad includes a project manager and four main independent software tools: - Eeschema: schematic editor. @@ -97,31 +81,53 @@ - Gerbview: GERBER file viewer (photoplotter documents). - Cvpcb: footprint selector for components association. +%package lang +Summary: Translations for package %{name} +Group: System/Localization +Provides: %{name}-lang-all = %{version} +BuildArch: noarch +# Per lang split packages from old kicad-i18n +Conflicts: kicad-lang-bg < 6.0.0 +Conflicts: kicad-lang-ca < 6.0.0 +Conflicts: kicad-lang-cs < 6.0.0 +Conflicts: kicad-lang-de < 6.0.0 +Conflicts: kicad-lang-el < 6.0.0 +Conflicts: kicad-lang-en < 6.0.0 +Conflicts: kicad-lang-es < 6.0.0 +Conflicts: kicad-lang-fi < 6.0.0 +Conflicts: kicad-lang-fr < 6.0.0 +Conflicts: kicad-lang-hu < 6.0.0 +Conflicts: kicad-lang-it < 6.0.0 +Conflicts: kicad-lang-ja < 6.0.0 +Conflicts: kicad-lang-ko < 6.0.0 +Conflicts: kicad-lang-lt < 6.0.0 +Conflicts: kicad-lang-nl < 6.0.0 +Conflicts: kicad-lang-pl < 6.0.0 +Conflicts: kicad-lang-pt < 6.0.0 +Conflicts: kicad-lang-ru < 6.0.0 +Conflicts: kicad-lang-sk < 6.0.0 +Conflicts: kicad-lang-sl < 6.0.0 +Conflicts: kicad-lang-sv < 6.0.0 +Conflicts: kicad-lang-zh_CN < 6.0.0 +Conflicts: kicad-lang-zh_TW < 6.0.0 + +%description lang +Provides translations for the "%{name}" package. + + %prep -%setup -q -n kicad-%{version} -%patch3 +%autosetup -p1 -n kicad-%{file_version} %build -# -DKICAD_PLUGINS:PATH=%%{_libdir}/kicad/plugins \ -# The above path is for .py scripts and other text files install places these files correctly. -# The KICAD_USER_PLUGIN is for binary plugins. %cmake \ - -DKICAD_VERSION_EXTRA=%{version} \ - -DKICAD_LIB:PATH=%{_libdir} \ - -DKICAD_USER_PLUGIN:PATH=%{_libdir}/kicad/plugins \ + -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -pie" \ -DKICAD_DOCS:PATH=%{_docdir}/kicad \ - -DKICAD_DATA:PATH=%{_datadir}/kicad \ - -DBUILD_GITHUB_PLUGIN=ON \ - -DKICAD_SCRIPTING=ON \ - -DKICAD_SCRIPTING_MODULES=ON \ + -DPYTHON_SITE_PACKAGE_PATH=%{python3_sitearch} \ + -DKICAD_BUILD_I18N=ON \ + -DKICAD_I18N_UNIX_STRICT_PATH:BOOL=ON \ -DKICAD_SCRIPTING_WXPYTHON=ON \ -%if %{with python3} - -DKICAD_SCRIPTING_PYTHON3=ON \ - -DKICAD_SCRIPTING_WXPYTHON_PHOENIX=ON \ -%endif -DKICAD_USE_OCC:BOOL=ON \ - -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -pie" \ - -DPYTHON_SITE_PACKAGE_PATH=%{python_sitearch} \ + -DKICAD_PCM=ON \ -DKICAD_SPICE=ON %cmake_build @@ -141,43 +147,54 @@ # Link to library libkicad_3dsg.so.2.0.0 has no use rm -rf %{buildroot}%{_libdir}/libkicad_3dsg.so +# https://gitlab.com/kicad/code/kicad/-/issues/9944 +rm -rf %{buildroot}%{_libdir}/libkicad*.a + # Delete packaging/maintenance scripts rm "%{buildroot}%{_docdir}/kicad/scripts/"{test_kicad_plugin.py,test_plugin.py} # Move remaining standalone scripts to kicad directory mv %{buildroot}%{_docdir}/kicad/scripts %{buildroot}%{_datadir}/kicad/ -%if %{with python3} sed -i '1s@^#!.*python.*@#!/usr/bin/python3@' %{buildroot}%{_datadir}/kicad/scripts/*.py -%else -sed -i '1s@^#!.*python.*@#!/usr/bin/python2@' %{buildroot}%{_datadir}/kicad/scripts/*.py -%endif chmod +x %{buildroot}%{_datadir}/kicad/scripts/*.py # Fix executable bits for scripts executed directly from kicad, remove she-bangs chmod -x %{buildroot}%{_datadir}/kicad/scripting/*/*.py sed -i '1s@^#!.*@@' %{buildroot}%{_datadir}/kicad/scripting/*/*.py -%fdupes -s %{buildroot}%{_datadir}/kicad -%fdupes -s %{buildroot}%{_datadir}/icons/hicolor +%fdupes %{buildroot}%{_datadir}/kicad +%fdupes %{buildroot}%{_datadir}/icons/hicolor # the pcbnew kiface and the python module are actually the same file -cmp --quiet %{buildroot}%{_bindir}/_pcbnew.kiface %{buildroot}%{python_sitearch}/_pcbnew.so && \ - ln -sf %{_bindir}/_pcbnew.kiface %{buildroot}%{python_sitearch}/_pcbnew.so +cmp %{buildroot}%{_bindir}/_pcbnew.kiface %{buildroot}%{python3_sitearch}/_pcbnew.so && \ + ln -sf %{_bindir}/_pcbnew.kiface %{buildroot}%{python3_sitearch}/_pcbnew.so + +%find_lang %{name} + +%check +%ifarch %{ix86} +# https://gitlab.com/kicad/code/kicad/-/issues/10149 +%ctest --exclude-regex qa_eeschema +%else +%ctest +%endif %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%doc README.txt Documentation/changelogs -%license LICENSE.GPLv3 LICENSE.AGPLv3 LICENSE.README +%doc README.md Documentation/changelogs +%license LICENSE.* %{_bindir}/* %{_libdir}/kicad/ %{_datadir}/kicad/ -%{python_sitearch}/* -%{_datadir}/appdata/kicad.appdata.xml +%{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/*.* %{_libdir}/libkicad_3dsg.so.2.0.0 +%files lang -f %{name}.lang + %changelog ++++++ 0001-Use-library-target-install-for-python-module-to-fix-.patch ++++++ >From 6baf90fcbce310036feb88ab021c740c5c079c96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bru...@rwth-aachen.de> Date: Sat, 11 Dec 2021 21:56:31 +0100 Subject: [PATCH] Use library target install for python module to fix RUNPATH When the native python module is copied into the install tree, no special handling for libraries/modules is triggered. This omits the RUNPATH adjustments normally done by CMake during installation of binaries, which is problematic for a number of reasons: - library lookup can fail when dependencies require non-default RUNPATHs - reproducible builds can fail when the buildroot contains semi-random path components Install the library target a second time, which is explicitly allowed by CMake. As RENAME is not supported for `install(TARGETS)`, adjust the name manually. --- pcbnew/CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt index 0ae24f0bd5..85b3cd471e 100644 --- a/pcbnew/CMakeLists.txt +++ b/pcbnew/CMakeLists.txt @@ -817,7 +817,13 @@ elseif( APPLE ) add_dependencies( ScriptingModulesPcbnewSoCopy ScriptingPythonDirectoryCreation ) set( PYMOD_EXT "so" ) else() # only linux remains among supported platforms - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.kiface DESTINATION ${PYTHON_DEST} COMPONENT binary RENAME "_pcbnew.so" ) + install( TARGETS pcbnew_kiface DESTINATION ${PYTHON_DEST} COMPONENT binary ) + cmake_policy(SET CMP0087 NEW) + install( CODE + "file( RENAME + \$ENV{DESTDIR}${PYTHON_DEST}/\$<TARGET_FILE_NAME:pcbnew_kiface> + \$ENV{DESTDIR}${PYTHON_DEST}/_pcbnew.so + )" ) set( PYMOD_EXT "so" ) endif() -- 2.34.1 ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.yfFL8y/_old 2022-01-07 12:46:51.751865509 +0100 +++ /var/tmp/diff_new_pack.yfFL8y/_new 2022-01-07 12:46:51.751865509 +0100 @@ -2,7 +2,7 @@ <constraints> <hardware> <disk> - <size unit="G">9</size> + <size unit="G">11</size> </disk> <memory> <size unit="G">8</size> ++++++ kicad-5.1.12.tar.bz2 -> kicad-6.0.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kicad/kicad-5.1.12.tar.bz2 /work/SRC/openSUSE:Factory/.kicad.new.1896/kicad-6.0.0.tar.bz2 differ: char 11, line 1
