summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD61
1 files changed, 24 insertions, 37 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 3571786afdec..11d9eb1f95d7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
# enable this if you run out of memory during linking
#_lowmem=true
-# enable gtk3 (warning: flash or any other plugin crashes frequently)
-_gtk3=true
+# enable gtk3 wayland (experimental)
+_gtk3_wayland=false
# try to build with PGO
# currently broken
@@ -20,19 +20,16 @@ _pgo=true
_pkgname=firefox
pkgname=$_pkgname-kde-opensuse
-pkgver=58.0.2
+pkgver=59.0
pkgrel=1
pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE"
arch=('i686' 'x86_64')
license=('MPL' 'GPL' 'LGPL')
url="https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox"
-depends=('gtk2' 'mozilla-common' 'libxt' 'startup-notification' 'mime-types'
+depends=('mozilla-common' 'libxt' 'startup-notification' 'mime-types'
'dbus-glib' 'alsa-lib' 'hicolor-icon-theme'
'libvpx' 'icu' 'libevent' 'nss>=3.28.3' 'nspr>=4.10.6' 'hunspell'
- 'sqlite' 'libnotify' 'kmozillahelper' 'ffmpeg' )
-if [ $_gtk3 ] ; then
- depends+=('gtk3')
-fi
+ 'sqlite' 'libnotify' 'kmozillahelper' 'ffmpeg' 'gtk3')
makedepends=('unzip' 'zip' 'diffutils' 'python2' 'yasm' 'mesa' 'imake'
'xorg-server-xvfb' 'libpulse' 'inetutils' 'autoconf2.13' 'rust'
@@ -41,16 +38,19 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
'speech-dispatcher: Text-to-Speech')
provides=("firefox=${pkgver}")
conflicts=('firefox')
-_patchrev=d14085eee2b2
+_patchrev=d61b64679bb4
options=('!emptydirs' 'strip')
_patchurl=http://www.rosenauer.org/hg/mozilla/raw-file/$_patchrev
_repo=https://hg.mozilla.org/mozilla-unified
source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE"
- mozconfig firefox.desktop firefox-install-dir.patch vendor.js kde.js firefox-fixed-loading-icon.png
+ mozconfig
+ firefox.desktop
+ vendor.js
+ kde.js
+ firefox-fixed-loading-icon.png
# Firefox patchset
firefox-branded-icons-$_patchrev.patch::$_patchurl/firefox-branded-icons.patch
firefox-kde-$_patchrev.patch::$_patchurl/firefox-kde.patch
- firefox-no-default-ualocale-$_patchrev.patch::$_patchurl/firefox-no-default-ualocale.patch
# Gecko/toolkit patchset
mozilla-kde-$_patchrev.patch::$_patchurl/mozilla-kde.patch
mozilla-nongnome-proxies-$_patchrev.patch::$_patchurl/mozilla-nongnome-proxies.patch
@@ -58,8 +58,7 @@ source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE"
add_missing_pgo_rule.patch
pgo_fix_missing_kdejs.patch
fix_pgo_bug1389436_explicitly_instantiate_gfxFont.patch
- firefox-install-dir.patch no-crmf.diff
- 0001-Bug-1430274-Define-MOZ_ALSA-for-more-source-files.-r.patch
+ no-crmf.diff
)
@@ -84,9 +83,13 @@ prepare() {
cp "$srcdir/mozconfig" .mozconfig
- patch -Np1 -i "$srcdir/firefox-install-dir.patch"
+ if [ $_gtk3_wayland = true ] ; then
+ echo "ac_add_options --enable-default-toolkit=cairo-gtk3-wayland" \
+ >> .mozconfig
+ fi
+
+
-
echo -n "$_google_api_key" >google-api-key
echo "ac_add_options --with-google-api-keyfile=\"$PWD/google-api-key\"" >>.mozconfig
@@ -101,7 +104,6 @@ prepare() {
patch -Np1 -i "$srcdir/mozilla-kde-$_patchrev.patch"
patch -Np1 -i "$srcdir/firefox-kde-$_patchrev.patch"
- patch -Np1 -i "$srcdir/firefox-no-default-ualocale-$_patchrev.patch"
patch -Np1 -i "$srcdir/firefox-branded-icons-$_patchrev.patch"
# add globalmenu support
@@ -113,13 +115,6 @@ prepare() {
# add missing file Makefile for pgo builds
patch -Np1 -i "$srcdir"/pgo_fix_missing_kdejs.patch
- # configure script misdetects the preprocessor without an optimization level
- # https://bugs.archlinux.org/task/34644
- # sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
-
- # https://bugs.archlinux.org/task/57285
- patch -Np1 -i "$srcdir"/0001-Bug-1430274-Define-MOZ_ALSA-for-more-source-files.-r.patch
-
# https://bugzilla.mozilla.org/show_bug.cgi?id=1371991
patch -Np1 -i ../no-crmf.diff
@@ -188,15 +183,11 @@ app.distributor.channel=$pkgname
app.partner.archlinux=archlinux
END
- for i in 16 22 24 32 48 256; do
+ for i in 16 22 24 32 48 64 128 256; do
install -Dm644 browser/branding/official/default$i.png \
"$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/firefox.png"
done
- install -Dm644 browser/branding/official/content/icon64.png \
- "$pkgdir/usr/share/icons/hicolor/64x64/apps/firefox.png"
- install -Dm644 browser/branding/official/mozicon128.png \
- "$pkgdir/usr/share/icons/hicolor/128x128/apps/firefox.png"
install -Dm644 browser/branding/official/content/about-logo.png \
"$pkgdir/usr/share/icons/hicolor/192x192/apps/firefox.png"
install -Dm644 browser/branding/official/content/about-logo@2x.png \
@@ -220,19 +211,15 @@ END
md5sums=('SKIP'
'6e7ef23754f23c32adaf686a760d369a'
'14e0f6237a79b85e60256f4808163160'
- 'dbf14588e85812ee769bd735823a0146'
'aa9f776d2187cba09de65cbb02b39ca0'
'05bb69d25fb3572c618e3adf1ee7b670'
'6e335a517c68488941340ee1c23f97b0'
- 'af659b0f4f5b904480bf97843fa3502b'
- 'fa564c666987df18683c1cb53a3834a9'
- '82f7f100d4b01677ed748679565d8b1a'
- '1975dde6770233eb17a16beea317d947'
+ 'df9f710c842d4847aae5bc667f97f4a2'
+ '1b373a938f8dd92fc93a31e4746f3609'
+ 'e594a05742a6dbb1496e62563c4b87f8'
'0661e259fe57df87fca791f4aeb78da0'
- '38b6df4dbce5df03e46eefe41202d74b'
+ 'd75eda715db340eb28e3a0417e2846a2'
'fe24f5ea463013bb7f1c12d12dce41b2'
'3fa8bd22d97248de529780f5797178af'
'b358b5ed3726ecd4ed054bdc09901982'
- 'dbf14588e85812ee769bd735823a0146'
- '196edf030efc516e3de5ae3aa01e9851'
- 'cf8b9644eb0ae7820ccc2e775fb68d6e')
+ '5223d4854f784003e3b575684cc004fe')