From 4942c8b982efe274c1899e9181c2d82117a96365 Mon Sep 17 00:00:00 2001 From: "Gilbert J.M. Forkel" Date: Sat, 1 Nov 2014 23:57:33 +0100 Subject: [PATCH 1/4] Removed invalid packet: install --- scripts/kicad-install.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/kicad-install.sh b/scripts/kicad-install.sh index 946952cfcd..f5402c8c53 100755 --- a/scripts/kicad-install.sh +++ b/scripts/kicad-install.sh @@ -132,7 +132,6 @@ install_prerequisites() sudo yum groupinstall "Development Tools" || exit 1 prerequisite_list=" - install bzr bzrtools bzip2-libs From 7413cfd160c953d0ec8729d04874fc4d72f87fb8 Mon Sep 17 00:00:00 2001 From: "Gilbert J.M. Forkel" Date: Sat, 1 Nov 2014 23:58:34 +0100 Subject: [PATCH 2/4] Updated wxWidget from 2 to 3 --- scripts/kicad-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/kicad-install.sh b/scripts/kicad-install.sh index f5402c8c53..a1b95ed7be 100755 --- a/scripts/kicad-install.sh +++ b/scripts/kicad-install.sh @@ -143,7 +143,7 @@ install_prerequisites() glew-devel grep openssl-devel - wxGTK-devel + wxGTK3-devel " for p in ${prerequisite_list} From 6aa4de9bfd5fa4778ddf6edc8fd95da04e6e37bf Mon Sep 17 00:00:00 2001 From: "Gilbert J.M. Forkel" Date: Sun, 2 Nov 2014 00:05:56 +0100 Subject: [PATCH 3/4] Do not exit if yum group install fails, because it also fails if all packages are installed already --- scripts/kicad-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/kicad-install.sh b/scripts/kicad-install.sh index a1b95ed7be..a146a87550 100755 --- a/scripts/kicad-install.sh +++ b/scripts/kicad-install.sh @@ -129,7 +129,7 @@ install_prerequisites() elif [ "$(expr match "$PM" '.*\(yum\)')" == "yum" ]; then #echo "red hat compatible system" # Note: if you find this list not to be accurate, please submit a patch: - sudo yum groupinstall "Development Tools" || exit 1 + sudo yum groupinstall "Development Tools" prerequisite_list=" bzr From 25061ed62618ddcf8a945044b13d778b6568833b Mon Sep 17 00:00:00 2001 From: "Gilbert J.M. Forkel" Date: Sun, 2 Nov 2014 00:20:53 +0100 Subject: [PATCH 4/4] Add check for correct wxGTK version report by wx-config. If incorrect cmake fails. Compare https://bugzilla.redhat.com/show_bug.cgi?id=1077718 --- scripts/kicad-install.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/kicad-install.sh b/scripts/kicad-install.sh index a146a87550..3b5dd8248d 100755 --- a/scripts/kicad-install.sh +++ b/scripts/kicad-install.sh @@ -151,6 +151,15 @@ install_prerequisites() sudo yum install $p || exit 1 done + echo "Checking wxGTK version. Maybe you have to symlink /usr/bin/wx-config-3.0 to /usr/bin/wx-config" + V=`wx-config --version | cut -f 1 -d '.'` || echo "Error running wx-config." + if [ $V -lt 3 ] + then + echo "Error: wx-config is reporting version prior to 3" + exit + else + echo "All ok" + fi # Only install the scripting prerequisites if required. if [ "$(expr match "$OPTS" '.*\(-DKICAD_SCRIPTING=ON\)')" == "-DKICAD_SCRIPTING=ON" ]; then #echo "KICAD_SCRIPTING=ON"