rpm/kicad
SHA256
1
0
Fork 0
forked from pool/kicad
Code Pull Requests Activity

Accepting request 186329 from science

Browse Source 
- 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

- Update to version 20130707
  * no changelog available
  * removed obsolete kicad-2012.01.19-gcc-4.7.patch

OBS-URL: https://build.opensuse.org/request/show/186329
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kicad?expand=0&rev=2
This commit is contained in:
Tomáš Chvátal 2013-08-16 10:42:26 +00:00 committed by Git OBS Bridge
parent 8cac49aae9
commit 1c1dacf030
9 changed files with 65 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
kicad-2012.01.19-build-with-old-wxwidgets.patch
View File

@ -1,79 +0,0 @@
diff -urN kicad-2012.01.19-orig/common/wineda_toolbar.cpp kicad-2012.01.19/common/wineda_toolbar.cpp
--- kicad-2012.01.19-orig/common/wineda_toolbar.cpp 2011-11-27 13:43:14.000000000 +0100
+++ kicad-2012.01.19/common/wineda_toolbar.cpp 2012-08-28 19:31:04.726787095 +0200
@@ -11,10 +11,8 @@
EDA_TOOLBAR::EDA_TOOLBAR( id_toolbar type, wxWindow * parent, wxWindowID id, bool horizontal ):
- wxAuiToolBar( parent, id, wxDefaultPosition, wxDefaultSize,
- wxAUI_TB_DEFAULT_STYLE | ( ( horizontal ) ?
- wxAUI_TB_HORZ_LAYOUT :
- wxAUI_TB_VERTICAL ) )
+ wxToolBar( parent, id, wxDefaultPosition, wxDefaultSize,
+ horizontal ? wxTB_HORIZONTAL : wxTB_VERTICAL )
{
m_Parent = parent;
m_Ident = type;
diff -urN kicad-2012.01.19-orig/eeschema/tool_sch.cpp kicad-2012.01.19/eeschema/tool_sch.cpp
--- kicad-2012.01.19-orig/eeschema/tool_sch.cpp 2011-11-27 13:43:14.000000000 +0100
+++ kicad-2012.01.19/eeschema/tool_sch.cpp 2012-08-28 19:58:10.582729686 +0200
@@ -140,7 +140,7 @@
_( "Back annotate component foot prints" ) );
// set icon paddings
- m_HToolBar->SetToolBorderPadding(3); // padding
+ //m_HToolBar->SetToolBorderPadding(3); // padding
m_HToolBar->SetToolSeparation(0);
//m_HToolBar->SetMargins(0,1); // margins width and height
@@ -225,7 +225,7 @@
HELP_DELETE_ITEMS, wxITEM_CHECK );
// set icon paddings
- m_VToolBar->SetToolBorderPadding(2); // padding
+ //m_VToolBar->SetToolBorderPadding(2); // padding
m_VToolBar->SetToolSeparation(0);
//m_VToolBar->SetMargins(1,0); // margins width and height
@@ -269,7 +269,7 @@
_( "HV orientation for wires and bus" ),
wxITEM_CHECK );
// set icon paddings
- m_OptionsToolBar->SetToolBorderPadding(2); // padding
+ //m_OptionsToolBar->SetToolBorderPadding(2); // padding
m_OptionsToolBar->SetToolSeparation(0);
//m_OptionsToolBar->SetMargins(4,0); // margins width and height
diff -urN kicad-2012.01.19-orig/include/wxstruct.h kicad-2012.01.19/include/wxstruct.h
--- kicad-2012.01.19-orig/include/wxstruct.h 2011-11-27 13:43:14.000000000 +0100
+++ kicad-2012.01.19/include/wxstruct.h 2012-08-28 19:41:20.270765363 +0200
@@ -900,7 +900,7 @@
* Class EDA_TOOLBAR
* is the base class for deriving KiCad tool bars.
*/
-class EDA_TOOLBAR : public wxAuiToolBar
+class EDA_TOOLBAR : public wxToolBar
{
public:
wxWindow* m_Parent;
@@ -910,7 +910,7 @@
public:
EDA_TOOLBAR( id_toolbar type, wxWindow* parent, wxWindowID id, bool horizontal );
- bool GetToolState( int toolId ) { return GetToolToggled(toolId); };
+// bool GetToolState( int toolId ) { return GetToolToggled(toolId); };
void AddRadioTool( int toolid,
const wxString& label,
diff -urN kicad-2012.01.19-orig/pcbnew/tool_pcb.cpp kicad-2012.01.19/pcbnew/tool_pcb.cpp
--- kicad-2012.01.19-orig/pcbnew/tool_pcb.cpp 2011-11-27 13:43:14.000000000 +0100
+++ kicad-2012.01.19/pcbnew/tool_pcb.cpp 2012-08-28 20:10:37.318703318 +0200
@@ -168,7 +168,7 @@
if( m_HToolBar && ! first_call )
{
- m_HToolBar->SetToolBitmap( ID_AUX_TOOLBAR_PCB_SELECT_LAYER_PAIR, *LayerPairBitmap );
+ //m_HToolBar->SetToolBitmap( ID_AUX_TOOLBAR_PCB_SELECT_LAYER_PAIR, *LayerPairBitmap );
m_HToolBar->Refresh();
}
}

11
kicad-2012.01.19-gcc-4.7.patch
View File

@ -1,11 +0,0 @@
diff -urN kicad-2012.01.19-orig/include/boost/polygon/polygon_90_set_data.hpp kicad-2012.01.19/include/boost/polygon/polygon_90_set_data.hpp
--- kicad-2012.01.19-orig/include/boost/polygon/polygon_90_set_data.hpp 2011-11-27 13:43:14.000000000 +0100
+++ kicad-2012.01.19/include/boost/polygon/polygon_90_set_data.hpp 2012-06-27 23:10:04.117079501 +0200
@@ -16,6 +16,7 @@
#include "detail/iterator_points_to_compact.hpp"
#include "detail/iterator_compact_to_points.hpp"
#include "polygon_traits.hpp"
+#include "detail/polygon_sort_adaptor.hpp"
//manhattan boolean algorithms
#include "detail/boolean_op.hpp"

3
kicad-20130331.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ffae85a1016739548ef0556118e2cabdaa9e219d69091d7fc98c89abeb33c851
size 12101252

3
kicad-20130707.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2a646a2ed6b1f7c7f1dc9041aafc02d762a7e1a1cfa206ea19e9513a9020eec7
size 11662571

14
kicad-gost.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
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

16
kicad-gost.spec
View File

@ -26,7 +26,7 @@ Name: kicad-gost
%else
Name: kicad
%endif
Version: 20130331
Version: 20130707
Release: 0
License: GPL-2.0+
%if 0%{?with_gost}
@ -37,15 +37,14 @@ Summary: EDA software suite for the creation of schematics and PCB
Group: Productivity/Scientific/Electronics
Url: http://kicad-pcb.org
# bzr branch lp:kicad/stable stable
# bzr export -r 3261 --root=kicad-[version] kicad-[version].tar.bz
# bzr export -r 4022 --root=kicad-[version] kicad-[version].tar.bz
Source: kicad-%{version}.tar.bz2
Patch0: kicad-2012.01.19-gcc-4.7.patch
Patch1: kicad-2012.01.19-build-with-old-wxwidgets.patch
Patch1: kikad-no-templates-install.patch
BuildRequires: boost-devel
BuildRequires: cmake >= 2.4.6
BuildRequires: doxygen
BuildRequires: fdupes
BuildRequires: freeglut-devel
BuildRequires: gcc-c++
BuildRequires: update-desktop-files
@ -78,12 +77,7 @@ Kicad is a set of four softwares and a project manager:
%prep
%setup -q -n kicad-%{version}
%if 0%{?suse_version} > 1210
%patch0 -p1
%endif
%if 0%{?suse_version} <= 1110
%patch1 -p1
%endif
# fix plugin directory
sed -i 's|KICAD_PLUGINS lib/kicad/plugins|KICAD_PLUGINS %{_lib}/kicad/plugins|' CMakeLists.txt
@ -108,6 +102,8 @@ 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

14
kicad.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
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

16
kicad.spec
View File

@ -26,7 +26,7 @@ Name: kicad-gost
%else
Name: kicad
%endif
Version: 20130331
Version: 20130707
Release: 0
License: GPL-2.0+
%if 0%{?with_gost}
@ -37,15 +37,14 @@ Summary: EDA software suite for the creation of schematics and PCB
Group: Productivity/Scientific/Electronics
Url: http://kicad-pcb.org
# bzr branch lp:kicad/stable stable
# bzr export -r 3261 --root=kicad-[version] kicad-[version].tar.bz
# bzr export -r 4022 --root=kicad-[version] kicad-[version].tar.bz
Source: kicad-%{version}.tar.bz2
Patch0: kicad-2012.01.19-gcc-4.7.patch
Patch1: kicad-2012.01.19-build-with-old-wxwidgets.patch
Patch1: kikad-no-templates-install.patch
BuildRequires: boost-devel
BuildRequires: cmake >= 2.4.6
BuildRequires: doxygen
BuildRequires: fdupes
BuildRequires: freeglut-devel
BuildRequires: gcc-c++
BuildRequires: update-desktop-files
@ -78,12 +77,7 @@ Kicad is a set of four softwares and a project manager:
%prep
%setup -q -n kicad-%{version}
%if 0%{?suse_version} > 1210
%patch0 -p1
%endif
%if 0%{?suse_version} <= 1110
%patch1 -p1
%endif
# fix plugin directory
sed -i 's|KICAD_PLUGINS lib/kicad/plugins|KICAD_PLUGINS %{_lib}/kicad/plugins|' CMakeLists.txt
@ -108,6 +102,8 @@ 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

22
kikad-no-templates-install.patch Normal file
View File

@ -0,0 +1,22 @@
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()