From a58973f61e7a13018efe48c39a6ab664d1ff040b Mon Sep 17 00:00:00 2001 From: fsLeg Date: Wed, 3 Dec 2014 19:16:27 +0300 Subject: [PATCH] Opera: switched to Stable stream by default. Upped version to 26.0.1656.32. Upped local FFmpeg version to 2.4.4. --- opera/README | 9 +++++---- opera/opera.SlackBuild | 28 +++++++++++++++------------- opera/opera.conf | 6 +++--- opera/opera.info | 8 ++++---- opera/opera.sh | 10 +++++----- opera/slack-desc | 22 +++++++++++----------- 6 files changed, 43 insertions(+), 40 deletions(-) diff --git a/opera/README b/opera/README index 02e1db0..5daf25a 100644 --- a/opera/README +++ b/opera/README @@ -1,10 +1,9 @@ Opera is the fastest and free (as in free beer) alternative browser. This is a unified SlackBuild that can make packages for all three Opera flavors: -stable (not yet released at the moment of writing), beta and developer. By -default beta version is built. If you want other flavor, specify it in a -FLAVOR variable. Possible values: "stable", "beta" and "developer". Don't -forget to adjust VERSION variable accordingly. +stable, beta and developer. By default stable version is built. If you want +other flavor, specify it in the FLAVOR variable. Possible values: "stable", +"beta" and "developer". Don't forget to adjust VERSION variable accordingly. This package makes use of AlienBOB's chromium-pepperflash-plugin package. If you have it installed, you'll have Adobe FlashPlayer. @@ -19,3 +18,5 @@ Sometimes different flavors of Opera require different FFmpeg versions. If the flavor you chose doesn't support FFmpeg version in the SlackBuild, you can specify a different version using FFMPEG_VERSION variable, i. e. FFMPEG_VERSION=2.4.2 + +WARNING: this package (stable flavor) conflicts with classic Opera from SBo. diff --git a/opera/opera.SlackBuild b/opera/opera.SlackBuild index 442481f..e736af8 100755 --- a/opera/opera.SlackBuild +++ b/opera/opera.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Slackware build script for Opera (Beta and Developer flavours) +# Slackware build script for Opera (stable and Developer flavours) # Copyright 2014 Vladislav Borisov Moscow, Russia # All rights reserved. @@ -23,20 +23,16 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # If your want to make a different flavor of Opera, change this variable. -# For now there are two valid choices: "beta" and "developer". -FLAVOR=-${FLAVOR:-beta} - -if [ "${FLAVOR}" == "-stable" ]; then - FLAVOR="" -fi +# The valid choices are: "stable", "stable" and "developer". +FLAVOR=-${FLAVOR:-stable} # You can build local version of ffmpeg if you want H.264 and MP3 decoding support FFMPEG=${FFMPEG:-no} -FFMPEG_VERSION="2.4.3" +FFMPEG_VERSION="2.4.4" PRGNAM_BASE=opera PRGNAM=${PRGNAM_BASE}${FLAVOR} -VERSION=${VERSION:-26.0.1656.20} +VERSION=${VERSION:-26.0.1656.32} BUILD=${BUILD:-1} TAG=${TAG:-fsleg} @@ -127,6 +123,12 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# opera-stable isn't actually called like that within the package, +# although we'll preserve that name in order to avoid conflict with classic Opera package +if [ "-stable" = "${FLAVOR}" ]; then + FLAVOR="" +fi + # Move libs to a more apropriate place mkdir -p usr/lib${LIBDIRSUFFIX} mv usr/lib/x86_64-linux-gnu/opera${FLAVOR} usr/lib${LIBDIRSUFFIX}/ @@ -156,7 +158,7 @@ chmod 755 usr/bin/opera${FLAVOR} # Move everything to $PKG mv usr etc $PKG/ -if [ "${FFMPEG}" == "yes" ]; then +if [ "yes" = "${FFMPEG}" ]; then build_ffmpeg else sed -i 's/PATH_TO_FFMPEG\://' ${PKG}/usr/bin/opera${FLAVOR} @@ -178,9 +180,9 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc # Change Opera flavour in some files -sed -i "s/opera-beta/opera${FLAVOR}/g" $PKG/usr/bin/opera${FLAVOR} \ - $PKG/etc/default/opera${FLAVOR} \ - $PKG/install/slack-desc +sed -i "s/opera_FLAVOR_/opera${FLAVOR}/g" $PKG/usr/bin/opera${FLAVOR} \ + $PKG/etc/default/opera${FLAVOR} +sed -i "s/opera_FLAVOR_/${PRGNAM}/g" $PKG/install/slack-desc cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz} diff --git a/opera/opera.conf b/opera/opera.conf index 41525db..abc96d5 100644 --- a/opera/opera.conf +++ b/opera/opera.conf @@ -1,7 +1,7 @@ -# Default settings for opera-beta. -# This file is sourced by /usr/bin/opera-beta +# Default settings for opera_FLAVOR_. +# This file is sourced by /usr/bin/opera_FLAVOR_ -# Options to pass to opera-beta +# Options to pass to opera_FLAVOR_ OPERA_FLAGS="" diff --git a/opera/opera.info b/opera/opera.info index 296bf54..8b3eb56 100644 --- a/opera/opera.info +++ b/opera/opera.info @@ -1,10 +1,10 @@ -PRGNAM="opera-beta" -VERSION="26.0.1656.20" +PRGNAM="opera-stable" +VERSION="26.0.1656.32" HOMEPAGE="http://www.opera.com/" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="http://get.geo.opera.com/pub/opera-beta/26.0.1656.20/linux/opera-beta_26.0.1656.20_amd64.deb" -MD5SUM_x86_64="7c3493a290b4cf5e6d9940a24d64a978" +DOWNLOAD_x86_64="http://get.geo.opera.com/pub/opera/desktop/26.0.1656.32/linux/opera-stable_26.0.1656.32_amd64.deb" +MD5SUM_x86_64="48b1d8eac2db3be33154a8e90c96b056" REQUIRES="" MAINTAINER="Vladislav Borisov" EMAIL="fsleg@t-rg.ws" diff --git a/opera/opera.sh b/opera/opera.sh index 7052268..9860c36 100755 --- a/opera/opera.sh +++ b/opera/opera.sh @@ -2,19 +2,19 @@ # Allow users to override command-line options # Based on Gentoo's chromium package (and by extension, Debian's) -if [[ -f /etc/default/opera-beta ]]; then - . /etc/default/opera-beta +if [[ -f /etc/default/opera_FLAVOR_ ]]; then + . /etc/default/opera_FLAVOR_ fi # Prefer user defined OPERA_USER_FLAGS (from env) over system -# default OPERA_FLAGS (from /etc/default/opera-beta) +# default OPERA_FLAGS (from /etc/default/opera_FLAVOR_) OPERA_FLAGS=${OPERA_USER_FLAGS:-$OPERA_FLAGS} export CHROME_WRAPPER=$(readlink -f "$0") -export CHROME_DESKTOP=opera-beta.desktop +export CHROME_DESKTOP=opera_FLAVOR_.desktop # Use ffmpeg libs export LD_LIBRARY_PATH="PATH_TO_FFMPEG:${LD_LIBRARY_PATH}" -exec /usr/lib_LIBDIRSUFFIX_/opera-beta/opera-beta $OPERA_FLAGS "$@" +exec /usr/lib_LIBDIRSUFFIX_/opera_FLAVOR_/opera_FLAVOR_ $OPERA_FLAGS "$@" diff --git a/opera/slack-desc b/opera/slack-desc index 27b57e7..aefa939 100644 --- a/opera/slack-desc +++ b/opera/slack-desc @@ -1,11 +1,11 @@ -opera-beta: Opera (web browser) -opera-beta: -opera-beta: Opera is the fastest and free (as in free beer) -opera-beta: alternative browser. -opera-beta: -opera-beta: Website: http://www.opera.com/ -opera-beta: -opera-beta: -opera-beta: -opera-beta: -opera-beta: +opera_FLAVOR_: Opera (web browser) +opera_FLAVOR_: +opera_FLAVOR_: Opera is the fastest and free (as in free beer) +opera_FLAVOR_: alternative browser. +opera_FLAVOR_: +opera_FLAVOR_: Website: http://www.opera.com/ +opera_FLAVOR_: +opera_FLAVOR_: +opera_FLAVOR_: +opera_FLAVOR_: +opera_FLAVOR_: -- 2.46.3