diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt new file mode 100644 index 0000000..ed3be19 --- /dev/null +++ b/COPYRIGHT.txt @@ -0,0 +1,354 @@ + Note that the GPL below is copyrighted by the Free Software + Foundation, but the instance of code that it refers to (KiCad) + is copyrighted by the KiCad developers, those who actually wrote it. + The various CHANGELOG*.txt files and more importantly the Bazaar + repository contain a record of who wrote what. + + Also note that the only valid version of the GPL as far as KiCad + is concerned is _this_ particular version of the license (ie v2, not + v2.2 or v3.x or whatever), unless explicitly otherwise stated. + + Dick Hollenbeck + + + + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/container_fwd.hpp.patch b/container_fwd.hpp.patch deleted file mode 100644 index 90f7def..0000000 --- a/container_fwd.hpp.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- kicad-20140120/include/boost/detail/container_fwd.hpp.orig 2015-06-30 11:25:12.116188042 +0100 -+++ kicad-20140120/include/boost/detail/container_fwd.hpp 2015-06-30 11:26:03.009468476 +0100 -@@ -136,7 +136,8 @@ - template class deque; - #endif - -- template class list; -+ // 'list' is set up in the c++11 headers -+ //template class list; - template class vector; - template class map; - template diff --git a/kicad-20140120.tar.bz2 b/kicad-20140120.tar.bz2 deleted file mode 100644 index cf6db71..0000000 --- a/kicad-20140120.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a57b1908ddbace8c36ef6fed65c484b7cc680465eb8ddd5d595af9b011306719 -size 11663525 diff --git a/kicad-4.0.0-rc1.tar.xz b/kicad-4.0.0-rc1.tar.xz new file mode 100644 index 0000000..7c0b885 --- /dev/null +++ b/kicad-4.0.0-rc1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:62c2e95a2d6b8a3cf30bb91146c3d2b1c0df0cbfc070b6e54bcfdf0da2df6973 +size 10951000 diff --git a/kicad-gost.changes b/kicad-gost.changes deleted file mode 100644 index 02c7e7b..0000000 --- a/kicad-gost.changes +++ /dev/null @@ -1,243 +0,0 @@ -------------------------------------------------------------------- -Tue Jun 30 13:16:28 UTC 2015 - tjcw@physics.org - -- Same build fix as kicad - * container_fwd.hpp.patch - -------------------------------------------------------------------- -Wed Mar 25 23:27:53 UTC 2015 - jengelh@inai.de - -- Do not conflict with self-provides - -------------------------------------------------------------------- -Tue Feb 25 12:47:03 UTC 2014 - dmitry_r@opensuse.org - -- Update to version 20140120 - * Bug fixes - -------------------------------------------------------------------- -Wed Aug 7 20:02:42 UTC 2013 - dmitry_r@opensuse.org - -- Removed templates to avoid conflict with kicad-library package - * kikad-no-templates-install.patch -- Removed obsolete kicad-2012.01.19-build-with-old-wxwidgets.patch - -------------------------------------------------------------------- -Wed Jul 17 11:59:08 UTC 2013 - dmitry_r@opensuse.org - -- Update to version 20130707 - * no changelog available - * removed obsolete kicad-2012.01.19-gcc-4.7.patch - -------------------------------------------------------------------- -Thu Jun 27 15:20:06 UTC 2013 - dmitry_r@opensuse.org - -- Change package license to GPL-2.0+ [bnc#796377] - -------------------------------------------------------------------- -Mon Apr 8 17:59:55 UTC 2013 - werner.ho@gmx.de - -- new version 20130330 -- removed version patch - -------------------------------------------------------------------- -Wed Jan 23 20:22:07 UTC 2013 - dmitry_r@opensuse.org - -- Update to version 20120521 - * various bugfixes, no detailed changelog available -- Change package license to GPL-3.0 [bnc#796377] -- Build with Unicode support -- Add switcher for build with GOST support -- Fix displayed version - * kicad-version.patch - -------------------------------------------------------------------- -Tue Aug 28 18:33:50 UTC 2012 - scorot@free.fr - -- fix build with old wxWindow on SLE 11 - -------------------------------------------------------------------- -Wed Jun 27 21:02:39 UTC 2012 - scorot@free.fr - -- add patch from debian to fix build with gcc-4.7 - -------------------------------------------------------------------- -Sat Feb 11 09:40:49 UTC 2012 - werner.ho@gmx.de - -- new version 2012-01-19 - -------------------------------------------------------------------- -Tue Jan 17 22:25:39 UTC 2012 - werner.ho@gmx.de - -- new version 2011-12-28 - -------------------------------------------------------------------- -Sun Aug 21 12:20:00 UTC 2011 - werner.ho@gmx.de - -- new version 2011-07-08 - -------------------------------------------------------------------- -Thu May 27 21:20:00 UTC 2011 - werner.ho@gmx.de - -- new version 2011-04-29 - -------------------------------------------------------------------- -Mon Mar 28 21:16:39 UTC 2011 - stefan.bruens@rwth-aachen.de - -- explicit request for DOUBLEBUFFER and DEPTH>=16 - fixes SwapBuffer() crash on Intel and Radeon GPUs - -------------------------------------------------------------------- -Thu Mar 15 21:20:00 UTC 2011 - werner.ho@gmx.de - -- build fix for openSUSE 11.4 - -------------------------------------------------------------------- -Sun Nov 07 11:20:00 UTC 2010 - werner.ho@gmx.de - -- added l10n files and patch fixes bug [#650383] - -------------------------------------------------------------------- -Fri Jul 23 11:00:31 UTC 2010 - mhopf@novell.com - -- Update to 2010-05-05-stable - -------------------------------------------------------------------- -Mon Apr 12 19:07:26 UTC 2010 - mhopf@novell.com - -- Make it build with older wxGTK (wxAuiToolBar) - -------------------------------------------------------------------- -Mon Apr 12 18:28:47 UTC 2010 - mhopf@novell.com - -- Update to 2010-04-06-SVN2508 - Currently only builds on 11.2 - -------------------------------------------------------------------- -Wed Jun 17 2009 Werner Hoch - 2009.02.06 -- new version 2009.02.06 - -------------------------------------------------------------------- -Sat Dec 20 2008 Werner Hoch - 2008.08.25 -- build fix for openSUSE 11.1 -- added freeglut-devel and update_desktop_file -- directory fixes - -------------------------------------------------------------------- -Sat Oct 04 2008 Werner Hoch - 2008.08.25 -- new version 2008.08.25 - -------------------------------------------------------------------- -Thu Mar 25 2008 Werner Hoch -- new version 2008.03.20 - -------------------------------------------------------------------- -Thu Dec 25 2007 Werner Hoch -- adapted spec file from kicad-2007.07.09-2.fc8.src.rpm -- removed french project descriptions -- use cmake build process -- new version 2007.11.29 - -------------------------------------------------------------------- -Mon Oct 15 2007 Alain Portal 2007.07.09-2 -- Update desktop file - -------------------------------------------------------------------- -Thu Oct 04 2007 Alain Portal 2007.07.09-1 -- New upstream version -- Merge previous patches -- Remove X-Fedora, Electronics and Engineering categories -- Update desktop file - -------------------------------------------------------------------- -Mon Aug 27 2007 Alain Portal 2007.01.15-4 -- License tag clarification - -------------------------------------------------------------------- -Thu Aug 23 2007 Alain Portal 2007.01.15-3 -- Rebuild - -------------------------------------------------------------------- -Wed Feb 14 2007 Alain Portal 2007.01.15-2 -- Fix desktop entry. Fix #228598 - -------------------------------------------------------------------- -Thu Feb 8 2007 Alain Portal 2007.01.15-1 -- New upstream version - -------------------------------------------------------------------- -Thu Feb 8 2007 Alain Portal 2006.08.28-4 -- Add patch to build with RPM_OPT_FLAGS and remove -s from LDFLAGS - Contribution of Ville Skyttä - Fix #227757 -- Fix typo in french summary - -------------------------------------------------------------------- -Thu Dec 28 2006 Jason L Tibbitts III 2006.08.28-3 -- Rebuild with wxGTK 2.8. - -------------------------------------------------------------------- -Thu Oct 05 2006 Christian Iseli 2006.08.28-2 -- rebuilt for unwind info generation, broken in gcc-4.1.1-21 - -------------------------------------------------------------------- -Fri Sep 22 2006 Alain Portal 2006.08.28-1 -- New upstream version -- Use macro style instead of variable style -- Install missing modules. Fix #206602 - -------------------------------------------------------------------- -Fri Sep 1 2006 Alain Portal 2006.06.26-6 -- FE6 rebuild - -------------------------------------------------------------------- -Mon Jul 10 2006 Alain Portal 2006.06.26-5 -- Removing backup files is no more needed. - -------------------------------------------------------------------- -Mon Jul 10 2006 Alain Portal 2006.06.26-4 -- Remove BR libGLU-devel that is no more needed (bug #197501 is closed) -- Fix files permissions. - -------------------------------------------------------------------- -Mon Jul 3 2006 Alain Portal 2006.06.26-3 -- s/mesa-libGLU-devel/libGLU-devel/ - -------------------------------------------------------------------- -Mon Jul 3 2006 Alain Portal 2006.06.26-2 -- BR mesa-libGLU-devel - -------------------------------------------------------------------- -Wed Jun 28 2006 Alain Portal 2006.06.26-1 -- New upstream version - -------------------------------------------------------------------- -Tue Jun 13 2006 Alain Portal 2006.04.24-5 -- Change name -- Use %%{_docdir} instead of %%{_datadir}/doc -- Use %%find_lang -- Update desktop database -- Convert MSDOS EOL to Unix EOL -- Remove BR utrac - -------------------------------------------------------------------- -Mon Jun 12 2006 Alain Portal 2006-04-24-0-4 -- Patch to suppress extra qualification compile time error on FC5 -- BR utrac to convert MSDOS files before applying patch - This will be remove for the next upstream version. - -------------------------------------------------------------------- -Tue May 23 2006 Alain Portal 2006-04-24-0-3 -- Install help in /usr/share/doc/kicad/ as the path is hardcoded - in gestfich.cpp -- Add desktop file - -------------------------------------------------------------------- -Mon May 22 2006 Alain Portal 2006-04-24-0-2 -- Add a second tarball that contains many things that are not included in - the upstream source tarball such components and footprints librairies, - help, localisation, etc. - -------------------------------------------------------------------- -Sun May 21 2006 Alain Portal 2006-04-24-0-1 -- Initial Fedora RPM diff --git a/kicad-gost.spec b/kicad-gost.spec deleted file mode 100644 index bb7cf3b..0000000 --- a/kicad-gost.spec +++ /dev/null @@ -1,130 +0,0 @@ -# -# spec file for package kicad-gost -# -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - - -%define with_gost 1 -# with_gost variable sets technical standard: -# 0 - international -# 1 - GOST -# it is sole difference between kicad.spec and kicad-gost.spec -%if 0%{?with_gost} -Name: kicad-gost -%else -Name: kicad -%endif -Version: 20140120 -Release: 0 -%if 0%{?with_gost} -Summary: EDA software suite for the creation of schematics and PCB with GOST support -License: GPL-2.0+ -Group: Productivity/Scientific/Electronics -%else -Summary: EDA software suite for the creation of schematics and PCB -License: GPL-2.0+ -Group: Productivity/Scientific/Electronics -%endif -Url: http://kicad-pcb.org -# https://code.launchpad.net/~kicad-stable-committers/kicad/stable -# revision 4027 -# bzr export -r [revision] kicad-[version].tar.bz2 lp:kicad/stable -Source: kicad-%{version}.tar.bz2 -Source9: pre_checkin.sh -Patch1: kikad-no-templates-install.patch -Patch2: container_fwd.hpp.patch - -BuildRequires: boost-devel -BuildRequires: cmake >= 2.4.6 -BuildRequires: doxygen -BuildRequires: fdupes -BuildRequires: freeglut-devel -BuildRequires: gcc-c++ -BuildRequires: update-desktop-files -BuildRequires: zlib-devel -%if 0%{?suse_version} < 1140 -BuildRequires: wxGTK-devel >= 2.8 -%else -BuildRequires: wxWidgets-devel >= 2.8.11 -%endif -# fix directory owner -BuildRequires: hicolor-icon-theme -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -Requires: kicad-library -Recommends: kicad-doc -%if 0%{?with_gost} -Conflicts: otherproviders(kicad) -Provides: kicad = %{version} -%endif - -%description -Kicad is an open source (GPL) software for the creation of electronic schematic -diagrams and printed circuit board artwork up to 16 layers. -Kicad is a set of four softwares and a project manager: -- Eeschema: schematic entry -- Pcbnew: board editor -- Gerbview: GERBER viewer (photoplotter documents) -- Cvpcb: footprint selector for components used in the circuit design -- Kicad: project manager - -%prep -%setup -q -n kicad-%{version} -%patch1 -p1 -%patch2 -p1 - -# fix plugin directory -sed -i 's|KICAD_PLUGINS lib/kicad/plugins|KICAD_PLUGINS %{_lib}/kicad/plugins|' CMakeLists.txt -# fix documentation directory -# sed -i 's|KICAD_DOCS share/doc/kicad|KICAD_DOCS share/doc/packages/kicad|' CMakeLists.txt - -%build -cmake \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DwxWidgets_USE_STATIC=OFF \ - -DwxUSE_UNICODE=ON \ -%if 0%{?with_gost} - -DKICAD_GOST=ON \ -%endif - -DKICAD_STABLE_VERSION=ON \ - . - -make %{?_smp_mflags} - -%install -rm resources/linux/mime/applications/eeschema.desktop -make install DESTDIR="%buildroot" -%suse_update_desktop_file -r kicad "Education;Engineering" - -%fdupes -s %{buildroot}%{_datadir}/kicad - -%files -%defattr(-,root,root) -%doc COPYRIGHT.txt CHANGELOG.txt -%{_bindir}/* -%{_datadir}/kicad/ -%{_datadir}/doc/kicad/ -%{_libdir}/kicad/plugins/netlist_form_pads-pcb.xsl -%dir %{_libdir}/kicad/ -%dir %{_libdir}/kicad/plugins/ -%{_datadir}/applications/*.desktop -%{_datadir}/mime/packages/kicad.xml -%{_datadir}/mimelnk/application/x-kicad-*.desktop -%dir %{_datadir}/mimelnk/ -%dir %{_datadir}/mimelnk/application/ -%{_datadir}/icons/hicolor/*/mimetypes/application-x-kicad-project.* -%{_datadir}/icons/hicolor/*/apps/*.* - -%changelog diff --git a/kicad-library-repos-install.patch b/kicad-library-repos-install.patch new file mode 100644 index 0000000..216118f --- /dev/null +++ b/kicad-library-repos-install.patch @@ -0,0 +1,113 @@ +Index: kicad-4.0.0-rc1/scripts/library-repos-install.sh +=================================================================== +--- kicad-4.0.0-rc1.orig/scripts/library-repos-install.sh ++++ kicad-4.0.0-rc1/scripts/library-repos-install.sh +@@ -24,7 +24,8 @@ + + + # Set where the library repos will go, use a full path +-WORKING_TREES=${WORKING_TREES:-~/kicad_sources} ++WORKING_TREES=~/.local/share/kicad ++KICAD_CONFIG_COMMON=~/.config/kicad/kicad_common + + + usage() +@@ -32,50 +33,35 @@ usage() + echo "" + echo " usage:" + echo "" +- echo "./library-sources-install.sh " ++ echo "kicad-library-install.sh " + echo " where is one of:" +- echo " --install-prerequisites (install command tools needed here, run once first.)" + echo " --install-or-update (from github, the library sources.)" ++ echo " --download-all-libraries (download library sources from GitHub.)" + echo " --remove-all-libraries (remove all *.pretty from $WORKING_TREES/library-repos/. )" + echo " --remove-orphaned-libraries (remove local libraries which have been deleted or renamed at github.)" + echo " --list-libraries (show the full list of github libraries.)" + echo " --create-bat-file (cat a windows batch file, redirect to capture to disk.)" + echo "" +- echo "examples (with --install-prerequisites once first):" +- echo ' $ ./library-sources-install.sh --install-prerequisites' +- echo ' $ ./library-sources-install.sh --install-or-update' ++ echo "Default library directory is $WORKING_TREES/library-repos/" + } + + +-install_prerequisites() +-{ +- # Find a package manager, PM +- PM=$( command -v yum || command -v apt-get ) +- +- # assume all these Debian, Mint, Ubuntu systems have same prerequisites +- if [ "$(expr match "$PM" '.*\(apt-get\)')" == "apt-get" ]; then +- #echo "debian compatible system" +- sudo apt-get install \ +- git \ +- curl \ +- sed +- +- # assume all yum systems have same prerequisites +- elif [ "$(expr match "$PM" '.*\(yum\)')" == "yum" ]; then +- #echo "red hat compatible system" +- # Note: if you find this list not to be accurate, please submit a patch: +- sudo yum install \ +- git \ +- curl \ +- sed ++add_libraries_config() ++{ ++ # Add libraries to config file ++ if [ ! -d "$KICAD_CONFIG_COMMON" ]; then ++ echo "[EnvironmentVariables]" > $KICAD_CONFIG_COMMON ++ echo "KIGITHUB=$WORKING_TREES/library-repos/" >> $KICAD_CONFIG_COMMON ++ echo "KISYSMOD=$WORKING_TREES/library-repos/kicad-library/modules/" >> $KICAD_CONFIG_COMMON ++ echo "KISYS3DMOD=$WORKING_TREES/library-repos/kicad-library/modules/packages3d/" >> $KICAD_CONFIG_COMMON ++ echo "KICAD_PTEMPLATES=$WORKING_TREES/library-repos/kicad-library/template/" >> $KICAD_CONFIG_COMMON + else +- echo +- echo "Incompatible System. Neither 'yum' nor 'apt-get' found. Not possible to" +- echo "continue. Please make sure to install git, curl, and sed before using this" +- echo "script." +- echo +- exit 1 ++ sed -i 's|^KIGITHUB.*|KIGITHUB='$WORKING_TREES'/library-repos/|' $KICAD_CONFIG_COMMON ++ sed -i 's|^KISYSMOD.*|KISYSMOD='$WORKING_TREES'/library-repos/kicad-library/modules/|' $KICAD_CONFIG_COMMON ++ sed -i 's|^KISYS3DMOD.*|KISYS3DMOD='$WORKING_TREES'/library-repos/kicad-library/modules/packages3d/|' $KICAD_CONFIG_COMMON ++ sed -i 's|^KICAD_PTEMPLATES.*|KICAD_PTEMPLATES='$WORKING_TREES'/library-repos/kicad-library/template/|' $KICAD_CONFIG_COMMON + fi ++ cp $WORKING_TREES/library-repos/kicad-library/template/fp-lib-table.for-pretty ~/.config/kicad/fp-lib-table + } + + +@@ -137,9 +123,7 @@ detect_pretty_repos() + checkout_or_update_libraries() + { + if [ ! -d "$WORKING_TREES" ]; then +- sudo mkdir -p "$WORKING_TREES" +- echo " mark $WORKING_TREES as owned by me" +- sudo chown -R `whoami` "$WORKING_TREES" ++ mkdir -p "$WORKING_TREES" + fi + cd $WORKING_TREES + +@@ -216,6 +200,7 @@ remove_orphaned_libraries() + + if [ $# -eq 1 -a "$1" == "--install-or-update" ]; then + checkout_or_update_libraries ++ add_libraries_config + exit + fi + +@@ -232,11 +217,6 @@ if [ $# -eq 1 -a "$1" == "--remove-all-l + fi + + +-if [ $# -eq 1 -a "$1" == "--install-prerequisites" ]; then +- install_prerequisites +- exit +-fi +- + if [ $# -eq 1 -a "$1" == "--list-libraries" ]; then + + # use github API to get repos into PRETTY_REPOS var diff --git a/kicad-user-library.patch b/kicad-user-library.patch new file mode 100644 index 0000000..c48b9ed --- /dev/null +++ b/kicad-user-library.patch @@ -0,0 +1,18 @@ +Index: kicad-4.0.0-rc1/common/kiface_i.cpp +=================================================================== +--- kicad-4.0.0-rc1.orig/common/kiface_i.cpp ++++ kicad-4.0.0-rc1/common/kiface_i.cpp +@@ -80,6 +80,13 @@ static void setSearchPaths( SEARCH_STACK + aDst->AddPaths( fn.GetPath() ); + } + ++// user local library ++wxString homeDir = wxFileName::GetHomeDir(); ++aDst->AddPaths( homeDir + wxT( "/.local/share/kicad/library-repos/kicad-library/library" ) ); ++aDst->AddPaths( homeDir + wxT( "/.local/share/kicad/library-repos/kicad-library/modules" ) ); ++aDst->AddPaths( homeDir + wxT( "/.local/share/kicad/library-repos/kicad-library/modules/packages3d" ) ); ++aDst->AddPaths( homeDir + wxT( "/.local/share/kicad/library-repos/kicad-library/template" ) ); ++ + #ifndef __WXMAC__ + aDst->AddPaths( wxT( "/usr/local/share" ) ); + #endif diff --git a/kicad.changes b/kicad.changes index 11710eb..eb05cc5 100644 --- a/kicad.changes +++ b/kicad.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Sun Sep 13 11:15:12 UTC 2015 - dmitry_r@opensuse.org + +- Update to version 4.0.0-rc1 + * Drop kicad-gost package + * Drop pre_checkin.sh + * Drop container_fwd.hpp.patch + * Drop kikad-no-templates-install.patch +- Change license to "GPL-2.0+ and GPL-3.0+" due to source code changes +- Use user library instead of system + * kicad-user-library.patch +- Replase kicad-libraries package with kicad-library-install.sh + script for creation offline library copy. + * kicad-library-repos-install.patch + ------------------------------------------------------------------- Tue Jun 30 10:38:49 UTC 2015 - tjcw@physics.org diff --git a/kicad.spec b/kicad.spec index e56fd9d..6e38a79 100644 --- a/kicad.spec +++ b/kicad.spec @@ -1,5 +1,5 @@ # -# spec file for package kicad-gost +# spec file for package kicad # # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # @@ -16,115 +16,138 @@ # -%define with_gost 0 -# with_gost variable sets technical standard: -# 0 - international -# 1 - GOST -# it is sole difference between kicad.spec and kicad-gost.spec -%if 0%{?with_gost} -Name: kicad-gost -%else Name: kicad -%endif -Version: 20140120 +Version: 4.0.0~rc1 Release: 0 -%if 0%{?with_gost} -Summary: EDA software suite for the creation of schematics and PCB with GOST support -License: GPL-2.0+ -Group: Productivity/Scientific/Electronics -%else +%define src_ver 4.0.0-rc1 Summary: EDA software suite for the creation of schematics and PCB -License: GPL-2.0+ +License: GPL-2.0+ and GPL-3.0+ Group: Productivity/Scientific/Electronics -%endif Url: http://kicad-pcb.org -# https://code.launchpad.net/~kicad-stable-committers/kicad/stable -# revision 4027 -# bzr export -r [revision] kicad-[version].tar.bz2 lp:kicad/stable -Source: kicad-%{version}.tar.bz2 -Source9: pre_checkin.sh -Patch1: kikad-no-templates-install.patch -Patch2: container_fwd.hpp.patch - -BuildRequires: boost-devel -BuildRequires: cmake >= 2.4.6 +Source: https://launchpad.net/kicad/4.0/%{src_ver}/+download/kicad-%{src_ver}.tar.xz +# License file was removed due to GPL-3.0+ code +# https://github.com/KiCad/kicad-source-mirror/commit/681090b8ef3a362af75e8ca4417e18622747b63b +Source2: COPYRIGHT.txt +# PATCH-FEATURE-OPENSUSE kicad-user-library.patch -- add user library path +Patch1: kicad-user-library.patch +# PATCH-FEATURE-OPENSUSE kicad-library-repos-install.patch +Patch2: kicad-library-repos-install.patch +%if 0%{?suse_version} > 1320 +BuildRequires: boost-devel >= 1.56 +%else +BuildRequires: boost_1_58_0-devel +%endif +BuildRequires: cmake BuildRequires: doxygen BuildRequires: fdupes -BuildRequires: freeglut-devel BuildRequires: gcc-c++ +BuildRequires: pkg-config +BuildRequires: python-devel BuildRequires: update-desktop-files -BuildRequires: zlib-devel -%if 0%{?suse_version} < 1140 -BuildRequires: wxGTK-devel >= 2.8 -%else -BuildRequires: wxWidgets-devel >= 2.8.11 -%endif -# fix directory owner +# Use direct version to avoid problems with wx 3.2 +BuildRequires: wxWidgets-3_0-devel >= 3 +# Fix bug in old python-wxWidgets-3_0-devel +BuildRequires: python-wxWidgets-3_0 >= 3 +BuildRequires: python-wxWidgets-3_0-devel >= 3 +BuildRequires: swig +BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(cairo) +BuildRequires: pkgconfig(glew) +BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(zlib) +# Fix directory owner BuildRequires: hicolor-icon-theme BuildRoot: %{_tmppath}/%{name}-%{version}-build - -Requires: kicad-library -Recommends: kicad-doc -%if 0%{?with_gost} -Conflicts: otherproviders(kicad) -Provides: kicad = %{version} -%endif +Requires: %{name}-library-install +Requires: python-wxWidgets-3_0 >= 3 +# Requires: %%{name}-library +Recommends: %{name}-doc +Obsoletes: kicad = 20140120 %description Kicad is an open source (GPL) software for the creation of electronic schematic -diagrams and printed circuit board artwork up to 16 layers. -Kicad is a set of four softwares and a project manager: -- Eeschema: schematic entry -- Pcbnew: board editor -- Gerbview: GERBER viewer (photoplotter documents) -- Cvpcb: footprint selector for components used in the circuit design -- Kicad: project manager +diagrams and printed circuit with up to 32 copper layers and additional techinical layers. + +KiCad includes a project manager and four main independent software tools: +- Eeschema: schematic editor. +- Pcbnew: printed circuit board editor. +- Gerbview: GERBER file viewer (photoplotter documents). +- Cvpcb: footprint selector for components association. + +%package library-install +Summary: Script for KiCad libraries downloading +Group: Productivity/Scientific/Electronics +Obsoletes: %{name}-library +Requires: %{name} = %{version} +Requires: curl +Requires: git-core +Requires: sed + +%description library-install +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. + +This package contains script for KiCad libraries downloading. %prep -%setup -q -n kicad-%{version} +%setup -q -n kicad-%{src_ver} %patch1 -p1 %patch2 -p1 -# fix plugin directory +cp %{SOURCE2} . + +# Fix plugin directory sed -i 's|KICAD_PLUGINS lib/kicad/plugins|KICAD_PLUGINS %{_lib}/kicad/plugins|' CMakeLists.txt -# fix documentation directory -# sed -i 's|KICAD_DOCS share/doc/kicad|KICAD_DOCS share/doc/packages/kicad|' CMakeLists.txt +# Fix documentation directory +sed -i 's|KICAD_DOCS share/doc/kicad|KICAD_DOCS share/doc/packages/kicad|' CMakeLists.txt %build -cmake \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DwxWidgets_USE_STATIC=OFF \ - -DwxUSE_UNICODE=ON \ -%if 0%{?with_gost} - -DKICAD_GOST=ON \ -%endif - -DKICAD_STABLE_VERSION=ON \ - . +%cmake \ + -DKICAD_REPO_NAME=stable \ + -DKICAD_BUILD_VERSION=%{src_ver} \ + -DKICAD_SKIP_BOOST=ON \ + -DBUILD_GITHUB_PLUGIN=ON \ + -DKICAD_SCRIPTING=ON \ + -DKICAD_SCRIPTING_MODULES=ON \ + -DKICAD_SCRIPTING_WXPYTHON=ON make %{?_smp_mflags} %install -rm resources/linux/mime/applications/eeschema.desktop -make install DESTDIR="%buildroot" +%cmake_install + +%suse_update_desktop_file -r bitmap2component "Education;Engineering" +%suse_update_desktop_file -r cvpcb "Education;Engineering" +%suse_update_desktop_file -r eeschema "Education;Engineering" +%suse_update_desktop_file -r gerbview "Education;Engineering" %suse_update_desktop_file -r kicad "Education;Engineering" +%suse_update_desktop_file -r pcbcalculator "Education;Engineering" +%suse_update_desktop_file -r pcbnew "Education;Engineering" + +install -D scripts/library-repos-install.sh %{buildroot}%{_bindir}/kicad-library-install.sh %fdupes -s %{buildroot}%{_datadir}/kicad +%fdupes -s %{buildroot}%{_datadir}/icons/hicolor %files %defattr(-,root,root) -%doc COPYRIGHT.txt CHANGELOG.txt +%doc CHANGELOG.txt COPYRIGHT.txt %{_bindir}/* +%exclude %{_bindir}/kicad-library-install.sh +%{_libdir}/kicad/ %{_datadir}/kicad/ -%{_datadir}/doc/kicad/ -%{_libdir}/kicad/plugins/netlist_form_pads-pcb.xsl -%dir %{_libdir}/kicad/ -%dir %{_libdir}/kicad/plugins/ +%{_datadir}/doc/packages/kicad/ +%{python_sitelib}/* %{_datadir}/applications/*.desktop %{_datadir}/mime/packages/kicad.xml %{_datadir}/mimelnk/application/x-kicad-*.desktop %dir %{_datadir}/mimelnk/ %dir %{_datadir}/mimelnk/application/ -%{_datadir}/icons/hicolor/*/mimetypes/application-x-kicad-project.* +%{_datadir}/icons/hicolor/*/mimetypes/application-x-* %{_datadir}/icons/hicolor/*/apps/*.* +%files library-install +%defattr(-,root,root) +%{_bindir}/kicad-library-install.sh + %changelog diff --git a/kikad-no-templates-install.patch b/kikad-no-templates-install.patch deleted file mode 100644 index 3f68e42..0000000 --- a/kikad-no-templates-install.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: kicad-20130707/template/CMakeLists.txt -=================================================================== ---- kicad-20130707.orig/template/CMakeLists.txt -+++ kicad-20130707/template/CMakeLists.txt -@@ -2,17 +2,5 @@ install(FILES kicad.pro - DESTINATION ${KICAD_TEMPLATE} - COMPONENT resources) - --# template_lst is a list of all templates. --set( template_lst -- raspberrypi-gpio -- stm32f100-discovery-shield -- ti-stellaris-boosterpack40 -- ti-stellaris-boosterpack40_min -- ) - --foreach( tpl ${template_lst} ) -- install( DIRECTORY ${tpl} -- DESTINATION ${KICAD_TEMPLATE} -- COMPONENT templates ) --endforeach() - diff --git a/pre_checkin.sh b/pre_checkin.sh deleted file mode 100644 index 3681b80..0000000 --- a/pre_checkin.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -cp -f kicad.changes kicad-gost.changes