diff options
author | Björn Bidar | 2018-05-19 17:19:49 +0200 |
---|---|---|
committer | Björn Bidar | 2018-05-19 17:19:49 +0200 |
commit | 73b3fc6c9010def7de082a73d45763c4c189fcfd (patch) | |
tree | c81da5cf0b17357b5db83061737ae20efc2614dc | |
parent | 2f73b55081d1a1f400cee18984212704f862c36b (diff) | |
download | aur-73b3fc6c9010def7de082a73d45763c4c189fcfd.tar.gz |
urel, use patches from gentoo, use system harfbuzzz adnd graphite2
-rw-r--r-- | .SRCINFO | 9 | ||||
-rw-r--r-- | PKGBUILD | 25 | ||||
-rw-r--r-- | mozconfig | 2 |
3 files changed, 26 insertions, 10 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Sat May 19 00:44:58 UTC 2018 +# Sat May 19 15:19:07 UTC 2018 pkgbase = firefox-kde-opensuse pkgdesc = Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE pkgver = 60.0.1 - pkgrel = 1 + pkgrel = 2 url = https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox arch = i686 arch = x86_64 @@ -31,7 +31,6 @@ pkgbase = firefox-kde-opensuse depends = startup-notification depends = mime-types depends = dbus-glib - depends = alsa-lib depends = hicolor-icon-theme depends = libvpx depends = icu @@ -67,8 +66,9 @@ pkgbase = firefox-kde-opensuse source = no-crmf.diff source = complete-csd-window-offset-mozilla-1457691.patch.xz source = 0001-Bug-1435212-Add-support-for-FFmpeg-4.0.-r-bryce.patch.xz + source = https://dev.gentoo.org/~axs/mozilla/patchsets/source/firefox-60.0-patches-01.tar.xz md5sums = SKIP - md5sums = ee8408a26641cefdec06e81d64b555bf + md5sums = 0a9a1df3daa55652c9e88465aa3bb7a4 md5sums = 14e0f6237a79b85e60256f4808163160 md5sums = c9385708f41599649e4e14fd3af506ce md5sums = 05bb69d25fb3572c618e3adf1ee7b670 @@ -84,6 +84,7 @@ pkgbase = firefox-kde-opensuse md5sums = 5223d4854f784003e3b575684cc004fe md5sums = 6c776f60394176fda2084bee667593f2 md5sums = d16e8582bacf6fc98e669ed87f4d6f4a + md5sums = 716f1c21a1020657928d4140d5563233 pkgname = firefox-kde-opensuse @@ -21,13 +21,13 @@ _pgo=true _pkgname=firefox pkgname=$_pkgname-kde-opensuse pkgver=60.0.1 -pkgrel=1 +pkgrel=2 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=('mozilla-common' 'libxt' 'startup-notification' 'mime-types' - 'dbus-glib' 'alsa-lib' 'hicolor-icon-theme' + 'dbus-glib' 'hicolor-icon-theme' 'libvpx' 'icu' 'libevent' 'nss>=3.28.3' 'nspr>=4.10.6' 'hunspell' 'sqlite' 'libnotify' 'kmozillahelper' 'ffmpeg' 'gtk3') @@ -63,6 +63,8 @@ source=("hg+$_repo#tag=FIREFOX_${pkgver//./_}_RELEASE" complete-csd-window-offset-mozilla-1457691.patch.xz 0001-Bug-1435212-Add-support-for-FFmpeg-4.0.-r-bryce.patch.xz + + https://dev.gentoo.org/~axs/mozilla/patchsets/source/firefox-60.0-patches-01.tar.xz ) @@ -127,8 +129,18 @@ prepare() { patch -Np1 -i ../complete-csd-window-offset-mozilla-1457691.patch # https://bugzilla.mozilla.org/show_bug.cgi?id=1435212 - patch -Np1 -i ../0001-Bug-1435212-Add-support-for-FFmpeg-4.0.-r-bryce.patch - + #patch -Np1 -i ../0001-Bug-1435212-Add-support-for-FFmpeg-4.0.-r-bryce.patch + + # gentoo patches + for file in "$srcdir"/firefox/*.patch ; do + case $file in + *gentoo*) : ;; + *) + patch -Np1 -i "$file" + ;; + esac + done + # WebRTC build tries to execute "python" and expects Python 2 mkdir -p "$srcdir/path" ln -sf /usr/bin/python2 "$srcdir/path/python" @@ -223,7 +235,7 @@ END ln -sf firefox "$pkgdir/usr/lib/firefox/firefox-bin" } md5sums=('SKIP' - 'ee8408a26641cefdec06e81d64b555bf' + '0a9a1df3daa55652c9e88465aa3bb7a4' '14e0f6237a79b85e60256f4808163160' 'c9385708f41599649e4e14fd3af506ce' '05bb69d25fb3572c618e3adf1ee7b670' @@ -238,4 +250,5 @@ md5sums=('SKIP' 'b358b5ed3726ecd4ed054bdc09901982' '5223d4854f784003e3b575684cc004fe' '6c776f60394176fda2084bee667593f2' - 'd16e8582bacf6fc98e669ed87f4d6f4a') + 'd16e8582bacf6fc98e669ed87f4d6f4a' + '716f1c21a1020657928d4140d5563233') diff --git a/mozconfig b/mozconfig index c1ad38cc5638..6f97a0b17ece 100644 --- a/mozconfig +++ b/mozconfig @@ -27,6 +27,8 @@ ac_add_options --with-system-jpeg ac_add_options --with-system-zlib ac_add_options --with-system-bz2 ac_add_options --with-system-libvpx +ac_add_options --with-system-harfbuzz +ac_add_options --with-system-graphite2 ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite ac_add_options --enable-system-ffi |