Request 3770 (accepted)

You're not reviewing the full diff of request 3770 , but the diff to the superseded request 3767 (Show full diff)

Overview

Request 3770 (accepted)

No description set

Created by awissu over 7 years ago
In state accepted
Package maintainer: awissu
Supersedes 3767

Submit vivaldi

Submit package home:awissu:branches:Extra / vivaldi to package Extra / vivaldi

vivaldi.changes Changed

vivaldi.spec Changed

@@ -18,11 +18,13 @@
 %global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so$
 %global __requires_exclude ^.*(ffmpeg|widevinecdm).*$
 %if 0%{?packman_bs}
-%define pepper_flash_lib %(rpm -ql flash-player-ppapi | grep "flashplayer.so")
-%define ffmpeg_lib %(rpm -ql chromium-ffmpeg-extra | grep "ffmpeg.so")
+%define pepper_flash_lib %(rpm -ql chromium-pepper-flash | grep "flashplayer.so")
+%define pepper_flash_ver %(grep -ao -m1 "LNX [,0-9]\+" %{pepper_flash_lib} | sed 's/[^0-9]\+//;s/,/./g')
+%define codecs_dir %(rpm -ql chromium | grep -m1 "\.so" | xargs dirname)
+%define codecs_ver %(rpm -q --qf '%{VERSION}' chromium | awk 'BEGIN{FS="."}{print $1 * 1000000 + $2 * 1000 + $3}')
 %endif
 Name:           vivaldi
-Version:        1.8.770.54
+Version:        1.7.735.46
 Release:        0
 Summary:        Powerful and Personal Web Browser
 License:        SUSE-Freeware
@@ -32,23 +34,20 @@
 Source1:        https://downloads.vivaldi.com/stable/%{name}-stable-%{version}-1.x86_64.rpm
 Source2:        vivaldi.config.in
 # PATCH-FIX-OPENSUSE launcher.patch avvissu@yandex.by -- Change the startup script
-Patch0:         vivaldi-1.8.770.50_launcher.patch
+Patch0:         vivaldi-1.6.689.46_launcher.patch
 BuildRequires:  build
 BuildRequires:  chrpath
+BuildRequires:  chromium
 BuildRequires:  fdupes
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  update-desktop-files
-Recommends:     chromium-ffmpeg-extra
+Recommends:     chromium-pepper-flash
 Recommends:     chromium-plugin-widevinecdm
-Recommends:     flash-player-ppapi
+Suggests:       chromium
 Conflicts:      vivaldi-stable
 ExclusiveArch:	%ix86 x86_64
 %if 0%{?packman_bs}
-BuildRequires:  chromium-ffmpeg-extra
-BuildRequires:  flash-player-ppapi
-%endif
-%ifarch x86_64
-BuildRequires:  chromium-plugin-widevinecdm
+BuildRequires:  chromium-pepper-flash
 %endif
 # Not enough memory for rpmlint
 #!BuildIgnore:  rpmlint-Factory
@@ -72,12 +71,13 @@
 
 for file in opt/%{name}/%{name} %{name}.config.in; do
     sed -e 's|@LIBDIR@|%{_libdir}|g' \
-        -e 's|@PKG_FFMPEG@|chromium-ffmpeg-extra|g' \
+        -e 's|@PKG_FFMPEG@|chromium|g' \
         -e 's|@VIVALDI_CONFIG@|%{_sysconfdir}/default/%{name}|g' \
         -e 's|@VIVALDI_FLAGS@|--disable-setuid-sandbox|g' \
         -e 's|@VIVALDI_SANDBOX_FILE@|%{name}-sandbox|g' \
-        -e '/FFMPEG_LIB\=/s|$\"$.*$\"$|\1%{ffmpeg_lib}\2|' \
-        -e '/PEPPER_PATH\=/s|$\"$.*$\"$|\1%{pepper_flash_lib}\2|' \
+        %{?codecs_dir:-e '/CODECS_DIR\=/s|$\"$.*$\"$|\1%{codecs_dir}\2|'} \
+        %{?codecs_ver:-e '/CODECS_VERSION\=/s|$\"$.*$\"$|\1%{codecs_ver}\2|'} \
+        %{?pepper_flash_lib:-e '/PEPPER_PATH\=/s|$\"$.*$\"$|\1%{pepper_flash_lib}\2|'} \
         -i $file
 done

vivaldi-1.6.689.46_launcher.patch Added

