Packman Build Service PMBS

Changes of Revision 4

vivaldi.changes Changed

vivaldi-stable-1.2.490.43_run.patch Changed

@@ -1,6 +1,6 @@
 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
+--- vivaldi-stable-1.2.490.43.orig/opt/vivaldi/vivaldi	2016-07-11 11:02:13.391676192 +0300
++++ vivaldi-stable-1.2.490.43/opt/vivaldi/vivaldi	2016-07-11 12:15:20.922846132 +0300
 @@ -9,25 +9,25 @@
  
  HERE="`dirname "$CHROME_WRAPPER"`"
@@ -35,7 +35,7 @@
 -  fi
 -  exit 1
 +    $MESSAGE "$VIVALDI_CONF_FILE not existing."
-+      exit 1
++    exit 1
  fi
  
 +. $VIVALDI_CONF_FILE
@@ -43,7 +43,7 @@
  # 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 @@
+@@ -45,20 +45,24 @@
  fi
  
  # Find libffmpeg.so with additional codecs.
@@ -53,11 +53,13 @@
 -    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_DIR="@CODECS_DIR@"
++if [ -n "$CHR_CODECS_DIR" ] && [ -d "$CHR_CODECS_DIR" ]; 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"
++  if [ -n "$CHR_CODECS_VER" ]; then
++    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_DIR"
++    fi
    fi
 +else 
 +  FFMPEG_LD_LIBRARY_PATH=":$HERE/lib"
@@ -74,7 +76,7 @@
  fi
  export LD_LIBRARY_PATH
  
-@@ -73,37 +75,40 @@
+@@ -73,37 +77,41 @@
  exec > >(exec cat)
  exec 2> >(exec cat >&2)
  
@@ -94,8 +96,9 @@
 -  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@"
++FLASH_PATH="@PEPPER_FLASH_LIB@"
++if [ -n "$FLASH_PATH" ]; then
++  FLASH_PATH="$FLASH_PATH"
 +elif [ -f "@LIBDIR@/chromium/PepperFlash/libpepflashplayer.so" ]; then
 +  FLASH_PATH="@LIBDIR@/chromium/PepperFlash/libpepflashplayer.so"
  fi