diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-06-13 10:39:22 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-06-13 10:39:22 +0100 |
commit | 9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch) | |
tree | 8ac67e26b45f34d71c5aab3621813b100a0d5f00 /sci-electronics/kicad | |
parent | f516638b7fe9592837389826a6152a7e1b251c54 (diff) |
gentoo resync : 13.06.2020
Diffstat (limited to 'sci-electronics/kicad')
-rw-r--r-- | sci-electronics/kicad/Manifest | 20 | ||||
-rw-r--r-- | sci-electronics/kicad/files/kicad-5.1.0-help.patch | 117 | ||||
-rw-r--r-- | sci-electronics/kicad/files/kicad-5.1.0-swig-4.0.0.patch | 12 | ||||
-rw-r--r-- | sci-electronics/kicad/files/kicad-5.1.5-algorithm-header.patch (renamed from sci-electronics/kicad/files/kicad-algorithm-header.patch) | 0 | ||||
-rw-r--r-- | sci-electronics/kicad/files/kicad-5.1.5-ldflags.patch (renamed from sci-electronics/kicad/files/ldflags.patch) | 0 | ||||
-rw-r--r-- | sci-electronics/kicad/files/kicad-5.1.5-metainfo.patch (renamed from sci-electronics/kicad/files/kicad-metainfo.patch) | 0 | ||||
-rw-r--r-- | sci-electronics/kicad/files/kicad-5.1.6-metainfo.patch | 30 | ||||
-rw-r--r-- | sci-electronics/kicad/files/kicad-5.1.6-ninja-build.patch | 45 | ||||
-rw-r--r-- | sci-electronics/kicad/kicad-5.1.0-r1.ebuild | 131 | ||||
-rw-r--r-- | sci-electronics/kicad/kicad-5.1.2-r1.ebuild | 133 | ||||
-rw-r--r-- | sci-electronics/kicad/kicad-5.1.5-r2.ebuild | 14 | ||||
-rw-r--r-- | sci-electronics/kicad/kicad-5.1.6.ebuild (renamed from sci-electronics/kicad/kicad-5.1.4.ebuild) | 76 |
12 files changed, 138 insertions, 440 deletions
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest index d4dadec3e3fe..614ca5eca4fe 100644 --- a/sci-electronics/kicad/Manifest +++ b/sci-electronics/kicad/Manifest @@ -1,25 +1,21 @@ -AUX kicad-5.1.0-help.patch 4690 BLAKE2B 5459e3e7fde22590f4357ec3981c9bc2d784f533cc0370befb6851fb01954923722c815aaafa4dcd37f15c74bc31fd3b711ac106301abeb195dedc8086965c47 SHA512 ed5c70b0157ff4db152e2374df669210b194147655c7c5083ffb2f5ce56358c30c4cb2aaff2368f3a34757e5a5021b335ce169727eaaf511b12d1ceb3fb9a350 -AUX kicad-5.1.0-swig-4.0.0.patch 623 BLAKE2B 66d3974741793b84a192d9223e739deddc544c230a8618aa78db1fe48bec1a632cb07bfcdb0b01137c1b1e4cb7d5fda4330c7cb717ea894d6279660752056e7b SHA512 c43552d6da296cbc11232f565a9525fc707304e9a823e4e003d998f4ef013d82708c7b17b4bcef82c661e0f53e849d372c089a077a356b006db3523ffe82892a +AUX kicad-5.1.5-algorithm-header.patch 417 BLAKE2B 644aeb5a0c2b084aeea5fd1a18d03bd16df6762a8b848021d6a0e6549142c9e1d3318c7bf20c9b594f9cebe67ecdebd42eacd2d15cb9e0652a5fc3afbc9b12fe SHA512 22424e038ee90dc73344dde8de553c614b3c29fb98fd74879b9dff4196a0d3317be8ec55d95bef57303e5961b20098ed4e29e1dfc25c206d396167a835ac6e9f AUX kicad-5.1.5-help.patch 4660 BLAKE2B c0521bea600748605dd581c34d63b6d084225d339f035167c3d0f0801f396ddfbbee22d843be53f81440b199c307604c98f08509fe9ec55efab6c297a7175947 SHA512 704fb0cc60bc18610bd410028c5c6302548bac646b0653ba32355b03fadbe4d8366dbad18469d5fd49d1d86e70497a13cbc2748c9e4b139d3a640c46bce50a36 +AUX kicad-5.1.5-ldflags.patch 890 BLAKE2B 2c5436fccb50886faacd84102ba7bfefa84986a5d65ea70965d2f0ded81e746e544f774bdfc0c539114dbafa3de7340bc41ea5af7a5db8a54b706221cafee7ee SHA512 4fda20a73499df81614dd920d18767d901269375d17749982d2c51cf595c873531379ac8ef57b1fc7adc1f4f028907002135f2e0fccaf4ee753184298e7cf8fd +AUX kicad-5.1.5-metainfo.patch 582 BLAKE2B 4eeeca5edb27989bfb953e8154dde533cca80cd2afa42e6e3bbd06190ca7371f48cdea2610761092a80e9cf0f25ebb8ea40271d79fef2fb3e7c803accf6fcd02 SHA512 cd3f0366df21609a7deadffb7bb4a2a134c9bc6e5c1aa8ef9b3c685cffc1662ddb8cd8d3769b52c0fe77af832f0b4758584c0b29e8af54a20667f2f522e15585 AUX kicad-5.1.5-ninja-build.patch 2171 BLAKE2B 1b9c6f07abed53e04f676f9aaea6f4e244ca0293e725a81c4d1037e0453201f00cc1d7267b48793c11f0715154762240fefb48ac3b3efcb905857eef76016c66 SHA512 e0ca5eb4695948934c89f3a19edb8dbb77c34039d65c5c0ffaa42c16c5cab0cc5537c747a2f9c2e154be9861f8171537fec6004208b91f32736f521465c959a4 AUX kicad-5.1.5-strict-aliasing.patch 916 BLAKE2B e17c085d09d5b028424d72036e6306aecf19300fa5ecc38e0a3b4f7668ed8e41aa7c66f5f6dc68f6a66905fea8947647de90788fe2ca5439703b3fe2010b287e SHA512 1000ea7dd6fef283d144ccd9d6193a68a399177e06b1f45cae5642f7c2854d16d3cf4d789f8444c6aa36028f23b7d66c6de7596ffef57c4ecdc28747fac84636 -AUX kicad-algorithm-header.patch 417 BLAKE2B 644aeb5a0c2b084aeea5fd1a18d03bd16df6762a8b848021d6a0e6549142c9e1d3318c7bf20c9b594f9cebe67ecdebd42eacd2d15cb9e0652a5fc3afbc9b12fe SHA512 22424e038ee90dc73344dde8de553c614b3c29fb98fd74879b9dff4196a0d3317be8ec55d95bef57303e5961b20098ed4e29e1dfc25c206d396167a835ac6e9f +AUX kicad-5.1.6-metainfo.patch 1740 BLAKE2B 26987940c5326d5fa27eb7a00bfec8af2bc7d4f61b937f4a12aaf08665c1d9a5d2816b154c76e954f80f7c8c620861e290988bafb3af071ae059bfb92113a2f2 SHA512 bf1b9d7adc23759e9b637f2d2f3d2843f1ef33a27c02f7e892a74a8743dfdcf635f918010f0bcc4a62ba0f7e939f89fa8c7786a761ffe709f670a0d6f63b3146 +AUX kicad-5.1.6-ninja-build.patch 2154 BLAKE2B 8b7fd64878e8dac5e9dcfdad262cdde1ca87460d7776d0213f0cfec39b432d638651260cc0b537b9fb5cb18de6e020d2920d065333cebc5f2dd1606e43a69d9a SHA512 8d1d9740b8f09623580ec1ddc8a9de407b3db0fe7ae0705ef3f1c7b234972a05b32885c581c9af26ae8a245c3b5b0e2c2eacc37bffce11881b50c43003ee77fa AUX kicad-boost-1.61.patch 9565 BLAKE2B edfafc5a9ef70ace413f7b1fb1c0a47fb4abc4bd52f0ec085d5449b5dc7bea454f16e809ea0c12a274f809bd52549507aefee6e34c9f32bf341449e6de2c87cf SHA512 a960117a4c08144de5111e76a33f208a9b3fe702d10ec2546afc57faf3de3fccfe19b5a5c62b527953d55687e644ed67c9b560cd3baf8b678d127977f3f30cee AUX kicad-cmake-checkcxxsymbolexists.patch 2353 BLAKE2B 38d173c8c47c623b1c2f62b58367fe8536d9349ac1a6c64368b481921b1477d73a126e2be6806b0a5f4404a586a318ca685a67ecac30ebc1a402c518d65680da SHA512 3d11ebd04dcd3b4f08de3b8c2f3e2d5b5022421caea4ca69ab22f45865f6ead5196bb5bc423761679f9259030cc2c8958cc27d9309a8485c69f5ef7393e330cc AUX kicad-footprints-cmakelists.txt 449 BLAKE2B d9bdcead011c5ece55c503bd6314de6daa107501152d4e3bc6f7f38dfd99405cf11da67df923df415657b84d50d4ef4f608307b2de23cc7458d8abc4cc03b9d8 SHA512 d101e28f8f5f00946a23839193bf83379da121d36bcf67f25b14b02cb5c2a4ff9a392db5b3676687bd26c0d61453313ce704192dd1e4e73834eb9930a07ee822 -AUX kicad-metainfo.patch 582 BLAKE2B 4eeeca5edb27989bfb953e8154dde533cca80cd2afa42e6e3bbd06190ca7371f48cdea2610761092a80e9cf0f25ebb8ea40271d79fef2fb3e7c803accf6fcd02 SHA512 cd3f0366df21609a7deadffb7bb4a2a134c9bc6e5c1aa8ef9b3c685cffc1662ddb8cd8d3769b52c0fe77af832f0b4758584c0b29e8af54a20667f2f522e15585 -AUX ldflags.patch 890 BLAKE2B 2c5436fccb50886faacd84102ba7bfefa84986a5d65ea70965d2f0ded81e746e544f774bdfc0c539114dbafa3de7340bc41ea5af7a5db8a54b706221cafee7ee SHA512 4fda20a73499df81614dd920d18767d901269375d17749982d2c51cf595c873531379ac8ef57b1fc7adc1f4f028907002135f2e0fccaf4ee753184298e7cf8fd 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 DIST kicad-library-4.0.7.tar.gz 475804416 BLAKE2B 0d6df1df7a72258e896552551996ff13e985976e03b6aafbe900dcc04c9b8eb6e5c1abc242ae5020c1bd20b51e9cc1e60f520b478954edcb6368db7f9ee46df0 SHA512 c5365e18e806102aace785895259deca708a61e0ce37262f5ee2482a8a1f86bc9ce1d37e0fb63cb0661bd5c71064ac36ca2260c9c02ed9790744eedd0a5b5360 EBUILD kicad-4.0.7-r1.ebuild 6708 BLAKE2B 9c1b70aaa068b9d874ee8f84c8bd79b849a02a91577c43e5b27881b856579248d56de03299300a900e9583d0f2d639ca15e150382236671521f690769c1cce2b SHA512 f2f426f0936148dd8a1d46f81be89cdbbdacf4e363755848bc06f2742600f92e39ab8438a825c1180f2811d9689161fb203e1f49457d7b2a8630a042e604e1c4 -EBUILD kicad-5.1.0-r1.ebuild 3599 BLAKE2B 29f32dd7320c26a0522f11ea53683681245dfc99f9c64a6a2da859560d69092b9e7e6bf89353a53dbf5d736a70db11a1056b2b61ce4ac170736cc7ad9f307475 SHA512 dca933f4b6fd96bd57cd6973925b5552082355dc1ce2ddde8f028628e0a7200dd494bd03b91788ed6e1cc057d240a183689751bd9bb44e13ca37dfc5329084da -EBUILD kicad-5.1.2-r1.ebuild 3675 BLAKE2B 48fb984e78eb3dfc2423b014c9312d05950a987695ffda2b63d3a3e3854496ce1039d5c14968c97e62a4b29b6d19596790492c3427be0cc2cefb714b6e0fee54 SHA512 6d89d89410d1a81aeee929de11e462b13d716d9c00a4552879530ad40df2f72883a91f5b9d6dd29dd37b811b060be1c7791e03caf84afb09bb4afe9b0854a3b1 -EBUILD kicad-5.1.4.ebuild 3639 BLAKE2B 2f140b6583965c2287a9a6e83f450e741455b34239be39c2ea87930569e487434507e21041c661242bbcfc4cb6eb5e8276551c4b100f58796f16b5c22b221054 SHA512 bbbdd68f196db3e4ef28f88695295e4e2f32960af970813cc8b17362fc3949a76556c0f659631cf5f0615d7a2cffa49ecc8654127f38b5c9c18c5f10e4060089 -EBUILD kicad-5.1.5-r2.ebuild 4333 BLAKE2B 5718da8e06510a5ded9db43da56acff9175016771f5919439e56003a172e6086cbb44b74bc83170660866142461c81017ab8f76b08ab94bd78bc474d7db5a92a SHA512 25b5a64bd0fbef7eefef88f6a5af4f0d758979d003cda5faee3f28f748c2e9d1c3dcf6e99ffd643d4c2cb42f0903bcf78facc30ff59670464d129f1bf90ac616 +EBUILD kicad-5.1.5-r2.ebuild 4305 BLAKE2B d41a667f513624973305ee599d8ab77b2efee05b6c48d604c529cf51e45b80d05a8d04399d076e6faa3df1793dbd6fd151640ca97272196e79f8c9f2feec54cd SHA512 4c3cd4d857b17a0121d508adc1e03bb6fa63fa8f5232b162c7cb021c319d559e288656b97c10a84b40627a3151583937bb5399599301378129c112966c9ce3d8 +EBUILD kicad-5.1.6.ebuild 4338 BLAKE2B f2237d955ceac04f914f6f003857c448aa50b4096d68b3602941497469a7bbc905548aa0c6725e12745c8e6807b63603b733fe7b0fd23b7f7ec7c14a6b8347bd SHA512 41d24eb3e5f9cdf1e352e9d49851140945f75b9919c78a62cbc9589eac7f5496a0282ea21cd2eff776905f4bd26624687a92c9ae1dbaf4983bee556f606c3bf7 MISC metadata.xml 1181 BLAKE2B dadb380f3a2c422a93f349ede59cd4a6bf03dac69306357df08ef88931f76329669e5713f741507ce37ec4bb10445351ed293ed13174ed38de6c284e2234e2f8 SHA512 60c76ec7d665f273fb538c10e4993ac6d30c567d9cb8c0c862175c63a59d45cc9fdeacbb2ba6a3cff12e722124ef6c7466828ea792ddd405c587bd0bac65472c 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 <pgm_base.h> - #include <common.h> --#include <config.h> // to define DEFAULT_INSTALL_PATH -+#include <config.h> // to define DEFAULT_INSTALL_PATH and KICAD_HELP - #include <macros.h> - #include <trace_helpers.h> - -@@ -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 "<CMAKE_INSTALL_PREFIX>/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 "<CMAKE_INSTALL_PREFIX>/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-algorithm-header.patch b/sci-electronics/kicad/files/kicad-5.1.5-algorithm-header.patch index aa118ea6f860..aa118ea6f860 100644 --- a/sci-electronics/kicad/files/kicad-algorithm-header.patch +++ b/sci-electronics/kicad/files/kicad-5.1.5-algorithm-header.patch diff --git a/sci-electronics/kicad/files/ldflags.patch b/sci-electronics/kicad/files/kicad-5.1.5-ldflags.patch index 1495037b1b72..1495037b1b72 100644 --- a/sci-electronics/kicad/files/ldflags.patch +++ b/sci-electronics/kicad/files/kicad-5.1.5-ldflags.patch diff --git a/sci-electronics/kicad/files/kicad-metainfo.patch b/sci-electronics/kicad/files/kicad-5.1.5-metainfo.patch index 48a5ef5be507..48a5ef5be507 100644 --- a/sci-electronics/kicad/files/kicad-metainfo.patch +++ b/sci-electronics/kicad/files/kicad-5.1.5-metainfo.patch 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_OBJECTS:pcbnew_kiface_objects> ) +- 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/kicad-5.1.0-r1.ebuild b/sci-electronics/kicad/kicad-5.1.0-r1.ebuild deleted file mode 100644 index 558341e09d25..000000000000 --- a/sci-electronics/kicad/kicad-5.1.0-r1.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Can switch to EAPI=7 when wxwidgets eclass also supports it -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -WX_GTK_VER="3.0" - -inherit check-reqs cmake-utils eapi7-ver eutils gnome2-utils python-single-r1 toolchain-funcs wxwidgets xdg-utils - -DESCRIPTION="Electronic Schematic and PCB design tools" -HOMEPAGE="http://www.kicad-pcb.org" -SRC_URI="https://launchpad.net/${PN}/5.0/${PV}/+download/${P}.tar.xz" - -LICENSE="GPL-2+ GPL-3+ Boost-1.0" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="doc examples github +ngspice occ +oce openmp +python" - -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) - ?? ( occ oce ) -" - -COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl] - $(python_gen_cond_dep " - python? ( - dev-python/wxpython:${WX_GTK_VER}[opengl,\${PYTHON_MULTI_USEDEP}] - ${PYTHON_DEPS} - ) - >=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}] - ") - github? ( net-misc/curl:=[ssl] ) - media-libs/glew:0= - media-libs/glm - media-libs/freeglut - media-libs/mesa[X(+)] - ngspice? ( - >sci-electronics/ngspice-27[shared] - ) - occ? ( >=sci-libs/opencascade-6.8.0:= ) - oce? ( sci-libs/oce ) - >=x11-libs/cairo-1.8.8:= - >=x11-libs/pixman-0.30" -DEPEND="${COMMON_DEPEND} - doc? ( app-doc/doxygen ) - python? ( >=dev-lang/swig-3.0:0 )" -RDEPEND="${COMMON_DEPEND} - sci-electronics/electronics-menu -" -CHECKREQS_DISK_BUILD="800M" - -PATCHES=( - "${FILESDIR}"/"${PN}-5.1.0-help.patch" - "${FILESDIR}"/"${PN}-5.1.0-swig-4.0.0.patch" -) - -pkg_setup() { - use python && python-single-r1_pkg_setup - use openmp && tc-check-openmp - setup-wxwidgets - check-reqs_pkg_setup -} - -src_configure() { - xdg_environment_reset - - local mycmakeargs=( - -DKICAD_DOCS="${EPREFIX}/usr/share/doc/${P}" - -DKICAD_HELP="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}" - -DBUILD_GITHUB_PLUGIN="$(usex github)" - -DKICAD_SCRIPTING="$(usex python)" - -DKICAD_SCRIPTING_MODULES="$(usex python)" - -DKICAD_SCRIPTING_WXPYTHON="$(usex python)" - -DKICAD_SCRIPTING_ACTION_MENU="$(usex python)" - -DKICAD_SPICE="$(usex ngspice)" - -DKICAD_USE_OCC="$(usex occ)" - -DKICAD_USE_OCE="$(usex oce)" - -DKICAD_INSTALL_DEMOS="$(usex examples)" - ) - use python && mycmakeargs+=( - -DPYTHON_DEST="$(python_get_sitedir)" - -DPYTHON_EXECUTABLE="${PYTHON}" - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - -DPYTHON_LIBRARY="$(python_get_library_path)" - ) - use occ && mycmakeargs+=( - -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade - -DOCC_LIBRARY_DIR="${CASROOT}"/lib - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - if use doc; then - cmake-utils_src_compile dev-docs doxygen-docs - fi -} - -src_install() { - cmake-utils_src_install - use python && python_optimize - if use doc ; then - dodoc uncrustify.cfg - cd Documentation || die - dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/. development/doxygen/. - fi -} - -pkg_postinst() { - optfeature "Component symbols library" sci-electronics/kicad-symbols - optfeature "Component footprints library" sci-electronics/kicad-footprints - optfeature "3D models of components " sci-electronics/kicad-packages3d - optfeature "Project templates" sci-electronics/kicad-templates - optfeature "Different languages for GUI" sci-electronics/kicad-i18n - optfeature "Extended documentation" app-doc/kicad-doc - optfeature "Creating 3D models of components" media-gfx/wings - - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} diff --git a/sci-electronics/kicad/kicad-5.1.2-r1.ebuild b/sci-electronics/kicad/kicad-5.1.2-r1.ebuild deleted file mode 100644 index 0afea3166881..000000000000 --- a/sci-electronics/kicad/kicad-5.1.2-r1.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Can switch to EAPI=7 when wxwidgets eclass also supports it -EAPI=6 -PYTHON_COMPAT=( python3_{6,7} ) - -WX_GTK_VER="3.0-gtk3" - -inherit check-reqs cmake-utils eapi7-ver eutils gnome2-utils python-single-r1 toolchain-funcs wxwidgets xdg-utils - -DESCRIPTION="Electronic Schematic and PCB design tools" -HOMEPAGE="http://www.kicad-pcb.org" -SRC_URI="https://launchpad.net/${PN}/5.0/${PV}/+download/${P}.tar.xz" - -LICENSE="GPL-2+ GPL-3+ Boost-1.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc examples github +ngspice occ +oce openmp +python" - -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) - ?? ( occ oce ) -" - -COMMON_DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] - $(python_gen_cond_dep " - python? ( - dev-python/wxpython:4.0[\${PYTHON_MULTI_USEDEP}] - ${PYTHON_DEPS} - ) - >=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}] - ") - github? ( net-misc/curl:=[ssl] ) - media-libs/glew:0= - media-libs/glm - media-libs/freeglut - media-libs/mesa[X(+)] - ngspice? ( - >sci-electronics/ngspice-27[shared] - ) - occ? ( >=sci-libs/opencascade-6.8.0:= ) - oce? ( sci-libs/oce ) - >=x11-libs/cairo-1.8.8:= - >=x11-libs/pixman-0.30" -DEPEND="${COMMON_DEPEND} - doc? ( app-doc/doxygen ) - python? ( >=dev-lang/swig-3.0:0 )" -RDEPEND="${COMMON_DEPEND} - sci-electronics/electronics-menu -" -CHECKREQS_DISK_BUILD="800M" - -PATCHES=( - "${FILESDIR}"/"${PN}-5.1.0-help.patch" - "${FILESDIR}"/"${PN}-5.1.0-swig-4.0.0.patch" -) - -pkg_setup() { - use python && python-single-r1_pkg_setup - use openmp && tc-check-openmp - setup-wxwidgets - check-reqs_pkg_setup -} - -src_configure() { - xdg_environment_reset - - local mycmakeargs=( - -DKICAD_DOCS="${EPREFIX}/usr/share/doc/${P}" - -DKICAD_HELP="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}" - -DBUILD_GITHUB_PLUGIN="$(usex github)" - -DKICAD_SCRIPTING="$(usex python)" - -DKICAD_SCRIPTING_MODULES="$(usex python)" - -DKICAD_SCRIPTING_WXPYTHON="$(usex python)" - -DKICAD_SCRIPTING_WXPYTHON_PHOENIX="$(usex python)" - -DKICAD_SCRIPTING_PYTHON3="$(usex python)" - -DKICAD_SCRIPTING_ACTION_MENU="$(usex python)" - -DKICAD_SPICE="$(usex ngspice)" - -DKICAD_USE_OCC="$(usex occ)" - -DKICAD_USE_OCE="$(usex oce)" - -DKICAD_INSTALL_DEMOS="$(usex examples)" - ) - use python && mycmakeargs+=( - -DPYTHON_DEST="$(python_get_sitedir)" - -DPYTHON_EXECUTABLE="${PYTHON}" - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - -DPYTHON_LIBRARY="$(python_get_library_path)" - ) - use occ && mycmakeargs+=( - -DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade - -DOCC_LIBRARY_DIR="${CASROOT}"/lib - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - if use doc; then - cmake-utils_src_compile dev-docs doxygen-docs - fi -} - -src_install() { - cmake-utils_src_install - use python && python_optimize - if use doc ; then - dodoc uncrustify.cfg - cd Documentation || die - dodoc -r *.txt kicad_doxygen_logo.png notes_about_pcbnew_new_file_format.odt doxygen/. development/doxygen/. - fi -} - -pkg_postinst() { - optfeature "Component symbols library" sci-electronics/kicad-symbols - optfeature "Component footprints library" sci-electronics/kicad-footprints - optfeature "3D models of components " sci-electronics/kicad-packages3d - optfeature "Project templates" sci-electronics/kicad-templates - optfeature "Different languages for GUI" sci-electronics/kicad-i18n - optfeature "Extended documentation" app-doc/kicad-doc - optfeature "Creating 3D models of components" media-gfx/wings - - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_mimeinfo_database_update - gnome2_icon_cache_update -} diff --git a/sci-electronics/kicad/kicad-5.1.5-r2.ebuild b/sci-electronics/kicad/kicad-5.1.5-r2.ebuild index 26d76cf58871..c2cf00a4c934 100644 --- a/sci-electronics/kicad/kicad-5.1.5-r2.ebuild +++ b/sci-electronics/kicad/kicad-5.1.5-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{6,7} ) +PYTHON_COMPAT=( python3_{6,7,8} ) WX_GTK_VER="3.0-gtk3" @@ -55,12 +55,12 @@ BDEPEND="doc? ( app-doc/doxygen )" CHECKREQS_DISK_BUILD="800M" PATCHES=( - "${FILESDIR}"/"${PN}-5.1.5-help.patch" - "${FILESDIR}"/"${PN}-5.1.5-ninja-build.patch" - "${FILESDIR}"/"${PN}-5.1.5-strict-aliasing.patch" - "${FILESDIR}"/"${PN}-algorithm-header.patch" - "${FILESDIR}"/"${PN}-metainfo.patch" - "${FILESDIR}"/"ldflags.patch" + "${FILESDIR}/${P}-help.patch" + "${FILESDIR}/${P}-ninja-build.patch" + "${FILESDIR}/${P}-strict-aliasing.patch" + "${FILESDIR}/${P}-algorithm-header.patch" + "${FILESDIR}/${P}-metainfo.patch" + "${FILESDIR}/${P}-ldflags.patch" ) pkg_setup() { diff --git a/sci-electronics/kicad/kicad-5.1.4.ebuild b/sci-electronics/kicad/kicad-5.1.6.ebuild index 88c18773559e..102ed1968447 100644 --- a/sci-electronics/kicad/kicad-5.1.4.ebuild +++ b/sci-electronics/kicad/kicad-5.1.6.ebuild @@ -1,21 +1,21 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Can switch to EAPI=7 when wxwidgets eclass also supports it -EAPI=6 -PYTHON_COMPAT=( python3_{6,7} ) +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) WX_GTK_VER="3.0-gtk3" -inherit check-reqs cmake-utils eapi7-ver eutils gnome2-utils python-single-r1 toolchain-funcs wxwidgets xdg-utils +inherit check-reqs cmake eutils python-single-r1 toolchain-funcs wxwidgets xdg-utils DESCRIPTION="Electronic Schematic and PCB design tools" -HOMEPAGE="http://www.kicad-pcb.org" -SRC_URI="https://launchpad.net/${PN}/5.0/${PV}/+download/${P}.tar.xz" +HOMEPAGE="https://www.kicad-pcb.org" +SRC_URI="https://gitlab.com/kicad/code/${PN}/-/archive/${PV}/${P}.tar.bz2" LICENSE="GPL-2+ GPL-3+ Boost-1.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm64 ~x86" IUSE="doc examples github +ngspice occ +oce openmp +python" REQUIRED_USE=" @@ -23,36 +23,44 @@ REQUIRED_USE=" ?? ( occ oce ) " -COMMON_DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] - $(python_gen_cond_dep " - python? ( - dev-python/wxpython:4.0[\${PYTHON_MULTI_USEDEP}] - ${PYTHON_DEPS} - ) - >=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}] - ") - github? ( net-misc/curl:=[ssl] ) +COMMON_DEPEND=" + >=dev-libs/boost-1.61:=[context,nls,threads] + media-libs/freeglut media-libs/glew:0= >=media-libs/glm-0.9.9.1 - media-libs/freeglut media-libs/mesa[X(+)] + >=x11-libs/cairo-1.8.8:= + >=x11-libs/pixman-0.30 + x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] + github? ( net-misc/curl:=[ssl] ) ngspice? ( >sci-electronics/ngspice-27[shared] ) occ? ( >=sci-libs/opencascade-6.8.0:= ) oce? ( sci-libs/oce ) - >=x11-libs/cairo-1.8.8:= - >=x11-libs/pixman-0.30" + python? ( + $(python_gen_cond_dep ' + >=dev-libs/boost-1.61:=[context,nls,threads,python,${PYTHON_MULTI_USEDEP}] + dev-python/wxpython:4.0[${PYTHON_MULTI_USEDEP}] + ') + ${PYTHON_DEPS} + ) +" DEPEND="${COMMON_DEPEND} - doc? ( app-doc/doxygen ) python? ( >=dev-lang/swig-3.0:0 )" RDEPEND="${COMMON_DEPEND} sci-electronics/electronics-menu " +BDEPEND="doc? ( app-doc/doxygen )" CHECKREQS_DISK_BUILD="800M" PATCHES=( - "${FILESDIR}"/"${PN}-5.1.0-help.patch" + "${FILESDIR}/${PN}-5.1.5-help.patch" + "${FILESDIR}/${P}-ninja-build.patch" + "${FILESDIR}/${PN}-5.1.5-strict-aliasing.patch" + "${FILESDIR}/${PN}-5.1.5-algorithm-header.patch" + "${FILESDIR}/${P}-metainfo.patch" + "${FILESDIR}/${PN}-5.1.5-ldflags.patch" ) pkg_setup() { @@ -62,11 +70,22 @@ pkg_setup() { check-reqs_pkg_setup } +src_unpack() { + default_src_unpack + # For the metainfo patch to work the kicad.appdata.xml has to be moved to + # avoid QA issue. This is needed because /usr/share/appdata location is + # deprecated, it should not be used anymore by new software. + # Appdata/Metainfo files should be installed into /usr/share/metainfo + # directory. as per + # https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html + mv "${S}/resources/linux/appdata" "${S}/resources/linux/metainfo" || die "Appdata move failed" +} + src_configure() { xdg_environment_reset local mycmakeargs=( - -DKICAD_DOCS="${EPREFIX}/usr/share/doc/${P}" + -DKICAD_DOCS="${EPREFIX}/usr/share/doc/${PF}" -DKICAD_HELP="${EPREFIX}/usr/share/doc/${PN}-doc-${PV}" -DBUILD_GITHUB_PLUGIN="$(usex github)" -DKICAD_SCRIPTING="$(usex python)" @@ -79,6 +98,7 @@ src_configure() { -DKICAD_USE_OCC="$(usex occ)" -DKICAD_USE_OCE="$(usex oce)" -DKICAD_INSTALL_DEMOS="$(usex examples)" + -DCMAKE_SKIP_RPATH="ON" ) use python && mycmakeargs+=( -DPYTHON_DEST="$(python_get_sitedir)" @@ -91,18 +111,18 @@ src_configure() { -DOCC_LIBRARY_DIR="${CASROOT}"/lib ) - cmake-utils_src_configure + cmake_src_configure } src_compile() { - cmake-utils_src_compile + cmake_src_compile if use doc; then - cmake-utils_src_compile dev-docs doxygen-docs + cmake_src_compile dev-docs doxygen-docs fi } src_install() { - cmake-utils_src_install + cmake_src_install use python && python_optimize if use doc ; then dodoc uncrustify.cfg @@ -122,11 +142,11 @@ pkg_postinst() { xdg_desktop_database_update xdg_mimeinfo_database_update - gnome2_icon_cache_update + xdg_icon_cache_update } pkg_postrm() { xdg_desktop_database_update xdg_mimeinfo_database_update - gnome2_icon_cache_update + xdg_icon_cache_update } |