[kicad/f14/master] - Remove obsolete patches - New upstream version - Update versioning patch, all others patches no mo
Alain Portal
dionysos at fedoraproject.org
Tue Mar 22 18:45:48 UTC 2011
commit 2fe255c50c3136c89bf399ef19099d3e37ecac43
Author: Alain Portal <alain.portal at free.fr>
Date: Tue Mar 22 19:45:37 2011 +0100
- Remove obsolete patches
- New upstream version
- Update versioning patch, all others patches no more needed
- Patch to fix a link time error (with help from Kevin Kofler and Nikola Pajkovsky)
- Add s390x as 64-bit arch
.gitignore | 3 +
kicad-2010.03.14-fix-demos-install.patch | 10 -
kicad-2010.03.14-link-fixes.patch | 36 -
kicad-2010.03.14-rev2463.patch | 210 --
kicad-2010.04.06.auto-update-3D-display.patch | 312 --
kicad-2010.04.06.cleanup-undoable.patch | 58 -
kicad-2010.04.06.create-png-from-screen.patch | 242 --
...dialog_design_rules.cpp.fix-sort-function.patch | 17 -
kicad-2010.04.06.dimension-vs-cotation.patch | 1781 ----------
kicad-2010.04.06.drc-clearance.patch | 325 --
...nt_in_schematic.cpp.fix_footprint_edition.patch | 22 -
kicad-2010.04.06.fix-issues-svg-export.patch | 121 -
kicad-2010.04.06.gerber-lines-thickness.patch | 3486 --------------------
kicad-2010.04.06.last-netlist-file.patch | 2635 ---------------
kicad-2010.04.06.minor-pcbnew-enhancements.patch | 156 -
kicad-2010.04.06.subcomponent.patch | 492 ---
kicad-2010.05.09.cmake-requirement.patch | 14 -
kicad-2010.05.27.3DViewer-crash.patch | 89 -
kicad-2010.05.27.3Dviewer-arcs-draw-issue.patch | 98 -
kicad-2010.05.27.display-footprint-value.patch | 10 -
...2010.05.27.fix-unwanted-mouse-cursor-move.patch | 44 -
kicad-2010.05.27.missing-focus.patch | 129 -
kicad-2010.05.27.module-edition-issues.patch | 234 --
kicad-2010.05.27.real-version.patch | 11 -
kicad-2010.05.27.search-current-sheet-only.patch | 33 -
kicad-2010.05.27.set-extension-if-missing.patch | 19 -
kicad-2010.05.27.undo-redo-issue.patch | 10 -
kicad-2011.01.28-fix-build.patch | 387 +++
kicad-2011.01.28-real-version.patch | 387 +++
kicad.spec | 44 +-
sources | 6 +-
31 files changed, 798 insertions(+), 10623 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 46e4da3..7df9b61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
kicad-2010.05.27.tar.bz2
kicad-doc-2010.05.27.tar.bz2
kicad-libraries-2010.05.27.tar.bz2
+/kicad-2011.01.28.tar.bz2
+/kicad-doc-2011.01.28.tar.bz2
+/kicad-libraries-2011.01.28.tar.bz2
diff --git a/kicad-2011.01.28-fix-build.patch b/kicad-2011.01.28-fix-build.patch
new file mode 100644
index 0000000..4b6c617
--- /dev/null
+++ b/kicad-2011.01.28-fix-build.patch
@@ -0,0 +1,387 @@
+diff -d -urpN kicad-2011.01.28/common/class_layerchoicebox.cpp kicad-origin/common/class_layerchoicebox.cpp
+--- kicad-2011.01.28/common/class_layerchoicebox.cpp 2011-03-01 20:24:28.000000000 +0100
++++ kicad-origin/common/class_layerchoicebox.cpp 1970-01-01 01:00:00.000000000 +0100
+@@ -1,180 +0,0 @@
+-#include "common.h"
+-#include "pcbnew.h"
+-#include "wxPcbStruct.h"
+-#include "class_board_design_settings.h"
+-#include "colors_selection.h"
+-
+-#include "bitmaps.h"
+-
+-#include "hotkeys.h"
+-#include "help_common_strings.h"
+-
+-#include <wx/ownerdrw.h>
+-#include <wx/menuitem.h>
+-#include <wx/bmpcbox.h>
+-#include <wx/wx.h>
+-
+-#include "class_layerchoicebox.h"
+-
+-/* class to display a layer list.
+- *
+- */
+-
+-WinEDALayerChoiceBox::WinEDALayerChoiceBox( WinEDA_Toolbar* parent, wxWindowID id,
+- const wxPoint& pos, const wxSize& size,
+- int n, const wxString choices[] ) :
+- wxBitmapComboBox( parent, id, wxEmptyString, pos, size,
+- n, choices, wxCB_READONLY )
+-{
+- m_layerorder = true;
+- m_layerhotkeys = true;
+- m_hotkeys = NULL;
+-
+- if( choices != NULL )
+- ResyncBitmapOnly();
+-}
+-
+-
+-WinEDALayerChoiceBox::WinEDALayerChoiceBox( WinEDA_Toolbar* parent, wxWindowID id,
+- const wxPoint& pos, const wxSize& size,
+- const wxArrayString& choices ) :
+- wxBitmapComboBox( parent, id, wxEmptyString, pos, size,
+- choices, wxCB_READONLY )
+-{
+- m_layerorder = true;
+- m_layerhotkeys = true;
+- m_hotkeys = NULL;
+-
+- if( !choices.IsEmpty() )
+- ResyncBitmapOnly();
+-}
+-
+-
+-bool WinEDALayerChoiceBox::SetLayersOrdered( bool value )
+-{
+- m_layerorder = value;
+- return m_layerorder;
+-}
+-
+-
+-bool WinEDALayerChoiceBox::SetLayersHotkeys( bool value )
+-{
+- m_layerhotkeys = value;
+- return m_layerhotkeys;
+-}
+-
+-
+-// Get Current Item #
+-int WinEDALayerChoiceBox::GetChoice()
+-{
+- return GetSelection();
+-}
+-
+-
+-// Get Current Layer
+-int WinEDALayerChoiceBox::GetLayerSelection()
+-{
+- return (long) GetClientData( GetSelection() );
+-}
+-
+-
+-// Set Layer #
+-int WinEDALayerChoiceBox::SetLayerSelection( int layer )
+-{
+- int elements = GetCount();
+-
+- for( int i = 0; i < elements; i++ )
+- {
+- if( GetClientData( i ) == (void*) layer )
+- {
+- if( GetSelection() != i ) // Element (i) is not selected
+- {
+- SetSelection( i );
+- return i;
+- }
+- else
+- return i; //If element already selected; do nothing
+- }
+- }
+-
+- // Not Found
+- SetSelection( -1 );
+- return -1;
+-}
+-
+-
+-// Reload the Layers
+-void WinEDALayerChoiceBox::Resync()
+-{
+- WinEDA_BasePcbFrame* pcbFrame = (WinEDA_BasePcbFrame*) GetParent()->GetParent();
+- BOARD* board = pcbFrame->GetBoard();
+-
+- wxASSERT( board != NULL );
+-
+- Clear();
+-
+- static DECLARE_LAYERS_ORDER_LIST( layertranscode );
+- static DECLARE_LAYERS_HOTKEY( layerhk );
+-
+- for( int i = 0; i < LAYER_COUNT; i++ )
+- {
+- wxBitmap layerbmp( 14, 14 );
+- wxMemoryDC bmpDC;
+- wxBrush brush;
+- wxString layername;
+- int layerid = i;
+-
+- if( m_layerorder )
+- layerid = layertranscode[i];
+-
+- if( !board->IsLayerEnabled( layerid ) )
+- continue;
+-
+- // Prepare Bitmap
+- bmpDC.SelectObject( layerbmp );
+- brush.SetColour( MakeColour( board->GetLayerColor( layerid ) ) );
+- brush.SetStyle( wxSOLID );
+-
+- bmpDC.SetBrush( brush );
+- bmpDC.DrawRectangle( 0, 0, layerbmp.GetWidth(), layerbmp.GetHeight() );
+- bmpDC.SetBrush( *wxTRANSPARENT_BRUSH );
+- bmpDC.SetPen( *wxBLACK_PEN );
+- bmpDC.DrawRectangle( 0, 0, layerbmp.GetWidth(), layerbmp.GetHeight() );
+-
+- layername = board->GetLayerName( layerid );
+-
+- if( m_layerhotkeys && m_hotkeys != NULL )
+- layername = AddHotkeyName( layername, m_hotkeys, layerhk[layerid], false );
+-
+- Append( layername, layerbmp, (void*) layerid );
+- }
+-}
+-
+-void WinEDALayerChoiceBox::ResyncBitmapOnly()
+-{
+- WinEDA_BasePcbFrame* pcbFrame = (WinEDA_BasePcbFrame*) GetParent()->GetParent();
+- BOARD* board = pcbFrame->GetBoard();
+-
+- int elements = GetCount();
+- for( int i = 0; i < elements; i++ )
+- {
+- wxBitmap layerbmp( 14, 14 );
+- wxMemoryDC bmpDC;
+- wxBrush brush;
+- wxString layername;
+- int layerid = i;
+-
+- // Prepare Bitmap
+- bmpDC.SelectObject( layerbmp );
+- brush.SetColour( MakeColour( board->GetLayerColor( layerid ) ) );
+- brush.SetStyle( wxSOLID );
+-
+- bmpDC.SetBrush( brush );
+- bmpDC.DrawRectangle( 0, 0, layerbmp.GetWidth(), layerbmp.GetHeight() );
+- bmpDC.SetBrush( *wxTRANSPARENT_BRUSH );
+- bmpDC.SetPen( *wxBLACK_PEN );
+- bmpDC.DrawRectangle( 0, 0, layerbmp.GetWidth(), layerbmp.GetHeight() );
+-
+- SetItemBitmap(i, layerbmp);
+- }
+-}
+diff -d -urpN kicad-2011.01.28/common/CMakeLists.txt kicad-origin/common/CMakeLists.txt
+--- kicad-2011.01.28/common/CMakeLists.txt 2011-03-01 20:24:28.000000000 +0100
++++ kicad-origin/common/CMakeLists.txt 2011-03-21 23:58:27.691625676 +0100
+@@ -28,7 +28,6 @@ set(COMMON_SRCS
+ block_commande.cpp
+ build_version.cpp
+ class_colors_design_settings.cpp
+- class_layerchoicebox.cpp
+ class_marker_base.cpp
+ class_plotter.cpp
+ class_undoredo_container.cpp
+@@ -101,6 +100,7 @@ set(PCB_COMMON_SRCS
+ ../pcbnew/classpcb.cpp
+ ../pcbnew/collectors.cpp
+ ../pcbnew/sel_layer.cpp
++ ../pcbnew/class_layerchoicebox.cpp
+ )
+
+ add_library(pcbcommon ${PCB_COMMON_SRCS})
+diff -d -urpN kicad-2011.01.28/pcbnew/class_layerchoicebox.cpp kicad-origin/pcbnew/class_layerchoicebox.cpp
+--- kicad-2011.01.28/pcbnew/class_layerchoicebox.cpp 1970-01-01 01:00:00.000000000 +0100
++++ kicad-origin/pcbnew/class_layerchoicebox.cpp 2011-03-01 20:24:28.000000000 +0100
+@@ -0,0 +1,180 @@
++#include "common.h"
++#include "pcbnew.h"
++#include "wxPcbStruct.h"
++#include "class_board_design_settings.h"
++#include "colors_selection.h"
++
++#include "bitmaps.h"
++
++#include "hotkeys.h"
++#include "help_common_strings.h"
++
++#include <wx/ownerdrw.h>
++#include <wx/menuitem.h>
++#include <wx/bmpcbox.h>
++#include <wx/wx.h>
++
++#include "class_layerchoicebox.h"
++
++/* class to display a layer list.
++ *
++ */
++
++WinEDALayerChoiceBox::WinEDALayerChoiceBox( WinEDA_Toolbar* parent, wxWindowID id,
++ const wxPoint& pos, const wxSize& size,
++ int n, const wxString choices[] ) :
++ wxBitmapComboBox( parent, id, wxEmptyString, pos, size,
++ n, choices, wxCB_READONLY )
++{
++ m_layerorder = true;
++ m_layerhotkeys = true;
++ m_hotkeys = NULL;
++
++ if( choices != NULL )
++ ResyncBitmapOnly();
++}
++
++
++WinEDALayerChoiceBox::WinEDALayerChoiceBox( WinEDA_Toolbar* parent, wxWindowID id,
++ const wxPoint& pos, const wxSize& size,
++ const wxArrayString& choices ) :
++ wxBitmapComboBox( parent, id, wxEmptyString, pos, size,
++ choices, wxCB_READONLY )
++{
++ m_layerorder = true;
++ m_layerhotkeys = true;
++ m_hotkeys = NULL;
++
++ if( !choices.IsEmpty() )
++ ResyncBitmapOnly();
++}
++
++
++bool WinEDALayerChoiceBox::SetLayersOrdered( bool value )
++{
++ m_layerorder = value;
++ return m_layerorder;
++}
++
++
++bool WinEDALayerChoiceBox::SetLayersHotkeys( bool value )
++{
++ m_layerhotkeys = value;
++ return m_layerhotkeys;
++}
++
++
++// Get Current Item #
++int WinEDALayerChoiceBox::GetChoice()
++{
++ return GetSelection();
++}
++
++
++// Get Current Layer
++int WinEDALayerChoiceBox::GetLayerSelection()
++{
++ return (long) GetClientData( GetSelection() );
++}
++
++
++// Set Layer #
++int WinEDALayerChoiceBox::SetLayerSelection( int layer )
++{
++ int elements = GetCount();
++
++ for( int i = 0; i < elements; i++ )
++ {
++ if( GetClientData( i ) == (void*) layer )
++ {
++ if( GetSelection() != i ) // Element (i) is not selected
++ {
++ SetSelection( i );
++ return i;
++ }
++ else
++ return i; //If element already selected; do nothing
++ }
++ }
++
++ // Not Found
++ SetSelection( -1 );
++ return -1;
++}
++
++
++// Reload the Layers
++void WinEDALayerChoiceBox::Resync()
++{
++ WinEDA_BasePcbFrame* pcbFrame = (WinEDA_BasePcbFrame*) GetParent()->GetParent();
++ BOARD* board = pcbFrame->GetBoard();
++
++ wxASSERT( board != NULL );
++
++ Clear();
++
++ static DECLARE_LAYERS_ORDER_LIST( layertranscode );
++ static DECLARE_LAYERS_HOTKEY( layerhk );
++
++ for( int i = 0; i < LAYER_COUNT; i++ )
++ {
++ wxBitmap layerbmp( 14, 14 );
++ wxMemoryDC bmpDC;
++ wxBrush brush;
++ wxString layername;
++ int layerid = i;
++
++ if( m_layerorder )
++ layerid = layertranscode[i];
++
++ if( !board->IsLayerEnabled( layerid ) )
++ continue;
++
++ // Prepare Bitmap
++ bmpDC.SelectObject( layerbmp );
++ brush.SetColour( MakeColour( board->GetLayerColor( layerid ) ) );
++ brush.SetStyle( wxSOLID );
++
++ bmpDC.SetBrush( brush );
++ bmpDC.DrawRectangle( 0, 0, layerbmp.GetWidth(), layerbmp.GetHeight() );
++ bmpDC.SetBrush( *wxTRANSPARENT_BRUSH );
++ bmpDC.SetPen( *wxBLACK_PEN );
++ bmpDC.DrawRectangle( 0, 0, layerbmp.GetWidth(), layerbmp.GetHeight() );
++
++ layername = board->GetLayerName( layerid );
++
++ if( m_layerhotkeys && m_hotkeys != NULL )
++ layername = AddHotkeyName( layername, m_hotkeys, layerhk[layerid], false );
++
++ Append( layername, layerbmp, (void*) layerid );
++ }
++}
++
++void WinEDALayerChoiceBox::ResyncBitmapOnly()
++{
++ WinEDA_BasePcbFrame* pcbFrame = (WinEDA_BasePcbFrame*) GetParent()->GetParent();
++ BOARD* board = pcbFrame->GetBoard();
++
++ int elements = GetCount();
++ for( int i = 0; i < elements; i++ )
++ {
++ wxBitmap layerbmp( 14, 14 );
++ wxMemoryDC bmpDC;
++ wxBrush brush;
++ wxString layername;
++ int layerid = i;
++
++ // Prepare Bitmap
++ bmpDC.SelectObject( layerbmp );
++ brush.SetColour( MakeColour( board->GetLayerColor( layerid ) ) );
++ brush.SetStyle( wxSOLID );
++
++ bmpDC.SetBrush( brush );
++ bmpDC.DrawRectangle( 0, 0, layerbmp.GetWidth(), layerbmp.GetHeight() );
++ bmpDC.SetBrush( *wxTRANSPARENT_BRUSH );
++ bmpDC.SetPen( *wxBLACK_PEN );
++ bmpDC.DrawRectangle( 0, 0, layerbmp.GetWidth(), layerbmp.GetHeight() );
++
++ SetItemBitmap(i, layerbmp);
++ }
++}
diff --git a/kicad-2011.01.28-real-version.patch b/kicad-2011.01.28-real-version.patch
new file mode 100644
index 0000000..4b6c617
--- /dev/null
+++ b/kicad-2011.01.28-real-version.patch
@@ -0,0 +1,387 @@
+diff -d -urpN kicad-2011.01.28/common/class_layerchoicebox.cpp kicad-origin/common/class_layerchoicebox.cpp
+--- kicad-2011.01.28/common/class_layerchoicebox.cpp 2011-03-01 20:24:28.000000000 +0100
++++ kicad-origin/common/class_layerchoicebox.cpp 1970-01-01 01:00:00.000000000 +0100
+@@ -1,180 +0,0 @@
+-#include "common.h"
+-#include "pcbnew.h"
+-#include "wxPcbStruct.h"
+-#include "class_board_design_settings.h"
+-#include "colors_selection.h"
+-
+-#include "bitmaps.h"
+-
+-#include "hotkeys.h"
+-#include "help_common_strings.h"
+-
+-#include <wx/ownerdrw.h>
+-#include <wx/menuitem.h>
+-#include <wx/bmpcbox.h>
+-#include <wx/wx.h>
+-
+-#include "class_layerchoicebox.h"
+-
+-/* class to display a layer list.
+- *
+- */
+-
+-WinEDALayerChoiceBox::WinEDALayerChoiceBox( WinEDA_Toolbar* parent, wxWindowID id,
+- const wxPoint& pos, const wxSize& size,
+- int n, const wxString choices[] ) :
+- wxBitmapComboBox( parent, id, wxEmptyString, pos, size,
+- n, choices, wxCB_READONLY )
+-{
+- m_layerorder = true;
+- m_layerhotkeys = true;
+- m_hotkeys = NULL;
+-
+- if( choices != NULL )
+- ResyncBitmapOnly();
+-}
+-
+-
+-WinEDALayerChoiceBox::WinEDALayerChoiceBox( WinEDA_Toolbar* parent, wxWindowID id,
+- const wxPoint& pos, const wxSize& size,
+- const wxArrayString& choices ) :
+- wxBitmapComboBox( parent, id, wxEmptyString, pos, size,
+- choices, wxCB_READONLY )
+-{
+- m_layerorder = true;
+- m_layerhotkeys = true;
+- m_hotkeys = NULL;
+-
+- if( !choices.IsEmpty() )
+- ResyncBitmapOnly();
+-}
+-
+-
+-bool WinEDALayerChoiceBox::SetLayersOrdered( bool value )
+-{
+- m_layerorder = value;
+- return m_layerorder;
+-}
+-
+-
+-bool WinEDALayerChoiceBox::SetLayersHotkeys( bool value )
+-{
+- m_layerhotkeys = value;
+- return m_layerhotkeys;
+-}
+-
+-
+-// Get Current Item #
+-int WinEDALayerChoiceBox::GetChoice()
+-{
+- return GetSelection();
+-}
+-
+-
+-// Get Current Layer
+-int WinEDALayerChoiceBox::GetLayerSelection()
+-{
+- return (long) GetClientData( GetSelection() );
+-}
+-
+-
+-// Set Layer #
+-int WinEDALayerChoiceBox::SetLayerSelection( int layer )
+-{
+- int elements = GetCount();
+-
+- for( int i = 0; i < elements; i++ )
+- {
+- if( GetClientData( i ) == (void*) layer )
+- {
+- if( GetSelection() != i ) // Element (i) is not selected
+- {
+- SetSelection( i );
+- return i;
+- }
+- else
+- return i; //If element already selected; do nothing
+- }
+- }
+-
+- // Not Found
+- SetSelection( -1 );
+- return -1;
+-}
+-
+-
+-// Reload the Layers
+-void WinEDALayerChoiceBox::Resync()
+-{
+- WinEDA_BasePcbFrame* pcbFrame = (WinEDA_BasePcbFrame*) GetParent()->GetParent();
+- BOARD* board = pcbFrame->GetBoard();
+-
+- wxASSERT( board != NULL );
+-
+- Clear();
+-
+- static DECLARE_LAYERS_ORDER_LIST( layertranscode );
+- static DECLARE_LAYERS_HOTKEY( layerhk );
+-
+- for( int i = 0; i < LAYER_COUNT; i++ )
+- {
+- wxBitmap layerbmp( 14, 14 );
+- wxMemoryDC bmpDC;
+- wxBrush brush;
+- wxString layername;
+- int layerid = i;
+-
+- if( m_layerorder )
+- layerid = layertranscode[i];
+-
+- if( !board->IsLayerEnabled( layerid ) )
+- continue;
+-
+- // Prepare Bitmap
+- bmpDC.SelectObject( layerbmp );
+- brush.SetColour( MakeColour( board->GetLayerColor( layerid ) ) );
+- brush.SetStyle( wxSOLID );
+-
+- bmpDC.SetBrush( brush );
+- bmpDC.DrawRectangle( 0, 0, layerbmp.GetWidth(), layerbmp.GetHeight() );
+- bmpDC.SetBrush( *wxTRANSPARENT_BRUSH );
+- bmpDC.SetPen( *wxBLACK_PEN );
+- bmpDC.DrawRectangle( 0, 0, layerbmp.GetWidth(), layerbmp.GetHeight() );
+-
+- layername = board->GetLayerName( layerid );
+-
+- if( m_layerhotkeys && m_hotkeys != NULL )
+- layername = AddHotkeyName( layername, m_hotkeys, layerhk[layerid], false );
+-
+- Append( layername, layerbmp, (void*) layerid );
+- }
+-}
+-
+-void WinEDALayerChoiceBox::ResyncBitmapOnly()
+-{
+- WinEDA_BasePcbFrame* pcbFrame = (WinEDA_BasePcbFrame*) GetParent()->GetParent();
+- BOARD* board = pcbFrame->GetBoard();
+-
+- int elements = GetCount();
+- for( int i = 0; i < elements; i++ )
+- {
+- wxBitmap layerbmp( 14, 14 );
+- wxMemoryDC bmpDC;
+- wxBrush brush;
+- wxString layername;
+- int layerid = i;
+-
+- // Prepare Bitmap
+- bmpDC.SelectObject( layerbmp );
+- brush.SetColour( MakeColour( board->GetLayerColor( layerid ) ) );
+- brush.SetStyle( wxSOLID );
+-
+- bmpDC.SetBrush( brush );
+- bmpDC.DrawRectangle( 0, 0, layerbmp.GetWidth(), layerbmp.GetHeight() );
+- bmpDC.SetBrush( *wxTRANSPARENT_BRUSH );
+- bmpDC.SetPen( *wxBLACK_PEN );
+- bmpDC.DrawRectangle( 0, 0, layerbmp.GetWidth(), layerbmp.GetHeight() );
+-
+- SetItemBitmap(i, layerbmp);
+- }
+-}
+diff -d -urpN kicad-2011.01.28/common/CMakeLists.txt kicad-origin/common/CMakeLists.txt
+--- kicad-2011.01.28/common/CMakeLists.txt 2011-03-01 20:24:28.000000000 +0100
++++ kicad-origin/common/CMakeLists.txt 2011-03-21 23:58:27.691625676 +0100
+@@ -28,7 +28,6 @@ set(COMMON_SRCS
+ block_commande.cpp
+ build_version.cpp
+ class_colors_design_settings.cpp
+- class_layerchoicebox.cpp
+ class_marker_base.cpp
+ class_plotter.cpp
+ class_undoredo_container.cpp
+@@ -101,6 +100,7 @@ set(PCB_COMMON_SRCS
+ ../pcbnew/classpcb.cpp
+ ../pcbnew/collectors.cpp
+ ../pcbnew/sel_layer.cpp
++ ../pcbnew/class_layerchoicebox.cpp
+ )
+
+ add_library(pcbcommon ${PCB_COMMON_SRCS})
+diff -d -urpN kicad-2011.01.28/pcbnew/class_layerchoicebox.cpp kicad-origin/pcbnew/class_layerchoicebox.cpp
+--- kicad-2011.01.28/pcbnew/class_layerchoicebox.cpp 1970-01-01 01:00:00.000000000 +0100
++++ kicad-origin/pcbnew/class_layerchoicebox.cpp 2011-03-01 20:24:28.000000000 +0100
+@@ -0,0 +1,180 @@
++#include "common.h"
++#include "pcbnew.h"
++#include "wxPcbStruct.h"
++#include "class_board_design_settings.h"
++#include "colors_selection.h"
++
++#include "bitmaps.h"
++
++#include "hotkeys.h"
++#include "help_common_strings.h"
++
++#include <wx/ownerdrw.h>
++#include <wx/menuitem.h>
++#include <wx/bmpcbox.h>
++#include <wx/wx.h>
++
++#include "class_layerchoicebox.h"
++
++/* class to display a layer list.
++ *
++ */
++
++WinEDALayerChoiceBox::WinEDALayerChoiceBox( WinEDA_Toolbar* parent, wxWindowID id,
++ const wxPoint& pos, const wxSize& size,
++ int n, const wxString choices[] ) :
++ wxBitmapComboBox( parent, id, wxEmptyString, pos, size,
++ n, choices, wxCB_READONLY )
++{
++ m_layerorder = true;
++ m_layerhotkeys = true;
++ m_hotkeys = NULL;
++
++ if( choices != NULL )
++ ResyncBitmapOnly();
++}
++
++
++WinEDALayerChoiceBox::WinEDALayerChoiceBox( WinEDA_Toolbar* parent, wxWindowID id,
++ const wxPoint& pos, const wxSize& size,
++ const wxArrayString& choices ) :
++ wxBitmapComboBox( parent, id, wxEmptyString, pos, size,
++ choices, wxCB_READONLY )
++{
++ m_layerorder = true;
++ m_layerhotkeys = true;
++ m_hotkeys = NULL;
++
++ if( !choices.IsEmpty() )
++ ResyncBitmapOnly();
++}
++
++
++bool WinEDALayerChoiceBox::SetLayersOrdered( bool value )
++{
++ m_layerorder = value;
++ return m_layerorder;
++}
++
++
++bool WinEDALayerChoiceBox::SetLayersHotkeys( bool value )
++{
++ m_layerhotkeys = value;
++ return m_layerhotkeys;
++}
++
++
++// Get Current Item #
++int WinEDALayerChoiceBox::GetChoice()
++{
++ return GetSelection();
++}
++
++
++// Get Current Layer
++int WinEDALayerChoiceBox::GetLayerSelection()
++{
++ return (long) GetClientData( GetSelection() );
++}
++
++
++// Set Layer #
++int WinEDALayerChoiceBox::SetLayerSelection( int layer )
++{
++ int elements = GetCount();
++
++ for( int i = 0; i < elements; i++ )
++ {
++ if( GetClientData( i ) == (void*) layer )
++ {
++ if( GetSelection() != i ) // Element (i) is not selected
++ {
++ SetSelection( i );
++ return i;
++ }
++ else
++ return i; //If element already selected; do nothing
++ }
++ }
++
++ // Not Found
++ SetSelection( -1 );
++ return -1;
++}
++
++
++// Reload the Layers
++void WinEDALayerChoiceBox::Resync()
++{
++ WinEDA_BasePcbFrame* pcbFrame = (WinEDA_BasePcbFrame*) GetParent()->GetParent();
++ BOARD* board = pcbFrame->GetBoard();
++
++ wxASSERT( board != NULL );
++
++ Clear();
++
++ static DECLARE_LAYERS_ORDER_LIST( layertranscode );
++ static DECLARE_LAYERS_HOTKEY( layerhk );
++
++ for( int i = 0; i < LAYER_COUNT; i++ )
++ {
++ wxBitmap layerbmp( 14, 14 );
++ wxMemoryDC bmpDC;
++ wxBrush brush;
++ wxString layername;
++ int layerid = i;
++
++ if( m_layerorder )
++ layerid = layertranscode[i];
++
++ if( !board->IsLayerEnabled( layerid ) )
++ continue;
++
++ // Prepare Bitmap
++ bmpDC.SelectObject( layerbmp );
++ brush.SetColour( MakeColour( board->GetLayerColor( layerid ) ) );
++ brush.SetStyle( wxSOLID );
++
++ bmpDC.SetBrush( brush );
++ bmpDC.DrawRectangle( 0, 0, layerbmp.GetWidth(), layerbmp.GetHeight() );
++ bmpDC.SetBrush( *wxTRANSPARENT_BRUSH );
++ bmpDC.SetPen( *wxBLACK_PEN );
++ bmpDC.DrawRectangle( 0, 0, layerbmp.GetWidth(), layerbmp.GetHeight() );
++
++ layername = board->GetLayerName( layerid );
++
++ if( m_layerhotkeys && m_hotkeys != NULL )
++ layername = AddHotkeyName( layername, m_hotkeys, layerhk[layerid], false );
++
++ Append( layername, layerbmp, (void*) layerid );
++ }
++}
++
++void WinEDALayerChoiceBox::ResyncBitmapOnly()
++{
++ WinEDA_BasePcbFrame* pcbFrame = (WinEDA_BasePcbFrame*) GetParent()->GetParent();
++ BOARD* board = pcbFrame->GetBoard();
++
++ int elements = GetCount();
++ for( int i = 0; i < elements; i++ )
++ {
++ wxBitmap layerbmp( 14, 14 );
++ wxMemoryDC bmpDC;
++ wxBrush brush;
++ wxString layername;
++ int layerid = i;
++
++ // Prepare Bitmap
++ bmpDC.SelectObject( layerbmp );
++ brush.SetColour( MakeColour( board->GetLayerColor( layerid ) ) );
++ brush.SetStyle( wxSOLID );
++
++ bmpDC.SetBrush( brush );
++ bmpDC.DrawRectangle( 0, 0, layerbmp.GetWidth(), layerbmp.GetHeight() );
++ bmpDC.SetBrush( *wxTRANSPARENT_BRUSH );
++ bmpDC.SetPen( *wxBLACK_PEN );
++ bmpDC.DrawRectangle( 0, 0, layerbmp.GetWidth(), layerbmp.GetHeight() );
++
++ SetItemBitmap(i, layerbmp);
++ }
++}
diff --git a/kicad.spec b/kicad.spec
index b6ed897..6c603f0 100644
--- a/kicad.spec
+++ b/kicad.spec
@@ -1,6 +1,6 @@
Name: kicad
-Version: 2010.05.27
-Release: 8.rev2363%{?dist}
+Version: 2011.01.28
+Release: 1.rev2765%{?dist}
Summary: Electronic schematic diagrams and printed circuit board artwork
Summary(fr): Saisie de schéma électronique et routage de circuit imprimé
@@ -9,9 +9,9 @@ License: GPLv2+
URL: https://launchpad.net/kicad
# Source files created from upstream's bazaar repository
-# bzr export -r 2363 kicad-2010.05.27
-# bzr export -r 76 kicad-libraries-2010.05.27
-# bzr export -r 110 kicad-doc-2010.05.27
+# bzr export -r 2765 kicad-2011.01.28
+# bzr export -r 109 kicad-libraries-2011.01.28
+# bzr export -r 163 kicad-doc-2011.01.28
Source: %{name}-%{version}.tar.bz2
Source1: %{name}-doc-%{version}.tar.bz2
@@ -21,16 +21,8 @@ Source4: %{name}-2010.05.09.x-kicad-pcbnew.desktop
Source5: pcbnew.desktop
Source6: %{name}-icons.tar.bz2
-Patch10: %{name}-%{version}.real-version.patch
-Patch11: %{name}-%{version}.display-footprint-value.patch
-Patch12: %{name}-%{version}.set-extension-if-missing.patch
-Patch13: %{name}-%{version}.undo-redo-issue.patch
-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
-Patch18: %{name}-%{version}.module-edition-issues.patch
-Patch19: %{name}-%{version}.3DViewer-crash.patch
+Patch10: %{name}-%{version}-real-version.patch
+Patch11: %{name}-%{version}-fix-build.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -184,22 +176,14 @@ Documentation and tutorials for Kicad in Chinese
%setup -q -a 1 -a 2 -a 6
%patch10 -p0 -b .real-version
-%patch11 -p0 -b .display-footprint-value
-%patch12 -p0 -b .set-extension-if-missing
-%patch13 -p0 -b .undo-redo-issue
-%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
-%patch18 -p1 -b .module-edition-issues
-%patch19 -p1 -b .3DViewer-crash
+%patch11 -p1 -b .fix-build
#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
#multilibs
-%ifarch x86_64 sparc64 ppc64 amd64
+%ifarch x86_64 sparc64 ppc64 amd64 s390x
%{__sed} -i "s|KICAD_PLUGINS lib/kicad/plugins|KICAD_PLUGINS lib64/kicad/plugins|" CMakeLists.txt
%{__sed} -i "s|/usr/lib/kicad|/usr/lib64/kicad|" %{SOURCE3}
%endif
@@ -413,7 +397,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
-* Sat Jan 29 2011 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 2010.05.27-8
+* Tue Mar 22 2011 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 2011.01.28-1.rev2765
+- New upstream version
+- Update versioning patch, all others patches no more needed
+- Patch to fix a link time error (with help from Kevin Kofler and Nikola Pajkovsky)
+
+* Sun Jan 30 2011 Dan Horák <dan at danny.cz> - 2010.05.27-9.rev2363
+- Add s390x as 64-bit arch
+
+* Sat Jan 29 2011 Alain Portal <alain.portal[AT]univ-montp2[DOT]fr> 2010.05.27-8.rev2363
- Fix 3D view crash with some graphics cards (BZ #664143).
* Wed Jul 14 2010 Dan Horák <dan at danny.cz> - 2010.05.27-7.rev2363
diff --git a/sources b/sources
index f4c9136..e5200ef 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-c4171a6c61e07b21eb7cb36d0f40a830 kicad-2010.05.27.tar.bz2
-f5fd4dc0c7610254e37d1c2c8dc9ba7d kicad-doc-2010.05.27.tar.bz2
-6ee04b0086ae1c907059bf785e05a1fd kicad-libraries-2010.05.27.tar.bz2
+7b8eee890ae6505f6e3fd647885921f4 kicad-2011.01.28.tar.bz2
+68edb60747234183dfdb0d89fea7d908 kicad-doc-2011.01.28.tar.bz2
+6d1821eaf22301dc1f21123415bd3d4d kicad-libraries-2011.01.28.tar.bz2
More information about the scm-commits
mailing list