aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--development/kicad/kicad.SlackBuild21
-rw-r--r--development/kicad/kicad.info8
-rw-r--r--development/kicad/kicad_boost_hdr.patch14
3 files changed, 35 insertions, 8 deletions
diff --git a/development/kicad/kicad.SlackBuild b/development/kicad/kicad.SlackBuild
index 32489410a826b..2f44fce534a4c 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-2013 Fernando Lopez Jr. <fernando.lopezjr@gmail.com>
+# Copyright 2019 Fernando Lopez Jr. <fernando.lopezjr@gmail.com>
# 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: 2017/Nov/12
+# Revision date: 2019/Jun/02
PRGNAM=kicad
-VERSION=${VERSION:-4.0.7}
+VERSION=${VERSION:-5.1.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -75,7 +75,17 @@ find -L . \
# KiCad 4.0.5 cannot be compiled with boost 1.61 and higher since the latter requires C++11.
# If you insist to use boost 1.61 and higher, you can apply this patch manually and compile
# with a C++11 capable compiler and its appropriate compiler switches.
-patch -p1 --verbose < $CWD/boost-1.61.patch
+#patch -p1 --verbose < $CWD/boost-1.61.patch
+
+# KiCad 5.1.2 patch:
+patch -p1 --verbose < $CWD/kicad_boost_hdr.patch
+
+# Additional notes:
+#
+# - wxWidgets and wxPython use different toolkits (gtk2 vs (gtk2-unicode)). It
+# will result in a broken build. Please either install wxPython built using
+# gtk2 or add '-DKICAD_SCRIPTING_WXPYTHON=OFF' to cmake parameters to disable
+# wxPython support.
mkdir -p build
cd build
@@ -90,6 +100,9 @@ cd build
-DKICAD_SCRIPTING=ON \
-DKICAD_SCRIPTING_MODULES=ON \
-DKICAD_SCRIPTING_WXPYTHON=ON \
+ -DKICAD_USE_SPICE=ON \
+ -DKICAD_USE_OCC=ON \
+ -DKICAD_USE_OCE=OFF \
-DCMAKE_BUILD_TYPE=Release ..
make VERBOSE=1
make install DESTDIR=$PKG
diff --git a/development/kicad/kicad.info b/development/kicad/kicad.info
index c29d6186e54c1..6421302929f0a 100644
--- a/development/kicad/kicad.info
+++ b/development/kicad/kicad.info
@@ -1,10 +1,10 @@
PRGNAM="kicad"
-VERSION="4.0.7"
+VERSION="5.1.2"
HOMEPAGE="http://kicad-pcb.org"
-DOWNLOAD="https://launchpad.net/kicad/4.0/4.0.7/+download/kicad-4.0.7.tar.xz"
-MD5SUM="af3ee2e40c25f1c01b92cd27c1a1b180"
+DOWNLOAD="https://launchpad.net/kicad/5.0/5.1.2/+download/kicad-5.1.2.tar.xz"
+MD5SUM="d3aa58ebcb1113ffbe49ec7643a0f09a"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="wxPython3"
+REQUIRES="wxPython3 ngspice OpenCASCADE glm"
MAINTAINER="Fernando Lopez Jr."
EMAIL="fernando.lopezjr@gmail.com"
diff --git a/development/kicad/kicad_boost_hdr.patch b/development/kicad/kicad_boost_hdr.patch
new file mode 100644
index 0000000000000..10469b2210966
--- /dev/null
+++ b/development/kicad/kicad_boost_hdr.patch
@@ -0,0 +1,14 @@
+Add missing "boost/version.hpp" before version checking macro
+<https://github.com/Kawashima-Azumi/kicad-source-mirror/commit/0921e66957971796285c5a47f64678a78c84dcec>
+diff --git a/qa/unit_test_utils/include/unit_test_utils/unit_test_utils.h b/qa/unit_test_utils/include/unit_test_utils/unit_test_utils.h
+index 08ae0b949..72314d56a 100644
+--- a/qa/unit_test_utils/include/unit_test_utils/unit_test_utils.h
++++ b/qa/unit_test_utils/include/unit_test_utils/unit_test_utils.h
+@@ -24,6 +24,7 @@
+ #ifndef UNIT_TEST_UTILS__H
+ #define UNIT_TEST_UTILS__H
+
++#include <boost/version.hpp>
+ #include <boost/test/test_case_template.hpp>
+ #include <boost/test/unit_test.hpp>
+