From e77a066b86e8587f7f54694577375682de6f8102 Mon Sep 17 00:00:00 2001
From: Eric Sandall
Date: Tue, 30 Mar 2010 11:52:03 -0700
Subject: google-chrome-bin: Download and build a copy of jpeg 7

google-chrome-bin requires libjpeg.so.62 (from jpeg 7). Build and copy a
version just for google-chrome-bin (does *not* install libjpeg.so.62 to
/usr/lib).
---
 bin-http/google-chrome-bin/BUILD                 |   3 ++-
 bin-http/google-chrome-bin/DETAILS               |   3 +++
 bin-http/google-chrome-bin/HISTORY               |   4 ++++
 bin-http/google-chrome-bin/INSTALL               |   6 ++++++
 bin-http/google-chrome-bin/PRE_BUILD             |   2 ++
 bin-http/google-chrome-bin/jpegsrc.v7.tar.gz.sig | Bin 0 -> 287 bytes
 6 files changed, 17 insertions(+), 1 deletion(-)
 create 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 27ba77d..9aff105 100755
--- a/bin-http/google-chrome-bin/BUILD
+++ b/bin-http/google-chrome-bin/BUILD
@@ -1 +1,2 @@
-true
+cd $SOURCE_DIRECTORY/jpeg-7 &&
+default_build
diff --git a/bin-http/google-chrome-bin/DETAILS b/bin-http/google-chrome-bin/DETAILS
index 928bf86..11a5fc1 100755
--- a/bin-http/google-chrome-bin/DETAILS
+++ b/bin-http/google-chrome-bin/DETAILS
@@ -11,9 +11,12 @@ then
 else
           SOURCE=${SPELL/-bin/}-beta_current_i386.rpm
 fi
+         SOURCE2=jpegsrc.v7.tar.gz
    SOURCE_IGNORE=unversioned
+     SOURCE2_GPG="gurus.gpg:$SOURCE2.sig:WORKS_FOR_ME"
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://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 dde0f4d..2cbe118 100644
--- a/bin-http/google-chrome-bin/HISTORY
+++ b/bin-http/google-chrome-bin/HISTORY
@@ -1,5 +1,9 @@
 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
+	* DETAILS: Add jpeg 7 source
+	* BUILD: Build jpeg 7
+	* INSTALL: Copy libjpeg.so to chrome/libjpeg.so.62
 
 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 5b04fe0..2e7599a 100755
--- a/bin-http/google-chrome-bin/INSTALL
+++ b/bin-http/google-chrome-bin/INSTALL
@@ -27,3 +27,9 @@ do
   ln -s $TRACK_ROOT/usr/lib/lib$lib.so \
         $INSTALL_ROOT/opt/google/chrome/lib$lib.so.0d
 done
+
+#
+# Copy custom-build libjpeg.so, stupid binaries
+#
+cp -v $SOURCE_DIRECTORY/jpeg-7/.libs/libjpeg.so \
+  $INSTALL_ROOT/opt/google/chrome/libjpeg.so.62
diff --git a/bin-http/google-chrome-bin/PRE_BUILD b/bin-http/google-chrome-bin/PRE_BUILD
index 10ec05e..32e8df9 100755
--- a/bin-http/google-chrome-bin/PRE_BUILD
+++ b/bin-http/google-chrome-bin/PRE_BUILD
@@ -3,6 +3,8 @@ cd $SOURCE_DIRECTORY &&
 verify_file &&
 rpm2tar $SOURCE_CACHE/$SOURCE &&
 tar xf ${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.v7.tar.gz.sig b/bin-http/google-chrome-bin/jpegsrc.v7.tar.gz.sig
new file mode 100644
index 0000000..d70e875
Binary files /dev/null and b/bin-http/google-chrome-bin/jpegsrc.v7.tar.gz.sig differ
-- 
cgit v1.2.3