Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master binary grimoire by Ismael Luceno (3ba6eb468a49eb9cfee599084aeaaaafac1c359e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master binary grimoire by Ismael Luceno (3ba6eb468a49eb9cfee599084aeaaaafac1c359e)
  • Date: Wed, 18 Sep 2019 10:09:50 +0000

GIT changes to master binary grimoire by Ismael Luceno <ismael AT iodev.co.uk>:

bin-http/google-chrome-bin/DEPENDS | 6 ++----
bin-http/google-chrome-bin/HISTORY | 5 +++++
bin-http/google-chrome-bin/INSTALL | 20 ++------------------
bin-http/google-chrome-bin/PRE_BUILD | 14 +-------------
4 files changed, 10 insertions(+), 35 deletions(-)

New commits:
commit 3ba6eb468a49eb9cfee599084aeaaaafac1c359e
Author: Ismael Luceno <ismael AT iodev.co.uk>
Commit: Ismael Luceno <ismael AT iodev.co.uk>

google-chrome-bin: Fix installation

Remove -a flag for cp, it fails inside castfs for some reason.

Also, remove rare symlinks, as those aren't used by Chrome anymore.

commit 14a1c56c4b031d81f2b0c89572addcd51cd9ae3a
Author: Ismael Luceno <ismael AT iodev.co.uk>
Commit: Ismael Luceno <ismael AT iodev.co.uk>

google-chrome-bin: Simplify extraction

commit 23e5b1639d72f101e2a74c3e895c18de129d6367
Author: Ismael Luceno <ismael AT iodev.co.uk>
Commit: Ismael Luceno <ismael AT iodev.co.uk>

google-chrome-bin: Update dependencies

diff --git a/bin-http/google-chrome-bin/DEPENDS
b/bin-http/google-chrome-bin/DEPENDS
index 5517f65..eba6c92 100755
--- a/bin-http/google-chrome-bin/DEPENDS
+++ b/bin-http/google-chrome-bin/DEPENDS
@@ -3,9 +3,7 @@ depends dbus-glib &&
depends gconf2 &&
depends gtk+2 &&
depends nspr &&
-depends -sub "3.19.x" nss &&
+depends nss &&
depends rpm2targz &&
depends xdg-utils &&
-depends libxscrnsaver &&
-
-suggest_depends xulrunner '' '' 'for Mozilla plugins'
+depends libxscrnsaver
diff --git a/bin-http/google-chrome-bin/HISTORY
b/bin-http/google-chrome-bin/HISTORY
index ca646f6..3a54dd4 100644
--- a/bin-http/google-chrome-bin/HISTORY
+++ b/bin-http/google-chrome-bin/HISTORY
@@ -1,3 +1,8 @@
+2019-09-17 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS: updated dependencies
+ * PRE_BUILD: simplified extraction
+ * INSTALL: fixed installation; no more rare symlinks
+
2019-07-08 Eric Sandall <sandalle AT sourcemage.org>
* Set 64-bit for EM64T as well.
Sorcery devel (from git), glibc, gcc, or updated smgl-archspecs
changed
diff --git a/bin-http/google-chrome-bin/INSTALL
b/bin-http/google-chrome-bin/INSTALL
index f8d63ec..310978f 100755
--- a/bin-http/google-chrome-bin/INSTALL
+++ b/bin-http/google-chrome-bin/INSTALL
@@ -1,6 +1,6 @@
install -d -m 0755 $INSTALL_ROOT/opt/google &&
-cp -arv $SOURCE_DIRECTORY/opt/google/* $INSTALL_ROOT/opt/google &&
-cp -arv $SOURCE_DIRECTORY/usr $INSTALL_ROOT/
+cp -rv $SOURCE_DIRECTORY/opt/google/* $INSTALL_ROOT/opt/google &&
+cp -rv $SOURCE_DIRECTORY/usr $INSTALL_ROOT/ &&

if [[ -d $INSTALL_ROOT/usr/lib/xulrunner/plugins ]]
then
@@ -9,22 +9,6 @@ then
fi &&

#
-# Google Chrome links to weird .so.1d and .so.0d
-# http://code.google.com/p/chromium/issues/detail?id=13425
-#
-for lib in nss3 nssutil3 smime3 ssl3
-do
- ln -s $TRACK_ROOT/usr/lib/lib$lib.so \
- $INSTALL_ROOT/opt/google/chrome/lib$lib.so.1d
-done &&
-
-for lib in plds4 plc4 nspr4
-do
- ln -s $TRACK_ROOT/usr/lib/lib$lib.so \
- $INSTALL_ROOT/opt/google/chrome/lib$lib.so.0d
-done
-
-#
# Create lib64 symlink
#
[ -e /lib64 ] || ln -s lib $INSTALL_ROOT/lib64
diff --git a/bin-http/google-chrome-bin/PRE_BUILD
b/bin-http/google-chrome-bin/PRE_BUILD
index 059688b..a97fe18 100755
--- a/bin-http/google-chrome-bin/PRE_BUILD
+++ b/bin-http/google-chrome-bin/PRE_BUILD
@@ -1,16 +1,4 @@
mk_source_dir $SOURCE_DIRECTORY &&
cd $SOURCE_DIRECTORY &&
verify_file &&
-rpm2tar $SOURCE_CACHE/$SOURCE &&
-tar xf ${SOURCE/rpm/tar} &&
-rm -f ${SOURCE/rpm/tar} &&
-
-ln $SOURCE_DIRECTORY/usr/bin/google-chrome{*,-bin} &&
-
-deskfile="$SOURCE_DIRECTORY/usr/share/applications/google-chrome.desktop"
-if [[ $GOOGLE_CHROME_BIN_VERSION != stable ]]; then
- deskfile="${deskfile%.desktop}-${GOOGLE_CHROME_BIN_VERSION}.desktop"
-fi
-
-sed -i
"s:Icon=.*:Icon=$INSTALL_ROOT/opt/google/chrome/product_logo_256.png:" \
- "$deskfile"
+rpm2tar -O "$SOURCE_CACHE/$SOURCE" | tar x



  • [SM-Commit] GIT changes to master binary grimoire by Ismael Luceno (3ba6eb468a49eb9cfee599084aeaaaafac1c359e), Ismael Luceno, 09/18/2019

Archive powered by MHonArc 2.6.24.

Top of Page