summaryrefslogtreecommitdiff
path: root/libre/icecat
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2011-08-19 14:56:22 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2011-08-19 14:56:22 -0300
commitd7406c2ab8481bd2689b87b8b50213bc23bf525d (patch)
treed81077a22551155cd6b5a1676c9a3e6577fb7ab3 /libre/icecat
parent9fe3016e5e2a96898b283a0ba14d277dafc8b389 (diff)
libre/icecat-6.0-1
PGO support!
Diffstat (limited to 'libre/icecat')
-rw-r--r--libre/icecat/Makefile.in451
-rw-r--r--libre/icecat/PKGBUILD88
-rw-r--r--libre/icecat/icecat.install18
-rw-r--r--libre/icecat/mozconfig1
4 files changed, 499 insertions, 59 deletions
diff --git a/libre/icecat/Makefile.in b/libre/icecat/Makefile.in
new file mode 100644
index 000000000..bd662ba85
--- /dev/null
+++ b/libre/icecat/Makefile.in
@@ -0,0 +1,451 @@
+# vim:set ts=8 sw=8 sts=8 noet:
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Mozilla Browser code.
+#
+# The Initial Developer of the Original Code is
+# Benjamin Smedberg <bsmedberg@covad.net>
+# Portions created by the Initial Developer are Copyright (C) 2004
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH = ../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
+relativesrcdir = browser/locales
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/config.mk
+
+vpath %.xml @srcdir@/en-US/searchplugins
+vpath %.xml $(LOCALE_SRCDIR)/searchplugins
+
+ifdef LOCALE_MERGEDIR
+vpath crashreporter%.ini $(LOCALE_MERGEDIR)/browser/crashreporter
+endif
+vpath crashreporter%.ini $(LOCALE_SRCDIR)/crashreporter
+ifdef LOCALE_MERGEDIR
+vpath crashreporter%.ini @srcdir@/en-US/crashreporter
+endif
+ifdef LOCALE_MERGEDIR
+vpath book%.inc $(LOCALE_MERGEDIR)/browser/profile
+endif
+vpath book%.inc $(LOCALE_SRCDIR)/profile
+ifdef LOCALE_MERGEDIR
+vpath book%.inc @srcdir@/en-US/profile
+endif
+
+
+run_for_effects := $(shell if ! test -d $(DIST); then $(NSINSTALL) -D $(DIST); fi; if ! test -d $(DIST)/branding; then $(NSINSTALL) -D $(DIST)/branding; fi)
+_ABS_DIST := $(shell cd $(DIST) && pwd)
+
+ifdef MOZ_BRANDING_DIRECTORY
+SUBMAKEFILES += \
+ $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/Makefile \
+ $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \
+ $(NULL)
+endif
+
+# This makefile uses variable overrides from the libs-% target to
+# build non-default locales to non-default dist/ locations. Be aware!
+
+AB = $(firstword $(subst -, ,$(AB_CD)))
+
+APP_VERSION := $(shell cat $(srcdir)/../config/version.txt)
+
+PWD := $(shell pwd)
+core_abspath = $(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(PWD)/$(1)))
+
+# These are defaulted to be compatible with the files the wget-en-US target
+# pulls. You may override them if you provide your own files. You _must_
+# override them when MOZ_PKG_PRETTYNAMES is defined - the defaults will not
+# work in that case.
+ZIP_IN ?= $(_ABS_DIST)/$(PACKAGE)
+WIN32_INSTALLER_IN ?= $(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
+
+DEFINES += \
+ -DAB_CD=$(AB_CD) \
+ -DMOZ_LANGPACK_EID=langpack-$(AB_CD)@gnuzilla.gnu.org \
+ -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
+ -DLOCALE_SRCDIR=$(call core_abspath,$(LOCALE_SRCDIR)) \
+ -DPKG_BASENAME="$(PKG_BASENAME)" \
+ -DPKG_INST_BASENAME="$(PKG_INST_BASENAME)" \
+ $(NULL)
+
+ifndef MOZ_BRANDING_DIRECTORY
+DEFINES += -DMOZ_USE_GENERIC_BRANDING
+endif
+
+ifeq (,$(filter-out pref,$(MOZ_EXTENSIONS)))
+DEFINES += -DEXTENSION_PREF
+endif
+
+PREF_JS_EXPORTS = $(LOCALE_SRCDIR)/firefox-l10n.js
+
+include $(topsrcdir)/config/rules.mk
+
+libs::
+# @if test -f "$(LOCALE_SRCDIR)/existing-profile-defaults.js"; then \
+# $(PERL) $(topsrcdir)/config/preprocessor.pl $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) \
+# $(LOCALE_SRCDIR)/existing-profile-defaults.js > $(FINAL_TARGET)/defaults/existing-profile-defaults.js; \
+# fi
+install::
+# @if test -f "$(LOCALE_SRCDIR)/existing-profile-defaults.js"; then \
+# $(PERL) $(topsrcdir)/config/preprocessor.pl $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) \
+# $(LOCALE_SRCDIR)/existing-profile-defaults.js > $(DESTDIR)$(mozappdir)/defaults/existing-profile-defaults.js; \
+# fi
+
+README_FILES = \
+ README.txt \
+ $(NULL)
+
+PROFILE_FILES = \
+ localstore.rdf \
+ mimeTypes.rdf \
+ $(NULL)
+
+PROFILE_CHROME = userChrome-example.css userContent-example.css
+
+libs:: $(addprefix $(LOCALE_SRCDIR)/,$(README_FILES))
+ifeq ($(OS_ARCH),WINNT)
+ $(EXIT_ON_ERROR) \
+ for file in $^; do \
+ $(PERL) -pe 's/(?<!\r)\n/\r\n/g;' < $$file > $(FINAL_TARGET)/`basename $$file`; \
+ done
+else
+ifneq ($(OS_ARCH),OS2)
+ $(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)
+endif
+endif
+
+NO_JA_JP_MAC_AB_CD := $(if $(filter ja-JP-mac, $(AB_CD)),ja,$(AB_CD))
+
+%/defaults/profile/bookmarks.html: bookmarks.inc generic/profile/bookmarks.html.in
+ $(SYSINSTALL) -D $(dir $@)
+ $(PYTHON) $(topsrcdir)/config/Preprocessor.py \
+ -I $< \
+ -DAB_CD=$(NO_JA_JP_MAC_AB_CD) \
+ $(srcdir)/generic/profile/bookmarks.html.in \
+ > $@
+
+libs:: $(FINAL_TARGET)/defaults/profile/bookmarks.html ;
+
+libs:: $(addprefix generic/profile/,$(PROFILE_FILES))
+ $(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile
+
+libs:: $(addprefix $(LOCALE_SRCDIR)/profile/chrome/,$(PROFILE_CHROME))
+ $(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile/chrome
+
+install:: $(DESTDIR)$(mozappdir)/defaults/profile/bookmarks.html ;
+
+install:: $(addprefix generic/profile/,$(PROFILE_FILES))
+ $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile
+
+install:: $(addprefix $(LOCALE_SRCDIR)/profile/chrome/,$(PROFILE_CHROME))
+ $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/chrome
+
+SEARCH_PLUGINS = $(shell cat $(LOCALE_SRCDIR)/searchplugins/list.txt)
+
+libs:: $(addsuffix .xml,$(SEARCH_PLUGINS))
+ $(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/searchplugins
+
+install:: $(addsuffix .xml,$(SEARCH_PLUGINS))
+ $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/searchplugins
+
+tests:
+ifneq (en-US, $(AB_CD))
+ @echo "Verifying $(AB_CD) installer variable usage"
+ @$(PERL) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/check-locales.pl $(LOCALE_SRCDIR)/installer
+endif
+
+clobber-%:
+ $(RM) -rf $(DIST)/xpi-stage/locale-$*
+
+libs-%:
+ $(NSINSTALL) -D $(DIST)/install
+ @$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1
+ @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
+ @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1
+ifdef MOZ_BRANDING_DIRECTORY
+ @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
+endif
+ @$(MAKE) tests AB_CD=$*
+
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+MOZ_PKG_MAC_DSSTORE=$(_ABS_DIST)/branding/dsstore
+MOZ_PKG_MAC_BACKGROUND=$(_ABS_DIST)/branding/background.png
+MOZ_PKG_MAC_ICON=$(_ABS_DIST)/branding/disk.icns
+MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ "
+endif
+
+PACKAGER_NO_LIBS = 1
+include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
+
+repackage-win32-installer: WIN32_INSTALLER_OUT="$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe"
+repackage-win32-installer: $(WIN32_INSTALLER_IN) $(SUBMAKEFILES)
+ @echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)."
+ifdef MOZ_BRANDING_DIRECTORY
+ $(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY) export
+else
+ $(MAKE) -C ../installer/windows export
+endif
+ if test ! -d $(_ABS_DIST)/$(PKG_INST_PATH); then \
+ $(NSINSTALL) -D $(_ABS_DIST)/$(PKG_INST_PATH); \
+ fi
+ $(RM) -rf l10n-stage
+ $(NSINSTALL) -D l10n-stage
+ $(CYGWIN_WRAPPER) 7z x -ol10n-stage $(WIN32_INSTALLER_IN)
+ $(RM) -r l10n-stage/localized
+ $(RM) l10n-stage/setup.exe
+# copy xpi-stage over, but not install.rdf and chrome.manifest,
+# those are just for language packs
+ cp -r $(DIST)/xpi-stage/locale-$(AB_CD) l10n-stage/localized
+ $(RM) l10n-stage/localized/install.rdf l10n-stage/localized/chrome.manifest
+ $(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen l10ngen/setup.exe l10ngen/7zSD.sfx
+ cp ../installer/windows/l10ngen/setup.exe l10n-stage
+ $(NSINSTALL) -D l10n-stage/localized/uninstall
+ cp ../installer/windows/l10ngen/helper.exe l10n-stage/localized/uninstall
+ rm -f app.7z
+ cd l10n-stage && \
+ $(CYGWIN_WRAPPER) 7z a -r -t7z ../app.7z -mx -m0=BCJ2 -m1=LZMA:d24 -m2=LZMA:d19 -m3=LZMA:d19 -mb0:1 -mb0s1:2 -mb0s2:3
+ cat ../installer/windows/l10ngen/7zSD.sfx \
+ $(topsrcdir)/browser/installer/windows/app.tag \
+ app.7z > $(WIN32_INSTALLER_OUT)
+ chmod 0755 $(WIN32_INSTALLER_OUT)
+
+ifeq (WINNT,$(OS_ARCH))
+repackage-win32-installer-%: $(WIN32_INSTALLER_IN) libs-%
+ @$(MAKE) repackage-win32-installer AB_CD=$* WIN32_INSTALLER_IN=$(WIN32_INSTALLER_IN)
+else
+repackage-win32-installer-%: ;
+endif
+
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+STAGEDIST = $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/MacOS
+else
+STAGEDIST = $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_DIR)
+endif
+
+$(STAGEDIST): AB_CD:=en-US
+$(STAGEDIST): UNPACKAGE=$(ZIP_IN)
+$(STAGEDIST): $(ZIP_IN)
+# only mac needs to remove the parent of STAGEDIST...
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ if test -d $(DIST)/l10n-stage; then \
+ $(RM) -r -v $(DIST)/l10n-stage; \
+ fi
+else
+# ... and windows doesn't like removing STAGEDIST itself, remove all children
+ if test -d $(DIST)/l10n-stage; then \
+ find $(STAGEDIST) -maxdepth 1 -print0 | xargs -0 $(RM) -r ; \
+ fi
+endif
+ $(NSINSTALL) -D $(DIST)/l10n-stage
+ cd $(DIST)/l10n-stage && \
+ $(UNMAKE_PACKAGE)
+ make clobber-zip AB_CD=en-US
+
+clobber-zip:
+ $(RM) $(STAGEDIST)/chrome/$(AB_CD).jar \
+ $(STAGEDIST)/chrome/$(AB_CD).manifest \
+ $(STAGEDIST)/defaults/pref/firefox-l10n.js
+ $(RM) -rf $(STAGEDIST)/searchplugins \
+ $(STAGEDIST)/dictionaries \
+ $(STAGEDIST)/defaults/profile \
+ $(STAGEDIST)/chrome/$(AB_CD)
+
+unpack: $(STAGEDIST)
+ @echo done unpacking
+
+repackage-zip: ZIP_OUT="$(_ABS_DIST)/$(PACKAGE)"
+repackage-zip: UNPACKAGE="$(ZIP_IN)"
+repackage-zip:
+ifeq (WINNT,$(OS_ARCH))
+ $(RM) -r $(STAGEDIST)/uninstall
+ $(NSINSTALL) -D $(STAGEDIST)/uninstall
+ cp ../installer/windows/l10ngen/helper.exe $(STAGEDIST)/uninstall
+endif
+# copy xpi-stage over, but not install.rdf and chrome.manifest,
+# those are just for language packs
+ cd $(DIST)/xpi-stage/locale-$(AB_CD) && \
+ tar --exclude=install.rdf --exclude=chrome.manifest $(TAR_CREATE_FLAGS) - * | ( cd $(STAGEDIST) && tar -xf - )
+ifneq (en,$(AB))
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ mv $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/Resources/en.lproj $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/Resources/$(AB).lproj
+endif
+endif
+ $(NSINSTALL) -D $(DIST)/l10n-stage/$(PKG_PATH)
+ cd $(DIST)/l10n-stage; \
+ $(MAKE_PACKAGE)
+ifdef MOZ_MAKE_COMPLETE_MAR
+ $(MAKE) -C $(DEPTH)/tools/update-packaging full-update AB_CD=$(AB_CD) \
+ MOZ_PKG_PRETTYNAMES=$(MOZ_PKG_PRETTYNAMES) \
+ PACKAGE_BASE_DIR="$(_ABS_DIST)/l10n-stage" \
+ DIST="$(_ABS_DIST)"
+endif
+# packaging done, undo l10n stuff
+ifneq (en,$(AB))
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ mv $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/Resources/$(AB).lproj $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/Resources/en.lproj
+endif
+endif
+ $(MAKE) clobber-zip AB_CD=$(AB_CD)
+ $(NSINSTALL) -D $(DIST)/$(PKG_PATH)
+ mv -f "$(DIST)/l10n-stage/$(PACKAGE)" "$(DIST)/$(PACKAGE)"
+
+repackage-zip-%: $(ZIP_IN) $(STAGEDIST) libs-%
+ @$(MAKE) repackage-zip AB_CD=$* ZIP_IN=$(ZIP_IN)
+
+langpack-%: LANGPACK_FILE=$(_ABS_DIST)/$(PKG_LANGPACK_PATH)$(PKG_LANGPACK_BASENAME).xpi
+langpack-%: AB_CD=$*
+langpack-%: XPI_NAME=locale-$*
+langpack-%: libs-%
+ @echo "Making langpack $(LANGPACK_FILE)"
+ $(NSINSTALL) -D $(DIST)/$(PKG_LANGPACK_PATH)
+# $(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) -I$(call EXPAND_LOCALE_SRCDIR,toolkit/locales)/defines.inc -I$(LOCALE_SRCDIR)/defines.inc $(srcdir)/generic/install.rdf > $(FINAL_TARGET)/install.rdf
+ cd $(DIST)/xpi-stage/locale-$(AB_CD) && \
+ $(ZIP) -r9D $(LANGPACK_FILE) install.rdf chrome chrome.manifest -x chrome/$(AB_CD).manifest
+
+langpack: langpack-$(AB_CD)
+
+# This is a generic target that will make a langpack, repack ZIP (+tarball)
+# builds, and repack an installer if applicable. It is called from the
+# tinderbox scripts. Alter it with caution.
+
+installers-%: clobber-% langpack-% repackage-win32-installer-% repackage-zip-%
+ @echo "repackaging done"
+
+ifdef MOZ_UPDATER
+libs:: $(addprefix $(LOCALE_SRCDIR)/,updater/updater.ini)
+ifeq ($(OS_ARCH),WINNT)
+ cat $< $(srcdir)/../installer/windows/nsis/updater_append.ini | \
+ sed -e "s/^InfoText=/Info=/" -e "s/^TitleText=/Title=/" | \
+ sed -e "s/%MOZ_APP_DISPLAYNAME%/$(MOZ_APP_DISPLAYNAME)/" > \
+ $(FINAL_TARGET)/updater.ini
+else
+ cat $< | \
+ sed -e "s/^InfoText=/Info=/" -e "s/^TitleText=/Title=/" | \
+ sed -e "s/%MOZ_APP_DISPLAYNAME%/$(MOZ_APP_DISPLAYNAME)/" > \
+ $(FINAL_TARGET)/updater.ini
+endif
+endif
+
+ifdef MOZ_CRASHREPORTER
+libs:: crashreporter-override.ini
+ $(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)
+endif
+
+# This variable is to allow the wget-en-US target to know which ftp server to download from
+ifndef EN_US_BINARY_URL
+EN_US_BINARY_URL = $(error You must set EN_US_BINARY_URL)
+endif
+
+# This make target allows us to wget the latest en-US binary from a specified website
+# The make installers-% target needs the en-US binary in dist/
+# and for the windows repackages we need the .installer.exe in dist/sea
+wget-en-US:
+ifndef WGET
+ $(error Wget not installed)
+endif
+ (cd $(_ABS_DIST) && $(WGET) -nv -N $(EN_US_BINARY_URL)/$(PACKAGE))
+ @echo "Downloaded $(EN_US_BINARY_URL)/$(PACKAGE) to $(_ABS_DIST)/$(PACKAGE)"
+ifeq ($(OS_ARCH), WINNT)
+ $(NSINSTALL) -D $(_ABS_DIST)/$(PKG_INST_PATH)
+ (cd $(_ABS_DIST)/$(PKG_INST_PATH) && $(WGET) -nv -N "$(EN_US_BINARY_URL)/$(PKG_PATH)$(PKG_INST_BASENAME).exe")
+ @echo "Downloaded $(EN_US_BINARY_URL)/$(PKG_PATH)$(PKG_INST_BASENAME).exe to $(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe"
+endif
+
+ident:
+ @$(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(STAGEDIST)/application.ini App SourceStamp
+
+#These make targets call prepare-repackages by setting different UPLOAD_DIR
+prepare-upload-latest-%:
+ @$(MAKE) prepare-repackages-$* UPLOAD_DIR=$(DIST)/upload/latest
+
+prepare-upload-dated-%:
+ @$(MAKE) prepare-repackages-$* UPLOAD_DIR=$(DIST)/upload/`date "+%Y-%m-%d-%H"`-$(MOZ_PKG_APPNAME)$(MOZ_APP_VERSION)-l10n
+
+#Each platform uploads their xpi files to different folders
+ifeq (Linux, $(OS_ARCH))
+XPI_DESTINATION = linux-xpi
+endif
+ifeq (Darwin, $(OS_ARCH))
+XPI_DESTINATION = mac-xpi
+endif
+ifeq (WINNT, $(OS_ARCH))
+XPI_DESTINATION = windows-xpi
+endif
+
+# This target will generate a UPLOAD_DIR folder with
+# l10n repackages in the way that we offer l10n nightlies
+# 1) ./ the binary
+# 2) ./{linux,mac,windows}-xpi/locale.xpi
+prepare-repackages-%:
+ifndef XPI_DESTINATION
+ $(error XPI_DESTINATION not defined; \
+ This is the folder where the xpi files will be moved to)
+endif
+ifndef UPLOAD_DIR
+ $(error UPLOAD_DIR not defined)
+endif
+ $(NSINSTALL) -D $(UPLOAD_DIR)
+ $(NSINSTALL) -D $(UPLOAD_DIR)/$(XPI_DESTINATION)
+# Move the langpack
+ mv $(DIST)/install/firefox-$(MOZ_APP_VERSION).$*.langpack.xpi \
+ $(UPLOAD_DIR)/$(XPI_DESTINATION)/$*.xpi
+# Move the repackage
+ mv $(DIST)/firefox-$(MOZ_APP_VERSION).$*.* \
+ $(UPLOAD_DIR)/.
+# Move the windows installer
+ifeq (WINNT, $(OS_ARCH))
+ mv $(DIST)/install/sea/firefox-$(MOZ_APP_VERSION).$*.win32.installer.exe \
+ $(UPLOAD_DIR)/.
+endif
+# Set the permissions that the folders will have in ftp once uploaded
+ chmod -vR 775 $(UPLOAD_DIR)
+
+l10n-upload-%: AB_CD=$*
+l10n-upload-%:
+ $(PYTHON) $(topsrcdir)/build/upload.py --base-path $(DIST) "$(DIST)/$(PACKAGE)" $(DIST)/$(LANGPACK)
+ifdef MOZ_MAKE_COMPLETE_MAR
+ $(PYTHON) $(topsrcdir)/build/upload.py --base-path $(DIST) $(DIST)/$(COMPLETE_MAR)
+endif
+ifeq (WINNT, $(OS_ARCH))
+ $(PYTHON) $(topsrcdir)/build/upload.py --base-path $(DIST) "$(INSTALLER_PACKAGE)"
+endif
+
+
+merge-%:
+ifdef LOCALE_MERGEDIR
+ $(RM) -rf $(LOCALE_MERGEDIR)
+ MACOSX_DEPLOYMENT_TARGET= compare-locales -m $(LOCALE_MERGEDIR) $(srcdir)/l10n.ini $(L10NBASEDIR) $*
+endif
+ @echo
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index ca29d2a2d..af3a0250c 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -7,6 +7,8 @@
# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com>
# Changelog
+# =6.0
+# * Build with PGO support
# =3.6.13
# * Installed Privacy Extension by default
# * DDG is now the default search engine
@@ -19,18 +21,19 @@
# * Disabled ContentHandlers and other Google/Yahoo! related services
pkgname=icecat
-pkgver=5.0
-pkgrel=2
+pkgver=6.0
+pkgrel=1
pkgdesc="GNU version of the Firefox browser. SafeBrowsing and other Google services disabled!"
arch=('i686' 'x86_64' 'mips64el')
+license=('MPL' 'GPL' 'LGPL')
+depends=('gtk2' 'gcc-libs' 'mozilla-common' 'nss>=3.12.10' 'libxt' 'libxrender'
+ 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib'
+ 'libevent' 'sqlite3>=3.7.4' 'libnotify' 'desktop-file-utils' 'libvpx'
+ 'lcms' 'nspr>=4.8.8' 'libevent' 'libpng' 'cairo')
+makedepends=('unzip' 'zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm'
+ 'mesa' 'autoconf2.13' 'gconf' 'xorg-server-xvfb')
+options=(!buildflags)
url="http://www.gnu.org/software/gnuzilla/"
-license=('GPL' 'MPL' 'LGPL')
-depends=('gtk2' 'gcc-libs' 'libidl2' 'mozilla-common' 'nss>=3.12.10' 'libxt'
- 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib'
- 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify' 'desktop-file-utils'
- 'libvpx' 'lcms' 'nspr>=4.8.8' 'libevent' 'libpng' 'cairo')
-makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools'
- 'yasm' 'mesa' 'autoconf2.13' 'gconf' 'xorg-server-xvfb')
install=icecat.install
source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
mozconfig
@@ -45,56 +48,65 @@ source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
yacy.xml
duck-duck-go-ssl.xml
duck-duck-go-lite.xml
+ Makefile.in
# Default options
firefox.js
region.properties)
+md5sums=('9b752e408717ccb50d50f0bafe18a552'
+ 'e7fe1de533599f4ae645ea1661e4006a'
+ 'e81ad01dbc16ba28bf92ba4b7c309ca7'
+ 'd93fe402b87cd000a869e1fd6badc6c9'
+ 'bd5db57c23c72a02a489592644f18995'
+ '462c68585461f8cdc23c93c46f6ee4cf'
+ '2d492295c4308f9bba9ece28d8b3af2d'
+ '937ac0e5392b060d93bd33e761fbfa51'
+ 'cf97082e77e3ef5f1bd74b1db9329965'
+ '24528ca3f7f1e1a0ba735231aa3ac1de'
+ 'c5f00b6b24222aacd5a749d1f59c4d24'
+ 'e1bda0854de7d764f7401c81bb82b5ef'
+ 'ff83f1796ee13d3aec494649491d93cc'
+ '9952048383966926eea6d67384102425'
+ 'f1c76e7e244257856a386ca2de69bdf0')
build() {
-
ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR
- msg2 "Patching some files..."
cd "${srcdir}/${pkgname}-${pkgver}/"
patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch"
-
+
+# Solve missing reporter locales and preprocessor.pl
+ cp --remove-destination ${srcdir}/Makefile.in ./browser/locales/
+
+# Default prefs, remove Google stuff
cp --remove-destination ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/
cp --remove-destination ${srcdir}/firefox.js ./browser/app/profile/
- msg2 "Starting build..."
cp "${srcdir}/mozconfig" .mozconfig
# Kill @PRE_RELEASE_SUFFIX@ from browser.xul because it
# gets set to \177 for an unknown reason
sed -i 's/@PRE_RELEASE_SUFFIX@//g' \
- browser/base/content/browser.xul
+ browser/base/content/browser.xul
- ## Don't generate startup cache. Unbreaks make install
- sed -i 's/^GENERATE_CACHE .*/GENERATE_CACHE = true/' \
- toolkit/mozapps/installer/packager.mk
+ export LDFLAGS="-Wl,-rpath,/usr/lib/icecat-$pkgver -Wl,-O1,--sort-common,--hash-style=gnu,--as-needed"
+ export PYTHON="/usr/bin/python2"
- export LDFLAGS="-Wl,-rpath,${ICECATDIR} -Wl,-O1,--sort-common,--hash-style=gnu,--as-needed"
- export PYTHON="/usr/bin/python2"
-
# PGO
sed -i '/^NO_PROFILE_GUIDED_OPTIMIZE = 1$/d' \
memory/jemalloc/Makefile.in
echo 'LDFLAGS += -lX11 -lXrender' \
>> layout/build/Makefile.in
- # Start build
- ./configure
- make MOZ_MAKE_FLAGS="${MAKEFLAGS}"
-
-# LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX :99 &
-# LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS"
-# kill $! || true
+ LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 &
+ LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS"
+ kill $! || true
}
package() {
ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR
cd "${srcdir}/${pkgname}-${pkgver}/"
- make install DESTDIR="${pkgdir}"
+ make -j1 -f client.mk install DESTDIR="${pkgdir}"
msg2 "Finishing..."
install -m755 -d ${pkgdir}/usr/share/applications
@@ -108,9 +120,9 @@ package() {
# Remove included dictionaries, add symlink to system myspell path
# Note: this will cause file conflicts when users have installed dictionaries in the old location
- #rm -rf "${pkgdir}/usr/lib/firefox-$pkgver/dictionaries"
- #ln -sf /usr/share/myspell/dicts \
- # "${pkgdir}/usr/lib/firefox-$pkgver/dictionaries"
+ rm -rf "$pkgdir/usr/lib/icecat-$pkgver/dictionaries"
+ ln -sf /usr/share/myspell/dicts \
+ "$pkgdir/usr/lib/icecat-$pkgver/dictionaries"
# We don't want the development stuff
rm -r "$pkgdir"/usr/{include,lib/icecat-devel-$pkgver,share/idl}
@@ -121,17 +133,3 @@ package() {
install -m755 -d ${pkgdir}${ICECATDIR}/searchplugins/
install -m644 ${srcdir}/*.xml ${pkgdir}${ICECATDIR}/searchplugins/
}
-md5sums=('3fd4f4c2bfdacdd52bbd6e197ceda95f'
- '105f2e5d98d719c37cba5601a59b8593'
- 'e81ad01dbc16ba28bf92ba4b7c309ca7'
- 'd93fe402b87cd000a869e1fd6badc6c9'
- 'bd5db57c23c72a02a489592644f18995'
- '462c68585461f8cdc23c93c46f6ee4cf'
- '2d492295c4308f9bba9ece28d8b3af2d'
- '937ac0e5392b060d93bd33e761fbfa51'
- 'cf97082e77e3ef5f1bd74b1db9329965'
- '24528ca3f7f1e1a0ba735231aa3ac1de'
- 'c5f00b6b24222aacd5a749d1f59c4d24'
- 'e1bda0854de7d764f7401c81bb82b5ef'
- '9952048383966926eea6d67384102425'
- 'f1c76e7e244257856a386ca2de69bdf0')
diff --git a/libre/icecat/icecat.install b/libre/icecat/icecat.install
index cefb71c4d..c1fe8284a 100644
--- a/libre/icecat/icecat.install
+++ b/libre/icecat/icecat.install
@@ -1,21 +1,13 @@
-#[ "${ICECATDIR}" = "" ] && ICECATDIR="/usr/lib/icecat"
-post_install () {
- echo -e "\n >>> Please, source /etc/profile or logout and re-login to your desktop session"
- echo -e " >>> If you installed some locale in the past or some stuff in libdir, please remove old /usr/lib/icecat-3.6.* directories"
- update-desktop-database -q
+post_install() {
+ update-desktop-database -q
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
}
-# arg 1: the new package version
-# arg 2: the old package version
post_upgrade() {
- post_install $1
+ post_install $1
}
post_remove() {
- update-desktop-database -q
+ post_install $1
}
-#op=$1
-#shift
-
-#$op $*
diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig
index 442dfe76d..9ece9301f 100644
--- a/libre/icecat/mozconfig
+++ b/libre/icecat/mozconfig
@@ -18,7 +18,6 @@ ac_add_options --enable-system-lcms
ac_add_options --with-pthreads
ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --enable-optimize="-pipe -O3"
ac_add_options --disable-safe-browsing
ac_add_options --enable-extensions=default
ac_add_options --enable-startup-notification