Request 2805 (accepted)

Overview

Request 2805 (accepted)

No description set

Created by awissu over 8 years ago
In state accepted
Package maintainer: awissu

Submit vivaldi

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

vivaldi.changes Changed

vivaldi.spec Changed

@@ -23,7 +23,7 @@
 %define pepper_flash_lib %(rpm -ql chromium-pepper-flash | grep "flashplayer.so")
 %endif
 Name:           vivaldi
-Version:        1.2.490.39
+Version:        1.2.490.43
 Release:        0
 Summary:        Powerful and Personal Web Browser
 License:        SUSE-Freeware
@@ -33,16 +33,12 @@
 Source1:        https://downloads.vivaldi.com/stable/%{name}-stable-%{version}-1.x86_64.rpm
 Source2:        vivaldi.config.in
 # PATCH-FIX-OPENSUSE run.patch avvissu@yandex.by -- Change the startup script
-Patch0:         vivaldi-stable-1.2.490.39_run.patch
+Patch0:         vivaldi-stable-1.2.490.43_run.patch
 BuildRequires:  build
 BuildRequires:  chrpath
 BuildRequires:  fdupes
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  update-desktop-files
-%ifarch %ix86
-# Not enough memory for rpmlint
-BuildRequires:  -rpmlint-Factory
-%endif
 Recommends:     chromium-pepper-flash
 Recommends:     chromium-widevinecdm-plugin
 Suggests:       chromium-ffmpeg
@@ -56,6 +52,10 @@
 BuildRequires:  chromium-widevinecdm-plugin
 %endif
 %endif
+%ifarch %ix86
+# Not enough memory for rpmlint
+BuildRequires:  -rpmlint-Factory
+%endif
 
 %description
 Vivaldi browser is made with power users in mind by people who love the Web.
@@ -72,12 +72,13 @@
 %patch0 -p1
 
 for file in opt/%{name}/%{name} %{SOURCE2}; do
-    sed -e 's|@VIVALDI_CONFIG@|%{_sysconfdir}/default/%{name}|g' \
+    sed -e 's|@LIBDIR@|%{_libdir}|g' \
+        -e 's|@VIVALDI_CONFIG@|%{_sysconfdir}/default/%{name}|g' \
         -e 's|@CODECS_DIR@|%{?codecs_dir}|g' \
         -e 's|@CODECS_VER@|%{?codecs_ver}|g' \
         -e 's|@PEPPER_FLASH_LIB@|%{?pepper_flash_lib}|g' \
         -e 's|@VIVALDI_SANDBOX_FILE@|\./%{name}-sandbox|g' \
-        -e 's|@VIVALDI_SANDBOX_FLAGS@|--disable-setuid-sandbox|g' \
+        -e 's|@VIVALDI_USER_FLAGS@|--disable-setuid-sandbox|g' \
         -i $file
 done

vivaldi-stable-1.2.490.39_run.patch Deleted

