6 files changed, 33 insertions, 9 deletions
diff --git a/development/kicad/README b/development/kicad/README
index 1486d92894..f1c57756db 100644
--- a/development/kicad/README
+++ b/development/kicad/README
@@ -6,4 +6,4 @@ netlist converter, pcb designer and a gerber viewer.
 There are separate SlackBuilds for the libraries and additional
 documentation, kicad-library and kicad-doc.
 
-This requires wxGTK
+This requires wxGTK.
diff --git a/development/kicad/doinst.sh b/development/kicad/doinst.sh
index f8f852bc2b..9830478e8c 100644
--- a/development/kicad/doinst.sh
+++ b/development/kicad/doinst.sh
@@ -2,4 +2,13 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
 
diff --git a/development/kicad/help_path.patch b/development/kicad/help_path.patch
index 6116e478c3..e974c9dd37 100644
--- a/development/kicad/help_path.patch
+++ b/development/kicad/help_path.patch
@@ -1,6 +1,6 @@
---- kicad-bzr_20100608/common/edaappl.cpp	2010-09-25 08:49:59.000000000 -0300
-+++ kicad-bzr_20100608_patched/common/edaappl.cpp	2010-09-25 13:46:19.000000000 -0300
-@@ -891,7 +891,6 @@
+--- 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
+@@ -903,7 +903,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" ) );
diff --git a/development/kicad/kicad-setlanguage.patch b/development/kicad/kicad-setlanguage.patch
new file mode 100644
index 0000000000..3fc33fab11
--- /dev/null
+++ b/development/kicad/kicad-setlanguage.patch
@@ -0,0 +1,11 @@
+--- kicad-bzr_20101223_orig/common/edaappl.cpp	2011-01-01 14:30:14.000000000 -0200
++++ kicad-bzr_20101223/common/edaappl.cpp	2011-01-01 14:29:33.000000000 -0200
+@@ -680,7 +680,7 @@
+         delete m_Locale;
+     m_Locale = new wxLocale;
+ 
+-    if( !m_Locale->Init( m_LanguageId ) )
++    if( !m_Locale->Init( m_LanguageId, wxLOCALE_CONV_ENCODING ) )
+     {
+         wxLogDebug( wxT("This language is not supported by the system.") );
+ 
diff --git a/development/kicad/kicad.SlackBuild b/development/kicad/kicad.SlackBuild
index be169fd3ac..8afef51ebb 100644
--- a/development/kicad/kicad.SlackBuild
+++ b/development/kicad/kicad.SlackBuild
@@ -4,10 +4,10 @@
 # Open-Source EDA Suite
 
 # Written by Niels Horn <niels.horn@gmail.com>
-# Revision date: 2010/09/25
+# Revision date: 2011/01/01
 
 PRGNAM=kicad
-VERSION=${VERSION:-bzr_20100608}
+VERSION=${VERSION:-bzr_20101223}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -58,6 +58,10 @@ find . \
 #  admits being "hacky"...
 patch -p1 < $CWD/help_path.patch
 
+# Partially revert bzr revision 2543, as it had the side-effect of not being
+#  able to change the ui language. Bug filed upstream...
+patch -p1 < $CWD/kicad-setlanguage.patch
+
 mkdir -p build
 cd build
   cmake \
diff --git a/development/kicad/kicad.info b/development/kicad/kicad.info
index 92e64fe6f1..e1de608862 100644
--- a/development/kicad/kicad.info
+++ b/development/kicad/kicad.info
@@ -1,8 +1,8 @@
 PRGNAM="kicad"
-VERSION="bzr_20100608"
+VERSION="bzr_20101223"
 HOMEPAGE="http://kicad.sourceforge.net/wiki"
-DOWNLOAD="http://www.nielshorn.net/_download/slackware/source/kicad-bzr_20100608.tar.bz2"
-MD5SUM="e7403db547bcde3757b57119450ff645"
+DOWNLOAD="http://www.nielshorn.net/_download/slackware/source/kicad-bzr_20101223.tar.bz2"
+MD5SUM="73f22404899e9a3b379212cc26d2369a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Niels Horn"