Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master binary grimoire by Eric Sandall (f0906d21e63864f74fb3626cd2e1a05726732300)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master binary grimoire by Eric Sandall (f0906d21e63864f74fb3626cd2e1a05726732300)
  • Date: Tue, 30 Mar 2010 16:44:42 -0500

GIT changes to master binary grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

bin-http/google-chrome-bin/BUILD | 4 +++-
bin-http/google-chrome-bin/DETAILS | 2 +-
bin-http/google-chrome-bin/HISTORY | 9 +++++++--
bin-http/google-chrome-bin/INSTALL | 2 +-
bin-http/google-chrome-bin/jpegsrc.v6b.tar.gz.sig |binary
bin-http/google-chrome-bin/jpegsrc.v7.tar.gz.sig | 0
dev/null |binary
7 files changed, 12 insertions(+), 5 deletions(-)

New commits:
commit f0906d21e63864f74fb3626cd2e1a05726732300
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

google-chrome-bin: Build jpeg 6b, not 7 (Bug #15582 cont.)

diff --git a/bin-http/google-chrome-bin/BUILD
b/bin-http/google-chrome-bin/BUILD
index 9aff105..b4bf555 100755
--- a/bin-http/google-chrome-bin/BUILD
+++ b/bin-http/google-chrome-bin/BUILD
@@ -1,2 +1,4 @@
-cd $SOURCE_DIRECTORY/jpeg-7 &&
+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 11a5fc1..ee18d62 100755
--- a/bin-http/google-chrome-bin/DETAILS
+++ b/bin-http/google-chrome-bin/DETAILS
@@ -11,7 +11,7 @@ then
else
SOURCE=${SPELL/-bin/}-beta_current_i386.rpm
fi
- SOURCE2=jpegsrc.v7.tar.gz
+ SOURCE2=jpegsrc.v6b.tar.gz
SOURCE_IGNORE=unversioned
SOURCE2_GPG="gurus.gpg:$SOURCE2.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/bin-http/google-chrome-bin/HISTORY
b/bin-http/google-chrome-bin/HISTORY
index c3038ec..43f97a1 100644
--- a/bin-http/google-chrome-bin/HISTORY
+++ b/bin-http/google-chrome-bin/HISTORY
@@ -1,10 +1,15 @@
2010-03-30 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD: Tar is named based on $SOURCE, works on x86_64 now
- Verify and unpack jpeg 7
+ Verify and unpack jpeg
After extracting tar SOURCE, remove
* DETAILS: Add jpeg 7 source
- * BUILD: Build jpeg 7
+ Use 6b, not 7
+ * BUILD: Build jpeg
+ Use 6b, not 7
+ Enable building shared library
+ Build local libtool for jpeg 6b's ./configure
* INSTALL: Copy libjpeg.so to chrome/libjpeg.so.62
+ Use 6b, not 7

2010-03-28 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: rpmunpack -> rpm2targz #15582
diff --git a/bin-http/google-chrome-bin/INSTALL
b/bin-http/google-chrome-bin/INSTALL
index 2e7599a..f9d7d4f 100755
--- a/bin-http/google-chrome-bin/INSTALL
+++ b/bin-http/google-chrome-bin/INSTALL
@@ -31,5 +31,5 @@ done
#
# Copy custom-build libjpeg.so, stupid binaries
#
-cp -v $SOURCE_DIRECTORY/jpeg-7/.libs/libjpeg.so \
+cp -v $SOURCE_DIRECTORY/jpeg-6b/.libs/libjpeg.so \
$INSTALL_ROOT/opt/google/chrome/libjpeg.so.62
diff --git a/bin-http/google-chrome-bin/jpegsrc.v6b.tar.gz.sig
b/bin-http/google-chrome-bin/jpegsrc.v6b.tar.gz.sig
new file mode 100644
index 0000000..4750429
Binary files /dev/null and
b/bin-http/google-chrome-bin/jpegsrc.v6b.tar.gz.sig differ
diff --git a/bin-http/google-chrome-bin/jpegsrc.v7.tar.gz.sig
b/bin-http/google-chrome-bin/jpegsrc.v7.tar.gz.sig
deleted file mode 100644
index d70e875..0000000
Binary files a/bin-http/google-chrome-bin/jpegsrc.v7.tar.gz.sig and /dev/null
differ



  • [SM-Commit] GIT changes to master binary grimoire by Eric Sandall (f0906d21e63864f74fb3626cd2e1a05726732300), Eric Sandall, 03/30/2010

Archive powered by MHonArc 2.6.24.

Top of Page