diff --git a/.cvsignore b/.cvsignore index 4342c77..9dfeee7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -kicad-2009.07.07.tar.bz2 -kicad-doc-2009.07.07.tar.bz2 -kicad-library-2009.07.07.tar.bz2 +kicad-2010.03.14.tar.bz2 +kicad-doc-2010.03.14.tar.bz2 +kicad-library-2010.03.14.tar.bz2 diff --git a/kicad-2010.03.14-fix-demos-install.patch b/kicad-2010.03.14-fix-demos-install.patch new file mode 100644 index 0000000..5aa2be0 --- /dev/null +++ b/kicad-2010.03.14-fix-demos-install.patch @@ -0,0 +1,10 @@ +diff -up kicad-2010.03.14/demos/CMakeLists.txt.BAD kicad-2010.03.14/demos/CMakeLists.txt +--- kicad-2010.03.14/demos/CMakeLists.txt.BAD 2010-03-16 15:20:23.281442395 -0400 ++++ kicad-2010.03.14/demos/CMakeLists.txt 2010-03-16 15:20:33.465442317 -0400 +@@ -1,5 +1,5 @@ + install(DIRECTORY ecc83 electric flat_hierarchy interf_u microwave +- pic_programmer pspice "sonde xilinx" test_xil_95108 video ++ pic_programmer pspice sonde_xilinx test_xil_95108 video + DESTINATION ${KICAD_DEMOS} + COMPONENT resources + PATTERN ".svn" EXCLUDE) diff --git a/kicad-2010.03.14-link-fixes.patch b/kicad-2010.03.14-link-fixes.patch new file mode 100644 index 0000000..fc31cb1 --- /dev/null +++ b/kicad-2010.03.14-link-fixes.patch @@ -0,0 +1,36 @@ +diff -up kicad-2010.03.14/eeschema/CMakeLists.txt.kbool kicad-2010.03.14/eeschema/CMakeLists.txt +--- kicad-2010.03.14/eeschema/CMakeLists.txt.kbool 2010-03-15 08:24:32.000000000 -0400 ++++ kicad-2010.03.14/eeschema/CMakeLists.txt 2010-03-16 13:21:28.364443236 -0400 +@@ -154,7 +154,7 @@ if(APPLE) + set_target_properties(eeschema PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist) + endif(APPLE) + +-target_link_libraries(eeschema common bitmaps polygon ${wxWidgets_LIBRARIES} ${GDI_PLUS_LIBRARIES}) ++target_link_libraries(eeschema common bitmaps kbool polygon ${wxWidgets_LIBRARIES} ${GDI_PLUS_LIBRARIES}) + + install(TARGETS eeschema + DESTINATION ${KICAD_BIN} +diff -up kicad-2010.03.14/kicad/CMakeLists.txt.kbool kicad-2010.03.14/kicad/CMakeLists.txt +--- kicad-2010.03.14/kicad/CMakeLists.txt.kbool 2010-03-10 11:23:50.000000000 -0500 ++++ kicad-2010.03.14/kicad/CMakeLists.txt 2010-03-16 13:21:28.364443236 -0400 +@@ -49,7 +49,7 @@ install(TARGETS KiCad + DESTINATION ${KICAD_BIN} + COMPONENT binary) + else(APPLE) +- target_link_libraries(kicad common bitmaps polygon ${wxWidgets_LIBRARIES} ${GDI_PLUS_LIBRARIES}) ++ target_link_libraries(kicad common bitmaps kbool polygon ${wxWidgets_LIBRARIES} ${GDI_PLUS_LIBRARIES}) + install(TARGETS kicad + DESTINATION ${KICAD_BIN} + COMPONENT binary) +diff -up kicad-2010.03.14/common/CMakeLists.txt.BAD kicad-2010.03.14/common/CMakeLists.txt +--- kicad-2010.03.14/common/CMakeLists.txt.BAD 2010-03-16 15:07:29.328317975 -0400 ++++ kicad-2010.03.14/common/CMakeLists.txt 2010-03-16 15:07:49.162441795 -0400 +@@ -44,6 +44,7 @@ set(COMMON_SRCS + hotkeys_basic.cpp + msgpanel.cpp + newstroke_font.cpp ++ ../pcbnew/class_drc_item.cpp + projet_config.cpp + # pyhandler.cpp + richio.cpp +diff -up kicad-2010.03.14/pcbnew/class_drc_item.cpp.BAD kicad-2010.03.14/pcbnew/class_drc_item.cpp diff --git a/kicad-2010.03.14-rev2463.patch b/kicad-2010.03.14-rev2463.patch new file mode 100644 index 0000000..ef823ba --- /dev/null +++ b/kicad-2010.03.14-rev2463.patch @@ -0,0 +1,210 @@ +Index: eeschema/class_text-label.cpp +=================================================================== +--- eeschema/class_text-label.cpp (révision 2462) ++++ eeschema/class_text-label.cpp (révision 2463) +@@ -1219,5 +1219,6 @@ + rect.SetEnd(end); + } + ++ rect.Normalize(); + return rect; + } +Index: eeschema/class_sch_cmp_field.cpp +=================================================================== +--- eeschema/class_sch_cmp_field.cpp (révision 2462) ++++ eeschema/class_sch_cmp_field.cpp (révision 2463) +@@ -155,10 +155,10 @@ + LineWidth, m_Italic, + m_Bold, false ); + } ++ + /* Enable this to draw the bounding box around the text field to validate + * the bounding box calculations. + */ +- + #if 0 + // Draw boundary box: + int x1 = BoundaryBox.GetX(); +@@ -243,27 +243,24 @@ + */ + EDA_Rect SCH_FIELD::GetBoundaryBox() const + { +- EDA_Rect BoundaryBox; +- int hjustify, vjustify; +- int orient; +- int dx, dy, x1, y1, x2, y2; ++ EDA_Rect BoundaryBox; ++ int hjustify, vjustify; ++ int orient; ++ wxSize size; ++ wxPoint pos1, pos2; + + SCH_COMPONENT* parentComponent = (SCH_COMPONENT*) m_Parent; + + orient = m_Orient; +- wxPoint pos = parentComponent->m_Pos; +- x1 = m_Pos.x - pos.x; +- y1 = m_Pos.y - pos.y; ++ wxPoint pos = parentComponent->m_Pos; ++ pos1 = m_Pos - pos; + +- dx = LenSize( m_Text ); +- dy = m_Size.y; ++ size.x = LenSize( m_Text ); ++ size.y = m_Size.y; + hjustify = m_HJustify; + vjustify = m_VJustify; + +- x2 = pos.x + ( parentComponent->m_Transform[0][0] * x1 ) +- + ( parentComponent->m_Transform[0][1] * y1 ); +- y2 = pos.y + ( parentComponent->m_Transform[1][0] * x1 ) +- + ( parentComponent->m_Transform[1][1] * y1 ); ++ pos2 = pos + TransformCoordinate( parentComponent->m_Transform, pos1 ); + + /* Calculate the text orientation, according to the component + * orientation/mirror */ +@@ -295,42 +292,40 @@ + } + + if( orient == TEXT_ORIENT_VERT ) +- EXCHG( dx, dy ); ++ EXCHG( size.x, size.y ); + + switch( hjustify ) + { + case GR_TEXT_HJUSTIFY_CENTER: +- x1 = x2 - (dx / 2); ++ pos1.x = pos2.x - (size.x / 2); + break; + + case GR_TEXT_HJUSTIFY_RIGHT: +- x1 = x2 - dx; ++ pos1.x = pos2.x - size.x; + break; + + default: +- x1 = x2; ++ pos1.x = pos2.x; + break; + } + + switch( vjustify ) + { + case GR_TEXT_VJUSTIFY_CENTER: +- y1 = y2 - (dy / 2); ++ pos1.y = pos2.y - (size.y / 2); + break; + + case GR_TEXT_VJUSTIFY_BOTTOM: +- y1 = y2 - dy; ++ pos1.y = pos2.y - size.y; + break; + + default: +- y1 = y2; ++ pos1.y = pos2.y; + break; + } + +- BoundaryBox.SetX( x1 ); +- BoundaryBox.SetY( y1 ); +- BoundaryBox.SetWidth( dx ); +- BoundaryBox.SetHeight( dy ); ++ BoundaryBox.SetOrigin( pos1 ); ++ BoundaryBox.SetSize( size ); + + // Take thickness in account: + int linewidth = ( m_Width == 0 ) ? g_DrawDefaultLineThickness : m_Width; +Index: eeschema/class_BodyItem_Text.cpp +=================================================================== +--- eeschema/class_BodyItem_Text.cpp (révision 2462) ++++ eeschema/class_BodyItem_Text.cpp (révision 2463) +@@ -305,15 +305,54 @@ + + GRSetDrawMode( aDC, aDrawMode ); + ++ /* Calculate the text orientation, according to the component ++ * orientation/mirror (needed when draw text in schematic) ++ */ ++ int orient = m_Orient; ++ if( aTransformMatrix[0][1] ) // Rotate component 90 degrees. ++ { ++ if( orient == TEXT_ORIENT_HORIZ ) ++ orient = TEXT_ORIENT_VERT; ++ else ++ orient = TEXT_ORIENT_HORIZ; ++ } ++ ++ /* Calculate the text justification, according to the component ++ * orientation/mirror this is a bit complicated due to cumulative ++ * calculations: ++ * - numerous cases (mirrored or not, rotation) ++ * - the DrawGraphicText function recalculate also H and H justifications ++ * according to the text orientation. ++ * - When a component is mirrored, the text is not mirrored and ++ * justifications are complicated to calculate ++ * so the more easily way is to use no justifications ( Centered text ) ++ * and use GetBoundaryBox to know the text coordinate considered as centered ++ */ ++ EDA_Rect bBox = GetBoundingBox(); ++ pos1 = bBox.Centre(); // this is the coordinates of the graphic text relative to the component position ++ // in schematic Y axis orientation ++ /* convert y coordinate from schematic to library Y axis orientation ++ * because we want to call TransformCoordinate to calculate real coordinates ++ */ ++ NEGATE( pos1.y ); ++ pos1 = TransformCoordinate( aTransformMatrix, pos1 ) + aOffset; + DrawGraphicText( aPanel, aDC, pos1, (EDA_Colors) color, m_Text, +- m_Orient, m_Size, m_HJustify, m_VJustify, ++ orient, m_Size, GR_TEXT_HJUSTIFY_CENTER, GR_TEXT_VJUSTIFY_CENTER, + GetPenSize( ), m_Italic, m_Bold ); + ++ ++ /* Enable this to draw the bounding box around the text field to validate ++ * the bounding box calculations. ++ */ + #if 0 +- EDA_Rect bBox = GetBoundingBox(); +- bBox.Inflate( 1, 1 ); +- GRRect( &aPanel->m_ClipBox, aDC, bBox.GetOrigin().x, bBox.GetOrigin().y, +- bBox.GetEnd().x, bBox.GetEnd().y, 0, LIGHTMAGENTA ); ++ EDA_Rect grBox; ++ bBox.SetY( -bBox.GetY() ); ++ bBox.SetHeight( -bBox.GetHeight()); ++ grBox.SetOrigin( TransformCoordinate( aTransformMatrix, bBox.GetOrigin() ) ); ++ grBox.SetEnd( TransformCoordinate( aTransformMatrix, bBox.GetEnd() ) ); ++ grBox.Move( aOffset ); ++ GRRect( &aPanel->m_ClipBox, aDC, grBox.GetOrigin().x, grBox.GetOrigin().y, ++ grBox.GetEnd().x, grBox.GetEnd().y, 0, LIGHTMAGENTA ); + #endif + } + +@@ -331,11 +370,18 @@ + } + + ++/** ++ * @return the boundary box for this, in schematic coordinates ++ */ + EDA_Rect LIB_TEXT::GetBoundingBox() + { ++ /* remenber Y coordinates in lib are bottom to top, so we must ++ * negate the Y position befire calling GetTextBox() that works using top to bottom ++ * Y axis orientation ++ */ ++ NEGATE(m_Pos.y ); + EDA_Rect rect = GetTextBox(); +- rect.m_Pos.y *= -1; +- rect.m_Pos.y -= rect.GetHeight(); ++ NEGATE(m_Pos.y ); // restore Y cooordinate for the graphic text + + wxPoint orig = rect.GetOrigin(); + wxPoint end = rect.GetEnd(); +@@ -345,6 +391,6 @@ + RotatePoint( &end, center, m_Orient ); + rect.SetOrigin( orig ); + rect.SetEnd( end ); +- ++ rect.Normalize(); + return rect; + } diff --git a/kicad.spec b/kicad.spec index ddaba57..9459c29 100644 --- a/kicad.spec +++ b/kicad.spec @@ -1,18 +1,23 @@ Name: kicad -Version: 2009.07.07 -Release: 4.rev1863%{?dist} +Version: 2010.03.14 +Release: 3.rev2463%{?dist} Summary: Electronic schematic diagrams and printed circuit board artwork Summary(fr): Saisie de schéma électronique et tracé de circuit imprimé Group: Applications/Engineering License: GPLv2+ -URL: http://www.lis.inpg.fr/realise_au_lis/kicad/ +URL: http://kicad.sourceforge.net # Source files created from upstream's SVN repository Source: kicad-%{version}.tar.bz2 Source1: kicad-doc-%{version}.tar.bz2 Source2: kicad-library-%{version}.tar.bz2 -Source3: kicad-ld.conf +Source3: kicad-ld.conf + +Patch0: kicad-2010.03.14-link-fixes.patch +# Fix spacing issue +Patch1: kicad-2010.03.14-fix-demos-install.patch +Patch2: kicad-2010.03.14-rev2463.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -46,6 +51,7 @@ Kicad est un ensemble de quatres logiciels et un gestionnaire de projet : %package doc Summary: Documentations for kicad +Summary(fr): Documentations pour kicad en anglais Group: Applications/Engineering License: GPLv2+ Requires: %{name} = %{version}-%{release} @@ -53,13 +59,13 @@ Requires: %{name} = %{version}-%{release} BuildArch: noarch %endif - %description doc Documentations and tutorials for kicad in English %package doc-de Summary: Documentation for Kicad in German +Summary(fr): Documentations pour kicad en allemand Group: Documentation Requires: %{name}-doc = %{version}-%{release} %if 0%{?fedora} >= 11 @@ -72,6 +78,7 @@ Documentation and tutorials for Kicad in German %package doc-es Summary: Documentation for Kicad in Spanish +Summary(fr): Documentations pour kicad en espagnol Group: Documentation Requires: %{name}-doc = %{version}-%{release} %if 0%{?fedora} >= 11 @@ -84,6 +91,7 @@ Documentation and tutorials for Kicad in Spanish %package doc-fr Summary: Documentation for Kicad in French +Summary(fr): Documentations pour kicad en français Group: Documentation Requires: %{name}-doc = %{version}-%{release} %if 0%{?fedora} >= 11 @@ -96,6 +104,7 @@ Documentation and tutorials for Kicad in French %package doc-hu Summary: Documentation for Kicad in Hungarian +Summary(fr): Documentations pour kicad en hongrois Group: Documentation Requires: %{name}-doc = %{version}-%{release} %if 0%{?fedora} >= 11 @@ -108,6 +117,7 @@ Documentation and tutorials for Kicad in Hungarian %package doc-it Summary: Documentation for Kicad in Italian +Summary(fr): Documentations pour kicad en italien Group: Documentation Requires: %{name}-doc = %{version}-%{release} %if 0%{?fedora} >= 11 @@ -120,6 +130,7 @@ Documentation and tutorials for Kicad in Italian %package doc-pt Summary: Documentation for Kicad in Portuguese +Summary(fr): Documentations pour kicad en portugais Group: Documentation Requires: %{name}-doc = %{version}-%{release} %if 0%{?fedora} >= 11 @@ -132,6 +143,7 @@ Documentation and tutorials for Kicad in Portuguese %package doc-ru Summary: Documentation for Kicad in Russian +Summary(fr): Documentations pour kicad en russe Group: Documentation Requires: %{name}-doc = %{version}-%{release} %if 0%{?fedora} >= 11 @@ -144,6 +156,7 @@ Documentation and tutorials for Kicad in Russian %package doc-zh_CN Summary: Documentation for Kicad in Chinese +Summary(fr): Documentations pour kicad en chinois Group: Documentation Requires: %{name}-doc = %{version}-%{release} %if 0%{?fedora} >= 11 @@ -156,6 +169,9 @@ Documentation and tutorials for Kicad in Chinese %prep %setup -q -a 1 -a 2 +%patch0 -p1 -b .link-fix +%patch1 -p1 -b .space-fix +%patch2 -p0 -b .rev2463 #kicad-doc.noarch: W: file-not-utf8 /usr/share/doc/kicad/AUTHORS.txt iconv -f iso8859-1 -t utf-8 AUTHORS.txt > AUTHORS.conv && mv -f AUTHORS.conv AUTHORS.txt @@ -328,7 +344,6 @@ fi %defattr(-,root,root,-) %doc %{_docdir}/%{name}/help/pt - %files doc-ru %defattr(-,root,root,-) %doc %{_docdir}/%{name}/help/ru @@ -336,11 +351,22 @@ fi %files doc-zh_CN %defattr(-,root,root,-) -#%doc %{_docdir}/%{name}/help/zh_CN %doc %{_docdir}/%{name}/tutorials/zh_CN %changelog +* Wed Mar 17 2010 Alain Portal 2010.03.14-3.rev2463 +- Patch with svn revision 2463 which fix 2 bugs +- Harmonize identation in %%changelog + +* Tue Mar 16 2010 Tom "spot" Callaway 2010.03.14-2.rev2462 +- Link fixes. Really, these libraries should be linked properly so they don't need + the executable linking calls to be explicitly correct, but cmake gives me a headache. +- Fix demo installation + +* Mon Mar 15 2010 Alain Portal 2010.03.14-1.rev2462 +- New upstream version + * Mon Aug 24 2009 Jon Ciesla - 2009.07.07-4.rev1863 - Multilib path correction, BZ 518916. @@ -374,81 +400,80 @@ fi - 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 +- 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 +- License tag clarification * Thu Aug 23 2007 Alain Portal 2007.01.15-3 - - Rebuild +- Rebuild * Wed Feb 14 2007 Alain Portal 2007.01.15-2 - - Fix desktop entry. Fix #228598 +- Fix desktop entry. Fix #228598 * Thu Feb 8 2007 Alain Portal 2007.01.15-1 - - New upstream version +- 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 +- 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. +- 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 +- 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 +- 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 +- FE6 rebuild * Mon Jul 10 2006 Alain Portal 2006.06.26-5 - - Removing backup files is no more needed. +- 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. +- 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/ +- s/mesa-libGLU-devel/libGLU-devel/ * Mon Jul 3 2006 Alain Portal 2006.06.26-2 - - BR mesa-libGLU-devel +- BR mesa-libGLU-devel * Wed Jun 28 2006 Alain Portal 2006.06.26-1 - - New upstream version +- 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 +- 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. +- 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 +- 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. +- 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 +- Initial Fedora RPM diff --git a/sources b/sources index 5affea7..f4e588a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -b7df0a960ff269205038b99131bfdbc0 kicad-2009.07.07.tar.bz2 -396786f9595a8fe90479d764492a7726 kicad-doc-2009.07.07.tar.bz2 -43a40c3f52cd74632eb31540e95952a8 kicad-library-2009.07.07.tar.bz2 +0e8529365ef1c856db04b5b5145d2979 kicad-2010.03.14.tar.bz2 +5fd986d514bc085e4ff3bbf5c558b231 kicad-doc-2010.03.14.tar.bz2 +a6029a5f7bf0e2c1abbdee05c20d6a36 kicad-library-2010.03.14.tar.bz2