summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mozilla-testing/iceweasel-libre/PKGBUILD97
-rw-r--r--mozilla-testing/iceweasel-libre/firefox-install-dir.patch28
-rw-r--r--mozilla-testing/iceweasel-libre/iceweasel.install18
-rw-r--r--mozilla-testing/iceweasel-libre/mozconfig67
-rw-r--r--mozilla-testing/iceweasel-libre/vendor.js9
5 files changed, 134 insertions, 85 deletions
diff --git a/mozilla-testing/iceweasel-libre/PKGBUILD b/mozilla-testing/iceweasel-libre/PKGBUILD
index 23db67d96..3a3d7a561 100644
--- a/mozilla-testing/iceweasel-libre/PKGBUILD
+++ b/mozilla-testing/iceweasel-libre/PKGBUILD
@@ -10,13 +10,11 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=iceweasel
pkgname=iceweasel-libre
-_pkgver=9.0
pkgver=${_debver}.${_debrel}
pkgrel=1
pkgdesc="A libre version of Debian Iceweasel, the browser based on Mozilla Firefox."
arch=('i586' 'i686' 'x86_64' 'mips64el')
-url="http://www.geticeweasel.org/"
license=('GPL2' 'MPL' 'LGPL')
depends=(
'alsa-lib'
@@ -32,7 +30,7 @@ depends=(
'mime-types'
'mozilla-common'
'mozilla-searchplugins'
- 'nss'
+ 'nss>=3.13.1'
'sqlite3'
'startup-notification'
)
@@ -40,6 +38,7 @@ makedepends=(
'autoconf2.13'
'diffutils'
'libidl2'
+ 'librsvg'
'mesa'
'p7zip-libre'
'pkg-config'
@@ -49,17 +48,17 @@ makedepends=(
'yasm'
'zip'
)
-options=(!buildflags !distcc)
+url="http://www.geticeweasel.org/"
install=iceweasel.install
source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
"${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
"${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc"
mozconfig
- libre.patch
- # Default configuration
- mozilla-firefox-1.0-lang.patch
xulrunner-copy-stub.patch
- region.properties)
+ libre.patch
+ firefox-install-dir.patch
+ region.properties
+ vendor.js)
if [ "$_pkgname" != "$pkgname" ]; then
provides+=("$_pkgname")
@@ -89,59 +88,61 @@ build() {
ln -s "${_debname}-${_debver}" "${_pkgname}-${pkgver}"
msg2 "Starting normal build..."
- cd "${srcdir}/${_pkgname}-${pkgver}/"
- patch -p1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch"
- patch -p1 -i "${srcdir}/xulrunner-copy-stub.patch"
- patch -p1 -i "${srcdir}/libre.patch"
+ cd "$srcdir/$_pkgname-$pkgver"
- cp --remove-destination ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/
-
- msg2 "Starting build..."
-
- cp "${srcdir}/mozconfig" .mozconfig
- #make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
- ./configure
- #touch config*
- make MOZ_MAKE_FLAGS="${MAKEFLAGS}"
-
- msg2 "Build complete"
+ cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
+ patch -Np1 -i "$srcdir/firefox-install-dir.patch" # install to /usr/lib/$pkgname
+ patch -Np1 -i "${srcdir}/xulrunner-copy-stub.patch" # small fix
+ patch -Np1 -i "${srcdir}/libre.patch"
+ cp -f ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/
+
+ # Fix PRE_RELEASE_SUFFIX
+ sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
+ browser/base/Makefile.in
+
+ export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname"
+ export PYTHON="/usr/bin/python2"
+
+ 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() {
+ cd "$srcdir/$_pkgname-$pkgver"
+ make -j1 -f client.mk DESTDIR="$pkgdir" install
- cd "${srcdir}/${_pkgname}-${pkgver}/"
- #make -j1 -f client.mk DESTDIR="${pkgdir}" install
- make install DESTDIR="${pkgdir}"
+ install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$pkgname/defaults/pref"
- msg2 "Finishing..."
+ brandingdir="debian/branding"
+ for i in 16x16 32x32 64x64; do
+ install -Dm644 "$brandingdir/default${i/x*/}.png" "$pkgdir/usr/share/icons/hicolor/$i/apps/$pkgname.png"
+ done
+ install -Dm644 "$brandingdir/iceweasel_icon.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/iceweasel.svg"
- install -m755 -d ${pkgdir}/usr/share/applications
- install -m755 -d ${pkgdir}/usr/share/pixmaps
- install -m755 -d ${pkgdir}/usr/share/icons/hicolor/16x16/apps
- install -m755 -d ${pkgdir}/usr/share/icons/hicolor/32x32/apps
- install -m755 -d ${pkgdir}/usr/share/icons/hicolor/64x64/apps
- install -m755 -d ${pkgdir}/usr/share/icons/hicolor/scalable/apps
-
- install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/iceweasel.desktop ${pkgdir}/usr/share/applications/ || return 1
- install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/default16.png ${pkgdir}/usr/share/icons/hicolor/16x16/apps/iceweasel.png
- install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/default32.png ${pkgdir}/usr/share/icons/hicolor/32x32/apps/iceweasel.png
- install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/default64.png ${pkgdir}/usr/share/icons/hicolor/64x64/apps/iceweasel.png
- install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/iceweasel_icon.svg ${pkgdir}/usr/share/icons/hicolor/scalable/apps/iceweasel.svg
-
+ install -d "$pkgdir/usr/share/applications"
+ install -m644 debian/iceweasel.desktop "$pkgdir/usr/share/applications"
+ #install -m644 debian/iceweasel-safe.desktop "$pkgdir/usr/share/applications"
- rm -rf ${pkgdir}/usr/lib/${_pkgname}-${_pkgver}/searchplugins
- ln -sf /usr/lib/mozilla/searchplugins ${pkgdir}/usr/lib/${_pkgname}-${_pkgver}/searchplugins
+ rm -rf "$pkgdir/usr/lib/$pkgname/"{dictionaries,hyphenation,searchplugins,plugins}
+ ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$pkgname/dictionaries"
+ ln -sf /usr/share/hyphen "$pkgdir/usr/lib/$pkgname/hyphenation"
+ ln -sf /usr/lib/mozilla/plugins "$pkgdir/usr/lib/$pkgname/plugins"
+ ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgname/searchplugins"
- rm -rvf ${pkgdir}/usr/lib/iceweasel-devel-${_pkgver}
- rm -rvf ${pkgdir}/usr/include
+ # We don't want the development stuff
+ rm -rf "$pkgdir"/usr/{include,lib/$pkgname-devel,share/idl}
+ # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850
+ ln -sf $pkgname "$pkgdir/usr/lib/$pkgname/$pkgname-bin"
}
md5sums=('bd656a24d0ba3d4ca7b68aca8081a07d'
'6cde9fe38df1434fdcc0f3a078b0238e'
'd9b5f2a893ad80da492aec8c9a7cbb7c'
- '5e2574eef71ee1437e2f8e7481c67893'
- '9609e77182cc300e3fe9d4b0c7e7efb4'
- 'bd5db57c23c72a02a489592644f18995'
+ 'c401067e1ffcb8df5a53076845d28a88'
'a485a2b5dc544a8a2bd40c985d2e5813'
- 'f1c76e7e244257856a386ca2de69bdf0')
+ '8942889dfa6936dc034e9c2f3503325a'
+ '1e4bcac59e93d21fffa6a1d1ad235247'
+ 'f1c76e7e244257856a386ca2de69bdf0'
+ '0d053487907de4376d67d8f499c5502b')
diff --git a/mozilla-testing/iceweasel-libre/firefox-install-dir.patch b/mozilla-testing/iceweasel-libre/firefox-install-dir.patch
new file mode 100644
index 000000000..b6f9700b3
--- /dev/null
+++ b/mozilla-testing/iceweasel-libre/firefox-install-dir.patch
@@ -0,0 +1,28 @@
+diff -Nur mozilla-release.orig/config/autoconf.mk.in mozilla-release/config/autoconf.mk.in
+--- mozilla-release.orig/config/autoconf.mk.in 2011-11-06 14:06:44.462920048 +0000
++++ mozilla-release/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@
+diff -Nur mozilla-release.orig/js/src/config/autoconf.mk.in mozilla-release/js/src/config/autoconf.mk.in
+--- mozilla-release.orig/js/src/config/autoconf.mk.in 2011-11-06 14:06:45.586263727 +0000
++++ mozilla-release/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@
+ ifneq (,$(filter /%,$(TOP_DIST)))
diff --git a/mozilla-testing/iceweasel-libre/iceweasel.install b/mozilla-testing/iceweasel-libre/iceweasel.install
index 376600ec2..c1fe8284a 100644
--- a/mozilla-testing/iceweasel-libre/iceweasel.install
+++ b/mozilla-testing/iceweasel-libre/iceweasel.install
@@ -1,21 +1,13 @@
-#[ "${ICDIR}" = "" ] && 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/iceweasel* 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/mozilla-testing/iceweasel-libre/mozconfig b/mozilla-testing/iceweasel-libre/mozconfig
index 8344f6967..88e5ec422 100644
--- a/mozilla-testing/iceweasel-libre/mozconfig
+++ b/mozilla-testing/iceweasel-libre/mozconfig
@@ -2,38 +2,57 @@
ac_add_options --prefix=/usr
ac_add_options --libdir=/usr/lib
-#ac_add_options --with-system-nss
+
+# System libraries
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
ac_add_options --with-system-jpeg
ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+ac_add_options --with-system-png
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-ffi
+ac_add_options --enable-system-cairo
+ac_add_options --enable-system-pixman
ac_add_options --with-pthreads
-ac_add_options --enable-optimize
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --enable-strip
-ac_add_options --enable-pango
-#ac_add_options --enable-system-cairo
-ac_add_options --enable-svg
-ac_add_options --enable-canvas
-ac_add_options --enable-libxul
+
+# Features
+ac_add_options --enable-startup-notification
+ac_add_options --enable-gio
+
+ac_add_options --disable-gnomevfs
ac_add_options --disable-crashreporter
-ac_add_options --disable-safe-browsing
+ac_add_options --disable-updater
ac_add_options --disable-tests
-ac_add_options --disable-debug
-ac_add_options --disable-xprint
-ac_add_options --disable-installer
-ac_add_options --disable-libnotify
-ac_add_options --disable-pedantic
-ac_add_options --disable-gnomevfs
ac_add_options --disable-mochitest
-ac_add_options --disable-updater
-ac_add_options --with-default-mozilla-five-home=/usr/lib/iceweasel
+ac_add_options --disable-installer
+# Optimization
+ac_add_options --enable-optimize
+
+# PGO
+ac_add_options --enable-profile-guided-optimization
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
+mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
+
+export MOZILLA_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1
+
+# Iceweasel
+ac_add_options --disable-official-branding
ac_add_options --with-branding=debian/branding
-ac_add_options --build=i586-pc-linux-gnu
-ac_add_options --host=i586-pc-linux-gnu
+# ConnochaetOS
+#ac_add_options --build=i586-pc-linux-gnu
+#ac_add_options --host=i586-pc-linux-gnu
+#export USE_SHORT_LIBNAME=1
+#mk_add_options USE_SHORT_LIBNAME=1
+
+# Parabola
+ac_add_options --disable-safe-browsing
export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-export USE_SHORT_LIBNAME=1
mk_add_options BUILD_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
-mk_add_options USE_SHORT_LIBNAME=1
diff --git a/mozilla-testing/iceweasel-libre/vendor.js b/mozilla-testing/iceweasel-libre/vendor.js
new file mode 100644
index 000000000..d8d606bc1
--- /dev/null
+++ b/mozilla-testing/iceweasel-libre/vendor.js
@@ -0,0 +1,9 @@
+// Use LANG environment variable to choose locale
+pref("intl.locale.matchOS", true);
+
+// Disable default browser checking.
+pref("browser.shell.checkDefaultBrowser", false);
+
+// Don't disable our bundled extensions in the application directory
+pref("extensions.autoDisableScopes", 11);
+pref("extensions.shownSelectionUI", true);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 07:25:24 +0000