Update to version 11 beta 1

1 files changed, 46 insertions, 15 deletions

diff --git a/flashplayer-plugin/build/flashplayer-plugin.SlackBuild b/flashplayer-plugin/build/flashplayer-plugin.SlackBuild
index e61ce917..4bf3b7a1 100755
--- a/flashplayer-plugin/build/flashplayer-plugin.SlackBuild
+++ b/flashplayer-plugin/build/flashplayer-plugin.SlackBuild
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2008, 2009, 2010  Eric Hameleers, Eindhoven, NL
+# Copyright 2008, 2009, 2010, 2011  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -47,6 +47,10 @@
 #               * New preview of "flash player square" for 64-bit Linux; there
 #                 is no more 32-bit "square" version, because new developments
 #                 are being folded into regular flashplayer10.
+# 11b1.071311-1:25/jul/2011 by Eric Hameleers <alien@slackware.com>
+#               * Update to version 11 beta 1.
+#                 Looks like 64-bit support has finally been folded into the
+#                 mainstream development of the plugin.
 # 
 # Run 'sh flashplayer-plugin.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -57,8 +61,8 @@
 # Set initial variables:
 
 PRGNAM=flashplayer-plugin
-SRCVER=${SRCVER:-10_2}
-BLDVER=${BLDVER:-111710}
+SRCVER=${SRCVER:-11_b1}
+BLDVER=${BLDVER:-071311}
 VERSION=$SRCVER.$BLDVER
 BUILD=${BUILD:-1}
 
@@ -81,12 +85,10 @@ fi
 
 case "$ARCH" in
   x86_64)
-    PREVER=${PREVER:-3}
     LIBDIRSUFFIX="64"
     ARCHBITS="64"
     ;;
   i?86)
-    PREVER=${PREVER:-2}
     LIBDIRSUFFIX=""
     ARCHBITS="32"
     ;;
@@ -96,8 +98,8 @@ case "$ARCH" in
     ;;
 esac
 
-SOURCE="$SRCDIR/flashplayer${SRCVER}_p${PREVER}_${ARCHBITS}bit_linux_${BLDVER}.tar.gz"
-SRCURL="http://download.macromedia.com/pub/labs/flashplayer10/flashplayer${SRCVER}_p${PREVER}_${ARCHBITS}bit_linux_${BLDVER}.tar.gz"
+SOURCE="$SRCDIR/flashplayer${SRCVER}_install_lin_${ARCHBITS}_${BLDVER}.tar.gz"
+SRCURL="http://download.macromedia.com/pub/labs/flashplatformruntimes/flashplayer11/flashplayer${SRCVER}_install_lin_${ARCHBITS}_${BLDVER}.tar.gz"
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@@ -110,6 +112,10 @@ trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR
 set -u
 P1=${1:-1}
 
+# Save old umask and set to 0022:
+_UMASK_=$(umask)
+umask 0022
+
 # Create working directories:
 mkdir -p $OUTPUT          # place for the package to be saved
 mkdir -p $TMP/tmp-$PRGNAM # location to build the source
@@ -121,10 +127,11 @@ rm -rf $OUTPUT/{configure,make,install,error,makepkg}-$PRGNAM.log
 
 # Source file availability:
 if ! [ -f ${SOURCE} ]; then
+  echo "Source '$(basename ${SOURCE})' not available yet..."
+  # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
+  [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)"
+  if [ -f ${SOURCE} ]; then echo "Ah, found it!"; continue; fi
   if ! [ "x${SRCURL}" == "x" ]; then
-    # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
-    [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)"
-    echo "Source '$(basename ${SOURCE})' not available yet..."
     echo "Will download file to $(dirname $SOURCE)"
     wget -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true
     if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then
@@ -149,7 +156,8 @@ echo "++"
 echo "|| $PRGNAM-$VERSION"
 echo "++"
 
-cd $TMP/tmp-$PRGNAM
+#cd $TMP/tmp-$PRGNAM
+cd $PKG
 echo "Extracting the source archive(s) for $PRGNAM..."
 tar -xvf ${SOURCE}
 chown -R root:root *
@@ -168,10 +176,30 @@ case "$ARCH" in
     ;;
 esac
 
-# Install the plugin to the package dir:
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins
-install -m 0755 libflashplayer.so \
-  $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins/libflashplayer.so
+# Move lib to lib64 if needed:
+[ "$ARCH" = "x86_64" ] && mv usr/lib usr/lib${LIBDIRSUFFIX}
+
+# Install the plugin to the mozilla plugins dir and fix library file attributes:
+mkdir -p usr/lib${LIBDIRSUFFIX}/mozilla/plugins
+mv libflashplayer.so usr/lib${LIBDIRSUFFIX}/mozilla/plugins/
+find usr/lib${LIBDIRSUFFIX} -name "*.so" -exec chmod 755 {} \;
+
+# Add this to the doinst.sh:
+mkdir -p $PKG/install
+cat <<EOINS >> $PKG/install/doinst.sh
+# Update the desktop database:
+if [ -x usr/bin/update-desktop-database ]; then
+  chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1
+fi
+
+# Update hicolor theme cache:
+if [ -d usr/share/icons/hicolor ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null
+  fi
+fi
+
+EOINS
 
 # Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -191,3 +219,6 @@ md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz > ${PRGNAM}-${VERSION}-${ARCH}-
 cd -
 cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txt
 
+# Restore the original umask:
+umask ${_UMASK_}
+