From f0906d21e63864f74fb3626cd2e1a05726732300 Mon Sep 17 00:00:00 2001
From: Eric Sandall
Date: Tue, 30 Mar 2010 14:44:18 -0700
Subject: google-chrome-bin: Build jpeg 6b, not 7 (Bug #15582 cont.)

---
 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 | Bin 0 -> 287 bytes
 bin-http/google-chrome-bin/jpegsrc.v7.tar.gz.sig  | Bin 287 -> 0 bytes
 6 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 bin-http/google-chrome-bin/jpegsrc.v6b.tar.gz.sig
 delete mode 100644 bin-http/google-chrome-bin/jpegsrc.v7.tar.gz.sig

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@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@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
-- 
cgit v1.2.3