@@ -0,0 +1,154 @@
+diff -ruN vivaldi-stable-1.6.689.46.orig/opt/vivaldi/vivaldi vivaldi-stable-1.6.689.46/opt/vivaldi/vivaldi
+--- vivaldi-stable-1.6.689.46.orig/opt/vivaldi/vivaldi	2016-12-24 23:30:24.740249628 +0300
++++ vivaldi-stable-1.6.689.46/opt/vivaldi/vivaldi	2016-12-24 23:53:05.000000000 +0300
+@@ -7,7 +7,27 @@
+ # Let the wrapped binary know that it has been run through the wrapper.
+ export CHROME_WRAPPER="`readlink -f "$0"`"
+ 
+-HERE="`dirname "$CHROME_WRAPPER"`"
++HERE="${CHROME_WRAPPER%/*}"
++
++# Check for existence of needed config file
++VIVALDI_CONF_FILE="@VIVALDI_CONFIG@"
++if which zenity &> /dev/null; then
++  xMESSAGE="zenity"
++elif which gmessage &> /dev/null; then
++  xMESSAGE="gmessage"
++elif which xmessage &> /dev/null; then
++  xMESSAGE="xmessage"
++else
++  xMESSAGE="echo"
++fi
++if [[ -r "$VIVALDI_CONF_FILE" ]]; then
++  if [ $? != 0 ]; then
++    $xMESSAGE "$VIVALDI_CONF_FILE not existing."
++    exit 1
++  fi
++fi
++
++. $VIVALDI_CONF_FILE
+ 
+ # We include some xdg utilities next to the binary, and we want to prefer them
+ # over the system versions when we know the system versions are very old. We
+@@ -26,65 +46,18 @@
+ fi
+ 
+ # Find libffmpeg.so with additional codecs.
+-CHR_CODECS_CL="/usr/share/doc/chromium-codecs-ffmpeg-extra/changelog.Debian.gz"
+-if [ -r "$CHR_CODECS_CL" ]; then
+-  if [ -r "/usr/lib/chromium-browser/libs/libffmpeg.so" ]; then
+-    LIBFFMPEG_PATH="/usr/lib/chromium-browser/libs"
+-  elif [ -r "/usr/lib/chromium-browser/libffmpeg.so" ]; then
+-    LIBFFMPEG_PATH="/usr/lib/chromium-browser"
+-  fi
+-  if [[ -n "$LIBFFMPEG_PATH" ]]; then
+-    CHR_CODECS_VER=`gzip -cd "$CHR_CODECS_CL" |
+-      sed -n '1s/^chromium-browser ($[0-9]\+\.$\{2\}$[0-9]\+$\.[0-9]\+-.*/\2/p'`
+-  fi
+-elif [ -r "/etc/os-release" ]; then
+-  # Check distro, to allow distro specific tests to locate a suitable libffmpeg.so
+-  . /etc/os-release
+-  # os-release does not mandate ID_LIKE so set it to something (if empty), to
+-  # avoid having an empty variable.
+-  ID_LIKE="${ID_LIKE:-unknown}"
+-  set_lib_dir_suf()
+-  {
+-    case "`uname -m`" in
+-      x86_64) LIB_DIR_SUFFIX="64" ;;
+-           *) LIB_DIR_SUFFIX="" ;;
+-    esac
+-  }
+-  # OpenSUSE, SLES and derivatives will all have an ID_LIKE that includes "suse"
+-  if [[ "$ID_LIKE" =~ "suse" ]]; then
+-    set_lib_dir_suf
+-    # chromium-ffmpeg recently changed the path for libffmpeg.so, so we need to
+-    # check both locations
+-    if [ -r "/usr/lib$LIB_DIR_SUFFIX/chromium/libffmpeg.so" ]; then
+-      LIBFFMPEG_PATH=/usr/lib$LIB_DIR_SUFFIX/chromium
+-    elif [ -r "/usr/lib$LIB_DIR_SUFFIX/chromium/lib/libffmpeg.so" ]; then
+-      LIBFFMPEG_PATH=/usr/lib$LIB_DIR_SUFFIX/chromium/lib
+-    fi
+-    if [[ -n "$LIBFFMPEG_PATH" ]]; then
+-      # Query RPM database and set the version if chromium-ffmpeg is installed.
+-      CHR_CODECS_VER=`rpm -qf "$LIBFFMPEG_PATH/libffmpeg.so" |
+-        sed -n 's/^chromium-ffmpeg-$[0-9]\+\.$\{2\}$[0-9]\+$\.[0-9]\+-.*/\2/p'`
+-    fi
+-  fi
+-fi
+-if [[ -n "$CHR_CODECS_VER" ]] && [ "$CHR_CODECS_VER" -ge "2564" ]; then
+-  # Seperate libffmpeg.so from the rest of the libs, as we do not want to prefer
+-  # the others to our own.
+-  VIVALDI_LOCAL_LIBS="$HOME/.local/lib/vivaldi"
+-  if [ ! -r "$VIVALDI_LOCAL_LIBS/libffmpeg.so" ]; then
+-    mkdir -p "$VIVALDI_LOCAL_LIBS"
+-    ln -fs "$LIBFFMPEG_PATH/libffmpeg.so" "$VIVALDI_LOCAL_LIBS/libffmpeg.so"
++CODECS_DIR="$(rpm -ql @PKG_FFMPEG@ | grep -m1 "\.so" | xargs dirname)"
++if [[ -n "$CODECS_DIR" && -d "$CODECS_DIR" ]]; then
++  CODECS_VERSION="$(rpm -q --qf '%{VERSION}' chromium | awk 'BEGIN{FS="."}{print $1 * 1000000 + $2 * 1000 + $3}')"
++  if [[ -n "$CODECS_VERSION" && "$CODECS_VERSION" -ge "48002564" ]]; then
++    FFMPEG_LD_LIBRARY_PATH=":$CODECS_DIR"
+   fi
+-  FFMPEG_LD_LIBRARY_PATH=":$VIVALDI_LOCAL_LIBS"
+ fi
+ 
+ # Set LD_LIBRARY_PATH to prefer our libs, excluding $HERE/lib/libffmpeg.so if
+ # an alternative ffmpeg was found.
+-if [[ -n "$LD_LIBRARY_PATH" ]]; then
+-  LD_LIBRARY_PATH="$HERE$FFMPEG_LD_LIBRARY_PATH:$HERE/lib:$LD_LIBRARY_PATH"
+-else
+-  LD_LIBRARY_PATH="$HERE$FFMPEG_LD_LIBRARY_PATH:$HERE/lib"
+-fi
++LD_LIBRARY_PATH="$HERE$FFMPEG_LD_LIBRARY_PATH:$HERE/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
++
+ export LD_LIBRARY_PATH
+ 
+ export CHROME_VERSION_EXTRA="stable"
+@@ -98,12 +71,45 @@
+ exec > >(exec cat)
+ exec 2> >(exec cat >&2)
+ 
++PEPPER_PATH="@LIBDIR@/chromium/PepperFlash/libpepflashplayer.so"
++if [[ -n "$PEPPER_PATH" && -f "$PEPPER_PATH" ]]; then
++  FLASH_PATH="$PEPPER_PATH"
++  FLASH_VERSION="$(grep -ao -m1 "LNX [,0-9]\+" $PEPPER_PATH | sed 's/[^0-9]\+//;s/,/./g')"
++fi
++
++# The setuid permission set on sandbox
++VIVALDI_SANDBOX_FILE="$HERE/@VIVALDI_SANDBOX_FILE@"
++VIVALDI_FLAGS="${VIVALDI_USER_FLAGS:-$VIVALDI_FLAGS}"
++if which xdg-su &> /dev/null; then
++  if [[ "$VIVALDI_FLAGS" =~ 'disable-setuid-sandbox' || "$@" =~ 'disable-setuid-sandbox' ]]; then
++    if [[ -u "$VIVALDI_SANDBOX_FILE" ]]; then
++      $xMESSAGE "Removing the setuid permission on sandbox"
++      xdg-su -c "chmod u-s $VIVALDI_SANDBOX_FILE" &> /dev/null || exit $?
++    fi
++  elif [[ ! -u "$VIVALDI_SANDBOX_FILE" ]]; then
++    $xMESSAGE "Setting the setuid permission on sandbox"
++    xdg-su -c "chmod u+s $VIVALDI_SANDBOX_FILE" &> /dev/null || exit $?
++  fi
++fi
++
++VIVALDI_FLAGS="${VIVALDI_FLAGS//--disable-setuid-sandbox/}"
++if [[ ! -u "$VIVALDI_SANDBOX_FILE" ]]; then
++  VIVALDI_FLAGS="$VIVALDI_FLAGS --disable-setuid-sandbox"
++fi
++
++export VIVALDI_FLAGS="$VIVALDI_FLAGS"
++export VIVALDI_DATA_DIR="${VIVALDI_USER_DATA_DIR:-$VIVALDI_DATA_DIR}"
++
+ # Make sure that the profile directory specified in the environment, if any,
+ # overrides the default.
+-if [[ -n "$CHROME_USER_DATA_DIR" ]]; then
++if [[ -n "$VIVALDI_DATA_DIR" ]]; then
+   # Note: exec -a below is a bashism.
+   exec -a "$0" "$HERE/vivaldi-bin"  \
+-    --user-data-dir="$CHROME_USER_DATA_DIR" "$@"
++    --user-data-dir="$VIVALDI_DATA_DIR" \
++    --ppapi-flash-path=$FLASH_PATH --ppapi-flash-version=$FLASH_VERSION $VIVALDI_FLAGS \
++    "$@"
+ else
+-  exec -a "$0" "$HERE/vivaldi"-bin  "$@"
++  exec -a "$0" "$HERE/vivaldi"-bin  \
++    --ppapi-flash-path=$FLASH_PATH --ppapi-flash-version=$FLASH_VERSION $VIVALDI_FLAGS \
++    "$@"
+ fi

