Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master binary grimoire by Ladislav Hagara (1ae214e60a53997fa584a858b5aa8c14ca214392)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master binary grimoire by Ladislav Hagara (1ae214e60a53997fa584a858b5aa8c14ca214392)
  • Date: Tue, 14 Jan 2014 18:51:44 -0600

GIT changes to master binary grimoire by Ladislav Hagara <hgr AT vabo.cz>:

bin-http/google-chrome-bin/BUILD | 4 ----
bin-http/google-chrome-bin/DETAILS | 3 ---
bin-http/google-chrome-bin/HISTORY | 1 +
bin-http/google-chrome-bin/INSTALL | 6 ------
bin-http/google-chrome-bin/PRE_BUILD | 2 --
dev/null |binary
6 files changed, 1 insertion(+), 15 deletions(-)

New commits:
commit 1ae214e60a53997fa584a858b5aa8c14ca214392
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

google-chrome-bin: jpeg-6b is not needed

diff --git a/bin-http/google-chrome-bin/BUILD
b/bin-http/google-chrome-bin/BUILD
index b4bf555..e69de29 100755
--- a/bin-http/google-chrome-bin/BUILD
+++ b/bin-http/google-chrome-bin/BUILD
@@ -1,4 +0,0 @@
-cd $SOURCE_DIRECTORY/jpeg-6b &&
-OPTS="--enable-shared $OPTS" &&
-./ltconfig --no-verify ./ltmain.sh $HOST &&
-default_build
diff --git a/bin-http/google-chrome-bin/DETAILS
b/bin-http/google-chrome-bin/DETAILS
index f37bbb5..af30eb9 100755
--- a/bin-http/google-chrome-bin/DETAILS
+++ b/bin-http/google-chrome-bin/DETAILS
@@ -25,11 +25,8 @@ else
fi
FORCE_DOWNLOAD[1]=on
SOURCE_IGNORE=unversioned
- SOURCE2=jpegsrc.v6b.tar.gz
- SOURCE2_GPG="gurus.gpg:$SOURCE2.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=https://dl.google.com/linux/direct/$SOURCE
- SOURCE2_URL[0]=http://www.ijg.org/files/$SOURCE2
LICENSE[0]=http://www.google.com/chrome/eula.html
WEB_SITE=http://chrome.google.com/
KEYWORDS="web http"
diff --git a/bin-http/google-chrome-bin/HISTORY
b/bin-http/google-chrome-bin/HISTORY
index 4812c9f..ba060cd 100644
--- a/bin-http/google-chrome-bin/HISTORY
+++ b/bin-http/google-chrome-bin/HISTORY
@@ -1,5 +1,6 @@
2014-01-14 Ladislav Hagara <hgr AT vabo.cz>
* PRE_BUILD, INSTALL: google-chrome.desktop path has been updated
+ * DETAILS, PRE_BUILD, BUILD, INSTALL: jpeg-6b is not needed

2013-12-06 Ladislav Hagara <hgr AT vabo.cz>
* PRE_BUILD: rpms now contain google-chrome-{stable,beta,unstable}
diff --git a/bin-http/google-chrome-bin/INSTALL
b/bin-http/google-chrome-bin/INSTALL
index 9033b9e..f8d63ec 100755
--- a/bin-http/google-chrome-bin/INSTALL
+++ b/bin-http/google-chrome-bin/INSTALL
@@ -25,12 +25,6 @@ do
done

#
-# Copy custom-build libjpeg.so, stupid binaries
-#
-cp -v $SOURCE_DIRECTORY/jpeg-6b/.libs/libjpeg.so \
- $INSTALL_ROOT/opt/google/chrome/libjpeg.so.62
-
-#
# 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 ca6eb0d..31ad571 100755
--- a/bin-http/google-chrome-bin/PRE_BUILD
+++ b/bin-http/google-chrome-bin/PRE_BUILD
@@ -4,8 +4,6 @@ verify_file &&
rpm2tar $SOURCE_CACHE/$SOURCE &&
tar xf ${SOURCE/rpm/tar} &&
rm -f ${SOURCE/rpm/tar} &&
-verify_file '2' &&
-unpack_file '2' &&

mv $SOURCE_DIRECTORY/usr/bin/google-chrome{*,-bin} &&
sed -i
"s:Icon=.*:Icon=$INSTALL_ROOT/opt/google/chrome/product_logo_256.png:" \
diff --git a/bin-http/google-chrome-bin/jpegsrc.v6b.tar.gz.sig
b/bin-http/google-chrome-bin/jpegsrc.v6b.tar.gz.sig
deleted file mode 100644
index 4750429..0000000
Binary files a/bin-http/google-chrome-bin/jpegsrc.v6b.tar.gz.sig and
/dev/null differ



  • [SM-Commit] GIT changes to master binary grimoire by Ladislav Hagara (1ae214e60a53997fa584a858b5aa8c14ca214392), Ladislav Hagara, 01/14/2014

Archive powered by MHonArc 2.6.24.

Top of Page