Update to 1.0.9

1 files changed, 23 insertions, 16 deletions

diff --git a/gecko-mediaplayer/build/gecko-mediaplayer.SlackBuild b/gecko-mediaplayer/build/gecko-mediaplayer.SlackBuild
index c515b388..714ec287 100755
--- a/gecko-mediaplayer/build/gecko-mediaplayer.SlackBuild
+++ b/gecko-mediaplayer/build/gecko-mediaplayer.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2009, 2010, 2011, 2012, 2013  Eric Hameleers, Eindhoven, NL
+# Copyright 2009, 2010, 2011, 2012, 2013, 2014  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -50,6 +50,8 @@
 #             * Upgrade.
 # 1.0.8-2:    21/nov/2013 by Eric Hameleers <alien@slackware.com>
 #             * Make it work with Chromium browser.
+# 1.0.9-1:    12/dec/2014 by Eric Hameleers <alien@slackware.com>
+#             * Upgrade.
 # 
 # Run 'sh gecko-mediaplayer.SlackBuild' to build a Slackware package.
 # The package (.tgz) and .txt file as well as build logs are created in /tmp .
@@ -60,8 +62,8 @@
 # Set initial variables:
 
 PRGNAM=gecko-mediaplayer
-VERSION=${VERSION:-1.0.8}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.0.9}
+BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:" -j4 "}
 TAG=${TAG:-alien}
 
@@ -76,7 +78,7 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.gz"
-SRCURL="http://gecko-mediaplayer.googlecode.com/files/${PRGNAM}-${VERSION}.tar.gz"
+SRCURL="https://code.google.com/p/gecko-mediaplayer/source/browse/packages/${PRGNAM}-${VERSION}.tar.gz"
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@@ -89,7 +91,6 @@ if [ -z "$ARCH" ]; then
     i?86)    export ARCH=i486 ;;
     armv7hl) export ARCH=$MARCH ;;
     armv6hl) export ARCH=$MARCH ;;
-    armv5hl) export ARCH=$MARCH ;;
     arm*)    export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
     *)       export ARCH=$MARCH ;;
@@ -109,9 +110,6 @@ case "$ARCH" in
   armv6hl)   SLKCFLAGS="-O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
-  armv5hl)   SLKCFLAGS="-O2 -mthumb -march=armv5te -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp"
-             SLKLDFLAGS=""; LIBDIRSUFFIX=""
-             ;;
   *)         SLKCFLAGS="-O2"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
@@ -178,12 +176,9 @@ echo "Extracting the source archive(s) for $PRGNAM..."
 tar -xvf ${SOURCE}
 cd ${PRGNAM}-${VERSION}
 
-if [ "$VERSION" = "1.0.8" ]; then
-  # Fix the function table check so that the plugin works with Chromium
-  # (already added to SVN for next release):
-  cat $SRCDIR/gecko-mediaplayer-1.0.8_functiontable.patch \
-    | patch -p1 --verbose 2>&1 | tee $OUTPUT/patch-$PRGNAM.log
-fi
+# Make it compile with recent versions of XUL (thanks ponce):
+cat $SRCDIR/gecko-mediaplayer-xulrunner_30.patch \
+  | patch -p1 --verbose 2>&1 | tee $OUTPUT/patch-$PRGNAM.log
 
 chown -R root:root .
 chmod -R u+w,go+r-w,a+X-s .
@@ -199,6 +194,7 @@ CFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --localstatedir=/var \
   --sysconfdir=/etc \
+  --disable-schemas-install \
   --program-prefix= \
   --program-suffix= \
   --build=$TARGET \
@@ -206,8 +202,19 @@ CFLAGS="$SLKCFLAGS" \
 
 # Still need the libdir explicitly here, to prevent installing unwantedly
 # into /usr/lib${LIBDIRSUFFIX}/seamonkey...
-make libdir=/usr/lib${LIBDIRSUFFIX} $NUMJOBS 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
-make libdir=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG install 2>&1 | tee $OUTPUT/install-${PRGNAM}.log
+make libdir=/usr/lib${LIBDIRSUFFIX} force_arch="$ARCH" $NUMJOBS \
+  2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+make libdir=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG install \
+  2>&1 | tee $OUTPUT/install-${PRGNAM}.log
+
+## Add this to the doinst.sh:
+#! [ -d $PKG/install ] && mkdir -p $PKG/install
+#cat <<EOT >> $PKG/install/doinst.sh
+## Compile glib schema files:
+#if [ -x usr/bin/glib-compile-schemas ]; then
+#  chroot . /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas > /dev/null 2>&1
+#fi
+#EOT
 
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION