[arch-commits] Commit in firefox/trunk (4 files)

[Jan Steffens]

    Date: Thursday, April 28, 2016 @ 11:34:27
  Author: heftig
Revision: 266430

46.0-2: Simplify

Modified:
  firefox/trunk/PKGBUILD
  firefox/trunk/mozconfig
Deleted:
  firefox/trunk/firefox-fixed-loading-icon.png
  firefox/trunk/firefox.install

-----------------+
 PKGBUILD        |   22 ++++++----------------
 firefox.install |   12 ------------
 mozconfig       |   13 ++++---------
 3 files changed, 10 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-28 08:27:08 UTC (rev 266429)
+++ PKGBUILD	2016-04-28 09:34:27 UTC (rev 266430)
@@ -5,19 +5,18 @@
 
 pkgname=firefox
 pkgver=46.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Standalone web browser from mozilla.org"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
 url="https://www.mozilla.org/firefox/"
 depends=('gtk3' 'gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types'
-         'dbus-glib' 'alsa-lib' 'ffmpeg' 'desktop-file-utils' 'hicolor-icon-theme'
+         'dbus-glib' 'alsa-lib' 'ffmpeg' 'desktop-file-utils'
          'libvpx' 'icu' 'libevent' 'nss' 'hunspell' 'sqlite' 'ttf-font')
 makedepends=('unzip' 'zip' 'diffutils' 'python2' 'yasm' 'mesa' 'imake' 'gconf'
              'xorg-server-xvfb' 'libpulse' 'inetutils')
 optdepends=('networkmanager: Location detection via available WiFi networks'
             'upower: Battery API')
-install=firefox.install
 options=('!emptydirs' '!makeflags')
 source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz
         mozconfig
@@ -25,16 +24,14 @@
         firefox-install-dir.patch
         vendor.js
         firefox-symbolic.svg
-        firefox-fixed-loading-icon.png
         firefox-gtk3-20.patch
         no-libnotify.patch)
 sha256sums=('b35aa05162362d73cd308066adca207f7aa40ceae10931fa4819371df6c4f8bf'
-            'cb10182bbf4a35f6d89c2c9ee41f0badc398fd714cb1fb56975c347a8edbe4ba'
+            '083de691a0e88b8829a110cc783de3cc8d6523be62ae4ea9180c44856d8e24f5'
             'c202e5e18da1eeddd2e1d81cb3436813f11e44585ca7357c4c5f1bddd4bec826'
             'd86e41d87363656ee62e12543e2f5181aadcff448e406ef3218e91865ae775cd'
             '4b50e9aec03432e21b44d18c4c97b2630bace606b033f7d556c9d3e3eb0f4fa4'
             'a2474b32b9b2d7e0fb53a4c89715507ad1c194bef77713d798fa39d507def9e9'
-            '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213'
             '440c3e22d98ecf8c44dcedbe90bbb302da3a059e3fc3fba205d89f0eca329cbf'
             'e4ebdd14096d177d264a7993dbd5df46463605ff45f783732c26d30b9caa53a7')
 validpgpkeys=('2B90598A745E992F315E22C58AB132963A06537A')
@@ -78,22 +75,15 @@
 
   mkdir "$srcdir/path"
   ln -s /usr/bin/python2 "$srcdir/path/python"
-
-  # configure script misdetects the preprocessor without an optimization level
-  # https://bugs.archlinux.org/task/34644
-  sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
-
-  # Fix tab loading icon (doesn't work with libpng 1.6)
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=841734
-  cp "$srcdir/firefox-fixed-loading-icon.png" \
-    browser/themes/linux/tabbrowser/loading.png
 }
 
 build() {
   cd $pkgname-$pkgver
 
+  # _FORTIFY_SOURCE causes configure failures
+  CPPFLAGS+=" -O2"
+
   export PATH="$srcdir/path:$PATH"
-  export PYTHON="/usr/bin/python2"
 
   # Do PGO
   xvfb-run -a -s "-extension GLX -screen 0 1280x1024x24" \

Deleted: firefox-fixed-loading-icon.png
===================================================================
(Binary files differ)

Deleted: firefox.install
===================================================================
--- firefox.install	2016-04-28 08:27:08 UTC (rev 266429)
+++ firefox.install	2016-04-28 09:34:27 UTC (rev 266430)
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

Modified: mozconfig
===================================================================
--- mozconfig	2016-04-28 08:27:08 UTC (rev 266429)
+++ mozconfig	2016-04-28 09:34:27 UTC (rev 266430)
@@ -1,7 +1,6 @@
 . $topsrcdir/browser/config/mozconfig
 
 ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
 ac_add_options --enable-release
 ac_add_options --enable-gold
 ac_add_options --enable-pie
@@ -11,27 +10,23 @@
 # System libraries
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
+ac_add_options --with-system-icu
 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 --with-system-icu
 ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
 ac_add_options --enable-system-ffi
-# system cairo without layers acceleration results in choppy video playback
-#ac_add_options --enable-system-cairo
 ac_add_options --enable-system-pixman
 
 # Features
 ac_add_options --enable-startup-notification
 ac_add_options --disable-gstreamer
-
+ac_add_options --disable-updater
 ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-installer
-ac_add_options --disable-debug-symbols
 
+STRIP_FLAGS="--strip-debug"
+
 # vim:set ft=sh: