Merge remote-tracking branch 'remotes/zpuskas/kicad-4.0.0-rc1'

Pull request: https://github.com/gentoo/gentoo/pull/313
This commit is contained in:
Ian Delaney
2015-11-01 12:15:48 +08:00
8 changed files with 196 additions and 244 deletions

View File

@@ -1,2 +1,3 @@
DIST kicad-2013-05-18-BZR4017-stable-UBUNTU_12.04_full_with_components_doc.tgz 280828915 SHA256 48c91acb9d4f45c7eebbcf4d602841896f11f22bb00721c62d351dd7241efd0b SHA512 8c4b81077c7e23bae6ad6a167fca7e34c006fc6a2a28457ddc276bef94ab43f6bf29f460a9ed5d9e564ef144a106ee82362b3cead3ca64b1361466d8d390619d WHIRLPOOL ed51fdc7ee287d65f4002250e79652d791d2aebe2fc872e1b853cfeccd287bf548346824ffc9afb599ff21721e972db7a5b3c134c662e883cd7d1e5c5b6c5abe
DIST kicad-sources-stable_2013-05-18_BZR4017.zip 15025159 SHA256 cb9ca0d19e5ea8ca45c731eeddbd8a242eb696e619ee98af91f2c7a0095b393d SHA512 747e4719a426646cf38b9951d28aea32085d672371426b44d9f9a575b55e051925ae3fd6c98aea6fa2c21c2c6a6a2f6cc2da461c882b854d033f5d1ce58384ba WHIRLPOOL 69dbeed6da6d1400207c048a49008d6b0876df184d64c520b82e7e82e3826a04ada5563551f1498244ee4d67ec7731f81285a604e671ee73f6518f211ecb8ef0
DIST kicad-4.0.0-rc1.tar.xz 10951000 SHA256 62c2e95a2d6b8a3cf30bb91146c3d2b1c0df0cbfc070b6e54bcfdf0da2df6973 SHA512 f158906b85e3c4032086c4a75563d47f75f183bc354e1f2fa55e157083005b51829c141e14171dea9092b9b24b6b5ff1c71e3ae485dd1d2d44fe7e63179c1ffa WHIRLPOOL 755fde28cf45196bb60ffb6af7bc0acb92148310ad74807ef71404c418557bc2c6243f41e9040c0217dc970061df09a4092e2a5e52e016888660e4998153c95a
DIST kicad-4.0.0_rc1-i18n.tar.gz 1959024 SHA256 5fbd037e4a76a83ed6be7554ab1add98f7d93dce0db5fea6a0bcd58ef61486bd SHA512 85c2db5d193cd4d1521eb9f454a13892680cb5340c3b86b264bceb36ce0c996f818b64c3edd9dae3ff51046c97ba33702649a1083a36f27a80d316f64465f630 WHIRLPOOL 8141fb59822fdda2bf46a9b8af7fe75d6557a1c3f384e5e2b03e58c5e4c9eca4f167a262f2ed9fd3479c64a8730ff1ba3f46f6cb72c680df9c6d6173ca611ada
DIST kicad-4.0.0_rc1-library.tar.gz 87967616 SHA256 09a9e184e19b6072efdc00fabb65e3c0d498858c17f5fa5ce8d255b21eab3db4 SHA512 f611015a8760d3c9cf26fd99a043d69fa75d398fb287af7e6fe7cfbd70d3ff1aa67abcedeffa00fef60434e3944ac6b59fa4ac9ea50097d910fbabcb6f288165 WHIRLPOOL 83585bbc772da122139dfa643c4045bfef207ea8dbc4a83a5458be6227ff976fe9c48cea2388f9ec0b20e7c697579701b75231b852161b33a9c51ddef480c6f4

View File

