From 03d9c0104bdb364d3eeee88055c3b750857b8b3b Mon Sep 17 00:00:00 2001
From: Niels Horn
Date: Wed, 24 Apr 2013 07:14:13 -0400
Subject: development/kicad: Updated for version bzr_20130325.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
---
 development/kicad/README            |  2 ++
 development/kicad/kicad.SlackBuild  | 10 +++-------
 development/kicad/kicad.info        |  8 ++++----
 development/kicad/kicad_gcc47.patch | 10 ----------
 development/kicad/slack-desc        | 10 +++++-----
 5 files changed, 14 insertions(+), 26 deletions(-)
 delete mode 100644 development/kicad/kicad_gcc47.patch

diff --git a/development/kicad/README b/development/kicad/README
index f7cf5723c5..a27f6fe862 100644
--- a/development/kicad/README
+++ b/development/kicad/README
@@ -5,3 +5,5 @@ netlist converter, pcb designer and a gerber viewer.
 
 There are separate SlackBuilds for the libraries and additional
 documentation, kicad-library and kicad-doc.
+
+KiCad requires wxPython built with the GNOMEPRINT=YES option.
diff --git a/development/kicad/kicad.SlackBuild b/development/kicad/kicad.SlackBuild
index 48242e9262..b79e9a3016 100644
--- a/development/kicad/kicad.SlackBuild
+++ b/development/kicad/kicad.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for kicad
 # Open-Source EDA Suite
 
-# Copyright 2010-2012  Niels Horn, Rio de Janeiro, RJ, Brazil
+# Copyright 2010-2013  Niels Horn, Rio de Janeiro, RJ, Brazil
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -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/09/14
+# Revision date: 2013/03/29
 
 PRGNAM=kicad
-VERSION=${VERSION:-bzr_20120521}
+VERSION=${VERSION:-bzr_20130325}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -77,10 +77,6 @@ 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 2501977015..b83c5b1b7c 100644
--- a/development/kicad/kicad.info
+++ b/development/kicad/kicad.info
@@ -1,10 +1,10 @@
 PRGNAM="kicad"
-VERSION="bzr_20120521"
+VERSION="bzr_20130325"
 HOMEPAGE="http://kicad.sourceforge.net/wiki"
-DOWNLOAD="http://www.nielshorn.net/_download/slackware/source/kicad-bzr_20120521.tar.bz2"
-MD5SUM="c301471534a781dc6506032a8003ccc7"
+DOWNLOAD="http://www.nielshorn.net/_download/slackware/source/kicad-bzr_20130325.tar.bz2"
+MD5SUM="d4828b22bc530ac63a112c060264b77c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="wxPython"
+REQUIRES="libgnomeprintui wxPython"
 MAINTAINER="Niels Horn"
 EMAIL="niels.horn@gmail.com"
diff --git a/development/kicad/kicad_gcc47.patch b/development/kicad/kicad_gcc47.patch
deleted file mode 100644
index 9fbbdd117d..0000000000
--- a/development/kicad/kicad_gcc47.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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"
diff --git a/development/kicad/slack-desc b/development/kicad/slack-desc
index cc6f5cc020..54137623e7 100644
--- a/development/kicad/slack-desc
+++ b/development/kicad/slack-desc
@@ -1,9 +1,9 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
 
      |-----handy-ruler------------------------------------------------------|
 kicad: kicad (Open Source EDA Suite)
-- 
cgit v1.2.3