1 files changed, 13 insertions, 11 deletions
diff --git a/development/amaya/amaya.SlackBuild b/development/amaya/amaya.SlackBuild
index 6417cea649143..f9fd339e87480 100644
--- a/development/amaya/amaya.SlackBuild
+++ b/development/amaya/amaya.SlackBuild
@@ -26,8 +26,8 @@
 # Modified by the SlackBuilds.org team
 
 PRGNAM=amaya
-VERSION=${VERSION:-11.3.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-11.4.4}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -72,28 +72,24 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Apply a patch so wxWidgets builds with the newer gtk
-( cd wxWidgets ; cat $CWD/newgtk.patch | patch -p1 || exit 1 )
-
-# Apply patch for gcc 4.5.x
-patch -p1 < $CWD/amaya_gcc45x.patch
+# Apply some patches (thanks to archlinux)
+for i in $CWD/patches/* ; do patch -p1 < $i ; done
 
 mkdir -p Amaya/build
 cd Amaya/build
   CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
   ../configure \
-    --prefix=/opt/ \
+    --prefix=/opt \
     --libdir=/usr/lib${LIBDIRSUFFIX} \
     --sysconfdir=/etc \
     --localstatedir=/var \
     --mandir=/usr/man \
     --docdir=/usr/doc/$PRGNAM-$VERSION \
     --with-gl \
-    --with-wxsrcdir=../../wxWidgets/ \
+    --enable-system-wx \
     --enable-system-raptor \
     --build=$ARCH-slackware-linux
-  make wxwidgets || exit 1
   make all || exit 1
   make install DESTDIR=$PKG || exit 1
 cd ..
@@ -114,8 +110,14 @@ cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
   ln -s ../../../opt/Amaya/resources/icons/misc/logo.png amaya.png
 )
 
+# Install the foreign dictionaries (English and French are already there)
+for i in Dutch German Italian Spanish Swedish ; do tar xf $CWD/$i.tgz ; done
+for i in G I N S W ; do
+  install -m 0644 -D ${i}princ.dic $PKG/opt/Amaya/dicopar/${i}princ.dic
+done
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install