[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/files/, sci-electronics/kicad/
commit: 996b5c04c7f5fb478244ff8372db0af3eaa130bd
Author: Matthew Smith gentoo org>
AuthorDate: Mon Feb 20 18:33:52 2023 +
Commit: Matthew Smith gentoo org>
CommitDate: Tue Feb 21 17:56:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=996b5c04
sci-electronics/kicad: remove -Werror
Closes: https://bugs.gentoo.org/895014
Acked-by: Zoltan Puskas sinustrom.info>
Signed-off-by: Matthew Smith gentoo.org>
.../kicad/files/kicad-7.0.0-werror.patch| 21 +
sci-electronics/kicad/kicad-7.0.0-r1.ebuild | 2 ++
2 files changed, 23 insertions(+)
diff --git a/sci-electronics/kicad/files/kicad-7.0.0-werror.patch
b/sci-electronics/kicad/files/kicad-7.0.0-werror.patch
new file mode 100644
index ..b5fa3b1ae15d
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-7.0.0-werror.patch
@@ -0,0 +1,21 @@
+From 04fc6081bd3d6575d00589f71150ab796778a9c9 Mon Sep 17 00:00:00 2001
+From: Matthew Smith
+Date: Mon, 20 Feb 2023 17:53:50 +
+Subject: [PATCH] build: Remove Werror flag from clipper2
+
+Bug: https://bugs.gentoo.org/895014
+
+--- a/thirdparty/clipper2/CMakeLists.txt
b/thirdparty/clipper2/CMakeLists.txt
+@@ -27,7 +27,7 @@ target_compile_definitions(clipper2 PUBLIC USINGZ)
+ if (MSVC)
+ target_compile_options(clipper2 PRIVATE /W4 /WX)
+ else()
+- target_compile_options(clipper2 PRIVATE -Wall -Wextra -Wpedantic -Werror)
++ target_compile_options(clipper2 PRIVATE -Wall -Wextra -Wpedantic)
+ target_link_libraries(clipper2 PUBLIC -lm)
+ endif()
+
+--
+2.39.2
+
diff --git a/sci-electronics/kicad/kicad-7.0.0-r1.ebuild
b/sci-electronics/kicad/kicad-7.0.0-r1.ebuild
index 6e1f702ce060..a6db98a4f37a 100644
--- a/sci-electronics/kicad/kicad-7.0.0-r1.ebuild
+++ b/sci-electronics/kicad/kicad-7.0.0-r1.ebuild
@@ -77,6 +77,8 @@ CHECKREQS_DISK_BUILD="900M"
PATCHES=(
# https://bugs.gentoo.org/895188
"${FILESDIR}"/${PN}-7.0.0-wxwidgets-version.patch
+
+ "${FILESDIR}"/${PN}-7.0.0-werror.patch
)
pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/files/, sci-electronics/kicad/
commit: 182524b3a568fe60c1b0e9a6e534fc4fa895c227
Author: Jakov Smolic sartura hr>
AuthorDate: Mon Jan 18 10:14:24 2021 +
Commit: David Seifert gentoo org>
CommitDate: Mon Jan 18 10:14:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=182524b3
sci-electronics/kicad: Remove old
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
sci-electronics/kicad/Manifest | 3 -
.../kicad/files/kicad-5.1.5-algorithm-header.patch | 11 --
.../kicad/files/kicad-5.1.6-ninja-build.patch | 45 --
sci-electronics/kicad/kicad-5.1.6.ebuild | 159 -
sci-electronics/kicad/kicad-5.1.7.ebuild | 158
sci-electronics/kicad/kicad-5.1.8.ebuild | 158
6 files changed, 534 deletions(-)
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index aa0af793ab9..a3d6d27bf93 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,4 +1 @@
-DIST kicad-5.1.6.tar.bz2 18299367 BLAKE2B
b5bfda025bb0be249f2ff334e8b82c49e4e4265fe4cf5daad8a01bfd6149f4c2d1c55d689f3033136ab904f45e8deb9ea12ccde43ea083b14d92e677adf39c0f
SHA512
4fd3d0ac1524cc113210be8dc1b76ab4e02bf271f598943ecab73af98a9dc99009b2d3818c97b358498d2f98ee863f13b21e958fd2143356c2a1368601f0d48a
-DIST kicad-5.1.7.tar.bz2 18279204 BLAKE2B
9d12cf06282d2b8a5c5c4b0a387774ef90f8035bf0fafd9f5d939819f71edbb248d2b15fb4b3f35a80950fd41d140d93165ece61748076d7e2938cc0c9140e46
SHA512
f853eed50245d875b2443cc9accb3c75e8404d8fee12f129df68b3ab7052c31cda1eb0ad22fc10eb23b35250188973fb51a8c55fcb1560ea65d6e5e22b94a182
-DIST kicad-5.1.8.tar.bz2 18282857 BLAKE2B
07afa95853dae587293f71b4b6b5e888610439d39dd5bd715a1f424a837d46894771bf3eb4b447f7a70ea0bb0a810fee141a81bf56a4be50e81415b38552ff11
SHA512
6d40c5ce65c4350174412359d03a9c0c3a311de9ba57d92c1b053fefbb3e518cccb7a38a2a87e8f5b1950a3676514d25ae0e5e14a97b72a56cc0d401aeab3452
DIST kicad-5.1.9.tar.bz2 18597932 BLAKE2B
bc91e1249378970188f968590f70f7f1e4226f9d5cf576da6b3e751332f3a6a2160f261e7a28587ac71bae2e03f77ba3d0aa703422515ea1bd24212de5efd108
SHA512
565226a1ce8d8af8011062f767366b60449d9ce5961f343e495d5b996fb66fbfc885ac3d383892879bdade9e4d374816a54b5eee754fbe5f257e8aaa8de8f739
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
deleted file mode 100644
index aa118ea6f86..000
--- a/sci-electronics/kicad/files/kicad-5.1.5-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-5.1.6-ninja-build.patch
b/sci-electronics/kicad/files/kicad-5.1.6-ninja-build.patch
deleted file mode 100644
index baff144fbd8..000
--- a/sci-electronics/kicad/files/kicad-5.1.6-ninja-build.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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.0
-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
[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/files/, sci-electronics/kicad/
commit: 0079fc0e567fd919f6c8b2cc9a373a56ae8c8dc5
Author: Zoltan Puskas sinustrom info>
AuthorDate: Tue May 26 05:39:33 2020 +
Commit: Alexey Shvetsov gentoo org>
CommitDate: Sat Jun 6 17:46:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0079fc0e
sci-electronics/kicad: Drop 5.1.0, 5.1.2, 5.1.4
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Zoltan Puskas sinustrom.info>
Signed-off-by: Alexey Shvetsov gentoo.org>
sci-electronics/kicad/Manifest | 3 -
sci-electronics/kicad/files/kicad-5.1.0-help.patch | 117 --
.../kicad/files/kicad-5.1.0-swig-4.0.0.patch | 12 --
sci-electronics/kicad/kicad-5.1.0-r1.ebuild| 131
sci-electronics/kicad/kicad-5.1.2-r1.ebuild| 133 -
sci-electronics/kicad/kicad-5.1.4.ebuild | 132
6 files changed, 528 deletions(-)
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index ecfc7f31056..be5b223eb6f 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,8 +1,5 @@
DIST kicad-4.0.7-i18n.tar.gz 2578242 BLAKE2B
610f580d9584cf9ef96686c3d7b7081d4c3a0d2c670482eaa2ef32720a7e71630670845a6050bae8e51df7ac41e30f73d3d11be65ea477ad9efd9fbb5176e2df
SHA512
4880705fd7e95c939b7f5e2b7730fd37c426be10596f4cfa80d7df102d9e67232621900395d45f4e735986054f74fb215ae2002a2818faae32b1c75e3cb7e10a
DIST kicad-4.0.7.tar.xz 10678656 BLAKE2B
54be9a3f5ae6378ac05cb327c28b1a358d895e736a116e1bf5151f021973b9510eab4671a67f222c3be2ef67929954b9576c5c28ef2b6a14708f8c019729969b
SHA512
7b2acd9efadf5d48565f71bd0df2474ecc8fc04145953c13ac27363d48dbe6b0de091e311713635f603aed89ce0759a1d623abb37a139e2c87184ca4e717145b
-DIST kicad-5.1.0.tar.xz 14191708 BLAKE2B
182b2e2d3ddef3d8cae1552b869427b5d63082aeaa1d3bd15d977c5421084fa6134f8d244a3024b46aa56c98c8412d3f1ba8f72b40c73ab9bfebea7535a8a4ad
SHA512
644865932d7e18e446c222cd85e969bb3462bca7fbf6c411e955cd460f5df45ed5221c0948ecd34262a2f5355e586c8fe04c1cb28fa51e4fd09d6f3f78c54761
-DIST kicad-5.1.2.tar.xz 14191500 BLAKE2B
f25de921a8f412dd52ad7afe31c95e3db5d497126925cb024ba31519b1bc1acdc573c4465aaee0b4acf73002100361bb95e4ca325b5199717f1827480d7e1f6e
SHA512
5280be13d82d675aecab208f6d05ac8ac31a8f4d620c541748a1c519f8587b0250f189d8c5cdc0d7fa19b52780e5c68bb3e1956a3f303bb183bfb4c59062be1b
-DIST kicad-5.1.4.tar.xz 14198672 BLAKE2B
99d317df6f2446611614c8d4294b4f8ff81082d2d74d701b616225c5667f96dd5a5bc47511e1af869351af3707244a6d660ff6a3257fe70e1e15df67c8d9fa3b
SHA512
ce0efb740686eafdbbdf8cda68ad800a70c8991302f984be3db4bbdb3bfafe1634871ec6ea26bb6854a417db6336880e5a043dc022ef8126c0e98abc90671337
DIST kicad-5.1.5.tar.xz 14203632 BLAKE2B
cda7bf95c8edbddd36489f299dca9393ee51658e828f7e9f37bfa56955924785186908b0d8c91ae3e895f15cdba50c7579cf7a450e525f4a2ba215a721df26dd
SHA512
5ca19e219da07a906f13e236849eb4497c9f827726a5cd13aceffe1d8c7dee480823bf3e949527f59a805eb3b8176fad51576ae663dd07b10e2822f2b37866a5
DIST kicad-5.1.6.tar.bz2 18299367 BLAKE2B
b5bfda025bb0be249f2ff334e8b82c49e4e4265fe4cf5daad8a01bfd6149f4c2d1c55d689f3033136ab904f45e8deb9ea12ccde43ea083b14d92e677adf39c0f
SHA512
4fd3d0ac1524cc113210be8dc1b76ab4e02bf271f598943ecab73af98a9dc99009b2d3818c97b358498d2f98ee863f13b21e958fd2143356c2a1368601f0d48a
DIST kicad-footprints-4.0.7.tar.gz 4758012 BLAKE2B
ca7ddcad3d1ca658d0d5b7c0a4a0e9a3906619bdbf14195b3bd14c528c01b6e9c1f185036ad495fc88a33a53040ae4d338230d8b2bbb598a69a1c07ddfec3cce
SHA512
9ba08f528d4b3fa6f165a20333ad2e0f6bc4165b51da77bdb080ad2c8cc12c029927ddb2f6aa669b4dac5fac52b8bdbec803d1b7b3fc639e9481bb866b8e3d6f
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 e89b7e45c24..000
--- 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.0
-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.0 -0800
-+++ kicad-5.1.0/CMakeModules/config.h.cmake2019-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.
-
[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/files/, sci-electronics/kicad/
commit: 1d73c3b32fe52dd04d263b9701ce227c1b927891
Author: Zoltan Puskas sinustrom info>
AuthorDate: Tue May 26 04:24:17 2020 +
Commit: Alexey Shvetsov gentoo org>
CommitDate: Sat Jun 6 17:46:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d73c3b3
sci-electronics/kicad: Bump to 5.1.6
Additionally updated to new source URI, and updated some patches.
Bug: https://bugs.gentoo.org/723406
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Zoltan Puskas sinustrom.info>
Signed-off-by: Alexey Shvetsov gentoo.org>
sci-electronics/kicad/Manifest | 1 +
.../kicad/files/kicad-5.1.6-metainfo.patch | 30
.../kicad/files/kicad-5.1.6-ninja-build.patch | 45 ++
sci-electronics/kicad/kicad-5.1.6.ebuild | 152 +
4 files changed, 228 insertions(+)
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 5b38dbd3a14..ecfc7f31056 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -4,5 +4,6 @@ DIST kicad-5.1.0.tar.xz 14191708 BLAKE2B
182b2e2d3ddef3d8cae1552b869427b5d63082a
DIST kicad-5.1.2.tar.xz 14191500 BLAKE2B
f25de921a8f412dd52ad7afe31c95e3db5d497126925cb024ba31519b1bc1acdc573c4465aaee0b4acf73002100361bb95e4ca325b5199717f1827480d7e1f6e
SHA512
5280be13d82d675aecab208f6d05ac8ac31a8f4d620c541748a1c519f8587b0250f189d8c5cdc0d7fa19b52780e5c68bb3e1956a3f303bb183bfb4c59062be1b
DIST kicad-5.1.4.tar.xz 14198672 BLAKE2B
99d317df6f2446611614c8d4294b4f8ff81082d2d74d701b616225c5667f96dd5a5bc47511e1af869351af3707244a6d660ff6a3257fe70e1e15df67c8d9fa3b
SHA512
ce0efb740686eafdbbdf8cda68ad800a70c8991302f984be3db4bbdb3bfafe1634871ec6ea26bb6854a417db6336880e5a043dc022ef8126c0e98abc90671337
DIST kicad-5.1.5.tar.xz 14203632 BLAKE2B
cda7bf95c8edbddd36489f299dca9393ee51658e828f7e9f37bfa56955924785186908b0d8c91ae3e895f15cdba50c7579cf7a450e525f4a2ba215a721df26dd
SHA512
5ca19e219da07a906f13e236849eb4497c9f827726a5cd13aceffe1d8c7dee480823bf3e949527f59a805eb3b8176fad51576ae663dd07b10e2822f2b37866a5
+DIST kicad-5.1.6.tar.bz2 18299367 BLAKE2B
b5bfda025bb0be249f2ff334e8b82c49e4e4265fe4cf5daad8a01bfd6149f4c2d1c55d689f3033136ab904f45e8deb9ea12ccde43ea083b14d92e677adf39c0f
SHA512
4fd3d0ac1524cc113210be8dc1b76ab4e02bf271f598943ecab73af98a9dc99009b2d3818c97b358498d2f98ee863f13b21e958fd2143356c2a1368601f0d48a
DIST kicad-footprints-4.0.7.tar.gz 4758012 BLAKE2B
ca7ddcad3d1ca658d0d5b7c0a4a0e9a3906619bdbf14195b3bd14c528c01b6e9c1f185036ad495fc88a33a53040ae4d338230d8b2bbb598a69a1c07ddfec3cce
SHA512
9ba08f528d4b3fa6f165a20333ad2e0f6bc4165b51da77bdb080ad2c8cc12c029927ddb2f6aa669b4dac5fac52b8bdbec803d1b7b3fc639e9481bb866b8e3d6f
DIST kicad-library-4.0.7.tar.gz 475804416 BLAKE2B
0d6df1df7a72258e896552551996ff13e985976e03b6aafbe900dcc04c9b8eb6e5c1abc242ae5020c1bd20b51e9cc1e60f520b478954edcb6368db7f9ee46df0
SHA512
c5365e18e806102aace785895259deca708a61e0ce37262f5ee2482a8a1f86bc9ce1d37e0fb63cb0661bd5c71064ac36ca2260c9c02ed9790744eedd0a5b5360
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 000..675ff749de8
--- /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.txt2020-05-11 11:27:08.0 -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.0 -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
[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/files/, sci-electronics/kicad/
commit: 41cbc5c9a11f007e126063bc7b60e57b8ca24538
Author: Zoltan Puskas sinustrom info>
AuthorDate: Tue May 12 08:10:34 2020 +
Commit: Alexey Shvetsov gentoo org>
CommitDate: Thu May 14 10:34:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41cbc5c9
sci-electronics/kicad: Drop 5.0.1
Closes: https://bugs.gentoo.org/682480
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Zoltan Puskas sinustrom.info>
Signed-off-by: Alexey Shvetsov gentoo.org>
sci-electronics/kicad/Manifest | 1 -
sci-electronics/kicad/files/kicad-5.0.0-curl.patch | 23
sci-electronics/kicad/files/kicad-5.0.0-help.patch | 117 ---
sci-electronics/kicad/kicad-5.0.1.ebuild | 130 -
4 files changed, 271 deletions(-)
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index be715a6e32b..5b38dbd3a14 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -1,6 +1,5 @@
DIST kicad-4.0.7-i18n.tar.gz 2578242 BLAKE2B
610f580d9584cf9ef96686c3d7b7081d4c3a0d2c670482eaa2ef32720a7e71630670845a6050bae8e51df7ac41e30f73d3d11be65ea477ad9efd9fbb5176e2df
SHA512
4880705fd7e95c939b7f5e2b7730fd37c426be10596f4cfa80d7df102d9e67232621900395d45f4e735986054f74fb215ae2002a2818faae32b1c75e3cb7e10a
DIST kicad-4.0.7.tar.xz 10678656 BLAKE2B
54be9a3f5ae6378ac05cb327c28b1a358d895e736a116e1bf5151f021973b9510eab4671a67f222c3be2ef67929954b9576c5c28ef2b6a14708f8c019729969b
SHA512
7b2acd9efadf5d48565f71bd0df2474ecc8fc04145953c13ac27363d48dbe6b0de091e311713635f603aed89ce0759a1d623abb37a139e2c87184ca4e717145b
-DIST kicad-5.0.1.tar.xz 14241544 BLAKE2B
47b6f8f4443e547dc1251e609b53fc998006c6a9302442a232767c6db79bcd94340afba694d99b6dfad5cf457a524d3dbce7a5971a9dcd13424ccb2b6f8f1de7
SHA512
36f591fe82c2c2da21581ec9425cf3c179839b20ea9db9e2d406220406e9daef6052d29202b4f0fe4fdab73434009626f66ce803e81e7a7dae4df9ea93ed896d
DIST kicad-5.1.0.tar.xz 14191708 BLAKE2B
182b2e2d3ddef3d8cae1552b869427b5d63082aeaa1d3bd15d977c5421084fa6134f8d244a3024b46aa56c98c8412d3f1ba8f72b40c73ab9bfebea7535a8a4ad
SHA512
644865932d7e18e446c222cd85e969bb3462bca7fbf6c411e955cd460f5df45ed5221c0948ecd34262a2f5355e586c8fe04c1cb28fa51e4fd09d6f3f78c54761
DIST kicad-5.1.2.tar.xz 14191500 BLAKE2B
f25de921a8f412dd52ad7afe31c95e3db5d497126925cb024ba31519b1bc1acdc573c4465aaee0b4acf73002100361bb95e4ca325b5199717f1827480d7e1f6e
SHA512
5280be13d82d675aecab208f6d05ac8ac31a8f4d620c541748a1c519f8587b0250f189d8c5cdc0d7fa19b52780e5c68bb3e1956a3f303bb183bfb4c59062be1b
DIST kicad-5.1.4.tar.xz 14198672 BLAKE2B
99d317df6f2446611614c8d4294b4f8ff81082d2d74d701b616225c5667f96dd5a5bc47511e1af869351af3707244a6d660ff6a3257fe70e1e15df67c8d9fa3b
SHA512
ce0efb740686eafdbbdf8cda68ad800a70c8991302f984be3db4bbdb3bfafe1634871ec6ea26bb6854a417db6336880e5a043dc022ef8126c0e98abc90671337
diff --git a/sci-electronics/kicad/files/kicad-5.0.0-curl.patch
b/sci-electronics/kicad/files/kicad-5.0.0-curl.patch
deleted file mode 100644
index c99071c0a54..000
--- a/sci-electronics/kicad/files/kicad-5.0.0-curl.patch
+++ /dev/null
@@ -1,23 +0,0 @@
a/common/CMakeLists.txt.old2018-09-13 16:21:29.642915273 +0200
-+++ a/common/CMakeLists.txt2018-09-13 16:23:25.146914833 +0200
-@@ -337,14 +337,17 @@
- list( APPEND COMMON_SRCS strtok_r.c )
- endif()
-
-+if( BUILD_GITHUB_PLUGIN )
-+list( APPEND COMMON_SRCS
-+kicad_curl/kicad_curl.cpp
-+kicad_curl/kicad_curl_easy.cpp
-+)
-+endif()
-
- set( COMMON_SRCS
- ${COMMON_SRCS}
- system/libcontext.cpp
-
--kicad_curl/kicad_curl.cpp
--kicad_curl/kicad_curl_easy.cpp
--
- view/view.cpp
- view/view_item.cpp
- view/view_group.cpp
diff --git a/sci-electronics/kicad/files/kicad-5.0.0-help.patch
b/sci-electronics/kicad/files/kicad-5.0.0-help.patch
deleted file mode 100644
index 0fb43c3550c..000
--- a/sci-electronics/kicad/files/kicad-5.0.0-help.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-diff -Naur kicad-5.0.1-orig/CMakeLists.txt kicad-5.0.1/CMakeLists.txt
kicad-5.0.1-orig/CMakeLists.txt2018-10-08 14:14:38.0 -0700
-+++ kicad-5.0.1/CMakeLists.txt 2018-12-25 00:04:50.423849671 -0800
-@@ -418,6 +418,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 kicad-5.0.1-orig/CMakeModules/config.h.cmake
kicad-5.0.1/CMakeModules/config.h.cmake
kicad-5.0.1-orig/CMakeModules/config.h.cmake 2018-10-08
14:14:38.0 -0700
-+++ kicad-5.0.1/CMakeModules/config.h.cmake2018-12-25 00:04:39.215828924
-0800
-@@ -59,6 +59,10 @@
- /// The install prefix
[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/files/, sci-electronics/kicad/
commit: d00cfe6700229442c37df3376a5b9220bc156a63
Author: Zoltan Puskas sinustrom info>
AuthorDate: Mon Apr 16 00:55:14 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed May 16 09:03:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d00cfe67
sci-electronics/kicad: Fix configuration issue with >=CMake-3.11
KiCad had a legacy redefinition of the CHECK_CXX_SYMBOL_EXISTS macro,
that is not needed since CMake-2.8.6. Upstream fix:
https://github.com/KiCad/kicad-source-mirror/commit/2e0b75c058d676f427328506bbf3bc10079da117
Also fixed src_configure().
Partial merge of https://github.com/gentoo/gentoo/pull/8020
Closes: https://bugs.gentoo.org/652204
Closes: https://bugs.gentoo.org/652736
Package-Manager: Portage-2.3.28, Repoman-2.3.9
.../files/kicad-cmake-checkcxxsymbolexists.patch | 46 ++
sci-electronics/kicad/kicad-4.0.5-r1.ebuild| 8 ++--
sci-electronics/kicad/kicad-4.0.6.ebuild | 8 ++--
sci-electronics/kicad/kicad-4.0.7.ebuild | 5 ++-
4 files changed, 59 insertions(+), 8 deletions(-)
diff --git a/sci-electronics/kicad/files/kicad-cmake-checkcxxsymbolexists.patch
b/sci-electronics/kicad/files/kicad-cmake-checkcxxsymbolexists.patch
new file mode 100644
index 000..b2a1eeb2cc4
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-cmake-checkcxxsymbolexists.patch
@@ -0,0 +1,46 @@
+diff -Naur kicad-4.0.7.orig/CMakeModules/CheckCXXSymbolExists.cmake
kicad-4.0.7/CMakeModules/CheckCXXSymbolExists.cmake
+--- kicad-4.0.7.orig/CMakeModules/CheckCXXSymbolExists.cmake 2017-08-28
07:31:31.0 -0700
kicad-4.0.7/CMakeModules/CheckCXXSymbolExists.cmake1969-12-31
16:00:00.0 -0800
+@@ -1,42 +0,0 @@
+-# - Check if a symbol exists as a function, variable, or macro in C++
+-# CHECK_CXX_SYMBOL_EXISTS( )
+-#
+-# Check that the is available after including given header
+-# and store the result in a . Specify the list
+-# of files in one argument as a semicolon-separated list.
+-# CHECK_CXX_SYMBOL_EXISTS() can be used to check in C++ files, as opposed
+-# to CHECK_SYMBOL_EXISTS(), which works only for C.
+-#
+-# If the header files define the symbol as a macro it is considered
+-# available and assumed to work. If the header files declare the
+-# symbol as a function or variable then the symbol must also be
+-# available for linking. If the symbol is a type or enum value
+-# it will not be recognized (consider using CheckTypeSize or
+-# CheckCSourceCompiles).
+-#
+-# The following variables may be set before calling this macro to
+-# modify the way the check is run:
+-#
+-# CMAKE_REQUIRED_FLAGS = string of compile command line flags
+-# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
+-# CMAKE_REQUIRED_INCLUDES = list of include directories
+-# CMAKE_REQUIRED_LIBRARIES = list of libraries to link
+-
+-#=
+-# Copyright 2003-2011 Kitware, Inc.
+-#
+-# Distributed under the OSI-approved BSD License (the "License");
+-# see accompanying file Copyright.txt for details.
+-#
+-# This software is distributed WITHOUT ANY WARRANTY; without even the
+-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+-# See the License for more information.
+-#=
+-# (To distribute this file outside of CMake, substitute the full
+-# License text for the above reference.)
+-
+-include(CheckSymbolExists)
+-
+-macro(CHECK_CXX_SYMBOL_EXISTS SYMBOL FILES VARIABLE)
+-
_CHECK_SYMBOL_EXISTS("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckSymbolExists.cxx"
"${SYMBOL}" "${FILES}" "${VARIABLE}" )
+-endmacro()
diff --git a/sci-electronics/kicad/kicad-4.0.5-r1.ebuild
b/sci-electronics/kicad/kicad-4.0.5-r1.ebuild
index da56b49911b..2e59e1a1d63 100644
--- a/sci-electronics/kicad/kicad-4.0.5-r1.ebuild
+++ b/sci-electronics/kicad/kicad-4.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -62,9 +62,12 @@ pkg_setup() {
src_prepare() {
xdg_src_prepare
+ cmake-utils_src_prepare
# Patch to work with >=boost 1.61
eapply "${FILESDIR}/${PN}-boost-1.61.patch"
+ # Patch to work with >=cmake 3.11
+ eapply "${FILESDIR}/${PN}-cmake-checkcxxsymbolexists.patch"
# Remove cvpcb desktop file as it does nothing
rm "resources/linux/mime/applications/cvpcb.desktop" || die
@@ -127,8 +130,6 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
-DKICAD_DOCS="/usr/share/doc/${PF}"
- -DKICAD_HELP="/usr/share/doc/${PF}/help"
- -DwxUSE_UNICODE=ON
-DKICAD_SKIP_BOOST=ON
-DBUILD_GITHUB_PLUGIN="$(usex github)"
[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/files/, sci-electronics/kicad/
commit: 58abb1e482842b9a215c7972810f9f2ed4fe04fc Author: Zoltan Puskas sinustrom info> AuthorDate: Tue May 2 07:31:14 2017 + Commit: Michał Górny gentoo org> CommitDate: Wed May 24 11:02:49 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58abb1e4 sci-electronics/kicad: Bump to 4.0.6 version, #614268 Package-Manager: Portage-2.3.5, Repoman-2.3.2 sci-electronics/kicad/Manifest | 4 + sci-electronics/kicad/files/kicad-boost-1.61.patch | 347 + sci-electronics/kicad/kicad-4.0.6.ebuild | 191 3 files changed, 542 insertions(+) diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest index 59db11de40b..73b9bfaf08a 100644 --- a/sci-electronics/kicad/Manifest +++ b/sci-electronics/kicad/Manifest @@ -2,8 +2,12 @@ DIST kicad-4.0.4-i18n.tar.gz 2409039 SHA256 aec8121fc64985b150c0843db937a3383afe DIST kicad-4.0.4.tar.xz 10672424 SHA256 6da5d3f7bc63a9c5b4d0f5e4b954411b45d712168596b5af02957343c87eda00 SHA512 230eb10d42e004c51d790db0d21dc08653944ca6cc4b728ad34b506f1a2b009c23369ddae417c8fafd420cb8045900dd4145cd1071867c759ab406dd12be3242 WHIRLPOOL c5e577bebfd11160528e9543d9a421a5814ad70134092e9a0bd759b7a941e730b33cac7059606eba049ad5ffc8e6d44a0079bdbe9446ad1f152fa04ec6150d4c DIST kicad-4.0.5-i18n.tar.gz 2464569 SHA256 18538b050f7c85eec0aaf3b2fd0a7a37a4eba139bb3d60be3ef80732e8e4b840 SHA512 ff33051202d3aa50284170ca1b0ebd6279ee60559c4ce88c577248d4fe3d5781bb5b75eea6c165fbbd4abc1fd681357a7d7877339c4413fb3774bc8a55264b81 WHIRLPOOL b63b9b59ddaf21485e8e358c356c694e03608989e6d2e13fc96bc620789cf1df66cf7d4fb051713ebcbd756afe6b43d217746ef2c84b593eeae8909c5e4c781f DIST kicad-4.0.5.tar.xz 10626696 SHA256 73f286733bb69b04749279a1848cbedfad908e7dcd1d11363c7fae7677c85331 SHA512 1486a039237e8d97ed21d62905ab74cb953b76c9d15bdfe7edd7380cf93e4c4b9a23aa82c6f523f6d5272e1dbe06ee8853a80eaabb1d0d9db6e304265f53ba7f WHIRLPOOL a7ca4e8183d44423a2076ca81047965166ed5f15504967ac790c18bedd045e61fbce17e197341876eb73aaa4a9a2571242cc5fcc4853abec99a19b3433690c6e +DIST kicad-4.0.6-i18n.tar.gz 2578341 SHA256 eac9f2d2e4b149bd2bda007faefa1548e538c18be1700a7994829a1e5d0e86ac SHA512 d5a531857ed2699d9bbf583bd0716cef7b39d098e351a8e106d16b0001c592469c4f7a47f0c88e040479e5c515b9de3323b9419dfa17761c3f2cd059af2b0f8c WHIRLPOOL 177367132272d3a340d715c187b2bb3faddfd4c754c674d3a4482b39fe4e1f10cd0be67360c6a3a06f3b3d44865c6faa712b4fd721b1a1a52ef40a94741e5d33 +DIST kicad-4.0.6.tar.xz 10834136 SHA256 e97cacc179839e65f2afa14d8830a3bed549aaa9ed234c988851971bf2a42298 SHA512 f20e5bdb7f4535e8eb9d8d76926a89ad4b69fd727447269f45695556aed9f7ddfdc05f434021bc210490ccb4b5223658eafc275df8cfaae91e22e3b645f2837e WHIRLPOOL b5997b8e25a5624cc366a08e77ee982a8dda71269a2360743621d923b12855ea7d8bd93efece01f633e2999e8773f8fea10fc313a51b2e4b76abde11846dd405 DIST kicad-footprints-4.0.4.tar.gz 1400434 SHA256 2b23e282c64c7e72d9ad52a6f114c20572b8c0e3fd9895b9b87b7ccacc7b4479 SHA512 7d42eea2c7c84961e05e0e61d6380e3d294d696e1321bb4406391125379fd6a3dc2b38e7ff8be51b684786bed892738452218f4c5a95c547319f1eaafc0cea6e WHIRLPOOL 6f96d7ecbe94c511f99c6022466704742aec83578790685c2945926682a0a2c50f2ff176bf075b06cea4cd60fe7afbfb8c142096b6b7a1d73020f0327d1281a8 DIST kicad-footprints-4.0.5.tar.gz 2330378 SHA256 50cb02d9eb44b30f8fd68434172a25a93c62cd9a07877091116fd8db8238f9ad SHA512 91122127be4b54bec7b37706d6438853463ed66b1c0c205e8d93709c159744e84ea58f3bf0cb1f4e18df6061f6df3d76f2ff0d6e698c6ba5ce3867d89838d95d WHIRLPOOL 44283efb35c3522e73d36fc51d591bc236cf2f17b8901279d28908b5a227f791597c74c94bff3be904417df42248b5d16e93a9aaa061132809ffe0507911b186 +DIST kicad-footprints-4.0.6.tar.gz 5315435 SHA256 cb515000ff82ef369ab852a056d32b679f4fb7cd4f908d6d736516c01bc4af6e SHA512 808a5a16cabeb3c7ffcffbef9eb8b57b42953ea23e025c283ad8258a7fc07fecbfeaa4ffd6d33dc8fe00b63c45216a3a9fbd81568a2e99c07b6833df7f04e1a9 WHIRLPOOL 7679c05952bcf6e32e475e868c0ecda8b6b52626a30a8aa0e9a53755bbefb8816cb4de323274d3e9464c33ebbc2a056068eab81edd62c146c9bc52665ecddd55 DIST kicad-libcontext.tar.gz 25599 SHA256 37be6072a6016d402b4341e2ceba719cdd8e279e275ea7275d91e19e813a31a3 SHA512 3b469dcf0e0f4e23f304d0068468a99516e89588d8f36a821af10e751f919cb8a9077d52109fdd43c1c2a443e026b38d0d3aa4774823d05755c9db35742d32d9 WHIRLPOOL d05f43544fa4c9d1fae957445782ad610c07564db81c12491fe6aeaf6948a369b3f55114eacb21916fbc9001f20d0a2c4944c3ab0ccc8e57bf9aa44fea507087 DIST kicad-library-4.0.4.tar.gz 87947075 SHA256 22c02d151aba7ea90c519fda953a8cd882d8da7e36ec0e68ed90a6e15151cdf3 SHA512 57f905277cf581cfda6ca574d87bbdd3a870cd240a151b2c8faedc7ecbfa2cc122b67937cbdbf028be77727cdf4fac9cdc3512ce5bfe80d0f6cbb4f444ccfd6c WHIRLPOOL 1ee926de02ca13c420535487437a45ecf8ea652e854105f4849612a30091ff9f9098d422e7e1c49ab1a6a2cb36cb94d9587a7267851307d947c76109b863da7b DIST kicad-library-4.0.5.tar.gz 91081668 SHA256 7169d1cfa1a55cbe7570252e68dc1242ae91458f16a13f7fc3f7804c504b1af1 SHA512
[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/files/
commit: 66c01bd53b7f13d75df1c8e44c4854390b04c4c5
Author: Michael Mair-Keimberger (asterix) gmail
com>
AuthorDate: Tue Jan 31 17:48:15 2017 +
Commit: David Seifert gentoo org>
CommitDate: Wed Feb 1 22:41:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66c01bd5
sci-electronics/kicad: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/3740
.../kicad/files/kicad-4.0.2-boost-context.patch| 107 -
.../files/kicad-4.0.2-swig-import-helper.patch | 31 --
2 files changed, 138 deletions(-)
diff --git a/sci-electronics/kicad/files/kicad-4.0.2-boost-context.patch
b/sci-electronics/kicad/files/kicad-4.0.2-boost-context.patch
deleted file mode 100644
index 00e80f3..
--- a/sci-electronics/kicad/files/kicad-4.0.2-boost-context.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -Naur kicad-4.0.2-orig/common/system/libcontext.cpp
kicad-4.0.2/common/system/libcontext.cpp
kicad-4.0.2-orig/common/system/libcontext.cpp 2016-06-16
22:30:58.0 -0700
-+++ kicad-4.0.2/common/system/libcontext.cpp2016-06-16 22:35:46.654719468
-0700
-@@ -13,7 +13,7 @@
- http://www.boost.org/LICENSE_1_0.txt)
-
- */
--#include "libcontext.h"
-+#include
- #if defined(LIBCONTEXT_PLATFORM_windows_i386) &&
defined(LIBCONTEXT_COMPILER_gcc)
- __asm (
- ".text\n"
-diff -Naur kicad-4.0.2-orig/CMakeLists.txt kicad-4.0.2/CMakeLists.txt
kicad-4.0.2-orig/CMakeLists.txt2016-02-13 13:14:42.0 -0800
-+++ kicad-4.0.2/CMakeLists.txt 2016-06-11 01:11:25.623484908 -0700
-@@ -561,7 +561,7 @@
- # Download boost and possibly build parts of it
- #
- if( KICAD_SKIP_BOOST )
--find_package( Boost 1.54.0 REQUIRED COMPONENTS context date_time
filesystem iostreams locale
-+find_package( Boost 1.54.0 REQUIRED COMPONENTS date_time filesystem
iostreams locale
-program_options regex
system thread )
-
- if( NOT Boost_FOUND )
-diff -Naur kicad-4.0.2-orig/common/CMakeLists.txt
kicad-4.0.2/common/CMakeLists.txt
kicad-4.0.2-orig/common/CMakeLists.txt 2016-02-13 13:14:42.0
-0800
-+++ kicad-4.0.2/common/CMakeLists.txt 2016-06-11 01:10:04.886830434 -0700
-@@ -256,6 +256,8 @@
- view/view_item.cpp
- view/view_group.cpp
-
-+system/libcontext.cpp
-+
- math/math_util.cpp
-
- tool/tool_action.cpp
-diff -Naur kicad-4.0.2-orig/include/tool/coroutine.h
kicad-4.0.2/include/tool/coroutine.h
kicad-4.0.2-orig/include/tool/coroutine.h 2016-02-13 13:14:42.0
-0800
-+++ kicad-4.0.2/include/tool/coroutine.h 2016-06-11 01:07:06.035378422
-0700
-@@ -27,8 +27,7 @@
-
- #include
-
--#include
--#include
-+#include
-
- #include "delegate.h"
-
-@@ -92,10 +91,8 @@
- if( m_saved )
- delete m_saved;
-
--#if BOOST_VERSION >= 105600
- if( m_self )
- delete m_self;
--#endif
-
- if( m_stack )
- free( m_stack );
-@@ -156,13 +153,9 @@
- assert( m_saved == NULL );
-
- m_args =
--#if BOOST_VERSION >= 105600
--m_self = new boost::context::fcontext_t();
--*m_self = boost::context::make_fcontext( sp, m_stackSize, callerStub
);
--#else
--m_self = boost::context::make_fcontext( sp, m_stackSize, callerStub );
--#endif
--m_saved = new boost::context::fcontext_t();
-+m_self = new fcontext_t();
-+*m_self = make_fcontext( sp, m_stackSize, callerStub );
-+m_saved = new fcontext_t();
-
- m_running = true;
- // off we go!
-@@ -222,14 +215,10 @@
- }
-
- ///> Wrapper for jump_fcontext to assure compatibility between different
boost versions
--static inline intptr_t jump(boost::context::fcontext_t* aOld,
boost::context::fcontext_t* aNew,
-+static inline intptr_t jump(fcontext_t* aOld, fcontext_t* aNew,
- intptr_t aP, bool aPreserveFPU = true )
- {
--#if BOOST_VERSION >= 105600
--return boost::context::jump_fcontext( aOld, *aNew, aP, aPreserveFPU );
--#else
--return boost::context::jump_fcontext( aOld, aNew, aP, aPreserveFPU );
--#endif
-+return jump_fcontext( aOld, *aNew, aP, aPreserveFPU );
- }
-
- template
-@@ -252,10 +241,10 @@
- ReturnType m_retVal;
-
- ///< saved caller context
--boost::context::fcontext_t* m_saved;
-+fcontext_t* m_saved;
-
- ///< saved coroutine context
--boost::context::fcontext_t* m_self;
-+fcontext_t* m_self;
-
- ///< coroutine stack
- void* m_stack;
diff --git a/sci-electronics/kicad/files/kicad-4.0.2-swig-import-helper.patch
b/sci-electronics/kicad/files/kicad-4.0.2-swig-import-helper.patch
deleted file mode 100644
index 9202acc..
--- a/sci-electronics/kicad/files/kicad-4.0.2-swig-import-helper.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Naur
[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/files/, sci-electronics/kicad/
commit: e8c187233e9e706c949815498b06fb7f3fb3a4ae
Author: Zoltan Puskas sinustrom info>
AuthorDate: Tue Sep 20 14:57:17 2016 +
Commit: Mike Gilbert gentoo org>
CommitDate: Tue Sep 20 22:33:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8c18723
sci-electronics/kicad: Add new 4.0.4 ebuild
Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2377
sci-electronics/kicad/Manifest | 4 ++
...ntext.patch => kicad-4.0.2-boost-context.patch} | 0
patch => kicad-4.0.2-swig-import-helper.patch} | 0
...ntext.patch => kicad-4.0.4-boost-context.patch} | 56 +--
sci-electronics/kicad/kicad-4.0.1-r1.ebuild| 2 +-
sci-electronics/kicad/kicad-4.0.2-r1.ebuild| 2 +-
sci-electronics/kicad/kicad-4.0.2-r2.ebuild| 4 +-
sci-electronics/kicad/kicad-4.0.2-r3.ebuild| 6 +-
sci-electronics/kicad/kicad-4.0.2-r4.ebuild| 6 +-
.../{kicad-4.0.2-r4.ebuild => kicad-4.0.4.ebuild} | 64 ++
10 files changed, 72 insertions(+), 72 deletions(-)
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index aba1b59..76b023c 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -4,6 +4,10 @@ DIST kicad-4.0.1.tar.xz 10837804 SHA256
73a9f8713ba93ce34e5f9c26e9667f33a22f4e33
DIST kicad-4.0.2-i18n.tar.gz 2290139 SHA256
05a9a5b1c9a2aa0e0712171c5e71cc3b74c43254a7d5fdd3d3c76e32ff927bea SHA512
2021706d0e96f6a82b57b8f187b703f37c32ee6efb99323ec191de141c2bfc89b590949cdbf2eea6cc618afc84bbac9fae758fdbb088aed3ab06649279bcab21
WHIRLPOOL
0797d587ed4009bc9be6aac0b19f2cd0581e497f074e6cfd33adff6a44b68c215c06c084d8221a57a0f39e228d70e9760bf368770d2bc7bd361be1688a65ab9b
DIST kicad-4.0.2-library.tar.gz 105106185 SHA256
0499da0fa617248a4196e50ff65c0bf78cb456bf1ca4bd6c72d956044b310bef SHA512
14f7136ded81f54fcccbb4555f77b0079d637a08b15b2fd60b729226dbc5adfb5fe7489060ba1d3b949ca1d94d95623df28cceac93ee600165598d9fd78711e7
WHIRLPOOL
c5080ad602684ccdb60493745714398027af2ba09b4a2187740b89fcac923941adda80c744a12338d8c6eda07763fdae12428a8c9d06379a637e3e0ee881bef1
DIST kicad-4.0.2.tar.xz 10841200 SHA256
2eae6986843a29862ab399a30b50454582d22f58ed3f53eb50d0c85e5d488eb9 SHA512
b0817cca7b8d0216507d78c602d332deaf2a68528b129309067b01e254c6600af5513dea7f44570beb4a339bc044ef7966890a91aeda6fd5a95515657cd1628a
WHIRLPOOL
7ae9b072addeea8cc3d6daa69b8f19d077604f0ec5d1e5dfed53efe6b0a32f6b12c1156c2f52092a859d9f716cab83d16b17b0e3abbc0c72a2bafacb3be27719
+DIST kicad-4.0.4-i18n.tar.gz 2409039 SHA256
aec8121fc64985b150c0843db937a3383afe1805697f339aa73009215c1b92cf SHA512
5fcbf54aeff92c142652908dda9e727e8b076aec4531f2bb4d27aa9fd946e92621141a9709a9469c133010cca019e4e6bc9731366e8c1adbe38078f5a6fcaedf
WHIRLPOOL
65c940149ab3357341b41a70f7db35695a598ade462a6fc8e602c4d1b53458fc712706e0effbc8b27b24f95510980a223cb9445b8ca8d54669dd89a65d066a2c
+DIST kicad-4.0.4.tar.xz 10672424 SHA256
6da5d3f7bc63a9c5b4d0f5e4b954411b45d712168596b5af02957343c87eda00 SHA512
230eb10d42e004c51d790db0d21dc08653944ca6cc4b728ad34b506f1a2b009c23369ddae417c8fafd420cb8045900dd4145cd1071867c759ab406dd12be3242
WHIRLPOOL
c5e577bebfd11160528e9543d9a421a5814ad70134092e9a0bd759b7a941e730b33cac7059606eba049ad5ffc8e6d44a0079bdbe9446ad1f152fa04ec6150d4c
DIST kicad-footprints-4.0.1.tar.gz 801985 SHA256
e3b195706c8f30928c34478a87607e996def94a19982f8987a783b8e4ffe112f SHA512
4fef1792eee8be951c77a8684942ecfa9047b602796f90e746010d63f72f5981cb2c90efe28ba7bd7d22894256d23f71b47eb170056e7b4423f72120f5413725
WHIRLPOOL
b41eb7149b14af4c3dd37bc19f7bba9afcc896c1b5d523e7bead0c6695dad7255527f952042589181876dc598d7a85963ab4f86b6c3179e0e82e6f187712c298
DIST kicad-footprints-4.0.2.tar.gz 802003 SHA256
eff257abc2d5e4b1b87b2251c74b5c751271505c0605f31f8f4390dedff43f6f SHA512
2b54bbbcaac8ae17f9b27f2ba2542be10a84fda46266dfa249699d731ceb3de1c8129bcd1e88f045b2fb20af9a58658ef65390ea702e7c583923a50b10cd5a29
WHIRLPOOL
bf9f9475092eb6a9167d5297731942c9f0ad48a49ba05d04db400cff64c46a413ffec68d524f39edbfee05fb55216da5b69dd2c1f409e955cb0758da1383b140
+DIST kicad-footprints-4.0.4.tar.gz 1400434 SHA256
2b23e282c64c7e72d9ad52a6f114c20572b8c0e3fd9895b9b87b7ccacc7b4479 SHA512
7d42eea2c7c84961e05e0e61d6380e3d294d696e1321bb4406391125379fd6a3dc2b38e7ff8be51b684786bed892738452218f4c5a95c547319f1eaafc0cea6e
WHIRLPOOL
6f96d7ecbe94c511f99c6022466704742aec83578790685c2945926682a0a2c50f2ff176bf075b06cea4cd60fe7afbfb8c142096b6b7a1d73020f0327d1281a8
DIST kicad-libcontext.tar.gz 25599 SHA256
37be6072a6016d402b4341e2ceba719cdd8e279e275ea7275d91e19e813a31a3 SHA512
3b469dcf0e0f4e23f304d0068468a99516e89588d8f36a821af10e751f919cb8a9077d52109fdd43c1c2a443e026b38d0d3aa4774823d05755c9db35742d32d9
WHIRLPOOL
d05f43544fa4c9d1fae957445782ad610c07564db81c12491fe6aeaf6948a369b3f55114eacb21916fbc9001f20d0a2c4944c3ab0ccc8e57bf9aa44fea507087
+DIST kicad-library-4.0.4.tar.gz 87947075 SHA256
[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/files/, sci-electronics/kicad/
commit: f228caa38719ad848fa163366c8f96a4d9ded711
Author: Zoltan Puskas sinustrom info>
AuthorDate: Sun Jun 26 08:07:44 2016 +
Commit: Michał Górny gentoo org>
CommitDate: Wed Jun 29 17:56:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f228caa3
sci-electronics/kicad: Fix swig import fixer script for build, #586406
Fix the broken swig import fixer script that did not work with
newer Python versions. Also correct ebuild licensing.
Bug: https://bugs.gentoo.org/586406
Closes: https://github.com/gentoo/gentoo/pull/1745
Package-Manager: portage-2.3.0_rc1
.../kicad/files/kicad-swig-import-helper.patch | 31
sci-electronics/kicad/kicad-4.0.2-r3.ebuild| 203 +
2 files changed, 234 insertions(+)
diff --git a/sci-electronics/kicad/files/kicad-swig-import-helper.patch
b/sci-electronics/kicad/files/kicad-swig-import-helper.patch
new file mode 100644
index 000..9202acc
--- /dev/null
+++ b/sci-electronics/kicad/files/kicad-swig-import-helper.patch
@@ -0,0 +1,31 @@
+diff -Naur kicad-4.0.2-orig/scripting/build_tools/fix_swig_imports.py
kicad-4.0.2/scripting/build_tools/fix_swig_imports.py
+--- kicad-4.0.2-orig/scripting/build_tools/fix_swig_imports.py 2016-02-13
13:14:42.0 -0800
kicad-4.0.2/scripting/build_tools/fix_swig_imports.py 2016-06-26
00:49:20.336661983 -0700
+@@ -37,7 +37,19 @@
+ txt = ""
+
+ for l in lines:
+-if l.startswith("if version_info >= (2,6,0):"): # ok with swig
version <= 3.0.2
++if l.startswith("if _swig_python_version_info >= (2, 7, 0):"): # ok
with swig version >= 3.0.10
++l = l.replace("_swig_python_version_info >= (2, 7, 0)","False")
++doneOk = True
++elif l.startswith("elif _swig_python_version_info >= (2, 6, 0):"): #
needed with swig version >= 3.0.10
++l = l.replace("_swig_python_version_info >= (2, 6, 0)","False")
++doneOk = True
++if l.startswith("if version_info >= (2, 7, 0):"): # ok with swig
version >= 3.0.9
++l = l.replace("version_info >= (2, 7, 0)","False")
++doneOk = True
++elif l.startswith("elif version_info >= (2, 6, 0):"): # needed with swig
version >= 3.0.9
++l = l.replace("version_info >= (2, 6, 0)","False")
++doneOk = True
++elif l.startswith("if version_info >= (2,6,0):"): # ok with swig
version <= 3.0.2
+ l = l.replace("version_info >= (2,6,0)","False")
+ doneOk = True
+ elif l.startswith("if version_info >= (2, 6, 0):"): # needed with swig
version 3.0.3
+@@ -60,6 +72,3 @@
+
+
+ exit(0)
+-
+-
+-
diff --git a/sci-electronics/kicad/kicad-4.0.2-r3.ebuild
b/sci-electronics/kicad/kicad-4.0.2-r3.ebuild
new file mode 100644
index 000..998e630
--- /dev/null
+++ b/sci-electronics/kicad/kicad-4.0.2-r3.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER="3.0"
+
+inherit cmake-utils flag-o-matic gnome2-utils python-single-r1 vcs-snapshot
wxwidgets versionator xdg
+
+DESCRIPTION="Electronic Schematic and PCB design tools."
+HOMEPAGE="http://www.kicad-pcb.org;
+LIBCONTEXT_COMMIT="3d92a1a50f4749b5a92131a957c9615473be85b4"
+
+SERIES=$(get_version_component_range 1-2)
+
+SRC_URI="https://launchpad.net/${PN}/${SERIES}/${PV}/+download/${P}.tar.xz
+ http://downloads.kicad-pcb.org/libraries/${PN}-footprints-${PV}.tar.gz
+ !minimal? ( https://github.com/KiCad/${PN}-library/archive/${PV}.tar.gz
-> ${P}-library.tar.gz )
+ i18n? ( https://github.com/KiCad/${PN}-i18n/archive/${PV}.tar.gz ->
${P}-i18n.tar.gz )
+
https://github.com/twlostow/libcontext/archive/${LIBCONTEXT_COMMIT}.tar.gz ->
${PN}-libcontext.tar.gz"
+
+LICENSE="GPL-2+ GPL-3+ Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc examples github i18n minimal +python webkit"
+LANGS="bg ca cs de el es fi fr hu it ja ko nl pl pt ru sk sl sv zh_CN"
+for lang in ${LANGS} ; do
+ IUSE="${IUSE} linguas_${lang}"
+done
+unset lang
+unset LANGS
+
+REQUIRED_USE="
+ github? ( webkit )
+ python? ( ${PYTHON_REQUIRED_USE} )"
+
+CDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit?]
+ python? (
+ dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}]
+ ${PYTHON_DEPS}
+ )
+ >=dev-libs/boost-1.56[nls,threads,python?]
+ github? ( dev-libs/openssl:0 )
+ media-libs/glew
+ media-libs/freeglut
+ media-libs/mesa
+ sys-libs/zlib
+ x11-libs/cairo"
+DEPEND="${CDEPEND}
+ doc? ( app-doc/doxygen )
+ i18n? ( virtual/libintl )
+ python? ( dev-lang/swig:0 )
+ app-text/dos2unix"
+RDEPEND="${CDEPEND}
+ sci-electronics/electronics-menu"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ xdg_src_prepare
+
+ # Add separated out libcontext files and patch source to use them
+
[gentoo-commits] repo/gentoo:master commit in: sci-electronics/kicad/files/, sci-electronics/kicad/
commit: d926c776cd06ce6d6b25213f4172c297e053e373 Author: Zoltan Puskas sinustrom info> AuthorDate: Sat Jun 11 08:24:50 2016 + Commit: Jason Zaman gentoo org> CommitDate: Sat Jun 18 07:30:54 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d926c776 sci-electronics/kicad: Fix build issue with dev-libs/boost-1.61 Boost in 1.61 removed context API. Kicad developers had a patch, that was autogenerated from boost and replaces context library. Gentoo bug: #583640 Package-Manager: portage-2.3.0_rc1 sci-electronics/kicad/Manifest | 1 + .../kicad/files/kicad-boost-context.patch | 107 +++ sci-electronics/kicad/kicad-4.0.2-r2.ebuild| 201 + 3 files changed, 309 insertions(+) diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest index 7d23793..aba1b59 100644 --- a/sci-electronics/kicad/Manifest +++ b/sci-electronics/kicad/Manifest @@ -6,3 +6,4 @@ DIST kicad-4.0.2-library.tar.gz 105106185 SHA256 0499da0fa617248a4196e50ff65c0bf DIST kicad-4.0.2.tar.xz 10841200 SHA256 2eae6986843a29862ab399a30b50454582d22f58ed3f53eb50d0c85e5d488eb9 SHA512 b0817cca7b8d0216507d78c602d332deaf2a68528b129309067b01e254c6600af5513dea7f44570beb4a339bc044ef7966890a91aeda6fd5a95515657cd1628a WHIRLPOOL 7ae9b072addeea8cc3d6daa69b8f19d077604f0ec5d1e5dfed53efe6b0a32f6b12c1156c2f52092a859d9f716cab83d16b17b0e3abbc0c72a2bafacb3be27719 DIST kicad-footprints-4.0.1.tar.gz 801985 SHA256 e3b195706c8f30928c34478a87607e996def94a19982f8987a783b8e4ffe112f SHA512 4fef1792eee8be951c77a8684942ecfa9047b602796f90e746010d63f72f5981cb2c90efe28ba7bd7d22894256d23f71b47eb170056e7b4423f72120f5413725 WHIRLPOOL b41eb7149b14af4c3dd37bc19f7bba9afcc896c1b5d523e7bead0c6695dad7255527f952042589181876dc598d7a85963ab4f86b6c3179e0e82e6f187712c298 DIST kicad-footprints-4.0.2.tar.gz 802003 SHA256 eff257abc2d5e4b1b87b2251c74b5c751271505c0605f31f8f4390dedff43f6f SHA512 2b54bbbcaac8ae17f9b27f2ba2542be10a84fda46266dfa249699d731ceb3de1c8129bcd1e88f045b2fb20af9a58658ef65390ea702e7c583923a50b10cd5a29 WHIRLPOOL bf9f9475092eb6a9167d5297731942c9f0ad48a49ba05d04db400cff64c46a413ffec68d524f39edbfee05fb55216da5b69dd2c1f409e955cb0758da1383b140 +DIST kicad-libcontext.tar.gz 25599 SHA256 37be6072a6016d402b4341e2ceba719cdd8e279e275ea7275d91e19e813a31a3 SHA512 3b469dcf0e0f4e23f304d0068468a99516e89588d8f36a821af10e751f919cb8a9077d52109fdd43c1c2a443e026b38d0d3aa4774823d05755c9db35742d32d9 WHIRLPOOL d05f43544fa4c9d1fae957445782ad610c07564db81c12491fe6aeaf6948a369b3f55114eacb21916fbc9001f20d0a2c4944c3ab0ccc8e57bf9aa44fea507087 diff --git a/sci-electronics/kicad/files/kicad-boost-context.patch b/sci-electronics/kicad/files/kicad-boost-context.patch new file mode 100644 index 000..00e80f3 --- /dev/null +++ b/sci-electronics/kicad/files/kicad-boost-context.patch @@ -0,0 +1,107 @@ +diff -Naur kicad-4.0.2-orig/common/system/libcontext.cpp kicad-4.0.2/common/system/libcontext.cpp +--- kicad-4.0.2-orig/common/system/libcontext.cpp 2016-06-16 22:30:58.0 -0700 kicad-4.0.2/common/system/libcontext.cpp2016-06-16 22:35:46.654719468 -0700 +@@ -13,7 +13,7 @@ + http://www.boost.org/LICENSE_1_0.txt) + + */ +-#include "libcontext.h" ++#include + #if defined(LIBCONTEXT_PLATFORM_windows_i386) && defined(LIBCONTEXT_COMPILER_gcc) + __asm ( + ".text\n" +diff -Naur kicad-4.0.2-orig/CMakeLists.txt kicad-4.0.2/CMakeLists.txt +--- kicad-4.0.2-orig/CMakeLists.txt2016-02-13 13:14:42.0 -0800 kicad-4.0.2/CMakeLists.txt 2016-06-11 01:11:25.623484908 -0700 +@@ -561,7 +561,7 @@ + # Download boost and possibly build parts of it + # + if( KICAD_SKIP_BOOST ) +-find_package( Boost 1.54.0 REQUIRED COMPONENTS context date_time filesystem iostreams locale ++find_package( Boost 1.54.0 REQUIRED COMPONENTS date_time filesystem iostreams locale +program_options regex system thread ) + + if( NOT Boost_FOUND ) +diff -Naur kicad-4.0.2-orig/common/CMakeLists.txt kicad-4.0.2/common/CMakeLists.txt +--- kicad-4.0.2-orig/common/CMakeLists.txt 2016-02-13 13:14:42.0 -0800 kicad-4.0.2/common/CMakeLists.txt 2016-06-11 01:10:04.886830434 -0700 +@@ -256,6 +256,8 @@ + view/view_item.cpp + view/view_group.cpp + ++system/libcontext.cpp ++ + math/math_util.cpp + + tool/tool_action.cpp +diff -Naur kicad-4.0.2-orig/include/tool/coroutine.h kicad-4.0.2/include/tool/coroutine.h +--- kicad-4.0.2-orig/include/tool/coroutine.h 2016-02-13 13:14:42.0 -0800 kicad-4.0.2/include/tool/coroutine.h 2016-06-11 01:07:06.035378422 -0700 +@@ -27,8 +27,7 @@ + + #include + +-#include +-#include ++#include + + #include "delegate.h" + +@@ -92,10 +91,8 @@ + if( m_saved ) + delete m_saved; + +-#if BOOST_VERSION >= 105600 + if( m_self ) +