vivaldi-1.8.770.50_launcher.patch Deleted

@@ -1,112 +0,0 @@
-diff -ruN vivaldi-stable-1.8.770.50.orig/opt/vivaldi/vivaldi vivaldi-stable-1.8.770.50/opt/vivaldi/vivaldi
---- vivaldi-stable-1.8.770.50.orig/opt/vivaldi/vivaldi	2017-03-29 18:43:04.849879591 +0300
-+++ vivaldi-stable-1.8.770.50/opt/vivaldi/vivaldi	2017-03-29 18:51:02.463220087 +0300
-@@ -9,6 +9,8 @@
- 
- HERE="`dirname "$CHROME_WRAPPER"`"
- 
-+. @VIVALDI_CONFIG@
-+
- # We include some xdg utilities next to the binary, and we want to prefer them
- # over the system versions when we know the system versions are very old. We
- # detect whether the system xdg utilities are sufficiently new to be likely to
-@@ -26,40 +28,18 @@
- fi
- 
- # Find libffmpeg.so with additional codecs.
--checkffmpeg () {
--  if [ "$VIVALDI_FFMPEG_FOUND" = "NO" ]; then
--    if [[ -n "$2" ]] && [ -e "$2" ] || [[ -z "$2" ]]; then
--      # Chromium's FFMpeg version N-82746-g6bb7ea7 is the oldest known working version
--      # chromium/third_party/ffmpeg/chromium/config/Chromium/linux/x64/libavutil/ffversion.h
--      if [ -r "$1" ]; then
--        if [ `grep -aom1 'FFmpeg version N-[0-9]\+-' "$1" | cut -f2 -d-` -ge "82746" ]; then
--          if [[ -n "$LD_PRELOAD" ]]; then
--            export LD_PRELOAD="$LD_PRELOAD:$1"
--          else
--            export LD_PRELOAD="$1"
--          fi
--          export VIVALDI_FFMPEG_FOUND=YES
--        fi
--      fi
--    fi
-+FFMPEG_LIB="$(rpm -ql @PKG_FFMPEG@ | grep 'ffmpeg.so')"
-+if [[ -n "$FFMPEG_LIB" && -e "$FFMPEG_LIB" ]]; then
-+  FFMPEG_VERSION="$(grep -aom1 'FFmpeg version N-[0-9]\+-' "$FFMPEG_LIB" | cut -f2 -d-)"
-+  if [[ -n "$FFMPEG_VERSION" && "$FFMPEG_VERSION" -ge "82746" ]]; then
-+    FFMPEG_LD_LIBRARY_PATH=":${FFMPEG_LIB%/*}"
-   fi
--}
-+fi
- 
--# Account for Debian multiarch directories
--case "`uname -m`" in
--  x86_64) DEBARCH="x86_64-linux-gnu" ;;
--    i?86) DEBARCH="i386-linux-gnu" ;;
--esac
--
--# Check for libs in order that they are most likely to appear.
--# Where possible, use other files/directories to confirm it's the correct variant.
--VIVALDI_FFMPEG_FOUND=NO
--checkffmpeg "/usr/lib/$DEBARCH/oxide-qt/libffmpeg.so" '/usr/share/doc/oxideqt-codecs-extra'
--checkffmpeg '/usr/lib/chromium-browser/libffmpeg.so' '/usr/share/doc/chromium-codecs-ffmpeg-extra'
--
--# Check if the user has manually placed suitable libs.
--checkffmpeg "$HOME/.local/lib/vivaldi/libffmpeg.so"
--checkffmpeg "$HERE/libffmpeg.so"
-+# Set LD_LIBRARY_PATH to prefer our libs, excluding $HERE/lib/libffmpeg.so if
-+# an alternative ffmpeg was found.
-+LD_LIBRARY_PATH="$HERE$FFMPEG_LD_LIBRARY_PATH:$HERE/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
-+export LD_LIBRARY_PATH
- 
- export CHROME_VERSION_EXTRA="stable"
- 
-@@ -72,12 +52,45 @@
- exec > >(exec cat)
- exec 2> >(exec cat >&2)
- 
-+PEPPER_PATH="@LIBDIR@/chromium/PepperFlash/libpepflashplayer.so"
-+if [[ -n "$PEPPER_PATH" && -f "$PEPPER_PATH" ]]; then
-+  FLASH_PATH="$PEPPER_PATH"
-+  FLASH_VERSION="$(grep -ao -m1 "LNX [,0-9]\+" $PEPPER_PATH | sed 's/[^0-9]\+//;s/,/./g')"
-+fi
-+
-+# The setuid permission set on sandbox
-+VIVALDI_SANDBOX_FILE="$HERE/@VIVALDI_SANDBOX_FILE@"
-+VIVALDI_FLAGS="${VIVALDI_USER_FLAGS:-$VIVALDI_FLAGS}"
-+if which xdg-su &> /dev/null; then
-+  if [[ "$VIVALDI_FLAGS" =~ 'disable-setuid-sandbox' || "$@" =~ 'disable-setuid-sandbox' ]]; then
-+    if [[ -u "$VIVALDI_SANDBOX_FILE" ]]; then
-+      echo "Removing the setuid permission on sandbox"
-+      xdg-su -c "chmod u-s $VIVALDI_SANDBOX_FILE" &> /dev/null || exit $?
-+    fi
-+  elif [[ ! -u "$VIVALDI_SANDBOX_FILE" ]]; then
-+    echo "Setting the setuid permission on sandbox"
-+    xdg-su -c "chmod u+s $VIVALDI_SANDBOX_FILE" &> /dev/null || exit $?
-+  fi
-+fi
-+
-+VIVALDI_FLAGS="${VIVALDI_FLAGS//--disable-setuid-sandbox/}"
-+if [[ ! -u "$VIVALDI_SANDBOX_FILE" ]]; then
-+  VIVALDI_FLAGS="$VIVALDI_FLAGS --disable-setuid-sandbox"
-+fi
-+
-+export VIVALDI_FLAGS="$VIVALDI_FLAGS"
-+export VIVALDI_DATA_DIR="${VIVALDI_USER_DATA_DIR:-$VIVALDI_DATA_DIR}"
-+
- # Make sure that the profile directory specified in the environment, if any,
- # overrides the default.
--if [[ -n "$CHROME_USER_DATA_DIR" ]]; then
-+if [[ -n "$VIVALDI_DATA_DIR" ]]; then
-   # Note: exec -a below is a bashism.
-   exec -a "$0" "$HERE/vivaldi-bin"  \
--    --user-data-dir="$CHROME_USER_DATA_DIR" "$@"
-+    --user-data-dir="$VIVALDI_DATA_DIR" \
-+    --ppapi-flash-path=$FLASH_PATH --ppapi-flash-version=$FLASH_VERSION $VIVALDI_FLAGS \
-+    "$@"
- else
--  exec -a "$0" "$HERE/vivaldi"-bin  "$@"
-+  exec -a "$0" "$HERE/vivaldi"-bin  \
-+    --ppapi-flash-path=$FLASH_PATH --ppapi-flash-version=$FLASH_VERSION $VIVALDI_FLAGS \
-+    "$@"
- fi

vivaldi-stable-1.8.770.54-1.i386.rpm -> vivaldi-stable-1.7.735.46-1.i386.rpm Changed

vivaldi-stable-1.8.770.54-1.x86_64.rpm -> vivaldi-stable-1.7.735.46-1.x86_64.rpm Changed

Build Results
RPM Lint

Refresh

Comments for request 3770 0

Request History

awissu created request over 7 years ago

awissu accepted request over 7 years ago

Please add a comment