@@ -1,35 +0,0 @@
From cacd01f36db6277111a35fe60ad4762ee3b002e1 Mon Sep 17 00:00:00 2001
From: Denis Dupeyron <calchan@gentoo.org>
Date: Thu, 18 Apr 2013 15:17:36 -0600
Subject: [PATCH] Fix desktop category and semicolon
---
resources/linux/mime/applications/eeschema.desktop | 2 +-
resources/linux/mime/applications/kicad.desktop | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/resources/linux/mime/applications/eeschema.desktop b/resources/linux/mime/applications/eeschema.desktop
index 3042eae..0ed616c 100644
--- a/resources/linux/mime/applications/eeschema.desktop
+++ b/resources/linux/mime/applications/eeschema.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Categories=Development;Electronics
+Categories=Electronics;
Comment=Design an electronic schematic
Comment[fr]=Dessiner des schémas électroniques
Exec=eeschema
diff --git a/resources/linux/mime/applications/kicad.desktop b/resources/linux/mime/applications/kicad.desktop
index 1d7645b..3a23e34 100644
--- a/resources/linux/mime/applications/kicad.desktop
+++ b/resources/linux/mime/applications/kicad.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Categories=Development;Electronics
+Categories=Electronics;
Comment=Design a printed circuit board
Comment[fr]=Concevoir un circuit imprimé
Exec=kicad
--
1.8.2.1

View File

