diff options
Diffstat (limited to 'libre/icecat')
| -rw-r--r-- | libre/icecat/PKGBUILD | 61 | ||||
| -rw-r--r-- | libre/icecat/arch-linux-wiki.xml | 12 | ||||
| -rw-r--r-- | libre/icecat/mozconfig | 16 |
3 files changed, 51 insertions, 38 deletions
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 89f6755fb..ca29d2a2d 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -19,27 +19,25 @@ # * Disabled ContentHandlers and other Google/Yahoo! related services pkgname=icecat -pkgver=4.0.1 +pkgver=5.0 pkgrel=2 -_xulver=2.0.1 pkgdesc="GNU version of the Firefox browser. SafeBrowsing and other Google services disabled!" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/gnuzilla/" -license=('GPL2' 'MPL' 'LGPL') -depends=("xulrunner=${_xulver}" 'desktop-file-utils') -makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa') -provides=("firefox=${pkgver}") -conflicts=('firefox') -replaces=('firefox') +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=(http://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz +source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz mozconfig icecat.desktop icecat-safe.desktop mozilla-firefox-1.0-lang.patch - xulrunner-copy-stub.patch # Search engines - arch-linux-wiki.xml internet-archive.xml jamendo-en.xml logless-search.xml @@ -58,22 +56,38 @@ build() { msg2 "Patching some files..." cd "${srcdir}/${pkgname}-${pkgver}/" patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch" - patch -Np0 -i "${srcdir}/xulrunner-copy-stub.patch" 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 - unset CFLAGS - unset CXXFLAGS - export LDFLAGS="-Wl,-rpath,${ICECATDIR}" + # 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 + ## 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,${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}" - msg2 "Build complete" +# 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 } package() { @@ -92,19 +106,26 @@ package() { cd ${pkgdir}/usr/lib ln -s ${ICECATDIR} icecat + # 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" + + # We don't want the development stuff + rm -r "$pkgdir"/usr/{include,lib/icecat-devel-$pkgver,share/idl} + msg2 "Removing proprietary and anti-privacy search engines" rm -f ${pkgdir}${ICECATDIR}/searchplugins/{google,answers,amazondotcom,eBay,yahoo,bing}.xml msg2 "And provide better ones..." install -m755 -d ${pkgdir}${ICECATDIR}/searchplugins/ install -m644 ${srcdir}/*.xml ${pkgdir}${ICECATDIR}/searchplugins/ } -md5sums=('1b4d44ee5badc28fd332cba564ecde0a' - '436db1f6167ffe82fcd71a53ffd80d0e' +md5sums=('3fd4f4c2bfdacdd52bbd6e197ceda95f' + '105f2e5d98d719c37cba5601a59b8593' 'e81ad01dbc16ba28bf92ba4b7c309ca7' 'd93fe402b87cd000a869e1fd6badc6c9' 'bd5db57c23c72a02a489592644f18995' - '5a1938673a367b20ecfa009a5eb767aa' - '3403175087e584a8c5e840cc62310cd9' '462c68585461f8cdc23c93c46f6ee4cf' '2d492295c4308f9bba9ece28d8b3af2d' '937ac0e5392b060d93bd33e761fbfa51' diff --git a/libre/icecat/arch-linux-wiki.xml b/libre/icecat/arch-linux-wiki.xml deleted file mode 100644 index 9e21b92e2..000000000 --- a/libre/icecat/arch-linux-wiki.xml +++ /dev/null @@ -1,12 +0,0 @@ -<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/"> -<os:ShortName>Arch Linux Wiki</os:ShortName> -<os:Description>searches on the arch linux wiki</os:Description> -<os:InputEncoding>UTF-8</os:InputEncoding> -<os:Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAG8SURBVDiNjZM/iBNBFMZ/MzvJunfmYFfwtjgbEzk4jhSKoNa2goiNaGXhCaYRDAiHNlprcYuVhaCNWIj4BxSusBJRhNtDRTF6nCkWPUQMJJe4s2PhBhIvE/yaebz3vY/fDIwwxmBTGMX7JwtSNRbmX9g8yrr9V+ccISYAa4CwEey6sbpDCJpFR6rZwJ19fLzyeZRP2pIni3LBU3IbGNVJs/M2nzXAU3K3pySeknTS7OTZZ+v+fwccuvPhqOuIV64Sy56S9LTxm796i6O8W95g3633xcBTDWOYSY35kRl8bYzwHNkqFWX5/rHy97EEgafqEwU54yqBMQRdnYnf2rCps1JHm0tjCeZuvpvaE7hrG+3U/9rq0dPDdK4jWlOuU1k9PfdtJMGmzupvkrbf+NntLz8A7vbnXW1KG530wkiCMIp3Ag1gez57lNSqR/LZbeBU3m8D5aRWTf4luDywDPBwoH6anwb4AtSHrhBGcRk4w7A+DdRv+8SAC9wbCgCuAoW8XgOuAR8HAprAdWAdqADLYRSfABDTSyt7gdfAE+BKUqu+ZIzCKD4ILAKHgXkxvbRyEXie1KrWHzcm6MAfcSib4f24CrwAAAAASUVORK5CYII=</os:Image> -<UpdateInterval>7</UpdateInterval> -<UpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/archlinux_wiki.xml</UpdateUrl> -<IconUpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/archlinux_wiki.png</IconUpdateUrl> -<SearchForm>http://wiki.archlinux.org/index.php/Main_Page</SearchForm> -<os:Url type="text/html" method="GET" template="http://wiki.archlinux.org/index.php/Special:Search?go=Go&search={searchTerms}"> -</os:Url> -</SearchPlugin>
\ No newline at end of file diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig index 0162c51ac..442dfe76d 100644 --- a/libre/icecat/mozconfig +++ b/libre/icecat/mozconfig @@ -10,9 +10,11 @@ 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-cairo +ac_add_options --enable-system-lcms ac_add_options --with-pthreads ac_add_options --enable-default-toolkit=cairo-gtk2 @@ -21,13 +23,11 @@ ac_add_options --disable-safe-browsing ac_add_options --enable-extensions=default ac_add_options --enable-startup-notification ac_add_options --enable-pango -ac_add_options --enable-strip ac_add_options --enable-svg ac_add_options --enable-canvas ac_add_options --enable-smil ac_add_options --enable-canvas3d ac_add_options --enable-places -ac_add_options --enable-shared-js ac_add_options --enable-url-classifier ac_add_options --enable-optimize @@ -37,21 +37,19 @@ ac_add_options --enable-jemalloc ac_add_options --enable-xterm-updates ac_add_options --enable-printing ac_add_options --enable-xinerama -ac_add_options --enable-libxul -ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-2.0 -ac_add_options --with-branding=browser/branding/unofficial ac_add_options --with-distribution-id=org.gnu.gnuzilla ac_add_options --with-user-appdir=.gnuzilla +ac_add_options --with-branding=browser/branding/unofficial ac_add_options --disable-javaxpcom ac_add_options --disable-crashreporter ac_add_options --disable-updater ac_add_options --disable-tests -ac_add_options --disable-xprint ac_add_options --disable-mochitest ac_add_options --disable-debug ac_add_options --disable-installer ac_add_options --disable-pedantic +ac_add_options --disable-static ac_add_options --enable-gio ac_add_options --disable-gnomevfs @@ -62,3 +60,9 @@ export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 mk_add_options MOZILLA_OFFICIAL=1 + +# 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' |