summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO34
-rw-r--r--PKGBUILD32
-rw-r--r--mozconfig4
3 files changed, 24 insertions, 46 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cf67bce0e9a5..f35f956854de 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Tue Aug 23 12:01:36 UTC 2016
+# Sun Sep 25 20:39:42 UTC 2016
pkgbase = firefox-kde-opensuse
pkgdesc = Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE
- pkgver = 48.0.1
+ pkgver = 49.0.1
pkgrel = 1
url = https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox
arch = i686
@@ -43,42 +43,40 @@ pkgbase = firefox-kde-opensuse
depends = gtk3
optdepends = networkmanager: Location detection via available WiFi networks
optdepends = upower: Battery API
- provides = firefox=48.0.1
+ provides = firefox=49.0.1
conflicts = firefox
options = !emptydirs
options = strip
- source = https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/48.0.1/source/firefox-48.0.1.source.tar.xz
+ source = https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/49.0.1/source/firefox-49.0.1.source.tar.xz
source = mozconfig
source = firefox.desktop
source = firefox-install-dir.patch
source = vendor.js
source = kde.js
source = firefox-fixed-loading-icon.png
- source = http://www.rosenauer.org/hg/mozilla/raw-file/6ab8b16f232c/firefox-branded-icons.patch
- source = http://www.rosenauer.org/hg/mozilla/raw-file/6ab8b16f232c/firefox-kde.patch
- source = http://www.rosenauer.org/hg/mozilla/raw-file/6ab8b16f232c/firefox-no-default-ualocale.patch
- source = http://www.rosenauer.org/hg/mozilla/raw-file/6ab8b16f232c/mozilla-kde.patch
- source = http://www.rosenauer.org/hg/mozilla/raw-file/6ab8b16f232c/mozilla-language.patch
- source = http://www.rosenauer.org/hg/mozilla/raw-file/6ab8b16f232c/mozilla-nongnome-proxies.patch
- source = http://www.rosenauer.org/hg/mozilla/raw-file/6ab8b16f232c/mozilla-flex_buffer_overrun.patch
+ source = http://www.rosenauer.org/hg/mozilla/raw-file/9fc2ebe6d7f1/firefox-branded-icons.patch
+ source = http://www.rosenauer.org/hg/mozilla/raw-file/9fc2ebe6d7f1/firefox-kde.patch
+ source = http://www.rosenauer.org/hg/mozilla/raw-file/9fc2ebe6d7f1/firefox-no-default-ualocale.patch
+ source = http://www.rosenauer.org/hg/mozilla/raw-file/9fc2ebe6d7f1/mozilla-kde.patch
+ source = http://www.rosenauer.org/hg/mozilla/raw-file/9fc2ebe6d7f1/mozilla-language.patch
+ source = http://www.rosenauer.org/hg/mozilla/raw-file/9fc2ebe6d7f1/mozilla-nongnome-proxies.patch
+ source = http://www.rosenauer.org/hg/mozilla/raw-file/9fc2ebe6d7f1/mozilla-flex_buffer_overrun.patch
source = unity-menubar.patch
source = add_missing_pgo_rule.patch
source = pgo_fix_missing_kdejs.patch
source = rb39193.patch
source = fix_mozalloc.patch
- source = https://cgit.gentoo.org/proj/mozilla.git/plain/www-client/firefox/files/xpcom-components-binutils-26.patch
- source = http://www.rosenauer.org/hg/mozilla/raw-file/6ab8b16f232c/mozilla-gtk3_20.patch
- md5sums = 8c09b6cbf13ce13aa57d87175da997f4
- md5sums = 3b48232100d936b2822220d971f1e92c
+ md5sums = 3ce01741b9eab6a2988b970127330dcd
+ md5sums = 169f583544e9efaf1f80f8548b57a8cc
md5sums = 9b02198df96be08f2a0a323ac2e6c2a2
md5sums = dbf14588e85812ee769bd735823a0146
md5sums = 0d053487907de4376d67d8f499c5502b
md5sums = 05bb69d25fb3572c618e3adf1ee7b670
md5sums = 6e335a517c68488941340ee1c23f97b0
md5sums = 3b3eb8c2747429887e4a03537932eac5
- md5sums = 84c6a2bf45cfc2393821ec2f5ccd64c5
+ md5sums = edb29c1ac737a2a2ecdfd499bd30237a
md5sums = 1fad9a988826d69fe712ea973e43f6da
- md5sums = 91ee1935c2674f89d4f8f358de2f0dbc
+ md5sums = 7b8cf4883062938956f202d04af47411
md5sums = 903307f923a459189a5a6062ff9df38c
md5sums = 0c684360f1df4536512d51873c1d243d
md5sums = 01af53dc830d00fe522c545bcc0ec4b9
@@ -87,8 +85,6 @@ pkgbase = firefox-kde-opensuse
md5sums = 3fa8bd22d97248de529780f5797178af
md5sums = 43550e772f110a338d5a42914ee2c3a6
md5sums = 0c1ed789c06297659137a2ed2ef769f7
- md5sums = a7819fec41ab24da3fc42541981605db
- md5sums = e4c3fa5aed9663316ea6cdb9c533242f
pkgname = firefox-kde-opensuse
diff --git a/PKGBUILD b/PKGBUILD
index f8f8d28f0383..9e2321adafa1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,7 @@ _gtk3=true
_pkgname=firefox
pkgname=$_pkgname-kde-opensuse
-pkgver=48.0.1
+pkgver=49.0.1
pkgrel=1
pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE"
arch=('i686' 'x86_64')
@@ -34,7 +34,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
'upower: Battery API' )
provides=("firefox=${pkgver}")
conflicts=('firefox')
-_patchrev=6ab8b16f232c
+_patchrev=9fc2ebe6d7f1
options=('!emptydirs' 'strip' )
_patchurl=http://www.rosenauer.org/hg/mozilla/raw-file/$_patchrev
source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz
@@ -53,12 +53,8 @@ source=(https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/
pgo_fix_missing_kdejs.patch
rb39193.patch
fix_mozalloc.patch
- https://cgit.gentoo.org/proj/mozilla.git/plain/www-client/firefox/files/xpcom-components-binutils-26.patch
)
-if [ $_gtk3 ] ; then
- source+=($_patchurl/mozilla-gtk3_20.patch)
-fi
# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -110,23 +106,11 @@ prepare() {
# add missing file Makefile for pgo builds
patch -Np1 -i "$srcdir"/pgo_fix_missing_kdejs.patch
- # enable gtk3
- if [ $_gtk3 ] ; then
- # fix gtk3 build
- # sed -i 's|parent->group|gtk_window_get_group(const_cast<GtkWindow*>(parent))|g' \
-# toolkit/xre/nsKDEUtils.cpp
- echo 'ac_add_options --enable-default-toolkit=cairo-gtk3' >>.mozconfig
- patch -Np1 -i "$srcdir"/mozilla-gtk3_20.patch
- fi
- #
# configure script misdetects the preprocessor without an optimization level
# https://bugs.archlinux.org/task/34644
# sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
- # Workaround for binutils/GNU ld 2.26 from NetBSD/amd64 7.99.26
- patch -Np1 -i "$srcdir"/xpcom-components-binutils-26.patch
-
# CVE-2016-6354 (bmo#1292534)
patch -Np1 -i "$srcdir"/mozilla-flex_buffer_overrun.patch
@@ -208,17 +192,17 @@ package() {
#https://bugzilla.mozilla.org/show_bug.cgi?id=658850
ln -sf firefox "$pkgdir/usr/lib/firefox/firefox-bin"
}
-md5sums=('8c09b6cbf13ce13aa57d87175da997f4'
- '3b48232100d936b2822220d971f1e92c'
+md5sums=('3ce01741b9eab6a2988b970127330dcd'
+ '169f583544e9efaf1f80f8548b57a8cc'
'9b02198df96be08f2a0a323ac2e6c2a2'
'dbf14588e85812ee769bd735823a0146'
'0d053487907de4376d67d8f499c5502b'
'05bb69d25fb3572c618e3adf1ee7b670'
'6e335a517c68488941340ee1c23f97b0'
'3b3eb8c2747429887e4a03537932eac5'
- '84c6a2bf45cfc2393821ec2f5ccd64c5'
+ 'edb29c1ac737a2a2ecdfd499bd30237a'
'1fad9a988826d69fe712ea973e43f6da'
- '91ee1935c2674f89d4f8f358de2f0dbc'
+ '7b8cf4883062938956f202d04af47411'
'903307f923a459189a5a6062ff9df38c'
'0c684360f1df4536512d51873c1d243d'
'01af53dc830d00fe522c545bcc0ec4b9'
@@ -226,6 +210,4 @@ md5sums=('8c09b6cbf13ce13aa57d87175da997f4'
'fe24f5ea463013bb7f1c12d12dce41b2'
'3fa8bd22d97248de529780f5797178af'
'43550e772f110a338d5a42914ee2c3a6'
- '0c1ed789c06297659137a2ed2ef769f7'
- 'a7819fec41ab24da3fc42541981605db'
- 'e4c3fa5aed9663316ea6cdb9c533242f')
+ '0c1ed789c06297659137a2ed2ef769f7')
diff --git a/mozconfig b/mozconfig
index d06ae2033420..aa4ad613ad21 100644
--- a/mozconfig
+++ b/mozconfig
@@ -23,7 +23,7 @@ ac_add_options --with-system-icu
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-cairo
ac_add_options --enable-system-pixman
ac_add_options --disable-libproxy
#ac_add_options --enable-shared-js
@@ -32,7 +32,7 @@ ac_add_options --disable-libproxy
ac_add_options --enable-startup-notification
ac_add_options --enable-pulseaudio
-#ac_add_options --disable-gio
+ac_add_options --disable-gio
ac_add_options --disable-gconf
ac_add_options --disable-crashreporter
ac_add_options --disable-tests