development/kicad: Updated for version 4.0.0 + new maintainer.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 18 insertions, 32 deletions

diff --git a/development/kicad/help_path.patch b/development/kicad/help_path.patch
deleted file mode 100644
index 9c61f86d53..0000000000
--- a/development/kicad/help_path.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kicad-bzr_20101223/common/edaappl.cpp	2010-12-31 17:48:16.000000000 -0200
-+++ kicad-bzr_20101223_patched/common/edaappl.cpp	2010-12-31 17:49:46.000000000 -0200
-@@ -927,7 +927,6 @@
-     // from a distribution files are in /usr/share/doc/kicad/help and binaries
-     // in /usr/bin or /usr/local/bin
-     subdirs.Add( wxT( "share" ) );
--    subdirs.Add( _T( "doc" ) );
-     subdirs.Add( wxT( "kicad" ) );
-     subdirs.Add( _T( "help" ) );
- 
diff --git a/development/kicad/kicad.SlackBuild b/development/kicad/kicad.SlackBuild
index 50728ba17e..014613e462 100644
--- a/development/kicad/kicad.SlackBuild
+++ b/development/kicad/kicad.SlackBuild
@@ -26,7 +26,7 @@
 # Revision date: 2013/03/29
 
 PRGNAM=kicad
-VERSION=${VERSION:-bzr_20130325}
+VERSION=${VERSION:-4.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -63,41 +63,37 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Patch to solve path to help-files from kicad-doc package
-#  This is not the cleanest solution, but it works, and the source code itself
-#  admits being "hacky"...
-patch -p1 < $CWD/help_path.patch
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p build
 cd build
   cmake \
+    -DKICAD_REPO_NAME=stable \
+    -DKICAD_BUILD_VERSION=4.0.0 \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DKICAD_DOCS=/usr/doc/$PRGNAM-$VERSION \
     -DKICAD_PLUGINS=/usr/lib${LIBDIRSUFFIX}/$PRGNAM/plugins \
     -DKICAD_STABLE_VERSION=ON \
+    -DKICAD_SKIP_BOOST=ON \
     -DCMAKE_BUILD_TYPE=Release ..
   make VERBOSE=1
   make install DESTDIR=$PKG
 cd ..
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS.txt CHANGELOG.txt COPYRIGHT.txt INSTALL.txt README.txt TODO.txt \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/kicad/kicad.info b/development/kicad/kicad.info
index b83c5b1b7c..337d906e19 100644
--- a/development/kicad/kicad.info
+++ b/development/kicad/kicad.info
@@ -1,10 +1,10 @@
 PRGNAM="kicad"
-VERSION="bzr_20130325"
-HOMEPAGE="http://kicad.sourceforge.net/wiki"
-DOWNLOAD="http://www.nielshorn.net/_download/slackware/source/kicad-bzr_20130325.tar.bz2"
-MD5SUM="d4828b22bc530ac63a112c060264b77c"
+VERSION="4.0.0"
+HOMEPAGE="http://kicad-pcb.org"
+DOWNLOAD="https://launchpad.net/kicad/4.0/4.0.0/+download/kicad-4.0.0.tar.xz"
+MD5SUM="f4f7ea77ee854ca12e1fd4463f681657"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libgnomeprintui wxPython"
-MAINTAINER="Niels Horn"
-EMAIL="niels.horn@gmail.com"
+REQUIRES="libgnomeprintui wxGTK3"
+MAINTAINER="Fernando Lopez Jr."
+EMAIL="fernando.lopezjr@gmail.com"