[packages/vivaldi] up to Vivaldi Beta 2 (1.0.344.37)
glen
glen at pld-linux.org
Tue Jan 19 09:06:46 CET 2016
commit 9cd662d5a8a2464c32f7ce97d97a43b145cd12f2
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Tue Jan 19 10:01:45 2016 +0200
up to Vivaldi Beta 2 (1.0.344.37)
bin.patch | 43 -------------------------------------------
desktop.patch | 8 ++++----
vivaldi.spec | 18 ++++++++----------
3 files changed, 12 insertions(+), 57 deletions(-)
---
diff --git a/vivaldi.spec b/vivaldi.spec
index d175c18..e5b4173 100644
--- a/vivaldi.spec
+++ b/vivaldi.spec
@@ -1,17 +1,16 @@
Summary: An advanced browser made with the power user in mind
Name: vivaldi
-Version: 1.0.264.3
-Release: 0.2
+Version: 1.0.344.37
+Release: 0.1
License: Vivaldi
Group: X11/Applications/Networking
-Source0: https://vivaldi.com/download/snapshot/%{name}-snapshot_%{version}-1_i386.deb
+Source0: https://vivaldi.com/download/stable/%{name}-beta_1.0.344.37-1_amd64.deb
# NoSource0-md5: 1a573721c1e50a8111972de82325aa60
NoSource: 0
-Source1: https://vivaldi.com/download/snapshot/%{name}-snapshot_%{version}-1_amd64.deb
-# NoSource1-md5: a0c890ed2701dfcb89e8bc2f226afcc3
+Source1: https://vivaldi.com/download/stable/%{name}-beta_1.0.344.37-1_amd64.deb
+# NoSource1-md5: 571fed995097dfb9d13e1d6a535e2c14
NoSource: 1
Source2: find-lang.sh
-Patch0: bin.patch
Patch1: desktop.patch
URL: https://vivaldi.com/
BuildRequires: hicolor-icon-theme
@@ -80,11 +79,10 @@ tar xf data.tar.xz && rm data.tar.xz
version=$(awk '/Version:/{print $2}' control)
test $version = %{version}-1
-mv opt/%{name}-snapshot/* .
-mv %{name}{-snapshot,}
-mv usr/share/applications/vivaldi-snapshot.desktop %{name}.desktop
+mv opt/%{name}-beta/* .
+mv %{name}{-beta,}
+mv usr/share/applications/vivaldi-beta.desktop %{name}.desktop
-%patch0 -p1
%patch1 -p1
%{__sed} -e 's, at localedir@,%{_datadir}/%{name},' %{_sourcedir}/find-lang.sh > find-lang.sh
diff --git a/bin.patch b/bin.patch
deleted file mode 100644
index fe24986..0000000
--- a/bin.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- vivaldi-1.0.252.3/vivaldi 2015-09-06 01:01:12.612961576 +0300
-+++ vivaldi-1.0.252.3/vivaldi 2015-09-06 00:56:58.047117862 +0300
-@@ -60,9 +60,9 @@
-
- # Automagically migrate user data directory.
- # TODO(phajdan.jr): Remove along with migration code in the browser for M33.
--if [[ -n "${XDG_CONFIG_HOME:-${HOME}/.config}/vivaldi-snapshot" ]]; then
-- if [[ ! -d "${XDG_CONFIG_HOME:-${HOME}/.config}/vivaldi-snapshot" ]]; then
-- "$HERE/vivaldi-bin" "--migrate-data-dir-for-sxs=${XDG_CONFIG_HOME:-${HOME}/.config}/vivaldi-snapshot" \
-+if [[ -n "${XDG_CONFIG_HOME:-${HOME}/.config}/vivaldi" ]]; then
-+ if [[ ! -d "${XDG_CONFIG_HOME:-${HOME}/.config}/vivaldi" ]]; then
-+ "$HERE/vivaldi-bin" "--migrate-data-dir-for-sxs=${XDG_CONFIG_HOME:-${HOME}/.config}/vivaldi" \
- --enable-logging=stderr --log-level=0
- fi
- fi
-@@ -73,7 +73,11 @@
- exec > >(exec cat)
- exec 2> >(exec cat >&2)
-
--if [ -f "/opt/google/chrome/PepperFlash/libpepflashplayer.so" ]; then
-+if [ -f "/usr/lib/browser-plugins/PepperFlash/libpepflashplayer.so" ]; then
-+ FLASH_PATH="/usr/lib/browser-plugins/PepperFlash/libpepflashplayer.so" # pld 32-bit
-+elif [ -f "/usr/lib64/browser-plugins/PepperFlash/libpepflashplayer.so" ]; then
-+ FLASH_PATH="/usr/lib64/browser-plugins/PepperFlash/libpepflashplayer.so" # pld 64-bit
-+elif [ -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
-@@ -90,12 +94,12 @@
- # overrides the default.
- if [[ -n "$CHROME_USER_DATA_DIR" ]]; then
- # Note: exec -a below is a bashism.
-- exec -a "$0" "$HERE/vivaldi-bin" --user-data-dir="${XDG_CONFIG_HOME:-${HOME}/.config}/vivaldi-snapshot" \
-+ exec -a "$0" "$HERE/vivaldi-bin" --user-data-dir="${XDG_CONFIG_HOME:-${HOME}/.config}/vivaldi" \
- --user-data-dir="$CHROME_USER_DATA_DIR" \
- --ppapi-flash-path=$FLASH_PATH --ppapi-flash-version=$FLASH_VERSION \
- "$@"
- else
-- exec -a "$0" "$HERE/vivaldi"-bin --user-data-dir="${XDG_CONFIG_HOME:-${HOME}/.config}/vivaldi-snapshot" \
-+ exec -a "$0" "$HERE/vivaldi"-bin --user-data-dir="${XDG_CONFIG_HOME:-${HOME}/.config}/vivaldi" \
- --ppapi-flash-path=$FLASH_PATH --ppapi-flash-version=$FLASH_VERSION \
- "$@"
- fi
diff --git a/desktop.patch b/desktop.patch
index bc64701..23bc5a3 100644
--- a/desktop.patch
+++ b/desktop.patch
@@ -1,13 +1,13 @@
---- vivaldi-1.0.252.3/vivaldi.desktop~ 2015-08-21 05:26:28.000000000 +0300
-+++ vivaldi-1.0.252.3/vivaldi.desktop 2015-09-06 00:58:22.987958860 +0300
+--- vivaldi-1.0.344.37/vivaldi.desktop~ 2015-12-16 14:48:51.000000000 +0200
++++ vivaldi-1.0.344.37/vivaldi.desktop 2016-01-19 10:05:22.971946999 +0200
@@ -105,9 +105,9 @@
Comment[zh_CN]=访问互联网
Comment[zh_HK]=連線到網際網路
Comment[zh_TW]=連線到網際網路
--Exec=/usr/bin/vivaldi-snapshot %U
+-Exec=/usr/bin/vivaldi-beta %U
+Exec=/usr/bin/vivaldi %U
Terminal=false
--Icon=vivaldi-snapshot
+-Icon=vivaldi-beta
+Icon=vivaldi
Type=Application
Categories=Network;WebBrowser;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vivaldi.git/commitdiff/9cd662d5a8a2464c32f7ce97d97a43b145cd12f2
More information about the pld-cvs-commit
mailing list