[arch-commits] CVS update of extra/network/firefox (3 files)
Alexander Baldeck
alexander at archlinux.org
Tue Nov 27 21:40:57 UTC 2007
Date: Tuesday, November 27, 2007 @ 16:40:57
Author: alexander
Path: /home/cvs-extra/extra/network/firefox
Modified: PKGBUILD (1.19 -> 1.20)
firefox-2.0-pango-ligatures.patch (1.1 -> 1.2)
mozconfig (1.1 -> 1.2)
upgpkg: firefox 2.0.0.10
-----------------------------------+
PKGBUILD | 44 ++++++++++++++++++++++++++----------
firefox-2.0-pango-ligatures.patch | 2 -
mozconfig | 4 +--
3 files changed, 35 insertions(+), 15 deletions(-)
Index: extra/network/firefox/PKGBUILD
diff -u extra/network/firefox/PKGBUILD:1.19 extra/network/firefox/PKGBUILD:1.20
--- extra/network/firefox/PKGBUILD:1.19 Sat Nov 3 11:21:52 2007
+++ extra/network/firefox/PKGBUILD Tue Nov 27 16:40:56 2007
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD,v 1.19 2007/11/03 15:21:52 alexander Exp $
+# $Id: PKGBUILD,v 1.20 2007/11/27 21:40:56 alexander Exp $
# Maintainer: Alexander Baldeck <alexander at archlinux.org>
# Contributor: Dale Blount <dale at archlinux.org>
# Contributer: Nick Penwarden <toth64 at yahoo.com>
pkgname=firefox
-pkgver=2.0.0.9
-pkgrel=1
+pkgver=2.0.0.10
+pkgrel=2
pkgdesc="Standalone web browser from mozilla.org"
arch=(i686 x86_64)
license=('MPL' 'GPL' 'LGPL')
@@ -30,6 +30,7 @@
firefox-1.5-pango-underline.patch
firefox-1.5-pango-justified-range.patch
firefox-1.5-xft-rangewidth.patch
+ firefox-2.0-pango-printing.patch
firefox.desktop
firefox-safe.desktop)
options=('!makeflags')
@@ -48,6 +49,7 @@
patch -Np1 -i ${startdir}/src/firefox-1.5-pango-underline.patch || return 1
patch -Np1 -i ${startdir}/src/firefox-1.5-pango-justified-range.patch || return 1
patch -Np1 -i ${startdir}/src/firefox-1.5-xft-rangewidth.patch || return 1
+ patch -Np0 -i ${startdir}/src/firefox-2.0-pango-printing.patch || return 1
if [ "$CARCH" = "x86_64" ]; then
patch -Np0 -i ../firefox-visibility.patch || return 1
@@ -60,7 +62,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/usr/lib/firefox-${pkgver}
export MOZ_DISABLE_GNOME=1
export MOZTMP=`mktemp -d -p ${startdir}/src`
LD_LIBRARY_PATH=`pwd` HOME=${MOZTMP} ./firefox-bin -register
@@ -69,14 +71,14 @@
find . -maxdepth 1 -type d -exec rm -rf {} \;
#Remove mozilla devel stuff, this is in XULRunner now
- 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/usr/share
+ rm -rf ${startdir}/pkg/usr/include
+ rm -rf ${startdir}/pkg/usr/lib/pkgconfig
- cd ${startdir}/pkg/opt/mozilla/lib && ln -sf firefox-${pkgver} firefox
+ cd ${startdir}/pkg/usr/lib && ln -sf firefox-${pkgver} firefox
- rm -rf ${startdir}/pkg/opt/mozilla/bin/defaults
+ rm -rf ${startdir}/pkg/usr/bin/defaults
mkdir -p ${startdir}/pkg/usr/share/applications
mkdir -p ${startdir}/pkg/usr/share/pixmaps
@@ -84,7 +86,25 @@
install -m644 ${startdir}/src/firefox.desktop ${startdir}/pkg/usr/share/applications/
install -m644 ${startdir}/src/firefox-safe.desktop ${startdir}/pkg/usr/share/applications/
- mkdir -p ${startdir}/pkg/opt/mozilla/lib/firefox/chrome/icons/default
- install -m644 ${startdir}/src/mozilla/browser/app/default.xpm ${startdir}/pkg/opt/mozilla/lib/firefox/chrome/icons/default/
- install -m644 ${startdir}/src/mozilla/browser/app/default.xpm ${startdir}/pkg/opt/mozilla/lib/firefox/icons/
+ mkdir -p ${startdir}/pkg/usr/lib/firefox/chrome/icons/default
+ install -m644 ${startdir}/src/mozilla/browser/app/default.xpm ${startdir}/pkg/usr/lib/firefox/chrome/icons/default/
+ install -m644 ${startdir}/src/mozilla/browser/app/default.xpm ${startdir}/pkg/usr/lib/firefox/icons/
}
+md5sums=('5c2f13d6a27f462ec6b862dafca22e7b'
+ 'e980891ba998459afb8afe7293f1a2af'
+ '224962b5f2446cab7727fdf07fd526de'
+ 'bd5db57c23c72a02a489592644f18995'
+ '29194973e2a535b460c6b7f92c635eaf'
+ '2082c2a2d1cedd08e83179271aacf337'
+ '362f9e0b0f25b964f7120b68fb629ee0'
+ '60b4bbe73d2e919ee4a6476dca6705b6'
+ '288fb7db871700ff5cf7286db6192b45'
+ '25f355113cdee6800380c6e1a4cd38f0'
+ '11b221ff41078d97c131e17361072e47'
+ '300170989d3743fda3e4b7a21ac56ed4'
+ '713a9587dd024f5d03f1fe9c095da9de'
+ '4d0713c0a94a367a4e84d5f7e56de631'
+ 'affb470ca6bac11a7f3005e2508621a8'
+ '52a9fc53aa12117dc392cb1dbdc56ae9'
+ '74ea70c9e935f0e7f7b75436fe33efd5'
+ '5e68cabfcf3c021806b326f664ac505e')
Index: extra/network/firefox/firefox-2.0-pango-ligatures.patch
diff -u extra/network/firefox/firefox-2.0-pango-ligatures.patch:1.1 extra/network/firefox/firefox-2.0-pango-ligatures.patch:1.2
--- extra/network/firefox/firefox-2.0-pango-ligatures.patch:1.1 Fri Oct 19 06:12:38 2007
+++ extra/network/firefox/firefox-2.0-pango-ligatures.patch Tue Nov 27 16:40:57 2007
@@ -134,7 +134,7 @@
// Make sure to clamp the pixel size to something reasonable so we
// don't make the X server blow up.
nscoord screenPixels = gdk_screen_height();
- mPointSize = PR_MIN(screenPixels * FONT_MAX_FONT_SCALE, mPointSize);
+ mPointSize = PR_MIN((screenPixels - 1) * FONT_MAX_FONT_SCALE, mPointSize);
+#endif
// enumerate over the font names passed in
Index: extra/network/firefox/mozconfig
diff -u extra/network/firefox/mozconfig:1.1 extra/network/firefox/mozconfig:1.2
--- extra/network/firefox/mozconfig:1.1 Thu Oct 26 18:40:59 2006
+++ extra/network/firefox/mozconfig Tue Nov 27 16:40:57 2007
@@ -22,8 +22,8 @@
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/firefox
+ac_add_options --prefix=/usr
+ac_add_options --with-default-mozilla-five-home=/usr/lib/firefox
ac_add_options --enable-crypto
ac_add_options --enable-single-profile
ac_add_options --disable-profilesharing
More information about the arch-commits
mailing list