aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiels Horn <niels.horn@gmail.com>2012-09-14 13:32:12 -0300
committerRobby Workman <rworkman@slackbuilds.org>2012-09-14 16:37:55 -0500
commitdac4e00614dd1e6972f699f1dc134149bb0b661c (patch)
treed628d23a65f3c00a951c33b9ad9d835e8bb397aa
parenteef727303c8e4a5eb00da759f45c5f0b8410c1b5 (diff)
development/kicad: Updated for version bzr_20120521 +fix for gcc4.7
Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
-rw-r--r--development/kicad/README3
-rw-r--r--development/kicad/kicad.SlackBuild8
-rw-r--r--development/kicad/kicad.info6
-rw-r--r--development/kicad/kicad_gcc47.patch10
4 files changed, 22 insertions, 5 deletions
diff --git a/development/kicad/README b/development/kicad/README
index 2d3da406c5c51..f7cf5723c5f74 100644
--- a/development/kicad/README
+++ b/development/kicad/README
@@ -2,3 +2,6 @@ The KiCad project aims at creating a portable, cross-platform, Free/Libre/
Open-Source EDA Suite, capable of schematic and printed circuit board
design. The suite consist of a project manager, schematic editor,
netlist converter, pcb designer and a gerber viewer.
+
+There are separate SlackBuilds for the libraries and additional
+documentation, kicad-library and kicad-doc.
diff --git a/development/kicad/kicad.SlackBuild b/development/kicad/kicad.SlackBuild
index 55122ae7f0053..48242e926207f 100644
--- a/development/kicad/kicad.SlackBuild
+++ b/development/kicad/kicad.SlackBuild
@@ -23,10 +23,10 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# Revision date: 2012/02/22
+# Revision date: 2012/09/14
PRGNAM=kicad
-VERSION=${VERSION:-bzr_20120205}
+VERSION=${VERSION:-bzr_20120521}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -77,6 +77,10 @@ find . \
# admits being "hacky"...
patch -p1 < $CWD/help_path.patch
+# Patch to build against gcc-4.7
+# Source: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672727
+patch -p1 < $CWD/kicad_gcc47.patch
+
mkdir -p build
cd build
cmake \
diff --git a/development/kicad/kicad.info b/development/kicad/kicad.info
index 7b7c7bb0426c5..25019770154dc 100644
--- a/development/kicad/kicad.info
+++ b/development/kicad/kicad.info
@@ -1,8 +1,8 @@
PRGNAM="kicad"
-VERSION="bzr_20120205"
+VERSION="bzr_20120521"
HOMEPAGE="http://kicad.sourceforge.net/wiki"
-DOWNLOAD="http://www.nielshorn.net/_download/slackware/source/kicad-bzr_20120205.tar.bz2"
-MD5SUM="870a0e86f460744a767945242b1e5f5f"
+DOWNLOAD="http://www.nielshorn.net/_download/slackware/source/kicad-bzr_20120521.tar.bz2"
+MD5SUM="c301471534a781dc6506032a8003ccc7"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="wxPython"
diff --git a/development/kicad/kicad_gcc47.patch b/development/kicad/kicad_gcc47.patch
new file mode 100644
index 0000000000000..9fbbdd117d9b8
--- /dev/null
+++ b/development/kicad/kicad_gcc47.patch
@@ -0,0 +1,10 @@
+--- kicad-bzr_20120521/include/boost/polygon/polygon_90_set_data.hpp 2012-09-14 12:19:08.000000000 -0300
++++ kicad-bzr_20120521_patched/include/boost/polygon/polygon_90_set_data.hpp 2012-09-14 12:55:52.000000000 -0300
+@@ -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"