From 60272c9f395eb02e5b00fe1a3ad7ccd6b3e334f5 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 9 Oct 2012 14:28:39 +0200 Subject: [PATCH] firefox: update to 16.0. --- srcpkgs/firefox/files/firefox.desktop | 64 +++++++++++++++---- .../firefox/patches/firefox-install-dir.patch | 52 +++++++-------- srcpkgs/firefox/template | 18 +++--- 3 files changed, 88 insertions(+), 46 deletions(-) diff --git a/srcpkgs/firefox/files/firefox.desktop b/srcpkgs/firefox/files/firefox.desktop index 2a4b6789bc0..2f35237753c 100644 --- a/srcpkgs/firefox/files/firefox.desktop +++ b/srcpkgs/firefox/files/firefox.desktop @@ -1,16 +1,10 @@ [Desktop Entry] -Encoding=UTF-8 -Exec=firefox %u -Icon=firefox -Type=Application -Terminal=false -MultipleArgs=false Name=Firefox -Name[bn]=ফায়ারফক্স3 -Name[eo]=Fajrovulpo3 -Name[fi]=Firefox3 -Name[pa]=ਫਾਇਰਫੋਕਸ3 -Name[tg]=Рӯбоҳи оташин3 +Name[bn]=ফায়ারফক্স +Name[eo]=Fajrovulpo +Name[fi]=Firefox +Name[pa]=ਫਾਇਰਫੋਕਸ +Name[tg]=Рӯбоҳи оташин GenericName=Web Browser GenericName[af]=Web Blaaier GenericName[ar]=متصفح ويب @@ -78,6 +72,50 @@ GenericName[xh]=Umkhangeli zincwadi we Web GenericName[zh_CN]=网页浏览器 GenericName[zh_TW]=網頁瀏覽器 GenericName[zu]=Umcingi we-Web -MimeType=text/html +Comment=Browse the World Wide Web +Comment[ar]=تصفح الشبكة العنكبوتية العالمية +Comment[ast]=Restola pela Rede +Comment[bn]=ইন্টারনেট ব্রাউজ করুন +Comment[ca]=Navegueu per la web +Comment[cs]=Prohlížení stránek World Wide Webu +Comment[da]=Surf på internettet +Comment[de]=Im Internet surfen +Comment[el]=Μπορείτε να περιηγηθείτε στο διαδίκτυο (Web) +Comment[es]=Navegue por la web +Comment[et]=Lehitse veebi +Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید +Comment[fi]=Selaa Internetin WWW-sivuja +Comment[fr]=Naviguer sur le Web +Comment[gl]=Navegar pola rede +Comment[he]=גלישה ברחבי האינטרנט +Comment[hr]=Pretražite web +Comment[hu]=A világháló böngészése +Comment[it]=Esplora il web +Comment[ja]=ウェブを閲覧します +Comment[ko]=웹을 돌아 다닙니다 +Comment[ku]=Li torê bigere +Comment[lt]=Naršykite internete +Comment[nb]=Surf på nettet +Comment[nl]=Verken het internet +Comment[nn]=Surf på nettet +Comment[no]=Surf på nettet +Comment[pl]=Przeglądanie stron WWW +Comment[pt]=Navegue na Internet +Comment[pt_BR]=Navegue na Internet +Comment[ro]=Navigați pe Internet +Comment[ru]=Доступ в Интернет +Comment[sk]=Prehliadanie internetu +Comment[sl]=Brskajte po spletu +Comment[sv]=Surfa på webben +Comment[ug]=دۇنيادىكى توربەتلەرنى كۆرگىلى بولىدۇ +Comment[uk]=Перегляд сторінок Інтернету +Comment[vi]=Để duyệt các trang web +Comment[zh_CN]=浏览互联网 +Comment[zh_TW]=瀏覽網際網路 +Exec=firefox %u +Icon=firefox +Terminal=false +Type=Application +MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; StartupNotify=true -Categories=Application;Network; +Categories=Network;WebBrowser; diff --git a/srcpkgs/firefox/patches/firefox-install-dir.patch b/srcpkgs/firefox/patches/firefox-install-dir.patch index 0772ff0c496..821c210d5c3 100644 --- a/srcpkgs/firefox/patches/firefox-install-dir.patch +++ b/srcpkgs/firefox/patches/firefox-install-dir.patch @@ -1,26 +1,28 @@ ---- config/autoconf.mk.in 2011-11-06 14:06:44.462920048 +0000 -+++ config/autoconf.mk.in 2011-11-06 14:20:45.124169469 +0000 -@@ -68,8 +68,8 @@ - mandir = @mandir@ - idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) - --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZ_APP_NAME) -+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel - - DIST = $(DEPTH)/dist - LIBXUL_SDK = @LIBXUL_SDK@ ---- js/src/config/autoconf.mk.in 2011-11-06 14:06:45.586263727 +0000 -+++ js/src/config/autoconf.mk.in 2011-11-06 14:21:01.770993669 +0000 -@@ -61,8 +61,8 @@ - datadir = @datadir@ - mandir = @mandir@ - --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZ_APP_NAME) -+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel - - TOP_DIST = @TOP_DIST@ +--- config/baseconfig.mk 2012-10-09 07:34:41.762092280 +0000 ++++ config/baseconfig.mk 2012-10-09 07:40:53.052771576 +0000 +@@ -1,9 +1,9 @@ + INCLUDED_AUTOCONF_MK = 1 + +-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++includedir := $(includedir)/$(MOZ_APP_NAME) ++idldir = $(datadir)/idl/$(MOZ_APP_NAME) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + DIST = $(DEPTH)/dist + + # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't +--- js/src/config/baseconfig.mk 2012-10-09 07:34:58.411973276 +0000 ++++ js/src/config/baseconfig.mk 2012-10-09 07:39:55.143186168 +0000 +@@ -1,7 +1,7 @@ + INCLUDED_AUTOCONF_MK = 1 + +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + ifneq (,$(filter /%,$(TOP_DIST))) + DIST = $(TOP_DIST) diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index bcc721ce66f..519c06c661f 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -1,20 +1,14 @@ # Template build file for 'firefox'. pkgname=firefox -version=15.0.1 +version=16.0 revision=1 wrksrc=mozilla-release -depends="desktop-file-utils hicolor-icon-theme" -makedepends="unzip zip perl python yasm jpeg-devel libpng-devel>=1.5.10 pixman-devel -libIDL-devel nss-devel>=3.13.3 sqlite-devel libXrender-devel libXScrnSaver-devel -gtk+-devel libevent-devel libnotify-devel libvpx-devel GConf-devel -startup-notification-devel dbus-glib-devel alsa-lib-devel hunspell-devel wireless_tools-devel" - short_desc="Lightweight gecko-based web browser" maintainer="Juan RP " homepage="http://www.mozilla.org/projects/firefox" license="MPL-1.1, GPL-2, LGPL-2.1" distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.bz2" -checksum=d5b245e3f16933edf49bc9754d38013f0f82c855f164f429b92697e14ae0c3bf +checksum=60d4e73a5ff2f796d8c9f3d0650a15afe6c140e017d0678ccf16c968e2c5ff55 long_desc=" Mozilla Firefox is a free, open-source and cross-platform web browser for Windows, Linux, MacOS X and many other operating systems. It is @@ -26,6 +20,14 @@ long_desc=" can be extended by developers using industry standards such as XML, CSS, JavaScript, C++, etc. Many extensions are available." +depends="desktop-file-utils hicolor-icon-theme" + +makedepends="unzip zip perl python yasm jpeg-devel libpng-devel>=1.5.10 + pixman-devel libIDL-devel nss-devel>=3.13.3 sqlite-devel libXrender-devel + gtk+-devel libevent-devel libnotify-devel libvpx-devel GConf-devel + startup-notification-devel dbus-glib-devel alsa-lib-devel hunspell-devel + wireless_tools-devel libXScrnSaver-devel" + do_build() { # Fix PRE_RELEASE_SUFFIX sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' browser/base/Makefile.in