[arch-commits] Commit in firefox3/repos (4 files)

[Eric Belanger]

    Date: Friday, May 30, 2008 @ 17:55:11
  Author: eric
Revision: 2292

Merged revisions 2-2291 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/firefox3/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r2237 | dan | 2008-05-29 22:39:51 -0400 (Thu, 29 May 2008) | 1 line
  
  upgpkg: firefox3 3.0rc1-1
........
  r2239 | dan | 2008-05-29 22:50:15 -0400 (Thu, 29 May 2008) | 1 line
  
  readd logic for setting/installing window manager icon
........
  r2291 | eric | 2008-05-30 17:54:53 -0400 (Fri, 30 May 2008) | 2 lines
  
  upgpkg: firefox3 3.0rc1-1
      fixed typo
........

Modified:
  firefox3/repos/unstable-x86_64/	(properties)
  firefox3/repos/unstable-x86_64/PKGBUILD
  firefox3/repos/unstable-x86_64/firefox3.desktop
  firefox3/repos/unstable-x86_64/mozconfig

------------------+
 PKGBUILD         |   23 ++++++++++++-----------
 firefox3.desktop |    2 +-
 mozconfig        |    7 ++-----
 3 files changed, 15 insertions(+), 17 deletions(-)


Property changes on: firefox3/repos/unstable-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /firefox3/trunk:1
   + /firefox3/trunk:1-2291

Modified: unstable-x86_64/PKGBUILD
===================================================================
--- unstable-x86_64/PKGBUILD	2008-05-30 21:54:53 UTC (rev 2291)
+++ unstable-x86_64/PKGBUILD	2008-05-30 21:55:11 UTC (rev 2292)
@@ -3,7 +3,7 @@
 # Contributor: Jakub Schmidtke <sjakub at gmail.com>
 
 pkgname=firefox3
-pkgver=3.0b5
+pkgver=3.0rc1
 pkgrel=1
 pkgdesc="Standalone web browser from mozilla.org"
 arch=(i686 x86_64)
@@ -29,7 +29,7 @@
   make -f client.mk build || return 1
   make DESTDIR=${startdir}/pkg install || return 1
 
-  cd ${startdir}/pkg/opt/mozilla/lib/firefox-${pkgver}
+  cd ${startdir}/pkg/opt/mozilla/lib/firefox-3.0
   export MOZ_DISABLE_GNOME=1
   export MOZTMP=`mktemp -d -p ${startdir}/src`
   LD_LIBRARY_PATH=`pwd` HOME=${MOZTMP} ./firefox-bin -register
@@ -41,10 +41,8 @@
   rm -rf ${startdir}/pkg/opt/mozilla/share
   rm -rf ${startdir}/pkg/opt/mozilla/include
   rm -rf ${startdir}/pkg/opt/mozilla/lib/pkgconfig
-  rm -rf ${startdir}/pkg/opt/mozilla/lib/firefox-devel-${pkgver}
+  rm -rf ${startdir}/pkg/opt/mozilla/lib/firefox-devel-3.0
 
-  cd ${startdir}/pkg/opt/mozilla/lib && ln -sf firefox-${pkgver} firefox3
-
   rm -rf ${startdir}/pkg/opt/mozilla/bin/defaults
 
   mkdir -p ${startdir}/pkg/usr/share/applications
@@ -53,15 +51,18 @@
   install -m644 ${startdir}/src/firefox3.desktop ${startdir}/pkg/usr/share/applications/
   install -m644 ${startdir}/src/firefox3-safe.desktop ${startdir}/pkg/usr/share/applications/
 
-  mkdir -p ${startdir}/pkg/opt/mozilla/lib/firefox3/chrome/icons/default
-  install -m644 ${startdir}/src/mozilla/browser/app/mozicon50.xpm ${startdir}/pkg/opt/mozilla/lib/firefox3/chrome/icons/default/default.xpm
-  install -m644 ${startdir}/src/mozilla/browser/app/mozicon50.xpm ${startdir}/pkg/opt/mozilla/lib/firefox3/icons/default.xpm
+  # ensure icon shows up correctly in window manager stuff
+  mkdir -p ${startdir}/pkg/opt/mozilla/lib/firefox-3.0/chrome/icons/default
+  install -m644 ${startdir}/src/mozilla/browser/app/mozicon50.xpm \
+    ${startdir}/pkg/opt/mozilla/lib/firefox-3.0/chrome/icons/default/default.xpm
+  install -m644 ${startdir}/src/mozilla/browser/app/mozicon50.xpm \
+    ${startdir}/pkg/opt/mozilla/lib/firefox-3.0/icons/default.xpm
 
   cd ${startdir}/pkg/opt/mozilla/bin && mv firefox firefox3
 }
 
-md5sums=('6a97a0933f8cd71b34436daa41530c29'
-         '3beb3a46e2f15b55678d253bc1fed3e4'
-         'ff1c7b1fb25fee646a0c6d2b08d3b98c'
+md5sums=('0a918cb4686aff937c052d1a72297092'
+         'bda73d7398c628bb9bf257e55e8d0627'
+         '1edbe1a5b584613bde6c21f4ee247b6e'
          '370aa36551a70150c1c6f07672ca0f32'
          'bd5db57c23c72a02a489592644f18995')

Modified: unstable-x86_64/firefox3.desktop
===================================================================
--- unstable-x86_64/firefox3.desktop	2008-05-30 21:54:53 UTC (rev 2291)
+++ unstable-x86_64/firefox3.desktop	2008-05-30 21:55:11 UTC (rev 2292)
@@ -79,5 +79,5 @@
 GenericName[zh_TW]=ç¶²é ç€è¦½å™¨
 GenericName[zu]=Umcingi we-Web
 MimeType=text/html
-StartupNotify=false
+StartupNotify=true
 Categories=Application;Network;

Modified: unstable-x86_64/mozconfig
===================================================================
--- unstable-x86_64/mozconfig	2008-05-30 21:54:53 UTC (rev 2291)
+++ unstable-x86_64/mozconfig	2008-05-30 21:55:11 UTC (rev 2292)
@@ -2,8 +2,7 @@
 . $topsrcdir/browser/config/mozconfig
 # add our own options
 
-# TODO need to wait for version 4.7 to be built
-#ac_add_options --with-system-nspr
+ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
@@ -20,12 +19,10 @@
 ac_add_options --enable-strip
 ac_add_options --enable-pango
 ac_add_options --enable-xft
-# TODO we cannot use the system cairo until we go to a version >= 1.5.2
-#ac_add_options --enable-system-cairo
+ac_add_options --enable-system-cairo
 ac_add_options --enable-svg
 ac_add_options --enable-canvas
 ac_add_options --prefix=/opt/mozilla
-ac_add_options --with-default-mozilla-five-home=/opt/mozilla/lib/firefox3
 ac_add_options --enable-crypto
 ac_add_options --enable-single-profile
 ac_add_options --disable-profilesharing