summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Marvin Schmidt <marv@exherbo.org> 2016-03-18 10:39:31 +0100
committerAvatar Marvin Schmidt <marv@exherbo.org> 2016-04-25 10:48:34 +0200
commit05417e8adc839defcb979fabaebe4d3f5418cb2c (patch)
tree7feae1e84b19c825bad7c2951ac713bd1f18a596
parent3a3057558d6fc5dd52901ddba85e5c1a40ac5c12 (diff)
downloadscientific-05417e8adc839defcb979fabaebe4d3f5418cb2c.tar.gz
scientific-05417e8adc839defcb979fabaebe4d3f5418cb2c.tar.xz
kicad-scm: Adjust to upstream changes
- The github plugin now uses curl instead of avhttp - KICAD_SKIP_BOOST option is gone and system boost is always used - System GLM is now used instead of a bundled version Change-Id: I042b522f7c43df0714212246635691e29b61f7e5 Reviewed-on: https://galileo.mailstation.de/gerrit/5891 Reviewed-by: Jenkins <wk@mailstation.de> Reviewed-by: Marvin Schmidt <marv@exherbo.org>
-rw-r--r--packages/sci-electronics/kicad/kicad-4.0.1-r1.exheres-015
-rw-r--r--packages/sci-electronics/kicad/kicad-scm.exheres-09
-rw-r--r--packages/sci-electronics/kicad/kicad.exlib8
3 files changed, 23 insertions, 9 deletions
diff --git a/packages/sci-electronics/kicad/kicad-4.0.1-r1.exheres-0 b/packages/sci-electronics/kicad/kicad-4.0.1-r1.exheres-0
index b78ff46..b34bfdc 100644
--- a/packages/sci-electronics/kicad/kicad-4.0.1-r1.exheres-0
+++ b/packages/sci-electronics/kicad/kicad-4.0.1-r1.exheres-0
@@ -1,10 +1,23 @@
-# Copyright 2015 Marvin Schmidt <marv@exherbo.org>
+# Copyright 2015-2016 Marvin Schmidt <marv@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
require kicad
PLATFORMS="~amd64"
+DEPENDENCIES+="
+ build:
+ net-libs/avhttp[>=2.9.9_p20150907] [[ note = [ The 2.9.9 release causes crashes ] ]]
+"
+
+DEFAULT_SRC_PREPARE_PATCHES+=(
+ "${FILES}"/0001-Use-system-avhttp.patch
+)
+
+CMAKE_SRC_CONFIGURE_PARAMS+=(
+ '-DKICAD_SKIP_BOOST:BOOL=TRUE'
+)
+
src_prepare() {
edo cd "${CMAKE_SOURCE}"
# For some reason the file has dos newlines in the release tarball,
diff --git a/packages/sci-electronics/kicad/kicad-scm.exheres-0 b/packages/sci-electronics/kicad/kicad-scm.exheres-0
index 27e4772..1806e48 100644
--- a/packages/sci-electronics/kicad/kicad-scm.exheres-0
+++ b/packages/sci-electronics/kicad/kicad-scm.exheres-0
@@ -1,5 +1,5 @@
# Copyright 2010-2011 Denis Dupeyron <calchan@gentoo.org>
-# Copyright 2013, 2014 Marvin Schmidt <marv@exherbo.org>
+# Copyright 2013-2016 Marvin Schmidt <marv@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
SCM_REPOSITORY="https://github.com/KiCad/kicad-source-mirror.git"
@@ -10,6 +10,13 @@ DOWNLOADS=""
PLATFORMS="~amd64"
+DEPENDENCIES+="
+ build+run:
+ dev-libs/glm[>=0.9.5.1]
+ net-misc/curl
+ x11-libs/cairo[>=1.8.8]
+"
+
src_prepare() {
edo cd "${CMAKE_SOURCE}"
kicad_src_prepare
diff --git a/packages/sci-electronics/kicad/kicad.exlib b/packages/sci-electronics/kicad/kicad.exlib
index f6b0bf9..acad9d1 100644
--- a/packages/sci-electronics/kicad/kicad.exlib
+++ b/packages/sci-electronics/kicad/kicad.exlib
@@ -1,5 +1,5 @@
# Copyright 2010-2011 Denis Dupeyron <calchan@gentoo.org>
-# Copyright 2013-2015 Marvin Schmidt <marv@exherbo.org>
+# Copyright 2013-2016 Marvin Schmidt <marv@exherbo.org>
# Copyright 2015 Jakub KopaƄski <jkopanski@quivade.com>
# Distributed under the terms of the GNU General Public License v2
# Based in part upon 'kicad-99999999' from Gentoo (same author), which is:
@@ -29,7 +29,6 @@ MYOPTIONS="
DEPENDENCIES="
build:
dev-libs/boost[>=1.54.0]
- net-libs/avhttp[>=2.9.9_p20150907] [[ note = [ The 2.9.9 release causes crashes ] ]]
virtual/pkg-config
doc? ( app-doc/doxygen )
build+run:
@@ -64,10 +63,6 @@ DEPENDENCIES="
BUGS_TO="<calchan@gentoo.org>"
-DEFAULT_SRC_PREPARE_PATCHES+=(
- "${FILES}"/0001-Use-system-avhttp.patch
-)
-
CMAKE_SRC_CONFIGURE_PARAMS=(
"-DwxWidgets_CONFIG_EXECUTABLE=/usr/$(exhost --target)/lib/wx/config/gtk2-unicode-3.0"
@@ -85,7 +80,6 @@ CMAKE_SRC_CONFIGURE_PARAMS=(
'-DBUILD_GITHUB_PLUGIN:BOOL=TRUE'
'-DKICAD_KEEPCASE:BOOL=TRUE'
- '-DKICAD_SKIP_BOOST:BOOL=TRUE'
'-DUSE_WX_GRAPHICS_CONTEXT:BOOL=FALSE'
'-DUSE_WX_OVERLAY:BOOL=FALSE'