summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Bidar2018-11-18 04:52:38 +0100
committerBjörn Bidar2018-11-18 04:59:29 +0100
commit612a6b9b29467e5f62018e52ef972858d79f6989 (patch)
treec7a109c973c12c1ab0120161038fc2bc1112755c
parent647481b971e810bca6b65807e8f51063faa1a264 (diff)
downloadaur-612a6b9b29467e5f62018e52ef972858d79f6989.tar.gz
upkg
- new upstream release - drop unneded patch to support newer cbindgen versions (Mozilla #1503401 merged)
-rw-r--r--.SRCINFO14
-rw-r--r--0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch35
-rw-r--r--PKGBUILD14
3 files changed, 9 insertions, 54 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 59d55a97a51c..708275781259 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sun Nov 4 01:32:44 UTC 2018
+# Sun Nov 18 03:51:50 UTC 2018
pkgbase = firefox-kde-opensuse
pkgdesc = Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE
- pkgver = 63.0.1
- pkgrel = 2
+ pkgver = 63.0.3
+ pkgrel = 1
url = https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox
arch = i686
arch = x86_64
@@ -49,12 +49,10 @@ pkgbase = firefox-kde-opensuse
depends = gtk3
optdepends = networkmanager: Location detection via available WiFi networks
optdepends = speech-dispatcher: Text-to-Speech
- provides = firefox=63.0.1
+ provides = firefox=63.0.3
conflicts = firefox
options = !emptydirs
- options = debug
- options = strip
- source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_63_0_1_RELEASE
+ source = hg+https://hg.mozilla.org/mozilla-unified#tag=FIREFOX_63_0_3_RELEASE
source = mozconfig
source = firefox.desktop
source = vendor.js
@@ -68,7 +66,6 @@ pkgbase = firefox-kde-opensuse
source = pgo_fix_missing_kdejs.patch
source = 2001_system_graphite2_support.patch
source = 2000_system_harfbuzz_support.patch
- source = 0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch
md5sums = SKIP
md5sums = 49c2d3dc354e18ab12c8c4e6f7d68d6b
md5sums = 14e0f6237a79b85e60256f4808163160
@@ -83,7 +80,6 @@ pkgbase = firefox-kde-opensuse
md5sums = 3fa8bd22d97248de529780f5797178af
md5sums = f31a90ed4c0b0c15346ea5098765771f
md5sums = a85ca9c88f49184c8b0feae206f0ba0c
- md5sums = 66b80264cbcf301a0a6fb71a5516afcf
pkgname = firefox-kde-opensuse
diff --git a/0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch b/0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch
deleted file mode 100644
index 6fd00ca1c5ad..000000000000
--- a/0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From e2d8a02d878aa27687f907b64fd41344ad1b2468 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
-Date: Tue, 30 Oct 2018 22:21:52 +0100
-Subject: [PATCH] Keep mozilla-release building with newer cbindgen versions.
-
----
- servo/components/style/cbindgen.toml | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/servo/components/style/cbindgen.toml b/servo/components/style/cbindgen.toml
-index 46162e43db5e..1df99ffc5160 100644
---- a/servo/components/style/cbindgen.toml
-+++ b/servo/components/style/cbindgen.toml
-@@ -23,11 +23,17 @@ derive_helper_methods = true
-
- [export]
- prefix = "Style"
- include = [
- "StyleAppearance",
- "StyleDisplay",
- "StyleDisplayMode",
- "StyleFillRule",
-- "StylePathCommand"
-+ "StylePathCommand",
-+
-+ "Appearance",
-+ "Display",
-+ "DisplayMode",
-+ "FillRule",
-+ "PathCommand"
- ]
- item_types = ["enums", "structs", "typedefs"]
---
-2.17.2
-
diff --git a/PKGBUILD b/PKGBUILD
index 91ae687b89f2..0f9d35afdbcd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,8 +20,8 @@ _pgo=true
_pkgname=firefox
pkgname=$_pkgname-kde-opensuse
-pkgver=63.0.1
-pkgrel=2
+pkgver=63.0.3
+pkgrel=1
pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE"
arch=('i686' 'x86_64')
license=('MPL' 'GPL' 'LGPL')
@@ -43,7 +43,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
provides=("firefox=${pkgver}")
conflicts=('firefox')
_patchrev=4b99400f6d17
-options=('!emptydirs' 'debug' 'strip')
+options=('!emptydirs')
_patchurl=http://www.rosenauer.org/hg/mozilla/raw-file/$_patchrev
_repo=https://hg.mozilla.org/mozilla-unified
source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE"
@@ -62,7 +62,6 @@ source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE"
pgo_fix_missing_kdejs.patch
2001_system_graphite2_support.patch
2000_system_harfbuzz_support.patch
- 0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch
)
@@ -119,10 +118,6 @@ prepare() {
patch -Np1 -i "$srcdir"/2000_system_harfbuzz_support.patch
patch -Np1 -i "$srcdir"/2001_system_graphite2_support.patch
-
- # https://bugzilla.mozilla.org/show_bug.cgi?id=1503401
- patch -Np1 -i "$srcdir"/0001-Keep-mozilla-release-building-with-newer-cbindgen-ve.patch
-
}
build() {
@@ -210,5 +205,4 @@ md5sums=('SKIP'
'fe24f5ea463013bb7f1c12d12dce41b2'
'3fa8bd22d97248de529780f5797178af'
'f31a90ed4c0b0c15346ea5098765771f'
- 'a85ca9c88f49184c8b0feae206f0ba0c'
- '66b80264cbcf301a0a6fb71a5516afcf')
+ 'a85ca9c88f49184c8b0feae206f0ba0c')