rpms/kicad/F-13 kicad-2010.05.27.search-current-sheet-only.patch, NONE, 1.1 kicad.spec, 1.28, 1.29
Alain Portal
dionysos at fedoraproject.org
Fri Jun 11 21:48:59 UTC 2010
Author: dionysos
Update of /cvs/pkgs/rpms/kicad/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14431
Modified Files:
kicad.spec
Added Files:
kicad-2010.05.27.search-current-sheet-only.patch
Log Message:
* Mon Jun 11 2010 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 2010.05.27-5
- Fix a crash in searching string (https://bugs.launchpad.net/kicad/+bug/592566)
kicad-2010.05.27.search-current-sheet-only.patch:
class_drawsheetpath.cpp | 2 +-
find.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE kicad-2010.05.27.search-current-sheet-only.patch ---
diff -ru kicad-2010.05.27/eeschema/class_drawsheetpath.cpp kicad-2010.05.27-592566/eeschema/class_drawsheetpath.cpp
--- kicad-2010.05.27/eeschema/class_drawsheetpath.cpp 2010-05-28 21:47:33.000000000 +0200
+++ kicad-2010.05.27-592566/eeschema/class_drawsheetpath.cpp 2010-06-11 23:08:57.000000000 +0200
@@ -335,7 +335,7 @@
}
else
{
- if( drawItem->Matches( aSearchData, Last() ) )
+ if( drawItem->Matches( aSearchData, this ) )
return drawItem;
}
diff -ru kicad-2010.05.27/eeschema/find.cpp kicad-2010.05.27-592566/eeschema/find.cpp
--- kicad-2010.05.27/eeschema/find.cpp 2010-05-28 21:47:32.000000000 +0200
+++ kicad-2010.05.27-592566/eeschema/find.cpp 2010-06-11 23:10:14.000000000 +0200
@@ -290,7 +290,7 @@
*/
void WinEDA_SchematicFrame::OnFindSchematicItem( wxFindDialogEvent& event )
{
- static SCH_ITEM* lastItem = NULL;
+ static SCH_ITEM* lastItem = NULL;
SCH_SHEET_LIST schematic;
wxString msg;
@@ -301,7 +301,7 @@
searchCriteria.SetFindString( event.GetFindString() );
searchCriteria.SetReplaceString( event.GetReplaceString() );
- if( event.GetFlags() & FR_CURRENT_SHEET_ONLY )
+ if( event.GetFlags() & FR_CURRENT_SHEET_ONLY && g_RootSheet->CountSheets() > 1 )
{
sheetFoundIn = m_CurrentSheet;
lastItem = m_CurrentSheet->MatchNextItem( searchCriteria, lastItem );
Index: kicad.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kicad/F-13/kicad.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- kicad.spec 10 Jun 2010 18:41:30 -0000 1.28
+++ kicad.spec 11 Jun 2010 21:48:59 -0000 1.29
@@ -1,6 +1,6 @@
Name: kicad
Version: 2010.05.27
-Release: 4.rev2363%{?dist}
+Release: 5.rev2363%{?dist}
Summary: Electronic schematic diagrams and printed circuit board artwork
Summary(fr): Saisie de schéma électronique et routage de circuit imprimé
@@ -28,6 +28,7 @@ Patch13: %{name}-%{version}.undo-
Patch14: %{name}-%{version}.missing-focus.patch
Patch15: %{name}-%{version}.fix-unwanted-mouse-cursor-move.patch
Patch16: %{name}-%{version}.3Dviewer-arcs-draw-issue.patch
+Patch17: %{name}-%{version}.search-current-sheet-only.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -187,6 +188,7 @@ Documentation and tutorials for Kicad in
%patch14 -p1 -b .missing-focus
%patch15 -p1 -b .fix-unwanted-mouse-cursor-move
%patch16 -p0 -b .3Dviewer-arcs-draw-issue
+%patch17 -p1 -b .search-current-sheet-only
#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
@@ -407,6 +409,9 @@ gtk-update-icon-cache %{_datadir}/icons/
%changelog
+* Mon Jun 11 2010 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 2010.05.27-5
+- Fix a crash in searching string (https://bugs.launchpad.net/kicad/+bug/592566)
+
* Mon Jun 8 2010 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 2010.05.27-4
- Fix a focus issue (https://bugs.launchpad.net/kicad/+bug/587970)
- Fix an unwanted mouse cursor move when using the t hotkey in pcbnew
More information about the scm-commits
mailing list