[arch-commits] Commit in firefox/trunk (PKGBUILD firefox.install mozconfig)

[Ionut Biru]

    Date: Tuesday, March 22, 2011 @ 10:10:11
  Author: ibiru
Revision: 115944

upgpkg: firefox 4.0-1
update to 4.0

Modified:
  firefox/trunk/PKGBUILD
  firefox/trunk/firefox.install
  firefox/trunk/mozconfig

-----------------+
 PKGBUILD        |   18 +++++++++++-------
 firefox.install |    1 +
 mozconfig       |    3 ++-
 3 files changed, 14 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-03-22 14:10:02 UTC (rev 115943)
+++ PKGBUILD	2011-03-22 14:10:11 UTC (rev 115944)
@@ -2,9 +2,9 @@
 # Contributor: Jakub Schmidtke <sjakub at gmail.com>
 
 pkgname=firefox
-pkgver=4.0rc1
-pkgrel=2
-_xulver=2.0rc1
+pkgver=4.0
+pkgrel=1
+_xulver=2.0
 pkgdesc="Standalone web browser from mozilla.org"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
@@ -18,8 +18,8 @@
         firefox-safe.desktop
         mozilla-firefox-1.0-lang.patch
         firefox-version.patch)
-md5sums=('511828dcc226f38602c6c67bd192ef40'
-         '8f8b86cd0cc36a3f60c0d287a2c0b9fb'
+md5sums=('3468a2c463b4fc2788ba621e4b511c30'
+         'd9292af4bb513d0bb811984f077cb77c'
          'bdeb0380c7fae30dd0ead6d2d3bc5873'
          '6f38a5899034b7786cb1f75ad42032b8'
          'bd5db57c23c72a02a489592644f18995'
@@ -43,8 +43,12 @@
   cd "${srcdir}/mozilla-2.0"
   make -j1 -f client.mk DESTDIR="${pkgdir}" install
 
-  install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps}
-  install -m644 browser/branding/unofficial/default48.png ${pkgdir}/usr/share/pixmaps/firefox.png
+  install -m755 -d ${pkgdir}/usr/share/applications
+
+  for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
+      install -d "$pkgdir/usr/share/icons/hicolor/$i/apps"
+      cp other-licenses/branding/firefox/default${i/x*/}.png "$pkgdir/usr/share/icons/hicolor/$i/apps/firefox.png"
+  done
   install -m644 ${srcdir}/firefox.desktop ${pkgdir}/usr/share/applications/
   install -m644 ${srcdir}/firefox-safe.desktop ${pkgdir}/usr/share/applications/
 }

Modified: firefox.install
===================================================================
--- firefox.install	2011-03-22 14:10:02 UTC (rev 115943)
+++ firefox.install	2011-03-22 14:10:11 UTC (rev 115944)
@@ -1,5 +1,6 @@
 post_install() {
   update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_upgrade() {

Modified: mozconfig
===================================================================
--- mozconfig	2011-03-22 14:10:02 UTC (rev 115943)
+++ mozconfig	2011-03-22 14:10:11 UTC (rev 115944)
@@ -36,7 +36,8 @@
 ac_add_options --enable-xinerama
 ac_add_options --enable-libxul
 ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-2.0
-ac_add_options --with-branding=browser/branding/unofficial
+#ac_add_options --with-branding=browser/branding/unofficial
+ac_add_options --enable-official-branding
 
 ac_add_options --disable-javaxpcom
 ac_add_options --disable-crashreporter