@@ -1,25 +0,0 @@
From 096b02e38c5e86902d5403fcb14313be8dd70fb3 Mon Sep 17 00:00:00 2001
From: Denis Dupeyron <calchan@gentoo.org>
Date: Thu, 18 Apr 2013 08:11:28 -0600
Subject: [PATCH] Add missing documentation
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e6e29a..1069a5f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -415,7 +415,7 @@ add_custom_target(uninstall
#================================================
# Installation parameters
#================================================
-install(FILES INSTALL.txt
+install(FILES AUTHORS.txt CHANGELOG.txt README.txt
DESTINATION ${KICAD_DOCS}
COMPONENT resources)
--
1.8.2.1

View File

@@ -1,27 +0,0 @@
From 50a62d296e803b75ae46c964173e8b2be0661618 Mon Sep 17 00:00:00 2001
From: Denis Dupeyron <calchan@gentoo.org>
Date: Thu, 18 Apr 2013 08:01:43 -0600
Subject: [PATCH] Use native Boost
---
CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e3c6ae2..9e6e29a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -260,8 +260,8 @@ check_find_package_result(OPENGL_FOUND "OpenGL")
# kicad now includes needed boost files.
# the two next lines can be uncommented to use the native boost lib.
# but this is not a good idea
-#find_package(Boost 1.36 QUIET)
-#check_find_package_result(Boost_FOUND "Boost")
+find_package(Boost 1.36 QUIET)
+check_find_package_result(Boost_FOUND "Boost")
##########################
# Find wxWidgets library #
--
1.8.2.1

View File

@@ -1,25 +0,0 @@
From 065491b83fb7f82606150aa89e70ac99738992e0 Mon Sep 17 00:00:00 2001
From: Denis Dupeyron <calchan@gentoo.org>
Date: Wed, 5 Jun 2013 14:03:07 -0600
Subject: [PATCH] Fix install location of scripts directory
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 59fe7c3..3f3bb14 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -428,7 +428,7 @@ install(FILES resources/freeroute.jnlp
###
if(UNIX)
install(DIRECTORY scripts
- DESTINATION ${KICAD_DOCS}
+ DESTINATION ${KICAD_DATA}
COMPONENT resources
PATTERN ".svn" EXCLUDE)
endif()
--
1.8.2.1

View File

@@ -1,129 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
#TODO:
# - python and wxpython scripting
EAPI="5"
WX_GTK_VER="2.8"
inherit eutils unpacker cmake-utils wxwidgets fdo-mime gnome2-utils
DESCRIPTION="Electronic Schematic and PCB design tools"
HOMEPAGE="http://www.kicad-pcb.org"
RELEASE_DATE="2013-05-18"
BZR_REV="4017"
UBUNTU_VER="12.04"
BASE_SRC_URI="http://iut-tice.ujf-grenoble.fr/cao"
SRC_URI="${BASE_SRC_URI}/${PN}-sources-stable_${RELEASE_DATE}_BZR${BZR_REV}.zip
${BASE_SRC_URI}/${PN}-${RELEASE_DATE}-BZR${BZR_REV}-stable-UBUNTU_${UBUNTU_VER}_full_with_components_doc.tgz"
LICENSE="GPL-2 kicad-doc"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="debug"
LANGS="de en es fr hu it ja pl pt ru zh_CN"
for lang in ${LANGS} ; do
IUSE="${IUSE} linguas_${lang}"
done
CDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[gnome,opengl,X]
dev-python/wxpython:${WX_GTK_VER}[opengl]"
DEPEND="${CDEPEND}
>=dev-util/cmake-2.6.4
>=dev-libs/boost-1.49[python]
app-doc/doxygen"
RDEPEND="${CDEPEND}
sys-libs/zlib
sci-electronics/electronics-menu"
S="${WORKDIR}/stable_${RELEASE_DATE}_BZR${BZR_REV}"
src_prepare() {
epatch "${FILESDIR}/${PN}-native-boost.patch"
epatch "${FILESDIR}/${PN}-desktop-file.patch"
epatch "${FILESDIR}/${PN}-scripts.patch"
epatch "${FILESDIR}/${PN}-missing-doc.patch"
rm -f resources/linux/mime/applications/eeschema.desktop
}
src_configure() {
need-wxwidgets unicode
mycmakeargs="${mycmakeargs}
-DKICAD_STABLE_VERSION=ON
-DKICAD_wxUSE_UNICODE=ON
-DKICAD_DOCS=/usr/share/doc/${PN}
-DKICAD_HELP=/usr/share/doc/${PN}"
# -DKICAD_SCRIPTING=ON
# -DKICAD_SCRIPTING_MODULES=ON
# -DKICAD_SCRIPTING_WXPYTHON=ON
cmake-utils_src_configure
}
src_compile() {
cmake-utils_src_compile all doxygen-docs
}
src_install() {
cmake-utils_src_install
insinto /usr/share/${PN}
doins -r "${WORKDIR}/${PN}/share/library"
doins -r "${WORKDIR}/${PN}/share/modules"
insinto /usr/share/doc/${PN}
doins -r "${WORKDIR}/${PN}/doc/contrib"
insinto /usr/share/doc/${PN}/help
for lang in $LANGS ; do
if [[ -d "${WORKDIR}/${PN}/doc/help/${lang}" ]] ; then
use linguas_$lang && doins -r "${WORKDIR}/${PN}/doc/help/${lang}"
fi
done
insinto /usr/share/doc/${PN}/tutorials
for lang in $LANGS ; do
if [[ -d "${WORKDIR}/${PN}/doc/tutorials/${lang}" ]] ; then
use linguas_$lang && doins -r "${WORKDIR}/${PN}/doc/tutorials/${lang}"
fi
done
local dev_doc="/usr/share/doc/${PN}/development"
insinto ${dev_doc}
doins HOW_TO_CONTRIBUTE.txt notes_about_pcbnew_new_file_format.odt TODO.txt uncrustify.cfg
doins "${WORKDIR}/${PN}/doc/help/file_formats/file_formats.pdf"
cd Documentation
doins -r *
docompress -x \
${dev_doc}/GUI_Translation_HOWTO.odt \
${dev_doc}/notes_about_pcbnew_new_file_format.odt \
${dev_doc}/uncrustify.cfg
${dev_doc}/file_formats.pdf
}
pkg_preinst() {
gnome2_icon_savelist
}
pkg_postinst() {
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
gnome2_icon_cache_update
elog "You may want to emerge media-gfx/wings if you want to create 3D models of components."
}
pkg_postrm() {
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
gnome2_icon_cache_update
}

View File

@@ -0,0 +1,183 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
PYTHON_COMPAT=( python2_7 )
WX_GTK_VER="3.0"
inherit cmake-utils fdo-mime flag-o-matic gnome2-utils python-single-r1 python-utils-r1 vcs-snapshot wxwidgets versionator
DESCRIPTION="Electronic Schematic and PCB design tools."
HOMEPAGE="http://www.kicad-pcb.org"
SERIES=$(get_version_component_range 1-2)
MY_PV=$(replace_version_separator 3 '-')
LIB_REVISION="bd0ec6a20c7cc0556093f60eac723e4505947784"
DOC_REVISION="0d0ed7b9de3afbba5d51fb6d7a25834000ed1099"
I18N_REVISION="bf793d30d64f4e75ea7a109ea434c1a27926b158"
SRC_URI="https://launchpad.net/${PN}/${SERIES}/${MY_PV}/+download/${PN}-${MY_PV}.tar.xz
!minimal? ( https://github.com/KiCad/${PN}-library/tarball/${LIB_REVISION} -> ${P}-library.tar.gz )
i18n? ( https://github.com/KiCad/${PN}-i18n/tarball/${I18N_REVISION} -> ${P}-i18n.tar.gz )"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="debug doc examples github i18n minimal python webkit"
LANGS="bg ca cs de el es fi fr hu it ja ko nl pl pt ru sk sl sv zh_CN"
for lang in ${LANGS} ; do
IUSE="${IUSE} linguas_${lang}"
done
unset lang
REQUIRED_USE="
github? ( webkit )
python? ( ${PYTHON_REQUIRED_USE} )"
CDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,webkit?]
python? (
dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}]
${PYTHON_DEPS}
)
>=dev-libs/boost-1.56[context,threads,python?]
github? ( dev-libs/openssl:0 )
media-libs/glew
media-libs/freeglut
media-libs/mesa
sys-libs/zlib
x11-libs/cairo"
DEPEND="${CDEPEND}
app-arch/xz-utils
doc? ( app-doc/doxygen )
i18n? ( >=sys-devel/gettext-0.18 )
python? ( dev-lang/swig:0 )"
RDEPEND="${CDEPEND}
sci-electronics/electronics-menu"
S="${WORKDIR}/${PN}-${MY_PV}"
pkg_setup() {
python-single-r1_pkg_setup
}
src_prepare() {
if use python; then
# dev-python/wxpython doesn't support python3
sed '/set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0)/d' -i CMakeModules/FindPythonLibs.cmake || die "sed failed"
fi
# Handle optional minimal install.
if use minimal; then
# remove tempaltes as they are not needed to run binaries
sed -e '/add_subdirectory( template )/d' -i CMakeLists.txt || die "sed failed"
else
# create a link to the parts library in the main project folder
ln -s "${WORKDIR}/${P}-library" "${S}/${PN}-library" || die "ln failed"
# add the libraries directory to cmake as a subproject to build
sed "/add_subdirectory( bitmaps_png )/a add_subdirectory( ${PN}-library )" -i CMakeLists.txt || die "sed failed"
# add the libraries directory subproject also to uninstallation procedures
sed '/make uninstall/,/# /d' -i ${PN}-library/CMakeLists.txt || die "sed failed"
fi
# Add internationalization for the GUI
if use i18n; then
# create a link to the translations library in the main project folder
ln -s "${WORKDIR}/${P}-i18n" "${S}/${PN}-i18n" || die "ln failed"
# Remove unused languages. Project generates only languages specified in the
# file in LINGUAS in the subproject folder. By default all languages are added
# so we sed out the unused ones based on the user linguas_* settings.
local lang=""
for lang in ${LANGS}; do
if ! use linguas_${lang}; then
sed "/${lang}/d" -i ${PN}-i18n/LINGUAS || die "sed failed"
fi
done
# cmakelists does not respect our build dir variables, so make it point to the right location
sed "s|\${CMAKE_BINARY_DIR}|${WORKDIR}/${P}_build|g" -i ${PN}-i18n/CMakeLists.txt || die "sed failed"
# we also make from the master project so the source dir is understood incorretly, replace that too
sed "s|\${CMAKE_SOURCE_DIR}/\${LANG}|\${CMAKE_SOURCE_DIR}/${PN}-i18n/\${LANG}|g" -i ${PN}-i18n/CMakeLists.txt || die "sed failed"
# add the translations directory to cmake as a subproject to build
sed "/add_subdirectory( bitmaps_png )/a add_subdirectory( ${PN}-i18n )" -i CMakeLists.txt || die "sed failed"
# add the translations directory subproject also to uninstallation procedures
sed '/make uninstall/,$d' -i ${PN}-i18n/CMakeLists.txt || die "sed failed"
fi
# Install examples in the right place if requested
if use examples; then
sed -e 's:${KICAD_DATA}/demos:${KICAD_DOCS}/examples:' -i CMakeLists.txt || die "sed failed"
else
sed -e '/add_subdirectory( demos )/d' -i CMakeLists.txt || die "sed failed"
fi
# Add important missing doc files
sed -e 's/INSTALL.txt/AUTHORS.txt CHANGELOG.txt README.txt TODO.txt/' -i CMakeLists.txt || die "sed failed"
}
src_configure() {
need-wxwidgets unicode
local mycmakeargs=(
-DKICAD_DOCS="/usr/share/doc/${PF}"
-DKICAD_HELP="/usr/share/doc/${PF}/help"
-DwxUSE_UNICODE=ON
-DKICAD_SKIP_BOOST=ON
$(cmake-utils_use github BUILD_GITHUB_PLUGIN)
$(cmake-utils_use python KICAD_SCRIPTING)
$(cmake-utils_use python KICAD_SCRIPTING_MODULES)
$(cmake-utils_use python KICAD_SCRIPTING_WXPYTHON)
$(cmake-utils_use webkit KICAD_USE_WEBKIT)
$(usex i18n "-DKICAD_I18N_UNIX_STRICT_PATH=1" "")
)
if use debug; then
append-flags "-DDEBUG"
fi
cmake-utils_src_configure
}
src_compile() {
cmake-utils_src_compile
if use doc; then
doxygen Doxyfile || die "doxygen failed"
fi
}
src_install() {
cmake-utils_src_install
use python && python_optimize "${D}/usr/$(get_libdir)/${EPYTHON}/site-packages/pcbnew.py"
if use doc ; then
insinto /usr/share/doc/${PF}
doins uncrustify.cfg
cd Documentation || die "cd failed"
doins -r GUI_Translation_HOWTO.pdf guidelines/UIpolicies.txt doxygen/*
fi
}
pkg_preinst() {
gnome2_icon_savelist
}
pkg_postinst() {
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
gnome2_icon_cache_update
if use minimal ; then
ewarn "If the schematic and/or board editors complain about missing libraries when you"
ewarn "open old projects, you will have to take one or more of the following actions :"
ewarn "- Install the missing libraries manually."
ewarn "- Remove the libraries from the 'Libs and Dir' preferences."
ewarn "- Fix the libraries' locations in the 'Libs and Dir' preferences."
ewarn "- Emerge ${PN} without the 'minimal' USE flag."
ewarn ""
fi
elog "You may want to emerge media-gfx/wings if you want to create 3D models of components."
}
pkg_postrm() {
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
gnome2_icon_cache_update
}

View File

@@ -1,9 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>proxy-maintainers</herd>
<maintainer>
<email>maintainer-needed@gentoo.org</email>
<email>zoltan@sinustrom.info</email>
<name>Zoltan Puskas</name>
<description>Proxied maintainer. Assign bugs to him.</description>
</maintainer>
<use>
<flag name="github">Add github support into PCB editor</flag>
<flag name="i18n">Allow GUI internationalization through linguas_* use flags</flag>
<flag name="minimal">Build only binaries without parts library and examples</flag>
<flag name="python">Enable python scripting support</flag>
</use>
<longdescription>
Kicad is an open source (GPL) software for the creation of electronic
schematic diagrams and printed circuit board artwork.