wok rev 11324
Up: firefox to 8.0.1. Moved /usr/lib/firefox-$VERSION to /usr/lib/firefox. Same for /usr/lib/firefox-devel-$VERSION. Its patch to work this way.
| author | Christopher Rogers <slaxemulator@gmail.com> |
|---|---|
| date | Thu Nov 17 13:37:18 2011 +0000 (2011-11-17) |
| parents | 379bfee924ae |
| children | aef77d974511 |
| files | firefox-dev/receipt firefox-dev/stuff/firefox-gtkmozembed.pc firefox-dev/stuff/firefox-js.pc firefox-dev/stuff/firefox-plugin.pc firefox-dev/stuff/firefox-xpcom.pc firefox-dev/stuff/libxul.pc firefox-langpack-fr/receipt firefox-langpack-pt-BR/receipt firefox-langpack-zh_CN/receipt firefox-langpack-zh_TW/receipt firefox/receipt firefox/stuff/firefox-install-dir.patch firefox/stuff/firefox.mozconfig firefox/stuff/mozilla-firefox-1.0-lang.patch firefox/stuff/prefs.js libfirefox/receipt |
line diff
1.1 --- a/firefox-dev/receipt Thu Nov 17 13:11:35 2011 +0000 1.2 +++ b/firefox-dev/receipt Thu Nov 17 13:37:18 2011 +0000 1.3 @@ -1,11 +1,11 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="firefox-dev" 1.7 -VERSION="8.0" 1.8 +VERSION="8.0.1" 1.9 CATEGORY="development" 1.10 SHORT_DESC="firefox devel files" 1.11 MAINTAINER="jozee@slitaz.org" 1.12 -DEPENDS="alsa-lib sqlite seamonkey cairo dbus-glib pango atk \ 1.13 +DEPENDS="alsa-lib sqlite cairo dbus-glib pango atk \ 1.14 libgio xorg-libXt xorg-libXinerama \ 1.15 xorg-libXcursor xorg-libXcomposite xorg-libXext xorg-libXdamage libxcb \ 1.16 xorg-libSM xorg-libICE" 1.17 @@ -16,7 +16,7 @@ 1.18 genpkg_rules() 1.19 { 1.20 mkdir -p $fs/usr/lib/pkgconfig 1.21 - cp -a $_pkg/usr/lib/firefox-devel-$VERSION $fs/usr/lib 1.22 + cp -a $_pkg/usr/lib/firefox-devel $fs/usr/lib 1.23 cp -a $_pkg/usr/include $fs/usr 1.24 1.25 # Gecko 1.9.0 compatibility... 1.26 @@ -29,17 +29,20 @@ 1.27 cp -a $stuff/*.pc $fs/usr/lib/pkgconfig 1.28 1.29 # copy missing xpidl files 1.30 - cp -a $_pkg/typelib/xpidl/xpidl $fs/usr/lib/firefox-devel-$VERSION/sdk/lib 1.31 + cp -a $_pkg/typelib/xpidl/xpidl $fs/usr/lib/firefox-devel/sdk/lib 1.32 + 1.33 + # fix version 1.34 + sed -i "s/3\.5\../$VERSION/" $fs/usr/lib/pkgconfig/* 1.35 } 1.36 1.37 # Pre and post install commands for Tazpkg. 1.38 post_install() 1.39 { 1.40 for i in usr/share/idl/firefox- usr/include/firefox- \ 1.41 - usr/lib/firefox-devel- ; do 1.42 - for j in $(ls -d $1/$i*); do 1.43 + usr/lib/firefox-devel- ; do 1.44 + for j in $(ls -d $1/$i* 2>/dev/null); do 1.45 [ "${j##*-}" = "$VERSION" ] && continue 1.46 - rm -rf $j 1.47 + [ -d $j ] && rm -rf $j 1.48 done 1.49 done 1.50 }
2.1 --- a/firefox-dev/stuff/firefox-gtkmozembed.pc Thu Nov 17 13:11:35 2011 +0000 2.2 +++ b/firefox-dev/stuff/firefox-gtkmozembed.pc Thu Nov 17 13:37:18 2011 +0000 2.3 @@ -1,6 +1,6 @@ 2.4 prefix=/usr 2.5 -libdir=/usr/lib/firefox-devel-3.5.5 2.6 -sdkdir=/usr/lib/firefox-devel-3.5.5/sdk 2.7 +libdir=/usr/lib/firefox-devel 2.8 +sdkdir=/usr/lib/firefox-devel/sdk 2.9 includedir=/usr/include/firefox-3.5.5 2.10 2.11 Name: mozilla-gtkembedmoz
3.1 --- a/firefox-dev/stuff/firefox-js.pc Thu Nov 17 13:11:35 2011 +0000 3.2 +++ b/firefox-dev/stuff/firefox-js.pc Thu Nov 17 13:37:18 2011 +0000 3.3 @@ -1,6 +1,6 @@ 3.4 prefix=/usr 3.5 -libdir=/usr/lib/firefox-devel-3.5.5/sdk/lib 3.6 -sdkdir=/usr/lib/firefox-devel-3.5.5/sdk 3.7 +libdir=/usr/lib/firefox-devel/sdk/lib 3.8 +sdkdir=/usr/lib/firefox-devel/sdk 3.9 includedir=/usr/include/firefox-3.5.5 3.10 3.11 Name: JavaScript
4.1 --- a/firefox-dev/stuff/firefox-plugin.pc Thu Nov 17 13:11:35 2011 +0000 4.2 +++ b/firefox-dev/stuff/firefox-plugin.pc Thu Nov 17 13:37:18 2011 +0000 4.3 @@ -1,6 +1,6 @@ 4.4 prefix=/usr 4.5 -libdir=/usr/lib/firefox-devel-3.5.5/sdk/lib 4.6 -sdkdir=/usr/lib/firefox-devel-3.5.5/sdk 4.7 +libdir=/usr/lib/firefox-devel/sdk/lib 4.8 +sdkdir=/usr/lib/firefox-devel/sdk 4.9 includedir=/usr/include/firefox-3.5.5 4.10 4.11 Name: Mozilla Plug-In API
5.1 --- a/firefox-dev/stuff/firefox-xpcom.pc Thu Nov 17 13:11:35 2011 +0000 5.2 +++ b/firefox-dev/stuff/firefox-xpcom.pc Thu Nov 17 13:37:18 2011 +0000 5.3 @@ -1,6 +1,6 @@ 5.4 prefix=/usr 5.5 exec_prefix=/usr 5.6 -libdir=/usr/lib/firefox-devel-3.5.5/sdk/lib 5.7 +libdir=/usr/lib/firefox-devel/sdk/lib 5.8 includedir=/usr/include/firefox-3.5.5 5.9 idldir=/usr/share/idl/firefox-3.5.5/stable 5.10
6.1 --- a/firefox-dev/stuff/libxul.pc Thu Nov 17 13:11:35 2011 +0000 6.2 +++ b/firefox-dev/stuff/libxul.pc Thu Nov 17 13:37:18 2011 +0000 6.3 @@ -1,6 +1,6 @@ 6.4 prefix=/usr 6.5 -libdir=/usr/lib/firefox-devel-3.5.5/sdk/lib 6.6 -sdkdir=/usr/lib/firefox-devel-3.5.5/sdk 6.7 +libdir=/usr/lib/firefox-devel/sdk/lib 6.8 +sdkdir=/usr/lib/firefox-devel/sdk 6.9 includedir=/usr/include/firefox-3.5.5 6.10 idldir=/usr/share/idl/firefox-3.5.5 6.11
7.1 --- a/firefox-langpack-fr/receipt Thu Nov 17 13:11:35 2011 +0000 7.2 +++ b/firefox-langpack-fr/receipt Thu Nov 17 13:37:18 2011 +0000 7.3 @@ -1,7 +1,7 @@ 7.4 # SliTaz package receipt. 7.5 7.6 PACKAGE="firefox-langpack-fr" 7.7 -VERSION="8.0" 7.8 +VERSION="8.0.1" 7.9 CATEGORY="network" 7.10 SHORT_DESC="France Language Package for firefox" 7.11 MAINTAINER="lufeng369@gmail.com" 7.12 @@ -15,7 +15,7 @@ 7.13 # Rules to gen a SliTaz package suitable for Tazpkg. 7.14 genpkg_rules() 7.15 { 7.16 - EXTDIR="$fs/usr/lib/firefox-$VERSION/extensions/$LANG_DIR" 7.17 + EXTDIR="$fs/usr/lib/firefox/extensions/$LANG_DIR" 7.18 mkdir -p $EXTDIR 7.19 cp -a $src/* $EXTDIR 7.20 }
8.1 --- a/firefox-langpack-pt-BR/receipt Thu Nov 17 13:11:35 2011 +0000 8.2 +++ b/firefox-langpack-pt-BR/receipt Thu Nov 17 13:37:18 2011 +0000 8.3 @@ -1,7 +1,7 @@ 8.4 # SliTaz package receipt. 8.5 8.6 PACKAGE="firefox-langpack-pt-BR" 8.7 -VERSION="8.0" 8.8 +VERSION="8.0.1" 8.9 CATEGORY="network" 8.10 SHORT_DESC="pt-BR language pack for firefox." 8.11 MAINTAINER="claudinei@slitaz.org" 8.12 @@ -15,7 +15,7 @@ 8.13 # Rules to gen a SliTaz package suitable for Tazpkg. 8.14 genpkg_rules() 8.15 { 8.16 - EXTDIR="$fs/usr/lib/firefox-$VERSION/extensions/$LANG_DIR" 8.17 + EXTDIR="$fs/usr/lib/firefox/extensions/$LANG_DIR" 8.18 mkdir -p $EXTDIR 8.19 cp -a $src/* $EXTDIR 8.20 }
9.1 --- a/firefox-langpack-zh_CN/receipt Thu Nov 17 13:11:35 2011 +0000 9.2 +++ b/firefox-langpack-zh_CN/receipt Thu Nov 17 13:37:18 2011 +0000 9.3 @@ -1,7 +1,7 @@ 9.4 # SliTaz package receipt. 9.5 9.6 PACKAGE="firefox-langpack-zh_CN" 9.7 -VERSION="8.0" 9.8 +VERSION="8.0.1" 9.9 CATEGORY="network" 9.10 SHORT_DESC="Chinese Language Package for firefox" 9.11 MAINTAINER="lufeng369@gmail.com" 9.12 @@ -15,7 +15,7 @@ 9.13 # Rules to gen a SliTaz package suitable for Tazpkg. 9.14 genpkg_rules() 9.15 { 9.16 - EXTDIR="$fs/usr/lib/firefox-$VERSION/extensions/$LANG_DIR" 9.17 + EXTDIR="$fs/usr/lib/firefox/extensions/$LANG_DIR" 9.18 mkdir -p $EXTDIR 9.19 cp -a $src/* $EXTDIR 9.20 }
10.1 --- a/firefox-langpack-zh_TW/receipt Thu Nov 17 13:11:35 2011 +0000 10.2 +++ b/firefox-langpack-zh_TW/receipt Thu Nov 17 13:37:18 2011 +0000 10.3 @@ -1,7 +1,7 @@ 10.4 # SliTaz package receipt. 10.5 10.6 PACKAGE="firefox-langpack-zh_TW" 10.7 -VERSION="8.0" 10.8 +VERSION="8.0.1" 10.9 CATEGORY="network" 10.10 SHORT_DESC="Chinese Language Package for firefox" 10.11 MAINTAINER="lufeng369@gmail.com" 10.12 @@ -15,7 +15,7 @@ 10.13 # Rules to gen a SliTaz package suitable for Tazpkg. 10.14 genpkg_rules() 10.15 { 10.16 - EXTDIR="$fs/usr/lib/firefox-$VERSION/extensions/$LANG_DIR" 10.17 + EXTDIR="$fs/usr/lib/firefox/extensions/$LANG_DIR" 10.18 mkdir -p $EXTDIR 10.19 cp -a $src/* $EXTDIR 10.20 }
11.1 --- a/firefox/receipt Thu Nov 17 13:11:35 2011 +0000 11.2 +++ b/firefox/receipt Thu Nov 17 13:37:18 2011 +0000 11.3 @@ -1,20 +1,21 @@ 11.4 # SliTaz package receipt. 11.5 11.6 PACKAGE="firefox" 11.7 -VERSION="8.0" 11.8 +VERSION="8.0.1" 11.9 CATEGORY="network" 11.10 SHORT_DESC="User friendly, secure and fast web browser." 11.11 MAINTAINER="pankso@slitaz.org" 11.12 TARBALL="$PACKAGE-$VERSION.source.tar.bz2" 11.13 WEB_SITE="http://www.mozilla.org/" 11.14 -WGET_URL="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$VERSION/source/$TARBALL" 11.15 +#WGET_URL="http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$VERSION/source/$TARBALL" 11.16 +WGET_URL="ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$VERSION/source/$TARBALL" 11.17 CONFIG_FILES="/etc/firefox" 11.18 TAGS="browser" 11.19 11.20 DEPENDS="gtk+ sqlite dbus dbus-glib glib jpeg xorg-libX11 xorg-libXdamage \ 11.21 -alsa-lib xorg-libXt libfirefox libnotify" 11.22 -BUILD_DEPENDS="zip libIDL coreutils findutils libnotify-dev wireless_tools-dev \ 11.23 -perl python yasm alsa-lib-dev mesa-dev" 11.24 +alsa-lib xorg-libXt libfirefox libevent libvpx" 11.25 +BUILD_DEPENDS="zip libIDL coreutils findutils wireless_tools-dev \ 11.26 +perl python yasm alsa-lib-dev mesa-dev libevent-dev libvpx-dev dbus-dev dbus-glib-dev" 11.27 11.28 # Rules to configure and make the package. 11.29 # 11.30 @@ -25,9 +26,18 @@ 11.31 { 11.32 cp -a $stuff/firefox.mozconfig $src/.mozconfig 11.33 cd $src 11.34 - sed -i 's/xtype/type/' toolkit/mozapps/installer/packager.mk 11.35 + patch -Np1 -i $stuff/mozilla-firefox-1.0-lang.patch 11.36 + patch -Np1 -i $stuff/firefox-install-dir.patch 11.37 + 11.38 + # Fix PRE_RELEASE_SUFFIX 11.39 + sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ 11.40 + browser/base/Makefile.in 11.41 + 11.42 + # Don't generate startup cache. Unbreaks build 11.43 + sed -i 's/^GENERATE_CACHE ?=.*/GENERATE_CACHE = true/' \ 11.44 + toolkit/mozapps/installer/packager.mk 11.45 ./configure $CONFIGURE_ARGS && 11.46 - make $MAKEFLAGS && 11.47 + make -j 4 && 11.48 make DESTDIR=$DESTDIR install && 11.49 cp -a xpcom/typelib $DESTDIR 11.50 } 11.51 @@ -35,51 +45,52 @@ 11.52 # Rules to gen a SliTaz package suitable for Tazpkg. 11.53 genpkg_rules() 11.54 { 11.55 - mkdir -p $fs/usr/lib/$PACKAGE-$VERSION/defaults/profile/chrome \ 11.56 - $fs/usr/share $fs/etc 11.57 + mkdir -p $fs/usr/lib/$PACKAGE \ 11.58 + $fs/usr/share $fs/etc/$PACKAGE/profile/chrome 11.59 cp -a $_pkg/usr/bin $fs/usr 11.60 - cp -a $_pkg/usr/lib/$PACKAGE-$VERSION $fs/usr/lib 11.61 + cp -a $_pkg/usr/lib/$PACKAGE $fs/usr/lib 11.62 11.63 # Home page, bookmarks file and branding. 11.64 - cp -a $stuff/browserconfig.properties $fs/usr/lib/$PACKAGE-$VERSION 11.65 + cp -a $stuff/browserconfig.properties $fs/etc/$PACKAGE 11.66 cp -a $stuff/bookmarks.html \ 11.67 - $fs/usr/lib/$PACKAGE-$VERSION/defaults/profile 11.68 + $fs/etc/$PACKAGE/profile 11.69 + mkdir -p $fs/etc/$PACKAGE/pref 11.70 cp -a $stuff/firefox-branding.js \ 11.71 - $fs/usr/lib/$PACKAGE-$VERSION/defaults/pref/firefox.js 11.72 + $fs/etc/$PACKAGE/pref/firefox.js 11.73 11.74 # User preference. 11.75 - cp -a $stuff/prefs.js $fs/usr/lib/$PACKAGE-$VERSION/defaults/profile 11.76 + cp -a $stuff/prefs.js $fs/etc/$PACKAGE/profile 11.77 cp -a $stuff/userChrome.css \ 11.78 - $fs/usr/lib/$PACKAGE-$VERSION/defaults/profile/chrome 11.79 - 11.80 - # Move default config to /etc/firefox (/usr maybe read-only) 11.81 - for i in defaults browserconfig.properties ; do 11.82 - mv -f $fs/usr/lib/$PACKAGE-$VERSION/$i $fs/etc/$PACKAGE 11.83 - done 11.84 + $fs/etc/$PACKAGE/profile/chrome 11.85 11.86 # added firefox-l10n.js to stuff to make sure its copyed for langpacks 11.87 cp -a $stuff/firefox-l10n.js \ 11.88 - $fs/etc/firefox/pref/firefox-l10n.js 11.89 + $fs/etc/$PACKAGE/pref/firefox-l10n.js 11.90 11.91 - ln -s /etc/$PACKAGE/browserconfig.properties $fs/usr/lib/$PACKAGE-$VERSION 11.92 - ln -s /etc/$PACKAGE $fs/usr/lib/$PACKAGE-$VERSION/defaults 11.93 + rm -rf $fs/usr/lib/$PACKAGE/defaults 11.94 + 11.95 + ln -sf /etc/$PACKAGE/browserconfig.properties $fs/usr/lib/$PACKAGE 11.96 + ln -sf /etc/$PACKAGE $fs/usr/lib/$PACKAGE/defaults 11.97 11.98 # EULA is accepted by SliTaz project. 11.99 sed -i s:'pref("browser.EULA.3.accepted", false);':'pref("browser.EULA.3.accepted", true);': \ 11.100 $fs/etc/firefox/pref/firefox.js 11.101 11.102 # Search Plugin (by: oddball) 11.103 - cp -a $stuff/searchplugins $fs/usr/lib/firefox-$VERSION/ 11.104 + cp -a $stuff/searchplugins $fs/usr/lib/firefox/ 11.105 chown -R root.root $fs 11.106 11.107 # Remove unnecessary files. 11.108 - rm -rf $fs/usr/lib/$PACKAGE-$VERSION/dictionaries/* 11.109 - rm -rf $fs/usr/lib/$PACKAGE-$VERSION/icons 11.110 + rm -rf $fs/usr/lib/$PACKAGE/dictionaries/* 11.111 + rm -rf $fs/usr/lib/$PACKAGE/icons 11.112 # split firefox libs 11.113 - rm -rf $fs/usr/lib/$PACKAGE-$VERSION/*.so 11.114 + rm -rf $fs/usr/lib/$PACKAGE/*.so 11.115 #retain big firefox libs 11.116 - cp $_pkg/usr/lib/$PACKAGE-$VERSION/libxul.so \ 11.117 - $fs/usr/lib/$PACKAGE-$VERSION 11.118 + cp -a $_pkg/usr/lib/$PACKAGE/libxul.so \ 11.119 + $fs/usr/lib/$PACKAGE 11.120 + #workaround for now 11.121 + #https://bugzilla.mozilla.org/show_bug.cgi?id=658850 11.122 + ln -sf firefox $fs/usr/lib/$PACKAGE/firefox-bin 11.123 } 11.124 11.125 # Pre - Post install command to set default locale. 11.126 @@ -89,10 +100,10 @@ 11.127 root=$1 11.128 # Get old plugins 11.129 mkdir /tmp/firefox-plugins-$$ 11.130 - cp -a $root/usr/lib/firefox-*/plugins/* /tmp/firefox-plugins-$$ 2> /dev/null 11.131 + cp -a $root/usr/lib/firefox/plugins/* /tmp/firefox-plugins-$$ 2> /dev/null 11.132 # Remove old libs and configs 11.133 - rm -rf $root/usr/lib/firefox-*/plugins 11.134 - rm -rf $root/usr/lib/firefox-*/dictionaries 11.135 + rm -rf $root/usr/lib/firefox/plugins 11.136 + rm -rf $root/usr/lib/firefox/dictionaries 11.137 rm -rf $root/etc/firefox 11.138 } 11.139 post_install() 11.140 @@ -105,8 +116,8 @@ 11.141 fi 11.142 for i in /tmp/firefox-plugins-$$/* ; do 11.143 [ -e $i ] || continue 11.144 - [ -e /usr/lib/firefox-*/plugins/$(basename $i) ] && continue 11.145 - cp -a $i /usr/lib/firefox-*/plugins/ 11.146 + [ -e /usr/lib/firefox/plugins/$(basename $i) ] && continue 11.147 + cp -a $i /usr/lib/firefox/plugins/ 11.148 done 11.149 rm -rf /tmp/firefox-plugins-$$ 11.150 }
12.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 12.2 +++ b/firefox/stuff/firefox-install-dir.patch Thu Nov 17 13:37:18 2011 +0000 12.3 @@ -0,0 +1,28 @@ 12.4 +diff -Nur mozilla-release.orig/config/autoconf.mk.in mozilla-release/config/autoconf.mk.in 12.5 +--- mozilla-release.orig/config/autoconf.mk.in 2011-11-06 14:06:44.462920048 +0000 12.6 ++++ mozilla-release/config/autoconf.mk.in 2011-11-06 14:20:45.124169469 +0000 12.7 +@@ -68,8 +68,8 @@ 12.8 + mandir = @mandir@ 12.9 + idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) 12.10 + 12.11 +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) 12.12 +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) 12.13 ++installdir = $(libdir)/$(MOZ_APP_NAME) 12.14 ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel 12.15 + 12.16 + DIST = $(DEPTH)/dist 12.17 + LIBXUL_SDK = @LIBXUL_SDK@ 12.18 +diff -Nur mozilla-release.orig/js/src/config/autoconf.mk.in mozilla-release/js/src/config/autoconf.mk.in 12.19 +--- mozilla-release.orig/js/src/config/autoconf.mk.in 2011-11-06 14:06:45.586263727 +0000 12.20 ++++ mozilla-release/js/src/config/autoconf.mk.in 2011-11-06 14:21:01.770993669 +0000 12.21 +@@ -61,8 +61,8 @@ 12.22 + datadir = @datadir@ 12.23 + mandir = @mandir@ 12.24 + 12.25 +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) 12.26 +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) 12.27 ++installdir = $(libdir)/$(MOZ_APP_NAME) 12.28 ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel 12.29 + 12.30 + TOP_DIST = @TOP_DIST@ 12.31 + ifneq (,$(filter /%,$(TOP_DIST)))
13.1 --- a/firefox/stuff/firefox.mozconfig Thu Nov 17 13:11:35 2011 +0000 13.2 +++ b/firefox/stuff/firefox.mozconfig Thu Nov 17 13:37:18 2011 +0000 13.3 @@ -10,6 +10,8 @@ 13.4 ac_add_options --with-system-zlib 13.5 ac_add_options --with-system-jpeg 13.6 #ac_add_options --with-system-png 13.7 +ac_add_options --with-system-libevent 13.8 +ac_add_options --with-system-libvpx 13.9 13.10 ac_add_options --enable-crypto 13.11 ac_add_options --enable-jemalloc
14.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 14.2 +++ b/firefox/stuff/mozilla-firefox-1.0-lang.patch Thu Nov 17 13:37:18 2011 +0000 14.3 @@ -0,0 +1,12 @@ 14.4 +--- mozilla/browser/app/profile/firefox.js.lang 2005-01-13 15:32:03.509282726 +0100 14.5 ++++ mozilla/browser/app/profile/firefox.js 2005-01-13 15:33:40.220914789 +0100 14.6 +@@ -253,6 +253,9 @@ 14.7 + pref("font.language.group", "chrome://global/locale/intl.properties"); 14.8 + pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties"); 14.9 + 14.10 ++// Use LANG environment variable to choose locale 14.11 ++pref("intl.locale.matchOS", true); 14.12 ++ 14.13 + // 0=lines, 1=pages, 2=history , 3=text size 14.14 + pref("mousewheel.withcontrolkey.action",3); 14.15 + pref("mousewheel.withshiftkey.action",2);
15.1 --- a/firefox/stuff/prefs.js Thu Nov 17 13:11:35 2011 +0000 15.2 +++ b/firefox/stuff/prefs.js Thu Nov 17 13:37:18 2011 +0000 15.3 @@ -9,6 +9,6 @@ 15.4 * For more information, see http://www.mozilla.org/unix/customizing.html#prefs 15.5 */ 15.6 15.7 -user_pref("general.useragent.extra.firefox", "Firefox/4.0 (SliTaz GNU/Linux)"); 15.8 +user_pref("general.useragent.extra.firefox", "Firefox/8.0.1 (SliTaz GNU/Linux)"); 15.9 user_pref("intl.charsetmenu.browser.cache", "ISO-8859-1, UTF-8"); 15.10 user_pref("font.name.serif.x-western", "DejaVu Sans");
16.1 --- a/libfirefox/receipt Thu Nov 17 13:11:35 2011 +0000 16.2 +++ b/libfirefox/receipt Thu Nov 17 13:37:18 2011 +0000 16.3 @@ -1,7 +1,7 @@ 16.4 # SliTaz package receipt. 16.5 16.6 PACKAGE="libfirefox" 16.7 -VERSION="8.0" 16.8 +VERSION="8.0.1" 16.9 CATEGORY="network" 16.10 SHORT_DESC="firefox lib files" 16.11 MAINTAINER="jozee@slitaz.org" 16.12 @@ -14,20 +14,20 @@ 16.13 # Rules to gen a SliTaz package suitable for Tazpkg. 16.14 genpkg_rules() 16.15 { 16.16 - mkdir -p $fs/usr/lib/$WANTED-$VERSION 16.17 - cp -a $_pkg/usr/lib/$WANTED-$VERSION/*.so $fs/usr/lib/$WANTED-$VERSION 16.18 + mkdir -p $fs/usr/lib/$WANTED 16.19 + cp -a $_pkg/usr/lib/$WANTED/*.so $fs/usr/lib/$WANTED 16.20 16.21 # remove some firefox libs (in firefox receipts) 16.22 - rm -rf $fs/usr/lib/firefox-$VERSION/libxul.so 16.23 + rm -rf $fs/usr/lib/firefox/libxul.so 16.24 16.25 # Remove unnecessary files (copied from firefox receipt) 16.26 - rm -rf $fs/usr/lib/firefox-$VERSION/libsqlite3.so 16.27 + rm -rf $fs/usr/lib/firefox/libsqlite3.so 16.28 } 16.29 16.30 post_install() 16.31 { 16.32 -# Export firefox libraries 16.33 - for i in /usr/lib/firefox*/*.so ; do 16.34 + # Export firefox libraries 16.35 + for i in /usr/lib/firefox/*.so ; do 16.36 [ -f $i ] && ln -sf $i /usr/lib 16.37 done 16.38 }