2 files changed, 20 insertions, 31 deletions
diff --git a/development/kicad/kicad.SlackBuild b/development/kicad/kicad.SlackBuild
index 7e1f5308e20a..aaa89552d9b0 100644
--- a/development/kicad/kicad.SlackBuild
+++ b/development/kicad/kicad.SlackBuild
@@ -3,7 +3,8 @@
 # Slackware build script for KiCad
 # Open-Source EDA Suite
 
-# Copyright 2019 Fernando Lopez Jr. <fernando.lopezjr@gmail.com>
+# Copyright 2019-2023 Fernando Lopez Jr. <fernando.lopezjr@gmail.com>
+# Copyright 2023 Steven Voges <Oregon, USA>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,12 +24,12 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Revision date: 2019/Jun/02
+# Revision date: 2023/Apr/19
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=kicad
-VERSION=${VERSION:-5.1.9}
+VERSION=${VERSION:-7.0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -41,9 +42,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -54,16 +52,16 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686 -std=c++11"
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686 -std=c++11"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC -std=c++11"
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
 else
-  SLKCFLAGS="-O2 -std=c++11"
+  SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
@@ -82,31 +80,20 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# 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
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=lld" \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib${LIBDIRSUFFIX} \
     -DKICAD_DOCS=/usr/doc/$PRGNAM-$VERSION \
     -DKICAD_PLUGINS=/usr/lib${LIBDIRSUFFIX}/$PRGNAM/plugins \
-    -DKICAD_STABLE_VERSION=ON \
-    -DKICAD_SKIP_BOOST=ON \
-    -DKICAD_SCRIPTING=ON \
-    -DKICAD_SCRIPTING_MODULES=ON \
     -DKICAD_SCRIPTING_WXPYTHON=ON \
-    -DKICAD_USE_SPICE=ON \
-    -DKICAD_USE_OCC=ON \
-    -DKICAD_USE_OCE=OFF \
+    -DKICAD_USE_EGL=ON \
     -DCMAKE_BUILD_TYPE=Release ..
-  make VERBOSE=1
+  make
   make install DESTDIR=$PKG
 cd ..
 
@@ -114,7 +101,9 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS.txt *.md LICENSE* \
+  $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 cf8692c7088d..cdccb6f7ade6 100644
--- a/development/kicad/kicad.info
+++ b/development/kicad/kicad.info
@@ -1,10 +1,10 @@
 PRGNAM="kicad"
-VERSION="5.1.9"
-HOMEPAGE="http://kicad-pcb.org"
-DOWNLOAD="https://gitlab.com/kicad/code/kicad/-/archive/5.1.9/kicad-5.1.9.tar.gz"
-MD5SUM="b2c2f141b1a6342977b1192702b8d26d"
+VERSION="7.0.2"
+HOMEPAGE="https://kicad.org"
+DOWNLOAD="https://gitlab.com/kicad/code/kicad/-/archive/7.0.2/kicad-7.0.2.tar.gz"
+MD5SUM="c490044b103bcb7bff9591b2a07eccdb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="wxPython3 ngspice OpenCASCADE glm"
+REQUIRES="OpenCASCADE glm ngspice unixODBC wxPython4 wxWidgets"
 MAINTAINER="Fernando Lopez Jr."
 EMAIL="fernando.lopezjr@gmail.com"