@@ -1,128 +0,0 @@
-diff -U 3 -dHrN vivaldi-stable-1.2.490.39.orig/opt/vivaldi/vivaldi vivaldi-stable-1.2.490.39/opt/vivaldi/vivaldi
---- vivaldi-stable-1.2.490.39.orig/opt/vivaldi/vivaldi	2016-06-14 22:30:05.384526263 +0300
-+++ vivaldi-stable-1.2.490.39/opt/vivaldi/vivaldi	2016-06-15 01:44:57.282503254 +0300
-@@ -9,25 +9,25 @@
- 
- HERE="`dirname "$CHROME_WRAPPER"`"
- 
--# Check if the CPU supports SSE2. If not, try to pop up a dialog to explain the
--# problem and exit. Otherwise the browser will just crash with a SIGILL.
--# http://crbug.com/348761
--grep ^flags /proc/cpuinfo|grep -qs sse2
-+# Check for existence of needed config file
-+VIVALDI_CONF_FILE="@VIVALDI_CONFIG@"
-+test -r $VIVALDI_CONF_FILE
- if [ $? != 0 ]; then
--  SSE2_DEPRECATION_MSG="This computer cannot run Vivaldi because \
--its hardware is no longer supported."
-+  VIVALDI_CONF_MSG="$VIVALDI_CONF_FILE not existing."
-   if which zenity &> /dev/null; then
--    zenity --warning --text="$SSE2_DEPRECATION_MSG"
-+    zenity --warning --text="$VIVALDI_CONF_MSG"
-   elif which gmessage &> /dev/null; then
--    gmessage "$SSE2_DEPRECATION_MSG"
-+    gmessage "$VIVALDI_CONF_MSG"
-   elif which xmessage &> /dev/null; then
--    xmessage "$SSE2_DEPRECATION_MSG"
-+    xmessage "$VIVALDI_CONF_MSG"
-   else
--    echo "$SSE2_DEPRECATION_MSG" 1>&2
-+    echo "$VIVALDI_CONF_MSG" 1>&2
-   fi
-   exit 1
- 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
- # detect whether the system xdg utilities are sufficiently new to be likely to
-@@ -45,20 +45,22 @@
- fi
- 
- # Find libffmpeg.so with additional codecs.
--CHR_CODECS_CH="/usr/share/doc/chromium-codecs-ffmpeg-extra/changelog.Debian.gz"
--if [ -r $CHR_CODECS_CH ]; then
--  CHR_CODECS_VER=$(gzip -cd $CHR_CODECS_CH |
--    sed -n '1s/chromium-browser ($\([0-9]\+\.$\{3\}\).*/\1/p')
--  if [ "$CHR_CODECS_VER" = "51.0.2704." ] || [ "$CHR_CODECS_VER" = "50.0.2661." ] || [ "$CHR_CODECS_VER" = "49.0.2623." ]; then
--    FFMPEG_LD_LIBRARY_PATH=":/usr/lib/chromium-browser/libs"
-+CHR_CODECS_CH="@CODECS_DIR@"
-+if [ -d $CHR_CODECS_CH ]; then
-+  CHR_CODECS_VER="@CODECS_VER@"
-+  if [[ "$CHR_CODECS_VER" =~ "51.0.2704" ]] || [[ "$CHR_CODECS_VER" =~ "50.0.2661" ]] || [[ "$CHR_CODECS_VER" =~ "49.0.2623" ]]; then
-+    FFMPEG_LD_LIBRARY_PATH=":$CHR_CODECS_CH"
-   fi
-+else 
-+  FFMPEG_LD_LIBRARY_PATH=":$HERE/lib"
- 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"
-+  LD_LIBRARY_PATH="$HERE$FFMPEG_LD_LIBRARY_PATH$:$LD_LIBRARY_PATH"
- else
--  LD_LIBRARY_PATH="$HERE$FFMPEG_LD_LIBRARY_PATH:$HERE/lib"
-+  LD_LIBRARY_PATH="$HERE$FFMPEG_LD_LIBRARY_PATH"
- fi
- export LD_LIBRARY_PATH
- 
-@@ -73,37 +75,40 @@
- exec > >(exec cat)
- exec 2> >(exec cat >&2)
- 
--if [ -f "/opt/google/chrome/PepperFlash/libpepflashplayer.so" ]; then
--  FLASH_PATH="/opt/google/chrome/PepperFlash/libpepflashplayer.so" # google
--elif [ -f "/usr/lib/pepperflashplugin-nonfree/libpepflashplayer.so" ]; then
--  FLASH_PATH="/usr/lib/pepperflashplugin-nonfree/libpepflashplayer.so" # debian/ubuntu
--elif [ -f "/usr/lib/PepperFlash/libpepflashplayer.so" ]; then
--  FLASH_PATH="/usr/lib/PepperFlash/libpepflashplayer.so" # arch/slack
-+if [ -f "@PEPPER_FLASH_LIB@" ]; then
-+  FLASH_PATH="@PEPPER_FLASH_LIB@"
- elif [ -f "/usr/lib/chromium/PepperFlash/libpepflashplayer.so" ]; then
-   FLASH_PATH="/usr/lib/chromium/PepperFlash/libpepflashplayer.so" # openSuse 32-bit
- elif [ -f "/usr/lib64/chromium/PepperFlash/libpepflashplayer.so" ]; then
-   FLASH_PATH="/usr/lib64/chromium/PepperFlash/libpepflashplayer.so" # openSuse 64-bit
--elif [ -f "/usr/lib/pepflashplugin-installer/libpepflashplayer.so" ]; then
--  FLASH_PATH="/usr/lib/pepflashplugin-installer/libpepflashplayer.so" # ppa:skunk/pepper-flash
--elif [ -f "/usr/lib/chromium-browser/PepperFlash/libpepflashplayer.so" ]; then
--  FLASH_PATH="/usr/lib/chromium-browser/PepperFlash/libpepflashplayer.so" # rosa/mandriva 32-bit
--elif [ -f "/usr/lib64/chromium-browser/PepperFlash/libpepflashplayer.so" ]; then
--  FLASH_PATH="/usr/lib64/chromium-browser/PepperFlash/libpepflashplayer.so" # rosa/mandriva 64-bit
- fi
- if [ -f $FLASH_PATH ]; then
-   FLASH_VERSION=`grep -m 1 -a -o "LNX [[:digit:]]\+,[[:digit:]]\+,[[:digit:]]\+,[[:digit:]]\+" $FLASH_PATH | cut -c 5- | sed -e "s/,/./g"`
- fi
- 
-+# The setuid permission set on sandbox
-+if [[ "$VIVALDI_USER_FLAGS" =~ 'enable-setuid-sandbox' ]] && [[ ! "$VIVALDI_USER_FLAGS" =~ 'disable-setuid-sandbox' ]]; then
-+    VIVALDI_USER_FLAGS=$(echo $VIVALDI_USER_FLAGS | sed 's/--enable-setuid-sandbox//')
-+    if [[ ! -u @VIVALDI_SANDBOX_FILE@ ]]; then
-+        if which xdg-su &> /dev/null; then
-+           xdg-su -c "chmod u+s @VIVALDI_SANDBOX_FILE@" &> /dev/null
-+        fi
-+    fi
-+elif [[ -u @VIVALDI_SANDBOX_FILE@ ]]; then
-+    if which xdg-su &> /dev/null; then
-+        xdg-su -c "chmod u-s @VIVALDI_SANDBOX_FILE@" &> /dev/null
-+    fi
-+fi
-+
- # Make sure that the profile directory specified in the environment, if any,
- # overrides the default.
--if [[ -n "$CHROME_USER_DATA_DIR" ]]; then
--  # Note: exec -a below is a bashism.
-+if [[ -n "$VIVALDI_USER_DATA_DIR" ]]; then
-   exec -a "$0" "$HERE/vivaldi-bin"  \
--    --user-data-dir="$CHROME_USER_DATA_DIR" \
--    --ppapi-flash-path=$FLASH_PATH --ppapi-flash-version=$FLASH_VERSION \
-+    --user-data-dir="$VIVALDI_USER_DATA_DIR" \
-+    --ppapi-flash-path=$FLASH_PATH --ppapi-flash-version=$FLASH_VERSION $VIVALDI_USER_FLAGS \
-     "$@"
- else
-   exec -a "$0" "$HERE/vivaldi"-bin  \
--    --ppapi-flash-path=$FLASH_PATH --ppapi-flash-version=$FLASH_VERSION \
-+    --ppapi-flash-path=$FLASH_PATH --ppapi-flash-version=$FLASH_VERSION $VIVALDI_USER_FLAGS \
-     "$@"
- fi

vivaldi-stable-1.2.490.43_run.patch Added

@@ -0,0 +1,138 @@
+diff -U 3 -dHrN vivaldi-stable-1.2.490.43.orig/opt/vivaldi/vivaldi vivaldi-stable-1.2.490.43/opt/vivaldi/vivaldi
+--- vivaldi-stable-1.2.490.43.orig/opt/vivaldi/vivaldi	2016-07-07 17:06:12.741177921 +0300
++++ vivaldi-stable-1.2.490.43/opt/vivaldi/vivaldi	2016-07-07 17:12:01.583911206 +0300
+@@ -9,25 +9,25 @@
+ 
+ HERE="`dirname "$CHROME_WRAPPER"`"
+ 
+-# Check if the CPU supports SSE2. If not, try to pop up a dialog to explain the
+-# problem and exit. Otherwise the browser will just crash with a SIGILL.
+-# http://crbug.com/348761
+-grep ^flags /proc/cpuinfo|grep -qs sse2
++# Check for existence of needed config file
++VIVALDI_CONF_FILE="@VIVALDI_CONFIG@"
++if which zenity &> /dev/null; then
++    MESSAGE="$(which zenity)"
++elif which gmessage &> /dev/null; then
++    MESSAGE="$(which gmessage)"
++elif which xmessage &> /dev/null; then
++    MESSAGE="$(which xmessage)"
++else
++    MESSAGE="echo"
++fi
++test -r $VIVALDI_CONF_FILE
+ if [ $? != 0 ]; then
+-  SSE2_DEPRECATION_MSG="This computer cannot run Vivaldi because \
+-its hardware is no longer supported."
+-  if which zenity &> /dev/null; then
+-    zenity --warning --text="$SSE2_DEPRECATION_MSG"
+-  elif which gmessage &> /dev/null; then
+-    gmessage "$SSE2_DEPRECATION_MSG"
+-  elif which xmessage &> /dev/null; then
+-    xmessage "$SSE2_DEPRECATION_MSG"
+-  else
+-    echo "$SSE2_DEPRECATION_MSG" 1>&2
+-  fi
+-  exit 1
++    $MESSAGE "$VIVALDI_CONF_FILE not existing."
++      exit 1
+ 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
+ # detect whether the system xdg utilities are sufficiently new to be likely to
+@@ -45,20 +45,22 @@
+ fi
+ 
+ # Find libffmpeg.so with additional codecs.
+-CHR_CODECS_CH="/usr/share/doc/chromium-codecs-ffmpeg-extra/changelog.Debian.gz"
+-if [ -r $CHR_CODECS_CH ]; then
+-  CHR_CODECS_VER=$(gzip -cd $CHR_CODECS_CH |
+-    sed -n '1s/chromium-browser ($\([0-9]\+\.$\{3\}\).*/\1/p')
+-  if [ "$CHR_CODECS_VER" = "51.0.2704." ] || [ "$CHR_CODECS_VER" = "50.0.2661." ] || [ "$CHR_CODECS_VER" = "49.0.2623." ]; then
+-    FFMPEG_LD_LIBRARY_PATH=":/usr/lib/chromium-browser/libs"
++CHR_CODECS_CH="@CODECS_DIR@"
++if [ -d $CHR_CODECS_CH ]; then
++  CHR_CODECS_VER="@CODECS_VER@"
++  if [[ "$CHR_CODECS_VER" =~ "51.0.2704" ]] || [[ "$CHR_CODECS_VER" =~ "50.0.2661" ]] || [[ "$CHR_CODECS_VER" =~ "49.0.2623" ]]; then
++    FFMPEG_LD_LIBRARY_PATH=":$CHR_CODECS_CH"
+   fi
++else 
++  FFMPEG_LD_LIBRARY_PATH=":$HERE/lib"
+ 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"
++  LD_LIBRARY_PATH="$HERE$FFMPEG_LD_LIBRARY_PATH$:$LD_LIBRARY_PATH"
+ else
+-  LD_LIBRARY_PATH="$HERE$FFMPEG_LD_LIBRARY_PATH:$HERE/lib"
++  LD_LIBRARY_PATH="$HERE$FFMPEG_LD_LIBRARY_PATH"
+ fi
+ export LD_LIBRARY_PATH
+ 
+@@ -73,37 +75,40 @@
+ exec > >(exec cat)
+ exec 2> >(exec cat >&2)
+ 
+-if [ -f "/opt/google/chrome/PepperFlash/libpepflashplayer.so" ]; then
+-  FLASH_PATH="/opt/google/chrome/PepperFlash/libpepflashplayer.so" # google
+-elif [ -f "/usr/lib/pepperflashplugin-nonfree/libpepflashplayer.so" ]; then
+-  FLASH_PATH="/usr/lib/pepperflashplugin-nonfree/libpepflashplayer.so" # debian/ubuntu
+-elif [ -f "/usr/lib/PepperFlash/libpepflashplayer.so" ]; then
+-  FLASH_PATH="/usr/lib/PepperFlash/libpepflashplayer.so" # arch/slack
+-elif [ -f "/usr/lib/chromium/PepperFlash/libpepflashplayer.so" ]; then
+-  FLASH_PATH="/usr/lib/chromium/PepperFlash/libpepflashplayer.so" # openSuse 32-bit
+-elif [ -f "/usr/lib64/chromium/PepperFlash/libpepflashplayer.so" ]; then
+-  FLASH_PATH="/usr/lib64/chromium/PepperFlash/libpepflashplayer.so" # openSuse 64-bit
+-elif [ -f "/usr/lib/pepflashplugin-installer/libpepflashplayer.so" ]; then
+-  FLASH_PATH="/usr/lib/pepflashplugin-installer/libpepflashplayer.so" # ppa:skunk/pepper-flash
+-elif [ -f "/usr/lib/chromium-browser/PepperFlash/libpepflashplayer.so" ]; then
+-  FLASH_PATH="/usr/lib/chromium-browser/PepperFlash/libpepflashplayer.so" # rosa/mandriva 32-bit
+-elif [ -f "/usr/lib64/chromium-browser/PepperFlash/libpepflashplayer.so" ]; then
+-  FLASH_PATH="/usr/lib64/chromium-browser/PepperFlash/libpepflashplayer.so" # rosa/mandriva 64-bit
++if [ -f "@PEPPER_FLASH_LIB@" ]; then
++  FLASH_PATH="@PEPPER_FLASH_LIB@"
++elif [ -f "@LIBDIR@/chromium/PepperFlash/libpepflashplayer.so" ]; then
++  FLASH_PATH="@LIBDIR@/chromium/PepperFlash/libpepflashplayer.so"
+ fi
+ if [ -f $FLASH_PATH ]; then
+   FLASH_VERSION=`grep -m 1 -a -o "LNX [[:digit:]]\+,[[:digit:]]\+,[[:digit:]]\+,[[:digit:]]\+" $FLASH_PATH | cut -c 5- | sed -e "s/,/./g"`
+ fi
+ 
++# The setuid permission set on sandbox
++if [[ "$VIVALDI_USER_FLAGS" =~ 'enable-setuid-sandbox' ]] && [[ ! "$VIVALDI_USER_FLAGS" =~ 'disable-setuid-sandbox' ]]; then
++    VIVALDI_USER_FLAGS=$(echo $VIVALDI_USER_FLAGS | sed 's/--enable-setuid-sandbox//')
++    if [[ ! -u @VIVALDI_SANDBOX_FILE@ ]]; then
++        if which xdg-su &> /dev/null; then
++            $MESSAGE "Setting the setgid permission on sandbox"
++            xdg-su -c "chmod u+s @VIVALDI_SANDBOX_FILE@" &> /dev/null
++        fi
++    fi
++elif [[ -u @VIVALDI_SANDBOX_FILE@ ]]; then
++    if which xdg-su &> /dev/null; then
++        $MESSAGE "Removing the setgid permission on sandbox"
++        xdg-su -c "chmod u-s @VIVALDI_SANDBOX_FILE@" &> /dev/null
++    fi
++fi
++
+ # Make sure that the profile directory specified in the environment, if any,
+ # overrides the default.
+-if [[ -n "$CHROME_USER_DATA_DIR" ]]; then
+-  # Note: exec -a below is a bashism.
++if [[ -n "$VIVALDI_USER_DATA_DIR" ]]; then
+   exec -a "$0" "$HERE/vivaldi-bin"  \
+-    --user-data-dir="$CHROME_USER_DATA_DIR" \
+-    --ppapi-flash-path=$FLASH_PATH --ppapi-flash-version=$FLASH_VERSION \
++    --user-data-dir="$VIVALDI_USER_DATA_DIR" \
++    --ppapi-flash-path=$FLASH_PATH --ppapi-flash-version=$FLASH_VERSION $VIVALDI_USER_FLAGS \
+     "$@"
+ else
+   exec -a "$0" "$HERE/vivaldi"-bin  \
+-    --ppapi-flash-path=$FLASH_PATH --ppapi-flash-version=$FLASH_VERSION \
++    --ppapi-flash-path=$FLASH_PATH --ppapi-flash-version=$FLASH_VERSION $VIVALDI_USER_FLAGS \
+     "$@"
+ fi

vivaldi-stable-1.2.490.39-1.i386.rpm -> vivaldi-stable-1.2.490.43-1.i386.rpm Changed

vivaldi-stable-1.2.490.39-1.x86_64.rpm -> vivaldi-stable-1.2.490.43-1.x86_64.rpm Changed

vivaldi.config.in Changed

Build Results
RPM Lint

Refresh

Comments for request 2805 0

Request History

awissu created request over 8 years ago

awissu accepted request over 8 years ago

Please add a comment